Merge master into staging-next

nixos/modules/services/cluster/kubernetes/kubelet.nix

@@ -336,10 +336,7 @@ in
           [
             gitMinimal
             openssh
-            # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
-            # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
-            # switch back to plain util-linux.
-            util-linux.withPatches
+            util-linuxMinimal
             iproute2
             ethtool
             thin-provisioning-tools

pkgs/applications/networking/cluster/k3s/builder.nix

@@ -332,11 +332,6 @@ let
       ldflags = versionldflags;
     }).overrideAttrs
       overrideContainerdAttrs;
-
-  # TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
-  # for the 25.05 release. Once the staging cycle referenced in the above PR completes,
-  # switch back to plain util-linuxMinimal.
-  k3sUtilLinux = util-linuxMinimal.withPatches;
 in
 buildGoModule rec {
   pname = "k3s";
@@ -383,7 +378,7 @@ buildGoModule rec {
     ipset
     bridge-utils
     ethtool
-    k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
+    util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
     conntrack-tools
     runc
     bash

pkgs/by-name/ag/agorakit/package.nix

@@ -2,18 +2,19 @@
   lib,
   fetchFromGitHub,
   php82,
+  nix-update-script,
   dataDir ? "/var/lib/agorakit",
 }:
 
 php82.buildComposerProject2 (finalAttrs: {
   pname = "agorakit";
-  version = "1.9.3";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "agorakit";
     repo = "agorakit";
-    tag = finalAttrs.version;
-    sha256 = "sha256-mBBl/8nXG3FsMeecbERLyY2tGFhh+5nS8A4nd7HI+8c=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-YCHszRi+atEkaM9bHncpRtQsuiS6P22yKSqYzXq8flk=";
   };
 
   installPhase = ''
@@ -26,9 +27,11 @@ php82.buildComposerProject2 (finalAttrs: {
     runHook postInstall
   '';
 
-  vendorHash = "sha256-PBymOrvorGfByTBVu/r+kBxQya5qIlu07mfu4ttT7xs=";
+  vendorHash = "sha256-tBB3Zl/N1XqPTD84at5WoGrD0G5rJbobk4E8BFOSm+M=";
   composerStrictValidation = false;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Web-based, open-source groupware";
     longDescription = "AgoraKit is web-based, open-source groupware for citizens' initiatives. By creating collaborative groups, people can discuss topics, organize events, store files and keep everyone updated as needed. AgoraKit is a forum, calendar, file manager and email notifier.";
@@ -36,5 +39,6 @@ php82.buildComposerProject2 (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ shogo ];
+    teams = with lib.teams; [ ngi ];
   };
 })

pkgs/by-name/al/alertmanager-ntfy/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "alertmanager-ntfy";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tyRBfcPL0tzsZgWwgjSW9eMcXZAotkx88tjDr2gw4s4=";
+    hash = "sha256-CtjWZIw0RHVnPP5OMiLbPjv/EuJI6GfWo2hEzRi7zVI=";
   };
 
   vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4=";

pkgs/by-name/ba/backrest/package.nix

@@ -8,6 +8,7 @@
   restic,
   stdenv,
   util-linux,
+  makeBinaryWrapper,
 }:
 let
   pname = "backrest";
@@ -53,9 +54,19 @@ in
 buildGoModule {
   inherit pname src version;
 
+  postPatch = ''
+    sed -i -e \
+      '/func installRestic(targetPath string) error {/a\
+        return fmt.Errorf("installing restic from an external source is prohibited by nixpkgs")' \
+      internal/resticinstaller/resticinstaller.go
+  '';
+
   vendorHash = "sha256-AINnBkP+e9C/f/C3t6NK+6PYSVB4NON0C71S6SwUXbE=";
 
-  nativeBuildInputs = [ gzip ];
+  nativeBuildInputs = [
+    gzip
+    makeBinaryWrapper
+  ];
 
   preBuild = ''
     mkdir -p ./webui/dist
@@ -87,6 +98,11 @@ buildGoModule {
     export HOME=$(pwd)
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/backrest \
+      --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}"
+  '';
+
   meta = {
     description = "Web UI and orchestrator for restic backup";
     homepage = "https://github.com/garethgeorge/backrest";

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

@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  installPhase = ''
-    make install PREFIX="$out"
-  '';
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
 
   fixupPhase = ''
     wrapProgram "$out/bin/chibi-scheme" \
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     description = "Small Footprint Scheme for use as a C Extension Language";
     platforms = lib.platforms.all;
     license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.DerGuteMoritz ];
+    maintainers = with lib.maintainers; [
+      applePrincess
+      DerGuteMoritz
+    ];
   };
 }

pkgs/by-name/co/copybara/package.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  jdk21,
+  makeWrapper,
+  git,
+  gnused,
+  gnugrep,
+  gawk,
+  which,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "copybara";
+  version = "20250501";
+
+  src = fetchurl {
+    url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
+    hash = "sha256-a6ONq8mvSCLEAhdGdOCQWxnsflphZBkRt9K/U/ZF7IA=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    jdk21
+  ];
+
+  runtimeDeps = [
+    git
+    gnused
+    gnugrep
+    gawk
+    which
+  ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/java
+    cp $src $out/share/java/copybara.jar
+
+    mkdir -p $out/bin
+    makeWrapper ${jdk21}/bin/java $out/bin/copybara \
+      --add-flags "-jar $out/share/java/copybara.jar" \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for transforming and moving code between repositories";
+    longDescription = ''
+      Copybara is a tool used internally at Google for transforming and moving
+      code between repositories. It allows you to maintain code in multiple
+      repositories while keeping them in sync through transformations.
+
+      Common use cases include:
+      - Importing sections of code from a confidential repository to a public repository
+      - Importing code from a public repository to a confidential repository
+      - Moving changes between authoritative and non-authoritative repositories
+    '';
+    homepage = "https://github.com/google/copybara";
+    changelog = "https://github.com/google/copybara/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cameroncuttingedge ];
+    platforms = lib.platforms.all;
+    mainProgram = "copybara";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+  };
+})

pkgs/by-name/di/dissent/package.nix

@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "dissent";
-  version = "0.0.34";
+  version = "0.0.35";
 
   src = fetchFromGitHub {
     owner = "diamondburned";
     repo = "dissent";
     tag = "v${version}";
-    hash = "sha256-65UsXSxcEQhQM3N4wUoEehJmF9pJPcGCG7fF/DWe+zU=";
+    hash = "sha256-cmp+oAUV+Oehs/kz6DRW57NgegBWbFVT/7xfY7CbcZM=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ buildGoModule rec {
     install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service
   '';
 
-  vendorHash = "sha256-unb/x7bzWWkr2zKioOarY2VdrGBiJq/mORsWifuulqQ=";
+  vendorHash = "sha256-AhzM0wu2wwwG/sDY+r2wgmotK4zA5u6vzq4KoPMLkL0=";
 
   meta = {
     description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";

pkgs/by-name/dy/dynisland/package.nix

@@ -6,26 +6,27 @@
   openssl,
   gtk4,
   gtk4-layer-shell,
+  mimalloc,
   glib,
   pkg-config,
   wrapGAppsHook4,
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dynisland";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "cr3eperall";
     repo = "dynisland";
-    tag = version;
-    hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg=";
+    tag = finalAttrs.version;
+    hash = "sha256-gO6QniPcv/250CD/cjEJPKijb4cg5R1mUvdrOqamEzk=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-91dQG0NvEL28gHxn6zk3vLODNft8C5ymkLddMT+PB0Q=";
+  cargoHash = "sha256-cvGsRFaqeMdp2cxgfZZcB2r67Si2K6En4or9HVG4WwA=";
 
   buildFeatures = [ "completions" ];
 
@@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     gtk4
     gtk4-layer-shell
+    mimalloc
   ];
 
   nativeBuildInputs = [
@@ -55,10 +57,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Dynamic and extensible GTK4 layer-shell, written in Rust";
     homepage = "https://github.com/cr3eperall/dynisland";
-    changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${version}";
+    changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ryand56 ];
     mainProgram = "dynisland";
     platforms = lib.platforms.linux;
   };
-}
+})

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

@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.6.3";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+e5UtnK/eiFnmvtKjVp3EZ8JLi+dWnJ+vgjDJKRLqH8=";
+    hash = "sha256-CUotqHmVXKKkbAS4a7YWoVjs1GRhxrA5Y5rXtMx/mCo=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-ExHT4kRyyp4c7vGqUN7hbP8pScvto/qp81oDjZGBJis=";
+  vendorHash = "sha256-JN9HaX056+AhYkMyZ7KO7c6z43ynbRyORAOvW+6eVO8=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-i+Ytv8uLSrdLPC04BfZbRXRA7jmy1IX4nYW5WRZubCY=";
+    hash = "sha256-0vMxwm6NOdhCQcVeO93QNGB1BlqVckXzHkpCVvDB9ms=";
   };
 
   composerRepository = php84.mkComposerRepository {

pkgs/by-name/hm/hmcl/package.nix

@@ -26,24 +26,25 @@
   vulkan-loader,
   libpulseaudio,
   gobject-introspection,
+  callPackage,
 }:
 
-let
-  version = "3.6.12";
-  icon = fetchurl {
-    url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico";
-    hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc=";
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hmcl";
-  inherit version;
+  version = "3.6.12";
 
   src = fetchurl {
-    url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar";
+    # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
+    # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
+    url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
     hash = "sha256-ofrG7CVZIODJoHE6owR9P7viBlChamYF5PEpFeeOH4E=";
   };
 
+  icon = fetchurl {
+    url = "https://github.com/HMCL-dev/HMCL/raw/release-${finalAttrs.version}/HMCL/src/main/resources/assets/img/icon@8x.png";
+    hash = "sha256-1OVq4ujA2ZHboB7zEk7004kYgl9YcoM4qLq154MZMGo=";
+  };
+
   dontUnpack = true;
 
   dontWrapGApps = true;
@@ -71,8 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,lib/hmcl}
     cp $src $out/lib/hmcl/hmcl.jar
-    magick ${icon} hmcl.png
-    install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png
+
+    for n in 16 32 48 64 96 128 256
+    do
+      size=$n"x"$n
+      mkdir -p $out/share/icons/hicolor/$size/apps
+      magick ${finalAttrs.icon} -resize $size $out/share/icons/hicolor/$size/apps/hmcl.png
+    done
 
     runHook postInstall
   '';
@@ -113,13 +119,19 @@ stdenv.mkDerivation (finalAttrs: {
       runHook postFixup
     '';
 
-  meta = with lib; {
+  passthru.updateScript = lib.getExe (callPackage ./update.nix { });
+
+  meta = {
     homepage = "https://hmcl.huangyuhui.net";
     description = "Minecraft Launcher which is multi-functional, cross-platform and popular";
+    changelog = "https://docs.hmcl.net/changelog/stable.html";
     mainProgram = "hmcl";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ daru-san ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      daru-san
+      moraxyc
+    ];
     inherit (hmclJdk.meta) platforms;
   };
 })

pkgs/by-name/hm/hmcl/update.nix

@@ -0,0 +1,40 @@
+{
+  writeShellApplication,
+  nix,
+  nix-update,
+  curl,
+  common-updater-scripts,
+  jq,
+}:
+
+writeShellApplication {
+  name = "update-hmcl";
+  runtimeInputs = [
+    curl
+    jq
+    nix
+    common-updater-scripts
+    nix-update
+  ];
+
+  text = ''
+    # get old info
+    oldVersion=$(nix-instantiate --eval --strict -A "hmcl.version" | jq -e -r)
+
+    get_latest_release() {
+        curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
+             -s "https://api.github.com/repos/HMCL-dev/HMCL/releases/latest" | jq -r ".tag_name"
+    }
+
+    version=$(get_latest_release)
+    version="''${version#release-}"
+
+    if [[ "$oldVersion" == "$version" ]]; then
+        echo "Already up to date!"
+        exit 0
+    fi
+
+    nix-update hmcl --version="$version"
+    update-source-version hmcl --source-key=icon --ignore-same-version
+  '';
+}

pkgs/by-name/la/lazynpm/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "lazynpm";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "jesseduffield";
+    repo = "lazynpm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tMUM9GzzTwp/C9hET301LrdWJzVSMYabSQxM78WdE9M=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${finalAttrs.version}"
+    "-X=main.commit=${finalAttrs.src.rev}"
+    "-X=main.date=1970-01-01T00:00:00Z"
+    "-X=main.buildSource=nixpkgs"
+  ];
+
+  meta = {
+    description = "Terminal UI for npm";
+    homepage = "https://github.com/jesseduffield/lazynpm";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ airrnot ];
+    mainProgram = "lazynpm";
+  };
+})

pkgs/by-name/ls/lsr/deps.nix

@@ -8,11 +8,11 @@
 
 linkFarm "zig-packages" [
   {
-    name = "ourio-0.0.0-_s-z0asOAgAhpi7gSpLLvWGj_4XURez4W9TWN6SGs5BP";
+    name = "ourio-0.0.0-_s-z0dAWAgD3XNod2pTh0H8X-a3CjtpAwduh7jcgBz0G";
     path = fetchgit {
       url = "https://github.com/rockorager/ourio";
-      rev = "54c1a1ed8d0994636770e5185ecdb59fe6d8535e";
-      hash = "sha256-WnNfO51t3Qc5LmeDOB6MVrsaUWR41mGuwbO5t5sCtwE=";
+      rev = "ed8a67650e5dbb0a6dca811c9d769187e306ad94";
+      hash = "sha256-GbfZyzbjkVAcOECjQFWkDRw6QZr+kPXzadaI7xBSkig=";
     };
   }
   {

pkgs/by-name/ls/lsr/package.nix

@@ -13,7 +13,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsr";
-  version = "0.2.0";
+  version = "1.0.0";
 
   src = fetchgit {
     url = "https://tangled.sh/@rockorager.dev/lsr";
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
       "src"
       "docs"
     ];
-    hash = "sha256-+5VHY02AHFtV405OGk5PR/2tl/3qDQHDrOUghZbx5ks=";
+    hash = "sha256-VeB0R/6h9FXSzBfx0IgpGlBz16zQScDSiU7ZvTD/Cds=";
   };
 
   postPatch = ''

pkgs/by-name/po/pocket-id/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocket-id";
-  version = "1.3.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I2wKxeXxGO8mx8pHzn/8mAqWsWBrMdFrznmkfEiBzpI=";
+    hash = "sha256-U5tZq310A6hnDIG8CeJl58EWLSshbXVaKJGSzLUCMI4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
-    npmDepsHash = "sha256-CmlYMqRb4+CC0VgpTQKOakc1k6mSIIYbn6l7URu6Eck=";
+    npmDepsHash = "sha256-AZ8je9uaJ1h9wxfs2RtPr2Ki0QNYD0nDd2BZDj6/sl8=";
     npmFlags = [ "--legacy-peer-deps" ];
 
     env.BUILD_OUTPUT_PATH = "dist";

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

@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.61";
+  version = "0.9.62";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vtswHOG3/9oao+KrHWJi3NLsFghczmyLfT276kq5Llg=";
+    hash = "sha256-DaDIx3AbW4JCiZrO4+dxAxue0vCaxbzAGEgKoERFK7g=";
     fetchSubmodules = true;
   };
 
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-9YG0l/cIjk5imkoly/pNmTVN7N+K56tpWnD7HDFSqiw=";
+    hash = "sha256-lez75n3dIM4efpP+qPuDteCfMnC6wPD+L2173iJbTZM=";
   };
 
   pnpmRoot = "../..";

pkgs/by-name/s-/s-tui/package.nix

@@ -2,25 +2,29 @@
   lib,
   stdenv,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   nix-update-script,
   s-tui,
   testers,
+  stress,
 }:
 
 python3Packages.buildPythonPackage rec {
   pname = "s-tui";
-  version = "1.1.6";
+  version = "1.2.0";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c=";
+  src = fetchFromGitHub {
+    owner = "amanusk";
+    repo = "s-tui";
+    tag = "v${version}";
+    hash = "sha256-VdQSDRDdRO6jHSuscOQZXnVM6nWHaXRfR4sZ3x5lriI=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    urwid
-    psutil
+  propagatedBuildInputs = [
+    python3Packages.urwid
+    python3Packages.psutil
+    stress
   ];
 
   passthru = {
@@ -32,7 +36,7 @@ python3Packages.buildPythonPackage rec {
     homepage = "https://amanusk.github.io/s-tui/";
     description = "Stress-Terminal UI monitoring tool";
     license = licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with maintainers; [ lilacious ];
     broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49
     mainProgram = "s-tui";
   };

pkgs/by-name/ut/util-linux/package.nix

@@ -205,18 +205,6 @@ stdenv.mkDerivation (finalPackage: rec {
     '';
 
   passthru = {
-    # TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
-    # for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
-    # in the above PR completes, this passthru and all consumers of it should go away.
-    withPatches = finalPackage.overrideAttrs (prev: {
-      patches = lib.unique (
-        prev.patches or [ ]
-        ++ [
-          ./fix-mount-regression.patch
-        ]
-      );
-    });
-
     updateScript = gitUpdater {
       # No nicer place to find latest release.
       url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";

pkgs/by-name/yt/ytdl-sub/package.nix

@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.06.27";
+  version = "2025.07.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-Ub5ITm30hZHWSMKFD7TX4z1GBQ0fU+cMqWRt2AVbGoI=";
+    hash = "sha256-aVI/OY1Dh5LvbDyg+GuWBz2e6oUgTzErqfnow22v8CI=";
   };
 
   postPatch = ''

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

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "python-snoo";
-  version = "0.6.6";
+  version = "0.6.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "python-snoo";
     tag = "v${version}";
-    hash = "sha256-Aj9d45EKjv4xAs/Y9/8ew+aDe/GFGSxQeSG1SAObqE0=";
+    hash = "sha256-XHjIrR/lv07wPGDga1XsuHYgqQCgqXCLkhzGH8XTbSU=";
   };
 
   postPatch = ''