Merge master into staging-next

maintainers/scripts/update.nix

@@ -13,9 +13,9 @@
   path ? null,
   max-workers ? null,
   include-overlays ? false,
-  keep-going ? null,
-  commit ? null,
-  skip-prompt ? null,
+  keep-going ? false,
+  commit ? false,
+  skip-prompt ? false,
   order ? null,
 }:
 
@@ -206,18 +206,18 @@ let
 
     to increase the number of jobs in parallel, or
 
-        --argstr keep-going true
+        --arg keep-going true
 
     to continue running when a single update fails.
 
     You can also make the updater automatically commit on your behalf from updateScripts
     that support it by adding
 
-        --argstr commit true
+        --arg commit true
 
-    to skip prompt:
+    To skip the prompt, you can add
 
-        --argstr skip-prompt true
+        --arg skip-prompt true
 
     By default, the updater will update the packages in arbitrary order. Alternately, you can force a specific order based on the packages’ dependency relations:
 
@@ -250,11 +250,15 @@ let
   # JSON file with data for update.py.
   packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages));
 
+  # Allow boolean arguments to be provided with either --arg or --argstr.
+  # The ability to use the string "true" will be deprecated.
+  isTrue = arg: arg == true || arg == "true";
+
   optionalArgs =
     lib.optional (max-workers != null) "--max-workers=${max-workers}"
-    ++ lib.optional (keep-going == "true") "--keep-going"
-    ++ lib.optional (commit == "true") "--commit"
-    ++ lib.optional (skip-prompt == "true") "--skip-prompt"
+    ++ lib.optional (isTrue keep-going) "--keep-going"
+    ++ lib.optional (isTrue commit) "--commit"
+    ++ lib.optional (isTrue skip-prompt) "--skip-prompt"
     ++ lib.optional (order != null) "--order=${order}";
 
   args = [ packagesJson ] ++ optionalArgs;

pkgs/README.md

@@ -1019,7 +1019,7 @@ Furthermore each update script will be passed the following environment variable
 > An update script will be usually run from the root of the Nixpkgs repository, but you should not rely on that.
 > Also note that `update.nix` executes update scripts in parallel by default, so you should avoid running `git commit` or any other commands that cannot handle that.
 
-While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--argstr commit true`.
+While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--arg commit true`.
 If you need to customize commit message, you can have the update script implement the `commit` feature.
 
 ### Supported features
@@ -1046,7 +1046,7 @@ If you need to customize commit message, you can have the update script implemen
   ```
   :::
 
-  When `update.nix` is run with `--argstr commit true`, it will create a separate commit for each of the objects.
+  When `update.nix` is run with `--arg commit true`, it will create a separate commit for each of the objects.
   An empty list can be returned when the script did not update any files; for example, when the package is already at the latest version.
 
   The commit object contains the following values:

pkgs/by-name/ar/ardour/package.nix

@@ -2,18 +2,22 @@
   lib,
   stdenv,
   fetchgit,
+  fetchpatch,
   fetchzip,
   alsa-lib,
+  apple-sdk,
   aubio,
   boost,
   cairomm,
   cppunit,
   curl,
+  darwin,
   dbus,
   doxygen,
   ffmpeg,
   fftw,
   fftwSinglePrec,
+  fixDarwinDylibNames,
   flac,
   fluidsynth,
   glibc,
@@ -21,6 +25,7 @@
   graphviz,
   harvid,
   hidapi,
+  installShellFiles,
   itstool,
   kissfft,
   libarchive,
@@ -59,6 +64,8 @@
   taglib,
   vamp-plugin-sdk,
   wafHook,
+  which,
+  writableTmpDirAsHomeHook,
   xjadeo,
   libxrandr,
   libxinerama,
@@ -66,12 +73,20 @@
   optimize ? true, # disable to print Lua DSP script output to stdout
   videoSupport ? true,
 }:
-stdenv.mkDerivation (
-  finalAttrs:
-  let
-    majorVersion = lib.versions.major finalAttrs.version;
-  in
-  {
+let
+  videoInputs = [
+    harvid
+    xjadeo
+  ];
+
+  bundledContent = fetchzip {
+    url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
+    hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
+    # archive does not contain a single folder at the root
+    stripRoot = false;
+  };
+
+  generic = stdenv.mkDerivation (finalAttrs: {
     pname = "ardour";
     version = "9.7";
 
@@ -83,13 +98,6 @@ stdenv.mkDerivation (
       hash = "sha256-6gtlnk/oPXWJcN5tcb1r7dXyLpHPTSJwd8VfOjjFnWQ=";
     };
 
-    bundledContent = fetchzip {
-      url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
-      hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
-      # archive does not contain a single folder at the root
-      stripRoot = false;
-    };
-
     patches = [
       # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096
       ./as-flags.patch
@@ -100,16 +108,21 @@ stdenv.mkDerivation (
     # Since they are not, let's generate the file manually.
     postPatch = ''
       printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
-      sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
       patchShebangs ./tools/
       substituteInPlace libs/ardour/video_tools_paths.cc \
-        --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
-        --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
+        --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${lib.getExe ffmpeg}");' \
+        --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${lib.getExe' ffmpeg "ffprobe"}");'
+    ''
+    + lib.optionalString videoSupport ''
+      substituteInPlace libs/ardour/video_tools_paths.cc \
+        --replace-fail 'harvid_exe = "";' 'harvid_exe ="${lib.getExe harvid}";' \
+        --replace-fail 'xjadeo_exe = X_("");' 'xjadeo_exe = X_("${lib.getExe' xjadeo "xjremote"}");'
     '';
 
     nativeBuildInputs = [
       doxygen
       graphviz # for dot
+      installShellFiles
       itstool
       makeWrapper
       perl
@@ -119,13 +132,11 @@ stdenv.mkDerivation (
     ];
 
     buildInputs = [
-      alsa-lib
       aubio
       boost
       cairomm
       cppunit
       curl
-      dbus
       ffmpeg
       fftw
       fftwSinglePrec
@@ -137,10 +148,10 @@ stdenv.mkDerivation (
       kissfft
       libarchive
       libjack2
+      libjpeg
       liblo
       libltc
       libogg
-      libpulseaudio
       librdf_rasqal
       libsamplerate
       libsigcxx
@@ -148,7 +159,6 @@ stdenv.mkDerivation (
       libusb1
       libuv
       libwebsockets
-      libxi
       libxml2
       libxslt
       lilv
@@ -168,23 +178,14 @@ stdenv.mkDerivation (
       suil
       taglib
       vamp-plugin-sdk
-      libxinerama
-      libjpeg
-      libxrandr
     ]
-    ++ lib.optionals videoSupport [
-      harvid
-      xjadeo
-    ];
+    ++ lib.optionals videoSupport videoInputs;
 
     wafConfigureFlags = [
       "--cxx17"
       "--docs"
-      "--freedesktop"
       "--no-phone-home"
       "--ptformat"
-      "--run-tests"
-      "--test"
       # since we don't have https://github.com/agfline/LibAAF yet,
       # we need to use some of ardours internal libs, see:
       # https://discourse.ardour.org/t/ardour-8-2-released/109615/6
@@ -192,50 +193,36 @@ stdenv.mkDerivation (
       # https://discourse.ardour.org/t/ardour-8-2-released/109615/8
       # "--use-external-libs"
     ]
+    ++ lib.optional finalAttrs.doCheck "--test"
     ++ lib.optional optimize "--optimize";
 
     env = {
       NIX_CFLAGS_COMPILE = toString [
         # 'ioprio_set' syscall support:
-        "-D_GNU_SOURCE"
         # compiler doesn't find headers without these:
-        "-I${lib.getDev serd}/include/serd-0"
-        "-I${lib.getDev sratom}/include/sratom-0"
-        "-I${lib.getDev sord}/include/sord-0"
+        "-I${lib.getInclude serd}/include/serd-0"
+        "-I${lib.getInclude sratom}/include/sratom-0"
+        "-I${lib.getInclude sord}/include/sord-0"
       ];
       LINKFLAGS = "-lpthread";
     };
 
     postInstall = ''
-      # wscript does not install these for some reason
-      install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-        -t "$out/share/mime/packages"
-      install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
-        -t "$out/share/applications"
-      for size in 16 22 32 48 256 512; do
-        install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
-          "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
-      done
-      install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
+      installManPage ardour.1
+    '';
 
-      # install additional bundled beats, chords and progressions
-      cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
-    ''
-    + lib.optionalString videoSupport ''
-      # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
-      wrapProgram "$out/bin/ardour${majorVersion}" \
-        --prefix PATH : "${
-          lib.makeBinPath [
-            harvid
-            xjadeo
-          ]
-        }"
+    doCheck = true;
+
+    checkPhase = ''
+      runHook preHook
+      ./waf test
+      runHook postHook
     '';
 
     meta = {
       description = "Multi-track hard disk recording software";
       longDescription = ''
-        Ardour is a digital audio workstation (DAW), You can use it to
+        Ardour is a digital audio workstation (DAW), you can use it to
         record, edit and mix multi-track audio and midi. Produce your
         own CDs. Mix video soundtracks. Experiment with new ideas about
         music and sound.
@@ -246,12 +233,148 @@ stdenv.mkDerivation (
       homepage = "https://ardour.org/";
       license = lib.licenses.gpl2Plus;
       mainProgram = "ardour9";
-      platforms = lib.platforms.linux;
+      platforms = lib.platforms.linux ++ lib.platforms.darwin;
       maintainers = with lib.maintainers; [
         magnetophon
         mitchmindtree
         ryand56
       ];
     };
-  }
-)
+  });
+
+  linux = generic.overrideAttrs (
+    finalAttrs:
+    let
+      majorVersion = lib.versions.major finalAttrs.version;
+    in
+    {
+      postPatch = finalAttrs.postPatch + ''
+        sed 's|/usr/include/libintl.h|${lib.getInclude glibc.dev}/include/libintl.h|' -i wscript
+      '';
+
+      buildInputs = generic.buildInputs ++ [
+        alsa-lib
+        dbus
+        libpulseaudio
+        libxi
+        libxinerama
+        libxrandr
+      ];
+
+      wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--freedesktop" ];
+      env.NIX_CFLAGS_COMPILE = finalAttrs.env.NIX_CFLAGS_COMPILE + "-D_GNU_SOURCE";
+
+      postInstall =
+        finalAttrs.postInstall
+        + ''
+          # wscript does not install these for some reason
+          install -vDm 644 "build/gtk2_ardour/ardour.xml" \
+            -t "$out/share/mime/packages"
+          install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
+            -t "$out/share/applications"
+          for size in 16 22 32 48 256 512; do
+            install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
+              "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
+          done
+
+          # install additional bundled beats, chords and progressions
+          cp -rp "${bundledContent}"/* "$out/share/ardour${majorVersion}/media"
+        ''
+        + lib.optionalString videoSupport ''
+          # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
+          wrapProgram "$out/bin/ardour${majorVersion}" \
+            --prefix PATH : "${lib.makeBinPath videoInputs}"
+        '';
+    }
+  );
+
+  darwin' = generic.overrideAttrs (
+    finalAttrs:
+    let
+      majorVersion = lib.versions.major finalAttrs.version;
+    in
+    {
+      patches = finalAttrs.patches ++ [
+        (fetchpatch {
+          # TODO: Remove with the next release of Ardour
+          url = "https://github.com/Ardour/ardour/commit/bff1ebbca2f50f1a0d2285efcf6e0c8237a07d8f.diff";
+          hash = "sha256-Ye22S2bmRt+c/GrrvgWCDlzUqSwaOdAh5vFuJb/BqV8=";
+          name = "fix-path-to-mo-files.diff";
+        })
+      ];
+
+      postPatch = finalAttrs.postPatch + ''
+        substituteInPlace wscript \
+          --replace-fail '-DMAC_OS_X_VERSION_MAX_ALLOWED=110000' '-DMAC_OS_X_VERSION_MAX_ALLOWED=140000' \
+          --replace-fail '-mmacosx-version-min=11.0' '-mmacosx-version-min=14'
+
+        substituteInPlace libs/tk/y{d,t}k/wscript \
+          --replace-fail "'-xobjective-c'" "'-xobjective-c', '-DDISABLE_VISIBILITY'"
+
+        substituteInPlace tools/osx_packaging/osx_build \
+          --replace-fail 'WITH_HARRISON_LV2=1' 'WITH_HARRISON_LV2=' \
+          --replace-fail 'WITH_GMSYNTH=1' 'WITH_GMSYNTH=' \
+          --replace-fail 'WITH_HARVID=1' 'WITH_HARVID=' \
+          --replace-fail 'WITH_XJADEO=1' 'WITH_XJADEO=' \
+          --replace-fail '`hostname`' 'localhost' \
+          --replace-fail '`whoami`' 'nixbld' \
+          --replace-fail '../../build' "$PWD/build" \
+          --replace-fail 'echo "Building DMG ..."' 'exit 0'
+      '';
+
+      nativeBuildInputs = finalAttrs.nativeBuildInputs ++ [
+        darwin.DarwinTools
+        fixDarwinDylibNames
+        which
+        writableTmpDirAsHomeHook
+      ];
+
+      buildInputs = finalAttrs.buildInputs ++ [
+        apple-sdk
+      ];
+
+      wafBuildTargets = [
+        "build"
+        "i18n"
+      ];
+
+      wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--with-backends=coreaudio,jack,dummy" ];
+
+      postBuild = ''
+        # NOTE: The .so files are symlinks to the actual .dylib files.
+        install_name_tool \
+          -change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \
+          -change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \
+          "build/gtk2_ardour/ardour-${finalAttrs.version}.0"
+
+        (
+        cd tools/osx_packaging
+        ./osx_build --public
+        )
+      '';
+
+      preCheck = ''
+        # NOTE: The .so files are symlinks to the actual .dylib files.
+        install_name_tool \
+          -change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \
+          -change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \
+          "build/libs/audiographer/run-tests"
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p "$out"/{Applications,bin}
+        mv "tools/osx_packaging/Ardour/Ardour${majorVersion}.app/" "$out/Applications/"
+        ln -s "$out/Applications/Ardour${majorVersion}.app/Contents/MacOS/Ardour${majorVersion}" \
+          "$out/bin/ardour${majorVersion}"
+
+        # install additional bundled beats, chords and progressions
+        cp -rp "${bundledContent}"/* "$out/Applications/Ardour${majorVersion}.app/Contents/Resources/media"
+
+        runHook postInstall
+      '';
+    }
+  );
+in
+if stdenv.hostPlatform.isLinux then linux else darwin'

pkgs/by-name/bu/buck2/package.nix

@@ -33,7 +33,7 @@
 #
 # from the root of the nixpkgs git repository, run:
 #
-#    nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package buck2
+#    nix-shell maintainers/scripts/update.nix --arg commit true --argstr package buck2
 
 let
 

pkgs/by-name/cl/claude-code/package.nix

@@ -1,6 +1,6 @@
 # NOTE: Use the following command to update the package
 # ```sh
-# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
+# nix-shell maintainers/scripts/update.nix --arg commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
 # ```
 {
   lib,

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

@@ -6,7 +6,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gh-aw";
-  version = "0.68.3";
+  version = "0.79.8";
 
   __structuredAttrs = true;
 
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
     owner = "github";
     repo = "gh-aw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P3psfcuzLJ0W+3iJbPI7lfWiy8CIfZsYyY/4bcLEEjs=";
+    hash = "sha256-n1w235wCvHZs48PWIu3v4qob3SQPt1kMLszHe/7Rcwg=";
   };
 
-  vendorHash = "sha256-1BMh4mC62usE4pUCU5osHm1a1pBrXsp4YCumvvcAHIY=";
+  vendorHash = "sha256-GgDf2Ly8Vs/FTqk3w5yNYn/X1bWyfUBWhfl8QH2WFVg=";
 
   subPackages = [ "cmd/gh-aw" ];
 

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

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gogup";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tkZt0lv3uy43EijCE+Lvgt2X4p1rB2SkZ4UfkJGYPbY=";
+    hash = "sha256-h7hozN4ggDqEqu2KlQpBEttT7j8JKW+4J4NyM+ftK2M=";
   };
 
-  vendorHash = "sha256-lS7C/932cpaVUtXJ3tuZKyqDv4yT2RSG2NfQW5kcQrM=";
+  vendorHash = "sha256-GbeyuZNpT3wqy52sk0B/9wrab906/E4ds06vQ5tHK7c=";
   doCheck = false;
 
   ldflags = [

pkgs/by-name/li/lightning-terminal/package.nix

@@ -122,7 +122,7 @@ buildGoModule rec {
         fi
       '';
 
-  # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true
+  # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --arg commit true
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (gitUpdater {
       rev-prefix = "v";

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

@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.37.0";
+  version = "2.38.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-2u0q/N78hrjj1XVD69hMkLPVYxfgn8LVoFLjsprDOX8=";
+    hash = "sha256-IaMmW9ODlac/7Kqp9tEalVvLkUHaK786+HnTOqWVAk8=";
   };
   patches = [
   ];
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-uJdgsN/se3Dq5RbtZ/FGtDGD+yXtQzCFvbPZngifeJc=";
+    hash = "sha256-Y4Y2ZZh9Kdj6zZCHgvLNdfB0ehaF5nDJSOjTLelmYrE=";
   };
 
   buildInputs = [

pkgs/by-name/my/myks/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "myks";
-  version = "5.13.1";
+  version = "5.13.2";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wnN4CuRqnItEorDDFHzC0eRutcu2fMeVA42U4Y8JnqQ=";
+    hash = "sha256-Ij1QmMr2JJSjs+5e80RxjZcCKoSqNb9mD+IKtQjX13w=";
   };
 
-  vendorHash = "sha256-BUMhjjQZFX+AicRKVAKkRwv4hnM8Ph6CxYrTPh+BTPY=";
+  vendorHash = "sha256-x5yCigeM4ltL1wphW8ufa0WB3nd14AOkXGLggAxKTrs=";
 
   subPackages = ".";
 

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

@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nix-update";
-  version = "1.15.1";
+  version = "1.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-update";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8=";
+    hash = "sha256-LT66e5NtAJRp0E8QXKeePdTCNpH+CMvJNF1ayzBr4rw=";
   };
 
   build-system = [ python3Packages.setuptools ];

pkgs/by-name/ox/oxlint/package.nix

@@ -23,25 +23,25 @@
 # runs without an external linter, which leaves `jsPlugins` configs inert.
 stdenv.mkDerivation (finalAttrs: {
   pname = "oxlint";
-  version = "1.69.0";
+  version = "1.70.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-jbPKyQ1A7jrHWRaG2a2fIqOhTrzBI3e6fQD/b9wRUQM=";
+    hash = "sha256-+eP+Pawp2ZE5SqgOy9mReGn0CmXB0Ynm9aupbKLRjhk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-VgrHzUfRPARd90kcCGHzhxPDOJzKsh7nvyg6TxbV9RU=";
+    hash = "sha256-kdV7K1YkaiEKfTNpGUgRGAOAIzdgrupsG4Kg6ZBasrU=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-UTJMkkdIhBZSbGyjBLACfwWI6jKNsdK5zk322EgvJf8=";
+    hash = "sha256-njuEuAvM1DE24ueA4ZlyE/SpwdaKTWgXCV341miVoDI=";
   };
 
   dontUseCmakeConfigure = true;

pkgs/by-name/pv/pvz-portable-unwrapped/package.nix

@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pvz-portable-unwrapped";
-  version = "0.1.24";
+  version = "0.1.25";
 
   src = fetchFromGitHub {
     owner = "wszqkzqk";
     repo = "PvZ-Portable";
     tag = finalAttrs.version;
-    hash = "sha256-vtJvVV03HZFhH3PJfmgxCn4R8SJFhCWP2ok5MKQOMD4=";
+    hash = "sha256-ePPDzHlUu+b0bbRHSHtbgqOVrOdW3FR0WPXZM9iTKWM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/si/simpleini/package.nix

@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleini";
-  version = "4.25";
+  version = "4.26";
 
   src = fetchFromGitHub {
     name = "simpleini-sources-${finalAttrs.version}";
     owner = "brofield";
     repo = "simpleini";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1JTVjMfEuWqlyYAm4Er6HPjrP2Tnt0ntai8oVvIEOu0=";
+    hash = "sha256-l8PolFjy9Nbdsk7PvuuRWukha4GygzxqMEzuzglqmUs=";
   };
 
   nativeBuildInputs = [

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

@@ -28,13 +28,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "syncyomi";
-  version = "1.1.7";
+  version = "1.1.8";
 
   src = fetchFromGitHub {
     owner = "SyncYomi";
     repo = "SyncYomi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ot8c7+a/YLhjt9HkcI8QZ2ICgtBj3VGJhxtnhWC0f+0=";
+    hash = "sha256-Dk6s5NXa9NY33/d4F9GDB5T1nKu8/OSEOY5cpIXz7ZA=";
   };
 
   vendorHash = "sha256-7AySGQBQHaTp2M1uj5581ZqcpzgexI1KvanWMOc6rx0=";

pkgs/by-name/tr/tree-sitter/grammars/README.md

@@ -121,5 +121,5 @@ nix-shell maintainers/scripts/update.nix --argstr package tree-sitter-grammars.t
 Or, to update all grammars:
 
 ```shell
-nix-shell maintainers/scripts/update.nix --argstr path tree-sitter-grammars --argstr keep-going true
+nix-shell maintainers/scripts/update.nix --argstr path tree-sitter-grammars --arg keep-going true
 ```

pkgs/by-name/tt/tt-smi/package.nix

@@ -8,7 +8,7 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tt-smi";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "tenstorrent";
     repo = "tt-smi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-meDqvDvGBXx/zbHbtgLUb+Kv8LSmsu9OvYCFhmEPAdQ=";
+    hash = "sha256-0Z8F1XdFvnx1q5AUA3RiMbfRyw2nlRVgxhKVotr4GrQ=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/uh/uhd/package.nix

@@ -49,7 +49,7 @@ stdenv'.mkDerivation (finalAttrs: {
   pname = "uhd";
   # NOTE: Use the following command to update the package, and the uhdImageSrc attribute:
   #
-  #     nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
+  #     nix-shell maintainers/scripts/update.nix --argstr package uhd --arg commit true
   #
   version = "4.9.0.1";
 

pkgs/by-name/vi/viskores/package.nix

@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "viskores";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "viskores";
     repo = "viskores";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s399ZkUlKB1xvow+VcA3FQxd+GVlCJyx6KWLtl2Z3RY=";
+    hash = "sha256-fD0L+offvoeYa2yuJ828VRa4GA9/PiyXmxrFAei7u2w=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/wo/worldpainter/package.nix

@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "worldpainter";
-  version = "2.26.1";
+  version = "2.26.2";
 
   src = fetchurl {
     url = "https://www.worldpainter.net/files/worldpainter_${version}.tar.gz";
-    hash = "sha256-YlFiGim9IeurDZ4H1XzxRDn7GM/U/zL9SqTUT4gJdno=";
+    hash = "sha256-vYsIDzzt6VeeXXDDHDduH8jb/sGgviqVRMilk5dl0tU=";
   };
 
   nativeBuildInputs = [

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

@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2026.10";
+  version = "2026.11";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-2yIiCY97Nlor9GhJYCnKwAjjjR9wQZt3q4ktvEeAef0=";
+    hash = "sha256-kTJD2xeclNApeSo1ALNI/XAwDY8tsBO0eMMQurtRF/M=";
   };
 
   meta = {

pkgs/data/fonts/nerd-fonts/update.py

@@ -12,7 +12,7 @@ if not all(
     raise Exception(
         "Please don't run this script manually, only with:\n"
         "nix-shell maintainers/scripts/update.nix --argstr path nerd-fonts "
-        "--argstr commit true"
+        "--arg commit true"
     )
 
 RELEASE_INFO_URL = "https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest"

pkgs/development/mobile/androidenv/README.md

@@ -1,6 +1,6 @@
 # How to update
 
-`nix-shell maintainers/scripts/update.nix  --argstr package androidenv.test-suite --argstr commit true`
+`nix-shell maintainers/scripts/update.nix  --argstr package androidenv.test-suite --arg commit true`
 
 # How to run tests
 

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "greeclimate";
-  version = "3.0.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cmroche";
     repo = "greeclimate";
     tag = "v${version}";
-    hash = "sha256-ikIpL9Il6uCA2z6SbceNzqTyC5P0lP5ZR4J3KfSgypo=";
+    hash = "sha256-lDsMx08BDaUZwmT9afwj9SOMovOftNOlfNV5btSAW8E=";
   };
 
   build-system = [ setuptools ];

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "qbusmqttapi";
-  version = "1.5.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qbus-iot";
     repo = "qbusmqttapi";
     tag = "v${version}";
-    hash = "sha256-llFrgXtECdozAgz+RHTKig9sTKYJHfO7Rt5qz+/e7c8=";
+    hash = "sha256-dxrJzmDb+uClZYfIjhUStYcNOSm90pIZlNdxbbRl4N0=";
   };
 
   postPatch = ''

pkgs/development/python-modules/rocketchat-api/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "rocketchat-api";
-  version = "3.6.1";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jadolg";
     repo = "rocketchat_API";
     tag = version;
-    hash = "sha256-KatsV5MbZ7akD/nsNLEIwPecsaa9W8PplGCppe5rcZI=";
+    hash = "sha256-s+RyHzuWI5pVshTG/DsgtC9+lpexTMkPJYNpNrI7Jkc=";
   };
 
   build-system = [

pkgs/development/tools/infisical/default.nix

@@ -13,7 +13,7 @@
 # from the root of the nixpkgs git repository, run:
 #
 #    nix-shell maintainers/scripts/update.nix \
-#      --argstr commit true \
+#      --arg commit true \
 #      --argstr package infisical
 
 let

pkgs/tools/games/minecraft/optifine/default.nix

@@ -8,7 +8,7 @@
 
 # The `versions.json` can be automatically updated and committed with a commit summary.
 # To do so, change directory to nixpkgs root, and do:
-# $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true
+# $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --arg commit true
 
 lib.recurseIntoAttrs (
   lib.mapAttrs (name: value: callPackage ./generic.nix value) (lib.importJSON ./versions.json)