3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

866 commits

Author SHA1 Message Date
Nikolay Amiantov d75a3cfb29 Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
2017-01-20 12:09:17 +03:00
Nikolay Amiantov 1db8ab66e3 opencl-info: init at 2014-02-21 2017-01-20 03:37:51 +03:00
Jörg Thalheim 068c9c6c53
r10k: use gemdir 2017-01-18 00:52:47 +01:00
Frederik Rietdijk 2445119d5a bootchart: use python2 2017-01-11 18:25:10 +01:00
Maurizio Di Pietro ba9803079c chase: avoided using fq attribute names 2017-01-06 11:00:43 +01:00
Graham Christensen 6a68b95266
chase: correct download URL
I broke the change after changing the name from chase_ to chase-. Sorry!
2017-01-04 06:43:06 -05:00
Graham Christensen fa89f84c54
maintainers: rename mdipietro to polyrod to match their github name 2017-01-03 20:39:20 -05:00
Maurizio Di Pietro e0878ce316
chase: init at 0.5.2 2017-01-03 20:32:59 -05:00
Vladimír Čunát 1fe136ea8a
Make all meta.maintainers attributes lists
(cherry picked from commit b714f55239)
The two new changes were really missing on master.
2017-01-03 18:28:20 +01:00
Michael Raskin 5ce78bdd03 dd_rescue: 1.99 -> 1.99.5 2017-01-02 20:18:50 +01:00
Michael Raskin 8dc53b17ea ipmiutil: 3.0.0 -> 3.0.1 2017-01-02 20:18:48 +01:00
Bruno Bzeznik 8f3e3d2576 ior: init at 3.0.1 2016-12-16 23:12:42 +01:00
Michael Raskin 9ad8afbf66 freeipmi: 1.5.4 -> 1.5.5 2016-12-08 16:15:18 +01:00
Vladimír Čunát 1960fb5275
pciutils: 3.5.1 -> 3.5.2 2016-12-03 11:07:49 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Vladimír Čunát ceda8cb203
pciutils: fixup finding modules to libkmod's way
Fixes #20683.
2016-11-24 16:50:56 +01:00
Vladimír Čunát 516f839c0d
Revert "pciutils: fixup finding modules to libkmod's way"
This reverts commit 286c836b3f.
It's bigger rebuild than I expected, I'm sorry.  Moving to staging.
2016-11-24 16:50:20 +01:00
Vladimír Čunát 286c836b3f
pciutils: fixup finding modules to libkmod's way
Fixes #20683.
2016-11-24 16:46:28 +01:00
Nikolay Amiantov c240000451 thermald: 1.5.3 -> 1.5.4 2016-11-24 01:17:59 +03:00
Graham Christensen 1376aeba42
monit: 5.19.0 -> 5.20.0 for CVE-2016-7067 2016-11-17 08:45:56 -05:00
Tim Steinbach 29f679d32e Merge pull request #19861 from womfoo/fix/netdata
netdata: allow execution without a config file
2016-11-02 19:45:21 -04:00
Bjørn Forsman 03200ab74b sg3_utils: 1.31 -> 1.42 2016-11-01 22:34:41 +01:00
Kranium Gikos Mendoza 8ce23cfec2 netdata: allow execution without a config file 2016-10-25 23:09:18 +08:00
Kranium Gikos Mendoza 237c15d883 netdata: allow UI to load when running as non-root 2016-10-25 22:56:15 +08:00
zimbatm cdbb020a1f fixes bundlerEnv calls 2016-10-14 16:56:42 +01:00
Tim Steinbach 2cfe0407b8 Merge pull request #19545 from derchrisuk/netdata
netdata: 1.0.0 -> 1.4.0
2016-10-14 09:27:13 -04:00
derchris 0acd3b3b42 netdata: 1.0.0 -> 1.4.0 2016-10-14 12:05:42 +02:00
zimbatm 1657d28895 hiera-eyaml: simplify 2016-10-08 22:38:56 +01:00
zimbatm 194ac466ee foreman: simplify 2016-10-08 22:38:56 +01:00
Nicolas Mattia 86c78073d8 r10k: remove unused docker dependency 2016-10-03 19:50:16 +02:00
Michael Raskin 5e882ea558 freeipmi: 1.5.3 -> 1.5.4 2016-10-03 17:35:18 +02:00
Nicolas Mattia e3f4ea02c9 r10k: init at 2.4.3 2016-10-02 21:10:56 +02:00
Michael Raskin a430a38f17 ipmiutil: 2.9.9 -> 3.0.0 2016-09-26 15:49:29 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Corbin Simpson edddd76165 collectd: patch deprecated usage of readdir_r() (#18956) 2016-09-25 19:52:55 +02:00
Arseniy Seroka f528ff3751 Merge pull request #18916 from Mic92/monit
monit: 5.10 -> 5.19.0
2016-09-25 01:03:32 +04:00
Franz Pletz 63052c1126
collectd: 5.5.2 -> 5.6.0 2016-09-24 15:33:31 +02:00
Jörg Thalheim 6b34a62ef8
monit: 5.10 -> 5.19.0
monit disables SSLv23 now by default, see

- https://mmonit.com/monit/changes/
- https://lwn.net/Vulnerabilities/691497/
2016-09-24 09:46:25 +02:00
Robin Gloster 4ec5e729c4
systemd-journal2gelf: fix after godeps changes 2016-09-19 00:08:21 +02:00
Robin Gloster 5650c92b01
systemd-journal2gelf: init at 20160414 2016-09-19 00:08:19 +02:00
Daiderd Jordan a167cd99f2 Merge pull request #18482 from aske/lshw
lshw: 02.17b -> 02.18b
2016-09-17 10:58:47 +02: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
aske 8233618691 lshw: 02.17b -> 02.18b 2016-09-14 02:26:31 +03:00
Kirill Boltaev 0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen 81eb0c20f8 honcho: Fix hash 2016-09-06 21:58:42 +03:00
Chris Martin c7a5edcb7c honcho: md5->sha256 2016-09-05 20:08:10 -04:00
Ram Kromberg c40578ccbb plan9port 2015-11-10 -> 2016-04-18 (#18228) 2016-09-04 14:52:34 +02:00
Susan Potter a8129aeaf7 rsyslog: 8.17.0 -> 8.21.0 2016-09-03 16:03:28 -05:00
Kranium Gikos Mendoza 0bdec3194a vboot_reference: fix build (#18211) 2016-09-02 12:13:00 +02:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Ram Kromberg e852a8e8b6 plan9port: 2015-06-29 -> 2015-11-10 2016-08-31 08:58:45 +03:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Joachim Fasting 525b250052
runit: optionally build static runit{,-init}
May be useful in initrd along with statically linked busybox.
2016-08-29 04:08:38 +02:00
Kranium Gikos Mendoza 3cca873b15 facter: 3.1.8 -> 3.4.1 2016-08-29 08:56:34 +08:00
Robin Gloster b46b0381b6 evemu: remove obsolete substituteInPlace and use autoreconfHook 2016-08-28 14:02:22 +00: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
Joachim Fasting ac193edd2d
runit: support building with clangStdenv 2016-08-27 11:49:26 +02:00
Joachim Fasting 84f73f1e2e
runit: refactor, add man output 2016-08-26 18:12:41 +02:00
Franz Pletz 6324e8ef15 stress-ng: 0.06.11 -> 0.06.14, fix i686 build 2016-08-25 05:01:40 +02:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Franz Pletz 415e1983ca collectd: Fix build on Glibc 2.24 2016-08-23 19:17:36 +02: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
obadz 15b07f4b8e efibootmgr: 0.12 -> 13
Fixes glib 2.24 build issues
2016-08-21 12:02:36 +01:00
Vladimír Čunát cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
obadz e82ffa5612 efivar: 0.23 -> 27
Fixes glib 2.24 build issues
Patch no longer required
2016-08-20 15:05:38 +01:00
Dan Peebles b7b2019e62 proot: fix static build 2016-08-19 21:41:21 +00:00
Matthew Bauer cf69e6d870 yeshup: only build on linux
It uses the linux-only sys/prctl.h header.
2016-08-16 19:25:46 +00:00
Matthew Bauer c92227f5cc smartmontools: fix darwin build
needs IOKit
2016-08-16 19:25:46 +00:00
Matthew Bauer 1138b5dc7e tm: fix darwin build 2016-08-16 19:25:44 +00:00
Matthew Bauer 51085c0681 hardlink: fix darwin build 2016-08-16 19:25:41 +00:00
Matthew Bauer 738b0a39d7 dog: fix darwin build 2016-08-16 19:25:41 +00:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Luca Bruno 909b036b47 Merge pull request #16610 from leenaars/datefudge
Datefudge
2016-08-12 22:10:59 +01:00
zimbatm c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00: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
Michael Raskin beaee69795 freeipmi: 1.5.2 -> 1.5.3 2016-08-11 17:57:35 +02:00
Michiel Leenaars b250898855 datefudge: init at 1.2.1 2016-08-09 14:58:16 +02:00
Robert Helgesson 28f17215b9
wsmancli: fix compilation
Without this the package build fails with a linking error. Fixes #14872.
2016-08-07 19:28:51 +02:00
Franz Pletz a3f6ca6d17 collectd: 5.5.1 -> 5.5.2 (security)
Fixes CVE-2016-6254.
2016-08-05 04:07:31 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster 1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Matthew Justin Bauer 2ae5dbbf3b acct: only build on linux 2016-08-01 15:12:31 -05:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
mimadrid 0a9eba2aa4
htop: 2.0.1 -> 2.0.2 2016-07-23 00:03:34 +02:00
Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Tuomas Tynkkynen 584b667efc ddrescue: lzip is a nativeBuildInput 2016-07-20 02:38:10 +03:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Kranium Gikos Mendoza 121a8c0646 stress-ng: 0.06.01 -> 0.06.11 2016-07-15 00:06:54 +08:00
joachifm 03a7fa9104 Merge pull request #16840 from womfoo/bump/leatherman-0.7.5-facter-3.1.8
Bump leatherman: 0.7.0 -> 0.7.5 and sole dependency facter 3.1.6 -> 3.1.8
2016-07-12 16:20:51 +02:00
Kranium Gikos Mendoza 356b3ae546 facter: 3.1.6 -> 3.1.8 2016-07-10 23:37:05 +08:00
Tobias Geerinckx-Rice 0385abbc70
di: 4.37 -> 4.42; trim meta.description 2016-07-05 09:29:42 +02:00
Joachim Fasting 966c75ef0c
evemu: add meta.platforms 2016-07-05 00:54:12 +02:00
Damien Cassou 0b80e03904 evemu: 2.0.0 -> 2.4.0 2016-07-04 15:19:03 +02:00
Christian Kauhaus 0c0f068f35
cron: fix crontab(5) and cron job PATH
Switch off HAVE_SAVED_UIDS since it activates a code path for temporary
privilege dropping which does not work on NixOS.

Vixie-cron's sources ship with two implementations. Unfortunately, the
one activated by HAVE_SAVED_UIDS (using setuid()) does not work on
NixOS. Saved UIDs work only if the program which is using them has the
setuid bit set on its own executable, not if called from a setuid
wrapper (as we do it in NixOS). The other implementation (using
setreuid()) works without problems.

Quote from
<http://stackoverflow.com/questions/8499296/realuid-saved-uid-effective-uid-whats-going-on>:

    If you're euid is root and you change the uid, the privileges gets
    dropped permanently.If effective user id is not root then saved user
    id is never touched and you can regain the root privilege back
    anytime you want in your program.

Also extend the default PATH with NixOS-specific bin directories as
vixie-cron's default is not really usable on NixOS.

Re #16518

Closes #16522
2016-07-02 00:09:07 +02:00
Arseniy Seroka 188ecd633e Merge pull request #16489 from mimadrid/update/fio-2.12
fio: 2.9 -> 2.12
2016-06-25 13:37:31 +03:00
mimadrid 49902897f2
fio: 2.9 -> 2.12 2016-06-25 11:06:16 +02:00
Kyle McKean 544d9a7620 collectd: add snmp support 2016-06-23 16:54:28 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Benjamin Staffin 68689f4d8e hiera-eyaml: init at 2.1.0 2016-06-15 20:19:06 -04:00
Joachim Fasting 70c5ab532f Merge pull request #16110 from womfoo/augeas
augeas: 1.2.0 -> 1.5.0
2016-06-13 16:46:08 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kranium Gikos Mendoza cc05622761 augeas: 1.2.0 -> 1.5.0 2016-06-10 10:23:44 +08:00
rushmorem 6e709b180e storebrowse: mark broken
`storebrowse` depends on https://code.google.com/archive/p/gosqlite/
which leads to gosqlite.googlecode.com/hg/sqlite which now 404s.
2016-06-09 22:09:07 +02:00
Kamil Chmielewski 8cd1d4cda5 buildGoPackage: use Go 1.6 by default 2016-06-09 13:08:10 +02:00
Kamil Chmielewski 734d152977 buildGo16Packages: fetchgit -> fetchFromGitHub 2016-06-09 13:08:10 +02:00
Kamil Chmielewski bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski 9e273d5b29 consul--template: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski abcec97b1e confd: extracted from goPackages 2016-06-09 11:22:02 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
michael bishop 85b87796ae
runit: fix closure size 2016-06-03 06:46:54 -03:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Frederik Rietdijk 373455e237 Merge pull request #15613 from womfoo/facter
facter: 3.1.5 -> 3.1.6 (add ruby support) and dependency leatherman: 0.4.2 -> 0.7.0
2016-05-28 15:29:31 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Michael Raskin cfdf0d5a79 freeipmi: 1.5.1 -> 1.5.2 2016-05-25 16:00:57 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Eelco Dolstra 64f22ddd64 pciutils: 3.4.1 -> 3.5.1 2016-05-22 23:05:25 +02:00
Kranium Gikos Mendoza ccb3ade7c2 facter: ruby support 2016-05-22 18:44:54 +08:00
Kranium Gikos Mendoza 7c4438dcf9 facter: 3.1.5 -> 3.1.6 2016-05-22 18:44:54 +08:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +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
Franz Pletz e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained
Update unmaintained packages
2016-05-16 23:45:11 +02: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
Matthias Beyer 5f76761dc2 daemonize: 1.7.6 -> 1.7.7 2016-05-16 16:12:18 +02:00
Vladimír Čunát e5d40c6fa3 Merge branch 'staging'
Hydra is only half-finished, but we'd better get secure glibc fast.
2016-05-16 10:15:28 +02:00
Joachim Fasting ca730d4452
fio: 2.2.11 -> 2.9
This fixes the build against linux 4.4 headers; see
https://hydra.nixos.org/build/35697941/log/raw

Also set `platforms.unix` per what upstream claims.
2016-05-16 01:06:00 +02:00
Michael Raskin 916c6cf1ad ipmiutil: 2.9.8 -> 2.9.9 2016-05-15 23:49:44 +02:00
Joachim Fasting a11b0bc515
efivar: fix build against linux 4.4 headers 2016-05-15 19:39:18 +02:00
Joachim Fasting 0a8d1627ec
Revert "efivar: fix build after #15449"
This reverts commit 21d09bcb71.
2016-05-15 19:30:39 +02:00
Vladimír Čunát 21d09bcb71 efivar: fix build after #15449
I don't know why it matters here; the error was:
linux.c:25:24: fatal error: linux/nvme.h: No such file or directory
2016-05-15 18:21:06 +02:00
Tobias Geerinckx-Rice 45f70fcb06
stress-ng: 0.06.00 -> 0.06.01 2016-05-08 19:42:49 +02:00
Tobias Geerinckx-Rice 519d99f975
thinkfan: 0.9.2 -> 0.9.3; add myself as a maintainer
CC maintainer @iElectric.
2016-05-08 00:44:49 +02:00
Tobias Geerinckx-Rice 39421df56a
stress-ng: 0.05.25 -> 0.06.00
Changes: https://launchpad.net/ubuntu/+source/stress-ng/0.06.00-1.
2016-05-06 19:17:07 +02:00
Tobias Geerinckx-Rice d6e4c1b750
thinkfan: install manual, README and examples
READMEs usually just waste those precious kilobytes, but both the
manual page and --help output refer to this one quite a bit.
2016-05-04 00:39:51 +02:00
Franz Pletz 4825d4033e ddrescue: 1.20 -> 1.21 2016-05-03 16:15:20 +02:00
Franz Pletz b5fdb8585b di: 4.36 -> 4.37 2016-05-03 16:15:20 +02:00
Franz Pletz 47a7b42d51 collectd: 5.5.0 -> 5.5.1 2016-05-03 16:15:20 +02:00
Tobias Geerinckx-Rice 95aab50e81
efivar: 0.21 -> 0.23 2016-05-03 03:50:13 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00