staging-next-24.05 iteration 7 - 2024-12-24

pkgs/data/misc/cacert/default.nix

@@ -39,12 +39,16 @@ let
     pname = "nss-cacert-certdata";
     inherit version;
 
-    src = if nssOverride != null then nssOverride.src else fetchFromGitHub {
-      owner = "nss-dev";
-      repo = "nss";
-      rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM";
-      hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw=";
-    };
+    src =
+      if nssOverride != null then
+        nssOverride.src
+      else
+        fetchFromGitHub {
+          owner = "nss-dev";
+          repo = "nss";
+          rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM";
+          hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw=";
+        };
 
     dontBuild = true;
 

pkgs/development/libraries/expat/default.nix

@@ -18,14 +18,16 @@
 
 let
   version = "2.6.4";
-  tag = "R_${lib.replaceStrings ["."] ["_"] version}";
+  tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "expat";
   inherit version;
 
   src = fetchurl {
-    url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
+    url =
+      with finalAttrs;
+      "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
     hash = "sha256-ppVina4EcFWzfVCg/0d20dRdCkyELPTM7hWEQfVf9+4=";
   };
 

pkgs/development/libraries/libsoup/default.nix

@@ -1,22 +1,25 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, glib
-, libxml2
-, meson
-, ninja
-, pkg-config
-, gnome
-, libsysprof-capture
-, gobject-introspection
-, vala
-, libpsl
-, brotli
-, gnomeSupport ? true
-, sqlite
-, buildPackages
-, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
+{
+  stdenv,
+  lib,
+  fetchurl,
+  fetchpatch,
+  glib,
+  libxml2,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  libsysprof-capture,
+  gobject-introspection,
+  vala,
+  libpsl,
+  brotli,
+  gnomeSupport ? true,
+  sqlite,
+  buildPackages,
+  withIntrospection ?
+    lib.meta.availableOn stdenv.hostPlatform gobject-introspection
+    && stdenv.hostPlatform.emulatorAvailable buildPackages,
 }:
 
 stdenv.mkDerivation rec {

pkgs/misc/ghostscript/default.nix

@@ -137,22 +137,21 @@ stdenv.mkDerivation rec {
       export DARWIN_LDFLAGS_SO_PREFIX=$out/lib/
     '';
 
-    autoconf
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    export DARWIN_LDFLAGS_SO_PREFIX=$out/lib/
-  '';
-
-  configureFlags = [
-    "--with-system-libtiff"
-    "--without-tesseract"
-  ] ++ lib.optionals dynamicDrivers [
-    "--enable-dynamic"
-    "--disable-hidden-visibility"
-  ] ++ lib.optionals x11Support [
-    "--with-x"
-  ] ++ lib.optionals cupsSupport [
-    "--enable-cups"
-  ];
+  configureFlags =
+    [
+      "--with-system-libtiff"
+      "--without-tesseract"
+    ]
+    ++ lib.optionals dynamicDrivers [
+      "--enable-dynamic"
+      "--disable-hidden-visibility"
+    ]
+    ++ lib.optionals x11Support [
+      "--with-x"
+    ]
+    ++ lib.optionals cupsSupport [
+      "--enable-cups"
+    ];
 
   # make check does nothing useful
   doCheck = false;

pkgs/servers/sql/postgresql/generic.nix

@@ -163,16 +163,18 @@ let
           ./patches/specify_pkglibdir_at_runtime.patch
           ./patches/paths-with-postgresql-suffix.patch
 
-      (substituteAll {
-        src = ./patches/locale-binary-path.patch;
-        locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
-      })
-    ] ++ lib.optionals stdenv'.hostPlatform.isMusl (
-      # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
-      map fetchurl (lib.attrValues muslPatches)
-    ) ++ lib.optionals stdenv'.isLinux  [
-      (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch)
-    ];
+          (substituteAll {
+            src = ./patches/locale-binary-path.patch;
+            locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
+          })
+        ]
+        ++ lib.optionals stdenv'.hostPlatform.isMusl (
+          # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
+          map fetchurl (lib.attrValues muslPatches)
+        )
+        ++ lib.optionals stdenv'.isLinux [
+          (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch)
+        ];
 
       installTargets = [ "install-world" ];