Commit Graph

742 Commits

Author SHA1 Message Date
Felix Buehler
e023025ee0 various: cleanup of "inherit version;" 2021-07-17 22:39:35 +02:00
Vladimír Čunát
3ea417e47f
Merge branch staging into staging-next
The staging version is a bit older already, used in pre-test:
https://hydra.nixos.org/eval/1685435
2021-07-16 09:59:01 +02:00
github-actions[bot]
6630d8e9bb
Merge staging-next into staging 2021-07-14 18:01:45 +00:00
gfrascadorio
8f68b7c15d lbzip2: latest gnulib requires autoconf 2.64 2021-07-13 10:44:23 -06:00
Jonathan Ringer
03e499425d zstd: don't build contrib when cross-compiling
Tests and `./gen_html` from contrib need to run
on host architecture. Disable them when doing
cross-compiliation.
2021-07-11 15:44:09 -07:00
Marc Seeger
9889bdb6fb zstd: Add pzstd to compiled binaries 2021-07-09 11:29:19 -07:00
Ryan Burns
e5f563ef03 zstd: fix darwin patch
Since v1.4.9, another stat command has been added to playTests.sh.
Similar to other uses in this file, it attempts to use BSD syntax on
Darwin/BSD, and must be patched to unconditionally use GNU syntax.
2021-06-20 18:10:23 -07:00
github-actions[bot]
e40e33d9d8
Merge staging-next into staging 2021-06-08 18:16:30 +00:00
Konrad Borowski
012f2315c5 flips: unstable-2020-10-02 -> unstable-2021-05-18 2021-06-06 17:15:50 +02:00
IvarWithoutBones
1194bfcc03 zstd: 1.4.9 -> 1.5.0 2021-05-31 15:47:58 -07:00
TredwellGit
2acd087dca lz4: patch CVE-2021-3520 and null pointer dereference 2021-05-30 02:08:18 +00:00
Daiderd Jordan
dd3fac8761
fwup: fix darwin build 2021-05-29 13:04:06 +02:00
Andrew Childs
1fc0499569 xar: fix cross compilation 2021-05-17 00:27:00 +09:00
Andrew Childs
2931a2e1d5 pbzx: fix cross compilation 2021-05-17 00:27:00 +09:00
Alyssa Ross
9a13661b38 bzip2_1_1: don't manually enableParallelBuilding
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
Ivar Scholten
249d9041be imagelol: init at 0.2 2021-04-26 00:32:06 +02:00
github-actions[bot]
8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Ivar
05987f952f
nx2elf: init at unstable-2020-05-26 (#119493)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-17 19:17:46 +02:00
Emery Hemingway
9e4a925caf zstd: do not cross-compile tests 2021-04-10 17:10:50 +02:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
github-actions[bot]
7c9222212f
Merge master into staging-next 2021-03-25 18:14:01 +00:00
Frederik Rietdijk
63434aa261 dtrx: stay with python2 2021-03-25 12:35:28 +01:00
Martin Weinelt
4252f1a092
Merge pull request #115625 from LeSuisse/zstd-1.4.9
zstd: 1.4.8 -> 1.4.9
2021-03-20 02:01:29 +01:00
github-actions[bot]
d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Ben Siraphob
e3e7090459 dejsonlz4: fix build on darwin 2021-03-18 23:02:06 +07:00
Ben Siraphob
3bced99816 zdelta: expand platforms to all and refactor 2021-03-18 23:02:05 +07:00
github-actions[bot]
e0a6159fc6
Merge master into staging-next 2021-03-16 18:18:29 +00:00
ajs124
45a014f479
Merge pull request #115224 from helsinki-systems/upd/lrzip
lrzip: 0.640 -> 0.641
2021-03-16 16:32:41 +01:00
Thomas Gerbet
aea3ad0d4d zstd: 1.4.8 -> 1.4.9
Fixes CVE-2021-24032.
2021-03-16 09:33:46 +01:00
github-actions[bot]
c596c93079
Merge master into staging-next 2021-03-14 00:41:40 +00:00
John Ericson
51011985ef zstd: Remove no-pthread patch used for building with mcfgthreads
Evidentially upstream has improved their feature detection so we no
longer need this patch.

CC @lhmouse
2021-03-12 16:22:27 +00:00
github-actions[bot]
5c2a7abde7
Merge master into staging-next 2021-03-08 18:22:56 +00:00
Ivar
3e616e0874
hacpack: init at 1.36 (#115357) 2021-03-08 09:56:57 -05:00
ajs124
e0ba4d7673 lrzip: 0.640 -> 0.641 2021-03-06 04:15:02 +01:00
Jörg Thalheim
10fafe98ff
bzip2: add homepage + changelog 2021-02-21 20:22:12 +01:00
Ivan Babrou
7b63dbf9d3 bzip2: 1.0.6.0.1 -> 1.0.6.0.2 2021-02-20 11:07:22 -08:00
ajs124
552493a347
Merge pull request #113327 from helsinki-systems/upd/lrzip
lrzip: 0.631 -> 0.640
2021-02-19 20:47:58 +01:00
Ben Siraphob
4b2c44c0a7 treewide: drop conditional makeFlag for darwin when specifiying cross-compiler 2021-02-20 01:02:08 +07:00
Ben Siraphob
223f25cf4a treewide: add targetPrefix to hardcoded references to CC=cc 2021-02-20 01:01:46 +07:00
Armijn Hemel
2be7907cba ncompress: split "name" in "pname" and "version" 2021-02-18 19:31:27 +01:00
Armijn Hemel
9e8284afd5 remove patch in default.nix as well 2021-02-18 13:35:13 +01:00
Armijn Hemel
4747d9ea90 ncompress: patch is no longer necessary since 4.2.4.6 2021-02-18 13:32:06 +01:00
Armijn Hemel
5abd0ceeb5 ncompress: 4.2.4.6 -> 5.0 2021-02-18 13:28:34 +01:00
ajs124
ae88e0e426 lrzip: 0.631 -> 0.640 2021-02-17 17:21:05 +01:00
Eelco Dolstra
5f766e6ce7
Merge pull request #111956 from armijnhemel/ncompress-4.2.4.6
ncompress: 4.2.4.5 -> 4.2.4.6
2021-02-10 17:54:14 +01:00
R. RyanTM
1377da3ac3 pigz: 2.4 -> 2.6 2021-02-08 03:21:51 +00:00
Armijn Hemel
9ffb7ecd24 ncompress: 4.2.4.5 -> 4.2.4.6 2021-02-04 21:39:53 +01:00
Jörg Thalheim
25749d7733
bzip2: add mic92 as maintainer 2021-01-31 20:27:26 +01:00
github-actions[bot]
a127deeb88
Merge master into staging-next 2021-01-25 18:52:08 +00:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Jan Tojnar
cc8fd11ffb
Merge branch 'master' into staging-next 2021-01-24 20:41:42 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
R. RyanTM
f2339096e7 lzip: 1.21 -> 1.22 2021-01-22 21:32:09 +01:00
zowoq
8adc564f28 treewide: editorconfig fixes
- add final newline
- use spaces for indentation
2021-01-21 09:30:52 +10:00
Ben Siraphob
d6aeae8f90 pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
github-actions[bot]
581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00:00
John Ericson
5c2965145f treewide: Inline more of the static overlay
Picking up where #107238 left off. I think I'll have gotten all the easy
stuff with this.
2021-01-03 21:46:14 +00:00
John Ericson
f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Mario Rodas
99061cb6ac zstd: 1.4.5 -> 1.4.8
+ https://github.com/facebook/zstd/releases/tag/v1.4.7
+ https://github.com/facebook/zstd/releases/tag/v1.4.8
2020-12-17 04:20:00 +00:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Emery Hemingway
f909429a9a lz4: 1.9.2 -> 1.9.3 2020-11-16 19:58:00 +01:00
freezeboy
7d3fb8234d
brotli: add myself as maintainer (#103129) 2020-11-08 22:11:29 -05:00
Vladimír Čunát
f4c13d1d9d
brotli.meta.maintainers: unlist myself
Years ago I thought I might use it for something, but anything like that
seems very unlikely to ever materialize, so let me focus on packages
that I consider more important.
2020-11-08 09:43:36 +01:00
freezeboy
99c9647e69 pkgsStatic.brotli: fix patch 2020-11-07 11:09:15 -08:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
John Ericson
66c9347db6
Merge pull request #102069 from nix-windows/libarchive-windows
libarchive: Fix MinGW build
2020-10-29 19:31:28 -04:00
John Ericson
437dc4c047 zstd: Fix MinGW build 2020-10-28 23:34:51 +00:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
freezeboy
347696a30b
brotli: 1.0.7 -> 1.0.9 (PR #100436)
Fixes CVE-2020-8927.
2020-10-17 10:46:14 +02:00
Konrad Borowski
e22e2a5080 flips: init at unstable-2020-10-02 2020-10-06 15:25:54 +02:00
Frederik Rietdijk
be534380c4 bzip2_1_1: init at 2020-08-11
bzip2 has been unmaintained for a long time. For a while now, there has
been maintainership, resulting in the release of 1.0.8. At the same
time, there is now a master branch (version 1.1.x) which supports meson
and cmake as build systems.

This commit adds the current HEAD of the master branch (1.1.x). In the
future we may want to use this one instead of the older and patched
1.0.6 we currently have.

Related:
- https://github.com/NixOS/nixpkgs/pull/65029
- https://github.com/NixOS/nixpkgs/pull/94969
2020-08-30 17:28:41 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00
Matthew Bauer
d1c2a9ed97 lzfse: use cmake build system
this builds .so correctly
2020-08-19 19:31:30 -05:00
Ben Wolsieffer
6093f9eb6e zstd: fix shebangs when cross-compiling 2020-08-15 08:32:57 +02:00
Frederik Rietdijk
50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Daniël de Kok
5d21f4c1d5 lzfse: enable Darwin build
- Enable Darwin build, since Darwin is supported.
- Replace the revision by the corresponding Git tag.
2020-07-31 08:21:05 +02:00
R. RyanTM
257665d72c pixz: 1.0.6 -> 1.0.7 2020-07-27 22:04:52 +00:00
Dmitry Kalinkin
f6ef3ac294
zstd: build programs and tests against the shared library 2020-07-02 12:10:15 -04:00
Mario Rodas
bb4164e8d0
Merge pull request #97198 from r-ryantm/auto-update/lzbench
lzbench: 1.8 -> 1.8.1
2020-10-04 08:56:46 -05:00
mlvzk
492b9af995 brotli: fix patch URL 2020-09-24 23:36:46 +02:00
R. RyanTM
be5a72b4af lzbench: 1.8 -> 1.8.1 2020-09-05 07:00:27 +00:00
Frederik Rietdijk
febc27b59a Merge master into staging-next 2020-06-12 08:57:26 +02:00
Bart Brouns
1683a5f146 Revert "dtrx: remove p7zip, since it's unsafe"
This reverts commit 9b3ca0c614.
p7zip is now switched to a maintained fork
2020-06-11 18:41:17 +02:00
Frederik Rietdijk
8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Frederik Rietdijk
dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
IvarWithoutBones
ff0da2c3e7 hactool: minor fixup 2020-06-07 15:24:46 +02:00
Frederik Rietdijk
d0532e79ae Merge staging-next into staging 2020-06-07 09:25:46 +02:00
Frederik Rietdijk
6b8223e634 Merge master into staging-next 2020-06-07 09:25:12 +02:00
Mario Rodas
8718eca57d
hactool: fix build on darwin 2020-06-06 04:20:00 -05:00
R. RyanTM
04d33ebf5c hactool: 1.3.3 -> 1.4.0 2020-06-06 08:53:25 +00:00
Frederik Rietdijk
af2dd0c798 Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd""
The PR was accidentally merged into master instead of staging and thus reverted. Now, in staging, we can re-revert it.

This reverts commit 4df2f78ec7.
2020-06-04 15:30:36 +02:00
Frederik Rietdijk
08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Frederik Rietdijk
4df2f78ec7 Revert "Merge pull request #78910 from serokell/libarchive-zstd"
Should go to staging instead.

This reverts commit f8d9f59abe, reversing
changes made to b27a19d5bf.
2020-05-29 21:03:02 +02:00
Frederik Rietdijk
f8d9f59abe
Merge pull request #78910 from serokell/libarchive-zstd
libarchive: link to zstd (split zstd output)
2020-05-29 20:51:16 +02:00
Vladimír Čunát
afa9962538
Merge #78910: libarchive: link to zstd (into staging)
Also split outputs and don't provide static lib by default.
2020-05-29 15:37:55 +02:00
Vladimír Čunát
7f76daacdb
zstd: get rid of static libs if enableShared 2020-05-29 15:29:20 +02:00
Frederik Rietdijk
1b7204ab3c Merge master into staging-next 2020-05-27 15:26:50 +02:00
Bart Brouns
9b3ca0c614 dtrx: remove p7zip, since it's unsafe 2020-05-26 22:23:33 +02:00
Frederik Rietdijk
c778596f56 Merge master into staging-next 2020-05-24 10:03:22 +02:00
Orivej Desh
6817991464
zstd: 1.4.4 -> 1.4.5 (#88609)
The previous CMake version did not run any tests, the current version
tries to run all tests (I could not await their completion), and the
last GNU Make version ran `make -C tests shortest` which ran only
playTests.sh, so I've enabled only the playTests test.
2020-05-23 14:44:00 +00:00
Pavol Rusnak
a9d90273d8 gzip: add setup-hook to stop gzip from adding timestamps to headers 2020-05-11 22:16:44 +02:00
tbenst
fd22984bbb
zopfli: include all headers 2020-05-08 16:17:23 +01:00
Ivar
35639c65f9 hactool: init at 1.3.3 2020-05-03 10:54:02 -07:00
Scott Worley
d2d7fbc431 gzip: Don't depend on gzip being in $PATH 2020-04-21 08:24:27 +02:00
snicket2100
b1c14fb636 advancecomp: version number correctly embedded in binaries
without this fix, binaries report their version number as "vnone"
which for example stops `image_optim` from using `advpng` (refuses
to use it not being able to tell what version number it has)
2020-04-13 10:21:29 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
worldofpeace
fba171669b
Merge pull request #83015 from r-ryantm/auto-update/xz
lzma: 5.2.4 -> 5.2.5
2020-03-28 17:37:21 -04:00
R. RyanTM
18482042bb lzma: 5.2.4 -> 5.2.5 2020-03-20 18:07:45 +00:00
Martin Milata
18ac6ba903 lz4: 1.9.1 -> 1.9.2
Fixes: https://nvd.nist.gov/vuln/detail/CVE-2019-17543
Release notes: https://github.com/lz4/lz4/releases/tag/v1.9.2
2020-03-12 22:55:06 +00:00
Benno Fünfstück
07cf03630f lbzip2: fix build
The release tarball is no longer available at the specified URL, so
building from git. Also, the gnulib in the release tarball was too old
for our recent glibc version.
2020-02-23 19:23:43 +01:00
Mario Rodas
20bc3aa323
Merge pull request #78573 from Moredread/lzbench
lzbench: 20170208 -> 1.8
2020-02-14 06:22:54 -05:00
Frederik Rietdijk
1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
Vladimír Čunát
cfa1f136db
lz4: split binaries into a separate output
It's a little suspicious that the binaries are (apparently)
linked statically, but I assume upstream has some reasons (e.g. speed).
2020-02-10 21:31:48 +01:00
Vladimír Čunát
35b13b52cd
lz4: do the refactoring forgotten after PR #51965 2020-02-10 21:30:50 +01:00
edef
08e96d2fb9 zopfli: add edef as maintainer 2020-02-10 20:08:25 +01:00
edef
60446543dc zopfli: split outputs 2020-02-10 20:08:25 +01:00
Yorick van Pelt
fe9a655054
zstd: enable split outputs 2020-02-10 20:03:57 +01:00
Frederik Rietdijk
531a48ebdb Merge master into staging-next 2020-02-09 11:00:29 +01:00
R. RyanTM
1ad0c1dcc1 xdelta: 3.0.11 -> 3.1.0 2020-02-09 10:00:29 +01:00
Maximilian Bosch
ea8ae88f04
Merge branch 'staging' into glibc230 2020-02-01 17:42:03 +01:00
zowoq
f224d16c4c upx: 3.95 -> 3.96
https://github.com/upx/upx/blob/v3.96/NEWS
2020-01-29 17:28:18 +10:00
Maximilian Bosch
6b0cd9ad47
Merge branch 'staging' into glibc230
Conflicts:
	pkgs/applications/misc/vit/default.nix
2020-01-28 14:54:51 +01:00
André-Patrick Bubel
de1411f0d4
lzbench: 20170208 -> 1.8 2020-01-27 02:49:23 +01:00
ajs124
782ea12568 zopfli: 1.0.2 -> 1.0.3 2020-01-17 23:29:26 +01:00
Maximilian Bosch
01ce36f788 bzip2: fix aarch64 build 2020-01-14 08:52:25 +00:00
Frederik Rietdijk
960c24a996
Merge pull request #75798 from tobim/pkgsStatic/arrow
arrow-cpp: add pkgsStatic support
2020-01-03 10:13:31 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Tobias Mayer
c06a0b2c8c zstd: build with CMake
CMake is used for static builds because the Makefile does not
offer a way to disable the shared library.
2019-12-29 10:57:15 +01:00
Andreas Rammhold
f23627cb12
advancecomp: fix CVE-2019-9210 2019-12-15 23:15:35 +01:00
c0bw3b
69b393ace5 Treewide: update some problematic homepages
These URLs are reported as problematic by Repology.
It could be a permanent redirection
or the page does not exist anymore
2019-12-08 10:21:29 -08:00
John Ericson
e241c1420a
Merge pull request #73316 from Ericson2314/mingw-rocksdb
rocksdb: Build with MinGW
2019-11-23 13:37:31 -05:00
John Ericson
4686cfcc94 Merge remote-tracking branch 'upstream/master' into mingw-rocksdb
Can just use single commit from
https://github.com/facebook/rocksdb/pull/6076 for rocksdb!
2019-11-23 17:26:49 +00:00
Renaud
206c264c7d
gzrt: fix homepage and src url redirect
+ meta.license is GPL2+
2019-11-16 10:11:17 +01:00
John Ericson
ca76436298 zstd: Fix MinGW build 2019-11-15 23:21:47 +00:00
John Ericson
774e88cd86 lz4: Fix MinGW build 2019-11-13 20:40:15 +00:00
Timothy DeHerrera
cb7e94a6b6 zstd: 1.4.3 -> 1.4.4 2019-11-05 23:34:57 +00:00
Matthew Bauer
7ebd5999bd
brotli: add staticOnly option 2019-09-29 11:19:56 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00