Commit graph

161640 commits

Author SHA1 Message Date
Graham Christensen
c88337c9ac
dockerTools.buildImage: support using a layered image in fromImage
Docker images used to be, essentially, a linked list of layers. Each
layer would have a tarball and a json document pointing to its parent,
and the image pointed to the top layer:

    imageA  ----> layerA
                    |
                    v
                  layerB
                    |
                    v
                  layerC

The current image spec changed this format to where the Image defined
the order and set of layers:

    imageA  ---> layerA
            |--> layerB
            `--> layerC

For backwards compatibility, docker produces images which follow both
specs: layers point to parents, and images also point to the entire
list:

    imageA  ---> layerA
            |      |
            |      v
            |--> layerB
            |      |
            |      v
            `--> layerC

This is nice for tooling which supported the older version and never
updated to support the newer format.

Our `buildImage` code only supported the old version, so in order for
`buildImage` to properly generate an image based on another image
with `fromImage`, the parent image's layers must fully support the old
mechanism.

This is not a problem in general, but is a problem with
`buildLayeredImage`.

`buildLayeredImage` creates images with newer image spec, because
individual store paths don't have a guaranteed parent layer. Including
a specific parent ID in the layer's json makes the output less likely
to cache hit when published or pulled.

This means until now, `buildLayeredImage` could not be the input to
`buildImage`.

The changes in this PR change `buildImage` to only use the layer's
manifest when locating parent IDs. This does break buildImage on
extremely old Docker images, though I do wonder how many of these
exist.

This work has been sponsored by Target.
2018-12-05 14:25:54 -05:00
Alexey Shmalko
33b9aa4f35
Merge pull request #51272 from binarin/anki-python3.7-fix
anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7
2018-12-04 16:26:25 +02:00
Jörg Thalheim
fc02ed8b30
Merge pull request #51385 from symphorien/pyflame
pyflame: init at 1.6.7
2018-12-04 14:11:09 +00:00
Renaud
b6cc4ae367
Merge pull request #51494 from romildo/upd.nordic-polar
nordic-polar: init at 1.3.0
2018-12-04 15:07:56 +01:00
Renaud
911aa08afc
Merge pull request #51492 from romildo/upd.materia-theme
materia-theme: 20181115 -> 20181125
2018-12-04 15:06:12 +01:00
Jörg Thalheim
2758a38701
Merge pull request #51504 from alyssais/patch-2
doc: reminder to upgrade linux-libre with linux
2018-12-04 13:53:13 +00:00
Alexey Shmalko
dd818c8d8f
Merge pull request #51499 from kylewlacy/plex-media-player_2-23-0
plex-media-player: 2.14.1 -> 2.23.0
2018-12-04 15:13:53 +02:00
Alexey Shmalko
48daad824e
Merge pull request #51507 from timokau/spotify-1.0.94
spotify: 1.0.93.242.gc2341a27-15 -> 1.0.94.262.g3d5c231c-9
2018-12-04 15:01:34 +02:00
José Romildo Malaquias
c46915c9c1 materia-theme: move to pkgs/data/themes 2018-12-04 10:56:57 -02:00
José Romildo Malaquias
eff0cf020f materia-theme: 20181115 -> 20181125 2018-12-04 10:50:48 -02:00
José Romildo Malaquias
5fc63b32f7 nordic-polar: init at 1.3.0 2018-12-04 10:45:13 -02:00
Timo Kaufmann
2f98b1c112 spotify: 1.0.93.242.gc2341a27-15 -> 1.0.94.262.g3d5c231c-9 2018-12-04 13:33:34 +01:00
Alyssa Ross
fa749ac858
linux_latest-libre: document finding latest rev
https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444064006
2018-12-04 12:08:30 +00:00
Alyssa Ross
d9eb8c760e
doc: reminder to upgrade linux-libre with linux
https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444061264
2018-12-04 12:04:03 +00:00
Jörg Thalheim
bf90c317ec
Merge pull request #51417 from jvassev/vault
vault: 0.11.2 -> 0.11.5
2018-12-04 10:58:34 +00:00
Jörg Thalheim
7dbb64aca4
Merge pull request #51493 from marsam/feature/docs-remove-nix-repl-references
docs: Remove nix-repl references
2018-12-04 10:53:09 +00:00
Jörg Thalheim
49a9bd626d
Merge pull request #51501 from timokau/pygraphviz-path
python.pkgs.pygraphviz: add graphviz path
2018-12-04 10:52:08 +00:00
Timo Kaufmann
21de751e74 python.pkgs.pygraphviz: add graphviz path 2018-12-04 11:44:40 +01:00
Jörg Thalheim
708164fe94
Merge pull request #51457 from binarin/nvidia-legacy-340-no-longer-patch-414
nvidia_legacy_340: Remove unneeded/failing patch
2018-12-04 10:42:38 +00:00
Maximilian Bosch
37f0a4f199
Merge pull request #51497 from hedning/nix-completions-bump
nix-{zsh,bash}-completions version bump
2018-12-04 11:18:25 +01:00
Kyle Lacy
50069a0eea plex-media-player: 2.14.1 -> 2.23.0 2018-12-04 00:11:48 -08:00
Tor Hedin Brønner
af4e0db357
Merge pull request #51254 from hedning/fix-balsa-enchant
balsa: switch from enchant to gtkspell3
2018-12-04 09:08:02 +01:00
Tor Hedin Brønner
ad8f5ca2bb nix-bash-completions: 0.6.6 -> 0.6.7 2018-12-04 08:34:23 +01:00
Tor Hedin Brønner
5bc0270211 nix-zsh-completions: 0.4.1 -> 0.4.2 2018-12-04 08:32:29 +01:00
Renaud
ec95e55eed
Merge pull request #51490 from flokli/zoom-us-2.5.146186.1130
zoom-us: 2.4.129780.0915 -> 2.5.146186.1130
2018-12-04 08:23:53 +01:00
Renaud
68b17ada12
Merge pull request #51475 from redvers/update/mediawiki
mediawiki: 1.29.1 -> 1.31.1
2018-12-04 08:06:57 +01:00
Mario Rodas
f1dd6faaaa
docs: Remove nix-repl references
nix-repl has been deprecated
2018-12-03 21:37:54 -05:00
Herwig Hochleitner
da511852c1 leiningen: move leiningen-x.x-standalone.jar out of share/java
fixes #51448
2018-12-04 02:58:58 +01:00
Florian Klink
c4177f4e5b zoom-us: 2.4.129780.0915 -> 2.5.146186.1130
fixes [CVE-2018-15715](https://nvd.nist.gov/vuln/detail/CVE-2018-15715)
2018-12-04 02:12:56 +01:00
Silvan Mosberger
e9ecd7f872 nix-index: Wrap with nix-env in PATH (#51165)
This fixes an impurity in nix-index: Previously it would take the nix-env
binary from the users PATH. I discovered this while trying to run nix-index in a
systemd service, which by default doesn't have nix-env in its path. The
errors it threw were not informative at all and it took me hours to
finally figure out the reason.
2018-12-04 08:54:37 +08:00
Vladyslav M
19532f2ba2
Merge pull request #51439 from jfrankenau/update-iwd
iwd: 0.11 -> 0.12
2018-12-04 02:24:35 +02:00
Renaud
833ee1809a
Merge pull request #51454 from avnik/mythes-fixup
hunspell: unbreak mythes build, due transient dependencies
2018-12-04 01:02:57 +01:00
Jörg Thalheim
20f11e6837
Merge pull request #51485 from extole/whisper_mock
Add mock to the list of whisper's test inputs.
2018-12-03 23:47:22 +00:00
Alexander V. Nikolaev
b057ac71ea mythes: fix link error on missed tinfo library (ncurses) 2018-12-04 01:45:50 +02:00
Jörg Thalheim
958d8e625e
Merge pull request #49392 from uvNikita/nixos/containers/veths
nixos/containers: don't create veths if not configured
2018-12-03 23:44:50 +00:00
Jörg Thalheim
41af4a520c
Merge pull request #51488 from flokli/cowsay-cross
cowsay: fix cross
2018-12-03 23:42:07 +00:00
Alexey Shmalko
d5b45b4ff8
Merge pull request #51327 from k0ral/loop
loop: init at unstable-2018-10-02
2018-12-04 01:37:23 +02:00
Jörg Thalheim
1f5c851967 radare: remove
This project has been deprecated in 2016.
Radare2 should been used intead: https://github.com/radare/radare
2018-12-04 00:33:49 +01:00
Florian Klink
fae81f322e cowsay: fix cross
The install.sh script looks for all perls in $PATH, tries to execute
these to test whether that perl is "good", if it is, takes it and
puts it into the shebang.

This obviously can't work for cross. As installation seems to be pretty
trivial, do it in a custom install phase.
2018-12-04 00:23:44 +01:00
Alexey Shmalko
dc9bb48a73
loop: cleanup 2018-12-04 01:20:02 +02:00
John Ericson
805d32dbf7
Merge pull request #51401 from roberth/all-packages-res
all-packages.nix: Alias self to res, deprecating self
2018-12-03 18:06:48 -05:00
Jörg Thalheim
230beb3ad6
Merge pull request #51483 from Mic92/radare2
radare2: 3.1.1 -> 3.1.2
2018-12-03 23:03:44 +00:00
Jörg Thalheim
24ab7035a8
Merge pull request #51477 from jtojnar/subl-gtk3
sublime3-dev: 3176 → 3183
2018-12-03 22:40:31 +00:00
Jörg Thalheim
e24ac2e06f
Merge pull request #51478 from bhipple/fix/libffi-src
libffi: swap src URL from FTP to HTTPS
2018-12-03 22:36:53 +00:00
Jörg Thalheim
58700be336
radare2: 3.1.1 -> 3.1.2 2018-12-03 22:29:22 +00:00
Symphorien Gibol
330fbbeb73 pyflame: init at 1.6.7 2018-12-03 23:27:33 +01:00
Benjamin Smith
83f782f175 Add mock to the list of whisper's test inputs.
This was required as the versiof whisper was upgraded from
1.1.3 to 1.1.4 and mock was added as a test dependency in
that release:
703dd9d3a6 (diff-62849af500c571aa4532da7be8833e73R14)
2018-12-03 14:20:25 -08:00
Jan Tojnar
23de7958bf
sublime3-dev: 3176 → 3183
Sublime finally switched to GTK 3!
2018-12-03 23:13:24 +01:00
Benjamin Hipple
08c75aaedc libffi: swap src URL from FTP to HTTPS
HTTPS is never worse and often better than FTP, since it's faster, more secure,
and more likely to be accessible through firewalls.

This does not change the tarball sha, as confirmed by `nix-prefetch-url`.
2018-12-03 22:10:29 +00:00
Renaud
aad3176fc3
Merge pull request #51471 from noneucat/polar-1.1.0
polar-bookshelf: 1.0.13 -> 1.1.0
2018-12-03 22:42:06 +01:00