diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
commit | fda26c8476c1684f77bacacf2b5c46b1fbf65b41 (patch) | |
tree | 84752640ad3cf64ba372bdd4aab713c097023281 /pkgs/applications/virtualization/docker | |
parent | 21976d1fbd612f67825473a7a2b05bb1387e5840 (diff) | |
parent | 6b8806dff7a2cd11e37944af1bbb276ceb870199 (diff) | |
download | nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.gz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.bz2 nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.lz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.xz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.zst nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.zip |
Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
Diffstat (limited to 'pkgs/applications/virtualization/docker')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5afd9a0e6bbd..49920e28f766 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -46,11 +46,10 @@ rec { }; # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' + preBuild = (optionalString (version == "17.09.0-ce") '' mkdir $(pwd)/vendor/src mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - ln -s $(pwd) vendor/src/github.com/containerd/containerd - ''; + '') + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; |