Commit graph

402 commits

Author SHA1 Message Date
WilliButz 400484008c
oxidized: temperature patch for x-series 2018-05-24 04:40:45 +02:00
WilliButz dc433b476e
oxidized: init at 0.21.0 2018-05-24 04:40:45 +02:00
Matthew Justin Bauer e5861b8e0d
tigervnc: add makeWrapper to nativeBuildInputs
Fixes #40654
2018-05-17 10:27:08 -05:00
xeji 8f259f3e32
Merge pull request #40277 from peterhoeg/f/ansible
ansible: update point releases and unify build
2018-05-12 17:49:00 +02:00
R. RyanTM 899bb98166 salt: 2017.7.4 -> 2018.3.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/salt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm --help’ got 0 exit code
- found 2018.3.0 with grep in /nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0
- directory tree listing: https://gist.github.com/e33aa60ebbbc7b62d8ac84faff16ce6d
2018-05-12 14:50:15 +02:00
adisbladis f90d8d5da2
Merge pull request #40115 from r-ryantm/auto-update/certbot
certbot: 0.23.0 -> 0.24.0
2018-05-11 12:14:13 +08:00
Peter Hoeg efbeca76fe ansible: drop 2.1, 2.2 and 2.3 as they are EOL 2018-05-10 23:11:37 +08:00
Peter Hoeg 06e394bbb4 ansible: update point releases and unify build
1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
2018-05-10 23:11:37 +08:00
Sarah Brofeldt 199e7f18ed bluemix: Fix eval of maintainers 2018-05-08 11:53:33 +02:00
Vincent Ambo a8768c610e bluemix-cli: init at 0.6.6 (#40147)
Adds the (non-free, binary) IBM Bluemix CLI which is required to
administrate IBM Bluemix services.
2018-05-08 09:22:25 +01:00
R. RyanTM 335931b012 certbot: 0.23.0 -> 0.24.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/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --version’ and found version 0.24.0
- found 0.24.0 with grep in /nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0
- directory tree listing: https://gist.github.com/ecc49ff604fc592bc8d187e494c0e9cc
2018-05-07 05:13:43 -07:00
Josef Kemetmüller b2e9f0fd37 salt: Fix build
We use tornado-4.x until https://github.com/saltstack/salt/issues/45790
is resolved.
2018-05-03 01:02:21 +02:00
Pascal Wittmann e96dc327c8
Merge pull request #39674 from pstn/dehydrated-bump
dehydrated: 0.6.1 -> 0.6.2
2018-04-30 08:29:39 +02:00
Maximilian Bosch 0e5eafc1fd
awscli: 1.14.50 -> 1.15.10; fix build
As reported in #39676 the build broke because of ca52152 as the bump of
`pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies
in `awscli`.

In order to reduce the risk of accidental bugs because of loosened
version constraints I bumped the AWS CLI to `1.15.10` which depends on
`botocore@1.10` as well.

Fixes #39676
2018-04-29 17:40:18 +02:00
Philipp Steinpass 2085b88c01 dehydrated: 0.6.1 -> 0.6.2 2018-04-29 17:19:20 +02:00
Robert Schütz e59eb49a0a
simp_le: drop upper bound of acme requirement (#39263) 2018-04-20 19:40:38 +02:00
Tim Steinbach 8cd80f3871
ansible: 2.5.0 -> 2.5.1 2018-04-19 21:36:55 -04:00
Yegor Timoshenko 443af66526
Merge pull request #38109 from sengaya/add-ansible25
ansible_2_5: init at 2.5.0
2018-04-19 16:57:16 +00:00
Matthew Justin Bauer e42116449a
Merge pull request #38744 from r-ryantm/auto-update/certbot
certbot: 0.22.2 -> 0.23.0
2018-04-18 22:16:41 -05:00
Peter Romfeld 0d88a2becf fastlane: 2.80.0 -> 2.91.0 2018-04-16 11:41:26 +08:00
Jörg Thalheim f5866564c8
Merge pull request #38897 from suvash/add-iamy
iamy: init at 2.1.1
2018-04-15 22:14:21 +01:00
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