Commit Graph

421 Commits

Author SHA1 Message Date
Will Dietz
84634a3b91 bison: 3.2.1 -> 3.2.2 2018-11-23 17:07:55 -06:00
Frederik Rietdijk
0d0d7dcd06 Merge staging-next into staging 2018-11-18 10:41:34 +01:00
Will Dietz
b76d11e1a5 bison: 3.1 -> 3.2.1 (#49454)
3.2: http://lists.gnu.org/archive/html/info-gnu/2018-10/msg00008.html
3.2.1: http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00005.html
2018-11-15 20:02:32 +00:00
Matthew Bauer
bfbfe941ab treewide: use scons setup hook
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
2018-11-13 19:14:10 -06:00
Markus Kowalewski
3455f378c9
peg: add license 2018-11-08 20:54:07 +01:00
R. RyanTM
d47f732428 bison: 3.0.5 -> 3.1 (#45843)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
bison
2018-09-27 21:05:13 +02:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Markus Kowalewski
f9a1aef084
flex: add license 2018-08-16 21:51:07 +02:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Benjamin Hipple
34d7a370c1 antlr: fix license
See #43716
2018-08-11 13:43:56 +00:00
Jan Malakhovski
65b4ff488b flex_2_5_35: make tests run, but disable 2018-08-11 09:35:29 +00:00
Jan Malakhovski
2dd797a1d2 bison: use checkInputs 2018-08-11 09:35:25 +00:00
Jan Malakhovski
d3b15144a7 flex, flex_2_6_1: fix tests 2018-08-11 09:35:22 +00:00
Jan Malakhovski
2a9eff8502 re2c: fix tests 2018-08-11 09:35:21 +00:00
Jan Tojnar
f07203656b
antlr4_7.runtime.cpp: init at 4.7.1 2018-08-09 17:36:50 +02:00
Tuomas Tynkkynen
008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
Robert Schütz
f0702c62a6 antlr: explicitly use python2
Also, put python2 into nativeBuildInputs because Arch lists it in makedepends.
2018-08-03 20:01:51 +02:00
John Ericson
25348b27c5 flex: Clean up to use less bash 2018-08-02 15:12:45 -04:00
John Ericson
1833a04aed flex: Don't use crossAttrs 2018-07-24 19:40:46 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer
a4476912f8
Merge pull request #42722 from thefloweringash/bison2-darwin
bison2: Fix Darwin runtime crash
2018-07-05 11:42:39 -04:00
Vladimír Čunát
f7781f5293
Merge branch 'master' into staging 2018-06-30 01:41:59 +02:00
Will Dietz
a8ae782cac bison: 2.7 -> 2.7.1 (#42726)
https://lists.gnu.org/archive/html/info-gnu/2013-04/msg00007.html

Been available for a while (2013), but seems good idea to update.
2018-06-28 23:34:52 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Andrew Childs
f29fa2098c bison2: Fix Darwin runtime crash 2018-06-28 18:06:25 +09:00
R. RyanTM
98030eee15 byacc: 20180525 -> 20180609
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/rngxfbcnpk0n5v16msm7dhg609xfg5jp-byacc-20180609/bin/yacc passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180609 with grep in /nix/store/rngxfbcnpk0n5v16msm7dhg609xfg5jp-byacc-20180609
- directory tree listing: https://gist.github.com/a6550f00724283aca52496de32c95794
- du listing: https://gist.github.com/85e15144de69a0381160d89701d1b858
2018-06-14 16:27:01 -07:00
Vladimír Čunát
52fdec3c1d
bison: drop non-applying patch on Darwin
The Darwin case seems newly fixed in the tarballs now.
Beware: the affected file is *not* in bison's git repo (gitignored),
but it is in tarballs and is used during build (yummy!)
2018-06-02 11:33:22 +02:00
Orivej Desh
4b2735fd9f Merge branch 'master' into staging
* master: (153 commits)
  coqPackages.contribs.aac-tactics: enable for Coq 8.7 and 8.8 (#41351)
  haskell.packages.ghcjs.terminfo: Bump version (#41337)
  nixos/mpd: allow services.mpd.dbFile to be null
  prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363)
  tdesktopPackages.preview: 1.2.24 -> 1.3.0
  signal-desktop: Refactor the package description
  rrootage: init at 0.23a
  bulletml: init at 0.0.6
  signal-desktop: Fix a possible crash when saving an attachment
  linux_rpi: More downstream device tree name fixups
  nixos/sd-image-raspberrypi: Support Raspberry Pi Zero
  U-Boot: Add ubootRaspberryPiZero variant
  U-Boot: 2018.03 -> 2018.05
  linux_rpi: 1.20171029 -> 1.20180417
  raspberrypifw: 1.20180328 -> 1.20180417
  scite: 3.7.5 -> 4.0.5 (#41345)
  neo4j: 3.3.4 -> 3.4.0 (#41338)
  bat: 0.3.0 -> 0.4.1 (#41348)
  perlPackages.Git: init at 0.42
  nodePackages_8_x.pnpm: wrap nodejs.passthru.python
  ...
2018-06-01 17:44:35 +00:00
R. RyanTM
0fbc3451ef byacc: 20180510 -> 20180525 (#41304)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525/bin/yacc passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180525 with grep in /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525
- directory tree listing: https://gist.github.com/fffd356f1d450bf13fc3f2bf8a8f5304
- du listing: https://gist.github.com/3e8f1a51d1e20db022ff93cedc85b5a7
2018-05-31 21:47:30 +02:00
R. RyanTM
42e18cf6d1 bison: 3.0.4 -> 3.0.5 (#41302)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5/bin/bison passed the binary check.
- /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5/bin/yacc passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 3.0.5 with grep in /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5
- directory tree listing: https://gist.github.com/76c5b3a38b02115e31a48c51785d1bd3
- du listing: https://gist.github.com/566dbfdfcc7a89fa9cd11d1ddf49935c
2018-05-31 19:56:38 +02:00
Jan Malakhovski
ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
Pascal Wittmann
9dc009926f
ragel: 7.0.0.10 -> 7.0.0.11 2018-05-24 22:16:00 +02:00
John Ericson
01a525b84e Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 13:31:20 -04:00
R. RyanTM
b7a0f37c0d byacc: 20170709 -> 20180510 (#40499)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

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 20180510 with grep in /nix/store/z8i5f145zpz750hvcbjlncy8kqak8zv2-byacc-20180510
- directory tree listing: https://gist.github.com/328d2b1900cfb911e7567cabf95d80c3
- du listing: https://gist.github.com/cc161fe31193017387ae25b64829aaf2
2018-05-14 17:03:17 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthew Bauer
e51405db3e antlr: supports darwin 2018-04-09 18:35:34 -05:00
Andrew Chambers
68639325de peg: 0.1.4 -> 0.1.18 2018-04-09 12:26:01 +12:00
Daiderd Jordan
319c61c893
ragel: fix clang build
/cc ZHF #36454
2018-03-25 14:41:08 +02:00
Matthew Bauer
7e59fd5b84 antlr4: 4.7 -> 4.7.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun -h` got 0 exit code
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun --help` got 0 exit code
- ran `/nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1/bin/grun help` got 0 exit code
- found 4.7.1 with grep in /nix/store/i4ipx4vd247inysxw0ygp7smcfx5yf05-antlr-4.7.1
2018-03-17 03:53:53 -05: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
Ryan Mulligan
b402f4fc59 jshon: 20140712 -> 20160111.2
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/pdxydl7lg0pbpcmh2332yygbb7b4vbq2-jshon-20160111.2/bin/jshon help` got 0 exit code
- found 20160111.2 in filename of file in /nix/store/pdxydl7lg0pbpcmh2332yygbb7b4vbq2-jshon-20160111.2
2018-03-08 20:38:10 -08:00
Ryan Mulligan
2493064a05 re2c: 0.16 -> 1.0.3
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -h` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c --help` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c help` got 0 exit code
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -V` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c -v` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c --version` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c version` and found version 1.0.3
- ran `/nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3/bin/re2c help` and found version 1.0.3
- found 1.0.3 with grep in /nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3
- found 1.0.3 in filename of file in /nix/store/nakhmqvpq4y9jdqs0n974wqmasvsypp9-re2c-1.0.3

cc "@thoughtpolice"
2018-03-01 16:24:52 +01:00
Will Dietz
cafe25224f flex: review feedback
* top-level attributes, not crossAttrs
* use depsBuildBuild
2018-01-22 18:44:42 -06:00
Will Dietz
67be78f129 flex: patch around attempt to regen manpage, fix cross 2018-01-22 16:51:31 -06:00
Ben Gamari
715fcb4266 flex: Don't disable static while cross-compiling flex
linux-pam appears to rely on this while cross-compiling.

(cherry picked from commit 4009dd163ac30cd25833bf7eb19b5e26e75c474f)
2018-01-22 16:51:30 -06:00
Ben Gamari
e6f9e82ee4 flex: Use native dependencies where applicable
Flex needs both a C compiler for the build environment, as well as a native m4.

(cherry picked from commit 81827c0084c1a69e41894a4d38b0c0b267eaff34)
2018-01-22 16:51:30 -06: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
Will Dietz
94f06c8868 byacc: 20170201 -> 20170709
http://invisible-island.net/byacc/CHANGES.html#t20170709
2018-01-02 12:31:33 -06:00
Will Dietz
19f1fd14b3 invisible-island programs: Fix FTP URL's, use HTTPS, prefer ftp
FTP URL's should use ftp.invisible-island.net.
2018-01-02 12:31:33 -06:00
Pascal Wittmann
f63c21569f
Fix homepage links (see #30636) 2017-11-11 17:36:48 +01:00
Vladimír Čunát
3562c2cfa7
flex: add notes about the glibc-2.26 patch 2017-11-06 19:25:14 +01:00
Vladimír Čunát
6535f0bca6
flex: fix with glibc-2.26
It caused segfaults, e.g. when building doxygen.
2017-11-06 19:20:21 +01:00
Piotr Bogdan
8904ce343a fix source root locations.
These have changed following commit
c3255fe8ec.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
Vincent Laporte
b9d276bf4c
antlr4: enable more platforms 2017-10-10 07:21:58 +00:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
John Ericson
e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
John Ericson
252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04: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
Frederik Rietdijk
740d76371e Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD 2017-07-31 09:12:15 +02:00
Vladimír Čunát
25c762f2bc
flex-2.5.35: switch source URL 2017-07-30 09:46:13 +02:00
Franz Pletz
5e08c4a2cd
flex: 2.6.3 -> 2.6.4 2017-07-29 19:51:15 +02:00
volth
d50437ba3e
flex_2_5_35: fix 404 2017-07-29 19:01:07 +02:00
Dan Peebles
0419452113 Fix Darwin stdenv to work on 10.13
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Peter Hoeg
f2be840e98 re2c: minor cleanup 2017-07-09 22:43:38 +08:00
Vladimír Čunát
3a891c67fc
re2c: fix sourceRoot in a more robust way
Reverting ee5a17514c would also work.
The temporary confusion was due to #26877 changes.
2017-07-09 10:40:11 +02:00
Karn Kallio
ee5a17514c re2c : Fix build by adjusting sourceRoot. 2017-07-09 07:36:51 +00:00
John Children
ea440eae21 antlr4_7: init at 4.7
Includes a more recent version of antlr to nixpkgs. Previous
versions exist already, but version 4 brings many changes
to the generated code and runtime targets.

The install location has been changed from previous versions
of antlr to make use of the set-java-classpath hook, which
is required to make use of both the runtime and the binary.

Also includes the testing rig as a script to allow graphical
inspection of parse trees.
2017-06-20 12:04:12 +01:00
Pascal Wittmann
a9b2de487b
rage: fix license for unstable
Beginning with the next development release (> 7.0.0.9)
Ragel is licensed under an MIT style license. Ragel 6
remains under GPL v2. Please see the file COPYING in the
source.
2017-06-13 21:37:54 +02:00
Pascal Wittmann
c9fcce368d
ragel: 6.9 -> 6.10 2017-06-13 21:37:52 +02:00
Pascal Wittmann
58e5078487 ragelDev: 7.0.0.9 -> 7.0.0.10 2017-05-29 11:38:36 +02:00
Michael Raskin
65220cb2e7 Merge pull request #24223 from c0bw3b/pkg/byacc
byacc: 1.9 -> 20170201
2017-05-01 00:25:55 +02:00
Matthew Bauer
b9c8a0182a
antlr: supports darwin 2017-04-23 18:08:40 -05:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Renaud
d9cf0256d4 byacc: 1.9 -> 20170201
Version bump
+ source URLs and homepage are updated
2017-03-22 23:29:12 +01:00
Daniel Brockman
5d6ea2d64e
jshon: fix null termination in read_stream.
This fixes a somewhat critical (security?) bug.

We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.

(See <https://github.com/keenerd/jshon/issues/53>.)

fixes #23727
2017-03-16 18:32:04 +01:00
Vladimír Čunát
6973c7739e
Merge branch 'master' into staging
There were some larger rebuilds because of security.
2017-01-26 16:49:41 +01:00
Robin Gloster
3756edb109
ragel: fix build with gcc 6 2017-01-25 20:12:35 +01:00
zimbatm
a17311a33e antlr3: point to version 3.4
This was pointing to a broken upstream URL and is a beta release. No
dependent in the nixpkgs tree.
2017-01-24 16:15:21 +00:00
Vladimír Čunát
cf1d3677d3
flex: bring back 2.6.1 as an option
Some breakages after flex update aren't so easy to fix,
and I can't really afford to spend much time on it ATM.
2017-01-06 16:17:46 +01:00
Vladimír Čunát
6bded45883
flex: 2.6.1 -> 2.6.3
This resolves some warnings and errors introduced in 2.6.x.
2016-12-30 23:17:08 +01:00
Franz Pletz
3d1206dfcc
ragel: add stable version, default to stable 2016-12-16 15:52:27 +01:00
Pascal Wittmann
36657f586f
jikespg: convert md5 to sha256 and adopt it 2016-11-20 16:36:54 +01:00
Pascal Wittmann
564f9dc55d ragel: 7.0.0.6 -> 7.0.0.9 2016-11-17 22:34:03 +01:00
Graham Christensen
feec685636
flex: 2.6.0 -> 2.6.1 2016-09-23 21:42:08 -04:00
Michael Raskin
592e265caa antlr3_4: init at 3.4 2016-09-06 18:19:17 +02:00
Michael Raskin
8f284c0a94 antlr3_5: init at 3.5.2 2016-09-06 18:19:17 +02: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
Robin Gloster
eabef9420a
re2c: 0.14.3 -> 0.16 2016-08-25 16:07:40 +00: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
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Joachim Fasting
2f56af5f1a
ragel: set meta.platforms 2016-06-23 00:55:54 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00