Merge master into staging-next

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -183,6 +183,8 @@
   To forcibly reenable cgroup v1 support, you can `set boot.kernelParams = [ "systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ]`.
   NixOS does not officially support this configuration and might cause your system to be unbootable in future versions. You are on your own.
 
+- `nrfutil` which previously pointed to the now-deprecated `pc-nrfutil` python package, has been repackaged under the same name with the new nrfutil tool.
+
 - `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components for the majority of users. Users needing this support can
   use the new `opensshWithKerberos` and `openssh_hpnWithKerberos` flavors (e.g. `programs.ssh.package = pkgs.openssh_gssapi`).
 

nixos/modules/installer/cd-dvd/iso-image.nix

@@ -722,7 +722,7 @@ in
     "/nix/.ro-store" = lib.mkImageMediaOverride
       { fsType = "squashfs";
         device = "/iso/nix-store.squashfs";
-        options = [ "loop" "threads=multi" ];
+        options = [ "loop" ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
         neededForBoot = true;
       };
 

nixos/modules/installer/netboot/netboot.nix

@@ -47,7 +47,7 @@ with lib;
     fileSystems."/nix/.ro-store" = mkImageMediaOverride
       { fsType = "squashfs";
         device = "../nix-store.squashfs";
-        options = [ "loop" "threads=multi" ];
+        options = [ "loop" ] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
         neededForBoot = true;
       };
 

pkgs/by-name/ht/htgettoken/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  makeWrapper,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "htgettoken";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "fermitools";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yHUD8UaRNclALKKToFNzC49w5jivabXBt28xi6/u0Ow=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
+    makeWrapper
+  ];
+
+  postInstall = with python3.pkgs; ''
+    wrapProgram $out/bin/htgettoken \
+      --set PYTHONPATH "${
+        makePythonPath [
+          gssapi
+          paramiko
+          urllib3
+        ]
+      }"
+  '';
+
+  meta = with lib; {
+    description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server ";
+    license = licenses.bsd3;
+    homepage = "https://github.com/fermitools/htgettoken";
+    maintainers = with maintainers; [ veprbl ];
+  };
+}

pkgs/by-name/nr/nrfutil/package.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  makeWrapper,
+  libusb1,
+  segger-jlink-headless,
+}:
+
+let
+  source = import ./source.nix;
+  supported = removeAttrs source [ "version" ];
+
+  platform = supported.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}");
+
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "nrfutil";
+  inherit (source) version;
+
+  src = fetchurl {
+    url = "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz";
+    inherit (platform) hash;
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv data/* $out/
+
+    wrapProgram $out/bin/nrfutil \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          segger-jlink-headless
+          libusb1
+        ]
+      }"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = with lib; {
+    description = "CLI tool for managing Nordic Semiconductor devices";
+    homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util";
+    changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html";
+    license = licenses.unfree;
+    platforms = attrNames supported;
+    maintainers = with maintainers; [ h7x4 ];
+    mainProgram = "nrfutil";
+  };
+})

pkgs/by-name/nr/nrfutil/source.nix

@@ -0,0 +1,15 @@
+{
+  version = "7.11.1";
+  x86_64-linux = {
+    name = "x86_64-unknown-linux-gnu";
+    hash = "sha256-faF/iA07wWiAuxeqEZciIYlnoWe4LKCtDxD0BwIyeYw=";
+  };
+  x86_64-darwin = {
+    name = "x86_64-apple-darwin";
+    hash = "sha256-EImYXMIvxPgzaGuAOWi4O6mG5S1awdGSX0HQgT1iHaI=";
+  };
+  aarch64-darwin = {
+    name = "aarch64-apple-darwin";
+    hash = "sha256-jgigeJRHH/c761wYGMHhtRHE59ms7obZPxiH5pKeoeQ=";
+  };
+}

pkgs/by-name/nr/nrfutil/update.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq nix nix-prefetch-github xq-xml
+
+nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
+
+narhash() {
+    nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash
+}
+
+set -euo pipefail
+
+declare -A architectures
+declare -A versions
+declare -A hashes
+
+architectures["x86_64-linux"]="x86_64-unknown-linux-gnu"
+architectures["x86_64-darwin"]="x86_64-apple-darwin"
+architectures["aarch64-darwin"]="aarch64-apple-darwin"
+
+binary_list=$(curl "https://developer.nordicsemi.com/.pc-tools/nrfutil/" | xq -q "#files" | grep -o -E 'nrfutil-(x86_64|aarch64)-.*?.gz' | cut -d' ' -f 1)
+
+for a in ${!architectures[@]}; do
+    versions["$a"]=$(echo "$binary_list" | grep "${architectures[${a}]}" | sed -r "s/nrfutil-${architectures[${a}]}-(.*?).tar.gz/\\1/" | tail -n 1)
+    echo "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz"
+    hashes["$a"]=$(narhash "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz")
+done
+
+{
+    printf "{\n"
+    printf "  version = \"${versions["x86_64-linux"]}\";\n"
+    for a in ${!architectures[@]}; do
+        printf "  ${a} = {\n"
+        printf "    name = \"${architectures[${a}]}\";\n"
+        printf "    hash = \"${hashes[${a}]}\";\n"
+        printf "  };\n"
+    done
+    printf "}\n"
+} > "${nixpkgs}/pkgs/by-name/nr/nrfutil/source.nix"

pkgs/by-name/xl/xlights/package.nix

@@ -2,11 +2,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2024.15";
+  version = "2024.16";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-/KUcBr5Z8xITeEL3g/5UFQ483lUY/fvf8VtlnSOcqu0=";
+    hash = "sha256-r9NtNuPmc8J1y3MxA4oSdRmPKDQeDQENdKbNVlcGwAI=";
   };
 
   meta = {

pkgs/development/compilers/dart/default.nix

@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       with C-style syntax. It offers compilation to JavaScript, interfaces,
       mixins, abstract classes, reified generics, and optional typing.
     '';
+    mainProgram = "dart";
     platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.bsd3;

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

@@ -14,6 +14,7 @@
 , libllvm
 , libcxx
 , linuxHeaders
+, freebsd
 , libxcrypt
 
 # Some platforms have switched to using compiler-rt, but still want a
@@ -68,7 +69,8 @@ stdenv.mkDerivation ({
     ++ [ python3 libllvm.dev ]
     ++ lib.optional stdenv.isDarwin xcbuild.xcrun;
   buildInputs =
-    lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders;
+    lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders
+    ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include;
 
   env.NIX_CFLAGS_COMPILE = toString ([
     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
@@ -155,12 +157,11 @@ stdenv.mkDerivation ({
   '') + ''
     substituteInPlace lib/builtins/int_util.c \
       --replace "#include <stdlib.h>" ""
-  '' + (if stdenv.hostPlatform.isFreeBSD then
-    # As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!!
+  '' + (lib.optionalString (!stdenv.hostPlatform.isFreeBSD)
+    # On FreeBSD, assert/static_assert are macros and allowing them to be implicitly declared causes link errors.
+    # see description above for why we're nuking assert.h normally but that doesn't work here.
+    # instead, we add the freebsd.include dependency explicitly
     ''
-    substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \
-      --replace "#include <assert.h>" "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))"
-    '' else ''
     substituteInPlace lib/builtins/clear_cache.c \
       --replace "#include <assert.h>" ""
     substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \

pkgs/development/tools/misc/nrfutil/default.nix

@@ -1,55 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "nrfutil";
-  version = "6.1.7";
-
-  src = fetchFromGitHub {
-    owner = "NordicSemiconductor";
-    repo = "pc-nrfutil";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    click
-    crcmod
-    ecdsa
-    libusb1
-    intelhex
-    pc-ble-driver-py
-    piccata
-    protobuf
-    pyserial
-    pyspinel
-    pyyaml
-    tqdm
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    behave
-    pytestCheckHook
-  ];
-
-  # Workaround: pythonRelaxDepsHook doesn't work for this.
-  postPatch = ''
-    mkdir test-reports
-    substituteInPlace requirements.txt \
-      --replace "libusb1==1.9.3" "libusb1" \
-      --replace "protobuf >=3.17.3, < 4.0.0" "protobuf"
-    substituteInPlace nordicsemi/dfu/tests/test_signing.py \
-      --replace "self.assertEqual(expected_vk_pem, vk_pem)" ""
-  '';
-
-  meta = {
-    description = "Device Firmware Update tool for nRF chips";
-    homepage = "https://github.com/NordicSemiconductor/pc-nrfutil";
-    license = lib.licenses.unfreeRedistributable;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ gebner ];
-  };
-}

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -4,8 +4,8 @@
         "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy"
     },
     "6.1": {
-        "version": "6.1.110",
-        "hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly"
+        "version": "6.1.111",
+        "hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"
     },
     "5.15": {
         "version": "5.15.167",
@@ -24,8 +24,8 @@
         "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
     },
     "6.6": {
-        "version": "6.6.51",
-        "hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w"
+        "version": "6.6.52",
+        "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"
     },
     "6.8": {
         "version": "6.8.12",
@@ -36,8 +36,8 @@
         "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
     },
     "6.10": {
-        "version": "6.10.10",
-        "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6"
+        "version": "6.10.11",
+        "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv"
     },
     "6.11": {
         "version": "6.11",

pkgs/os-specific/linux/nct6687d/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nct6687d";
-  version = "0-unstable-2024-02-23";
+  version = "0-unstable-2024-09-02";
 
   src = fetchFromGitHub {
     owner = "Fred78290";
     repo = "nct6687d";
-    rev = "0ee35ed9541bde22fe219305d1647b51ed010c5e";
-    hash = "sha256-g81U+ngnsOslBDCQP51uDDyHPpCv9T/j+KmFUAQfz/M=";
+    rev = "f45b72a6ca335e20f8a2df5ee5d4e130916150d0";
+    hash = "sha256-2sAL6aXUafmm2DKIhqEoTSPZVmzu/lnTkpPznJndX3o=";
   };
 
   setSourceRoot = ''

pkgs/os-specific/linux/ryzenadj/default.nix

@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, pciutils, cmake }:
 stdenv.mkDerivation rec {
   pname = "ryzenadj";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "FlyGoat";
     repo = "RyzenAdj";
     rev = "v${version}";
-    sha256 = "sha256-aNkVP1fuPcb41Qk5YI1loJnqVmamSzoMFyTGkJtrnvg=";
+    sha256 = "sha256-VuIrA5UrRqwUta/mrYd+6F4gh/Z65+zzoTXUlRA8wzA=";
   };
 
   nativeBuildInputs = [ pciutils cmake ];

pkgs/servers/nosql/aerospike/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "7.1.0.5";
+  version = "7.1.0.6";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-eUB9A9dv71hlrnOQsKcZTfqxXVhz5ErhIOIks2wJois=";
+    hash = "sha256-10Ky4j4XyskjuuabCvD0mjpLOd9QjChM9TrDvKmgGHQ=";
     fetchSubmodules = true;
   };
 

pkgs/tools/filesystems/btrfs-progs/default.nix

@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "6.10.1";
+  version = "6.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    hash = "sha256-JWhGlrxbXQfJjxnUv3pItTq5SHDKTEaKaK89+eLIo14=";
+    hash = "sha256-/5rpFSEwOpDYfhxL4jDwEh85xE3b5Swq6uJjxv7PoJk=";
   };
 
   nativeBuildInputs = [

pkgs/top-level/all-packages.nix

@@ -18295,8 +18295,6 @@ with pkgs;
 
   nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
 
-  nrfutil = callPackage ../development/tools/misc/nrfutil { };
-
   obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; };
 
   obuild = callPackage ../development/tools/ocaml/obuild { };