Update to Nixpkgs 24.05

.clang-format

@@ -31,4 +31,3 @@ AlwaysBreakBeforeMultilineStrings: true
 IndentPPDirectives: AfterHash
 PPIndentWidth: 2
 BinPackArguments: false
-BinPackParameters: false

build/hydra.nix

@@ -129,7 +129,7 @@ in
   };
 
   # System tests.
-  tests = import ../tests/nixos { inherit lib nixpkgs nixpkgsFor; } // {
+  tests = import ../tests/nixos { inherit lib nixpkgs nixpkgsFor self; } // {
 
     # Make sure that nix-env still produces the exact same result
     # on a particular version of Nixpkgs.
@@ -151,10 +151,11 @@ in
 
     nixpkgsLibTests =
       forAllSystems (system:
-        import (nixpkgs + "/lib/tests/release.nix")
+        import (nixpkgs + "/lib/tests/test-with-nix.nix")
           {
+            lib = nixpkgsFor.${system}.native.lib;
+            nix = self.packages.${system}.nix;
             pkgs = nixpkgsFor.${system}.native;
-            nixVersions = [ self.packages.${system}.nix ];
           }
       );
   };
@@ -169,10 +170,10 @@ in
     pkgs.runCommand "install-tests"
       {
         againstSelf = testNixVersions pkgs pkgs.nix pkgs.pkgs.nix;
-        againstCurrentUnstable =
+        againstCurrentLatest =
           # FIXME: temporarily disable this on macOS because of #3605.
           if system == "x86_64-linux"
-          then testNixVersions pkgs pkgs.nix pkgs.nixUnstable
+          then testNixVersions pkgs pkgs.nix pkgs.nixVersions.latest
           else null;
         # Disabled because the latest stable version doesn't handle
         # `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work

flake.nix

@@ -3,8 +3,9 @@
 
   # TODO switch to nixos-23.11-small
   #      https://nixpk.gs/pr-tracker.html?pr=291954
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
+  inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
   inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
   inputs.libgit2 = { url = "github:libgit2/libgit2"; flake = false; };
 
@@ -45,6 +46,7 @@
         "armv7l-unknown-linux-gnueabihf"
         "riscv64-unknown-linux-gnu"
         "x86_64-unknown-netbsd"
+        "x86_64-unknown-freebsd"
         "x86_64-w64-mingw32"
       ];
 
@@ -146,16 +148,9 @@
               ++ [ "-DUSE_SSH=exec" ];
           });
 
-          boehmgc-nix = (final.boehmgc.override {
+          boehmgc-nix = final.boehmgc.override {
             enableLargeConfig = true;
-          }).overrideAttrs(o: {
-            patches = (o.patches or []) ++ [
-              ./dep-patches/boehmgc-coroutine-sp-fallback.diff
-
-              # https://github.com/ivmai/bdwgc/pull/586
-              ./dep-patches/boehmgc-traceable_allocator-public.diff
-            ];
-          });
+          };
 
           libseccomp-nix = final.libseccomp.overrideAttrs (_: rec {
             version = "2.5.5";
@@ -165,8 +160,6 @@
             };
           });
 
-          changelog-d-nix = final.buildPackages.callPackage ./misc/changelog-d.nix { };
-
           nix =
             let
               officialRelease = false;
@@ -230,7 +223,7 @@
         rl-next =
           let pkgs = nixpkgsFor.${system}.native;
           in pkgs.buildPackages.runCommand "test-rl-next-release-notes" { } ''
-          LANG=C.UTF-8 ${pkgs.changelog-d-nix}/bin/changelog-d ${./doc/manual/rl-next} >$out
+          LANG=C.UTF-8 ${pkgs.changelog-d}/bin/changelog-d ${./doc/manual/rl-next} >$out
         '';
         repl-completion = nixpkgsFor.${system}.native.callPackage ./tests/repl-completion.nix { };
       } // (lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
@@ -244,7 +237,7 @@
       );
 
       packages = forAllSystems (system: rec {
-        inherit (nixpkgsFor.${system}.native) nix changelog-d-nix;
+        inherit (nixpkgsFor.${system}.native) nix changelog-d;
         default = nix;
       } // (lib.optionalAttrs (builtins.elem system linux64BitSystems) {
         nix-static = nixpkgsFor.${system}.static.nix;

maintainers/release-notes

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix
-#!nix shell .#changelog-d-nix --command bash
+#!nix shell .#changelog-d --command bash
 
 # --- CONFIGURATION ---
 

src/libexpr-c/nix_api_expr.h

@@ -114,12 +114,12 @@ nix_err nix_value_call_multi(
  *
  * @see nix_value_call_multi
  */
-#define NIX_VALUE_CALL(context, state, value, fn, ...)                  \
-  do {                                                                  \
-    Value * args_array[] = {__VA_ARGS__};                               \
-    size_t nargs = sizeof(args_array) / sizeof(args_array[0]);          \
-    nix_value_call_multi(context, state, fn, nargs, args_array, value); \
-  } while (0)
+#define NIX_VALUE_CALL(context, state, value, fn, ...)                      \
+    do {                                                                    \
+        Value * args_array[] = {__VA_ARGS__};                               \
+        size_t nargs = sizeof(args_array) / sizeof(args_array[0]);          \
+        nix_value_call_multi(context, state, fn, nargs, args_array, value); \
+    } while (0)
 
 /**
  * @brief Forces the evaluation of a Nix value.