Vladimír Čunát
8caa1418f6
Merge branch 'master' into staging-next-2022-04-23
2022-04-28 18:04:16 +02:00
Mario Rodas
d54f49cbd0
Merge pull request #169637 from wyndon/init-httm
...
httm: init at 0.9.0
Closes https://github.com/NixOS/nixpkgs/issues/170698
2022-04-27 18:50:56 -05:00
github-actions[bot]
073cad8fd6
Merge master into staging-next
2022-04-25 12:04:02 +00:00
adisbladis
9ea7bd4e67
rmfuse: 0.2.1 -> 0.2.3
2022-04-25 17:00:58 +12:00
adisbladis
9af334d8fc
Revert "rmfuse: 0.2.1 -> 0.2.3"
...
This reverts commit 4f62471862
.
2022-04-25 16:20:03 +12:00
adisbladis
2683fa17f2
Merge pull request #139480 from Zhaith-Izaliel/master
...
rmfuse: 0.2.1 -> 0.2.3
2022-04-25 10:33:06 +07:00
Vladimír Čunát
82ec893b68
Merge branch 'staging' into staging-next
2022-04-23 18:10:57 +02:00
Mario Rodas
2dcf00e6f4
Merge pull request #169543 from trofi/fix-zkfuse-for-gcc-11
...
zkfuse: add a -std=c++14 workaround for gcc-11
2022-04-22 22:09:29 -05:00
Artturin
f1c7f19e49
treewide: testVersion -> testers.testVersion
2022-04-22 16:24:27 +03:00
wyndon
260470a1b2
httm: init at 0.9.0
2022-04-22 00:54:59 +02:00
Sergei Trofimovich
06e48b1552
zkfuse: add a -std=c++14 workaround for gcc-11
...
Otherwise the build fails as:
zkadapter.h:616:33: error: ISO C++17 does not allow dynamic exception specifications
2022-04-21 08:12:34 +01:00
Ben Siraphob
259fa13d53
treewide: remove nativeBuildInputs that are in stdenv
2022-04-16 21:46:46 +03:00
Martin Weinelt
2bd8fc9378
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-16 00:52:15 +02:00
Ben Siraphob
0074718c56
Merge pull request #168791 from roblabla/fix-mtools-darwin
...
mtools: Fix build on darwin by providing libiconv to buildInputs
2022-04-15 18:09:23 +00:00
roblabla
24dbe601c9
mtools: Fix build on darwin by providing libiconv to buildInputs
2022-04-15 17:23:25 +02:00
Martin Weinelt
a7fc5aaa76
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-15 13:30:48 +02:00
Malo Bourgon
0e802eafad
treewide: add meta.mainProgram to many packages
2022-04-14 10:24:01 -07:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
...
Minor conflicts; I hope I didn't mess up:
pkgs/development/tools/misc/binutils/default.nix
pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Alyssa Ross
fd3f39303b
squashfs-tools-ng: 1.1.3 -> 1.1.4
2022-04-13 08:20:27 +00:00
github-actions[bot]
bf63dd7434
Merge staging-next into staging
2022-04-10 18:01:38 +00:00
Nick Cao
46093e942f
garage: 0.6.1 -> 0.7.0
2022-04-10 18:05:20 +08:00
github-actions[bot]
55db28db36
Merge staging-next into staging
2022-04-09 18:01:56 +00:00
Madoura
ba944d42b3
bcachefs-tools: unstable-2022-03-22 -> unstable-2022-04-08
2022-04-09 02:22:23 -05:00
github-actions[bot]
c57af6e8b0
Merge staging-next into staging
2022-04-08 18:11:40 +00:00
Vlad M
4f75c9974d
Merge pull request #167811 from r-ryantm/auto-update/lfs
...
lfs: 2.4.0 -> 2.5.0
2022-04-08 21:00:33 +03:00
Lassulus
8be8cc6a7b
Merge pull request #167713 from helsinki-systems/upd/xfsprogs
...
xfsprogs: 5.14.2 -> 5.15.0
2022-04-08 17:00:26 +01:00
R. Ryantm
f46c19b575
lfs: 2.4.0 -> 2.5.0
2022-04-08 03:27:03 +00:00
github-actions[bot]
1266a252ca
Merge staging-next into staging
2022-04-08 00:02:53 +00:00
Graham Christensen
16543b630a
zpool-auto-expand-partitions: init at 0.1.0
2022-04-07 13:06:52 -04:00
ajs124
9b377e72cf
xfsprogs: 5.14.2 -> 5.15.0
2022-04-07 15:25:47 +01:00
Martin Weinelt
cc774b5792
Merge remote-tracking branch 'origin/staging-next' into staging
2022-04-07 12:12:57 +02:00
Sandro
41e7bba517
Merge pull request #166839 from Luflosi/update/apfsprogs
2022-04-06 14:06:34 +02:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging
2022-04-06 00:02:41 +00:00
Vladimír Čunát
b4729bad3d
Merge #165406 : staging-next 2022-03-23
2022-04-05 20:34:08 +02:00
Armeen Mahdian
701ea1da06
buttersink: remove
...
Motivated by #148779 and an unmaintained upstream.
2022-04-05 07:59:26 -05:00
Martin Weinelt
bf1914e12a
Merge remote-tracking branch 'origin/staging-next' into staging
2022-04-05 04:05:02 +02:00
Martin Weinelt
c6476294e1
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-04 18:40:34 +02:00
lunik1
2105726e87
xfsdump: init at 3.1.10
2022-04-04 14:56:58 +01:00
github-actions[bot]
ffa96ab0c0
Merge staging-next into staging
2022-04-02 18:01:37 +00:00
github-actions[bot]
fc17fe6417
Merge master into staging-next
2022-04-02 18:01:07 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/libraries/zlib/default.nix
pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
...
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
Luflosi
4ea204571a
apfsprogs: unstable-2021-10-26 -> unstable-2022-02-23
2022-04-01 18:21:31 +02:00
github-actions[bot]
be4f006d3c
Merge master into staging-next
2022-03-31 18:01:13 +00:00
Ben Siraphob
61776f460f
treewide: remove stdenv from buildInputs
2022-03-31 11:19:30 -05:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging
2022-03-31 12:02:10 +00:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/einops/default.nix
pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs
2022-03-30 20:17:24 -05:00
Alyssa Ross
fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
...
At some point, I'd like to make another attempt at
71f1f4884b
("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d
. One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries. This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.
This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching. The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.
I started by making the following global replacements:
${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
${openssl.out}/lib -> ${lib.getLib openssl}/lib
Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.
Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.
Then I manually investigated and fixed the following packages:
- pycurl
- citrix-workspace
- ppp
- wraith
- unbound
- gambit
- acl2
I'm reasonably confindent in my fixes for all of them.
For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all. Removing it doesn't make a difference to the output size, the
file list, or the closure.
I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Jan Tojnar
c8a5db3854
Merge branch 'staging-next' into staging
...
; Conflicts:
; pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00