ci/OWNERS

@@ -506,7 +506,7 @@ pkgs/by-name/oc/octodns/ @anthonyroussel
 pkgs/by-name/te/teleport*     @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
 
 # Warp-terminal
-pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @4evy @johnrtitor
+pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @FlameFlag @johnrtitor
 
 # Nim
 /doc/languages-frameworks/nim.section.md  @NixOS/nim

doc/languages-frameworks/javascript.section.md

@@ -495,7 +495,7 @@ In this example, `prePnpmInstall` will be run by both `pnpmConfigHook` and by th
 
 #### pnpm `fetcherVersion` {#javascript-pnpm-fetcherVersion}
 
-This is the version of the output of `fetchPnpmDeps`. New packages should use `4`:
+This is the version of the output of `fetchPnpmDeps`. New packages should use `3`:
 
 ```nix
 {

doc/release-notes/rl-2611.section.md

@@ -23,8 +23,6 @@
 - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`.
   Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information.
 
-- `zerofs` has been updated from `1.x` to `2.x` which is a breaking change. Volumes created by earlier releases are refused at open with a clear error. There is no migration tool; older volumes remain readable and writable by the release that created them.
-
 - `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias.
 
 - `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation.

maintainers/github-teams.json

@@ -178,12 +178,11 @@
     "members": {
       "0xMRTT": 105598867,
       "21CSM": 81891917,
-      "4evy": 57304299,
       "Aleksanaa": 42209822,
-      "Br1ght0ne": 12615679,
       "CorbanR": 1918683,
       "Emin017": 99674037,
       "Et7f3": 29592775,
+      "FlameFlag": 57304299,
       "Guanran928": 68757440,
       "LnL7": 689294,
       "Mastermindaxe": 33257997,

maintainers/maintainer-list.nix

@@ -261,13 +261,6 @@
     githubId = 3417013;
     name = "Eske Nielsen";
   };
-  _4evy = {
-    name = "_4evy";
-    email = "git@ps1.sh";
-    github = "_4evy";
-    githubId = 57304299;
-    matrix = "@donteatoreo:matrix.org";
-  };
   _4r7if3x = {
     email = "the.artifex@proton.me";
     matrix = "@4r7if3x:matrix.org";
@@ -9157,6 +9150,13 @@
     name = "Sebastian Neubauer";
     keys = [ { fingerprint = "2F93 661D AC17 EA98 A104  F780 ECC7 55EE 583C 1672"; } ];
   };
+  FlameFlag = {
+    name = "FlameFlag";
+    email = "github@flameflag.dev";
+    github = "FlameFlag";
+    githubId = 57304299;
+    matrix = "@donteatoreo:matrix.org";
+  };
   Flameopathic = {
     email = "flameopathic@gmail.com";
     github = "Flameopathic";
@@ -9540,13 +9540,6 @@
     githubId = 2881922;
     name = "Francis St-Amour";
   };
-  fstracke = {
-    email = "fritz.stracke@rwth-aachen.de";
-    github = "fstracke";
-    githubId = 31512703;
-    name = "Fritz Stracke";
-    keys = [ { fingerprint = "7A9D 6DB2 0C5A AA55 7838  EEE6 B8CA 2D9A D8F0 506F"; } ];
-  };
   ftrvxmtrx = {
     email = "ftrvxmtrx@gmail.com";
     github = "ftrvxmtrx";
@@ -16494,12 +16487,6 @@
     githubId = 30468956;
     name = "Lukas Heiligenbrunner";
   };
-  lukas-sgx = {
-    email = "lukas.soigneux@epitech.eu";
-    github = "lukas-sgx";
-    githubId = 68616614;
-    name = "Lukas Soigneux";
-  };
   lukaslihotzki = {
     email = "lukas@lihotzki.de";
     github = "lukaslihotzki";
@@ -22466,7 +22453,7 @@
     githubId = 38916722;
   };
   pradyuman = {
-    email = "me@pmn.co";
+    email = "me@pradyuman.co";
     github = "pradyuman";
     githubId = 9904569;
     name = "Pradyuman Vig";
@@ -24106,12 +24093,6 @@
     githubId = 64620440;
     name = "RoGreat";
   };
-  rohan-datar = {
-    email = "me@rohandatar.com";
-    github = "rohan-datar";
-    githubId = 37545071;
-    name = "Rohan Datar";
-  };
   rohanssrao = {
     email = "rohanssrao@gmail.com";
     github = "rohanssrao";

maintainers/scripts/luarocks-packages.csv

@@ -136,7 +136,6 @@ mpack,,,,,,
 neorg,,,,,5.1,GaetanLepage
 neorg-interim-ls,,,,,,
 neotest,,,,,5.1,mrcjkb
-neotest-nix,,,,,,khaneliman
 nginx-lua-prometheus,,,,,,ulysseszhan
 nlua,,,,,,teto
 nui.nvim,,,,,5.1,mrcjkb

nixos/modules/i18n/input-method/fcitx5.nix

@@ -109,8 +109,7 @@ in
         (pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb" (
           lib.concatStringsSep "\n" (
             lib.mapAttrsToList (
-              name: value:
-              "${name} \"${builtins.replaceStrings [ "\\" "\n" "\"" ] [ "\\\\" "\\n" "\\\"" ] value}\""
+              name: value: "${name} ${builtins.replaceStrings [ "\\" "\n" ] [ "\\\\" "\\n" ] value}"
             ) cfg.quickPhrase
           )
         ))

nixos/modules/programs/firefox.nix

@@ -327,6 +327,7 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
+    danth
     linsui
   ];
 }

nixos/modules/programs/fish.nix

@@ -293,8 +293,8 @@ in
                 ''
                   mkdir -p $out
                   if [ -d $package/share/man ]; then
-                    find -L $package/share/man -type f -print0 \
-                      | xargs -0 ${pkgs.python3.pythonOnBuildForHost.interpreter} \
+                    find -L $package/share/man -type f \
+                      | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} \
                           ${generator}/create_manpage_completions.py --directory $out \
                           >/dev/null
                   fi

nixos/modules/services/desktop-managers/cosmic.nix

@@ -20,7 +20,7 @@ let
     with pkgs;
     [
       cosmic-applets
-      cosmic-app-library
+      cosmic-applibrary
       cosmic-bg
       cosmic-comp
       cosmic-files

nixos/modules/services/mail/postfix-tlspol.nix

@@ -164,20 +164,6 @@ in
       };
       users.groups.postfix-tlspol = { };
 
-      systemd.sockets.postfix-tlspol = {
-        wantedBy = [ "sockets.target" ];
-        socketConfig = {
-          Accept = false;
-          ListenStream = [
-            (lib.removePrefix "unix:" cfg.settings.server.address)
-          ];
-          SocketUser = "postfix-tlspol";
-          SocketGroup = "postfix-tlspol";
-          SocketMode = cfg.settings.server.socket-permissions;
-          DirectoryMode = "0755";
-        };
-      };
-
       systemd.services.postfix-tlspol = {
         after = [
           "nss-lookup.target"
@@ -187,6 +173,7 @@ in
           "nss-lookup.target"
           "network-online.target"
         ];
+        wantedBy = [ "multi-user.target" ];
 
         description = "Postfix DANE/MTA-STS TLS policy socketmap service";
         documentation = [ "https://github.com/Zuplu/postfix-tlspol" ];
@@ -230,6 +217,9 @@ in
           RestrictAddressFamilies = [
             "AF_INET"
             "AF_INET6"
+          ]
+          ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [
+            "AF_UNIX"
           ];
           RestrictNamespaces = true;
           RestrictRealtime = true;
@@ -247,7 +237,7 @@ in
           RuntimeDirectory = "postfix-tlspol";
           RuntimeDirectoryMode = "1750";
           WorkingDirectory = "/var/cache/postfix-tlspol";
-          UMask = "0077";
+          UMask = "0117";
         };
       };
     })

nixos/modules/services/networking/mptcpd.nix

@@ -5,9 +5,11 @@
   ...
 }:
 let
+
   cfg = config.services.mptcpd;
-  settingsFormat = pkgs.formats.ini { };
+
 in
+
 {
 
   options = {
@@ -18,57 +20,15 @@ in
 
       package = lib.mkPackageOption pkgs "mptcpd" { };
 
-      settings = lib.mkOption {
-        type = settingsFormat.type;
-        default = { };
-        example = lib.literalExpression ''
-          {
-            core = {
-              "addr-flags" = "subflow";
-              "notify-flags" = "existing,skip_link_local,skip_loopback,check_route";
-              "load-plugins" = "addr_adv,sspi";
-            };
-          }
-        '';
-        description = ''
-          mptcpd configuration written to {file}`/etc/mptcpd/mptcpd.conf`.
-
-          See {manpage}`mptcpd(8)` for details about available options and syntax.
-        '';
-      };
-
     };
 
   };
 
   config = lib.mkIf cfg.enable {
 
-    # Disable NetworkManager from configuring the MPTCP endpoints.
-    # See https://github.com/multipath-tcp/mptcpd/blob/48942b2110805af236ca41164fde67830efd7507/README.md?plain=1#L19-L38
-    networking.networkmanager.connectionConfig = {
-      "connection.mptcp-flags" = 1;
-    };
-
-    environment.etc."mptcpd/mptcpd.conf".source = settingsFormat.generate "mptcpd.conf" cfg.settings;
-
     environment.systemPackages = [ cfg.package ];
 
-    services.mptcpd.settings = {
-      core = {
-        log = lib.mkDefault "journal";
-        "plugin-dir" = "${cfg.package}/lib/mptcpd";
-        "path-manager" = lib.mkDefault "addr_adv";
-      };
-    };
-
     systemd.packages = [ cfg.package ];
-    systemd.services.mptcp = {
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = [
-        ""
-        "${cfg.package}/libexec/mptcpd"
-      ];
-    };
 
   };
 

nixos/modules/services/networking/yggdrasil.nix

@@ -33,11 +33,17 @@ let
     else
       null;
 
+  # Build base configuration with systemd credential path override
   baseSettings =
     cfg.settings
-    // lib.optionalAttrs (effectiveKeyPath != null) {
-      PrivateKeyPath = "/run/credentials/yggdrasil.service/private-key";
-    };
+    // (
+      if effectiveKeyPath != null then
+        {
+          PrivateKeyPath = "/private-key";
+        }
+      else
+        { }
+    );
 
   # Remove null values that yggdrasil doesn't expect
   cleanSettings = lib.filterAttrs (n: v: v != null) baseSettings;
@@ -321,6 +327,7 @@ in
           StateDirectory = "yggdrasil";
           RuntimeDirectory = "yggdrasil";
           RuntimeDirectoryMode = "0750";
+          BindReadOnlyPaths = lib.optional (effectiveKeyPath != null) "%d/private-key:/private-key";
           LoadCredential = lib.optional (effectiveKeyPath != null) "private-key:${effectiveKeyPath}";
 
           AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";

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

@@ -202,6 +202,7 @@ in
 
   meta.maintainers = with lib.maintainers; [
     bhankas
+    danth
     ramblurr
   ];
 }

nixos/tests/postfix-tlspol.nix

@@ -9,10 +9,7 @@
 
   containers.machine = {
     services.postfix.enable = true;
-    services.postfix-tlspol = {
-      enable = true;
-      settings.server.metrics-address = "127.0.0.1:8642";
-    };
+    services.postfix-tlspol.enable = true;
 
     services.dnsmasq = {
       enable = true;
@@ -29,19 +26,13 @@
     with subtest("Interact with the service"):
       machine.succeed("postfix-tlspol -purge")
 
-      response = machine.log(machine.succeed("postfix-tlspol -query localhost"))
-      response = json.loads(machine.succeed("postfix-tlspol -query localhost"))
+      response = json.loads((machine.succeed("postfix-tlspol -query localhost")))
       machine.log(json.dumps(response, indent=2))
 
       assert response["dane"]["policy"] == "", f"Unexpected DANE policy for localhost: {response["dane"]["policy"]}"
       assert response["mta-sts"]["policy"] == "TEMP", f"Unexpected MTA-STS policy for localhost: {response["mta-sts"]["policy"]}"
 
-    with subtest("Metrics listener"):
-      machine.log(machine.succeed("curl --silent --fail http://localhost:8642/metrics | grep --quiet postfix_tlspol_queries_total"))
-
-
-    with subtest("Hardening"):
-      machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1])
+    machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1])
   '';
 
 }

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix

@@ -77,10 +77,7 @@ melpaBuild {
   meta = {
     homepage = "https://github.com/dakra/ghostel";
     description = "Terminal emulator powered by libghostty";
-    maintainers = with lib.maintainers; [
-      rohan-datar
-      vonfry
-    ];
+    maintainers = with lib.maintainers; [ vonfry ];
     license = lib.licenses.gpl3Plus;
   };
 }

pkgs/applications/editors/vim/plugins/generated.nix

@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-07-06";
+    version = "0-unstable-2026-06-26";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "4504f8f389c44561e10027e68000cbe000129727";
-      hash = "sha256-GvIyqf5GVCR2wkS5G1+IN4KIkLxaO/nsCXECU41DdW4=";
+      rev = "490afbd7fd3b316330550405ac74758a971104a4";
+      hash = "sha256-jdH0D+L3Y+5NJXoIik5Ao18dHRKc3dN3ZmKVUH+R9/4=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -628,12 +628,12 @@ final: prev: {
 
   YouCompleteMe = buildVimPlugin {
     pname = "YouCompleteMe";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-01-30";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "d4c91430b70a21ce471c8572400b647d313995b4";
-      hash = "sha256-G/xFHsu2HveQDpFGCQY99Z5KGrIcJaLs7Jq9a1PuYJY=";
+      rev = "6a52780a22dfd4ddafbe23c0d2c2a2107ceeb397";
+      hash = "sha256-/k9lIx9BVaTNu9Kqrz9Y6d+hTGsDnspmq0rcdJpZo7I=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -1120,12 +1120,12 @@ final: prev: {
 
   async-nvim = buildVimPlugin {
     pname = "async.nvim";
-    version = "0-unstable-2026-07-06";
+    version = "0-unstable-2026-06-11";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "async.nvim";
-      rev = "46adf61a022d5c923f981d527443f406e7d0f63e";
-      hash = "sha256-7VuTWfdh3d3/q2KUyi5d+7GbaEq8NgbQgBt+Wt+/n5U=";
+      rev = "e2a813be9cd143ab1181de6d8a0720e0230cd86e";
+      hash = "sha256-b7jE3tY+6nlbIFTuOxKz4w6jDw7hlyvgBYy0Jg6McAc=";
     };
     meta.homepage = "https://github.com/lewis6991/async.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2114,12 +2114,12 @@ final: prev: {
 
   boo-colorscheme-nvim = buildVimPlugin {
     pname = "boo-colorscheme-nvim";
-    version = "0.5.2-unstable-2026-07-06";
+    version = "0.5.2-unstable-2026-02-10";
     src = fetchFromGitHub {
       owner = "rockerBOO";
       repo = "boo-colorscheme-nvim";
-      rev = "8eb36d50a124472c8b3c864e45997b4ac7331db7";
-      hash = "sha256-K/9OkwFHVgu1JJbkhqGr4pO9P6c4Qf4SB6LLSdqLkIc=";
+      rev = "36a52f900f49fe78bfeb30d2519a8dd356bf8fc1";
+      hash = "sha256-oGplv+2q1M1pIwFj2u8ZT9WTNNImYreQtiBECGJKe/Q=";
     };
     meta.homepage = "https://github.com/rockerBOO/boo-colorscheme-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2268,12 +2268,12 @@ final: prev: {
 
   calendar-vim = buildVimPlugin {
     pname = "calendar.vim";
-    version = "0-unstable-2026-07-01";
+    version = "0-unstable-2025-03-07";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "2ef5b0a2717d8a2ea24c55d11e426f25e6243282";
-      hash = "sha256-1aLYR0yTtOV0DYrcSics0PZo0+FLSO6CGYScmyyvQN4=";
+      rev = "36d1a3a76e39b9d73ff964db2f75dacaf2d2bef3";
+      hash = "sha256-rNB44bWt6kFnrn+UyOqYHjigA9F/Iao9Osg/YTO4nhw=";
     };
     meta.homepage = "https://github.com/itchyny/calendar.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2310,12 +2310,12 @@ final: prev: {
 
   catppuccin-vim = buildVimPlugin {
     pname = "catppuccin-vim";
-    version = "0-unstable-2026-06-30";
+    version = "0-unstable-2025-08-11";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "vim";
-      rev = "029e9a878a58eba039e47847a2f17e10acefb3f5";
-      hash = "sha256-gDq7vXIBc2mY8DMl+A6Ps0qPvAIR3NDhCRxBgqMOYCM=";
+      rev = "fc2e9d853208621a94ec597c50bf559875bf6d99";
+      hash = "sha256-Ap9UKMWfDBbWLf7Rh47JQy3EO2Tphf05RZvX9voF1Ac=";
     };
     meta.homepage = "https://github.com/catppuccin/vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -3484,12 +3484,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-07-03";
+    version = "0.0.82-unstable-2026-06-26";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "caff3ebadf920d3f2323ee6b9ac88a90ba5b02ba";
-      hash = "sha256-zF1y/MOicePWquCRUy6hCgIhIHiO8Z0p2zquZmyaXC8=";
+      rev = "4783286c40bcced33e2755f41a338bacc8232f90";
+      hash = "sha256-ardShVUN0QYzBtb8QWPsOQYw6NDjAmlBJVNsSFTe5Wc=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -3568,12 +3568,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.18.0";
+    version = "19.17.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.18.0";
-      hash = "sha256-4O0UuJuuv4gmyxiZlLMG/sKlt84SW2ZooeOlFlK6/7I=";
+      tag = "v19.17.0";
+      hash = "sha256-/1XlRYSEucUMJAllX27OJNbydgLyzbWS+SXhyNXj4QU=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -3694,12 +3694,12 @@ final: prev: {
 
   colorful-menu-nvim = buildVimPlugin {
     pname = "colorful-menu.nvim";
-    version = "0-unstable-2026-06-30";
+    version = "0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "xzbdmw";
       repo = "colorful-menu.nvim";
-      rev = "196ddf16d5f8fec09ba7f20e6b153aa5188e907b";
-      hash = "sha256-cqujcf3hgTcHtwqRliEvFAtkBRkNljSNXn/N4AOgeyc=";
+      rev = "13f9b7eaa9cd2901b4f8915cfb2483c3be4c8c20";
+      hash = "sha256-RPYTEtJ3pazPJjIby+WQOHVAa1BE58d9/EOu8XQnUNk=";
     };
     meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4199,12 +4199,12 @@ final: prev: {
 
   cornelis = buildVimPlugin {
     pname = "cornelis";
-    version = "0.12-compat";
+    version = "2.8.0-unstable-2026-06-02";
     src = fetchFromGitHub {
       owner = "agda";
       repo = "cornelis";
-      tag = "nvim-0.12-compat";
-      hash = "sha256-ObmnsH25/vnC6TEJ44ZZuJJBrnnAJuDNYkJZU6YnTi4=";
+      rev = "f6db4a8e0993276557cc59b8e720d04e73138ded";
+      hash = "sha256-XG7F0ALVWU+8XHfYEj0R8SF+vjwCyy65oX4UcVxRlPc=";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
     meta.license = getLicenseFromSpdxId "BSD-3-Clause";
@@ -4549,12 +4549,12 @@ final: prev: {
 
   ddc-filter-sorter_rank = buildVimPlugin {
     pname = "ddc-filter-sorter_rank";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-06-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-filter-sorter_rank";
-      rev = "0d58fe698528dfeaf895eb70791c1b5e8a1d2288";
-      hash = "sha256-0iLK7vdkZ27sMUho3SK7NHh77uL+aLpIjqkSOuKc5j8=";
+      rev = "69a1109addf0e639811ec9a4a81bc09f09357c2a";
+      hash = "sha256-H2Bh9aIMzMvE+Hz6Fqq5Ztt9004JYjzUAgaFcOJh1Os=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4577,12 +4577,12 @@ final: prev: {
 
   ddc-source-around = buildVimPlugin {
     pname = "ddc-source-around";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-06-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-source-around";
-      rev = "277b926fdb3b642572cc756d52a42f18ac7c6059";
-      hash = "sha256-5KT1verDM4My7ow+9nswHPsSUNmdqsyx1H3jd2SKp3k=";
+      rev = "c4268422e397ffea86fc1b2bda8ec9bb088c9771";
+      hash = "sha256-q8N4bmL6D9lE1kh2ZOv6ITBhkudJF6fOR8vlBUhZMEY=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-around/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5433,12 +5433,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-06-25";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "24a927e168789103137156e980e2635956e90b3c";
-      hash = "sha256-uo3/DBMPv67UOQJscAW6aoc7c5IDJdQta7f8/1kI9dQ=";
+      rev = "07a41015af3bcbad7dff94191d5ad4b8a67fd202";
+      hash = "sha256-/XQu9ywd4AK8sD7AIRdPJYjrPqM5ZorZv266tJViz/M=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5560,12 +5560,12 @@ final: prev: {
 
   efmls-configs-nvim = buildVimPlugin {
     pname = "efmls-configs-nvim";
-    version = "1.11.2";
+    version = "1.11.1-unstable-2026-05-24";
     src = fetchFromGitHub {
       owner = "creativenull";
       repo = "efmls-configs-nvim";
-      tag = "v1.11.2";
-      hash = "sha256-NXwwuvdMpqI0+i0gmX7mtNlUHWTJnDejuZUN2PiS6hs=";
+      rev = "2f5dc31042cc76fc3d5a859842a8416085c4d41f";
+      hash = "sha256-mtHihfpaV9gJFqZBD0h90dAC6kECNxbFPH3OYJoKVT0=";
     };
     meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -6696,11 +6696,11 @@ final: prev: {
 
   gitlab-vim = buildVimPlugin {
     pname = "gitlab.vim";
-    version = "1.1.0-unstable-2026-07-03";
+    version = "1.1.0-unstable-2026-06-24";
     src = fetchgit {
       url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
-      rev = "ca4971d02c3114d6f5e94b1d0bf460faccbf7f5e";
-      hash = "sha256-i64MIJqWf3BVJPEf5dpzU5nvnTNXjqn4c8SuQ6Pkct4=";
+      rev = "94cadd5075cfefadd5dcfe8a820313a3fb99465e";
+      hash = "sha256-awuHlEw7jV7gBMVi57MOYDowexdtqLyQCUljV0mYlCg=";
     };
     meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
     meta.license = unfree;
@@ -6739,11 +6739,11 @@ final: prev: {
     pname = "gitportal.nvim";
     version = "0-unstable-2026-06-26";
     src = fetchgit {
-      url = "https://codeberg.org/trevorhauter/gitportal.nvim/";
+      url = "https://codeberg.org/trevorhauter/gitportal.nvim";
       rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb";
       hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk=";
     };
-    meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim/";
+    meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim";
     meta.license = getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
@@ -7100,12 +7100,12 @@ final: prev: {
 
   guihua-lua = buildVimPlugin {
     pname = "guihua.lua";
-    version = "0.1-unstable-2026-07-03";
+    version = "0.1-unstable-2026-05-26";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "guihua.lua";
-      rev = "4c513d5dac550af77034cced421967b393261509";
-      hash = "sha256-e0Almh8wWGp5NxHX48Y4XGEUHtPCYOXi4BIlfeSzaIs=";
+      rev = "f8e06bd8a26dee3377d63c2adf1e57cdb58ac474";
+      hash = "sha256-lupDg/yt75164H8zQs/HTKqC3Y1FnQCzoMq90nwapO8=";
     };
     meta.homepage = "https://github.com/ray-x/guihua.lua/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7465,12 +7465,12 @@ final: prev: {
 
   hlchunk-nvim = buildVimPlugin {
     pname = "hlchunk.nvim";
-    version = "1.3.0-unstable-2026-07-04";
+    version = "1.3.0-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "shellRaining";
       repo = "hlchunk.nvim";
-      rev = "fb5a16ecc4ff15772189679ffdede6ee879288ec";
-      hash = "sha256-rSQnHnks068egYd9AlfuC43F3BcysyMTYnlaUFjlDM4=";
+      rev = "06f51922ca43d5cdacf96725c106405fe064c59e";
+      hash = "sha256-ETsuiYjTR4JF/4RVqRXJHLtcoalEaFinHxxD4Ww34xU=";
     };
     meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8878,12 +8878,12 @@ final: prev: {
 
   lightline-vim = buildVimPlugin {
     pname = "lightline.vim";
-    version = "0-unstable-2026-07-01";
+    version = "0-unstable-2026-04-12";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "d042c506cb2e7a59112a72447e0b5fe8739d9d1d";
-      hash = "sha256-CVxtG8RLBgHOQUwIjaB9vmeOjGODZzNj/KCEOHTw7EI=";
+      rev = "6c283f8df85aa7219fa4096a6ed4ff45d48aa9e1";
+      hash = "sha256-YYhSlqYUXFbArn2lq80LH/WXIUbHjt087+w2y/6EjtQ=";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10488,12 +10488,12 @@ final: prev: {
 
   mkdnflow-nvim = buildVimPlugin {
     pname = "mkdnflow.nvim";
-    version = "2.22.3";
+    version = "2.22.2-unstable-2026-03-25";
     src = fetchFromGitHub {
       owner = "jakewvincent";
       repo = "mkdnflow.nvim";
-      tag = "v2.22.3";
-      hash = "sha256-z382m54owzdh5+xUHjGdELuZqc8kD4z5TaqzptO0Fac=";
+      rev = "f20732686f70f60f18f09f4befe984ae63a99201";
+      hash = "sha256-DxoSwy8WTgfKpguNVKsII2IUNfMS4oDGO18JmqalCcQ=";
     };
     meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -10572,12 +10572,12 @@ final: prev: {
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "1.9.2-unstable-2026-07-03";
+    version = "1.9.2-unstable-2026-03-01";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "bedea63819c618e007e7c40059fc6e72d598c8df";
-      hash = "sha256-fzVqcow/Ugjq/owYt6wnz22iF/vHGZEKOkPV0kabWYE=";
+      rev = "c1db39e78fe18559d8f2204bf5c4d476bdc80d3e";
+      hash = "sha256-FsDtd50Ehyd6EVdyU3fIDefkZJsOIi5bMPPdV3rKZw0=";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -11034,12 +11034,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-07-02";
+    version = "1.4.0-unstable-2026-06-26";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "6859959fa6322a48121d66aba7d4f3fe628a167d";
-      hash = "sha256-7oYpUrXAzPgUKvmZIgCuSpK3u4sV6SF4d9s38mt5i4g=";
+      rev = "21fe7bede81cabd3281825c445a0b76b1279e840";
+      hash = "sha256-odhIicmF3HEUyWCNXV+0u4MhU3sSoFAw6LbfMZqYJVs=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11118,12 +11118,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-07-06";
+    version = "3.0.0-unstable-2026-06-23";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "6fc2fa890bd2031ed999c074daab0fb4feff20a5";
-      hash = "sha256-fJB5E05OJh01LNZ5wCv6GSymjB0GVia6nYP2ypIY7dM=";
+      rev = "43ea1a0854052e583f647e0b35879f0158a70a78";
+      hash = "sha256-WTnQnnOP98ZGnVRoQyhai0Bot4kQi6tGjWE7t4gSwdc=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11611,12 +11611,12 @@ final: prev: {
 
   neotest-python = buildVimPlugin {
     pname = "neotest-python";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2026-04-05";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-python";
-      rev = "51c453d57f8d5156671b42ea57fafa2e1c9fb641";
-      hash = "sha256-M0FROtTXMiAmmo83m1WwSQ5px5I6awV4I3/UY+sTYAc=";
+      rev = "e6df4f1892f6137f58135917db24d1655937d831";
+      hash = "sha256-TUu50qK97RuBI1eOD0JGtSq3M7o0HwlRKjLz2SCfjlE=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12002,12 +12002,12 @@ final: prev: {
 
   nightfox-nvim = buildVimPlugin {
     pname = "nightfox.nvim";
-    version = "3.10.0-unstable-2026-07-04";
+    version = "3.10.0-unstable-2026-05-03";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "4dacd3f0185a2227bdf3b6c0975a8f0bf87cac9a";
-      hash = "sha256-LR0VqMMuH3GN6uI2aun7yOFsLxhGASMnFuzMrhPNJ+Q=";
+      rev = "26b61b1f856ec37cae3cb64f5690adb955f246a1";
+      hash = "sha256-xSnMYGilRjNHh1G1eOghl8Dr93HsCe3WHHAkchCyW+E=";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12240,12 +12240,12 @@ final: prev: {
 
   nvchad = buildVimPlugin {
     pname = "nvchad";
-    version = "2.5-unstable-2026-07-03";
+    version = "2.5-unstable-2026-04-13";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "add44b952d631981614bbb8cfc6f7002f296dfe6";
-      hash = "sha256-EuP+/HWJgqwG5LR2rNvtq7mhFkUDs0oyeG6xbbPogC4=";
+      rev = "d042cc975247c2aa55fcb228e5d146dc1dc6c648";
+      hash = "sha256-WNQMaM5EQBRQC9JfvEIgFhn3K5n8q0YeiJ9NdG3E+z4=";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -12895,12 +12895,12 @@ final: prev: {
 
   nvim-java = buildVimPlugin {
     pname = "nvim-java";
-    version = "4.1.2";
+    version = "4.1.0";
     src = fetchFromGitHub {
       owner = "nvim-java";
       repo = "nvim-java";
-      tag = "v4.1.2";
-      hash = "sha256-7mtQVcO4skrUFClGOXxKqmvVo6Vgq6ZM2Um0x6C7IGg=";
+      tag = "v4.1.0";
+      hash = "sha256-w4BCKMbbFps6YxV3gyo5KGzBRJnU6h1vrUbYRq9cO0A=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13214,12 +13214,12 @@ final: prev: {
 
   nvim-metals = buildVimPlugin {
     pname = "nvim-metals";
-    version = "0.10.x-unstable-2026-07-02";
+    version = "0.10.x-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "a4b20656bf1014404dd63bf9fd5f22fcc50fee52";
-      hash = "sha256-3Vqc82HfKRKw/4LrrpamInCY5uVT6dfuENhmMie0DQ8=";
+      rev = "4cc98f07ec96bb748a8796831767538e0e4f9be4";
+      hash = "sha256-uXmLZMbJKUFua9Jg/LYJ9dGRz+QF+nw7Nz5n6uaGSdQ=";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13354,12 +13354,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "1.9-unstable-2026-07-03";
+    version = "1.9-unstable-2026-06-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "2ce07161353d8345966a2bee02408d012ca25df0";
-      hash = "sha256-eqzUYYCtIinlT5FD6OHWCmyNKX/SXmaJ/3J26ZDXjuI=";
+      rev = "f15aad8c58ef24b98ffe241ff52f9dfd74cff591";
+      hash = "sha256-XDLiO1PxxdKzC2YPhMKwM6NK76SWe2933CXMjH9eHZs=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13494,12 +13494,12 @@ final: prev: {
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "0-unstable-2026-06-30";
+    version = "0-unstable-2026-06-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "77dfcafd53088c7941f2d383541aa8fdda7fd7b7";
-      hash = "sha256-8zRw79IKv7suISRjcUxs/iUWxp6tb+aDDsMo6DYuQ9o=";
+      rev = "4abd0dc9510599d90d871d112f01924ef7171705";
+      hash = "sha256-JM9+rn64kWqvKFac8qHmCPEecRY+dj9AC7BSarMYNHs=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13690,7 +13690,7 @@ final: prev: {
 
   nvim-test = buildVimPlugin {
     pname = "nvim-test";
-    version = "1.4.1-unstable-2026-05-16";
+    version = "1.4.1-unstable-2026-7-2";
     src = fetchFromGitHub {
       owner = "klen";
       repo = "nvim-test";
@@ -13718,12 +13718,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "1.18.0";
+    version = "1.17.0-unstable-2026-06-20";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      tag = "v1.18.0";
-      hash = "sha256-QPPtshLL7sfb3wUxr/kusA3nAEfoxgiOxayUFptGUI0=";
+      rev = "8e8be709c9a93e1ebefde7964884a8b564bfd3e0";
+      hash = "sha256-GAxve+xgXntwJ4B/WdNUiDwE3kgMRz8fKfOlJYp1Zg8=";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.license = unfree;
@@ -14040,12 +14040,12 @@ final: prev: {
 
   nvim_context_vt = buildVimPlugin {
     pname = "nvim_context_vt";
-    version = "0-unstable-2026-07-06";
+    version = "0-unstable-2025-09-17";
     src = fetchFromGitHub {
       owner = "andersevenrud";
       repo = "nvim_context_vt";
-      rev = "b72accf0ba6772c9ae6e37f4540a81f1bc715f1a";
-      hash = "sha256-ahqp4VVPyt7Cev98Icr2p8RbbDOGiUYIsbOXxX6AwkE=";
+      rev = "fadbd9e57af72f6df3dd33df32ee733aa01cdbc0";
+      hash = "sha256-ghpXrJgEN0CCCEXDsqe9G34KTGpAc0x8UhMQNmakp2c=";
     };
     meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14152,12 +14152,12 @@ final: prev: {
 
   ocaml-nvim = buildVimPlugin {
     pname = "ocaml.nvim";
-    version = "1.0.0-unstable-2026-07-03";
+    version = "1.0.0-unstable-2026-05-28";
     src = fetchFromGitHub {
       owner = "tarides";
       repo = "ocaml.nvim";
-      rev = "333647c7d16aa0e28a6d7cf15f2716111bec53af";
-      hash = "sha256-+RUoWuV9YEOsx+jOTa8No5OyoeO6iVUuSsrtHmYKpb4=";
+      rev = "f1ef89e7f2a0c24974798b1c9ad7b73222283d08";
+      hash = "sha256-ViZPylvq40WM8WibABWnDlWMY45b4BATkLFu5x4kFrA=";
     };
     meta.homepage = "https://github.com/tarides/ocaml.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14194,12 +14194,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-06-29";
+    version = "0-unstable-2026-06-19";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "b9a73e167f851a98d8f29d62658d3640bb8a7314";
-      hash = "sha256-v6vM3ajWF3yI2QA1pSqzo2zsbQohX1kmaI81b1Aqusc=";
+      rev = "66b8eeca8e18213a19742f8a031e6947c738342f";
+      hash = "sha256-dZl0/0JbrxLdQEhPI7xzg0HjD173t67fI5xG9eEJZcI=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14250,12 +14250,12 @@ final: prev: {
 
   oklch-color-picker-nvim = buildVimPlugin {
     pname = "oklch-color-picker.nvim";
-    version = "5.0.0";
+    version = "4.1.2";
     src = fetchFromGitHub {
       owner = "eero-lehtinen";
       repo = "oklch-color-picker.nvim";
-      tag = "v5.0.0";
-      hash = "sha256-KW30ECF4TT1uv6Mty2SFzg5COqy+2ocKTQ+B3EpCP10=";
+      tag = "v4.1.2";
+      hash = "sha256-KEmKDWKQC87rAghhOxbJN4umZvBSx0Um0ur3GdMZFhU=";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14404,12 +14404,12 @@ final: prev: {
 
   onenord-nvim = buildVimPlugin {
     pname = "onenord.nvim";
-    version = "0.7.0-unstable-2026-07-01";
+    version = "0.7.0-unstable-2026-05-14";
     src = fetchFromGitHub {
       owner = "rmehri01";
       repo = "onenord.nvim";
-      rev = "5240bfb79bcab7e03508626c5283cfc417b79169";
-      hash = "sha256-17HuRmDezELDyBscbFuksflCoiVXuALG+xbGKb6vCJo=";
+      rev = "8b6fe1e0f260ca0b8201ef6a8e2c97e0f38ea35d";
+      hash = "sha256-iqnWSAV16m5RTHs3YeYolF+amXvHbsnkHNtVa2mBhyY=";
     };
     meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14446,12 +14446,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.13.4";
+    version = "0.13.3";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.13.4";
-      hash = "sha256-exXm85BrPcHx8DU5vih7DNv8XPLEzxI2MrPLWoxDRnk=";
+      tag = "v0.13.3";
+      hash = "sha256-9pg1IRnDwQbPDSBZj9mLWW6jcQsIfubx+t3gb3I/JrU=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14895,12 +14895,12 @@ final: prev: {
 
   pi-nvim = buildVimPlugin {
     pname = "pi.nvim";
-    version = "0-unstable-2026-07-06";
+    version = "0-unstable-2026-06-21";
     src = fetchFromGitHub {
       owner = "pablopunk";
       repo = "pi.nvim";
-      rev = "9b619b4f9fb96fa4dc1a6a7776a651980cd819a0";
-      hash = "sha256-xtA3Ylu6kB5QF3KJ+4eDDO1PJhcTZVZyS3ei96Hs4bM=";
+      rev = "4458f7cef8923ba396728e7218d66002fa07426e";
+      hash = "sha256-uG3QFdpziSkesPdUx8rllI9hDg14NeZQtSU22CaGqhQ=";
     };
     meta.homepage = "https://github.com/pablopunk/pi.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15120,12 +15120,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "5.1.0-1";
+    version = "5.0.1-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v5.1.0-1";
-      hash = "sha256-V4GAh22phFQLEonJa/quLGP7IKxi+4Wtym1paC4yJfk=";
+      tag = "v5.0.1-1";
+      hash = "sha256-wTz4UcaB/qUzA8sWf0WLZhY7tTE+OonSfpiSu7/JN7I=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -15512,12 +15512,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "0-unstable-2026-07-04";
+    version = "0-unstable-2026-06-12";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "64e10d782ae5b9653558482910213b8946651456";
-      hash = "sha256-lclcY2rNbpc8X0whwsVFwfC+eoPvSw3IFY2SQl0TZPE=";
+      rev = "7eaa150061ea18fdbe18fbb924d236e3ddccc57d";
+      hash = "sha256-CMnRH1M4/ha+QEGGCcuVXwRFSs69O6VycJlKMFYh6CI=";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16227,12 +16227,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-07-04";
+    version = "2.1.0-unstable-2026-06-26";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "ebf4d8bbc16570817c0f5275468466b9d00b8d7d";
-      hash = "sha256-mqmD7cZ2B+VuIyW/yv+N8nJquRX31tXw1tz1qvSMmus=";
+      rev = "0e5bc00d2a32e6c782cd279cb96ab6c7ae49cd94";
+      hash = "sha256-e3gTt/d6mpTNdQcsBUNN/B4WzDFp3Qj4//vTRaTgTB0=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17982,12 +17982,12 @@ final: prev: {
 
   tiny-glimmer-nvim = buildVimPlugin {
     pname = "tiny-glimmer.nvim";
-    version = "0-unstable-2026-07-05";
+    version = "0-unstable-2026-05-18";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-glimmer.nvim";
-      rev = "9a48d8a7436231cb16d47c88f924702e5602870a";
-      hash = "sha256-ONv/NE4D5vWNV56oJc/h5/nniOWjH5eUG0Q80dMVSxg=";
+      rev = "f26728abf811324d7ed6b035a11d7b76a27c06c3";
+      hash = "sha256-CUxWZOoEj2kamwlhcpz0K1IR+7TfFC22RPIVj4x6TeI=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17996,12 +17996,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "0-unstable-2026-07-05";
+    version = "0-unstable-2026-06-09";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "6264451f14119d63a52580e5198d6baf8518b0b2";
-      hash = "sha256-dG4eCcIRaHOPj75DNOBJAqo2Vy7LAQ0QfWOVD94FloA=";
+      rev = "e930d0a46031645040d5492595b46cdf6ab3514f";
+      hash = "sha256-m4ax8+4P+fWtne7hLn3I9RXPeC8y/CZXqtqKCVa8e7c=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18349,12 +18349,12 @@ final: prev: {
 
   ts-comments-nvim = buildVimPlugin {
     pname = "ts-comments.nvim";
-    version = "1.5.0-unstable-2026-06-29";
+    version = "1.5.0-unstable-2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "ts-comments.nvim";
-      rev = "a59d6092213447450191122c9346f309161504cb";
-      hash = "sha256-uqFE+EXQt6+UqwxVRdgk7oY05DPo5sV1q9KvvE1xVGk=";
+      rev = "123a9fb12e7229342f807ec9e6de478b1102b041";
+      hash = "sha256-ORK3XpHANaqvp1bfMG2GJmAiaOsLoGW82ebL/FJtKaA=";
     };
     meta.homepage = "https://github.com/folke/ts-comments.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -20310,12 +20310,12 @@ final: prev: {
 
   vim-dirvish = buildVimPlugin {
     pname = "vim-dirvish";
-    version = "1.0-unstable-2026-07-05";
+    version = "1.0-unstable-2026-06-22";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "4cbf39ce024c57f700c4d5502cc172ea91d69360";
-      hash = "sha256-w2sdZLTh8kk0M6NuZ1a4MYpr+tNi9LQwbTiJXeoXiUs=";
+      rev = "09c60f20ddc248fa2955c58b3183d44e1885f151";
+      hash = "sha256-j/LFQjpXTuH13KbbrSGjZ8uv7FYqZpR7e9g5vgFGD7g=";
     };
     meta.homepage = "https://github.com/justinmk/vim-dirvish/";
     meta.license = unfree;
@@ -21220,12 +21220,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "0-unstable-2026-07-04";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "f6e3f8d68606e51deaeca591f2036b3e14fb120c";
-      hash = "sha256-nfo4OXAC3r99MEWO567kgQodPaqDTWEZFCVRthafNbU=";
+      rev = "cf275f3cb71afb52773cced233f5da3c8e168250";
+      hash = "sha256-oiTjsrld7jqcaBYP/q4ndQlySoY1XTxIv/Jj9zqb6fo=";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.license = unfree;
@@ -21543,12 +21543,12 @@ final: prev: {
 
   vim-illuminate = buildVimPlugin {
     pname = "vim-illuminate";
-    version = "0-unstable-2026-07-03";
+    version = "0-unstable-2025-05-24";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "8629e6b2dfa8c66677b9d489eb02480cbcfa9599";
-      hash = "sha256-lvcm3OA1jYmwhyD9yLYT829s70jGBgEPEgfenlGSJnY=";
+      rev = "0d1e93684da00ab7c057410fecfc24f434698898";
+      hash = "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -24007,12 +24007,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "0.5.2-unstable-2026-07-03";
+    version = "0.5.2-unstable-2026-06-18";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "1e684449e2056206be74714e7a9c4880e1cc97fb";
-      hash = "sha256-rYPX5p06R1HNKSJry9b2FJbmwdd+bqSDIfmrn0dFWg4=";
+      rev = "1d6c33a2879a7fdddc94659eeae09e504da13f39";
+      hash = "sha256-HDJdBW0Z7YxZtvGZAXaGcHeBsmKgyYiGARK501/WCtk=";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -24021,12 +24021,12 @@ final: prev: {
 
   vim-splunk = buildVimPlugin {
     pname = "vim-splunk";
-    version = "0-unstable-2026-05-26";
+    version = "0-unstable-2026-05-24";
     src = fetchFromGitHub {
       owner = "yorokobi";
       repo = "vim-splunk";
-      rev = "eae98aaa9232ee86e4bd3ffb4e795290891b64c5";
-      hash = "sha256-LI2vHM55sUGVsWFyiMgmIBuD49qUlsvFbER7zg7lKNg=";
+      rev = "003bc863caa442dbcbb711d8c61ad8895c0da47a";
+      hash = "sha256-KRF707b0O9FuS5R7m688+9x7RxNzRlDFI3Nz2g6nels=";
     };
     meta.homepage = "https://github.com/yorokobi/vim-splunk/";
     meta.license = getLicenseFromSpdxId "Unlicense";
@@ -25238,12 +25238,12 @@ final: prev: {
 
   vimspector = buildVimPlugin {
     pname = "vimspector";
-    version = "8968291813-unstable-2026-07-03";
+    version = "8968291813-unstable-2026-01-11";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "34099d18d8957bb3db5f396c8ca993ffb246a437";
-      hash = "sha256-ByYDS33zvVc97qD8g52+3VbPPWnaoUK7/Ou2Ai4X1M8=";
+      rev = "409005fac4f014b271ed3526f3c0d08c4d42ed19";
+      hash = "sha256-Kyx3YHOvZ7xagbU4xzumEAshU7oZOssacQBb7bIRu98=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -25253,12 +25253,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2026-07-05";
+    version = "2.17-unstable-2026-06-28";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "a5949d2800c1866c878956d49c51fc8d003c6b99";
-      hash = "sha256-P7zDZBNy2WivNbwCURpS3zTNd5nXenYu2PZEbyWnbCY=";
+      rev = "5e6a06f5cec5ede3dc6ba045ef6eda13b6dccb1f";
+      hash = "sha256-VFFsnjboIU/rvIDukClePaY2zsqgO+M1YkGTlq/Y5eU=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25898,13 +25898,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "13.9.0";
+    version = "13.1.8";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      tag = "v13.9.0";
-      hash = "sha256-Ua8FqTFlTSqnHSrz31RuS+A3SkOxjXB/L8Yb8fq+FSQ=";
-      fetchSubmodules = true;
+      tag = "v13.1.8";
+      hash = "sha256-fRKPfXAWAXlf9N5Z6DhYPCN8ygm3vRxvTp6HyYi4Uhw=";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -26067,11 +26066,11 @@ final: prev: {
 
   zig-vim = buildVimPlugin {
     pname = "zig.vim";
-    version = "0-unstable-2026-07-02";
+    version = "0-unstable-2026-05-06";
     src = fetchgit {
       url = "https://codeberg.org/ziglang/zig.vim/";
-      rev = "e3becb683d29c6b15c7ecbbaa349431a1a3bd55d";
-      hash = "sha256-DEpTzpSm9ztgCwlJ6oZ2cLdVZ4IMzNUIvbCB7uTxqUs=";
+      rev = "29f7a9b8a4e33f936b803de0b713683ad687a6c3";
+      hash = "sha256-nIek0mbJ869dWuX3LAeSHJay86zE4lupXQTeYhLzth8=";
     };
     meta.homepage = "https://codeberg.org/ziglang/zig.vim/";
     meta.license = unfree;
@@ -26108,12 +26107,12 @@ final: prev: {
 
   zotcite = buildVimPlugin {
     pname = "zotcite";
-    version = "0.7-unstable-2026-07-02";
+    version = "0.7-unstable-2026-06-27";
     src = fetchFromGitHub {
       owner = "jalvesaq";
       repo = "zotcite";
-      rev = "2f55d9a0eba87144bfb9211f17342490cd28bcd5";
-      hash = "sha256-aZUOa74Qbnr68hqRfDPsn5AoSAFUr/qPsOhMBxFhWPM=";
+      rev = "a58ac3cf19c2139b4a08d00c042746a81a884825";
+      hash = "sha256-SyPg375RBK1uKJGBe+ckMoAA0ozG/LyvkXS4vuicXQk=";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";

pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix

@@ -29,7 +29,6 @@ let
     "neorg"
     "neorg-interim-ls"
     "neotest"
-    "neotest-nix"
     "nui-nvim"
     "nvim-cmp"
     "nvim-nio"

pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix

@@ -12,12 +12,12 @@
   perl,
 }:
 let
-  version = "0.1.2";
+  version = "release-v0.1";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    tag = "v${version}";
-    hash = "sha256-x7OhVz4rWj2x1UsUm8iqkB5PQVAELvAYJ0yo2beU9TY=";
+    rev = "2033b42ab72fb9f27b35769f9cb7a9f4f1993db4";
+    hash = "sha256-Ql/17DSHpBVbihUHssyZe3MGC5fgasbjgxdABp8xk24=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
@@ -76,6 +76,7 @@ vimUtils.buildVimPlugin {
 
   passthru = {
     updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
       attrPath = "vimPlugins.avante-nvim.avante-nvim-lib";
     };
 

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -935,7 +935,6 @@ assertNoAdditions {
     nvimSkipModules = [
       "repro_blink"
       "repro_cmp"
-      "repro_native_completion"
     ];
   };
 

pkgs/applications/editors/vscode/extensions/default.nix

@@ -396,8 +396,8 @@ let
         mktplcRef = {
           name = "astro-vscode";
           publisher = "astro-build";
-          version = "2.16.17";
-          hash = "sha256-k54hpRlzjtNWv0mIUBKFxJYc5T2jpWxB9U8nuXXmjJ0=";
+          version = "2.16.14";
+          hash = "sha256-WuDsYSQ5B2xA3LnU1fiXBx8yqOplGstZO0qYaLtPF0A=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";
@@ -1145,8 +1145,8 @@ let
         mktplcRef = {
           name = "vscode-database-client2";
           publisher = "cweijan";
-          version = "9.0.2";
-          hash = "sha256-RCjtYpGDEjFkKvTspvgopccNVvMt1imeAGHZYRsle/Q=";
+          version = "9.0.1";
+          hash = "sha256-P2GoE92SwGMb45On5ziTZ9dBjPb0VnFSo+4TEwrcWuM=";
         };
         meta = {
           description = "Database Client For Visual Studio Code";
@@ -1215,8 +1215,8 @@ let
         mktplcRef = {
           name = "flutter";
           publisher = "dart-code";
-          version = "3.138.0";
-          hash = "sha256-FkaUKApoN6e8ET2o/71GVhyNWdZ34t6fqEzlraH7QBc=";
+          version = "3.136.0";
+          hash = "sha256-RK493qHjEK/k8oy/OIzO3bvNnFo+ZftQhZMIAmBCaJk=";
         };
 
         meta.license = lib.licenses.mit;
@@ -1346,8 +1346,8 @@ let
         mktplcRef = {
           publisher = "discloud";
           name = "discloud";
-          version = "2.29.7";
-          hash = "sha256-l0CTWC16Aw2u8uob5tKauYIT3KaDsptV/L8WR54eN64=";
+          version = "2.29.6";
+          hash = "sha256-CHpRetKZnGzShIePnbVUdR06/1AAO2I1RX7NiZ7GBNs=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -4135,8 +4135,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.20.0";
-          hash = "sha256-s2CAzAXMXdmCyOoMmyHjz5GRPHi5riDf/Og3SVrW7QI=";
+          version = "1.19.1";
+          hash = "sha256-aVtMiSbPLs6zIdcD0TopIAVKvJksSdTy9ND+jGw/G0A=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "sysdig-vscode-ext";
     publisher = "sysdig";
-    version = "0.2.17";
-    hash = "sha256-8qYDp6IcUvlFdCPmMozHVocsgGqK8b2+tve1wBO3bhU=";
+    version = "0.2.14";
+    hash = "sha256-b4e5Qgk8YfI1nAB8yrM5k0svgebgZSucXRktkK0EItk=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/dolphin.nix

@@ -20,13 +20,13 @@
 }:
 mkLibretroCore {
   core = "dolphin";
-  version = "0-unstable-2026-06-28";
+  version = "0-unstable-2026-06-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "dolphin";
-    rev = "894fdda35688f3ac33c680ef6fe17ce965a16bf1";
-    hash = "sha256-Dkvv8EgQjLjyt0muSVF0Cnex/3xUcZXvWTzgUw61Sv0=";
+    rev = "fec5e8e106489e0d00e69dd4afaabc3d95688047";
+    hash = "sha256-GNAZgFHZCnokL3HYU+xsFtghpN09QbsZpwMW1eMtSvU=";
     fetchSubmodules = true;
   };
 

pkgs/applications/emulators/libretro/cores/mame2015.nix

@@ -22,8 +22,7 @@ mkLibretroCore {
   extraBuildInputs = [ alsa-lib ];
   makefile = "Makefile";
   # Build failures when this is set to a bigger number
-  env.NIX_BUILD_CORES = 8;
-
+  NIX_BUILD_CORES = 8;
   meta = {
     description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets";
     homepage = "https://github.com/libretro/mame2015-libretro";

pkgs/applications/emulators/libretro/cores/melondsds.nix

@@ -1,27 +1,17 @@
 {
   lib,
-  applyPatches,
-  coreutils,
   fetchFromGitHub,
-  fmt_11,
   glm,
-  gnugrep,
-  gnused,
+  libslirp,
+  fmt_11,
+  span-lite,
   howard-hinnant-date,
-  jq,
   libGL,
   libGLU,
-  libslirp,
-  mkLibretroCore,
-  nix,
-  nix-prefetch-git,
   cmake,
-  span-lite,
-  unstableGitUpdater,
-  writeShellApplication,
+  mkLibretroCore,
 }:
 let
-  # NOTE: before changing the following fetches, see the updateScript below
   # https://github.com/JesseTG/melonds-ds/blob/33c48260402865ef77667487528efd5ca7ce1233/cmake/FetchDependencies.cmake#L44
   melonDS-src = fetchFromGitHub {
     owner = "JesseTG";
@@ -38,8 +28,8 @@ let
   embed-binaries-src = fetchFromGitHub {
     owner = "andoalon";
     repo = "embed-binaries";
-    rev = "078b62beba97e8192c99bfb16d5e17220cfc7598";
-    hash = "sha256-EkK+ZCbrZ2Y9wJ864OIwRWDfHcmxzKMco0QAkLOQOwY=";
+    rev = "21f28cabbba02cd657578c70b7aedd0f141467ff";
+    hash = "sha256-iW3DBGdp/ykE3EoGcuirq5V5lKV0vemzIjDFrINzQPM=";
   };
   pntr-src = fetchFromGitHub {
     owner = "robloach";
@@ -54,33 +44,35 @@ let
     hash = "sha256-J5wAqF5yQ5KYArJJyKzaqscWsXq+KAPKXybYfVgasXs=";
   };
   # using nixpkgs zlib gives a linking error
-  zlib-src = applyPatches {
-    src = fetchFromGitHub {
-      owner = "madler";
-      repo = "zlib";
-      rev = "925af44f3cde53c6b076611c297850091b5dc7bb";
-      hash = "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=";
-    };
-    patches = [ ./patches/melondsds-zlib-no-zconf-rename.patch ];
+  zlib-src = fetchFromGitHub {
+    owner = "madler";
+    repo = "zlib";
+    rev = "570720b0c24f9686c33f35a1b3165c1f568b96be";
+    hash = "sha256-5g/Jo8M/jvkgV0NofSAV4JdwJSk5Lyv9iGRb2Kz/CC0=";
   };
 in
 mkLibretroCore rec {
   core = "melondsds";
-  version = "0-unstable-2026-03-03";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "JesseTG";
     repo = "melonds-ds";
-    rev = "bac0256dc6a8736c5a228f57c562257e45fd49f3";
-    hash = "sha256-EeXYibPV9BPazC/i5UqXEd4BKlIZbNbPNgpsoo4ws7k=";
+    rev = "33c48260402865ef77667487528efd5ca7ce1233";
+    hash = "sha256-n5MZ6BWUWRi+jz34EbL+SeSkjFZeqQNXE3hS6JzS424=";
   };
 
+  patches = [ ./patches/melondsds-noslirpcopy.patch ];
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "find_package(Git REQUIRED)" ""
 
     substituteInPlace src/libretro/CMakeLists.txt \
       --replace-fail "include(embed-binaries)" "include(${embed-binaries-src}/cmake/embed-binaries.cmake)"
+
+    substituteInPlace cmake/FetchDependencies.cmake \
+      --replace-fail "set_target_properties(example" "set_target_properties(zlib_example" \
+      --replace-fail "set_target_properties(zlib_example64 minigzip64" "set_target_properties(zlib_example64"
   '';
 
   makefile = "";
@@ -108,79 +100,6 @@ mkLibretroCore rec {
 
   postBuild = "cd src/libretro";
 
-  passthru.updateScript = [
-    (lib.getExe (writeShellApplication {
-      name = "update-libretro-melondsds";
-      runtimeInputs = [
-        coreutils
-        gnugrep
-        gnused
-        jq
-        nix
-        nix-prefetch-git
-      ];
-      text = ''
-        ${lib.escapeShellArgs (unstableGitUpdater {
-          hardcodeZeroVersion = true;
-        })}
-
-        src=$(nix-build --no-out-link -A "$UPDATE_NIX_ATTR_PATH.src")
-        core_file="pkgs/applications/emulators/libretro/cores/melondsds.nix"
-
-        # find lines in the format:
-        #   fetch_dependency(name url rev)
-        # and extracts name, url and rev
-        grep "^fetch_dependency" "''${src}/cmake/FetchDependencies.cmake" |
-          sed 's/"//g' |
-          sed 's/fetch_dependency(\(.*\))/\1/' |
-          while read -r name url rev
-          do
-            echo >&2
-
-            # example: if there is fetch_dependency(melonDS ...) and no melonDS-src
-            if ! fetch_block=$(grep -A10 "''${name}-src =" "$core_file")
-            then
-
-              # if the dependency comes from nix, we just skip it
-              if grep -q "FETCHCONTENT_SOURCE_DIR_''${name^^}" "$core_file"
-              then
-                echo "> skipped: ''${name} is provided by nixpkgs" >&2
-                continue
-              fi
-
-              # otherwise, its a new dependency not specified on the config, and the updater can't continue
-              echo "> ERROR: dependency missing: ''${name}" >&2
-              exit 1
-            fi
-
-            echo "> ''${name}: ''${url} (''${rev})" >&2
-
-            prefetch=$(nix-prefetch-git --url "''${url}" --rev "''${rev}" --quiet)
-            rev=$(echo "$prefetch" | jq -r ".rev")
-            hash=$(echo "$prefetch" | jq -r ".hash")
-
-            old_rev=$(echo "$fetch_block" | grep -m1 "rev =" | sed 's/\s*rev = "\(.*\)".*/\1/')
-            old_hash=$(echo "$fetch_block" | grep -m1 "hash =" | sed 's/\s*hash = "\(.*\)".*/\1/')
-
-            if [[ "$old_hash" == "$hash" ]]
-            then
-              echo "> skipped: same hash" >&2
-              continue
-            fi
-
-            echo "rev - old: $old_rev" >&2
-            echo "rev - new: $rev" >&2
-            echo "hash - old: $old_hash" >&2
-            echo "hash - new: $hash" >&2
-
-            # finally replace old revision and old hash by the new one
-            sed -i "s|$old_hash|$hash|" "$core_file"
-            sed -i "s/$old_rev/$rev/" "$core_file"
-          done
-      '';
-    }))
-  ];
-
   meta = {
     description = "A remake of the libretro MelonDS core";
     homepage = "https://github.com/JesseTG/melonds-ds";

pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch

@@ -0,0 +1,17 @@
+diff --git a/cmake/libslirp.cmake b/cmake/libslirp.cmake
+index 1cb6758..bef1793 100644
+--- a/cmake/libslirp.cmake
++++ b/cmake/libslirp.cmake
+@@ -2,12 +2,6 @@ add_library(slirp STATIC
+         src/glib-stub/glib.c
+ )
+ 
+-# Copy libslirp's files to another directory so that we can include it as <slirp/libslirp.h>
+-file(MAKE_DIRECTORY "${libslirp_BINARY_DIR}/include")
+-file(REMOVE_RECURSE "${libslirp_BINARY_DIR}/include/slirp")
+-file(COPY "${libslirp_SOURCE_DIR}/src" DESTINATION "${libslirp_BINARY_DIR}/include")
+-file(RENAME "${libslirp_BINARY_DIR}/include/src" "${libslirp_BINARY_DIR}/include/slirp")
+-
+ target_include_directories(slirp PUBLIC
+     "${libslirp_BINARY_DIR}/include"
+     "${libslirp_SOURCE_DIR}/src"

pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch

@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13dd268..69779cf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,18 +62,6 @@ if(MSVC)
-     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- endif()
- 
--if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
--    # If we're doing an out of source build and the user has a zconf.h
--    # in their source tree...
--    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
--        message(STATUS "Renaming")
--        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
--        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
--        message(STATUS "but CMake generates it automatically in the build directory.")
--        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
--  endif()
--endif()
--
- set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
- 		${ZLIB_PC} @ONLY)

pkgs/applications/emulators/wine/base.nix

@@ -64,7 +64,6 @@
   x11Support ? false,
   ffmpegSupport ? false,
   embedInstallers ? false,
-  smartcardSupport ? false,
 }:
 
 let
@@ -252,9 +251,6 @@ stdenv.mkDerivation (
         ++ lib.optionals ffmpegSupport [
           pkgs.ffmpeg-headless
         ]
-        ++ lib.optionals smartcardSupport [
-          pkgs.pcsclite
-        ]
       );
 
     inherit patches;
@@ -279,8 +275,7 @@ stdenv.mkDerivation (
       ++ lib.optionals vulkanSupport [ "--with-vulkan" ]
       ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [
         "--without-x"
-      ]
-      ++ lib.optionals smartcardSupport [ "--with-pcsclite" ];
+      ];
 
     # Wine locates a lot of libraries dynamically through dlopen().  Add
     # them to the RPATH so that the user doesn't have to set them in

pkgs/applications/emulators/wine/default.nix

@@ -51,7 +51,6 @@ args@{
   ffmpegSupport ? false,
   embedInstallers ? false, # The Mono and Gecko MSI installers
   moltenvk, # Allow users to override MoltenVK easily
-  smartcardSupport ? false,
 }:
 
 let

pkgs/applications/misc/electrum/default.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  protobuf,
   wrapQtAppsHook,
   python3,
   zbar,
@@ -20,14 +21,14 @@ let
     else
       "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
 in
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3.pkgs.buildPythonApplication rec {
   pname = "electrum";
-  version = "4.8.0";
+  version = "4.7.2";
   pyproject = true;
 
   src = fetchurl {
-    url = "https://download.electrum.org/${finalAttrs.version}/Electrum-${finalAttrs.version}.tar.gz";
-    hash = "sha256-z14bzs81eJNTMSWSBLTyCmsljDNztG54SVkoTcSqvsM=";
+    url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
+    hash = "sha256-qzA/HLw+QPTdE6qsg8TNqr0DuOgfMrs8UcEnfp1uBpc=";
   };
 
   build-system = with python3.pkgs; [
@@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    protobuf
     python3.pkgs.pythonRelaxDepsHook
   ]
   ++ lib.optionals enableQt [
@@ -99,7 +101,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     "tests/test_qml_types.py"
   ];
 
-  postPatch =
+  postPatch = ''
+    # Upstream tarball omits regenerated protobuf bindings in some releases.
+    protoc --python_out=. electrum/paymentrequest.proto
+  ''
+  + (
     if enableQt then
       ''
         substituteInPlace ./electrum/qrscanner.py \
@@ -108,7 +114,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     else
       ''
         sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
-      '';
+      ''
+  );
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/share/applications/electrum.desktop \
@@ -168,4 +175,4 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     ];
     mainProgram = "electrum";
   };
-})
+}

pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.15.10";
+  version = "3.15.9";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = "helm-diff";
     rev = "v${version}";
-    hash = "sha256-c0sbFd19cDGm7VJbbfT+FKzUbeyAO1kCgh1eYV11C3I=";
+    hash = "sha256-dZ2bXouzjX0rw9NoUJjtF4KzTuZVdHm2ik6puiOg2Tc=";
   };
 
   vendorHash = "sha256-GanQBm/g+PcMHaXA5gAaqacpOuv6kES6ng/CmH8/0j4=";

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -36,20 +36,20 @@
     "vendorHash": "sha256-4S5uyvSjtEOO1hK5MhuAmjsPBJ6qC1KN3/mrtRHU+P4="
   },
   "akamai_akamai": {
-    "hash": "sha256-AYvC8s8OKwlwF8eDoCsuOhOanCwbn/5u/vGumee6FNg=",
+    "hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=",
     "homepage": "https://registry.terraform.io/providers/akamai/akamai",
     "owner": "akamai",
     "repo": "terraform-provider-akamai",
-    "rev": "v10.3.0",
+    "rev": "v10.2.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg="
+    "vendorHash": "sha256-5IfYhOEhXRpdL7G3Op9a0Ep14el2gwcVmRMkGB7oWH4="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=",
+    "hash": "sha256-wBwFtW2hbBL7YkL8o7bkd3eMCmdjObIbBiuLPsmZqQo=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.284.0",
+    "rev": "v1.282.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4="
   },
@@ -787,13 +787,13 @@
     "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
   },
   "jianyuan_sentry": {
-    "hash": "sha256-V0+vbeECEaeOwr8a1HohdClZKwVkjHSxbhu86Bl9ZKE=",
+    "hash": "sha256-mJVuJJzNw/nkg1OoPG2iIE30RVsnj3YTQ3VAYITB6tE=",
     "homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
     "owner": "jianyuan",
     "repo": "terraform-provider-sentry",
-    "rev": "v0.15.4",
+    "rev": "v0.15.3",
     "spdx": "MIT",
-    "vendorHash": "sha256-qSLy0iPPiJ9EdpU1D879bICDKwJfDA+JnxCepsvGVbA="
+    "vendorHash": "sha256-+LDSNV2Y5jDFyOu/PFtJhP7VgWAVvozC/yBXzTU7YXQ="
   },
   "joneshf_openwrt": {
     "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
@@ -905,13 +905,13 @@
     "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58="
   },
   "metio_migadu": {
-    "hash": "sha256-Aef1H/L2EFeU9mhecOnlPAbJbt3XfBL0Wz67IqxCI10=",
+    "hash": "sha256-KDk/uSxycO9hiaiEKHq58ktwum88J9StpB52mNQYer4=",
     "homepage": "https://registry.terraform.io/providers/metio/migadu",
     "owner": "metio",
     "repo": "terraform-provider-migadu",
-    "rev": "2026.7.2",
+    "rev": "2026.6.25",
     "spdx": "0BSD",
-    "vendorHash": "sha256-wUX2smEhKUftBCRi7ANq8NpHXpB+EmlVshrhI2ltY2I="
+    "vendorHash": "sha256-7/2iHstATnmeuvoIFIQw2Gi3QSIoXp5W69fnUYHipxc="
   },
   "mongey_kafka": {
     "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -1013,13 +1013,13 @@
     "vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ="
   },
   "okta_okta": {
-    "hash": "sha256-Qpdinb4ZJRjZG4lMv5EFkicBcYU+OiLz9on3ZaQQu8s=",
+    "hash": "sha256-EuGhOCJKjhttlWVfrpBjBAVOtbFfRHl2gk7zev2w9TY=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.13.0",
+    "rev": "v6.12.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-z13CKv4d+C2VsdUfiArzLLaXExq8k4Y5Y9GEidqqGb0="
+    "vendorHash": "sha256-/IbzilmyVTZh7qWogtXd+/Y7UJdjsQaf7Yjhi1fU1Vc="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@@ -1085,11 +1085,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-SBPy6elle5eSGY67JZEkfaov1jkfaqmvDGPEO9Zd8AY=",
+    "hash": "sha256-b2BPsCJe8q1oODTi9TaD4kac/wecardNv4/gEQBWK60=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.33.1",
+    "rev": "v3.33.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1238,11 +1238,11 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-1f066NavFneIeH8X5CYGd0GmssPfzJACXt6GHvR/FLU=",
+    "hash": "sha256-2EGyYs8fy1y9g241spfKFwpv7ZTRJePvf06OS7EFDaU=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.52.3",
+    "rev": "v1.52.2",
     "spdx": "MIT",
     "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
   },
@@ -1346,11 +1346,11 @@
     "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE="
   },
   "terraform-lxd_lxd": {
-    "hash": "sha256-fGiXnP8neze47FQXVCFlScya9ih67/5TQW5xKEBnI+Y=",
+    "hash": "sha256-vrrQxld9Ymu2RcSRlkUzknTIBJteVeb9Jqr19CV3XzM=",
     "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
     "owner": "terraform-lxd",
     "repo": "terraform-provider-lxd",
-    "rev": "v3.0.2",
+    "rev": "v3.0.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-jOZw/va3dA0DYmnYSKbASHvyL7levjf1Bk6WelLga+Q="
   },

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -74,7 +74,7 @@ let
     mainProgram = "discord";
     maintainers = with lib.maintainers; [
       artturin
-      _4evy
+      FlameFlag
       infinidoge
       jopejoe1
       Scrumplex

pkgs/applications/networking/ostinato/default.nix

@@ -3,10 +3,13 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  qt5,
+  qmake,
   copyDesktopItems,
+  wrapQtAppsHook,
   makeDesktopItem,
-  protobuf_21,
+  qtbase,
+  qtscript,
+  protobuf,
   libpcap,
   wireshark,
   gzip,
@@ -14,42 +17,35 @@
   gawk,
   libnl,
 }:
-let
-  protobuf = protobuf_21;
 
-  ostinatoIcon = fetchurl {
-    url = "https://ostinato.org/images/site-logo.png";
-    hash = "sha256-9cBngj8pNOTTWNdvZaND79aa14OnrqvXq0zjzQNJDXA=";
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "ostinato";
   version = "1.3.0";
 
-  strictDeps = true;
-  __structuredAttrs = true;
-
   src = fetchFromGitHub {
     owner = "pstavirs";
     repo = "ostinato";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
+    rev = "v${version}";
+    sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
+  };
+
+  ostinatoIcon = fetchurl {
+    url = "https://ostinato.org/images/site-logo.png";
+    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
   };
 
   buildInputs = [
-    qt5.qtbase
+    qtbase
     protobuf
     libpcap
-    qt5.qtscript
+    qtscript
     libnl
   ];
 
   nativeBuildInputs = [
     copyDesktopItems
-    qt5.qmake
-    qt5.wrapQtAppsHook
-    qt5.qtscript
-    protobuf
+    qmake
+    wrapQtAppsHook
   ];
 
   patches = [ ./drone_ini.patch ];
@@ -96,4 +92,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ rick68 ];
     platforms = with lib.platforms; linux ++ darwin ++ cygwin;
   };
-})
+}

pkgs/applications/video/kodi/addons/jellycon/default.nix

@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellycon";
   namespace = "plugin.video.jellycon";
-  version = "1.0.2";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellycon";
     rev = "v${version}";
-    sha256 = "sha256-dpH611GZ+BG63bSFypcZ9VUtNCA/tL8zgKuaU7cCRII=";
+    sha256 = "sha256-TLJalH3b1EYoIbnUhnHl8A9EF2Q6dDy0M2hl9je0K54=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/kodi/addons/jellyfin/default.nix

@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "2.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "sha256-S5LAIeYwApyGPsj999rotFgfAZmLxnJjuJD8CE4QDro=";
+    sha256 = "sha256-xWLwtGeKu2W9u96jvLRRluSsnFjfad1/XSIcad00c3Y=";
   };
 
   nativeBuildInputs = [ python ];

pkgs/applications/virtualization/krunvm/default.nix

@@ -7,32 +7,29 @@
   buildah,
   buildah-unwrapped,
   cargo,
-  darwin,
   libiconv,
   libkrun,
   makeWrapper,
   rustc,
+  sigtool,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "krunvm";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "libkrun";
     repo = "krunvm";
-    tag = "v${finalAttrs.version}";
+    rev = "v${version}";
     hash = "sha256-peOaPivQKOwioh5skPNFiA3ptHv9pSsnjpy43cms8O8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
+    inherit src;
     hash = "sha256-MRcQ0Vnd3PJqE2q981JpXPjwMUKT4t+RcOvzWptK7PQ=";
   };
 
-  strictDeps = true;
-  __structuredAttrs = true;
-
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     cargo
@@ -40,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     asciidoctor
     makeWrapper
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
   buildInputs = [
     libkrun
@@ -80,4 +77,4 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = libkrun.meta.platforms;
     mainProgram = "krunvm";
   };
-})
+}

pkgs/build-support/coq/default.nix

@@ -41,7 +41,7 @@ in
   pname,
   version ? null,
   fetcher ? null,
-  owner ? "rocq-community",
+  owner ? "coq-community",
   domain ? "github.com",
   repo ? pname,
   defaultVersion ? null,
@@ -98,7 +98,7 @@ let
       "dropAttrs"
       "dropDerivationAttrs"
       "keepAttrs"
-      "env"
+      "enableParallelBuilding"
     ]
     ++ dropAttrs
   ) keepAttrs;
@@ -158,13 +158,29 @@ let
   append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
   prefix-name = foldl append-version "" namePrefix;
   useDune = args.useDune or (useDuneifVersion fetched.version);
-  coqlib-flags = [
-    "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
-    "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
-  ];
-  docdir-flags = [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
-  COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib";
+  coqlib-flags =
+    switch coq.coq-version
+      [
+        {
+          case = v: versions.isLe "8.6" v && v != "dev";
+          out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+        }
+      ]
+      [
+        "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
+        "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
+      ];
+  docdir-flags =
+    switch coq.coq-version
+      [
+        {
+          case = v: versions.isLe "8.6" v && v != "dev";
+          out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ];
+        }
+      ]
+      [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
 in
+
 stdenv.mkDerivation (
   removeAttrs (
     {
@@ -186,16 +202,10 @@ stdenv.mkDerivation (
         );
       buildInputs =
         args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs);
-      inherit enableParallelBuilding;
-
-      env =
-        optionalAttrs setCOQBIN {
-          COQBIN = "${coq}/bin/";
-        }
-        // optionalAttrs (args ? useMelquiondRemake) {
-          inherit COQUSERCONTRIB;
-        }
-        // (args.env or { });
+      enableParallelBuilding =
+        lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true)
+          "mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting"
+          enableParallelBuilding;
 
       meta =
         (
@@ -218,6 +228,7 @@ stdenv.mkDerivation (
         // (args.meta or { });
 
     }
+    // (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; })
     // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) {
       installFlags = coqlib-flags ++ docdir-flags ++ extraInstallFlags;
     })
@@ -235,7 +246,8 @@ stdenv.mkDerivation (
         runHook postInstall
       '';
     })
-    // (optionalAttrs (args ? useMelquiondRemake) {
+    // (optionalAttrs (args ? useMelquiondRemake) rec {
+      COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib";
       preConfigurePhases = [ "autoconf" ];
       configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ];
       buildPhase = "./remake -j$NIX_BUILD_CORES";

pkgs/build-support/rocq/default.nix

@@ -41,7 +41,7 @@ in
   pname,
   version ? null,
   fetcher ? null,
-  owner ? "rocq-community",
+  owner ? "coq-community",
   domain ? "github.com",
   repo ? pname,
   defaultVersion ? null,
@@ -98,7 +98,6 @@ let
       "dropAttrs"
       "dropDerivationAttrs"
       "keepAttrs"
-      "env"
     ]
     ++ dropAttrs
   ) keepAttrs;
@@ -163,7 +162,6 @@ let
     "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
   ];
   docdir-flags = [ "COQDOCINSTALL=$(out)/share/coq/${rocq-core.rocq-version}/user-contrib" ];
-  COQUSERCONTRIB = "$out/lib/coq/${rocq-core.rocq-version}/user-contrib";
 in
 
 stdenv.mkDerivation (
@@ -189,15 +187,6 @@ stdenv.mkDerivation (
         args.overrideBuildInputs or ([ rocq-core ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs);
       inherit enableParallelBuilding;
 
-      env =
-        optionalAttrs setROCQBIN {
-          ROCQBIN = "${rocq-core}/bin/";
-        }
-        // optionalAttrs (args ? useMelquiondRemake) {
-          inherit COQUSERCONTRIB;
-        }
-        // (args.env or { });
-
       meta =
         (
           {
@@ -219,6 +208,7 @@ stdenv.mkDerivation (
         // (args.meta or { });
 
     }
+    // (optionalAttrs setROCQBIN { ROCQBIN = "${rocq-core}/bin/"; })
     // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) {
       installFlags = rocqlib-flags ++ docdir-flags ++ extraInstallFlags;
     })
@@ -236,7 +226,8 @@ stdenv.mkDerivation (
         runHook postInstall
       '';
     })
-    // (optionalAttrs (args ? useMelquiondRemake) {
+    // (optionalAttrs (args ? useMelquiondRemake) rec {
+      COQUSERCONTRIB = "$out/lib/coq/${rocq-core.rocq-version}/user-contrib";
       preConfigurePhases = [ "autoconf" ];
       configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ];
       buildPhase = "./remake -j$NIX_BUILD_CORES";

pkgs/by-name/ad/adscan/package.nix

@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "adscan";
-  version = "9.2.1";
+  version = "9.2.0";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "ADScanPro";
     repo = "adscan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gBlS5co1LUu07Xz+JZWi4zNOPtPHGfl+StpFPauOFG4=";
+    hash = "sha256-28v36+sbgt/xaE8N7w4o0WTMYd95QsW190VPhOgL3+8=";
   };
 
   pythonRelaxDeps = [ "credsweeper" ];

pkgs/by-name/al/all-the-package-names/package.nix

@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2495";
+  version = "2.0.2487";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-65UbcJXOUZVDEtjDy0PkRLPIlhk8/WxItDeyiULLpNY=";
+    hash = "sha256-PFD7xUMkKqR18VHqeAczX/05T4sgsbMleo66gRpww3w=";
   };
 
-  npmDepsHash = "sha256-Vv3rJBDRSwWnbYFO01M0rLJM3b2gP0z8wAi9T2nRwxQ=";
+  npmDepsHash = "sha256-PmcM88pOewKiRc4LBYitB17lltyY+PmAcT0vSt7xCbw=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/al/alt-tab-macos/package.nix

@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://alt-tab.app";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      _4evy
+      FlameFlag
       emilytrau
       Br1ght0ne
     ];

pkgs/by-name/an/anydesk/pin.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.0.4",
-  "x86_64-linux": "sha256-fg3sLcushu5zDvsBakHLP/FRqhvauICx86rlpK4YkW8=",
-  "aarch64-linux": "sha256-TFV1VQdFIlGYIf4iYtAw42cVkaiWvsdCcSjdS/qugX0="
+  "version": "8.0.3",
+  "x86_64-linux": "sha256-Mjl17hh5A/pwRAi7giL1SJYlQ61O0SXX+KeH8STZ4bs=",
+  "aarch64-linux": "sha256-MhAj5cy81uBMoNeFPvOyhBOlJzBgNRHXyCXrpdvF8nE="
 }

pkgs/by-name/ao/ao3downloader/package.nix

@@ -8,14 +8,14 @@
 # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
 python312Packages.buildPythonApplication (finalAttrs: {
   pname = "ao3downloader";
-  version = "2026.7.0";
+  version = "2026.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nianeyna";
     repo = "ao3downloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cyn4bWHKKfRGade8A1kAJRJzdcXCY46nGgVw5i0OUyQ=";
+    hash = "sha256-3SiJH594vjVahlW+wAzD+akRU7WLoQo+EIN9cxgAtks=";
   };
 
   build-system = with python312Packages; [

pkgs/by-name/ap/apko/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.2.21";
+  version = "1.2.19";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I5t+xML6M88vfshqMwl/wdBWo0F3l7xOa0DSbyqyB1o=";
+    hash = "sha256-Iia0U/oibPuUYC3adeXvL5m4nhEPHqBvHw7J7Uxn88s=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-Oj1BbZA84GO+EkYyjjFf9gaMxMpMnEeU0H3OuqSLQ88=";
+  vendorHash = "sha256-vYUxwtqGUDbJhbhlajPtlUZKD4TKreHEGR1dCSuSiA4=";
 
   excludedPackages = [
     "internal/gen-jsonschema"

pkgs/by-name/as/ascii-image-converter/package.nix

@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "Convert images into ASCII art on the console";
     homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ danth ];
     mainProgram = "ascii-image-converter";
   };
 })

pkgs/by-name/as/asdf-vm/package.nix

@@ -8,18 +8,18 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "asdf-vm";
-  version = "0.19.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
 
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WUHNr9AaCOYh0mZS5zZqWwuq8uw6bgGtj5mPgIvNGUE=";
+    hash = "sha256-nc9fsahzOKlGtg1oA/0hnBUEkQ0BPeDWyPpl3KoDjqA=";
 
   };
 
-  vendorHash = "sha256-RSKenTwSgseEpvT6K36kWRfmIMPymYEGOTPcEHU7o2E=";
+  vendorHash = "sha256-ru0/VvtoUMw9beycgh+TOO/FN2kqszynT4I4iDuS1Lo=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/az/azure-cli/extensions-manual.nix

@@ -247,11 +247,6 @@
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/interactive-1.0.0b1-py2.py3-none-any.whl";
     hash = "sha256-COvHDhvsigEEMYlMQ2hHFKzjX7WwdkwfT9id6z+Sj7w=";
     description = "Microsoft Azure Command-Line Interactive Shell";
-    # The wheel contains Requires-Dist entries for both spellings.
-    pythonRelaxDeps = [
-      "prompt_toolkit"
-      "prompt-toolkit"
-    ];
     propagatedBuildInputs = with python3Packages; [
       prompt-toolkit
     ];

pkgs/by-name/bo/bomly/package.nix

@@ -1,66 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  grype,
-  makeBinaryWrapper,
-  nix-update-script,
-  syft,
-  versionCheckHook,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "bomly";
-  version = "0.16.0";
-
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "bomly-dev";
-    repo = "bomly-cli";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-y4FJCOzgEUprIBy/RuWVIlco4bI0XNUNabRr+2VebgM=";
-  };
-
-  vendorHash = "sha256-qptl09fBZigImxr0ReWIqdmvyeHqr372pZqDnyMHe5A=";
-
-  # .gitattributes excludes all testdata from the GitHub tarball
-  postPatch = ''
-    mkdir -p internal/benchmark/testdata
-    cp ${./scan_targets.json} internal/benchmark/testdata/scan_targets.json
-  '';
-
-  buildInputs = [ makeBinaryWrapper ];
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  # testdata directories are excluded from the GitHub tarball via .gitattributes
-  doCheck = false;
-
-  ldflags = [
-    "-s"
-    "-X=main.version=${finalAttrs.version}"
-  ];
-
-  postFixup = ''
-    wrapProgram $out/bin/bomly --prefix PATH : "${
-      lib.makeBinPath [
-        grype
-        syft
-      ]
-    }"
-  '';
-
-  doInstallCheck = true;
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "CLI for dependency intelligence, SBOMs, vulnerability auditing, and CI policy gates";
-    homepage = "https://github.com/bomly-dev/bomly-cli";
-    changelog = "https://github.com/bomly-dev/bomly-cli/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-    mainProgram = "bomly";
-  };
-})

pkgs/by-name/bo/bomly/scan_targets.json

@@ -1,160 +0,0 @@
-[
-  {
-    "name": "scan-go",
-    "url": "https://github.com/bomly-dev/example-go-gomod",
-    "ref": "v1.0.0",
-    "ecosystem": "go",
-    "tools": ["go"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-npm",
-    "url": "https://github.com/bomly-dev/example-javascript-npm",
-    "ref": "v1.0.0",
-    "ecosystem": "npm",
-    "tools": ["npm"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-maven",
-    "url": "https://github.com/bomly-dev/example-java-maven",
-    "ref": "v1.0.0",
-    "ecosystem": "maven",
-    "tools": ["mvn"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-python-pip",
-    "url": "https://github.com/bomly-dev/example-python-pip",
-    "ref": "fe04c758134b95dab102e1fce10275f7d18c0cf2",
-    "ecosystem": "python",
-    "tools": ["pip"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-composer",
-    "url": "https://github.com/bomly-dev/example-php-composer",
-    "ref": "v1.0.0",
-    "ecosystem": "php",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-bundler",
-    "url": "https://github.com/bomly-dev/example-ruby-bundler",
-    "ref": "v1.0.0",
-    "ecosystem": "ruby",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-github-actions",
-    "url": "https://github.com/bomly-dev/example-github-actions",
-    "ref": "v1.0.0",
-    "ecosystem": "github-actions",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-nuget",
-    "url": "https://github.com/bomly-dev/example-dotnet-nuget",
-    "ref": "v1.0.0",
-    "ecosystem": "dotnet",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-cargo",
-    "url": "https://github.com/bomly-dev/example-rust-cargo",
-    "ref": "v1.0.0",
-    "ecosystem": "rust",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-pub",
-    "url": "https://github.com/bomly-dev/example-dart-pub",
-    "ref": "v1.0.0",
-    "ecosystem": "dart",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-cocoapods",
-    "url": "https://github.com/bomly-dev/example-swift-cocoapods",
-    "ref": "v1.0.0",
-    "ecosystem": "swift",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-mix",
-    "url": "https://github.com/bomly-dev/example-elixir-mix",
-    "ref": "v1.0.0",
-    "ecosystem": "elixir",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-swiftpm",
-    "url": "https://github.com/bomly-dev/example-swift-swiftpm",
-    "ref": "v1.0.0",
-    "ecosystem": "swift",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-sbt",
-    "url": "https://github.com/bomly-dev/example-scala-sbt",
-    "ref": "v1.0.0",
-    "ecosystem": "scala",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-yarn",
-    "url": "https://github.com/bomly-dev/example-javascript-yarn",
-    "ref": "v1.0.0",
-    "ecosystem": "npm",
-    "tools": ["npm"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-pnpm",
-    "url": "https://github.com/bomly-dev/example-javascript-pnpm",
-    "ref": "v1.0.0",
-    "ecosystem": "npm",
-    "tools": ["npm"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-gradle",
-    "url": "https://github.com/bomly-dev/example-java-gradle",
-    "ref": "v1.0.0",
-    "ecosystem": "maven",
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-python-pipenv",
-    "url": "https://github.com/bomly-dev/example-python-pipenv",
-    "ref": "v1.0.0",
-    "ecosystem": "python",
-    "args": ["--install-first"],
-    "tools": ["pipenv"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-python-poetry",
-    "url": "https://github.com/bomly-dev/example-python-poetry",
-    "ref": "v1.0.0",
-    "ecosystem": "python",
-    "tools": ["poetry"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-python-uv",
-    "url": "https://github.com/bomly-dev/example-python-uv",
-    "ref": "v1.0.0",
-    "ecosystem": "python",
-    "args": ["--install-first"],
-    "tools": ["uv"],
-    "benchmark_enabled": true
-  },
-  {
-    "name": "scan-cpp-conan",
-    "url": "https://github.com/bomly-dev/example-cpp-conan",
-    "ref": "v1.0.0",
-    "ecosystem": "cpp",
-    "benchmark_enabled": true
-  }
-]

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

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "brutus";
-  version = "1.6.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "brutus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iZ0oUYlrcPxPGuJvHXqHX+R4dXKS7pLgZgNhBuBVWtc=";
+    hash = "sha256-Kb5+ue83YEHUG6Ezi7e7WmljHUPRXXD7/bT2ypTZVg4=";
   };
 
   vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ=";

pkgs/by-name/ca/cargo-leptos/package.nix

@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-leptos";
-  version = "0.3.7";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = "cargo-leptos";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-w1kd/eOjNHYAramUvHdgj0ogFqgHDQ1P+ItKTTLL9hU=";
+    hash = "sha256-Y81cCy1w4FoWRyTN15BuC9Z8FSVPJxYObXms0rJHxwM=";
   };
 
-  cargoHash = "sha256-p0mku5B9RtU0E7ny1Izhr2diBLgDH8HR2/B92MvBfws=";
+  cargoHash = "sha256-Wv1gsrcrsJ3izYYFCPMO4ds1w6RQcIlWh+GcsckoKM4=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ca/cargo-tarpaulin/package.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tarpaulin";
-  version = "0.36.0";
+  version = "0.35.5";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = finalAttrs.version;
-    hash = "sha256-qd0PmCCUmd9Y4kUei+hZoc+rIYYZMf0s2ml9IoHtXX8=";
+    hash = "sha256-m822/s9HBKIxAfzgQEBOZeHcHU57MPGOumqlTc55Ro8=";
   };
 
-  cargoHash = "sha256-EJTzITwwLEMVWdLdSE+A9D3Deh501561rxrlsqzmRKs=";
+  cargoHash = "sha256-Qo06iUy/1ElEe/gkH23JZLw7AKPkBPw6aLXnvx9Hv4g=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/ca/cargo-update/package.nix

@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
-  version = "20.0.3";
+  version = "20.0.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0=";
+    hash = "sha256-wV1R95TBPLXzCmE9sjztxJdvwvWxedEQPI5TxZEGUqA=";
   };
 
-  cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU=";
+  cargoHash = "sha256-LsqDwGboCPGrRmpFqy13anszrwE8+VoqRqfm5K3VgM8=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/cd/cdncheck/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cdncheck";
-  version = "1.2.43";
+  version = "1.2.42";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DSM57Wkddl57EMvWK4Zfym+pbuG9HFZlYyjLC5LS3HE=";
+    hash = "sha256-nZo7TUbd3uy78HoD4HPm34R8fBwRjByJ0wI/vJmNoCU=";
   };
 
   vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ=";

pkgs/by-name/ce/cedar/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cedar";
-  version = "4.11.2";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "cedar-policy";
     repo = "cedar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pJiSnaq2oz1uZVkLp9s2HLPdG2sZ0EtURlO8R2V+dJs=";
+    hash = "sha256-9IJ/AMWOtkNAoBbzTKqUZI87MvHPihdhNBwsmn0qpDA=";
   };
 
-  cargoHash = "sha256-6AtFdE7vXoevOU3uWP4sgibakNHK8ffnuWCzJxFt/wo=";
+  cargoHash = "sha256-sinfwdi3/ZFmdbxRiUbtmhsVGcJenn82HFu8mJz415I=";
 
   cargoBuildFlags = [
     "--bin"

pkgs/by-name/ce/certspotter/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "certspotter";
-  version = "0.24.2";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "SSLMate";
     repo = "certspotter";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0GwESNuwvwC3HgNy+1dXxgGshlj5sFCnPj25TnDXbFw=";
+    hash = "sha256-yV0IiTHGEMsdTafrw/juu/vsCq/Ofoxik7vS2huwIKw=";
   };
 
   vendorHash = "sha256-JA/HZrbeauCD0TA2Egy49nYWXHqVRkOs9OmgaAR1z/c=";

pkgs/by-name/cf/cfdg/package.nix

@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cfdg";
-  version = "3.4.3";
+  version = "3.4.2";
   src = fetchFromGitHub {
     owner = "MtnViewJohn";
     repo = "context-free";
     rev = "Version${version}";
-    sha256 = "sha256-a/HmB2AkhcibCxzHfiNjnUiYmz5hrfZVs7aZZu5IBIw=";
+    sha256 = "sha256-PtkvhX5PIeN/5UDpAaVwBwfp8ykjsjfH+8iGdbNQOfI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ch/check-jsonschema/package.nix

@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "check-jsonschema";
-  version = "0.37.4";
+  version = "0.37.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = finalAttrs.version;
-    hash = "sha256-MBnjH5lzutoPTyhYqQTa6FnK8fUMkzy15epBUMxO8BY=";
+    hash = "sha256-9s0AitPH9PAuQ7FH009ppBbH5Z2aNjhinAungoXX3OQ=";
   };
 
   build-system = with python3Packages; [ setuptools ];

pkgs/by-name/cl/clang-uml/package.nix

@@ -17,13 +17,13 @@
 }:
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "clang-uml";
-  version = "0.6.3";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "bkryza";
     repo = "clang-uml";
     rev = finalAttrs.version;
-    hash = "sha256-t0z9VcPkdX9qKt/gA24G50+62Teh4eVF4etd4f6HzoQ=";
+    hash = "sha256-hGjLOyduTc+yOQhO5gDKNfY0fDvbUfvF0FrdjrDheyw=";
   };
 
   patches = [

pkgs/by-name/cl/clickhouse-backup/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "clickhouse-backup";
-  version = "2.7.3";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tcNQoNxzlRcXcSyGWOzCmGtV34ZSzfnyi98QAIWwYF0=";
+    hash = "sha256-rzCVuyG04IHl5oUyw9XuyN56tM/AzAmveZ9NsB7Co68=";
   };
 
-  vendorHash = "sha256-HN0H2YFj7k/T2ff1GCrjfE9PO6MtdR/SWKZL/FoqHZ8=";
+  vendorHash = "sha256-MZfAEXoONdx/2Zb4NeDrdM1WT4jnqhwdNkMm6QzasGY=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

pkgs/by-name/cl/cloc/package.nix

@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "2.10";
+  version = "2.08";
 in
 stdenv.mkDerivation {
   pname = "cloc";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     owner = "AlDanial";
     repo = "cloc";
     rev = "v${version}";
-    sha256 = "sha256-B5dk22H5FeWZ+12A7iwAsJ0ORVfI1stDfue9ZgXBOg4=";
+    sha256 = "sha256-FRby6mhaeTPU0G0rEDszfrTMcrNviFmjbJ8jJnjaZN4=";
   };
 
   setSourceRoot = ''

pkgs/by-name/cl/cloudfoundry-cli/package.nix

@@ -8,15 +8,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudfoundry-cli";
-  version = "8.18.4";
+  version = "8.18.3";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-qbNRferh8AEo3Y7zCgaQKQ1IZHSbhDYzy7OqZahiBfA=";
+    sha256 = "sha256-0+osaSI+qOBGMbkVBvoT69qbXLZLHHOs6ML3kx6OIMQ=";
   };
-  vendorHash = "sha256-zkv7ZuEKp6Nlw1NQqr0A6HX4Jx/yFR4wpo7tyD6VoXY=";
+  vendorHash = "sha256-8ozKd8kT+QDgk1t86AIdlRObZPooO77mEFGKcpGCy3s=";
 
   subPackages = [ "." ];
 

pkgs/by-name/co/coc-clangd/package.nix

@@ -7,16 +7,16 @@
 
 buildNpmPackage {
   pname = "coc-clangd";
-  version = "0-unstable-2026-07-01";
+  version = "0-unstable-2026-06-13";
 
   src = fetchFromGitHub {
     owner = "clangd";
     repo = "coc-clangd";
-    rev = "d745e149736451664ab448d08f3e9f83ec3cc70d";
-    hash = "sha256-juqZg1zsmQYdokvH83InUP1YpS8oybPhglapMas5z0A=";
+    rev = "45d66ce2ed6caf5f5ced672d6b45a41e90dd623f";
+    hash = "sha256-QmC8USEHBzuC2NcVjjAsPXpg9ClW28+E+cadNhdXLg0=";
   };
 
-  npmDepsHash = "sha256-OgNHgDSAqINNmskwhrWNh+TiHGRE4Y9SCFc0+RTs+CI=";
+  npmDepsHash = "sha256-2tpijK2jAPZNrS2h5beUgEsPE2UXAodvE496K2kKz3w=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

pkgs/by-name/co/conmon-rs/package.nix

@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "conmon-rs";
-  version = "1.0.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon-rs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-aeicug8d5RKFgq7ZSGBN7qY0PvlZcTeMwYMYXTS3Gvw=";
+    hash = "sha256-3+W+keg+4XwbtQDps/9FRVPtX3yuR2sQbkoSusDiLmA=";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doCheck = false;
 
-  cargoHash = "sha256-8GtwbX+FOE+upKJbQFGv+RJDZHPNMcA5SUTPK6qgrIs=";
+  cargoHash = "sha256-shfufw5Ompcp8rv5tnuojEP7t7r7eGTvomPVoFv2AFE=";
 
   meta = {
     description = "OCI container runtime monitor written in Rust";

pkgs/by-name/co/cosmic-applets/package.nix

@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-tygAgaafoU0CnTzKPb00uVaYTieCJ4uNjux3AYyYtXQ=";
+    hash = "sha256-A8Qk9u3Q83Q4AjzTrdptfS9UNoyKq39YihC4d/dNBYc=";
   };
 
   cargoPatches = [

pkgs/by-name/co/cosmic-applibrary/package.nix

@@ -10,8 +10,8 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "cosmic-app-library";
-  version = "1.2.0";
+  pname = "cosmic-applibrary";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/co/cosmic-bg/package.nix

@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-r/7eyaUwxXNbfzO+7TCa25JaOefGF/hY+PBHFJtpoiw=";
+    hash = "sha256-bczUWa91l52P6Q46/lkX1j9eKasM154D82fBaLFHF1M=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
   '';
 
-  cargoHash = "sha256-jU6KesqaHnfVZfCtDKrG/pVaJzh3Q5Q6UDMlOoFiLeY=";
+  cargoHash = "sha256-UDhXKg4lO6op/lfi3aZ4iclzUqcf5xQI85UWAHVTWig=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;

pkgs/by-name/co/cosmic-comp/package.nix

@@ -20,22 +20,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-yhgjdkAzUipGAo7Jv9hWlhOb/dLXn1/68yX+tRO6UV4=";
+    hash = "sha256-fUuw7qwfojAmu/mkWMkWBhpcSgZNTIzdXmInjyKrZBI=";
   };
 
-  cargoHash = "sha256-Yi1nVvWmFzlXxHN01BeeGc9YRqrRoVXTqehisOrGWS0=";
-
-  # Only default feature is systemd
-  buildNoDefaultFeatures = !useSystemd;
+  cargoHash = "sha256-ki+unf58rXBCpj5PCpBcg/6FWo16+MdPQWae+w1YkJ8=";
 
   separateDebugInfo = true;
+
   __structuredAttrs = true;
 
   nativeBuildInputs = [
@@ -53,6 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optional useSystemd systemd;
 
+  # Only default feature is systemd
+  buildNoDefaultFeatures = !useSystemd;
+
   makeFlags = [
     "prefix=${placeholder "out"}"
     "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"

pkgs/by-name/co/cosmic-edit/package.nix

@@ -16,27 +16,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-w6Os3R//40ED9q6wyiABmIgofdj+WaLZPD/4+1EF7aY=";
+    hash = "sha256-5DsnhaiJgmTakn+q9o2Q7IeuakAC/j0Ck3F3pfFx/EA=";
   };
 
+  cargoHash = "sha256-2E+98uWtahyQufoZTzdUtkwbuISsUHwlqOmMSpyi1O8=";
+
+  separateDebugInfo = true;
+
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
   '';
 
-  cargoHash = "sha256-/OnmUO7WFXvZPq+0nPe2BKbYZRR0Ku+V8+qeLWnYHPQ=";
-
-  separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
-
   nativeBuildInputs = [
     just
     pkg-config

pkgs/by-name/co/cosmic-ext-tweaks/package.nix

@@ -26,9 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-mC19GLLHrjqYXl052HoNFscz9zzQWVBBm0OxzXoUd8U=";
 
   separateDebugInfo = true;
-  __structuredAttrs = true;
-
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
   nativeBuildInputs = [
     libcosmicAppHook

pkgs/by-name/co/cosmic-files/package.nix

@@ -12,23 +12,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ZjV5HkVzDHH96OcaHSKKrTJdOSp3NqWHbLgtq/GOQ+M=";
+    hash = "sha256-cRwZrmm/zOIV6VCyz2dTH+qn8h6LOnaOiHU5nENTK6o=";
   };
 
-  cargoHash = "sha256-HWkuWaF2UP5brDW39nq1pn9Zp1XgEUToumuD4MmHhU8=";
+  cargoHash = "sha256-+21DCCTkNrbdxgxQi0YyuAxpl1IvwUz3ccUE+E0sZ4Y=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
-
   nativeBuildInputs = [
     just
     libcosmicAppHook

pkgs/by-name/co/cosmic-greeter/package.nix

@@ -19,30 +19,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-JaPF2kFXQLumPBn8JFBiaSJ/tP3QqK/hwhy5rZrLuY4=";
+    hash = "sha256-oxXCAvBISkZu76VpvQ9AliFRJ8r5Ay7mjWf4sEwV0Xs=";
   };
 
-  postPatch = ''
-    substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
-    substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
-  '';
-
   cargoHash = "sha256-mfY2hsMxBooRjmTB2jgUIKyKHBpGfZ9Qslwv+2aEQyg=";
 
-  cargoBuildFlags = [ "--all" ];
-
   separateDebugInfo = true;
-  __structuredAttrs = true;
 
   env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
+  cargoBuildFlags = [ "--all" ];
+
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     cmake
@@ -70,6 +66,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  postPatch = ''
+    substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
+    substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
+  '';
+
   preFixup = ''
     libcosmicAppWrapperArgs+=(
       --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}

pkgs/by-name/co/cosmic-icons/package.nix

@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -24,17 +24,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ just ];
 
-  propagatedBuildInputs = [
-    pop-icon-theme
-    hicolor-icon-theme
-  ];
-
   justFlags = [
     "--set"
     "prefix"
     (placeholder "out")
   ];
 
+  propagatedBuildInputs = [
+    pop-icon-theme
+    hicolor-icon-theme
+  ];
+
   dontDropIconThemeCache = true;
 
   passthru.updateScript = nix-update-script {

pkgs/by-name/co/cosmic-idle/package.nix

@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -26,10 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-0tcrOfVT5b57ev3b5F2U78F2QPGFwp94bqFVNyKH0Yk=";
   };
 
-  postPatch = ''
-    substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"'
-  '';
-
   cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
 
   separateDebugInfo = true;
@@ -52,6 +48,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  postPatch = ''
+    substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"'
+  '';
+
   passthru = {
     tests = {
       inherit (nixosTests)

pkgs/by-name/co/cosmic-initial-setup/package.nix

@@ -14,7 +14,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -24,16 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-UABqbmbwW2ZBOO7mq16/h0s55VCWRF2yyf/1TaubC88=";
   };
 
-  postPatch = ''
-    # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
-    substituteInPlace justfile \
-      --replace-fail \
-      "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \
-      "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
-  '';
-
   cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY=";
 
+  separateDebugInfo = true;
+
   buildFeatures = [ "nixos" ];
 
   # cargo-auditable fails during the build when compiling the `crabtime::function`
@@ -44,14 +38,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # https://github.com/rust-secure-code/cargo-auditable/issues/225
   auditable = false;
 
-  separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env = {
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-    DISABLE_IF_EXISTS = "/iso/nix-store.squashfs";
-  };
-
   nativeBuildInputs = [
     libcosmicAppHook
     just
@@ -64,6 +52,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     udev
   ];
 
+  postPatch = ''
+    # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
+    substituteInPlace justfile \
+      --replace-fail \
+      "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \
+      "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
+  '';
+
+  preFixup = ''
+    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]})
+  '';
+
   dontUseJustBuild = true;
   dontUseJustCheck = true;
 
@@ -76,9 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  preFixup = ''
-    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]})
-  '';
+  env.DISABLE_IF_EXISTS = "/iso/nix-store.squashfs";
 
   passthru = {
     tests = {

pkgs/by-name/co/cosmic-launcher/package.nix

@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Dy1sOEe/Cb1wyXHETZ5wJt8IcJMGw19OeDGOhuv4kQg=";
+    hash = "sha256-9U64nSeI47bkc8BQU9ilXBlHQRGS2zC/FcBKc7Z17RY=";
   };
 
   cargoHash = "sha256-WnZAPQR8hGGNC5S7hPmcGSMs9HrOw4/wqJR151eIgHY=";
@@ -26,8 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";
-
   nativeBuildInputs = [
     just
     libcosmicAppHook
@@ -45,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable";
+
   passthru = {
     tests = {
       inherit (nixosTests)

pkgs/by-name/co/cosmic-monitor/package.nix

@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-monitor";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-monitor";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6Iz2CMcw131GrgSsSk2FgnwAnges1yMeEwblrusCc24=";
+    hash = "sha256-CiJ9LeNcdOyC8yn0c7hCz0QEecxYK95KGvs1SWr9360=";
   };
 
-  cargoHash = "sha256-INILXUO4637bcq51OV+ENJG306kXOrKN8547/RRSG0k=";
+  cargoHash = "sha256-OMhLPQ3GkV/wdeb9F7lsKY1Uzzg8+UlhOeakGZo6mYk=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;

pkgs/by-name/co/cosmic-notifications/package.nix

@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/co/cosmic-osd/package.nix

@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -30,8 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";
-
   nativeBuildInputs = [
     just
     libcosmicAppHook
@@ -57,6 +55,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";
+
   passthru = {
     tests = {
       inherit (nixosTests)

pkgs/by-name/co/cosmic-panel/package.nix

@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/co/cosmic-player/package.nix

@@ -1,7 +1,3 @@
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: Lily Foster <lily@lily.flowers>
-# Portions of this code are adapted from nixos-cosmic
-# https://github.com/lilyinstarlight/nixos-cosmic
 {
   lib,
   stdenv,
@@ -22,23 +18,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-4oIfTsEGMVmgS0VWLnQ1xAcPAzBeYaGT8xU3b/ObeO8=";
+    hash = "sha256-aHQbwpNr8tsfUR0Dm4WTzz6XNXjgdqZ9/2AQRPPbnog=";
   };
 
-  cargoHash = "sha256-aY5QYZ1OjiCHgfFysTTU6Wp/1IexAWjuZCkTFuFY1PI=";
+  cargoHash = "sha256-KVaKTMrWijResBqzH62j/YqBR4TQ77x2sK/kN40UWjw=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
-
   nativeBuildInputs = [
     just
     pkg-config
@@ -46,6 +40,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
+  # Largely based on lilyinstarlight's work linked below
+  # https://github.com/lilyinstarlight/nixos-cosmic/blob/main/pkgs/cosmic-player/package.nix
+
   buildInputs = [
     alsa-lib
     ffmpeg
@@ -70,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  preFixup = ''
+  postInstall = ''
     libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 

pkgs/by-name/co/cosmic-protocols/package.nix

@@ -21,9 +21,8 @@ stdenv.mkDerivation {
   __structuredAttrs = true;
   strictDeps = true;
 
-  nativeBuildInputs = [ wayland-scanner ];
-
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
+  nativeBuildInputs = [ wayland-scanner ];
 
   passthru = {
     tests = {

pkgs/by-name/co/cosmic-randr/package.nix

@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/co/cosmic-reader/package.nix

@@ -33,8 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.rev;
-
   nativeBuildInputs = [
     just
     libcosmicAppHook
@@ -66,6 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  env.VERGEN_GIT_SHA = finalAttrs.src.rev;
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version"

pkgs/by-name/co/cosmic-screenshot/package.nix

@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/co/cosmic-session/package.nix

@@ -12,34 +12,32 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-nKrdjvD1dcFvwhCiruM/bxrh8CYOWnoVgJj/2nkfEFg=";
+    hash = "sha256-FphY53MaOUUR2oQfZak3HbT+kvysUnw2AIc4L9O+TcU=";
   };
 
-  postPatch = ''
-    substituteInPlace data/start-cosmic \
-      --replace-fail '/usr/bin/cosmic-session' "$out/bin/cosmic-session" \
-      --replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"
-    substituteInPlace data/cosmic.desktop \
-      --replace-fail '/usr/bin/start-cosmic' "$out/bin/start-cosmic"
-  '';
-
   cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A=";
 
   separateDebugInfo = true;
+
+  postPatch = ''
+    substituteInPlace data/start-cosmic \
+      --replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
+      --replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"
+    substituteInPlace data/cosmic.desktop \
+      --replace-fail '/usr/bin/start-cosmic' "${placeholder "out"}/bin/start-cosmic"
+  '';
+
   __structuredAttrs = true;
 
-  env.ORCA = "orca"; # get orca from $PATH
-
-  nativeBuildInputs = [ just ];
-
   buildInputs = [ bash ];
+  nativeBuildInputs = [ just ];
 
   dontUseJustBuild = true;
 
@@ -55,6 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
+  env.ORCA = "orca"; # get orca from $PATH
+
   passthru = {
     providedSessions = [ "cosmic" ];
     tests = {

pkgs/by-name/co/cosmic-settings-daemon/package.nix

@@ -17,14 +17,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-cCxcIRrLvCxWDujXuREukkxZ0qPl3SH4n1VWAR1c/QY=";
+    hash = "sha256-6MLZpGGvE1EnUlRv2T6+iXy8B0aqBTNNrqDtBbeABYs=";
   };
 
   postPatch = ''

pkgs/by-name/co/cosmic-settings/package.nix

@@ -27,14 +27,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-zs8QJc8bLbLLj1lqLsxdgkVOLIHqk+fOEyNEEmViv0g=";
+    hash = "sha256-LfhFza0G85+fIuACMdwV50Okh5/46z8tLoJ9IvLqTgw=";
   };
 
   cargoPatches = [

pkgs/by-name/co/cosmic-store/package.nix

@@ -15,23 +15,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-DqkYwbEph6GJM9Gok/XaiIFyWnv0+W+geviyzrXmQ8I=";
+    hash = "sha256-pePtfOgeQtaD15dfWzrMQmXcINf/V5ovKWAG8kOPf+c=";
   };
 
-  cargoHash = "sha256-IuMCYUZWtzvGyLMNb+Kwoj6M9fKaEYFMfcfYYVggVYw=";
+  cargoHash = "sha256-jECZ/6hxaDfz2pOOqLkbq5HfF3YnCVK2geFAC+n286A=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
-
   nativeBuildInputs = [
     just
     pkg-config

pkgs/by-name/co/cosmic-term/package.nix

@@ -15,23 +15,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-0LGbe9oOwkNKU3XboEeZfi3isRbX95rIu+/VWWf6N68=";
+    hash = "sha256-ocOPssCxm2p2HoAIHIAoAMh66cGcGXuGWDuAEtHFoPQ=";
   };
 
-  cargoHash = "sha256-JJQ+CLSaqdqTWcbb/Oj6a1vjIHXIYQsmMn+PtmHt0Gc=";
+  cargoHash = "sha256-ezFCpU4ZNfANYRVTMrvPMC79j55XGUwYMMKeihekYds=";
 
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
-
   nativeBuildInputs = [
     just
     pkg-config

pkgs/by-name/co/cosmic-wallpapers/package.nix

@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -19,11 +19,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-m2cYppfitpBDKK8CC9i/lUrC9rfSYTuqUSZSyIKKGyg=";
   };
 
+  makeFlags = [ "prefix=${placeholder "out"}" ];
+
   __structuredAttrs = true;
   strictDeps = true;
 
-  makeFlags = [ "prefix=${placeholder "out"}" ];
-
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"

pkgs/by-name/co/cosmic-workspaces-epoch/package.nix

@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.2.0";
+  version = "1.1.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -27,6 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-Z5dC3W8QoDBZWBjHwRj9MC8EScDjQwUiUcOPTRDToDA=";
 
   separateDebugInfo = true;
+
   __structuredAttrs = true;
 
   nativeBuildInputs = [
@@ -40,13 +41,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     udev
   ];
 
+  dontCargoInstall = true;
+
   makeFlags = [
     "prefix=${placeholder "out"}"
     "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  dontCargoInstall = true;
-
   passthru = {
     tests = {
       inherit (nixosTests)

pkgs/by-name/cs/csharprepl/package.nix

@@ -21,7 +21,7 @@ buildDotnetGlobalTool {
     changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ _4evy ];
+    maintainers = with lib.maintainers; [ FlameFlag ];
     mainProgram = "csharprepl";
   };
 }

pkgs/by-name/ct/ctranslate2/package.nix

@@ -30,15 +30,12 @@ stdenv'.mkDerivation (finalAttrs: {
   pname = "ctranslate2";
   version = "4.8.1";
 
-  __strutcturedAttrs = true;
-  strictDeps = true;
-
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-cchwv+esysn/0v6RqD5zp306HfzOjjlCxH5usLETXs0=";
+    hash = "sha256-+82u+w08wGX0oh1wBaH/epI2IH7lxbvMThJEoGt0Kvk=";
   };
 
   # Fix CMake 4 compatibility

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

@@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   postInstall = ''
     installShellCompletion --cmd delta \
       --bash <($out/bin/delta --generate-completion bash) \
-      --fish <($out/bin/delta --generate-completion fish) \
-      --zsh <($out/bin/delta --generate-completion zsh)
+      --fish <($out/bin/delta --generate-completion zsh) \
+      --zsh <($out/bin/delta --generate-completion fish)
   '';
 
   # test_env_parsing_with_pager_set_to_bat sets environment variables,

pkgs/by-name/de/devin-desktop/info.json

@@ -1,14 +1,14 @@
 {
   "aarch64-darwin": {
-    "version": "3.4.22",
+    "version": "3.3.18",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip",
-    "sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/16737566f57f3b53bde136375fe0544eca12fac4/Devin-darwin-arm64-3.3.18.zip",
+    "sha256": "7ac789baa5d818b09f6a62315d34b55dde02b0a409a22903d0228a819ea734e7"
   },
   "x86_64-linux": {
-    "version": "3.4.22",
+    "version": "3.3.18",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz",
-    "sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/16737566f57f3b53bde136375fe0544eca12fac4/Devin-linux-x64-3.3.18.tar.gz",
+    "sha256": "05c7fa988c324a1633038ebe90e217d17a7f188197a5070f397460864ef41292"
   }
 }

pkgs/by-name/do/docker-credential-helpers/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "docker-credential-helpers";
-  version = "0.9.8";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-credential-helpers";
     rev = "v${version}";
-    sha256 = "sha256-xioDtn0/4CZytaUhRXb2T5DHnP/yWdXPeNTQoKf9AoA=";
+    sha256 = "sha256-HgioRk6qz9H9KD0JWcYg2bIpqHZxnPHYc3idxMUKuD8=";
   };
 
   vendorHash = null;

pkgs/by-name/du/dutctl/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dutctl";
-  version = "1.0.0-alpha.1-unstable-2026-07-05";
+  version = "1.0.0-alpha.1-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "BlindspotSoftware";
     repo = "dutctl";
-    rev = "1ee4c9baee1b088154fd3b94cf1023ef88f8cd0a";
-    hash = "sha256-45C4ktDKiz4wkisKTSUCqlR5n5TI13IYPKAbsj5bekY=";
+    rev = "9f57498b4ebf99cc1960015832986f059673020b";
+    hash = "sha256-Xif0qngaMtje67QTvLANlfMAuQZNVJMDGtnDAwznyO8=";
   };
 
-  vendorHash = "sha256-RJviv/FMfU6COdwUcsQb13cETAVOINYEGZNv5y4tKD0=";
+  vendorHash = "sha256-6ne0gvVbdb4OIQmc0nHa7I4ms4gb0CXO8c1GuFqmefc=";
 
   ldflags = [
     "-s"