···1212# See also: https://github.com/NixOS/nix/issues/7582
13131414builtins.mapAttrs (
1515- _: pkg: if builtins.isAttrs pkg then pkg.override { withAWS = false; } else pkg
1515+ attr: pkg:
1616+ if
1717+ # TODO descend in `nixComponents_*` and override `nix-store`. Also
1818+ # need to introduce the flag needed to do that with.
1919+ #
2020+ # This must be done before Nix 2.26 and beyond becomes the default.
2121+ !(builtins.elem attr [
2222+ "nixComponents_2_26"
2323+ "nix_2_26"
2424+ "latest"
2525+ ])
2626+ # There may-be non-package things, like functions, in there too
2727+ && builtins.isAttrs pkg
2828+ then
2929+ pkg.override { withAWS = false; }
3030+ else
3131+ pkg
1632) pkgs.nixVersions
···1717 offloadCfg = pCfg.offload;
1818 reverseSyncCfg = pCfg.reverseSync;
1919 primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable;
2020- busIDType = lib.types.strMatching "([[:print:]]+[:@][0-9]{1,3}:[0-9]{1,2}:[0-9])?";
2020+ busIDType = lib.types.strMatching "([[:print:]]+:[0-9]{1,3}(@[0-9]{1,10})?:[0-9]{1,2}:[0-9])?";
2121 ibtSupport = useOpenModules || (nvidia_x11.ibtSupport or false);
2222 settingsFormat = pkgs.formats.keyValue { };
2323in
···120120 prime.nvidiaBusId = lib.mkOption {
121121 type = busIDType;
122122 default = "";
123123- example = "PCI:1:0:0";
123123+ example = "PCI:1@0:0:0";
124124 description = ''
125125 Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
126126- shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
126126+ shows the NVIDIA GPU at "0001:02:03.4", set this option to "PCI:2@1:3:4".
127127+128128+ lspci might omit the PCI domain (0001 in above example) if it is zero.
129129+ In which case, use "@0" instead.
130130+131131+ Please be aware that this option takes decimal address while lspci reports
132132+ hexadecimal address. So for device at domain "10000", use "@65536".
127133 '';
128134 };
129135130136 prime.intelBusId = lib.mkOption {
131137 type = busIDType;
132138 default = "";
133133- example = "PCI:0:2:0";
139139+ example = "PCI:0@0:2:0";
134140 description = ''
135141 Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
136136- shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
142142+ shows the Intel GPU at "0001:02:03.4", set this option to "PCI:2@1:3:4".
143143+144144+ lspci might omit the PCI domain (0001 in above example) if it is zero.
145145+ In which case, use "@0" instead.
146146+147147+ Please be aware that this option takes decimal address while lspci reports
148148+ hexadecimal address. So for device at domain "10000", use "@65536".
137149 '';
138150 };
139151140152 prime.amdgpuBusId = lib.mkOption {
141153 type = busIDType;
142154 default = "";
143143- example = "PCI:4:0:0";
155155+ example = "PCI:4@0:0:0";
144156 description = ''
145157 Bus ID of the AMD APU. You can find it using lspci; for example if lspci
146146- shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0".
158158+ shows the AMD APU at "0001:02:03.4", set this option to "PCI:2@1:3:4".
159159+160160+ lspci might omit the PCI domain (0001 in above example) if it is zero.
161161+ In which case, use "@0" instead.
162162+163163+ Please be aware that this option takes decimal address while lspci reports
164164+ hexadecimal address. So for device at domain "10000", use "@65536".
147165 '';
148166 };
149167
···991010stdenv.mkDerivation rec {
1111 pname = "netdiscover";
1212- version = "0.10";
1212+ version = "0.11";
13131414 src = fetchFromGitHub {
1515 owner = "netdiscover-scanner";
1616 repo = pname;
1717- rev = version;
1818- sha256 = "sha256-Pd/Rf1G9z8sBZA5i+bzuzYUCiNI0Tv7Bz0lJDJCQU9I=";
1717+ tag = version;
1818+ hash = "sha256-LUM6vl6pohrTW3X9c1FaDE7j9mvMuAiDkFBKWc4KZso=";
1919 };
20202121 nativeBuildInputs = [ autoreconfHook ];
2222+2223 buildInputs = [
2324 libpcap
2425 libnet
···2930 meta = with lib; {
3031 description = "Network address discovering tool, developed mainly for those wireless networks without dhcp server, it also works on hub/switched networks";
3132 homepage = "https://github.com/netdiscover-scanner/netdiscover";
3333+ changelog = "https://github.com/netdiscover-scanner/netdiscover/releases/tag/${src.tag}";
3234 license = licenses.gpl3Plus;
3335 maintainers = with maintainers; [ vdot0x23 ];
3436 platforms = platforms.unix;
+1-1
pkgs/by-name/nt/ntfy/package.nix
···125125126126 meta = with lib; {
127127 description = "Utility for sending notifications, on demand and when commands finish";
128128- homepage = "https://ntfy.rtfd.org/";
128128+ homepage = "https://ntfy.readthedocs.io/en/latest/";
129129 license = licenses.gpl3;
130130 maintainers = with maintainers; [ kamilchm ];
131131 mainProgram = "ntfy";
+1-1
pkgs/by-name/pe/perseus-cli/package.nix
···2626 '';
27272828 meta = with lib; {
2929- homepage = "https://arctic-hen7.github.io/perseus";
2929+ homepage = "https://framesurge.sh/perseus/en-US";
3030 description = "High-level web development framework for Rust with full support for server-side rendering and static generation";
3131 maintainers = with maintainers; [ max-niederman ];
3232 license = with licenses; [ mit ];
+3-3
pkgs/by-name/pr/protols/package.nix
···6677rustPlatform.buildRustPackage rec {
88 pname = "protols";
99- version = "0.9.0";
99+ version = "0.11.1";
10101111 src = fetchFromGitHub {
1212 owner = "coder3101";
1313 repo = "protols";
1414 tag = version;
1515- hash = "sha256-MsQFGbUWymGYXLABWsDlSXAWBwxw0P9de/txrxdf/Lw=";
1515+ hash = "sha256-A2fa1rZvxVpJ6X0s0wTDROarGX5Fxp6zKK9cWiag7TQ=";
1616 };
17171818 useFetchCargoVendor = true;
1919- cargoHash = "sha256-eO35LukqPFooGFCluLhQacvqlVtreJH/XdnlBYwImbw=";
1919+ cargoHash = "sha256-Pvz15q9yGqcJecOvDWXQQCEDXuSEJbJyZ8Arj8Xbyh4=";
20202121 meta = {
2222 description = "Protocol Buffers language server written in Rust";
···11-diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
22-index 4fd1b1a..2d1d9d3 100644
33---- a/tree/CMakeLists.txt
44-+++ b/tree/CMakeLists.txt
55-@@ -40,16 +40,6 @@ if (NOT (WIN32 OR MSVC))
66- endif()
77- endif()
88-99--if(APPLE)
1010-- # On MacOS:
1111-- # -undefined dynamic_lookup is necessary for pybind11 linking
1212-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -w -undefined dynamic_lookup")
1313--
1414-- # On MacOS, we need this so that CMake will use the right Python if the user
1515-- # has a virtual environment active
1616-- set (CMAKE_FIND_FRAMEWORK LAST)
1717--endif()
1818--
1919- # Fetch pybind to be able to use pybind11_add_module symbol.
2020- set(PYBIND_VER v2.10.1)
2121- include(FetchContent)
···77 pkgs,
88 stdenv,
99 maintainers,
1010- ...
1010+ otherSplices,
1111}:
1212let
1313 officialRelease = true;
···2424 inherit (nixDependencies) newScope;
2525 }
2626 {
2727- otherSplices = generateSplicesForMkScope "nixComponents";
2727+ inherit otherSplices;
2828 f = import ./packaging/components.nix {
2929 inherit
3030 lib
···4545 inherit newScope; # layered directly on pkgs, unlike nixComponents above
4646 }
4747 {
4848- otherSplices = generateSplicesForMkScope "nixDependencies";
4848+ # Technically this should point to the nixDependencies set only, but
4949+ # this is ok as long as the scopes don't intersect.
5050+ inherit otherSplices;
4951 f = import ./dependencies.nix {
5052 inherit pkgs;
5153 inherit stdenv;
5254 };
5355 };
5456in
5555-(nixComponents.overrideSource src).nix-everything
5757+nixComponents.overrideSource src
+1
pkgs/top-level/aliases.nix
···327327 crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
328328 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
329329 critcl = tclPackages.critcl; # Added 2024-10-02
330330+ crunchy-cli = throw "'crunchy-cli' was sunset, see <https://github.com/crunchy-labs/crunchy-cli/issues/362>"; # Added 2025-03-26
330331 cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
331332 cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
332333 cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20