Merge master into staging-next

ci/OWNERS

@@ -200,6 +200,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn @wolfgangwalther
 /maintainers/scripts/haskell                  @sternenseemann @maralorn @wolfgangwalther
 /pkgs/development/compilers/ghc               @sternenseemann @maralorn @wolfgangwalther
+/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix  @sternenseemann @maralorn @wolfgangwalther @OPNA2608
 /pkgs/development/haskell-modules             @sternenseemann @maralorn @wolfgangwalther
 /pkgs/test/haskell                            @sternenseemann @maralorn @wolfgangwalther
 /pkgs/top-level/release-haskell.nix           @sternenseemann @maralorn @wolfgangwalther

nixos/modules/security/audit.nix

@@ -41,6 +41,8 @@ in
         '';
       };
 
+      package = lib.mkPackageOption pkgs "audit" { };
+
       failureMode = lib.mkOption {
         type = lib.types.enum [
           "silent"
@@ -93,7 +95,7 @@ in
       "audit_backlog_limit=${toString cfg.backlogLimit}"
     ];
 
-    environment.systemPackages = [ pkgs.audit ];
+    environment.systemPackages = [ cfg.package ];
 
     # upstream contains a audit-rules.service, which uses augenrules.
     # That script does not handle cleanup correctly and insists on loading from /etc/audit.
@@ -119,12 +121,12 @@ in
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
-        ExecStart = "${lib.getExe' pkgs.audit "auditctl"} -R ${rules}/audit.rules";
+        ExecStart = "${lib.getExe' cfg.package "auditctl"} -R ${rules}/audit.rules";
         ExecStopPost = [
           # Disable auditing
-          "${lib.getExe' pkgs.audit "auditctl"} -e 0"
+          "${lib.getExe' cfg.package "auditctl"} -e 0"
           # Delete all rules
-          "${lib.getExe' pkgs.audit "auditctl"} -D"
+          "${lib.getExe' cfg.package "auditctl"} -D"
         ];
       };
     };

nixos/modules/security/auditd.nix

@@ -101,6 +101,8 @@ in
   options.security.auditd = {
     enable = lib.mkEnableOption "the Linux Audit daemon";
 
+    package = lib.mkPackageOption pkgs "auditd" { default = "audit"; };
+
     settings = lib.mkOption {
       type = lib.types.submodule {
         freeformType = lib.types.attrsOf settingsType;
@@ -146,7 +148,7 @@ in
       defaultText = lib.literalExpression ''
         {
           af_unix = {
-            path = lib.getExe' pkgs.audit "audisp-af_unix";
+            path = lib.getExe' config.security.auditd.package "audisp-af_unix";
             args = [
               "0640"
               "/var/run/audispd_events"
@@ -155,15 +157,15 @@ in
             format = "binary";
           };
           remote = {
-            path = lib.getExe' pkgs.audit "audisp-remote";
+            path = lib.getExe' config.security.auditd.package "audisp-remote";
             settings = { };
           };
           filter = {
-            path = lib.getExe' pkgs.audit "audisp-filter";
+            path = lib.getExe' config.security.auditd.package "audisp-filter";
             args = [
               "allowlist"
               "/etc/audit/audisp-filter.conf"
-              (lib.getExe' pkgs.audit "audisp-syslog")
+              (lib.getExe' config.security.auditd.package "audisp-syslog")
               "LOG_USER"
               "LOG_INFO"
               "interpret"
@@ -171,7 +173,7 @@ in
             settings = { };
           };
           syslog = {
-            path = lib.getExe' pkgs.audit "audisp-syslog";
+            path = lib.getExe' config.security.auditd.package "audisp-syslog";
             args = [ "LOG_INFO" ];
           };
         }
@@ -226,7 +228,7 @@ in
 
     security.auditd.plugins = {
       af_unix = {
-        path = lib.getExe' pkgs.audit "audisp-af_unix";
+        path = lib.getExe' cfg.package "audisp-af_unix";
         args = [
           "0640"
           "/run/audit/audispd_events"
@@ -235,15 +237,15 @@ in
         format = "binary";
       };
       remote = {
-        path = lib.getExe' pkgs.audit "audisp-remote";
+        path = lib.getExe' cfg.package "audisp-remote";
         settings = { };
       };
       filter = {
-        path = lib.getExe' pkgs.audit "audisp-filter";
+        path = lib.getExe' cfg.package "audisp-filter";
         args = [
           "allowlist"
           "/etc/audit/audisp-filter.conf"
-          (lib.getExe' pkgs.audit "audisp-syslog")
+          (lib.getExe' cfg.package "audisp-syslog")
           "LOG_USER"
           "LOG_INFO"
           "interpret"
@@ -251,12 +253,12 @@ in
         settings = { };
       };
       syslog = {
-        path = lib.getExe' pkgs.audit "audisp-syslog";
+        path = lib.getExe' cfg.package "audisp-syslog";
         args = [ "LOG_INFO" ];
       };
     };
 
-    systemd.packages = [ pkgs.audit.out ];
+    systemd.packages = [ cfg.package.out ];
 
     systemd.services.auditd = {
       wantedBy = [ "multi-user.target" ];
@@ -271,7 +273,7 @@ in
         ExecStart = [
           # the upstream unit does not allow symlinks, so clear and rewrite the ExecStart
           ""
-          "${lib.getExe' pkgs.audit "auditd"} -l -s nochange"
+          "${lib.getExe' cfg.package "auditd"} -l -s nochange"
         ];
       };
     };

pkgs/applications/editors/jetbrains/ides/idea-oss.nix

@@ -8,10 +8,10 @@
 let
   src = mkJetBrainsSource {
     # update-script-start: source-args
-    version = "2025.3.1";
-    buildNumber = "253.29346.138";
+    version = "2025.3.1.1";
+    buildNumber = "253.29346.240";
     buildType = "idea";
-    ideaHash = "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU=";
+    ideaHash = "sha256-L5O6QjDY3SqSQ1DnQTjIez7pIvPAdtOXP/+B05bAV+Q=";
     androidHash = "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY=";
     jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=";
     restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=";

pkgs/applications/editors/jetbrains/ides/phpstorm.nix

@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz";
-      hash = "sha256-/Yk3q2t5YFzvyZF//moI4FprfMAlb6IXhiPSTsMi+ik=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.tar.gz";
+      hash = "sha256-u5b/elgB4/kMrgkgyqhz4L2BZqsNqt6Fwb+JIC1eSEk=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz";
-      hash = "sha256-dkhmf4W0xFkosE1MJvIogqiqZaeHpk+i96/+UaG8KmE=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.tar.gz";
+      hash = "sha256-iHIsnxTpuunA/L8/ZQsbQCqEfIu2lvtNNq9V0yPvBvY=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg";
-      hash = "sha256-EZiLzuXZSycepnrqzT6DYClZWmz+v+wmWVZfwYpK0tE=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.dmg";
+      hash = "sha256-L4brbVVJgRgv/A2yu3oDGycWX6z5IiDf/7Zd/W2V2tk=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg";
-      hash = "sha256-BFPgpu6Gw8v5e4xI8oJnUdgIW/ghG1QaBHUmIcWvFrw=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.dmg";
+      hash = "sha256-I1j18NK10Vda4F2VOIm3mvjqUvhFMc7OYq1NpyRG+bw=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2025.3.1";
-  buildNumber = "253.29346.151";
+  version = "2025.3.1.1";
+  buildNumber = "253.29346.257";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

pkgs/applications/graphics/sane/backends/default.nix

@@ -52,13 +52,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";
   };
 
-  # Fix hangs in tests, hopefully
-  # FIXME: remove in next release
   patches = [
+    # Fix hangs in tests, hopefully
+    # FIXME: remove in next release
     (fetchpatch {
       url = "https://gitlab.com/sane-project/backends/-/commit/8acc267d5f4049d8438456821137ae56e91baea9.patch";
       hash = "sha256-IyupDeH1MPvEBnGaUzBbCu106Gp7zXxlPGFAaiiINQI=";
     })
+    # Fix multipages scanning
+    # https://gitlab.com/sane-project/backends/-/merge_requests/883
+    (fetchpatch {
+      url = "https://gitlab.com/sane-project/backends/-/commit/fbf80b0fc1d262ed40d4b49dd53c14707083ef60.patch";
+      hash = "sha256-9KKTr7p1vCgvGr6hFY83K5gbL7Ilm4Uzc86JIxv+ahI=";
+      revert = true;
+    })
   ];
 
   postPatch = ''

pkgs/applications/graphics/tesseract/tesseract5.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tesseract";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "tesseract-ocr";
     repo = "tesseract";
     rev = version;
-    sha256 = "sha256-bLTYdT9CNfgrmmjP6m0rRqJDHiSOkcuGVCFwPqT12jk=";
+    sha256 = "sha256-VLmKwycJK66fFkdWOSYO5OJkJC8MTWKTQWIVb243ekc=";
   };
 
   enableParallelBuilding = true;

pkgs/applications/office/libreoffice/skip-broken-tests.patch

@@ -188,3 +188,15 @@ index e37df27fd817..937c12e8c4c5 100644
      saveAsPDF(u"tdf163105-kashida-spaces.fodt");
  
      auto pPdfDocument = parsePDFExport();
+diff --git a/sc/qa/unit/functions_array.cxx b/sc/qa/unit/functions_array.cxx
+index ef0da39f5..43caa9002 100644
+--- a/sc/qa/unit/functions_array.cxx
++++ b/sc/qa/unit/functions_array.cxx
+@@ -25,6 +25,7 @@ void ArrayFunctionsTest::testArrayFormulasFODS()
+ 
+ void ArrayFunctionsTest::testDubiousArrayFormulasFODS()
+ {
++    return; // flaky https://github.com/NixOS/nixpkgs/issues/398633
+     //TODO: sc/qa/unit/data/functions/array/dubious/fods/linest.fods produces widely different
+     // values when built with -ffp-contract enabled (-ffp-contract=on default on Clang 14,
+     // -ffp-contract=fast default when building with optimizations on GCC) on at least aarch64

pkgs/applications/virtualization/cri-o/default.nix

@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.34.3";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    hash = "sha256-2Avq1EzK+i+16yoPM7j6IlavDi2oUS5A1hOIdzVThEQ=";
+    hash = "sha256-aP3qhD2d1x+VPDifkg9lXgVD38UcongyN6vHkn8oYos=";
   };
   vendorHash = null;
 

pkgs/by-name/au/auto-editor/package.nix

@@ -1,12 +1,17 @@
 {
   lib,
+  stdenv,
+  config,
   buildNimPackage,
   fetchFromGitHub,
 
   withHEVC ? true,
-  withWhisper ? false,
+  withWhisper ? false, # TODO: Investigate linker failure. See PR 476678
+  withVpx ? true,
+  withSvtAv1 ? true,
+  withCuda ? false,
 
-  ffmpeg,
+  ffmpeg-full,
   yt-dlp,
   lame,
   libopus,
@@ -15,6 +20,7 @@
   x265,
   dav1d,
   svt-av1,
+  libvpl,
   whisper-cpp,
 
   python3,
@@ -23,42 +29,36 @@
 
 buildNimPackage rec {
   pname = "auto-editor";
-  version = "29.4.0";
+  version = "29.6.1";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-DzgR/GyVIUq6Dfes6OnTdYO/vyGBPcKSeD2IikF7sIM=";
+    hash = "sha256-7/ey7nZdy1SnGdW5LjX7dtxyqqvrTuIvtJXMXYVYB6k=";
   };
 
   lockFile = ./lock.json;
 
   buildInputs = [
-    ffmpeg
+    ffmpeg-full
     lame
     libopus
-    libvpx
     x264
     dav1d
-    svt-av1
   ]
-  ++ lib.optionals withHEVC [
-    x265
-  ]
-  ++ lib.optionals withWhisper [
-    whisper-cpp
-  ];
+  ++ lib.optionals withHEVC [ x265 ]
+  ++ lib.optionals withWhisper [ whisper-cpp ]
+  ++ lib.optionals withVpx [ libvpx ]
+  ++ lib.optionals withSvtAv1 [ svt-av1 ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libvpl ];
 
-  nimFlags = [
-    "--passc:-Wno-incompatible-pointer-types"
-  ]
-  ++ lib.optionals withHEVC [
-    "-d:enable_hevc"
-  ]
-  ++ lib.optionals withWhisper [
-    "-d:enable_whisper"
-  ];
+  nimFlags =
+    lib.optionals withHEVC [ "-d:enable_hevc" ]
+    ++ lib.optionals withWhisper [ "-d:enable_whisper" ]
+    ++ lib.optionals withVpx [ "-d:enable_vpx" ]
+    ++ lib.optionals withSvtAv1 [ "-d:enable_svtav1" ]
+    ++ lib.optionals withCuda [ "-d:enable_cuda" ];
 
   postPatch = ''
     substituteInPlace src/log.nim \
@@ -77,7 +77,7 @@ buildNimPackage rec {
   checkPhase = ''
     runHook preCheck
 
-    eval "nim r --nimcache:$NIX_BUILD_TOP/nimcache $nimFlags $src/tests/rationals.nim"
+    eval "nim r --nimcache:$NIX_BUILD_TOP/nimcache $nimFlags $src/tests/unit.nim"
 
     substituteInPlace tests/test.py \
       --replace-fail '"./auto-editor"' "\"$out/bin/main\""

pkgs/by-name/ba/bambu-studio/package.nix

@@ -57,13 +57,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bambu-studio";
-  version = "02.03.01.51";
+  version = "02.04.00.70";
 
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SnWOTFymTVHzYqraMzohOrpM0UuLW+PRfZBqkFASEWs=";
+    hash = "sha256-BrH8gKbc0y76wbWrQxU+0xMJcYAm4Gi/xmECVf6pGkI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/br/bruno-cli/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   clang_20,
   buildNpmPackage,
+  nodejs_22,
   bruno,
   pkg-config,
   pango,
@@ -21,6 +22,9 @@ buildNpmPackage {
   # to keep them in sync with easier maintenance
   inherit (bruno) version src npmDepsHash;
 
+  # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
+  nodejs = nodejs_22;
+
   npmWorkspace = "packages/bruno-cli";
   npmFlags = [ "--legacy-peer-deps" ];
 
@@ -45,6 +49,7 @@ buildNpmPackage {
 
     npm run build --workspace=packages/bruno-common
     npm run build --workspace=packages/bruno-graphql-docs
+    npm run build --workspace=packages/bruno-schema-types
     npm run build --workspace=packages/bruno-converters
     npm run build --workspace=packages/bruno-query
     npm run build --workspace=packages/bruno-filestore
@@ -64,12 +69,12 @@ buildNpmPackage {
     pushd $out/lib/node_modules/usebruno
 
     # packages used by the GUI app, unused by CLI
-    rm -r packages/bruno-{app,electron,tests,toml,schema,docs}
+    rm -r packages/bruno-{app,electron,tests,toml,docs}
     rm node_modules/bruno
-    rm node_modules/@usebruno/{app,tests,toml,schema}
+    rm node_modules/@usebruno/{app,tests,toml}
 
     # heavy dependencies that seem to be unused
-    rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*}
+    rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*,@swagger-api}
     rm -r node_modules/.bin
 
     # unused file types

pkgs/by-name/br/bruno/package.nix

@@ -21,13 +21,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.15.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-REK3rJ+Svf6bLIfLwizlLa3rIBgnhQHbhzTTe8VPoc4=";
+    hash = "sha256-lvv1SJuUxNwukg/yi6mhgvVs8M/Eyf2H36NJN+6XKSE=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
@@ -36,7 +36,7 @@ buildNpmPackage rec {
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-CXXXyDaaoAoZhUo1YNP3PUEGzlmIaDnA+JhrCqBY1H4=";
+  npmDepsHash = "sha256-zb0oP4/L7449z83tpcT6W/6sXS4Urph3ELN9kUC32dA=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
@@ -102,6 +102,7 @@ buildNpmPackage rec {
 
     npm run build --workspace=packages/bruno-common
     npm run build --workspace=packages/bruno-graphql-docs
+    npm run build --workspace=packages/bruno-schema-types
     npm run build --workspace=packages/bruno-converters
     npm run build --workspace=packages/bruno-app
     npm run build --workspace=packages/bruno-query
@@ -167,6 +168,11 @@ buildNpmPackage rec {
           makeWrapper ${lib.getExe electron} $out/bin/bruno \
             --add-flags $out/opt/bruno/resources/app.asar \
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+            --prefix LD_LIBRARY_PATH : ${
+              lib.makeLibraryPath [
+                stdenv.cc.cc.lib
+              ]
+            } \
             --set-default ELECTRON_IS_DEV 0 \
             --inherit-argv0
 

pkgs/by-name/ca/camunda-modeler/package.nix

@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "camunda-modeler";
-  version = "5.42.0";
+  version = "5.43.0";
 
   src = fetchurl {
     url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
-    hash = "sha256-6P3b9qcYOfKzJCsDc5K09fKklu/9jFYwoeLMbC8JR64=";
+    hash = "sha256-NR1UXnIU0Wf2WeiagqijEXz9qUShFbM1umenFFETOJI=";
   };
   sourceRoot = "camunda-modeler-${version}-linux-x64";
 

pkgs/by-name/cg/cgns/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   gfortran,
   tk,
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-0cZtq8nVAHAubHD6IDofnh8N7xiNHQkbhXR5OpdhPQU=";
   };
 
+  patches = [
+    # Fixes crash for test_particlef on LoongArch64
+    (fetchpatch2 {
+      url = "https://github.com/CGNS/CGNS/commit/0ea14abf6da44f13ca8a01117ad7af8eb405394c.patch?full_index=1";
+      hash = "sha256-dtwTD8YqRm0NCXTDPRHmaPLTU17ZLzOyVii1aoGYge0=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace src/cgnstools/tkogl/tkogl.c \
       --replace-fail "<tk-private/generic/tkInt.h>" "<tkInt.h>"

pkgs/by-name/ch/chiaki-ng/package.nix

@@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
     xxHash
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   cmakeFlags = [
     "-Wno-dev"
     (lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true")

pkgs/by-name/ci/cinnamon-desktop/package.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-desktop";
-  version = "6.6.1";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-desktop";
     tag = version;
-    hash = "sha256-vBRaUXsPAPOpMEs2pl6AaaKIMeeXB0UdCb1hzYd43KY=";
+    hash = "sha256-AcUJ9anKuvUAJKaQVHbkYShmrlSHG35gV/NIkPgJojk=";
   };
 
   outputs = [

pkgs/by-name/ci/cinnamon-settings-daemon/package.nix

@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "6.6.1";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-settings-daemon";
     tag = version;
-    hash = "sha256-WK7MU63M3B0C4Dsik6j4cDyBTZlkF6pofZi2aJcH9eI=";
+    hash = "sha256-s8LKta03ei4MIQICY5t4Kh2oDEN9egstX8IQ56FXq7s=";
   };
 
   patches = [

pkgs/by-name/ci/cinnamon-translations/package.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-translations";
-  version = "6.6.1";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-translations";
     tag = version;
-    hash = "sha256-6y1zHKO/qpkAL5fs6QUjNJki16X+bxW/175Sz1PUPQw=";
+    hash = "sha256-DHwW9YrQFNtTvY4/QMBVLQ2idyuknacZvoMIMiHFsU4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ci/cinnamon/package.nix

@@ -74,13 +74,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon";
-  version = "6.6.3";
+  version = "6.6.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     tag = version;
-    hash = "sha256-BPHHvcE0jmrOo5W4Egv1Hir8t4CSPJGH3oqv1VJ4AUQ=";
+    hash = "sha256-K1Saz0WY5Qwb7YF8fcH0yWNK071dFwzxuPZP2MuSvrs=";
   };
 
   patches = [

pkgs/by-name/ck/ckan/package.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ckan";
-  version = "1.36.0";
+  version = "1.36.2";
 
   src = fetchurl {
     url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
-    hash = "sha256-Tw8s86FtBz/92uq2imFZm4n88NCCpePTpydoAoYsE3U=";
+    hash = "sha256-EZSf+n6QUEZW2Bjl2ac/6e+Jo+PlxWd1Z1PKHvgC/Ko=";
   };
 
   icon = fetchurl {

pkgs/by-name/db/dbeaver-bin/package.nix

@@ -19,7 +19,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.3.1";
+  version = "25.3.2";
 
   src =
     let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-+9bKKfLFR+9iBv/Sgwbd/gVpUa2c4uvkZGzx61x5bJ8=";
-        aarch64-linux = "sha256-sfrytO39RnqODECo0CPj2tusvZBIo5I9KuRqzoLbE0M=";
-        x86_64-darwin = "sha256-74EMwaG2xmH2gEyhcwqZKgVzNOup81DG8T8DmELN53g=";
-        aarch64-darwin = "sha256-cJ9hS/jQySoGbXd0yLmBNlVak8OOnMW2ToXojnx9Th4=";
+        x86_64-linux = "sha256-kOlQLHrE5QmrmtzyX9fDJ0tCZ21YPAO+jnR0B+kXSrA=";
+        aarch64-linux = "sha256-+GegQSZIUMqWsQJBVoC1xqEN9rQAXPh0ApKl2lDPpUA=";
+        x86_64-darwin = "sha256-eimRS96Mpej3BUU5O1XPS/oze0mGw3+4QV2DrRQy68U=";
+        aarch64-darwin = "sha256-S7sdXGfL16Q5hIXmkM22dbmfZeSHKEv3MthoQOYO6n0=";
       };
     in
     fetchurl {

pkgs/by-name/fi/firefly-iii-data-importer/package.nix

@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.9.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AjpzJfer1v7+FLIGEcBJrMxUlda5MwV2ThJuV5MNIxQ=";
+    hash = "sha256-+oc6FJwlixJ6PNQmZoZxUveR3h+zRopptMYm6ef9r/I=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-7nhoRnKcOnnBt0YxaMEXYHPqDjaCltDnSiCnMDCEq5M=";
+  vendorHash = "sha256-y8tGv5dgGHV2moBgYKSvBoc0SfHvt7HbSrctoAdMQGE=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-as11uXE3qBGz7HIkTEeFLznwevcS+yChETo4ElyRVl8=";
+    hash = "sha256-pslV+UCFblp3gObCh+xDFNvYb/x3Eqz+Z9r+rC6gwXY=";
   };
 
   composerRepository = php84.mkComposerRepository {

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

@@ -1,20 +1,59 @@
 {
   lib,
   fetchFromGitHub,
+  stdenvNoCC,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs_24,
+  fetchYarnDeps,
   buildGoModule,
+  go-bindata,
   versionCheckHook,
 }:
-
-buildGoModule (finalAttrs: {
+let
   pname = "fleet";
   version = "4.78.1";
-
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
-    tag = "fleet-v${finalAttrs.version}";
+    tag = "fleet-v${version}";
     hash = "sha256-3F9vzY1JAw2DMzUhMl7j9I8RGjVXulQH2JcYCFuAwDY=";
   };
+
+  frontend = stdenvNoCC.mkDerivation {
+    pname = "${pname}-frontend";
+    inherit version src;
+
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      nodejs_24
+    ];
+
+    yarnOfflineCache = fetchYarnDeps {
+      yarnLock = src + "/yarn.lock";
+      hash = "sha256-cCf0Q6g+VJaTCOZ12/7z8gcDf3+YT2LBTCJb39InJVw=";
+    };
+
+    NODE_ENV = "production";
+    yarnBuildScript = "webpack";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/assets
+      cp -r assets/* $out/assets/
+
+      mkdir -p $out/frontend/templates
+      cp frontend/templates/react.tmpl $out/frontend/templates/react.tmpl
+
+      runHook postInstall
+    '';
+  };
+in
+buildGoModule (finalAttrs: {
+  inherit pname version src;
+
   vendorHash = "sha256-EwPbZLcqJV5J7ieoQwAJLIn4wwMlwZoTtWaXgvY3pR0=";
 
   subPackages = [
@@ -26,12 +65,29 @@ buildGoModule (finalAttrs: {
     "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
   ];
 
+  nativeBuildInputs = [ go-bindata ];
+
+  preBuild = ''
+    cp -r ${frontend}/assets/* assets
+    cp -r ${frontend}/frontend/templates/react.tmpl frontend/templates/react.tmpl
+
+    go-bindata -pkg=bindata -tags full \
+      -o=server/bindata/generated.go \
+      frontend/templates/ assets/... server/mail/templates
+  '';
+
+  tags = [ "full" ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "version";
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
 
+  passthru = {
+    inherit frontend;
+  };
+
   meta = {
     homepage = "https://github.com/fleetdm/fleet";
     changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}";
@@ -40,6 +96,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       asauzeau
       lesuisse
+      bddvlpr
     ];
     mainProgram = "fleet";
   };

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

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   windows,
   autoconf,
   automake,
@@ -26,11 +25,11 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flint";
-  version = "3.3.1";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs=";
+    hash = "sha256-lJdnmATerZJuOv/rjUxYc50cdoTWDCwSgnVQ0o5FSjM=";
   };
 
   patches = [

pkgs/by-name/fr/fresh-editor/package.nix

@@ -68,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       chillcicada
       dwt
+      randoneering
     ];
     mainProgram = "fresh";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;

pkgs/by-name/fu/furtherance/package.nix

@@ -13,16 +13,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "furtherance";
-  version = "26.1.0";
+  version = "26.1.1";
 
   src = fetchFromGitHub {
     owner = "unobserved-io";
     repo = "Furtherance";
     rev = finalAttrs.version;
-    hash = "sha256-EwOLTq82NNuRMUCFSKryl6fBtXxhNps+tzOo3Uhe3yA=";
+    hash = "sha256-VG1Ghhi74tkPU9bgauV98Gp5kVoZJ1cJUqWLWnrUAOU=";
   };
 
-  cargoHash = "sha256-iJW7tnGnwdp494ylJyNEuC80SIV8wRu8ygd5lcul2KA=";
+  cargoHash = "sha256-6S0L8FHI5eCTzhxlew35pK7TewMplKKJDaqJdtoYRnM=";
 
   nativeBuildInputs = [
     pkg-config

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

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-dnscollector";
-  version = "1.14.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     tag = "v${version}";
-    hash = "sha256-J6h/td5vCZwVruamZziIxRhAOdLdlv3Aupz9m0bExU4=";
+    hash = "sha256-d6FFxVGolXfZF4Ulklxg8u26DdV9yHeDUf2IEEryELw=";
   };
 
-  vendorHash = "sha256-BQLlEY9CJDwJRbzB5kflBwwxcWMLbaqgWUtz2p3CJsE=";
+  vendorHash = "sha256-4gk7LwRDrTiMCrR6JJpdSvCmNa7wQ5Hk06OGd6/SACc=";
 
   subPackages = [ "." ];
 

pkgs/by-name/ku/kubectl-gadget/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.47.0";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
-    rev = "v${version}";
-    hash = "sha256-ZGi7zsIphiXNLfVc6u+ZSGsgWWcMaBpyt1BpwS2WRCU=";
+    tag = "v${version}";
+    hash = "sha256-g2nJYiGukgi6CEhIJRuqqpPT9XbfQGFVmQD4Ne8gul0=";
   };
 
-  vendorHash = "sha256-0vpPBQ1ty4FZMj3bgB56Gu5pNdo7SyhxvGQOHos6m9s=";
+  vendorHash = "sha256-FLWpvCHeZUnlGZM1lxNoArqfSP2iQuYnhBRtD2ymclI=";
 
   env.CGO_ENABLED = 0;
 
@@ -37,6 +37,7 @@ buildGoModule rec {
     description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF";
     mainProgram = "kubectl-gadget";
     homepage = "https://inspektor-gadget.io";
+    changelog = "https://github.com/inspektor-gadget/inspektor-gadget/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       kranurag7

pkgs/by-name/mi/microcom/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcom";
-  version = "2023.09.0";
+  version = "2025.11.0";
 
   src = fetchFromGitHub {
     owner = "pengutronix";
     repo = "microcom";
     rev = "v${version}";
-    hash = "sha256-CT/myxOK4U3DzliGsa45WMIFcYLjcoxx6w5S1NL5c7Y=";
+    hash = "sha256-drQpUOl+QLBvwT++bEBk9Bt+tTQxrnFgfuoGIW5Bcyw=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/by-name/mo/moon-buggy/package.nix

@@ -6,15 +6,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "moon-buggy";
-  version = "1.0.51";
+  version = "1.1.0";
 
   buildInputs = [
     ncurses
   ];
 
   src = fetchurl {
-    url = "http://m.seehuhn.de/programs/moon-buggy-${version}.tar.gz";
-    sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m";
+    url = "http://www.seehuhn.de/programs/moon-buggy/moon-buggy-${version}.tar.gz";
+    sha256 = "sha256-JZrm57GDjEBTKvXA8gzXxhc81cVS7eQIEUBkR1vPxbY=";
   };
 
   meta = {

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

@@ -15,6 +15,8 @@
   fetchpatch,
   withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl,
   libutempter,
+  # build server binary only when set to false (useful for perlless systems)
+  withClient ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,6 +43,8 @@ stdenv.mkDerivation rec {
     zlib
     openssl
     bash-completion
+  ]
+  ++ lib.optionals withClient [
     perl
   ]
   ++ lib.optional withUtempter libutempter;
@@ -70,9 +74,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter";
 
-  postInstall = ''
-    wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
-  '';
+  postInstall =
+    if withClient then
+      ''
+        wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
+      ''
+    else
+      ''
+        rm $out/bin/mosh
+        rm $out/bin/mosh-client
+        rm -r $out/share/{man,bash-completion}
+      '';
 
   meta = {
     homepage = "https://mosh.org/";

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

@@ -43,7 +43,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "6.6.0";
+  version = "6.6.1";
 
   outputs = [
     "out"
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = "muffin";
     rev = version;
-    hash = "sha256-yGbnqIKw+Ouk1onr2H+KckO/YQob1N1beLmfqQhOheU=";
+    hash = "sha256-65XVmSz/p8MYj4vbONCPFG3wdt7sCtHSX9Kg8UcYUf0=";
   };
 
   patches = [

pkgs/by-name/ne/nemo/package.nix

@@ -37,13 +37,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.6.2";
+  version = "6.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo";
     rev = version;
-    hash = "sha256-5jgD2C71sQkqnAGsnsjK8W9qaLtNtGeYLXsV2+7u2jU=";
+    hash = "sha256-jsAKNKpNsheyugI6dVQAYYrOTmHLDjJCbjlWmAChFgU=";
   };
 
   patches = [

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

@@ -5,6 +5,7 @@
   base,
   bytestring,
   cmdargs,
+  containers,
   directory,
   fetchzip,
   file-embed,
@@ -23,15 +24,16 @@
 }:
 mkDerivation {
   pname = "nixfmt";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/v1.1.0.tar.gz";
-    sha256 = "19sydkdw1579qmvzx0zq06s23bm6m6l9wp1kvsfhxawk8pkz2pc2";
+    url = "https://github.com/nixos/nixfmt/archive/v1.2.0.tar.gz";
+    sha256 = "1qvj1sddh7bgggqnj7cnhvfh4iz1pwzc9a9awc1g7y349yvpwad3";
   };
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     base
+    containers
     megaparsec
     mtl
     parser-combinators

pkgs/by-name/ni/nixfmt/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p cabal2nix curl jq
+#!nix-shell --pure -i bash -p cabal2nix curl cacert jq nix
 #
 # This script will update the nixfmt derivation to the latest version using
 # cabal2nix.
@@ -24,4 +24,7 @@ cabal2nix --jailbreak \
   "https://github.com/nixos/nixfmt/archive/${release_tag}.tar.gz" \
   >> "$derivation_file"
 
+nix-shell "$script_dir/../../../../" \
+  --run "treefmt --no-cache $derivation_file"
+
 echo "Finished."

pkgs/by-name/om/omnix/package.nix

@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "omnix";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "juspay";
     repo = "omnix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wxBZLeYoYIQlZLsWpJty95fUmEbgHPCwbn392b9n3NY=";
+    hash = "sha256-D9rAVsSFooVWpSX//gTcRcmgiAjwZYNRMDIctMmwnho=";
   };
 
-  cargoHash = "sha256-qZv/4P9f87Glif2VsdrY23JGw6bSSQYdekF6erY5owk=";
+  cargoHash = "sha256-3zWbhuZzqkxgM0Js3luR6+Yr5/UGn1EoL6OqxPt94JM=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/op/openroad/package.nix

@@ -96,6 +96,9 @@ stdenv.mkDerivation rec {
     patchShebangs --build etc/find_messages.py
     # Disable two tests that are failing curently.
     sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt
+    # fix build with gcc15
+    sed -e '39i #include <cstdint>' -i src/gpl/src/placerBase.h
+    sed -e '37i #include <cstdint>' -i src/gpl/src/routeBase.h
   '';
 
   cmakeFlags = [

pkgs/by-name/ow/owmods-cli/package.nix

@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "owmods-cli";
-  version = "0.15.2";
+  version = "0.15.4";
 
   src = fetchFromGitHub {
     owner = "ow-mods";
     repo = "ow-mod-man";
     rev = "cli_v${version}";
-    hash = "sha256-5ymU9X4J5UPLHxV+7WB29e5Wuq++wYA9bqI2YPjDtWs=";
+    hash = "sha256-Tu7+H8RCUxKqCtdkPDzEUnK2VUq+80R+kumHRJqf7RY=";
   };
 
-  cargoHash = "sha256-Z/muI8JLjOFJBSIMWlvCyFW4JI3lP6/O0AI8Uj8AtBo=";
+  cargoHash = "sha256-/id7DC3W22musOI4r4b0RPqSnIQVn1yHYLZcTilShVk=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pr/programmer-calculator/package.nix

@@ -7,20 +7,20 @@
 
 gccStdenv.mkDerivation rec {
   pname = "programmer-calculator";
-  version = "3.0";
+  version = "3.0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "alt-romes";
     repo = "programmer-calculator";
-    rev = "v${version}";
-    sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw=";
+    rev = "153272c50b2491ddf25dfbfcf228a08a3b3ace69";
+    sha256 = "sha256-24OYG3tVxcc/1i9HRrzW/jPY41KnKkugLziWnG1wQIw=";
   };
 
   buildInputs = [ ncurses ];
 
   installPhase = ''
     runHook preInstall
-    install -Dm 555 pcalc -t "$out/bin"
+    install -Dm 555 bin/pcalc -t "$out/bin"
     runHook postInstall
   '';
 
@@ -32,7 +32,7 @@ gccStdenv.mkDerivation rec {
       representations, sizes, and overall close to the bits
     '';
     homepage = "https://alt-romes.github.io/programmer-calculator";
-    changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${version}";
+    changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${lib.versions.majorMinor version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ cjab ];
     platforms = lib.platforms.all;

pkgs/by-name/re/remind/package.nix

@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "06.01.05";
+  version = "06.02.01";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-5S6s3PylXNGxxzYII2bwT59TFg8sIEUjENkRUDFTuFM=";
+    hash = "sha256-bdR0uLPUGAaB5w4BNPaPOuI9Eg3utyETlUlLIQmcxMs=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [
@@ -38,10 +38,7 @@ tcl.mkTclDerivation rec {
     substituteInPlace scripts/tkremind.in \
       --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \
       --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \
-      --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \
       --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\""
-    substituteInPlace configure \
-      --replace-fail 'f=-ffat-lto-objects' ""
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [

pkgs/by-name/ru/rustdesk/package.nix

@@ -38,17 +38,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustdesk";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-o7jsVWiCkHaKFpAu27r/Lr1Q9g7uR/OYJdwsiQeDJUA=";
+    hash = "sha256-FRtYafsIKHnGPV8NaiaHxIHkon8/T2P83uq9taUD1Xc=";
   };
 
-  cargoHash = "sha256-gd2vS+p+1QtOWZcRWJWahFGo5rFG+soqxx3vJYSYJUo=";
+  cargoHash = "sha256-mEtTo1ony5w/dzJcHieG9WywHirBoQ/C0WpiAr7pUVc=";
 
   patches = [
     ./make-build-reproducible.patch

pkgs/by-name/sa/sage/sage-src.nix

@@ -89,6 +89,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sagemath/sage/commit/fa00696112fde95e0c4241ad6063936200ce6f68.patch?full_index=1";
       hash = "sha256-eFDpNu/2gcQATELmQ7/VzXI35xIzaVrD8bhhJ57e2gc=";
     })
+
+    # https://github.com/sagemath/sage/pull/41233, landed in 10.8.rc0
+    (fetchpatch2 {
+      name = "flint-3.4-update.patch";
+      url = "https://github.com/sagemath/sage/commit/9bd5304f1a222e215d7006a04854ff66616748bf.patch?full_index=1";
+      hash = "sha256-7bgouXV3pM20IX5PM24ZpJWOBlZjQksGtjopgouEbyg=";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

pkgs/by-name/sc/schemat/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "schemat";
-  version = "0.4.7";
+  version = "0.4.12";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "schemat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-veGrwwERnMy+60paF/saEbVxTDyqNVT1hsfggGCzZt0=";
+    hash = "sha256-NUpY4VXrp6A+ACjID9uqD9G31acGtmByyVCjIDT05vI=";
   };
 
-  cargoHash = "sha256-R43i06XW3DpP+6fPUo/CZhKOVXMyoTPuygJ01BpW1/I=";
+  cargoHash = "sha256-wPHD+ZOf9BdqpG1s/o8awxe7apbTF2Nr0i/00Vpvnes=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

pkgs/by-name/sh/shellhub-agent/package.nix

@@ -12,18 +12,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.21.4";
+  version = "0.21.5";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-Q53xxBclPH8oF+MS3gm99bOBhby7HQ+AqI6QeFTcmFc=";
+    hash = "sha256-0adBDz9oHb+Wo1/BucMPavX/4xZidjQYNVA3O475JEo=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-PiDciFxMevdWBww49+xTvZkYdyml5VmxoGG+E0PL658=";
+  vendorHash = "sha256-zBT3kQhn6RhgcP/5FBEhKo1oPl9GgFQqWGsBUgrDwW4=";
 
   ldflags = [
     "-s"

pkgs/by-name/st/steel/package.nix

@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2025-12-17";
+  version = "0-unstable-2026-01-09";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "b7c2306320ea05649ebcac3af7ecaa7aa0c77117";
-    hash = "sha256-TjOTfka+ieAVHMjXymVDHlu29z6VoyB/7wYUGSiV/G4=";
+    rev = "b019511196ef987ee7e368590a852e385dfbae53";
+    hash = "sha256-qG2W6gWSft5xWhna2RwZ847WtBstBEGTQroC598hjTM=";
   };
 
-  cargoHash = "sha256-bXAgp83U48GsTAuki3tsoOK7X+UepKJIlS0bL5qMc8I=";
+  cargoHash = "sha256-mtRDasfCejM6o664+3XBZJ6sWw1BO+pYi/nrCaglsQ8=";
 
   nativeBuildInputs = [
     curl

pkgs/by-name/xc/xclock/package.nix

@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchpatch,
+  meson,
+  ninja,
+  pkg-config,
+  wrapWithXFileSearchPathHook,
+  libx11,
+  libxaw,
+  libxft,
+  libxkbfile,
+  libxmu,
+  libxrender,
+  libxt,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xclock";
+  version = "1.1.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xclock";
+    tag = "xclock-${finalAttrs.version}";
+    hash = "sha256-ZgUb+iVO45Az/C+2YJ1TXxcTLk3zQjM1GGv2E69WNfo=";
+  };
+
+  patches = [
+    # meson build system patch
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/28e10bd26ac7e02fe8a4fb8016bb115f8d664032.patch";
+      hash = "sha256-KdrS7VneJqwVPB+TRJoMmtR03Ju3PvvUMYfXz5tII6k=";
+    })
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    libx11
+    libxaw
+    libxft
+    libxkbfile
+    libxmu
+    libxrender
+    libxt
+    xorgproto
+  ];
+
+  mesonFlags = [
+    (lib.mesonOption "appdefaultdir" "${placeholder "out"}/share/X11/app-defaults")
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xclock-(.*)" ]; };
+
+  meta = {
+    description = "analog / digital clock for X";
+    longDescription = ''
+      xclock is the classic X Window System clock utility. It displays the time in analog or digital
+      form, continuously updated at a frequency which may be specified by the user.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xclock";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpnd
+      mit
+    ];
+    mainProgram = "xclock";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/xf/xfd/package.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  wrapWithXFileSearchPathHook,
+  fontconfig,
+  libxaw,
+  libxft,
+  libxkbfile,
+  libxmu,
+  libxrender,
+  libxt,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xfd";
+  version = "1.1.4";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xfd";
+    tag = "xfd-${finalAttrs.version}";
+    hash = "sha256-8kkoJILNlVgDIV029mF3err6es5V001FQqUnTtD9/LQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    fontconfig
+    libxaw
+    libxft
+    libxkbfile
+    libxmu
+    libxrender
+    libxt
+    xorgproto
+  ];
+
+  installFlags = [ "appdefaultdir=$out/share/X11/app-defaults" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xfd-(.*)" ]; };
+
+  meta = {
+    description = "X font display utility, using either the X11 core protocol or libXft2.";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfd";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xfd";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/xf/xfs/package.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxfont_2,
+  xorgproto,
+  xtrans,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xfs";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xfs-${finalAttrs.version}.tar.xz";
+    hash = "sha256-twvUYzHiQbMOXgDb3C6rt/P4iAzUQkSs3hPXl20Jjsw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libxfont_2
+    xorgproto
+    xtrans
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X Font Server, for X11 core protocol fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xfs";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+      x11
+      hpnd
+    ];
+    mainProgram = "xfs";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isStatic;
+  };
+})

pkgs/by-name/xk/xkbevd/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  bison,
+  pkg-config,
+  util-macros,
+  libx11,
+  libxkbfile,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkbevd";
+  version = "1.1.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xkbevd";
+    tag = "xkbevd-${finalAttrs.version}";
+    hash = "sha256-n/detXvtRvysc5pjFc0Q27yLC2QsNUBo9AIXYkUG4PQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    util-macros # unused dependency but the build fails if pkg-config can't find it
+    libx11
+    libxkbfile
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbevd-(.*)" ]; };
+
+  meta = {
+    description = "XKB event daemon";
+    longDescription = ''
+      The xkbevd event daemon listens for specified XKB events and executes requested commands if
+      they occur. The configuration file consists of a list of event specification/action pairs
+      and/or variable definitions.
+      This command is very raw and is therefore only partially implemented; it is a rough prototype
+      for developers, not a general purpose tool for end users.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbevd";
+    license = lib.licenses.hpnd;
+    mainProgram = "xkbevd";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/xk/xkbprint/package.nix

@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  libx11,
+  libxkbfile,
+  xorgproto,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkbprint";
+  version = "1.0.7";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xkbprint";
+    tag = "xkbprint-${finalAttrs.version}";
+    hash = "sha256-JcVXwhEV6tTdgBNki7MuUPjjZOjVE83uBP/yc+ShycE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    libx11
+    libxkbfile
+    xorgproto
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbprint-(.*)" ]; };
+
+  meta = {
+    description = "Generates a PostScript image of an XKB keyboard description.";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbprint";
+    license = with lib.licenses; [
+      hpnd
+      hpndDec
+    ];
+    mainProgram = "xkbprint";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

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

@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  wrapWithXFileSearchPathHook,
+  libx11,
+  libxaw,
+  libxmu,
+  xorgproto,
+  libxt,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xload";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xload";
+    tag = "xload-${finalAttrs.version}";
+    hash = "sha256-Mm09uKP+LUW0xGrwcJth/XCUqJ1RDEspbYpL92vOdk4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    libx11
+    libxaw
+    libxmu
+    xorgproto
+    libxt
+  ];
+
+  installFlags = [ "appdefaultdir=$out/share/X11/app-defaults" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xload-(.*)" ]; };
+
+  meta = {
+    description = "System load average display for X";
+    longDescription = ''
+      xload displays a periodically updating histogram of the system load average.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xload";
+    license = with lib.licenses; [
+      x11
+      mit
+    ];
+    mainProgram = "xload";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/xp/xpr/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorgproto,
+  libx11,
+  libxmu,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xpr";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xpr";
+    tag = "xpr-${finalAttrs.version}";
+    hash = "sha256-q8WcQSzlAwbdIcXWyQjjHmvuqYa4k2e7O+VhShwBDUE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxmu
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xpr-(.*)" ]; };
+
+  meta = {
+    description = "Utility to print an X window dump from xwd";
+    longDescription = ''
+      xpr takes as input a window dump file produced by xwd and formats it for output on various
+      types of printers.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xpr";
+    license = with lib.licenses; [
+      mit
+      x11
+      hpnd
+    ];
+    mainProgram = "xpr";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/xv/xviewer/package.nix

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xviewer";
-  version = "3.4.15";
+  version = "3.4.16";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xviewer";
     rev = version;
-    hash = "sha256-fAB7nbkGx6aNKwRA01013hAiGJ8pEovI0WClOqT0D10=";
+    hash = "sha256-ayd91gVLuSUVlCxaPSBbx7hg4tthVTaBEnl5V9YYbQw=";
   };
 
   nativeBuildInputs = [

pkgs/development/coq-modules/metarocq/default.nix

@@ -15,13 +15,14 @@ let
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
-      (case "9.1" "1.4-9.1")
+      (case "9.1" "1.4.1-9.1")
       (case "9.0" "1.4-9.0.1")
     ] null;
   release = {
     "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
     "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
     "1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE=";
+    "1.4.1-9.1".sha256 = "sha256-tzoAWX74lg7pArGVP11QBvDRKMvmGxXvrf3+1E3Y4DI=";
   };
   releaseRev = v: "v${v}";
 

pkgs/development/python-modules/netbox-dns/default.nix

@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-plugin-dns";
-  version = "1.4.4";
+  version = "1.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "peteeckel";
     repo = "netbox-plugin-dns";
     tag = version;
-    hash = "sha256-166DFPSF1f0YF0T2bTEkmyI4M6PgBfimYyZX7fnNfrI=";
+    hash = "sha256-+7I3Kahh2LtOytTg/vb8bFVubGbWMwfKUMUsUpApqGE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/peakrdl-rust/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "peakrdl-rust";
-  version = "0.4.1";
+  version = "0.5.1";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "darsor";
     repo = "PeakRDL-rust";
     tag = "v${version}";
-    hash = "sha256-9OEzfIvuVilbFlv0z07S6b7wVM95e+vdcDU8MphRlao=";
+    hash = "sha256-rcVM7ljFWlEXLxG7ASXE2iZ+WYazeMFE0sgTzkviOP0=";
   };
 
   build-system = [ uv-build ];

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

@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "python-sat";
-  version = "1.8.dev25";
+  version = "1.8.dev26";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "python_sat";
-    hash = "sha256-3eVCBXg95RyzMA8O8EOss1FKh+1EofnkKYJcVNuQAzY=";
+    hash = "sha256-CXyYqvm0j9GbB8WVeGC/o6rjRvJNDquaGLGGREgIfoc=";
   };
 
   preBuild = ''

pkgs/development/python-modules/sentry-sdk/default.nix

@@ -67,14 +67,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.44.0";
+  version = "2.48.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = version;
-    hash = "sha256-i2rd4JFcGYToWMJeOuHaCKnwKtC/LFrpnWCf1taGqhc=";
+    hash = "sha256-Y8zGs5xj0PB0zQMHmg9RwbCiarOC2s8k/5/yQr+sL4k=";
   };
 
   postPatch = ''

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "serialx";
-  version = "0.6.1";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "puddly";
     repo = "serialx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hko0xVpqcmu7NhsS3MZRjfCY21E0g7qUDqAf5bqfw2I=";
+    hash = "sha256-AtRh6xrmuRf7+ZL8dSxq4cHFOtKNJox5iQF84eDOY80=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

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

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.9.0";
+  version = "9.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     tag = version;
-    hash = "sha256-apdEtXPfpUPtBw129ZF5SDnY/P9YIUkw1bfgVvL3yV4=";
+    hash = "sha256-ewG2VgxK8F2G/wogkGnhqZT9M9vrJu9Rdx4uXYNRhrI=";
   };
 
   build-system = [ setuptools ];

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "wordcloud";
-  version = "1.9.4";
+  version = "1.9.5";
 
   pyproject = true;
 
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-snPYpd7ZfT6tkEBGtJRk3LcRGe5534dQcqTBBcrdNHo=";
+    hash = "sha256-asfBN48ohtfoSWAKMG/r1B0NRrFc6HbWZaPlSfVAOws=";
   };
 
   nativeBuildInputs = [ cython ];

pkgs/servers/x11/xorg/default.nix

@@ -116,6 +116,7 @@
   xbitmaps,
   xcalc,
   xcb-proto,
+  xclock,
   xcmsdb,
   xcompmgr,
   xconsole,
@@ -126,14 +127,19 @@
   xdriinfo,
   xev,
   xeyes,
+  xfd,
   xfontsel,
+  xfs,
   xfsinfo,
   xgamma,
   xgc,
   xhost,
+  xkbevd,
+  xkbprint,
   xkbutils,
   xkeyboard-config,
   xkill,
+  xload,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -146,6 +152,7 @@
   xorgproto,
   xorg-server,
   xorg-sgml-doctools,
+  xpr,
   xprop,
   xrandr,
   xrdb,
@@ -197,6 +204,7 @@ self: with self; {
     xbacklight
     xbitmaps
     xcalc
+    xclock
     xcmsdb
     xcompmgr
     xconsole
@@ -206,13 +214,18 @@ self: with self; {
     xdriinfo
     xev
     xeyes
+    xfd
     xfontsel
+    xfs
     xfsinfo
     xgamma
     xgc
     xhost
+    xkbevd
+    xkbprint
     xkbutils
     xkill
+    xload
     xlsatoms
     xlsclients
     xlsfonts
@@ -221,6 +234,7 @@ self: with self; {
     xmodmap
     xmore
     xorgproto
+    xpr
     xprop
     xrandr
     xrdb
@@ -364,58 +378,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xclock = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXaw,
-      libXft,
-      libxkbfile,
-      libXmu,
-      xorgproto,
-      libXrender,
-      libXt,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xclock";
-      version = "1.1.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xclock-1.1.1.tar.xz";
-        sha256 = "0b3l1zwz2b1cn46f8pd480b835j9anadf929vqpll107iyzylz6z";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libX11
-        libXaw
-        libXft
-        libxkbfile
-        libXmu
-        xorgproto
-        libXrender
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputevdev = callPackage (
     {
@@ -2162,98 +2124,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xfd = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxkbfile,
-      fontconfig,
-      libXaw,
-      libXft,
-      libXmu,
-      xorgproto,
-      libXrender,
-      libXt,
-      gettext,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xfd";
-      version = "1.1.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xfd-1.1.4.tar.xz";
-        sha256 = "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        gettext
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libxkbfile
-        fontconfig
-        libXaw
-        libXft
-        libXmu
-        xorgproto
-        libXrender
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xfs = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libXfont2,
-      xorgproto,
-      xtrans,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xfs";
-      version = "1.2.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz";
-        sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libXfont2
-        xorgproto
-        xtrans
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xinit = callPackage (
     {
@@ -2372,166 +2242,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkbevd = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxkbfile,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkbevd";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz";
-        sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxkbfile
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkbprint = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxkbfile,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkbprint";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz";
-        sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxkbfile
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xload = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXaw,
-      libXmu,
-      xorgproto,
-      libXt,
-      gettext,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xload";
-      version = "1.2.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xload-1.2.0.tar.xz";
-        sha256 = "104snn0rpnc91bmgj797cj6sgmkrp43n9mg20wbmr8p14kbfc3rc";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        gettext
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libX11
-        libXaw
-        libXmu
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xpr = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXmu,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xpr";
-      version = "1.2.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xpr-1.2.0.tar.xz";
-        sha256 = "1hyf6mc2l7lzkf21d5j4z6glg9y455hlsg8lv2lz028k6gw0554b";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXmu
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xtrap = callPackage (
     {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

@@ -448,6 +448,7 @@ print OUT <<EOF;
   xbitmaps,
   xcalc,
   xcb-proto,
+  xclock,
   xcmsdb,
   xcompmgr,
   xconsole,
@@ -458,14 +459,19 @@ print OUT <<EOF;
   xdriinfo,
   xev,
   xeyes,
+  xfd,
   xfontsel,
+  xfs,
   xfsinfo,
   xgamma,
   xgc,
   xhost,
+  xkbevd,
+  xkbprint,
   xkbutils,
   xkeyboard-config,
   xkill,
+  xload,
   xlsatoms,
   xlsclients,
   xlsfonts,
@@ -478,6 +484,7 @@ print OUT <<EOF;
   xorgproto,
   xorg-server,
   xorg-sgml-doctools,
+  xpr,
   xprop,
   xrandr,
   xrdb,
@@ -529,6 +536,7 @@ self: with self; {
     xbacklight
     xbitmaps
     xcalc
+    xclock
     xcmsdb
     xcompmgr
     xconsole
@@ -538,13 +546,18 @@ self: with self; {
     xdriinfo
     xev
     xeyes
+    xfd
     xfontsel
+    xfs
     xfsinfo
     xgamma
     xgc
     xhost
+    xkbevd
+    xkbprint
     xkbutils
     xkill
+    xload
     xlsatoms
     xlsclients
     xlsfonts
@@ -553,6 +566,7 @@ self: with self; {
     xmodmap
     xmore
     xorgproto
+    xpr
     xprop
     xrandr
     xrdb

pkgs/servers/x11/xorg/overrides.nix

@@ -338,8 +338,6 @@ self: super:
       postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts);
     });
 
-  xclock = addMainProgram super.xclock { };
-
   xinit =
     (super.xinit.override {
       stdenv = if isDarwin then clangStdenv else stdenv;
@@ -423,14 +421,7 @@ self: super:
     ];
   });
 
-  xfd = addMainProgram super.xfd { };
-  xfs = addMainProgram super.xfs { };
   xinput = addMainProgram super.xinput { };
-  xkbevd = addMainProgram super.xkbevd { };
-  xkbprint = addMainProgram super.xkbprint { };
-  xload = addMainProgram super.xload { };
-
-  xpr = addMainProgram super.xpr { };
 
   xwd = addMainProgram super.xwd { };
 }

pkgs/servers/x11/xorg/tarballs.list

@@ -1,13 +1,6 @@
-mirror://xorg/individual/app/xclock-1.1.1.tar.xz
-mirror://xorg/individual/app/xfd-1.1.4.tar.xz
-mirror://xorg/individual/app/xfs-1.2.2.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
 mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz
-mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
-mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
-mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xpr-1.2.0.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz

pkgs/tools/package-management/nix/default.nix

@@ -185,8 +185,7 @@ lib.makeExtensible (
           };
         }).appendPatches
           (
-            patches_common
-            ++ [
+            [
               (fetchpatch2 {
                 name = "nix-2.31-14692-mdbook-0.5-support.patch";
                 url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch";