Merge branch 'staging' into staging-next

We've lost most of finished binaries due to a buildEnv fix (#363710),
e.g. rebuilding darwin stdenvs, so let's pull more of `staging`, too.

pkgs/applications/editors/emacs/build-support/wrapper.nix

@@ -75,7 +75,7 @@ runCommand
           # well :D.
           local varSlice="$var[*]"
           # ''${..-} to hack around old bash empty array problem
-          case "''${!varSlice-}" in
+          case " ''${!varSlice-} " in
               *" $pkg "*) return 0 ;;
           esac
           unset -v varSlice

pkgs/applications/editors/neovim/utils.nix

@@ -90,7 +90,7 @@ let
     /* the function you would have passed to lua.withPackages */
     , extraLuaPackages ? (_: [])
     , withNodeJs ? false
-    , withRuby ? true
+    , withRuby ? false
     , vimAlias ? false
     , viAlias ? false
     , configure ? {}

pkgs/applications/editors/vim/common.nix

@@ -1,14 +1,14 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.0787";
+  version = "9.1.0905";
 
   outputs = [ "out" "xxd" ];
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-kV2SaIOUv+ZcDsqBibZZ38gCevVLhejcYtY0TCQVtig=";
+    hash = "sha256-sFsTONGeSocn1M8NZo5LjIhagmq/nR1zrGRN7p86Q4o=";
   };
 
   enableParallelBuilding = true;

pkgs/applications/gis/grass/default.nix

@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libsvm
     libtiff
-    (libxml2.override { enableHttp = true; })
+    libxml2
     netcdf
     pdal
     postgresql

pkgs/by-name/al/alsa-lib/package.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "alsa-lib";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchurl {
     url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-SGjNkIYnJ52lpjT0aHAWJb6MwlHYQmLH5baiGDka0NI=";
+    hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY=";
   };
 
   patches = [

pkgs/by-name/ca/cairo/package.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3
+{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3
 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib
 , x11Support? !stdenv.hostPlatform.isDarwin || true, libXext, libXrender
 , gobjectSupport ? true, glib
@@ -41,6 +41,16 @@ in {
     Carbon
   ]);
 
+  patches = [
+    # Pull upstream fix to fix "out of memory" errors:
+    #   https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595
+    (fetchpatch {
+      name = "fix-oom.patch";
+      url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/b9eed915f9a67380e7ef9d8746656455c43f67e2.patch";
+      hash = "sha256-iWYxMVeNpseClSTf7BfU9GBe+tJWc+DUJWTWE5MnGh4=";
+    })
+  ];
+
   propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ]
     ++ optionals x11Support [ libXext libXrender ]
     ++ optionals xcbSupport [ libxcb ]

pkgs/by-name/de/desktop-file-utils/package.nix

@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "desktop-file-utils";
-  version = "0.27";
+  version = "0.28";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${version}.tar.xz";
-    hash = "sha256-oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY=";
+    hash = "sha256-RAHU4jHYQsLegkI5WnSjlcpGjNlvX2ENgi3zNZSJinA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/el/elfutils/package.nix

@@ -1,18 +1,18 @@
 { lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts
 , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
 , argp-standalone
-, enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform libarchive, sqlite, curl, libmicrohttpd, libarchive
+, enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform libarchive, sqlite, curl, json_c, libmicrohttpd, libarchive
 , gitUpdater, autoreconfHook
 }:
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   pname = "elfutils";
-  version = "0.191";
+  version = "0.192";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-33bbcTZtHXCDZfx6bGDKSDmPFDZ+sriVTvyIlxR62HE=";
+    hash = "sha256-YWCZvq4kq6Efm2PYbKbMjVZtlouAI5EzTJHfVOq0FrQ=";
   };
 
   patches = [
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableDebuginfod [
     sqlite
     curl
+    json_c
     libmicrohttpd
     libarchive
   ];

pkgs/by-name/gh/ghostscript/package.nix

@@ -2,6 +2,7 @@
 , stdenv
 , lib
 , fetchurl
+, fetchpatch2
 , pkg-config
 , zlib
 , expat
@@ -72,6 +73,12 @@ stdenv.mkDerivation rec {
   patches = [
     ./urw-font-files.patch
     ./doc-no-ref.diff
+
+    # Support SOURCE_DATE_EPOCH for reproducible builds
+    (fetchpatch2 {
+      url = "https://salsa.debian.org/debian/ghostscript/-/raw/01e895fea033cc35054d1b68010de9818fa4a8fc/debian/patches/2010_add_build_timestamp_setting.patch";
+      hash = "sha256-XTKkFKzMR2QpcS1YqoxzJnyuGk/l/Y2jdevsmbMtCXA=";
+    })
   ];
 
   outputs = [ "out" "man" "doc" "fonts" ];

pkgs/by-name/gm/gmt/package.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
 
   env = {
-    NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib";
+    NIX_LDFLAGS = "-lxml2 -L${lib.getLib libxml2}/lib";
     NIX_CFLAGS_COMPILE =
       lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration "
       + lib.optionalString (

pkgs/by-name/hw/hwdata/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwdata";
-  version = "0.389";
+  version = "0.390";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    hash = "sha256-w8rN9T0GwElkLmNLzROQtd7CdY0DcuCRUWxFtA2ekJc=";
+    hash = "sha256-DexmtBKe1rrmvHMVk8P20hBLfdP1x6CWx/F1s4lDnK4=";
   };
 
   configureFlags = [ "--datadir=${placeholder "out"}/share" ];

pkgs/by-name/js/json_c/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "json-c";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchFromGitHub {
     owner = "json-c";
     repo = "json-c";
-    rev = "json-c-0.17-20230812";
-    hash = "sha256-R5KIJ0xVgGqffjzJaZvvvhAneJ+ZBuanyF6KYTTxb58=";
+    rev = "json-c-0.18-20240915";
+    hash = "sha256-UyMXr8Vc6kDOx1/lD2YKPiHdaTotXAF9ak0yQuwrSUA=";
   };
 
   outputs = [ "out" "dev" ];

pkgs/by-name/li/libaom/package.nix

@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libaom";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchzip {
     url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
-    hash = "sha256-7xtIT8zalh1XJfVKWeC/+jAkhOuFHw6Q0+c2YMtDark=";
+    hash = "sha256-SqXDeIApj7XEK2cChenN9pun5eNm4Q+Smpp76xHwMMU=";
     stripRoot = false;
   };
 

pkgs/by-name/li/libjxl/package.nix

@@ -27,15 +27,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libjxl";
-  version = "0.11.0";
+  version = "0.11.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "libjxl";
     repo = "libjxl";
     rev = "v${version}";
-    hash = "sha256-lBc0zP+f44YadwOU9+I+YYWzTrAg7FSfF3IQuh4LjM4=";
+    hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE=";
     # There are various submodules in `third_party/`.
     fetchSubmodules = true;
   };

pkgs/by-name/li/libmysofa/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmysofa";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
     rev = "v${version}";
-    hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg=";
+    hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
   };
 
   outputs = [ "out" "dev" ];

pkgs/by-name/li/librist/package.nix

@@ -11,23 +11,16 @@
 
 stdenv.mkDerivation rec {
   pname = "librist";
-  version = "0.2.10";
+  version = "0.2.11";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "rist";
     repo = "librist";
     rev = "v${version}";
-    hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";
+    hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY=";
   };
 
-  patches = [
-    # https://github.com/NixOS/nixpkgs/pull/257020
-    ./darwin.patch
-    # https://code.videolan.org/rist/librist/-/merge_requests/257
-    ./musl.patch
-  ];
-
   nativeBuildInputs = [
     meson
     ninja

pkgs/by-name/li/libwacom/package.nix

@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
-  version = "2.13.0";
+  version = "2.14.0";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linuxwacom";
     repo = "libwacom";
     rev = "libwacom-${finalAttrs.version}";
-    hash = "sha256-OJQe0GdndgpvW4aJdgSKWw+u3ng1pn3FgdcA81jfmkQ=";
+    hash = "sha256-tJwLcHXXg4tFk7qKQyt+6dcDo8Qykqjn13MfXMoGvKc=";
   };
 
   postPatch = ''

pkgs/by-name/li/libzip/package.nix

@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libzip";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchurl {
     url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz";
-    hash = "sha256-wOb6UqYroR79MCYikNxpcJR67zLgzClO5Q6QBc6sCSo=";
+    hash = "sha256-aypDg3AF4cI/3+5TK3j4BoY+QS0gibnEK0mrCMvNdmU=";
   };
 
   outputs = [ "out" "dev" "man" ];

pkgs/by-name/ma/mapserver/package.nix

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     libjpeg
     libpng
     librsvg
-    (libxml2.override { enableHttp = true; })
+    libxml2
     postgresql
     proj
     protobufc

pkgs/by-name/ma/maturin/package.nix

@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.7.4";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-Zephf4mB3RI5YIAOIjfqIfgVANefkH63OQoPPMe417E=";
+    hash = "sha256-2uf49Rz6x0+Mb9EKjyAIlfdmfZ3qRVFLUgwW02SDE48=";
   };
 
-  cargoHash = "sha256-yLKt/Xml7ig6QG3T5Qn39tW7U5NIN1hSOaLiSRMiy5I=";
+  cargoHash = "sha256-SXomWGP7xCheIW2n1QNavq28EVWOpwh9AsCYPPUMm14=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security

pkgs/by-name/mu/mupdf/package.nix

@@ -61,12 +61,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.24.9";
+  version = "1.24.11";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    hash = "sha256-C0RqoO7MEU6ZadzNcMl4k1j8y2WJqB1HDclBoIdNqYo=";
+    hash = "sha256-GRInuWd19nBe99lVEYdRGTK1GSc7NFNaMxSRz32YFj8=";
   };
 
   patches = [

pkgs/by-name/pd/pdal/package.nix

@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     laszip
     libgeotiff
     libtiff
-    (libxml2.override { enableHttp = true; })
+    libxml2
     openscenegraph
     postgresql
     proj