Merge staging-next into staging

lib/systems/architectures.nix

@@ -137,6 +137,17 @@ rec {
       "avx512"
       "fma"
     ];
+    rocketlake = [
+      "sse3"
+      "ssse3"
+      "sse4_1"
+      "sse4_2"
+      "aes"
+      "avx"
+      "avx2"
+      "avx512"
+      "fma"
+    ];
     cascadelake = [
       "sse3"
       "ssse3"
@@ -419,6 +430,7 @@ rec {
       sapphirerapids = [ "tigerlake" ] ++ inferiors.tigerlake;
       emeraldrapids = [ "sapphirerapids" ] ++ inferiors.sapphirerapids;
 
+      rocketlake = [ "x86-64-v4" ] ++ inferiors.x86-64-v4;
       alderlake = [ "skylake" ] ++ inferiors.skylake;
       sierraforest = [ "alderlake" ] ++ inferiors.alderlake;
 

nixos/modules/services/web-apps/movim.nix

@@ -71,9 +71,10 @@ let
         stateDirectories = # sh
           ''
             # Symlinking in our state directories
-            rm -rf $out/{.env,cache} ${appDir}/{log,public/cache}
+            rm -rf $out/{.env,cache} ${appDir}/{log,public/cache,public/images}
             ln -s ${cfg.dataDir}/.env ${appDir}/.env
             ln -s ${cfg.dataDir}/public/cache ${appDir}/public/cache
+            ln -s ${cfg.dataDir}/public/images ${appDir}/public/images
             ln -s ${cfg.logDir} ${appDir}/log
             ln -s ${cfg.runtimeDir}/cache ${appDir}/cache
           '';
@@ -867,8 +868,9 @@ in
           fi
 
           # Caches, logs
-          mkdir -p ${cfg.dataDir}/public/cache ${cfg.logDir} ${cfg.runtimeDir}/cache
+          mkdir -p ${cfg.dataDir}/public/{cache,images} ${cfg.logDir} ${cfg.runtimeDir}/cache
           chmod -R ug+rw ${cfg.dataDir}/public/cache
+          chmod -R ug+rw ${cfg.dataDir}/public/images
           chmod -R ug+rw ${cfg.logDir}
           chmod -R ug+rwx ${cfg.runtimeDir}/cache
 
@@ -946,6 +948,10 @@ in
           inherit user group;
           mode = "0750";
         };
+        "${dataDir}/public/images".d = {
+          inherit user group;
+          mode = "0750";
+        };
         "${runtimeDir}".d = {
           inherit user group;
           mode = "0700";

pkgs/build-support/cc-wrapper/default.nix

@@ -195,6 +195,7 @@ let
         cooperlake = versionAtLeast ccVersion "10.0";
         tigerlake = versionAtLeast ccVersion "10.0";
         knm = versionAtLeast ccVersion "8.0";
+        rocketlake = versionAtLeast ccVersion "11.0";
         alderlake = versionAtLeast ccVersion "12.0";
         sapphirerapids = versionAtLeast ccVersion "11.0";
         emeraldrapids = versionAtLeast ccVersion "13.0";
@@ -228,6 +229,7 @@ let
         icelake-client = versionAtLeast ccVersion "7.0";
         icelake-server = versionAtLeast ccVersion "7.0";
         knm = versionAtLeast ccVersion "7.0";
+        rocketlake = versionAtLeast ccVersion "13.0";
         alderlake = versionAtLeast ccVersion "16.0";
         sapphirerapids = versionAtLeast ccVersion "12.0";
         emeraldrapids = versionAtLeast ccVersion "16.0";

pkgs/build-support/writers/test.nix

@@ -471,7 +471,7 @@ recurseIntoAttrs {
     toml = expectDataEqual {
       file = writeTOML "data.toml" { hello = "world"; };
       expected = ''
-        hello = "world"
+        hello = 'world'
       '';
     };
 

pkgs/by-name/ab/abook/package.nix

@@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   meta = {
     homepage = "http://abook.sourceforge.net/";
     description = "Text-based addressbook program designed to use with mutt mail client";

pkgs/by-name/ch/chroma/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "chroma";
-  version = "2.24.0";
+  version = "2.24.1";
 
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = "chroma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KfojHrRJjGT03WeBobvBO9pHsJP6I7fSxzcSlmCsaxE=";
+    hash = "sha256-AcXfyqwcDCVG3msdUOA8M5sRgKM6UjUsou9/zKEHnE8=";
   };
 
   vendorHash = "sha256-Vq5k4Jz4r5iZs7Yy175Ubj92eSr4v1xCtbLYhfo3OAg=";

pkgs/by-name/de/decker/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "decker";
-  version = "1.60";
+  version = "1.66";
 
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-A8lsQs3fZm8XREHx2IPRNWZp4tTZ4Jya30+gBT6xME8=";
+    hash = "sha256-GKhIm9TC0l1u4dblnemqM72uXY9ah4QWCJiyv1bu14I=";
   };
 
   buildInputs = [

pkgs/by-name/fl/flood/package.nix

@@ -8,30 +8,30 @@
   pnpmConfigHook,
   nix-update-script,
 }:
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "flood";
-  version = "4.13.9";
+  version = "4.13.10";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
-    rev = "v${version}";
-    hash = "sha256-0jez1JwgE7J4EOm5wC/hFpvaP4+Zl/XvupLYAR/tGJQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b2Va/t1yiIo1cmxSXfFd74z7pc3NjRCktioqEKxzUJI=";
   };
 
   nativeBuildInputs = [ pnpm_9 ];
   npmConfigHook = pnpmConfigHook;
-  npmDeps = pnpmDeps;
+  npmDeps = finalAttrs.pnpmDeps;
   dontNpmPrune = true;
   pnpmDeps = fetchPnpmDeps {
-    inherit
+    inherit (finalAttrs)
       pname
       version
       src
       ;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-OqaRlqL08W8V35TYBk2mvgPDl58rLQV/avnSQGBvdNY=";
+    hash = "sha256-NQ6SJ0etny+HE4ND/2s28Sbfi7vr+YnjCBfVB0OKWqM=";
   };
 
   passthru = {
@@ -44,6 +44,7 @@ buildNpmPackage rec {
   meta = {
     description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
     homepage = "https://flood.js.org";
+    changelog = "https://github.com/jesec/flood/releases/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       azahi
@@ -53,4 +54,4 @@ buildNpmPackage rec {
     ];
     mainProgram = "flood";
   };
-}
+})

pkgs/by-name/ga/gammu/package.nix

@@ -18,6 +18,8 @@
   libdbi-drivers ? null,
   postgresSupport ? false,
   libpq ? null,
+  libgudev,
+  glib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -58,8 +60,10 @@ stdenv.mkDerivation (finalAttrs: {
     libusb1
     curl
     gettext
+    glib
     sqlite
     libiconv
+    libgudev
   ]
   ++ lib.optionals dbiSupport [
     libdbi

pkgs/by-name/ga/garnet/deps.json

@@ -164,6 +164,11 @@
     "version": "8.17.0",
     "hash": "sha256-kmYad8WDMK9lZQBOCrsu3HuzXCbD+oQmRcOZU9++VPI="
   },
+  {
+    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
+    "version": "17.14.15",
+    "hash": "sha256-wv0Hi7pjPYeSwDFyaa8baIOyiUraVfudmVtpm0okoYU="
+  },
   {
     "pname": "System.ClientModel",
     "version": "1.7.0",

pkgs/by-name/ga/garnet/package.nix

@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.1.3";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-4XGJ+TnWMiphXumy42AmNnCixqLGmLftANwDz11f6TQ=";
+    hash = "sha256-YMfeY5VaC9brkiaK5UAkTlAUy7jFgbKBXPml9GYDsUs=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

pkgs/by-name/gi/gitoxide/package.nix

@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitoxide";
-  version = "0.52.1";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PcRX5k4rqi61VnEpbKR2avChLBhPNSEsUjvul2myWOY=";
+    hash = "sha256-fg5Y2WYlDqcV2OIVHUWMMP2e/gz2FNBUd0AmZzKUVx8=";
   };
 
-  cargoHash = "sha256-zeT+2gIJbRqVtAiulccRoczd+xdYBkcWWYzbk/bRtXA=";
+  cargoHash = "sha256-i48mE6PJTDeT+xOwljKxXZiSDvHPON+ysMptm8obIUU=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/go/go-toml/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.3.0";
+  version = "2.3.1";
 in
 buildGoModule {
   pname = "go-toml";
@@ -14,7 +14,7 @@ buildGoModule {
     owner = "pelletier";
     repo = "go-toml";
     rev = "v${version}";
-    sha256 = "sha256-bA8UYvYx5avw+3yzGL9TTZYGSrFUA6RxtomlSJnQHNA=";
+    sha256 = "sha256-12PFm89E8GI2toBpEZWp+VaAlywI6yBoPjz421GhMu4=";
   };
 
   vendorHash = null;

pkgs/by-name/ha/haproxy/package.nix

@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.3.6";
+  version = "3.3.8";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5py13Fnk6x/3K86/MNVfCRmAPGhuQowMOlkD8s98H7Y=";
+    hash = "sha256-ibH+c9VNWZD3SZfag39f0NoWJ6G6pism9dNYpvPEgpU=";
   };
 
   buildInputs = [

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

@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     "CFLAGS=-std=gnu17"
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "File editor/viewer/analyzer for executables";
     homepage = "https://hte.sourceforge.net";

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

@@ -104,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ openssl ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   configureScript = "./autogen.sh";
 
   meta = {

pkgs/by-name/li/librewolf-unwrapped/librewolf.nix

@@ -33,8 +33,8 @@ rec {
     sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild
 
     # Temporary fix used with patches/rust-build.patch
-    sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/b9432f9ed39742015f4bb4c3e75c89a2b9a9eef943dd0fd7cd889fddd1e6d39c/g' third_party/rust/encoding_rs/.cargo-checksum.json
-
+    sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/60cd124908737068ab21c7773b3df71d00e186cd605f15bad9977232830aabc0/g' third_party/rust/encoding_rs/.cargo-checksum.json
+    sed -i 's/d7405d2bcf99cf9729075473c45f677630f4c1947c8ba9757db607f2025a7da2/a066ad881d5a74386e666fc844f7fecbbd70021d0330c1b08a2d7a2a67437ccf/g' third_party/rust/encoding_rs/.cargo-checksum.json
 
     cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences
     cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences

pkgs/by-name/li/librewolf-unwrapped/src.json

@@ -1,11 +1,11 @@
 {
-  "packageVersion": "150.0-1",
+  "packageVersion": "150.0.1-1",
   "source": {
-    "rev": "150.0-1",
-    "hash": "sha256-udoXrll3sQnG8Jp6AZtd9V2vela4Uej9SKy7wP7YiUc="
+    "rev": "150.0.1-1",
+    "hash": "sha256-9+NiNv6uAxdj3zFurH3dBDWk4SJxdgJaHAm67aOmJAk="
   },
   "firefox": {
-    "version": "150.0",
-    "hash": "sha512-d+jq6G57F8M5M/3qbTtfvnPmYTlJ5iwT2e0+WT57oLUHAfqX/H1WoniWHS4c2ykCJEwwoQIHkAkbCuLwyxtOcQ=="
+    "version": "150.0.1",
+    "hash": "sha512-s3EOGzUAIxK/JI6CJoEDm3XsEZb40BTIiwN3ybBvNHgEaRUqmK2WdEClGkoMpFQYumI5Q4+GmuVkzILAI2RReQ=="
   }
 }

pkgs/by-name/li/libtorrent-rakshasa/package.nix

@@ -14,23 +14,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rakshasa";
-  version = "0.16.8";
+  version = "0.16.11";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-catUO7dlJUu8td/+EtBsEs128y/c+teT5xk5H+vkipE=";
+    hash = "sha256-T8Td2bQlO21ieXdJ+oZ4GytJiGxb9AcgBsygl8yMrpI=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
-    curl
     pkg-config
   ];
 
   buildInputs = [
     cppunit
+    curl
     openssl
     zlib
   ];

pkgs/by-name/mo/movim/package.nix

@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   writeShellScript,
   dash,
   php,
@@ -44,15 +45,23 @@ let
 in
 php.buildComposerProject2 (finalAttrs: {
   pname = "movim";
-  version = "0.32.1";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "movim";
     repo = "movim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1sNStxgvP8iaiINIa4UOFz8RGeQlFvJK5+RGlK/3Xa8=";
+    hash = "sha256-TQ8PLmz9hn+OFfIF5cckv5gGhID7vuA5O1xVJ6PSPVA=";
   };
 
+  patches = [
+    # Removes debug var_dump that was accidentally left in
+    (fetchpatch2 {
+      url = "https://github.com/movim/movim/commit/239bd099711d196df574106155374f301f2c9531.patch";
+      hash = "sha256-tLWUOKTJDFE9obrnghG/S8FHJY0rcWlueWncHVdi0Jk=";
+    })
+  ];
+
   php = php.buildEnv (
     {
       extensions = (
@@ -88,12 +97,12 @@ php.buildComposerProject2 (finalAttrs: {
     ++ lib.optional minify.style.enable lightningcss
     ++ lib.optional minify.svg.enable scour;
 
-  vendorHash = "sha256-8tEs+kQGB0pmhEQndOOOUDTFkIq+OvyKTmi9YAvK6qc=";
+  vendorHash = "sha256-iy869AKgn/ZL1jYFvqvYkfr4lv5J4l2W6glGqZvJLhE=";
 
   postPatch = ''
     # Our modules are already wrapped, removes missing *.so warnings;
     # replacing `$configuration` with actually-used flags.
-    substituteInPlace src/Movim/Daemon/Session.php \
+    substituteInPlace src/Movim/Daemon/SessionsWorker.php \
       --replace-fail \
         "'exec ' . PHP_BINARY . ' ' . \$configuration . '" \
         "'exec ' . PHP_BINARY . ' -dopcache.enable=1 -dopcache.enable_cli=1 ' . '"

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

@@ -10,14 +10,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.32";
+  version = "1.3.36";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-67u4KsVVZntt8Iu49GMj2aCpRupyeBaws6/XqBQuEJg=";
+    hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM=";
   };
 
   vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ=";

pkgs/by-name/ni/nixfmt-rs/package.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  scdoc,
+  versionCheckHook,
+  nix-update-script,
+  nixfmt,
+  gitMinimal,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nixfmt-rs";
+  version = "0.2.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "nixfmt-rs";
+    tag = finalAttrs.version;
+    hash = "sha256-eBVi22+EGMYWv2t/seoPqou8PuABxVcsWTFcrNYP6So=";
+  };
+
+  cargoHash = "sha256-fadjOtfB8bFuhTN9mAmi2A526boW7Aje39IBjdxszok=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    scdoc
+  ];
+
+  postBuild = ''
+    scdoc < docs/nixfmt.1.scd > nixfmt.1
+  '';
+
+  postInstall = ''
+    installManPage nixfmt.1
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  nativeCheckInputs = [
+    gitMinimal
+    nixfmt
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/Mic92/nixfmt-rs/releases/tag/${finalAttrs.version}";
+    description = "Rust reimplementation of nixfmt that produces byte-identical output to the Haskell original";
+    homepage = "https://github.com/Mic92/nixfmt-rs";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      drupol
+      mic92
+    ];
+    mainProgram = "nixfmt";
+  };
+})

pkgs/by-name/ni/nixtamal/package.nix

@@ -7,6 +7,8 @@
   darwin,
   makeBinaryWrapper,
   coreutils,
+  curl,
+  gawk,
   nix-prefetch-darcs,
   nix-prefetch-fossil,
   nix-prefetch-git,
@@ -18,7 +20,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.4.1";
+  version = "1.5.0";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -27,7 +29,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-0iXSACRjdBkEV+9wfcKJhpzY3oArd66g/Dc30HcCbng=";
+    hash = "sha256-noQU480HoxVjnHvEY/rso9jANNA8EIKbYeYpnhkkx74=";
   };
 
   nativeBuildInputs = [
@@ -110,6 +112,8 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     wrapProgram "$bin/bin/nixtamal" --prefix PATH : ${
       lib.makeBinPath [
         coreutils
+        curl
+        gawk
         nix-prefetch-darcs
         nix-prefetch-fossil
         nix-prefetch-git

pkgs/by-name/pg/pgtui/package.nix

@@ -0,0 +1,75 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromCodeberg,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "pgtui";
+  version = "0.14.0";
+
+  src = fetchFromCodeberg {
+    owner = "kdwarn";
+    repo = "pgtui";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-sIrB1eaKJr0CJ42KPtIUhBQgPf2VoZJk5uQUS/gHBjE=";
+  };
+
+  cargoHash = "sha256-QxG+OtFZr5SIsnzCyuMf03J2CKgeGDHHcvERx6O+DJk=";
+
+  checkFlags = [
+    "--skip=db_tests::tests::test_connection"
+    "--skip=editor::tests::insert_successful_in_mixed_case_table"
+    "--skip=editor::tests::insert_successful_with_pk"
+    "--skip=editor::tests::update_errs_when_no_primary_key"
+    "--skip=editor::tests::update_success_in_mixed_case_table"
+    "--skip=editor::tests::update_success_when_primary_key_is_identity"
+    "--skip=editor::tests::update_success_with_bigint_pk"
+    "--skip=editor::tests::update_success_with_bpchar_pk"
+    "--skip=editor::tests::update_success_with_char_pk"
+    "--skip=editor::tests::update_success_with_char_var_pk"
+    "--skip=editor::tests::update_success_with_citext_pk"
+    "--skip=editor::tests::update_success_with_date_pk"
+    "--skip=editor::tests::update_success_with_dbl_pk"
+    "--skip=editor::tests::update_success_with_dt_no_tz_pk"
+    "--skip=editor::tests::update_success_with_dt_with_tz_pk"
+    "--skip=editor::tests::update_success_with_f32real_pk"
+    "--skip=editor::tests::update_success_with_int_pk"
+    "--skip=editor::tests::update_success_with_numeric_pk"
+    "--skip=editor::tests::update_success_with_smallint_pk"
+    "--skip=editor::tests::update_success_with_text_pk"
+    "--skip=editor::tests::update_success_with_time_no_tz_pk"
+    "--skip=fields::tests::collect_field_errs_when_relation_not_handled_type"
+    "--skip=fields::tests::collect_field_metadata_errs_when_relation_not_handled_type"
+    "--skip=fields::tests::field_collect"
+    "--skip=fields::tests::fieldmeta_collect"
+    "--skip=fields::tests::verify_big_decimal_types"
+    "--skip=fields::tests::verify_char_types"
+    "--skip=fields::tests::verify_date_types"
+    "--skip=fields::tests::verify_datetime_types"
+    "--skip=fields::tests::verify_datetime_values"
+    "--skip=fields::tests::verify_float32_types"
+    "--skip=fields::tests::verify_float64_types"
+    "--skip=fields::tests::verify_integer_types"
+    "--skip=fields::tests::verify_time_no_tz_types"
+    "--skip=fields::tests::verify_time_no_tz_values"
+    "--skip=fields::tests::verify_time_with_tz_types"
+    "--skip=relations::tests::data_definition_correct"
+    "--skip=relations::tests::multi_col_primary_key_correct"
+    "--skip=relations::tests::single_col_int_primary_key_correct"
+    "--skip=relations::tests::single_col_text_primary_key_correct"
+  ];
+
+  meta = {
+    description = "A Postgres TUI client that utilizes your terminal text editor for inserts & updates";
+    mainProgram = "pgtui";
+    homepage = "https://kdwarn.net/pgtui";
+    changelog = "https://codeberg.org/kdwarn/pgtui/src/tag//v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+    ];
+  };
+})

pkgs/by-name/ph/phrasendrescher/fix-prototypes.patch

@@ -0,0 +1,26 @@
+diff --git a/src/rewriter.c b/src/rewriter.c
+index f8c72bf..9c95e7e 100644
+--- a/src/rewriter.c
++++ b/src/rewriter.c
+@@ -64,7 +64,7 @@ int rewriter_get(char *word)
+     	
+ 	if (word == '\0') {
+ 		*original_word = '\0';
+-		rewriter_reset(rule_set);
++		rewriter_reset();
+ 		return 0;
+ 	}
+ 	
+diff --git a/src/utils.h b/src/utils.h
+index c20ac5c..b8fe00a 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -33,7 +33,7 @@
+ 
+ void	prepare_tty();
+ void	reset_tty();
+-void	handle_user_input();
++void	handle_user_input(int worker_num);
+ void	set_verbose();
+ 
+ void	verbose_printf(const char *fmt, ...);

pkgs/by-name/ph/phrasendrescher/package.nix

@@ -5,6 +5,7 @@
   openssl,
   libssh2,
   gpgme,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "18vg6h294219v14x5zqm8ddmq5amxlbz7pw81lcmpz8v678kwyph";
   };
 
+  patches = [
+    # gcc15
+    ./fix-prototypes.patch
+  ];
+
   postPatch = ''
     substituteInPlace configure \
       --replace 'SSL_LIB="ssl"' 'SSL_LIB="crypto"'
@@ -29,6 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--with-plugins" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-h";
+  doInstallCheck = true;
+
   meta = {
     description = "Modular and multi processing pass phrase cracking tool";
     homepage = "https://leidecker.info/projects/phrasendrescher/index.shtml";

pkgs/by-name/pr/process-viewer/package.nix

@@ -8,14 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "process-viewer";
-  version = "0.5.8";
+  version = "0.5.11";
+
+  __structuredAttrs = true;
 
   src = fetchCrate {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
+    inherit (finalAttrs) version;
+    pname = "process_viewer";
+    hash = "sha256-d2qEcb9iPnhNnRFbzbktk36hyL16opcDgE9xOnmlJGg=";
   };
 
-  cargoHash = "sha256-vmNqay/tYGASSez+VqyCQVMW+JGqfBvjwSKx0AG/LeY=";
+  cargoHash = "sha256-UD0eTRfHimp6ZGStvrP1upUe3yO3Mw96Sq3OG4Y7zn0=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -31,7 +34,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Process viewer GUI in rust";
     homepage = "https://github.com/guillaumegomez/process-viewer";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.matthiasbeyer ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      kybe236
+    ];
     mainProgram = "process_viewer";
   };
 })

pkgs/by-name/pr/prometheus/package.nix

@@ -198,6 +198,10 @@ buildGoModule (finalAttrs: {
   checkFlags = [
     # Skip for issue during TSDB compaction
     "-skip=TestBlockRanges"
+    # both are flaky and might fail when the builder is under load
+    # https://github.com/prometheus/prometheus/issues/16450
+    "-skip=TestDelayedCompaction"
+    "-skip=TestHeadCompactionWhileScraping"
   ]
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     "-skip=TestEvaluations/testdata/aggregators.test"

pkgs/by-name/rt/rtorrent/package.nix

@@ -16,19 +16,22 @@
   pkg-config,
   stdenv,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
   withLua ? false,
   zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtorrent";
-  version = "0.16.8";
+  version = "0.16.11";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TG5wEJwOPhgmKNcpjTuSu6MNk91t9sR33mXIUueR4yA=";
+    hash = "sha256-OEIJMBj1UfIOpR1w8c8ztKWJVD5hKxiJaxweF7mBRNM=";
   };
 
   outputs = [
@@ -36,10 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     installShellFiles
     pkg-config
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [
@@ -69,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "-h";
+  versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru = {
     inherit libtorrent-rakshasa;

pkgs/by-name/sy/syft/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "syft";
-  version = "1.43.0";
+  version = "1.44.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JWcJn8NU9GfTJDKFedop5UuLq/SqFFdM26F7yhkcQyM=";
+    hash = "sha256-Yh/JmZbsIPP69EnkwUId3C+5Z2rT787LRcTuMyt9KhA=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

pkgs/by-name/ti/tinycc/package.nix

@@ -3,6 +3,7 @@
   copyPkgconfigItems,
   fetchFromRepoOrCz,
   makePkgconfigItem,
+  apple-sdk,
   perl,
   stdenv,
   texinfo,
@@ -63,19 +64,40 @@ stdenv.mkDerivation (finalAttrs: {
     "--cc=$CC"
     "--ar=$AR"
     "--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
-    "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
+    "--sysincludepaths=${
+      lib.concatStringsSep ":" (
+        [
+          "{B}/include"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+          "${apple-sdk.sdkroot}/usr/include"
+        ]
+        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+          "${lib.getDev stdenv.cc.libc}/include"
+        ]
+      )
+    }"
     # The first libpath will be the one in which tcc will look for libtcc1.a,
     # which is need for its tests.
     "--libpaths=$lib/lib/tcc:$lib/lib:${lib.getLib stdenv.cc.libc}/lib"
     # build cross compilers
     "--enable-cross"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # The bounds checker has an unresolved arm64 atomic helper on Darwin.
+    "--config-bcheck=no"
+  ]
   ++ lib.optionals stdenv.hostPlatform.isMusl [
     "--config-musl"
   ];
 
   enableParallelBuilding = true;
 
+  preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+    # TCC cannot cross-compile x86 long double constants from aarch64-darwin.
+    makeFlagsArray+=("TCC_X=i386-win32 x86_64-win32 arm arm64 arm-wince c67 riscv64 arm64-osx")
+  '';
+
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=implicit-int"
     "-Wno-error=int-conversion"
@@ -83,7 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Test segfault for static build
   doInstallCheck =
-    !stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    !stdenv.hostPlatform.isStatic
+    && stdenv.buildPlatform.canExecute stdenv.hostPlatform
+    && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
 
   postPatch = ''
     patchShebangs texi2pod.pl
@@ -143,8 +167,6 @@ stdenv.mkDerivation (finalAttrs: {
       onemoresuza
     ];
     platforms = lib.platforms.unix;
-    # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
   };
 })
 # TODO: self-compilation

pkgs/by-name/tu/turingdb/package.nix

@@ -26,13 +26,13 @@ let
 in
 turingstdenv.mkDerivation (finalAttrs: {
   pname = "turingdb";
-  version = "1.29";
+  version = "1.30";
 
   src = fetchFromGitHub {
     owner = "turing-db";
     repo = "turingdb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jaSA/asTEKw3HOYq6HOFSLG17RqnhdX6gqL2rNh9MB8=";
+    hash = "sha256-dYggkkuTC+amR/Alz+B1YCNo5kHgmrt/dNLRW5EgaZY=";
 
     fetchSubmodules = true;
 

pkgs/by-name/va/vacuum-tube/package.nix

@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-M12JonxOnY0JM7JghGAhs2cV/EsDNMpD9PBNRYp6Q8o=";
+    hash = "sha256-YTgVJ+vX5SLXtPee1Fp/Jr84o5wjbP+P4/Bly3GZxpc=";
   };
 
-  npmDepsHash = "sha256-Zud3I8rdl9ILK2uQZQ3GqYEIE7CZkiYHB/P/ryLEMvk=";
+  npmDepsHash = "sha256-9Eu6GO8mhn5/1EPPInv4ImWrIkQxVjLjJ/IZ8nHkWII=";
   makeCacheWritable = true;
 
   env = {

pkgs/development/python-modules/cvxpy/default.nix

@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   numpy,
@@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: {
   pname = "cvxpy";
   version = "1.8.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "cvxpy";
@@ -36,6 +38,15 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-MDKTuiePzqdIJlTRxbCOxoaEAisGx368iWbwKEB97QU=";
   };
 
+  patches = [
+    # Upstream PR: https://github.com/cvxpy/cvxpy/pull/3290
+    (fetchpatch {
+      name = "highs-1.14.0.patch";
+      url = "https://github.com/cvxpy/cvxpy/commit/89f8d337d927457c2e308de8295dd83f274e40e7.patch";
+      hash = "sha256-BO878Kz5ZH5FHkxZugzT+n6wjsoOReqCZWM2HDvFqAw=";
+    })
+  ];
+
   postPatch =
     # too tight tolerance in tests (AssertionError)
     ''

pkgs/development/python-modules/orjson/cross-arch-compat.patch

@@ -12,33 +12,37 @@ riscv64, leading to compilation errors.
 Now uses CARGO_CFG_TARGET_ARCH environment variable to correctly
 detect the target architecture during cross-compilation.
 ---
- build.rs | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
+ build.rs | 7 ++++++--
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/build.rs b/build.rs
-index 42788623..28e006a9 100644
+index 49a9a9a4..0a99698d 100644
 --- a/build.rs
 +++ b/build.rs
-@@ -38,8 +38,11 @@ fn main() {
+@@ -11,6 +11,9 @@ fn main() {
      #[allow(unused_variables)]
      let is_64_bit_python = matches!(python_config.pointer_width, Some(64));
 
--    #[cfg(all(target_arch = "x86_64", not(target_os = "macos")))]
--    if version_check::is_min_version("1.89.0").unwrap_or(false) && is_64_bit_python {
-+    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
-+    let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
++    let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
++    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
 +
-+    if target_arch == "x86_64" && target_os != "macos"
-+        && version_check::is_min_version("1.89.0").unwrap_or(false) && is_64_bit_python {
+     match python_config.implementation {
+         pyo3_build_config::PythonImplementation::CPython => {
+             println!("cargo:rustc-cfg=CPython");
+@@ -18,7 +21,7 @@ fn main() {
+             println!("cargo:rustc-cfg=CPython");
+             #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
+-            if is_64_bit_python {
++            if (target_arch == "x86_64" || target_arch == "aarch64") && is_64_bit_python {
+                 println!("cargo:rustc-cfg=feature=\"inline_int\"");
+                 #[cfg(target_endian = "little")]
+                 println!("cargo:rustc-cfg=feature=\"inline_str\"");
+             }
+@@ -50,7 +53,7 @@ fn main() {
+     println!("cargo:rustc-check-cfg=cfg(PyPy)");
+
+     #[cfg(all(target_arch = "x86_64", not(target_os = "macos")))]
+-    if is_64_bit_python {
++    if target_arch == "x86_64" && target_os != "macos" && is_64_bit_python {
          println!("cargo:rustc-cfg=feature=\"avx512\"");
      }
-
-@@ -51,8 +54,7 @@ fn main() {
-         println!("cargo:rustc-cfg=feature=\"optimize\"");
-     }
-
--    #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
--    if is_64_bit_python {
-+    if (target_arch == "x86_64" || target_arch == "aarch64") && is_64_bit_python {
-         println!("cargo:rustc-cfg=feature=\"inline_int\"");
-     }

pkgs/servers/nextcloud/default.nix

@@ -53,14 +53,14 @@ let
 in
 {
   nextcloud32 = generic {
-    version = "32.0.8";
-    hash = "sha256-WK2N34YNdaKUuXqOPjlWLeyH/2UMuRwRRYmzdEqx3g0=";
+    version = "32.0.9";
+    hash = "sha256-/W1ZGXXv3hyvDoQnqCuqVaSot65kPaKe2D4pnCCMHu4=";
     packages = nextcloud32Packages;
   };
 
   nextcloud33 = generic {
-    version = "33.0.2";
-    hash = "sha256-kSV6tQAtXQnajQnYA4mYMzA1HFwAp+OiWxd7zqgRccw=";
+    version = "33.0.3";
+    hash = "sha256-XBBS+GCzWqVrJLwmE6a+oMIjE7n70CuwJHwfC52/d9I=";
     packages = nextcloud33Packages;
   };