3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

676 commits

Author SHA1 Message Date
Dmitry Kalinkin 262fd63a72
Merge branch 'master' into staging-next
Conflicts:
	pkgs/tools/networking/inetutils/default.nix
2021-08-26 00:57:08 -04:00
davidak 66933d5f13
Merge pull request #124868 from LnL7/darwin-fwup
fwup: fix darwin build
2021-08-26 05:19:09 +02:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Pamplemousse 47fd767531 zstd: Fix static build 2021-08-16 17:52:13 -07:00
Felix Buehler 7cd5d178fc tools: replace name with pname&version 2021-08-12 21:47:47 +02:00
Felix Buehler db228f3a74 xz: replace name with pname&version 2021-08-12 20:35:32 +02:00
Sandro efbb23c889
Merge pull request #131538 from psibi/add-ouch
ouch: init at 0.1.5
2021-07-30 12:21:56 +00:00
github-actions[bot] a1d3be1d42
Merge master into staging-next 2021-07-28 12:01:16 +00:00
Sandro Jäckel ff42213e2d
mozlz4a: remove alias 2021-07-28 12:56:25 +02:00
Sibi Prabakaran d78400378b
ouch: init at 0.1.5 2021-07-26 08:19:29 +05:30
Vladimír Čunát 76f4182a36
zstd: fixup wrong preInstall order for isDarwin
This regressed in 03e499425 (PR #129873).
2021-07-25 09:45:29 +02:00
github-actions[bot] 2e00ed4420
Merge staging-next into staging 2021-07-22 06:01:44 +00:00
Sandro a55ab60d5e
Merge pull request #130928 from SuperSandro2000/cleanup-compression 2021-07-22 02:26:35 +02:00
Sandro Jäckel 93de4f3f6c
pxz: drop no longer required patch 2021-07-22 01:09:13 +02:00
Sandro Jäckel aaa06c39d5
kzipmix: 20091108 -> 20200115 2021-07-22 01:07:36 +02:00
Sandro Jäckel 09f99feeba
zsync: cleanup 2021-07-21 16:08:05 +02:00
Sandro Jäckel 56d6f78a0d
rzip: cleanup 2021-07-21 16:08:05 +02:00
Sandro Jäckel 676fe1cc8f
pxz: cleanup 2021-07-21 16:08:05 +02:00
Sandro Jäckel ab4a6cbdaf
pixz: cleanup 2021-07-21 16:08:04 +02:00
Sandro Jäckel d04efb055c
pigz: cleanup 2021-07-21 16:08:04 +02:00
Sandro Jäckel 75286ae016
lzop: cleanup 2021-07-21 16:08:03 +02:00
Sandro Jäckel 8f9e79923c
lrzip: cleanup 2021-07-21 13:41:59 +02:00
Sandro Jäckel 40e00bb8d4
lhasa: cleanup 2021-07-21 13:41:20 +02:00
Sandro Jäckel 7ca9718c5f
lbzip2: cleanup 2021-07-21 13:40:22 +02:00
Sandro Jäckel 459da1755b
kzipmix: cleanup 2021-07-21 13:39:50 +02:00
Sandro Jäckel 9807562b1f
gzrt: cleanup 2021-07-21 13:38:55 +02:00
Sandro Jäckel a2d112eb4b
dejsonlz4: cleanup 2021-07-21 13:38:03 +02:00
Sandro Jäckel 7c49b4143c
bsdiff: cleanup 2021-07-21 13:37:36 +02:00
Sandro Jäckel eaf2c4a2dd
bsc: cleanup 2021-07-21 13:36:40 +02:00
Sandro Jäckel 0a97ad6827
brotli: cleanup 2021-07-21 13:36:40 +02:00
github-actions[bot] 08a8809bfe
Merge staging-next into staging 2021-07-18 00:02:06 +00:00
github-actions[bot] 382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Sandro b4176ae90a
Merge pull request #130472 from Stunkymonkey/inherit-version3
various: cleanup of "inherit version;"
2021-07-18 00:38:39 +02:00
Felix Buehler 82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
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