1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

581 commits

Author SHA1 Message Date
Robert Schütz d72710880c
Merge pull request #35891 from aneeshusa/fix-salt-msgpack-dependency
salt: 2017.7.2 -> 2017.7.4, fix msgpack dependency
2018-04-15 08:08:14 +02:00
Jörg Thalheim 7663de114a lxd: 2.16 -> 3.0.0 2018-04-14 11:02:24 +01:00
Suvash Thapaliya 7e324b857b
iamy: init at 2.1.1
Add iamy package - maintains aws iam in yaml format
2018-04-13 12:51:31 +02:00
Yorick 276580f769 acme.sh: init at 2.7.8 (#38856) 2018-04-12 22:14:49 +01:00
R. RyanTM 96512b979b bubblewrap: 0.2.0 -> 0.2.1 (#38770)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bubblewrap/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1/bin/bwrap --help’ got 0 exit code
- ran ‘/nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1/bin/bwrap --version’ and found version 0.2.1
- found 0.2.1 with grep in /nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1
- directory tree listing: https://gist.github.com/9ee4cdd00b90b74f8599566d9ed1d5d0
2018-04-11 18:33:52 +02:00
R. RyanTM 479d38c588 certbot: 0.22.2 -> 0.23.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/certbot/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot -h’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot --help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot --version’ and found version 0.23.0
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.23.0
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped --help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped help’ got 0 exit code
- ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped --version’ and found version 0.23.0
- found 0.23.0 with grep in /nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0
- directory tree listing: https://gist.github.com/16960558211e845b02775a58c7aef6ce
2018-04-11 01:56:24 -07:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Frederik Rietdijk 3ed297511d python: aws-shell: 0.1.1 -> 0.2.0 2018-04-08 11:34:57 +02:00
Thilo Uttendorfer cf45cfc58c ansible_2_5: init at 2.5.0 2018-03-30 08:08:29 +02:00
Averell Dalton d13af8be9d nxproxy: 3.5.0.33 -> 3.5.99.16 2018-03-29 16:30:14 +02:00
Robert Scott 814225cf22 aws-auth: remove
No longer works with current awscli versions, unmaintained upstream
2018-03-23 21:12:25 -05:00
lewo 8920d1efb1
Merge pull request #37496 from spencerjanssen/awscli-1.14.50
awscli: 1.14.47 -> 1.14.50
2018-03-21 21:46:40 +01:00
Jörg Thalheim f2feb99990
Merge pull request #37493 from makefu/pkgs/simp_le/0.8.0
simp_le: 0.6.1 -> 0.8.0
2018-03-21 12:03:59 +00:00
Robert Schütz 727c76765d simp_le: patch shebangs 2018-03-21 10:14:52 +01:00
Spencer Janssen 3c64662e14 awscli: 1.14.47 -> 1.14.50
Fixes a broken build introduced when botocore was updated in ce34a9a3
2018-03-20 16:55:42 -05:00
makefu e144fa07b9
simp_le: 0.6.2 -> 0.8.0 2018-03-20 22:29:09 +01:00
makefu e9f176a09a
certbot: 0.19.0 -> 0.22.2 2018-03-20 22:25:50 +01:00
Robert Schütz b96fa84bbf
Merge pull request #35347 from Ma27/package-chkcrontab
chkcrontab: init at 1.7
2018-03-18 10:22:54 +01:00
Gabriel Ebner 51794dfdd3
Merge pull request #37041 from ryantm/dehydrated
dehydrated: 0.5.0 -> 0.6.1
2018-03-17 13:55:10 +01:00
Ryan Mulligan 87f7ea335c dehydrated: 0.5.0 -> 0.6.1 2018-03-14 15:37:03 -07:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Jörg Thalheim a30cb1bf55 google-cloud-sdk: also fix darwin 2018-03-08 22:28:09 +00:00
Ryan Mulligan 84cb658505 google-cloud-sdk: 184.0.0 -> 190.0.1
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 190.0.1 with grep in /nix/store/y7rvgsj3077w8div5qny11xhgyjvy06c-google-cloud-sdk-190.0.1
2018-03-08 12:48:47 -08:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Maximilian Bosch 8ed04b9348
chkcrontab: init at 1.7
`chkcrontab` is a simple utility to check crontab for errors.
Fixes #34969
2018-03-05 14:09:01 +01:00
WilliButz 51ec5a3b5b
gixy: 0.1.8 -> 0.1.9 2018-03-04 14:17:26 +01:00
Aneesh Agrawal e797e00913 salt: 2017.7.2 -> 2017.7.4
Release notes: https://docs.saltstack.com/en/2017.7/topics/releases/2017.7.4.html
2018-03-03 23:52:10 -08:00
Pierre Radermecker 9b29c0647d Update salt-pepper from 0.5.0 to 0.5.5 2018-03-03 17:33:45 +01:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Ryan Mulligan ff00a215d7 nxproxy: 3.5.0.32 -> 3.5.0.33
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33/bin/nxproxy -h` got 0 exit code
- ran `/nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33/bin/nxproxy --help` got 0 exit code
- ran `/nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33/bin/nxproxy help` got 0 exit code
- ran `/nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33/bin/nxproxy -v` and found version 3.5.0.33
- found 3.5.0.33 with grep in /nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33
- found 3.5.0.33 in filename of file in /nix/store/0q7isf3b9x0yan8dpzmm6qch9cdp95mn-nxproxy-3.5.0.33
2018-02-28 15:00:55 +00:00
Ryan Mulligan 4cb01d3358 sec: 2.7.7 -> 2.7.12
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec -h` got 0 exit code
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec --help` got 0 exit code
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec -V` and found version 2.7.12
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec -v` and found version 2.7.12
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec --version` and found version 2.7.12
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec -h` and found version 2.7.12
- ran `/nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12/bin/sec --help` and found version 2.7.12
- found 2.7.12 with grep in /nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12
- found 2.7.12 in filename of file in /nix/store/586lmj690hk6bvlsbzmx44kfcpamxs1l-sec-2.7.12

cc "@tv"
2018-02-27 15:53:17 -08:00
Aneesh Agrawal ee8495c4c2 salt: fix msgpack dependency 2018-02-27 10:08:20 -08:00
Frederik Rietdijk 405407fcf5
Merge pull request #35680 from NixOS/python-unstable
Python: last major updates package set
2018-02-27 09:16:47 +00:00
Robert Schütz ae870798dc awscli: refactor 2018-02-27 09:35:05 +01:00
Frederik Rietdijk 73072e688b awscli: 1.14.41 -> 1.14.47 2018-02-27 09:25:53 +01:00
Ryan Mulligan 220526dba5 dehydrated: 0.4.0 -> 0.5.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/dehydrated -h` got 0 exit code
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/dehydrated --help` got 0 exit code
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/dehydrated -h` and found version 0.5.0
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/dehydrated --help` and found version 0.5.0
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/.dehydrated-wrapped -h` got 0 exit code
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/.dehydrated-wrapped --help` got 0 exit code
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/.dehydrated-wrapped -h` and found version 0.5.0
- ran `/nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0/bin/.dehydrated-wrapped --help` and found version 0.5.0
- found 0.5.0 with grep in /nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0
- found 0.5.0 in filename of file in /nix/store/khsw23siwrvmczmlcjdlp31ksqjxs902-dehydrated-0.5.0
2018-02-25 19:59:45 -08:00
Alexander V. Nikolaev 1bc1909e5b treewide: transition from mesa_glu to libGLU 2018-02-24 17:05:43 +02:00
Vladimír Čunát 1d15dadbec
Merge branch 'master' into staging
Larger rebuilds from master.
2018-02-20 20:33:40 +01:00
Suvash Thapaliya 8faa916ba4
Remove empty dependencies and related file 2018-02-20 10:54:31 +01:00
Frederik Rietdijk 9307dbb947 awscli: 1.14.32 -> 1.14.41 2018-02-18 20:07:43 +01:00
Suvash Thapaliya c7e01acef2
docker-credential-gcr: init at 1.4.3
Docker authentication helper for Google Cloud (gcr.io) repositories
2018-02-18 15:48:30 +01:00
Andrew Dunham ac5e4d4990 lego: init at unstable-2018-02-02 2018-02-11 12:17:25 -08:00
Tuomas Tynkkynen 9548028a22 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
2018-02-06 04:11:23 +02:00
Peter Romfeld bbebd26b13
fastlane: 2.75.1 -> 2.80.0 2018-02-05 16:50:53 +08:00
Frederik Rietdijk 763a372911 awscli: 1.4.29 -> 1.4.32 2018-02-03 17:43:30 +01:00
Frederik Rietdijk 4c88132d25 Merge commit 'a0f8e3a' into HEAD 2018-01-22 16:08:37 +01:00
Nick Novitski 9f6f2cdbde
google-cloud-sdk: disable component updater 2018-01-21 18:26:30 -08:00
Frederik Rietdijk e3865944f6 awscli: 1.14.22 -> 1.4.29 2018-01-20 12:18:00 +01:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
zimbatm d411899576
google-cloud-sdk: 182.0.0 -> 184.0.0 (#33784) 2018-01-12 13:51:04 +00:00
adisbladis 8c1e47a320
aws-vault: Fix eval 2018-01-11 21:38:32 +08:00
zimbatm b5b6656c87 aws-vault: init at 4.1.0 2018-01-11 12:46:21 +00:00
adisbladis 828298ce26
fastlane: 2.68.2 -> 2.75.1 2018-01-11 17:20:54 +08:00
adisbladis 663618ed3a
awscli: 1.14.17 -> 1.14.22 2018-01-11 17:20:53 +08:00
Will Dietz 30b5b0d48b tigervnc: enable composite (required by glx, which we enable) 2018-01-05 10:34:21 -06:00
Will Dietz 2edf41e6bb tigervnc: build in parallel 2018-01-05 10:32:40 -06:00
Frederik Rietdijk 2c7feca25d awscli: 1.14.6 -> 1.14.17 2017-12-31 11:01:52 +01:00
Robin Gloster e16f887ec5
ansible_2_{1,2}: fix for jinja src change 2017-12-26 20:39:26 +01:00
rnhmjoj 491bc4cfed
pythonPackages: rename dns -> dnspython 2017-12-10 15:27:06 +01:00
Sarah Brofeldt e32a2b4695
Merge pull request #32458 from elitak/vncdo
vncdo: init at 0.11.2
2017-12-09 16:54:59 +01:00
Tamas Herman a16501cd44 awscli: 1.11.185 -> 1.14.6 2017-12-09 09:18:30 +00:00
Lorenzo Manacorda 6ee9df6b31 google-cloud-sdk: 177.0.0 -> 182.0.0 (#32452) 2017-12-08 20:32:51 +00:00
Eric Litak 19126daab3 vncdo: init at 0.11.2 2017-12-08 10:43:14 -08:00
Peter Romfeld 946beae8e4 fastlane: 2.66.2 -> 2.68.2 2017-12-06 12:25:19 +08:00
Aaron Bull Schaefer 6636f3bc25 ansible: 2.4.1.0 -> 2.4.2.0 2017-11-30 08:41:10 -08:00
Peter Romfeld cc234675a9 fastlane: 2.63.0 -> 2.66.2 2017-11-24 00:25:21 +08:00
WilliButz 489fd5a7ce
gixy: init at 0.1.8 2017-11-17 15:36:52 +01:00
Eric Litak be3806830c simp_le: 0.2.0 -> 0.6.1 2017-11-16 09:14:33 -08:00
Eric Litak 8307427b17 certbot: 0.11.1 -> 0.19.0 2017-11-16 09:14:27 -08:00
Ilya Kolpakov 886770c6f0 google-cloud-sdk: no dependence on gce by default (fixes #31369) 2017-11-16 13:46:37 +01:00
Ilya Kolpakov fc8fbab87f google-cloud-sdk: don't repeat base download url 2017-11-16 11:12:55 +01:00
Michael Raskin 57f5e2aa76 bubblewrap: 0.1.8 -> 0.2.0 2017-11-11 13:10:50 +01:00
adisbladis d191bede7b
awscli: 1.11.162 -> 1.11.185 2017-11-11 02:35:43 +08:00
adisbladis 689f385923
aws_shell: Move out of python-packages.nix 2017-11-11 02:35:42 +08:00
Jörg Thalheim 6a61a78f4b
Merge pull request #31085 from peterromfeldhk/fastlane
fastlane: 2.62.1 -> 2.63.0
2017-11-02 08:50:12 +00:00
zimbatm f4e38223f3 google-cloud-sdk: 171.0.0 -> 177.0.0 2017-11-01 20:33:23 +00:00
Peter Romfeld 04b3b00917 fastlane: 2.62.1 -> 2.63.0 2017-11-01 20:26:14 +08:00
Aaron Bull Schaefer 16e9541169 ansible: 2.4.0.0 -> 2.4.1.0 2017-10-30 16:09:40 -07:00
Jörg Thalheim 330b4336bd
Merge pull request #30848 from peterromfeldhk/fastlane
fastlane: 2.61.0 -> 2.62.1
2017-10-28 11:56:28 +01:00
Peter Romfeld 21ad5f0ab6
fastlane: 2.61.0 -> 2.62.1 2017-10-27 11:13:43 +08:00
Aaron Bull Schaefer 19fda23a50 ansible_2_3: 2.3.1.0 -> 2.3.2.0 2017-10-25 12:23:52 -07:00
Kevin Cox 5f8cf0048e rust: update cargo builder to fetch registry dynamically
The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.

Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.

This also uses the new --frozen and --locked flags which is nice.

Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).

This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.

Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
2017-10-23 00:30:47 +01:00
Peter Romfeld 29f9ca40cb ansible_2_4: init at 2.4.0.0 (#30073) 2017-10-17 22:03:43 +01:00
Jörg Thalheim 6d8d452c33 Merge pull request #30496 from peterromfeldhk/fastlane
fastlane: 2.60.1 -> 2.61.0
2017-10-17 08:47:44 +01:00
Peter Romfeld f68347cb26 fastlane: 2.60.1 -> 2.61.0 2017-10-17 12:26:02 +08:00
Jörg Thalheim 6a807fe709 Merge pull request #30368 from derchrisuk/awslogs
awslogs: 0.7 -> 0.10
2017-10-13 13:22:32 +01:00
Jörg Thalheim bef0850c61 Merge pull request #30372 from derchrisuk/intecture-cli
intecture-{auth,agent,cli}: updates
2017-10-13 13:17:37 +01:00
derchris 1d20ee2f92 intecture-auth: 0.1.0 -> 0.1.2 2017-10-13 12:22:39 +01:00
derchris 845d0b6005 intecture-agent: 0.3.0 -> 0.3.1 2017-10-13 12:22:24 +01:00
Aneesh Agrawal 98d5aa05cb salt: 2017.7.1 -> 2017.7.2 2017-10-13 13:07:30 +02:00
derchris 096efff693 awslogs: 0.7 -> 0.10 2017-10-13 00:00:28 +02:00
derchris c4ef6ee7cc intecture-cli: 0.3.2 -> 0.3.4 2017-10-12 23:03:35 +02:00
Vladimír Čunát 9f1b54b31b
tigervnc: fixup build after xorgserver changes
The server itself doesn't need those build inputs anymore,
but tigervnc does, apparently.
2017-10-08 17:54:49 +02:00
Orivej Desh 66d4941afe Merge branch 'master' into staging
* master: (48 commits)
  Mathematica: 11.0.1 -> 11.2.0
  kbfs: 20170922.f76290 -> 20171004.40555d
  packer: 1.0.3 -> 1.1.0
  libxdg-basedir: 1.0.2 -> 1.2.0
  fscrypt: 0.2.1 -> 0.2.2
  devtodo: init at 0.1.20
  keybase: 1.0.30 -> 1.0.33
  elixir: Fix locale problem on NixOS
  keybase-gui: 1.0.25 -> 1.0.33
  terraform: 0.10.2 -> 0.10.7  (#30055)
  emby: 3.2.32.0 -> 3.2.33.0
  sbcl: 1.3.21 -> 1.4.0
  ardour: 5.11 -> 5.12
  axoloti: fix evaluation
  axoloti: init at 1.0.12-1
  melpa-packages: Add new lean packages
  fastlane: init at 2.60.1
  nixos/traefik: guard example path
  go-ethereum: 1.7.0 -> 1.7.1
  xzgv: 0.9.1 -> 0.9.2
  ...
2017-10-05 07:41:39 +00:00
Peter Romfeld fca7a9af0f fastlane: init at 2.60.1 2017-10-04 15:02:23 +01:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Nikolay Amiantov b241bcf388 google-cloud-sdk: 161.0.0 -> 171.0.0 2017-09-25 22:47:03 +03:00
Joachim F 92513b8a41 Merge pull request #29020 from danbst/salt-update
salt: 2016.11.5 -> 2017.7.1, patch fix
2017-09-24 03:31:41 +00:00
John Ericson ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
Frederik Rietdijk febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Jason Miller e9183fd2d4 tigervnc: correct default ssh client path (#29084)
* tigervnc: correct default ssh client path

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream.  This patches it to use the nixpkgs openssh client.

* tigervnc: patch ssh path correctly
2017-09-08 19:45:17 +01:00
Frederik Rietdijk d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk d45e554457 mycli: move out of python-packages.nix and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk 67651d80bc Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-06 13:54:10 +02:00
John Ericson 40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg
misc pkgs: Reorganize dependencies ahead of #26805
2017-09-05 18:10:32 -04:00
John Ericson 252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00
danbst a5b8c0c2de salt: 2016.11.5 -> 2017.7.1, patch fix
The libcrypto patch didn't work well with `salt-ssh` (that code failed on
remote machines), so let's make Nix-based library lookup as fallback.

https://github.com/saltstack/salt/issues/43350
2017-09-05 15:54:16 +03:00
Frederik Rietdijk 72cc6ba17f ansible_2_1, ansible_2_2: use overridePythonAttrs 2017-09-02 13:55:59 +02:00
Jörg Thalheim 8d015553d5 ansible_2_2/ansible_2_1: switch to overrideDerivation for jinja2 2017-09-02 13:55:59 +02:00
Jörg Thalheim 2f5dab753c ansible: move out of pythonPackages
ansible is not a library
2017-08-28 11:30:22 +01:00
Nick Hu fcd8950520 scaleway-cli: init at v1.14 2017-08-22 14:26:47 +01:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Franz Pletz aaee055dae
lxd: 2.14 -> 2.16 2017-08-01 06:16:03 +02:00
Frederik Rietdijk 1c94c54c4a cli53: fix build 2017-07-29 13:04:07 +02:00
Muhammad Herdiansyah 159be2e4f5 bubblewrap: init at 0.1.8 2017-07-28 16:26:12 +07:00
Robin Gloster 27800258e1 aws-auth: clean up 2017-07-26 18:45:41 +02:00
Robert Scott 2989324d60 aws-auth: init at unstable-2017-07-24 2017-07-26 18:45:41 +02:00
Vladimír Čunát 5328aac7be
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Maarten Hoogendoorn caf44a5dd3 google-cloud-sdk: enable alpha and beta features
google-cloud-sdk: enable alpha and beta features
2017-07-03 13:40:33 -04:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Tim Steinbach 89c5413b58
google-cloud-sdk: 159.0.0 -> 161.0.0 2017-06-30 13:14:10 -04:00
Vladimír Čunát ddf864f8aa
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
Diego Pontoriero 3dfa1d2282
google-cloud-sdk: 155.0.0 -> 159.0.0 2017-06-27 17:34:19 -07:00
Franz Pletz bf08c50cbc
cli53: fix eval 2017-06-22 02:00:10 +02:00
Franz Pletz 6338c50a84
Merge branch 'master' into staging 2017-06-22 00:41:25 +02:00
Domen Kožar 843b3faa18
Revert "cli53: 0.4.4 -> 0.8.8"
This reverts commit c25b145815.
2017-06-20 14:04:14 +02:00
Domen Kožar 8ae8e51dc3
Revert "fix eval"
This reverts commit 650f64c779.
2017-06-20 14:03:57 +02:00
Domen Kožar 650f64c779
fix eval 2017-06-20 14:01:53 +02:00
Franz Pletz c9268482e0
lxd: 2.12 -> 2.14 2017-06-20 03:45:48 +02:00
Jörg Thalheim 8b8a9b695a
cli53: add missing deps.nix 2017-06-18 13:23:30 +01:00
Jörg Thalheim 2c5de11979
cli53: fix meta 2017-06-18 13:14:10 +01:00
Jörg Thalheim c25b145815
cli53: 0.4.4 -> 0.8.8 2017-06-18 11:25:41 +01:00
Jörg Thalheim d7f6367471
daemontools: fix build 2017-05-31 23:57:15 +01:00
Bastian Köcher 179c504a66 lxd: 2.0.2 -> 2.12 (#25685)
* Upgrades lxd to version 2.12

* Adds missing packages to path for lxd
2017-05-24 19:29:38 +01:00
Stefan Lau b1a6442c24 google-cloud-sdk: Fix calls to itself 2017-05-21 13:54:33 +02:00
Stefan Lau b6fabe24fd google-cloud-sdk: 151.0.0 -> 155.0.0 2017-05-21 13:54:09 +02:00
Aneesh Agrawal c392d1f9c9 salt: 2016.11.4 -> 2016.11.5 2017-05-19 05:05:14 -04:00
Aneesh Agrawal 779ae06467 Add salt master module (#25632)
* salt: 2016.11.2 -> 2016.11.4

* salt: Add master NixOS module
2017-05-09 18:20:35 +01:00
Jörg Thalheim 63b294eb0c
tigervnc: 1.8.0pre20170211 -> 1.8.0pre20170419 2017-05-07 09:38:42 +01:00
jeaye ae878851f2
simp_le: 0.1.1 -> 0.2.0
The release is here:
https://github.com/zenhack/simp_le/releases/tag/0.2.0

This is needed, since the existing package is broken. See this
https://github.com/kuba/simp_le/issues/120 for reference.
2017-04-22 17:46:35 -07:00
Jörg Thalheim 73c8797d16 gce/create-gce.sh: rewrite using nix-shell shebang and bash (#24869)
* google-cloud-sdk: 150.0.0 -> 151.0.0

- gce/create-gce.sh: rewrite using nix-shell shebang and bash
- allows to run the script without being the same directory
- nix-shell install google-cloud-sdk
- some shellcheck cleanups and scripting best practice
- gce/create-gce.sh: do not clobber NIX_PATH: this allows NIX_PATH to be overwritten to build a different release
- gce/create-gce.sh: remove legacy hydra option
2017-04-13 13:42:28 +02:00
Aristid Breitkreuz 94214467ff google-cloud-sdk: 148.0.1 -> 150.0.0 2017-04-08 10:57:33 +02:00
Tim Steinbach 73c7649708
google-cloud-sdk: 138.0.0 -> 148.0.1 2017-03-27 13:28:56 -04:00
Pierre Radermecker de363e8706 pepper: add 'pierrer' as a maintainer 2017-03-09 10:44:39 +01:00
Jörg Thalheim 83fa5738d5 pepper: disable tests 2017-03-09 08:05:13 +01:00
Pierre Radermecker ee4e630648 salt-pepper: init at 0.5.0 2017-03-09 00:18:07 +01:00
Robin Gloster 183eeb3c0f
simp_le: fix meta.homepage 2017-02-20 16:06:17 +01:00
Robin Gloster 464529c603
simp_le: 2016-12-16 -> 0.1.1 2017-02-20 12:48:42 +01:00
rushmorem 87cf2231fa intecture-agent: init at 0.3.0 2017-02-19 03:49:33 +02:00
rushmorem 31d4b7b830 intecture-auth: init at 0.1.0 2017-02-19 03:20:37 +02:00
rushmorem af6c722a7b intecture-cli: init at 0.3.2 2017-02-19 02:35:47 +02:00
Robin Gloster 72cda1667b
certbot: 0.9.3 -> 0.11.1 2017-02-17 00:14:04 +01:00
Michael Raskin 2155b1eaba Merge pull request #22827 from peterhoeg/u/gtkvnc
gtk-vnc: 0.6.0 -> 0.7.0
2017-02-15 14:36:33 +00:00
Peter Hoeg bf86a268df gtk-vnc: 0.6.0 -> 0.7.0 2017-02-15 21:00:49 +08:00
Philipp 01e5b8527d dehydrated: 0.3.1 -> 0.4.0 (#22804) 2017-02-15 07:05:22 +01:00
Parnell Springmeyer 9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Michael Raskin 909a1dd569 tigervnc: 1.7.1 -> 1.8.0pre20170211
This allows to build with X.org server 1.19.1
2017-02-13 15:30:19 +01:00
lufia 2e648bdacf google-cloud-sdk: support x86_64-darwin 2017-02-13 15:06:21 +01:00
Graham Christensen 379144f54b
salt: 2016.3.3 -> 2016.11.2 for multiple CVEs
From the Arch Linux advisory:

- CVE-2017-5192 (arbitrary code execution): The
  `LocalClient.cmd_batch()` method client does not accept
  `external_auth` credentials and so access to it from salt-api has
  been removed for now. This vulnerability allows code execution for
  already- authenticated users and is only in effect when running
  salt-api as the `root` user.

- CVE-2017-5200 (arbitrary command execution): Salt-api allows
  arbitrary command execution on a salt-master via Salt's ssh_client.
  Users of Salt-API and salt-ssh could execute a command on the salt
  master via a hole when both systems were enabled.
2017-02-08 21:24:10 -05:00
Graham Christensen d66fa9acfd
tigervnc: 1.7.0 -> 1.7.1 for CVE-2017-5581 2017-02-03 07:34:25 -05:00
Parnell Springmeyer 4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Robin Gloster c8982c015c
salt: fix patch after upstream code change
fixes #20458
2016-12-23 12:29:35 +01:00
Hoang Xuan Phu 5a31ad1bbf
simp_le: switch to zenhack/simp_le
kuba/simp_le seems unmaintained.
fixes #21174
2016-12-21 12:11:04 +01:00
Hoang Xuan Phu 17322ca4fd
certbot: 0.6.0 -> 0.9.3 2016-12-21 12:04:56 +01:00
Rickard Nilsson 327a650f09 google-cloud-sdk: 134.0.0 -> 138.0.0 2016-12-19 09:05:45 +01:00
Jörg Thalheim 8aecafcf5e tigervnc: fix missing Xvnc (xauth) (#21110)
the xorg patch was not applied.
Also a different root for `make install` is needed.
In addition more unnessary option are disabled.
2016-12-13 17:27:23 +01:00
Tristan Helmich c8c6ff4a96 simp_le: bump acme dependency to newer version
acme_0_5_0 is no longer working and removed in another commit
2016-12-12 16:26:28 +01:00
Mikael Brockman d2fc461f6b
awslogs: init at 0.7
fixes #20921
2016-12-06 10:56:54 +01:00
Travis Whitaker 39ad303e21 tigervnc: 1.6.0 -> 1.7.0 2016-11-19 23:34:53 -08:00
Vladimír Čunát b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Aristid Breitkreuz 8600e38bca google-cloud-sdk: add assertion for x86/x86-64 Linux 2016-11-13 11:56:25 +01:00
Aristid Breitkreuz ed9b1c673b google-cloud-sdk: 122.0.0 -> 134.0.0 2016-11-13 11:38:35 +01:00
Frederik Rietdijk dd5256993e certbot: use python2 2016-11-08 22:48:54 +01:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Philipp 5c3a6d6802 Added package for dehydrated. (#19651)
* Added package for dehydrated.
2016-10-20 13:32:05 +02:00
Frederik Rietdijk 6b724f069b cli53: use python2 2016-10-18 23:16:07 +02:00
Aneesh Agrawal 1d9a98cae0 salt: use Python 2 2016-10-18 23:14:36 +02:00
Eelco Dolstra 69bb34673e Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
2016-10-03 17:12:59 +02:00
Alexander Ried e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Alexander Ried da658b98ce gtk-vnc: 0.5.3 -> 0.6.0
gtk3 build is now default
2016-10-01 17:14:31 +02:00
Alexander Ried ecd80b9a0e gtk-vnc: remove gtk2 support (unused) 2016-10-01 17:14:31 +02:00
Aneesh Agrawal 7b7d8ddbca salttesting: remove unused package
It was added as a dependency of Salt, which no longer depends on it.
2016-09-27 13:34:22 -04:00
Frederik Rietdijk 982ac542cb cli53: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Frederik Rietdijk d07270649c gtk-vnc: do not use top-level python packages 2016-09-25 23:19:40 +02:00
Aneesh Agrawal 34b5d639c6 SaltTesting: 2015.7.10 -> 2016.9.7 2016-09-23 20:33:36 -04:00
Aneesh Agrawal f61b23cd23 salt: 2015.8.8 -> 2016.3.3 2016-09-23 20:31:20 -04:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Rickard Nilsson f25006bfaf google-cloud-sdk: 113.0.0 -> 122.0.0 2016-08-24 13:19:38 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen b61fbf3132 treewide: Fix output references to openssl 2016-08-23 04:53:27 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Ram Kromberg 363fac7da7 gtk-vnc: vala -> vala_0_23 2016-08-21 20:17:14 +03:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Kamil Chmielewski da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Franz Pletz e55aa50175 simp_le: apply patch to update TOS hash
Fixes #17455.

Also see https://github.com/kuba/simp_le/issues/114.
2016-08-02 21:21:02 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Zack Piper bd1e99a5ed lxd: 2.0.0.rc4 -> 2.0.2 2016-06-19 20:21:03 +01:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rickard Nilsson 548a136345 google-cloud-sdk: 109.0.0 -> 113.0.0 2016-06-10 09:07:01 +00:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski a1f3808e2f lxd: extracted from goPackages 2016-06-09 11:21:30 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Franz Pletz d580b0ac0c simp_le: needs acme 0.5.0 2016-05-22 22:47:52 +02:00
Tobias Geerinckx-Rice 9414e2d536
certbot: 0.5.0 -> 0.6.0; rename from letsencrypt 2016-05-21 13:52:28 +02:00
Joachim Fasting 488de71921 Merge pull request #15433 from zimbatm/google-gloud-sdk-109
google-cloud-sdk: 106.0.0 -> 109.0.0
2016-05-18 19:09:52 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
zimbatm 0208e92577 google-cloud-sdk: 106.0.0 -> 109.0.0 2016-05-13 12:48:04 +01:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
zimbatm 89675e4a07 Merge pull request #15371 from groxxda/bump/simp_le
simp_le: 2016-02-06 -> 2016-04-17
2016-05-10 22:17:29 +01:00
Alexander Ried 988b151fa1 letsencrypt: 0.4.0 -> 0.5.0
seems like the dependency on gnureadline is more or less optional for
letsencrypt itself but the tests will not pass without it
2016-05-10 22:16:11 +01:00
Alexander Ried 8335c68543 simp_le: 2016-02-06 -> 2016-04-17
suports acme 0.5
2016-05-10 21:54:21 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Frederik Rietdijk d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Joachim Fasting 0f9058365a Merge pull request #12521 from zopa/master
google-cloud-sdk: Add various modules to python path
2016-04-22 22:35:59 +02:00
Arseniy Seroka 9a1a6a0c0c Merge pull request #14865 from moretea/update_google_sdk
google-cloud-sdk: 0.9.82 -> 106.0.0
2016-04-21 19:04:11 +03:00
Maarten Hoogendoorn dbd88d8778 google-cloud-sdk: 0.9.82 -> 106.0.0 2016-04-21 11:45:05 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Kevin Cox 08a035725f daemontools: init at 0.76 (#14675) 2016-04-14 01:32:52 +01:00
Michael Raskin c2d9c35ebd tigervnc: fix build by adding dependencies 2016-04-13 15:21:11 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Aneesh Agrawal 270c0eb097 salt: init at 2015.8.8
Also init salttesting at 2015.7.10 as a build dependency.
2016-04-02 19:37:38 -04: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
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Svein Ove Aas 4b998c1f94 simp_le: 2016-01-09 -> 2016-02-06 2016-03-11 12:43:46 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
zimbatm 5f4417e0cf pythonPackages.acme_0_1: init at 0.1.0
`acme_0_1` is introduced because `simp_le` strictly depends on version 0.1.0
of the library (which is now at 0.4.0).
2016-03-03 18:47:02 +00:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Benjamin Staffin 8104b8ff1d letsencrypt: 0.1.0 -> 0.4.0
Closes #12123
2016-02-26 18:03:07 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Robin Gloster d43078b15b webdruid: remove
It used the old builderDefsPackage and segfaulted on startup. Could not
fix it and has not been touched for 6 years.
2016-01-30 20:31:02 +00:00
Robin Gloster f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz 954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00