Commit Graph

627 Commits

Author SHA1 Message Date
Benjamin Hipple
b4b19de128 bzip2: enable parallel building 2019-05-12 11:26:58 -04:00
Will Dietz
1b0cd28a51 lz4: pick upstream fix for Darwin, move to pname 2019-05-04 17:33:46 +02:00
Matthew Bauer
74c784a79c treewide: make -Wno-error flags clang-only
In 724e833ea2, I was a little too aggressive in enabling these flags.
Many don’t work in gcc, and we should probably avoid settings them
widely. This makes those flags optional on isclang
2019-04-29 21:34:24 -04:00
Will Dietz
9d36a79ba6 lz4: 1.8.3 -> 1.9.1 (#59812)
* lz4: 1.8.3 -> 1.9.0

https://github.com/lz4/lz4/releases/tag/v1.9.0

* lz4: 1.9.0 -> 1.9.1

fixes read out-of-bounds issue w/1.9.0
2019-04-27 07:17:04 +02:00
Matthew Bauer
87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer
724e833ea2 treewide: disable -Werror for llvm 7
Some of these have errors on newest llvm. It’s easiest to just add
-Wno-error in these cases.
2019-04-26 21:55:04 -04:00
Jan Tojnar
89a150355b
Merge branch 'master' into staging 2019-04-26 16:35:54 +02:00
Frederik Rietdijk
2b9caf8896 pigz: fix cross 2019-04-26 12:48:19 +02:00
Will Dietz
bcc9858699
Merge pull request #59813 from dtzWill/update/zstd-1.4.0
zstd: 1.3.8 -> 1.4.0
2019-04-21 18:22:48 -05:00
mt_caret
5ffe382afc dejsonlz4: init at 1.1 (#51373)
* dejsonlz4: init at 1.1

* fix description

Co-Authored-By: mt-caret <mtakeda.enigsol@gmail.com>
2019-04-20 20:50:47 +02:00
Will Dietz
b25ffa1246 zstd: 1.3.8 -> 1.4.0
https://github.com/facebook/zstd/releases/tag/v1.4.0
2019-04-17 22:29:41 -05:00
R. RyanTM
aeae1a3868 ncompress: 4.2.4.4 -> 4.2.4.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ncompress/versions
2019-03-26 11:47:19 -07:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Daiderd Jordan
fa82915e01
xar: add explicit lzma input
lzma is part of the stdenv but not during bootstrapping?
2019-02-24 11:32:01 +01:00
Will Dietz
09cc811fd1 lzip: 1.20 -> 1.21
NEWS file from tarball
(don't see it on the mailing list for whatever reason,
maybe I'm just blind O:))
https://gist.github.com/dtzWill/4029f87c33939795a365939d06a8ef18
2019-01-13 17:39:15 -06:00
Vladimír Čunát
6af68f6055
Merge #53091: gzip: 1.9 -> 1.10 (into staging) 2018-12-31 14:36:31 +01:00
Will Dietz
06dc418292 gzip: 1.9 -> 1.10
https://savannah.gnu.org/forum/forum.php?forum_id=9339
2018-12-30 17:05:33 -06:00
Will Dietz
2aaabb02bf zstd: 1.3.7 -> 1.3.8
https://github.com/facebook/zstd/releases/tag/v1.3.8
2018-12-28 13:13:31 -06:00
Dmitry Kalinkin
c217d67be3
mozlz4a: replace lz4 alias with proper name
lz4 used to package the same package as python-lz4, then lz4 was
removed and became an alias to python-lz4
2018-12-25 10:36:24 -05:00
Michael Raskin
14b3e7c004 mozlz4a: 2015-07-24 -> 2018-08-23; fixes compatibility with newer python3Packages.lz4 2018-12-21 13:21:49 +01:00
John Ericson
e0a4d1083f
Merge pull request #51965 from vaibhavsagar/fix-static-lz4
lz4: Fix pkgsStatic build
2018-12-13 18:28:05 -05:00
Vaibhav Sagar
cb5a7bdc3a lz4: fix pkgsStatic build 2018-12-13 18:00:26 -05:00
c0bw3b
a04a512f34 Treewide: use HTTPS on NonGNU domains 2018-12-02 15:21:04 +01:00
Will Dietz
edfffe0adf brotli: 1.0.6 -> 1.0.7 (#48874) 2018-10-23 19:40:42 +02:00
Vladyslav M
66760c7c5c
Merge pull request #48846 from veprbl/pr/zstd_137
zstd: 1.3.6 -> 1.3.7
2018-10-23 02:05:08 +03:00
Dmitry Kalinkin
0b520bd26d
zstd: 1.3.6 -> 1.3.7 2018-10-22 18:27:35 -04:00
Matthew Bauer
a5de0ca963 treewide: preserve hashes
avoid mass rebuild from the last commits
2018-10-16 23:19:34 -05:00
Matthew Bauer
51e5f8af42 treewide: don’t set CMAKE_SYSTEM_NAME 2018-10-16 21:52:38 -05:00
Vladyslav M
c8f7188f17 zstd: 1.3.5 -> 1.3.6 (#47965) 2018-10-14 15:55:09 +02:00
Will Dietz
55b6cad537 lz4: 1.8.2 -> 1.8.3 (#47547) 2018-10-02 00:14:26 +02:00
Matthew Bauer
3bc7ad9364
Merge pull request #46773 from mcmtroffaes/feature/fix-brotli-mingw
brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds
2018-09-22 17:12:10 -05:00
Will Dietz
6e9cc8871f brotli: 1.0.5 -> 1.0.6 (#46903) 2018-09-20 00:10:47 +02:00
Matthias C. M. Troffaes
e4f1968100 brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds
CMAKE passes the flag -rdynamic otherwise (which is not recognized by mingw).
Setting the appropriate flag avoids this problem and allows the build
to succeed.
2018-09-17 09:37:32 +01:00
Markus Kowalewski
1e98674c79
zdelta: add license 2018-09-07 22:13:59 +02:00
Markus Kowalewski
fd59d5642e
pigz: add license 2018-09-07 22:11:27 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Will Dietz
da8e3ef9e5 upx: 3.94 -> 3.95 2018-08-27 12:50:44 -05:00
Jan Malakhovski
35b8d5aea8 zstd: make tests run, but disable 2018-08-11 09:35:33 +00:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann
1d4de0d552
Merge pull request #44813 from markuskowa/licenses-zip
Add licenses: libzip, minizip, bzip2, zip
2018-08-09 12:15:33 +02:00
Markus Kowalewski
3bc155dfd0
bzip2: update license 2018-08-09 11:44:34 +02:00
Bob van der Linden
326157bb4e zopfli: 1.0.1 -> 1.0.2 (#44769) 2018-08-08 23:42:35 +02:00
Austin Seipp
a240276ccb zstdmt: remove (dupe, unmaintainable)
The user who wrote this code on GitHub has since deleted their account,
making any updates impossible. Furthermore, this package is redundant
anyway: Zstandard has been shipping a compatible 'zstdmt' binary, API,
and stable multi-threading support for over a year now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-08-07 18:40:39 -05:00
Matthew Bauer
3c0ac73e4a lzip: support windows cross 2018-08-02 16:51:48 -04:00
John Ericson
34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Frederik Rietdijk
f001c81c1a Merge master into staging-next 2018-07-16 17:11:01 +02:00
Domen Kožar
f3341e2330
xz: enable optional static compilation 2018-07-16 09:56:03 +01:00
Matthew Bauer
9cd122a2c4
Merge pull request #43088 from matthewbauer/misc
Get rid of 2 unneeded packages
2018-07-05 20:13:47 -04:00
R. RyanTM
1fd0653294 zstd: 1.3.4 -> 1.3.5 (#42913) 2018-07-03 14:43:42 +00:00
Vladimír Čunát
f7781f5293
Merge branch 'master' into staging 2018-06-30 01:41:59 +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
Will Dietz
6f9a53c13c brotli: 1.0.4 -> 1.0.5 (#42702)
Release notes:
https://github.com/google/brotli/releases/tag/v1.0.5

Commits:
https://github.com/google/brotli/compare/v1.0.4...v1.0.5
2018-06-28 13:03:21 +02:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Benjamin Hipple
1baf5cfa7c lz4: 131 -> v1.8.2 (#41293)
Upgrades lz4 from version 131 (released 2015-06-29) to v1.8.2 (released 2018-05-07)
2018-06-03 12:17:32 +00:00
Matthew Bauer
e99322507e treewide: get rid of musl stuff 2018-05-31 12:36:45 -04:00
R. RyanTM
14cdf37418 lzma: 5.2.3 -> 5.2.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --version’ and found version 5.2.4
- found 5.2.4 with grep in /nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin
- directory tree listing: https://gist.github.com/5bf57c36243ce0756cb390f685d22fdf
2018-05-02 21:37:53 +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
Tuomas Tynkkynen
16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
Matthew Justin Bauer
29bc523733
Merge pull request #38865 from matthewbauer/darwin-security-fixes
[darwin] Security fixes
2018-04-12 14:27:00 -05:00
R. RyanTM
59b75e06a6 brotli: 1.0.3 -> 1.0.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -h’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --help’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -V’ and found version 1.0.4
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --version’ and found version 1.0.4
- directory tree listing: https://gist.github.com/8f1f6ce7cb6e005fe8d7cb00a4f50222
2018-04-12 09:16:59 -07:00
Frederik Rietdijk
ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Matthew Bauer
0c70c40845 Merge branch 'auto-update/pigz' 2018-04-11 00:17:21 -05:00
Matthew Bauer
11db118623 pigz: fix on darwin 2018-04-11 00:16:17 -05:00
Matthew Bauer
c3ce4ee723 pbzx: init at 1.0.2 2018-04-09 18:35:35 -05:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Vladyslav M
6558ec1dd5 zstd: 1.3.3 -> 1.3.4 2018-03-27 12:53:11 +03:00
Will Dietz
69ca33057e xar, libselinux: use musl-fts on musl, fix 2018-03-26 14:00:11 -05:00
Shea Levy
d0a8866622
Merge branch 'binutils-2.30' into staging 2018-03-22 07:28:10 -04:00
Eelco Dolstra
7e44f19fce
zstd: Fix install name on macOS
It had an install name '/usr/local/lib/libzstd.1.dylib'.
2018-03-20 13:43:02 +01:00
Shea Levy
86972b2321
xz: Fix dependency on /bin/sh 2018-03-17 21:58:15 -04: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
2c81bc115c pigz: 2.3.4 -> 2.4
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -h` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --help` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -V` and found version 2.4
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --version` and found version 2.4
- found 2.4 with grep in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
- found 2.4 in filename of file in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
2018-03-09 08:48:08 -08:00
Will Dietz
c1c502e93b brotli: 1.0.2 -> 1.0.3
https://github.com/google/brotli/releases/tag/v1.0.3
2018-03-05 17:41:11 -06:00
Ryan Mulligan
bcc04c75f8 lzip: 1.19 -> 1.20
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` got 0 exit code
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -V` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --version` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip -h` and found version 1.20
- ran `/nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20/bin/lzip --help` and found version 1.20
- found 1.20 with grep in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20
- found 1.20 in filename of file in /nix/store/y8gzi68gamcb4wjrhm075vg5xv3gjfam-lzip-1.20
2018-03-01 06:06:08 +02:00
Shea Levy
044c65bd06
Merge branch 'systemd-cross' into staging 2018-02-26 07:42:21 -05:00
Shea Levy
dcab8d611d
lzip: Fix cross compilation 2018-02-25 09:46:49 -05:00
Ryan Mulligan
7bfccd7c24 advancecomp: 2.0 -> 2.1
Semi-automatic update; builds on NixOS
2018-02-24 14:16:49 -08:00
Will Dietz
f5e96d3e1b xz: set CONFIG_SHELL to /bin/sh, fix retained reference to bootstrap 2018-02-13 09:44:25 -06:00
Daiderd Jordan
f968949c75
gzip: remove darwin format patch 2018-01-27 20:08:35 +01:00
Vladimír Čunát
2d2dbe083f
Merge branch 'master' into staging
Hydra: ?compare=1429281
2018-01-27 09:14:22 +01:00
Will Dietz
c403410845 brotli: install man pages 2018-01-23 06:46:23 -06:00
Will Dietz
4c36d7e521 brotli: run tests 2018-01-23 06:46:23 -06:00
Vladimír Čunát
22d9f2d1a1
Merge #33737: gzip: 1.8 -> 1.9 2018-01-21 11:42:23 +01:00
Tuomas Tynkkynen
67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02: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
Tuomas Tynkkynen
6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
Lancelot SIX
31eedb3084
gzip: 1.8 -> 1.9
See http://lists.gnu.org/archive/html/info-gnu/2018-01/msg00004.html
for release informations.
2018-01-11 11:17:18 +01:00
John Ericson
0c16a11c9a
Merge pull request #33575 from dtzWill/fix/cross-1
Minor cross fixes, 1
2018-01-09 12:34:50 -05:00
Will Dietz
7c992cb7af bsdiff: fix 'cc' usage 2018-01-09 11:23:56 -05:00
Daiderd Jordan
dc2ae3aef6
brotli: remove darwin cmake fix 2018-01-07 09:45:56 +01:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Daiderd Jordan
9d33aa50fe
brotli: fix darwin build 2018-01-03 20:40:56 +01:00
Eelco Dolstra
e4beb97b9c
brotli: Use multiple outputs 2018-01-02 12:00:39 +01:00
Will Dietz
9064293f31 brotli: 1.0.1 -> 1.0.2 2017-12-29 17:11:33 -06:00
dywedir
9d1a524157 zstd: 1.3.2 -> 1.3.3 2017-12-22 13:51:09 +02:00
Orivej Desh
0bb47027ab lzip: add unpackCmd hook 2017-12-04 23:31:48 +00:00
Kosta Welke
bfd4eae7a2 zopfli: build on macos 2017-11-29 18:34:09 +00:00
Orivej Desh
2a0e757fb8 brotli: 0.6.0 -> 1.0.1 2017-11-29 00:59:46 +00:00
Orivej Desh
7584d1c3bd brotliUnstable: delete 2017-11-29 00:59:46 +00:00
Andreas Rammhold
4b759a0011 rzip: fix CVE-2017-8364 2017-11-09 12:48:21 +01:00
Orivej Desh
3463add6c5
Merge pull request #31203 from mimadrid/update/zstd-1.3.2
zstd: 1.3.0 -> 1.3.2
2017-11-03 19:21:44 +00:00
mimadrid
8e982d5f2e
zstd: 1.3.0 -> 1.3.2 2017-11-03 19:58:01 +01:00
c0bw3b
525380b472 treewide: abandon Google Code homepages 2017-11-03 18:52:28 +00: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
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -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
Daiderd Jordan
76437e5e5a
gsc: fix darwin build 2017-09-08 22:22:04 +02:00
Franz Pletz
a5e9a31fb5
advancecomp: 1.23 -> 2.0 2017-09-05 13:10:13 +02:00
Franz Pletz
a160f34823
xar: 1.5.2 -> 1.6.1 2017-08-28 00:54:42 +02:00
Vladimír Čunát
76e6863cb1
lzop: 1.03 -> 1.04
This fixes build with gcc6.
2017-08-20 09:19:30 +02:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Robin Gloster
28cc2642f0
treewide: use less phases if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
2017-08-11 11:40:36 +02:00
Joachim Fasting
a40bf20a1d
pigz: enable parallel building 2017-08-06 23:38:15 +02:00
Joachim Fasting
d56361f036
pigz: 2.3.3 -> 2.3.4 2017-08-06 23:38:14 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
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
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Daiderd Jordan
7cd9779488
upx: fix clang build 2017-07-26 23:24:49 +02:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Lluís Batlle i Rossell
f338e99039 zstd: 1.2.0 -> 1.3.0 2017-07-25 17:57:50 +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
David McFarland
23efc95a74 gzip: remove cygwin hack
The file being patched doesn't exist any more, and gzip now builds
on cygwin without this.
2017-06-26 09:26:10 -03:00
Will Dietz
a3b2ccb7b4 upx: 3.93 -> 3.94
* Use release tarball
* Cleanup a bit
2017-06-21 18:54:10 -05:00
Michael Raskin
aafe99ca90 mozlz4a: init at 2015-07-24 2017-05-21 00:21:47 +02:00
Miguel Madrid
cb19bc8a45 brotli: 0.5.2 -> 0.6.0 (#25812) 2017-05-20 14:04:33 +01:00
Orivej Desh
cb1af17f53 zstd: 1.1.3 -> 1.2.0 2017-05-10 17:52:34 +00:00
Armijn Hemel
d80d08de50 lzip: 1.18 -> 1.19 2017-05-10 18:29:07 +02:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer
0293d0dbec
lhasa: supports darwin 2017-04-23 18:08:36 -05:00
armijnhemel
a8c8d5a588 upx: 3.91 -> 3.93
* moved from sourceforge to github
2017-04-18 21:49:54 +02:00
Tuomas Tynkkynen
6b84ee9f96 lzma: 5.2.2 -> 5.2.3 2017-04-11 13:00:56 +03:00
Daiderd Jordan
f8230518a2 Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
2017-04-10 08:50:15 +02:00
Matthew Bauer
06716f310a
zstmdt: fix macOS build 2017-04-08 23:28:02 -05:00
Petr Mikusek
60f18cf94a advancecomp: fix license 2017-04-07 20:33:56 +02:00
Dan Peebles
6f0a2af5bc brotli: fix on Darwin 2017-04-06 21:17:32 -04:00
ndowens
f7f720bfc5 Merge pull request #24325 from ndowens/lzfse
lzfse: 2016-06-21 -> 2017-03-08
2017-03-26 17:29:40 -05:00
ndowens
915e44e6d1 lzfse: 2016-06-21 -> 2017-03-08 2017-03-25 10:09:42 -05:00
ndowens
22e58be888 advancecomp: 1.19 -> 1.23 2017-03-24 21:37:56 -05:00
Michael Raskin
452cc25e5b Merge pull request #23311 from cheecheeo/zstdmt
zstdmt: init at 0.3
2017-03-18 18:40:22 +01:00
Tuomas Tynkkynen
aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Lluís Batlle i Rossell
7aa5effaf6 lzham: init at 1.0
Compressor.
2017-03-11 10:00:06 +01:00
Lluís Batlle i Rossell
8ac134321b bsc: init at 3.1.0
Compressor.
2017-03-11 10:00:06 +01:00
ndowens
c00aa5d178 lzip: 1.17 -> 1.18 2017-03-02 20:37:01 -06:00
John Chee
bb46cde859 zstdmt: init at 0.3 2017-03-01 00:11:31 +00:00
Lluís Batlle i Rossell
9e7ce9010c
lzbench: init at 20170208
In-memory benchmark of several up-to-date compressors.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
2017-02-27 22:42:40 +01:00
Jörg Thalheim
fc2a42b40e
zsync: replace sha1 with sha256 2017-02-26 10:02:10 +01:00
Jörg Thalheim
4c11d5fe83
dtrx: replace sha1 with sha256 2017-02-26 10:01:41 +01:00
Lluís Batlle i Rossell
e62fe37575 zstd: update to 1.1.3 2017-02-16 21:46:48 +01:00
Lluís Batlle i Rossell
0cee46dd21 brotli: update to 0.5.2
From 0.3.0
2017-02-16 21:34:44 +01:00
John Ericson
b518598a40 gzip: xz.bin should be native input---accidentally worked because bin (#21887)
Otherwise http://hydra.nixos.org/build/46501984/nixlog/2
2017-01-14 19:21:10 +01:00
Michael Raskin
d01cd11e59 lrzip: 0.630 -> 0.631 2017-01-02 20:18:50 +01:00
Mitch Tishmack
49d721a889 pixz: refactor allow builds on non linux 2016-12-26 15:05:00 -06:00
Mitch Tishmack
a21640d394 pigz: refactor allow builds on non linux 2016-12-26 15:04:53 -06:00
Graham Christensen
390f6a985b
Revert "Revert "bzip2: patch for CVE-2016-3189""
This reverts commit 6393ca650e.
2016-11-30 19:30:52 -05:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Vladimír Čunát
e68d8e05aa Revert "lz4: 131 -> 1.7.3"
This reverts commit 1f0a12ee8d.
Systemd build was broken and such change should probably go through
staging anyway.
2016-11-17 21:51:34 +01:00
Tobias Geerinckx-Rice
1f0a12ee8d
lz4: 131 -> 1.7.3
‘make install’ now supports FreeBSD out of the box (untested).
2016-11-17 16:27:31 +01:00
Alex Ivanov
ec99fb434f dtrx: add archivers to dependencies 2016-11-10 17:41:20 +03:00
Tobias Geerinckx-Rice
aa0a7194e9
zstd: 1.0.0 -> 1.1.1 2016-11-05 18:44:11 +01:00
Sander van der Burg
b44e79e240 lhasa: init at 0.3.1 2016-10-10 20:48:00 +00:00
Eelco Dolstra
b87d5abafd lz4: Don't install static library 2016-09-05 19:10:27 +02:00
Susan Potter
766a018453 zstd: 0.7.5 -> 1.0.0
Also updated to use the new repository location under facebook organization.
2016-09-03 15:57:33 -05:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Tobias Geerinckx-Rice
c0620282d3
zstd: 0.7.3 -> 0.7.5 2016-08-03 20:21:20 +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
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tobias Geerinckx-Rice
599cf0fe50
zstd: 0.7.2 -> 0.7.3
New:
- compression format specification zstd_compression_format.md
- -- separator, stating that all following arguments are file names
- ZSTD_getDecompressedSize()

Fixes:
- dictBuilder using HC levels
- legacy support from ZSTD_decompress_usingDDict()
- multi-blocks decoding with intermediate uncompressed blocks
2016-07-08 22:09:43 +02:00
Ram Kromberg
5abd5603ed lzfse: init at 2016-06-21 2016-07-08 13:09:16 +03:00
Tobias Geerinckx-Rice
11ce7e0cfd
zstd: 0.7.1 -> 0.7.2
Fixes:
- ZSTD_decompressBlock() using multiple consecutive blocks.
- potential segfault on very large files (many gigabytes).
- CLI displays system error message when destination file
  cannot be created.
- potential leak in zdict.
2016-07-03 21:19:15 +02:00
Florian
09492d3b85 zstd: set meta.platforms to unix 2016-06-23 19:30:12 +02:00
Tobias Geerinckx-Rice
7a93926a91
zstd: 0.7.0 -> 0.7.1
Fixes:
- ZBUFF_compressEnd() called multiple times with too small dst buffer
- dictBuilder fails if first sample is too small
- corruption issue
- cli breaks during destination file overwrite confirmation

Changes:
- frame checksum enabled by default in command line mode
2016-06-23 14:32:13 +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
Tobias Geerinckx-Rice
723439564f
zstd: 0.6.1 -> 0.7.0
Changes: https://github.com/Cyan4973/zstd/releases/tag/v0.7.0
2016-06-16 21:20:00 +02:00
Tobias Geerinckx-Rice
1212d921c1
lrzip: 0.621 -> 0.630
Changes: http://ck-hack.blogspot.com/2016/06/lrzip-0630.html
2016-06-12 00:28:55 +02: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
Tobias Geerinckx-Rice
f2c7f9a677
zstd: 0.6.0 -> 0.6.1 2016-05-14 16:01:33 +02:00
Vladimír Čunát
68b4c4caa7 bzip2: greatly simplify by using autoconfiscated version
I don't know there's still need for linkStatic or cygwin special-casing,
but I left it there for now.
2016-05-05 08:31:09 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Franz Pletz
50884acd84 lzip: 1.16 -> 1.17 2016-05-03 16:15:20 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Lancelot SIX
8a67abb820 pkgs.gzip: 1.7 -> 1.8
See http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00012.html
2016-04-28 19:36:27 +02:00
Vladimír Čunát
91f2b9ed66 bzip2: fix on mingw
The whole expression is rather a mess, mainly due to upstream
often behaving badly with non-standard configurations.
2016-04-23 10:52:01 +02:00
Aneesh Agrawal
a01fdb3ad4 gzip: 1.6 -> 1.7 (close #14828) 2016-04-20 16:40:53 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Tobias Geerinckx-Rice
550b878e46
zstd: 0.5.1 -> 0.6.0
Changes:
- Stronger high compression modes
- Changed : highest compression modes require --ultra command to
  remove memory restrictions
- API: ZSTD_getFrameParams() provides size of decompressed content
- Fixed: zstd cli return error code > 0 and removes dst file artifact
  when decompression fails
- Various fixes and small performance improvements
2016-04-14 02:37:53 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Franz Pletz
2a021baf21 pbzip2: 1.1.12 -> 1.1.13 2016-04-12 15:51:32 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Vladimír Čunát
b336ed89e6 zopfli: disable parallel building
It was failing often, e.g.:
https://hydra.nixos.org/build/32101335/nixlog/1/raw
2016-03-23 20:20:36 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00