diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
| commit | 09e494f4c296b29755fb8639e3f751f6aa706a45 (patch) | |
| tree | 1f1ff77e46b78c8d91808fef8405361366867dd4 /pkgs/top-level | |
| parent | 6b8044795e4b7ff99b96259a4a6b09eb9380703d (diff) | |
| parent | b2181bc967053310657128d687e44ec683e7604b (diff) | |
| download | nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.gz nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.bz2 nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.lz nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.xz nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.tar.zst nixpkgs-09e494f4c296b29755fb8639e3f751f6aa706a45.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1a2b734de8..c9c7e34e972 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1281,7 +1281,9 @@ with pkgs; argyllcms = callPackage ../tools/graphics/argyllcms {}; - arj = callPackage ../tools/archivers/arj { }; + arj = callPackage ../tools/archivers/arj { + stdenv = gccStdenv; + }; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -7813,6 +7815,8 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; + netdiscover = callPackage ../tools/networking/netdiscover { }; + nethogs = callPackage ../tools/networking/nethogs { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; @@ -28202,7 +28206,7 @@ with pkgs; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; - super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; + super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -29562,7 +29566,12 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { + boost = boost17x; + miniupnpc = miniupnpc_2; + withGui = false; + inherit (darwin) autoSignDarwinBinariesHook; + }; cgminer = callPackage ../applications/blockchains/cgminer { }; |