Commit Graph

197 Commits

Author SHA1 Message Date
Patrick Hilhorst
9ec40cc3bf
treewide: Fix overrides having wrong versions 2018-11-06 00:06:21 +01:00
Daiderd Jordan
33f818198b
docker-proxy: mark linux only
Unlike docker (cli only) this probably won't work on darwin.

    github.com/docker/libnetwork/networkdb
    can't load package: package github.com/docker/libnetwork/ns: build constraints exclude all Go files in /private/tmp/nix-build-docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.drv-0/go/src/github.com/docker/libnetwork/ns

/cc ZHF #45961
2018-09-20 22:22:53 +02:00
Tim Steinbach
54ba2c9afc
docker: 18.06.0 -> 18.06.1 2018-08-22 16:08:54 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Tim Steinbach
e953d314a8
docker: 18.03 -> 18.06 2018-07-19 08:34:13 -04:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Sarah Brofeldt
c80e0fbb08 docker: Ensure references to go are removed from docker-containerd (#41849) 2018-06-11 19:45:34 +02:00
Tim Steinbach
46440d3426
docker-edge: 18.04.0-ce -> 18.05.0-ce 2018-05-11 09:19:41 -04:00
Tim Steinbach
e0ad325cd4
docker: 18.03.0 -> 18.03.1 2018-04-26 08:02:21 -04:00
Matthew Bauer
52893d5276 treewide: move "extensions" drvs to dir
This cleans up the tree for pkgs/applications somewhat. Should not
change any hashes.
2018-04-17 13:50:49 -05:00
Tim Steinbach
d76725f3a5
docker-edge: 18.03 -> 18.04 2018-04-10 18:28:35 -04:00
Tim Steinbach
b072dcffae
docker: 18.02 -> 18.03 2018-03-23 17:37:30 -04:00
Tim Steinbach
3b9cf7aadc
docker: 17.12.0 -> 17.12.1 2018-02-28 12:48:17 -05:00
Tim Steinbach
4ffe462b10
docker-edge: 18.01.0 -> 18.02.0 2018-02-09 10:25:58 -05:00
Tim Steinbach
078fc69425
Merge pull request #33746 from NeQuissimus/docker_18_01
docker-edge: 17.12.0 -> 18.01.0
2018-01-30 14:06:19 +00:00
Tim Steinbach
3d2948e009
docker: Fix build after containerd update 2018-01-19 11:26:59 -05:00
Tim Steinbach
438452f07a
docker-edge: 17.12.0 -> 18.01.0 2018-01-11 09:15:47 -05:00
Tim Steinbach
b084b36010
docker: 17.{09,11} -> 17.12 2018-01-02 09:11:33 -05:00
Tim Steinbach
0781951e75
docker: 17.09.0 -> 17.09.1 2017-12-10 14:16:27 -05:00
Tim Steinbach
3901f08f10
docker-edge: 17.10 -> 17.11 2017-11-21 09:23:48 -05:00
Periklis Tsirakidis
1434c5ed9c fixup! docker-cli: enable darwin support 2017-11-20 20:30:46 +01:00
Periklis Tsirakidis
4a2bd8ed14 fixup! docker-cli: enable darwin support 2017-11-20 20:16:08 +01:00
Periklis Tsirakidis
0f0ffa70a0 docker-cli: enable darwin support 2017-11-20 20:07:00 +01:00
Tim Steinbach
de3d191b91
docker: add 17.10.0-ce 2017-10-18 08:25:25 -04:00
Orivej Desh
fda26c8476 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
  ...
2017-10-02 00:22:12 +00:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Orivej Desh
f1ffca9ac6 docker: fix docker_17_06 build
Broken by #29843
2017-09-28 11:59:53 +02:00
Tim Steinbach
825e417457
docker: add 17.09.0-ce 2017-09-27 08:18:40 -04:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
Tim Steinbach
8bd1a220d9
docker: 17.06.1-ce -> 17.06.2-ce 2017-09-05 19:57:29 -04:00
Heitham Omar
6dcc77bdb8 docker: add libseccomp to build 2017-08-30 20:28:43 +02:00
Tim Steinbach
693d2403f1 docker-edge: 17.06 -> 17.07 2017-08-30 13:04:45 +02:00
Tim Steinbach
5b1134cb79
docker: 17.06.0-ce -> 17.06.1-ce 2017-08-18 16:39:43 -04:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Benno Fünfstück
268374cafe docker: update runc commit
This updates to the new runc as was also done upstream:

f3ef17e47d

In particular, it fixes an issue where output of interactive docker containers
would not reset correctly to the beginning of a line.
2017-08-04 23:04:08 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Vincent Demeester
19325558f1 Fix docker packaging without sandbox
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-07-21 10:00:47 +02:00
Vincent Demeester
ec570448a0
docker-ce: 17.03.02-ce -> 17.06.0-ce
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-07-10 09:58:32 +02:00
Tim Steinbach
add90948bc
docker: 17.03.1-ce -> 17.03.2-ce 2017-06-28 12:49:59 -04:00
Jörg Thalheim
618f9aa52c
docker-proxy: remove go references
related to #25861
2017-05-17 22:14:34 +01:00
Vincent Demeester
398f6ed7d3
docker-edge: 17.04 to 17.05
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-05-09 10:11:05 +02:00
Tim Steinbach
1e589239b3
docker-edge: init at 17.04 2017-04-05 20:49:26 -04:00
Tim Steinbach
aefb9671bf
docker: 17.03.0 -> 17.03.1 2017-04-04 13:43:57 -04:00
Tim Steinbach
aed4918795
docker: 1.13.1 -> 17.03.0-ce 2017-03-14 08:02:35 -04:00
Joachim Fasting
c4fe196087
docker: use removeReferencesTo 2017-03-11 15:17:34 +01:00
Vincent Demeester
a50b4d0e03
docker: 1.13.0 -> 1.13.1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-13 16:42:39 +01:00
Vincent Demeester
d79fa8850a
Fixing the wrong Git Commit hash in docker version
`DOCKER_GITCOMMIT` needs to match the tagged commit used to build the
binary. The current commit refers to 1.12.1 and wasn't update each
time we updated the package. Using a variable near the version and
adding a comment so we don't forget to update next time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-23 10:32:17 +01:00
Vincent Demeester
74d4d3e4f9
docker: 1.12.6 -> 1.13.0
- Update docker version to 1.13.0.
- Introduce now docker-proxy package (from libnetmork).
- Use overrideDerivation to set the correct version for docker.
- Update tini to make sure we can build it static.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-18 21:33:37 +01:00
Franz Pletz
cb07316773
docker: 1.12.5 -> 1.12.6
Fixes CVE-2016-9962.
2017-01-11 10:59:24 +01:00
Tim Steinbach
a5a98290b7
docker: 1.12.3 -> 1.12.5 2016-12-16 08:57:08 -05:00
Tim Steinbach
282532e702
docker: 1.12.2 -> 1.12.3 2016-10-27 12:46:04 -04:00
Tim Steinbach
1a23e336a5
docker: 1.12.1 -> 1.12.2 2016-10-14 22:47:18 -04:00
Jaka Hudoklin
0a518618a2 docker: 1.10.3 -> 1.12.1 2016-09-13 12:50:58 +02:00
Tuomas Tynkkynen
282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Leon Isenberg
ccbb3fa541 docker: Expose completions for fish 2016-06-20 23:41:32 +02:00
obadz
f0de1c75b5 docker: fix build with systemd 230 2016-05-27 15:42:15 +01:00
Nathan Zadoks
99177c7377 docker: remove enableLxc parameter
LXC support was removed in Docker 1.4 (November 2015), and isn't coming
back.
2016-05-24 11:08:20 -04:00
Nathan Zadoks
ebdd600732 docker: allow disabling btrfs and devicemapper 2016-04-17 00:41:17 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Pierre Dal-Pra
d97805ccd0 docker: 1.10.0 -> 1.10.3 2016-03-18 22:12:42 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Cole Mickens
712eb6b7e0 docker 1.9.1 -> 1.10.0 2016-02-04 22:52:06 -08:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Nathan Zadoks
9c9a5353f9 docker: enable journald support 2016-01-14 16:01:19 +01:00
Tobias Geerinckx-Rice
82419575aa btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Nathan Zadoks
d5e5a7dbc3 docker: 1.9.0 -> 1.9.1 2015-12-21 12:18:22 +01:00
Luca Bruno
2f0fe05543 docker: use glibc.static with multiple-outputs for dockerinit 2015-12-10 13:19:25 +01:00
Jaka Hudoklin
8f806d88bf Merge pull request #11057 from offlinehacker/pkgs/docker-gc/add
docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc
2015-11-18 22:28:18 +01:00
Jaka Hudoklin
7f45af89f7 Merge pull request #11063 from offlinehacker/pkgs/docker/update_1.9.0
docker: 1.8.1 -> 1.9.0
2015-11-18 22:26:17 +01:00
Jaka Hudoklin
02fc10ce25 docker: make lxc optional 2015-11-16 16:17:53 +01:00
Jaka Hudoklin
c79e22edbf docker: 1.8.1 -> 1.9.0 2015-11-16 15:56:09 +01:00
Jaka Hudoklin
a42d2e439b docker-gc: init at b0cc52aa3da2e2ac0080794e0be6e674b1f063fc 2015-11-16 15:16:48 +01:00
Jaka Hudoklin
95e2403f86 Merge pull request #9530 from offlinehacker/pkgs/docker/fix_add_utillinux
docker: add blkid from utillinux to path
2015-08-29 18:32:52 +02:00
Jaka Hudoklin
ff0575a2f1 docker: add blkid from utillinux to path 2015-08-29 18:25:39 +02:00
Domen Kožar
e65fce3af6 docker: fix build on i686 2015-08-27 13:22:29 +02:00
Domen Kožar
c2841a2221 docker: 1.7 -> 1.8.1, fix build (go 1.4) 2015-08-26 13:56:18 +02:00
Benjamin Staffin
a5cdd98da4 docker: 1.6.0 -> 1.7.1 2015-08-03 20:20:56 -07:00
Domen Kožar
f550eb7fde docker: fix build 2015-05-10 12:41:21 +02:00
Jaka Hudoklin
eee1bb5ae5 docker: update to 1.6.0 2015-04-25 15:46:35 +02:00
Jaka Hudoklin
6944b2bde7 docker: update to 1.5.0 2015-02-27 13:53:38 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
codyopel
6d3fee045a docker: fix shebangs, closes #6368 2015-02-16 21:41:46 -05:00
Brian McKenna
a26b8bcb5d Upgrade to Docker 1.4 2015-01-20 19:49:10 -07:00
Rob Vermaas
90c3dc79c5 docker: update from 1.3.1 to 1.3.3, potentially fixes CVE-2014-6407, CVE-2014-6408 2014-12-17 15:47:56 +01:00
Rob Vermaas
f54c852a36 docker: update from 1.3.0 to 1.3.1, potentially fixes CVE-2014-5277 2014-11-18 16:06:36 +01:00
Paul Colomiets
f86967ac8a docker: upgrade to 1.3.0 2014-10-17 23:20:09 +03:00
Jaka Hudoklin
0c398f6040 docker: add xz to PATH, make importing from archives work 2014-09-04 01:30:59 +02:00
Jaka Hudoklin
e5194e5aea docker: fix docker not finding dockerinit 2014-09-03 18:24:51 +02:00
Jaka Hudoklin
88391a5c65 docker: update to 1.2.0 2014-08-24 17:30:50 +02:00
Georges Dubus
a82e9e4b5c Added e2fsprogs to docker dependencies.
Otherwise, it complains about mkfs.ext4 not being present at service
start (and stops).
2014-08-19 11:00:46 +02:00
Paul Colomiets
9bc1676e5a Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
Alex Berg
47090c9bdc Bump docker version to 0.10.0. 2014-05-03 17:03:33 +02:00
Alex Berg
7dff8a8aaf Bump Docker to v0.9.1. Tested pulling, committing, pushing.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 15:08:07 -05:00
Jaka Hudoklin
cc33c351b8 Add docker 2014-01-27 00:56:51 +01:00