Merge remote-tracking branch 'origin/staging-next' into staging

ci/OWNERS

@@ -220,7 +220,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /nixos/tests/chromium.nix @emilylange @networkException
 
 # Certificate Authorities
-pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
+pkgs/by-name/ca/cacert @ajs124 @lukegb @mweinelt
 pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt
 pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 
@@ -275,7 +275,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/tests/home-assistant.nix @mweinelt
 /nixos/tests/zigbee2mqtt.nix @mweinelt
 /pkgs/servers/home-assistant @mweinelt
-/pkgs/tools/misc/esphome @mweinelt
+/pkgs/by-name/es/esphome @mweinelt
 
 # Network Time Daemons
 /pkgs/by-name/ch/chrony @thoughtpolice

doc/languages-frameworks/vim.section.md

@@ -139,9 +139,9 @@ Note: this is not possible anymore for Neovim.
 
 ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
 
-Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
+Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
 
-When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`.
+When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/update.py) to update the tree sitter grammars for `nvim-treesitter`.
 
 Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
 

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -206,6 +206,8 @@
 
 - [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable)
 
+- [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable)
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}

nixos/modules/module-list.nix

@@ -1019,6 +1019,7 @@
   ./services/network-filesystems/kubo.nix
   ./services/network-filesystems/litestream/default.nix
   ./services/network-filesystems/moosefs.nix
+  ./services/network-filesystems/ipfs-cluster.nix
   ./services/network-filesystems/netatalk.nix
   ./services/network-filesystems/nfsd.nix
   ./services/network-filesystems/openafs/client.nix

nixos/modules/services/databases/postgresql.md

@@ -9,7 +9,7 @@
 
 <!-- FIXME: more stuff, like maintainer? -->
 
-PostgreSQL is an advanced, free relational database.
+PostgreSQL is an advanced, free, relational database.
 <!-- MORE -->
 
 ## Configuring {#module-services-postgres-configuring}
@@ -67,7 +67,7 @@ name. This can be done with
 If the database user name equals the connecting system user name,
 postgres by default will accept a passwordless connection via unix
 domain socket. This makes it possible to run many postgres-backed
-services without creating any database secrets at all
+services without creating any database secrets at all.
 
 ### Assigning extra permissions {#module-services-postgres-initializing-extra-permissions}
 
@@ -178,7 +178,7 @@ These instructions are also applicable to other versions.
 :::
 
 Major PostgreSQL upgrades require a downtime and a few imperative steps to be called. This is the case because
-each major version has some internal changes in the databases' state during major releases. Because of that,
+each major version has some internal changes in the databases' state. Because of that,
 NixOS places the state into {file}`/var/lib/postgresql/&lt;version&gt;` where each `version`
 can be obtained like this:
 ```
@@ -203,7 +203,6 @@ For an upgrade, a script like this can be used to simplify the process:
       systemctl stop postgresql
 
       export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
-
       export NEWBIN="${newPostgres}/bin"
 
       export OLDDATA="${cfg.dataDir}"
@@ -224,11 +223,11 @@ For an upgrade, a script like this can be used to simplify the process:
 
 The upgrade process is:
 
-  1. Rebuild nixos configuration with the configuration above added to your {file}`configuration.nix`. Alternatively, add that into separate file and reference it in `imports` list.
-  2. Login as root (`sudo su -`)
-  3. Run `upgrade-pg-cluster`. It will stop old postgresql, initialize a new one and migrate the old one to the new one. You may supply arguments like `--jobs 4` and `--link` to speedup migration process. See <https://www.postgresql.org/docs/current/pgupgrade.html> for details.
-  4. Change postgresql package in NixOS configuration to the one you were upgrading to via [](#opt-services.postgresql.package). Rebuild NixOS. This should start new postgres using upgraded data directory and all services you stopped during the upgrade.
-  5. After the upgrade it's advisable to analyze the new cluster.
+  1. Add the above to your {file}`configuration.nix` and rebuild. Alternatively, add that into a separate file and reference it in the `imports` list.
+  2. Login as root (`sudo su -`).
+  3. Run `upgrade-pg-cluster`. This will stop the old postgresql cluster, initialize a new one and migrate the old one to the new one. You may supply arguments like `--jobs 4` and `--link` to speedup the migration process. See <https://www.postgresql.org/docs/current/pgupgrade.html> for details.
+  4. Change the postgresql package in NixOS configuration to the one you were upgrading to via [](#opt-services.postgresql.package). Rebuild NixOS. This should start the new postgres version using the upgraded data directory and all services you stopped during the upgrade.
+  5. After the upgrade it's advisable to analyze the new cluster:
 
        - For PostgreSQL ≥ 14, use the `vacuumdb` command printed by the upgrades script.
        - For PostgreSQL < 14, run (as `su -l postgres` in the [](#opt-services.postgresql.dataDir), in this example {file}`/var/lib/postgresql/13`):
@@ -273,7 +272,7 @@ A complete list of options for the PostgreSQL module may be found [here](#opt-se
 
 ## Plugins {#module-services-postgres-plugins}
 
-Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`:
+The collection of plugins for each PostgreSQL version can be accessed with `.pkgs`. For example, for the `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`:
 ```ShellSession
 $ nix repl '<nixpkgs>'
 
@@ -301,7 +300,7 @@ To add plugins via NixOS configuration, set `services.postgresql.extensions`:
 }
 ```
 
-You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like:
+You can build a custom `postgresql-with-plugins` (to be used outside of NixOS) using the function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like this:
 ```nix
 self: super: {
   postgresql_custom = self.postgresql_17.withPackages (ps: [
@@ -362,7 +361,7 @@ This currently works for:
 ## JIT (Just-In-Time compilation) {#module-services-postgres-jit}
 
 [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package
-is disabled by default because of the ~300MiB closure-size increase from the LLVM dependency. It
+is disabled by default because of the ~600MiB closure-size increase from the LLVM dependency. It
 can be optionally enabled in PostgreSQL with the following config option:
 
 ```nix
@@ -415,7 +414,7 @@ several common hardening options from `systemd`, most notably:
     }
     ```
 
-The NixOS module also contains necessary adjustments for extensions from `nixpkgs`
+The NixOS module also contains necessary adjustments for extensions from `nixpkgs`,
 if these are enabled. If an extension or a postgresql feature from `nixpkgs` breaks
 with hardening, it's considered a bug.
 

nixos/modules/services/network-filesystems/ipfs-cluster.nix

@@ -0,0 +1,126 @@
+{
+  config,
+  lib,
+  pkgs,
+  options,
+  ...
+}:
+let
+  cfg = config.services.ipfs-cluster;
+
+  # secret is by envvar, not flag
+  initFlags = toString [
+    (lib.optionalString (cfg.initPeers != [ ]) "--peers")
+    (lib.strings.concatStringsSep "," cfg.initPeers)
+  ];
+in
+{
+  options = {
+
+    services.ipfs-cluster = {
+
+      enable = lib.mkEnableOption "Pinset orchestration for IPFS - requires ipfs daemon to be useful";
+
+      consensus = lib.mkOption {
+        type = lib.types.enum [
+          "raft"
+          "crdt"
+        ];
+        description = "Consensus protocol - 'raft' or 'crdt'. https://cluster.ipfs.io/documentation/guides/consensus/";
+      };
+
+      dataDir = lib.mkOption {
+        type = lib.types.str;
+        default = "/var/lib/ipfs-cluster";
+        description = "The data dir for ipfs-cluster.";
+      };
+
+      initPeers = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        description = "Peer addresses to initialize with on first run.";
+      };
+
+      openSwarmPort = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Open swarm port, secured by the cluster secret. This does not expose the API or proxy. https://cluster.ipfs.io/documentation/guides/security/";
+      };
+
+      secretFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        description = ''
+          File containing the cluster secret in the format of EnvironmentFile as described by
+          {manpage}`systemd.exec(5)`. For example:
+          <programlisting>
+          CLUSTER_SECRET=<replaceable>...</replaceable>
+          </programlisting>
+
+          If null, a new secret will be generated on first run and stored in the data directory.
+          A secret in the correct format can also be generated by: `openssl rand -hex 32`
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.enable -> config.services.kubo.enable;
+        message = "ipfs-cluster requires ipfs - configure and enable services.kubo";
+      }
+    ];
+
+    environment.systemPackages = [ pkgs.ipfs-cluster ];
+
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${config.services.kubo.user} ${config.services.kubo.group} - -"
+    ];
+
+    systemd.services.ipfs-cluster-init = {
+      path = [
+        "/run/wrappers"
+        pkgs.ipfs-cluster
+      ];
+      environment.IPFS_CLUSTER_PATH = cfg.dataDir;
+      wantedBy = [ "default.target" ];
+
+      serviceConfig = {
+        ExecStart = [
+          "${lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-service"} init --consensus ${cfg.consensus} ${initFlags}"
+        ];
+        Type = "oneshot";
+        RemainAfterExit = true;
+        User = config.services.kubo.user;
+        Group = config.services.kubo.group;
+        EnvironmentFile = lib.mkIf (cfg.secretFile != null) cfg.secretFile;
+      };
+      # only run once (= when the data directory is empty)
+      unitConfig.ConditionDirectoryNotEmpty = "!${cfg.dataDir}";
+    };
+
+    systemd.services.ipfs-cluster = {
+      environment.IPFS_CLUSTER_PATH = cfg.dataDir;
+      wantedBy = [ "multi-user.target" ];
+
+      wants = [ "ipfs-cluster-init.service" ];
+      after = [ "ipfs-cluster-init.service" ];
+
+      serviceConfig = {
+        Type = "notify";
+        ExecStart = [ "${lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-service"} daemon" ];
+        User = config.services.kubo.user;
+        Group = config.services.kubo.group;
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openSwarmPort [ 9096 ];
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [
+      sorki
+    ];
+  };
+}

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

@@ -195,10 +195,12 @@ in
           SystemCallFilter = [
             "@pkey"
             "@system-service"
-            "@chown"
+            # /!\ order matters: @privileged contains @chown, so we need
+            # @privileged negated before we re-list @chown for libuv copy
+            "~@privileged"
+            "~@chown:EPERM"
             "~@keyring"
             "~@memlock"
-            "~@privileged"
             "~@resources"
             "~@setuid"
             "~@timer"

nixos/tests/misc.nix

@@ -19,7 +19,6 @@ import ./make-test-python.nix (
           }
         ];
         environment.variables.EDITOR = lib.mkOverride 0 "emacs";
-        documentation.nixos.enable = lib.mkOverride 0 true;
         systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
         systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = { };
         virtualisation.fileSystems = {

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

@@ -116,6 +116,7 @@ mapAliases (
     snipmate = vim-snipmate;
     sourcemap = sourcemap-vim;
     "sourcemap.vim" = sourcemap-vim;
+    Spacegray-vim = throw "Spacegray-vim has been removed: abandoned by upstream"; # Added 2025-03-24
     surround = vim-surround;
     sleuth = vim-sleuth;
     solidity = vim-solidity;

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

@@ -0,0 +1,36 @@
+{
+  buildVimPlugin,
+  coc-clangd,
+  coc-css,
+  coc-diagnostic,
+  coc-pyright,
+  coc-toml,
+}:
+final: prev: {
+  coc-clangd = buildVimPlugin {
+    inherit (coc-clangd) pname version meta;
+    src = "${coc-clangd}/lib/node_modules/coc-clangd";
+  };
+
+  coc-css = buildVimPlugin {
+    inherit (coc-css) pname version meta;
+    src = "${coc-css}/lib/node_modules/coc-css";
+  };
+
+  coc-diagnostic = buildVimPlugin {
+    inherit (coc-diagnostic) pname version meta;
+    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
+  };
+
+  coc-pyright = buildVimPlugin {
+    pname = "coc-pyright";
+    inherit (coc-pyright) version meta;
+    src = "${coc-pyright}/lib/node_modules/coc-pyright";
+  };
+
+  coc-toml = buildVimPlugin {
+    pname = "coc-toml";
+    inherit (coc-toml) version meta;
+    src = "${coc-toml}/lib/node_modules/coc-toml";
+  };
+}

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

@@ -19,12 +19,25 @@ let
 
   initialPackages = self: { };
 
-  plugins = callPackage ./generated.nix {
+  cocPlugins = callPackage ./cocPlugins.nix {
     inherit buildVimPlugin;
+  };
+
+  luaPackagePlugins = callPackage ./luaPackagePlugins.nix {
     inherit (neovimUtils) buildNeovimPlugin;
   };
 
-  extras = callPackage ./extras.nix {
+  nodePackagePlugins = callPackage ./nodePackagePlugins.nix {
+    inherit buildVimPlugin;
+  };
+
+  nonGeneratedPlugins =
+    self: super:
+    lib.mapAttrs (name: _: callPackage (./non-generated + "/${name}") { }) (
+      lib.filterAttrs (name: type: type == "directory") (builtins.readDir ./non-generated)
+    );
+
+  plugins = callPackage ./generated.nix {
     inherit buildVimPlugin;
     inherit (neovimUtils) buildNeovimPlugin;
   };
@@ -44,7 +57,10 @@ let
 in
 lib.pipe initialPackages [
   (extends plugins)
-  (extends extras)
+  (extends cocPlugins)
+  (extends luaPackagePlugins)
+  (extends nodePackagePlugins)
+  (extends nonGeneratedPlugins)
   (extends overrides)
   (extends aliases)
   lib.makeExtensible

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

@@ -1,104 +0,0 @@
-{
-  lib,
-  buildVimPlugin,
-  buildNeovimPlugin,
-  nodePackages,
-  neovim-unwrapped,
-}:
-let
-  luaPackages = neovim-unwrapped.lua.pkgs;
-in
-self: super:
-(
-  let
-    nodePackageNames = [
-      "coc-cmake"
-      "coc-docker"
-      "coc-emmet"
-      "coc-eslint"
-      "coc-explorer"
-      "coc-flutter"
-      "coc-git"
-      "coc-go"
-      "coc-haxe"
-      "coc-highlight"
-      "coc-html"
-      "coc-java"
-      "coc-jest"
-      "coc-json"
-      "coc-lists"
-      "coc-ltex"
-      "coc-markdownlint"
-      "coc-pairs"
-      "coc-prettier"
-      "coc-r-lsp"
-      "coc-rls"
-      "coc-rust-analyzer"
-      "coc-sh"
-      "coc-smartf"
-      "coc-snippets"
-      "coc-solargraph"
-      "coc-spell-checker"
-      "coc-sqlfluff"
-      "coc-stylelint"
-      "coc-sumneko-lua"
-      "coc-tabnine"
-      "coc-texlab"
-      "coc-tsserver"
-      "coc-ultisnips"
-      "coc-vetur"
-      "coc-vimlsp"
-      "coc-vimtex"
-      "coc-wxml"
-      "coc-yaml"
-      "coc-yank"
-    ];
-    nodePackage2VimPackage =
-      name:
-      buildVimPlugin {
-        pname = name;
-        inherit (nodePackages.${name}) version meta;
-        src = "${nodePackages.${name}}/lib/node_modules/${name}";
-      };
-  in
-  lib.genAttrs nodePackageNames nodePackage2VimPackage
-)
-// (
-  let
-    luarocksPackageNames = [
-      "fidget-nvim"
-      "gitsigns-nvim"
-      "image-nvim"
-      "lsp-progress-nvim"
-      "lualine-nvim"
-      "luasnip"
-      "lush-nvim"
-      "lz-n"
-      "lze"
-      "lzextras"
-      "lzn-auto-require"
-      "middleclass"
-      "mini-test"
-      "neorg"
-      "neotest"
-      "nui-nvim"
-      "nvim-cmp"
-      "nvim-nio"
-      "nvim-web-devicons"
-      "oil-nvim"
-      "orgmode"
-      "papis-nvim"
-      "rest-nvim"
-      "rocks-config-nvim"
-      "rtp-nvim"
-      "telescope-manix"
-      "telescope-nvim"
-    ];
-    toVimPackage =
-      name:
-      buildNeovimPlugin {
-        luaAttr = luaPackages.${name};
-      };
-  in
-  lib.genAttrs luarocksPackageNames toVimPackage
-)

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

@@ -458,6 +458,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  VimCompletesMe = buildVimPlugin {
+    pname = "VimCompletesMe";
+    version = "2015-04-20";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "VimCompletesMe";
+      rev = "b915ac2c081dd5aec69b561b04a8ac1778d2277c";
+      sha256 = "0mal1raflzzmahb4skc01dwp9vasvwcyh9mpw3r75gfrfzbyjrlk";
+    };
+    meta.homepage = "https://github.com/vim-scripts/VimCompletesMe/";
+    meta.hydraPlatforms = [ ];
+  };
+
   VimOrganizer = buildVimPlugin {
     pname = "VimOrganizer";
     version = "2020-12-15";
@@ -18757,6 +18770,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  vim-pony = buildVimPlugin {
+    pname = "vim-pony";
+    version = "2018-06-24";
+    src = fetchFromGitHub {
+      owner = "jmcomets";
+      repo = "vim-pony";
+      rev = "cd0949971c485fd23de62bb78ca39e5bbe8b915a";
+      sha256 = "0sassx3mkkd543mljycfmvgwcnw36zbpanm41mf3bavxvsk0azx6";
+    };
+    meta.homepage = "https://github.com/jmcomets/vim-pony/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-poweryank = buildVimPlugin {
     pname = "vim-poweryank";
     version = "2017-08-13";

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

@@ -0,0 +1,46 @@
+{
+  lib,
+  buildNeovimPlugin,
+  neovim-unwrapped,
+}:
+final: prev:
+let
+  luaPackages = neovim-unwrapped.lua.pkgs;
+
+  luarocksPackageNames = [
+    "fidget-nvim"
+    "gitsigns-nvim"
+    "image-nvim"
+    "lsp-progress-nvim"
+    "lualine-nvim"
+    "luasnip"
+    "lush-nvim"
+    "lz-n"
+    "lze"
+    "lzextras"
+    "lzn-auto-require"
+    "middleclass"
+    "mini-test"
+    "neorg"
+    "neotest"
+    "nui-nvim"
+    "nvim-cmp"
+    "nvim-nio"
+    "nvim-web-devicons"
+    "oil-nvim"
+    "orgmode"
+    "papis-nvim"
+    "plenary-nvim"
+    "rest-nvim"
+    "rocks-config-nvim"
+    "rtp-nvim"
+    "telescope-manix"
+    "telescope-nvim"
+  ];
+in
+lib.genAttrs luarocksPackageNames (
+  name:
+  buildNeovimPlugin {
+    luaAttr = luaPackages.${name};
+  }
+)

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

@@ -0,0 +1,65 @@
+{
+  lib,
+  buildVimPlugin,
+  nodePackages,
+}:
+final: prev:
+let
+  nodePackageNames = [
+    "coc-cmake"
+    "coc-docker"
+    "coc-emmet"
+    "coc-eslint"
+    "coc-explorer"
+    "coc-flutter"
+    "coc-git"
+    "coc-go"
+    "coc-haxe"
+    "coc-highlight"
+    "coc-html"
+    "coc-java"
+    "coc-jest"
+    "coc-json"
+    "coc-lists"
+    "coc-ltex"
+    "coc-markdownlint"
+    "coc-pairs"
+    "coc-prettier"
+    "coc-r-lsp"
+    "coc-rls"
+    "coc-rust-analyzer"
+    "coc-sh"
+    "coc-smartf"
+    "coc-snippets"
+    "coc-solargraph"
+    "coc-spell-checker"
+    "coc-sqlfluff"
+    "coc-stylelint"
+    "coc-sumneko-lua"
+    "coc-tabnine"
+    "coc-texlab"
+    "coc-tsserver"
+    "coc-ultisnips"
+    "coc-vetur"
+    "coc-vimlsp"
+    "coc-vimtex"
+    "coc-wxml"
+    "coc-yaml"
+    "coc-yank"
+    "coc-nginx"
+  ];
+
+  packageNameOverrides = {
+    "coc-nginx" = "@yaegassy/coc-nginx";
+  };
+
+  getPackageName = name: packageNameOverrides.${name} or name;
+in
+lib.genAttrs nodePackageNames (
+  name:
+  buildVimPlugin {
+    pname = name;
+    inherit (nodePackages.${getPackageName name}) version meta;
+    src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}";
+  }
+)

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

@@ -0,0 +1,22 @@
+{
+  vimUtils,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+vimUtils.buildVimPlugin {
+  pname = "bitbake-vim";
+  version = "2025-03-24";
+
+  src = fetchFromGitHub {
+    owner = "openembedded";
+    repo = "bitbake";
+    rev = "8cc976e2792fdde3900729f3b09dd18ab640b5e8";
+    sha256 = "12k48zhd9bh3b8xjpang2xj14nhyla2p55r1is3m25wkqys10p9c";
+  };
+
+  sourceRoot = "source/contrib/vim";
+
+  meta.homepage = "https://github.com/openembedded/bitbake/";
+
+  passthru.updateScript = nix-update-script { };
+}

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

@@ -0,0 +1,10 @@
+{
+  vimPlugins,
+  vimUtils,
+}:
+vimUtils.buildVimPlugin {
+  pname = "vim2nix";
+  version = "1.0";
+  src = ./src;
+  dependencies = [ vimPlugins.vim-addon-manager ];
+}

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

@@ -16,11 +16,6 @@
   mkYarnModules,
   python3,
   # Misc dependencies
-  coc-clangd,
-  coc-css,
-  coc-diagnostic,
-  coc-pyright,
-  coc-toml,
   code-minimap,
   dasht,
   deno,
@@ -37,7 +32,6 @@
   meson,
   neovim-unwrapped,
   nim1,
-  nodePackages,
   nodejs,
   notmuch,
   openscad,
@@ -229,8 +223,6 @@ in
     ];
   };
 
-  avante-nvim = callPackage ./non-generated/avante-nvim { };
-
   aw-watcher-vim = super.aw-watcher-vim.overrideAttrs {
     patches = [
       (replaceVars ./patches/aw-watcher-vim/program_paths.patch {
@@ -285,21 +277,6 @@ in
     ];
   };
 
-  # The GitHub repository returns 404, which breaks the update script
-  bitbake-vim = buildVimPlugin {
-    pname = "bitbake.vim";
-    version = "2021-02-06";
-    src = fetchFromGitHub {
-      owner = "sblumentritt";
-      repo = "bitbake.vim";
-      rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
-      sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
-    };
-    meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
-  };
-
-  blink-cmp = callPackage ./non-generated/blink-cmp { };
-
   blink-cmp-copilot = super.blink-cmp-copilot.overrideAttrs {
     dependencies = [ self.copilot-lua ];
   };
@@ -320,8 +297,6 @@ in
     dependencies = [ self.blink-cmp ];
   };
 
-  blink-pairs = callPackage ./non-generated/blink-pairs { };
-
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
   };
@@ -378,8 +353,6 @@ in
     ];
   };
 
-  clangd_extensions-nvim = callPackage ./non-generated/clangd_extensions-nvim { };
-
   clang_complete = super.clang_complete.overrideAttrs {
     # In addition to the arguments you pass to your compiler, you also need to
     # specify the path of the C++ std header (if you are using C++).
@@ -431,8 +404,6 @@ in
     ];
   };
 
-  cmp-async-path = callPackage ./non-generated/cmp-async-path { };
-
   cmp-beancount = super.cmp-beancount.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
@@ -622,39 +593,6 @@ in
     ];
   };
 
-  coc-clangd = buildVimPlugin {
-    inherit (coc-clangd) pname version meta;
-    src = "${coc-clangd}/lib/node_modules/coc-clangd";
-  };
-
-  coc-css = buildVimPlugin {
-    inherit (coc-css) pname version meta;
-    src = "${coc-css}/lib/node_modules/coc-css";
-  };
-
-  coc-diagnostic = buildVimPlugin {
-    inherit (coc-diagnostic) pname version meta;
-    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
-  };
-
-  coc-pyright = buildVimPlugin {
-    pname = "coc-pyright";
-    inherit (coc-pyright) version meta;
-    src = "${coc-pyright}/lib/node_modules/coc-pyright";
-  };
-
-  coc-nginx = buildVimPlugin {
-    pname = "coc-nginx";
-    inherit (nodePackages."@yaegassy/coc-nginx") version meta;
-    src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx";
-  };
-
-  coc-toml = buildVimPlugin {
-    pname = "coc-toml";
-    inherit (coc-toml) version meta;
-    src = "${coc-toml}/lib/node_modules/coc-toml";
-  };
-
   codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModule = [
@@ -753,8 +691,6 @@ in
       '';
     };
 
-  codesnap-nvim = callPackage ./non-generated/codesnap-nvim { };
-
   codewindow-nvim = super.codewindow-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
   };
@@ -880,8 +816,6 @@ in
     ];
   };
 
-  cord-nvim = callPackage ./non-generated/cord-nvim { };
-
   cornelis = super.cornelis.overrideAttrs {
     dependencies = [ self.vim-textobj-user ];
     opt = [ self.vim-which-key ];
@@ -1293,17 +1227,10 @@ in
     configurePhase = "cd plugins/nvim";
   };
 
-  gitlab-vim = callPackage ./non-generated/gitlab-vim { };
-
   gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
 
-  # NOTE: this overrides a luaPackages-based plugin
-  gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
-    dependencies = [ self.plenary-nvim ];
-  };
-
   git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
     # TODO: Remove after next fixed version
     # https://github.com/akinsho/git-conflict.nvim/issues/103
@@ -1377,8 +1304,6 @@ in
     ];
   };
 
-  hare-vim = callPackage ./non-generated/hare-vim { };
-
   harpoon = super.harpoon.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1452,24 +1377,6 @@ in
     doInstallCheck = true;
   };
 
-  # NOTE: this overrides a luaPackages-based plugin
-  image-nvim = super.image-nvim.overrideAttrs {
-    dependencies = with self; [
-      nvim-treesitter
-      nvim-treesitter-parsers.markdown_inline
-      nvim-treesitter-parsers.norg
-    ];
-
-    # Add magick to package.path
-    patches = [ ./patches/image-nvim/magick.patch ];
-
-    postPatch = ''
-      substituteInPlace lua/image/magick.lua \
-        --replace-fail @nix_magick@ ${luajitPackages.magick}
-    '';
-
-  };
-
   indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
     # Meta file
     nvimSkipModule = "ibl.config.types";
@@ -1525,8 +1432,6 @@ in
     '';
   };
 
-  LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { };
-
   LazyVim = super.LazyVim.overrideAttrs {
     # Any other dependency is optional
     dependencies = [ self.lazy-nvim ];
@@ -1712,8 +1617,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
-
   ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs {
     # Other modules require setup call first
     nvimRequireCheck = "ltex_extra";
@@ -1723,11 +1626,6 @@ in
     dependencies = [ self.lualine-nvim ];
   };
 
-  # NOTE: this overrides a luaPackages-based plugin
-  luasnip = super.luasnip.overrideAttrs {
-    dependencies = [ luaPackages.jsregexp ];
-  };
-
   luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs {
     dependencies = [ self.luasnip ];
     # E5108: /luasnip-latex-snippets/luasnippets/tex/utils/init.lua:3: module 'luasnip-latex-snippets.luasnippets.utils.conditions' not found:
@@ -1761,7 +1659,7 @@ in
       # We only need its dependencies `node-modules`.
       nodeDep = mkYarnModules rec {
         inherit (super.markdown-preview-nvim) pname version;
-        packageJSON = ./markdown-preview-nvim/package.json;
+        packageJSON = ./patches/markdown-preview-nvim/package.json;
         yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock";
         offlineCache = fetchYarnDeps {
           inherit yarnLock;
@@ -1771,7 +1669,7 @@ in
     in
     super.markdown-preview-nvim.overrideAttrs {
       patches = [
-        (replaceVars ./markdown-preview-nvim/fix-node-paths.patch {
+        (replaceVars ./patches/markdown-preview-nvim/fix-node-paths.patch {
           node = "${nodejs}/bin/node";
         })
       ];
@@ -1903,8 +1801,6 @@ in
     ];
   };
 
-  moveline-nvim = callPackage ./non-generated/moveline-nvim { };
-
   multicursors-nvim = super.multicursors-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
@@ -1978,14 +1874,6 @@ in
     ];
   };
 
-  # NOTE: this overrides a luaPackages-based plugin
-  neotest = super.neotest.overrideAttrs {
-    dependencies = with self; [
-      nvim-nio
-      plenary-nvim
-    ];
-  };
-
   neotest-bash = super.neotest-bash.overrideAttrs {
     dependencies = with self; [
       neotest
@@ -2364,8 +2252,6 @@ in
     dependencies = [ self.nvim-dap ];
   };
 
-  nvim-dbee = callPackage ./non-generated/nvim-dbee { };
-
   nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
   };
@@ -2430,8 +2316,6 @@ in
     dependencies = [ self.nvim-java-core ];
   };
 
-  nvim-julia-autotest = callPackage ./non-generated/nvim-julia-autotest { };
-
   nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -2506,8 +2390,6 @@ in
     nvimSkipModule = "snippets.utils.cmp";
   };
 
-  nvim-spectre = callPackage ./non-generated/nvim-spectre { };
-
   nvim-surround = super.nvim-surround.overrideAttrs {
     # Optional treesitter integration
     nvimSkipModule = "nvim-surround.queries";
@@ -2773,11 +2655,6 @@ in
     ];
   };
 
-  plenary-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.plenary-nvim;
-    runtimeDeps = [ curl ];
-  };
-
   poimandres-nvim = super.poimandres-nvim.overrideAttrs {
     # Optional treesitter support
     nvimSkipModule = "poimandres.highlights";
@@ -2828,8 +2705,6 @@ in
   quicker-nvim = super.quicker-nvim.overrideAttrs {
   };
 
-  rainbow-delimiters-nvim = callPackage ./non-generated/rainbow-delimiters-nvim { };
-
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = [ self.cmd-parser-nvim ];
   };
@@ -2877,18 +2752,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  # needs  "http" and "json" treesitter grammars too
-  # NOTE: this overrides a luaPackages-based plugin
-  rest-nvim = super.rest-nvim.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-      (nvim-treesitter.withPlugins (p: [
-        p.http
-        p.json
-      ]))
-    ];
-  };
-
   rocks-nvim =
     (neovimUtils.buildNeovimPlugin {
       luaAttr = luaPackages.rocks-nvim;
@@ -2931,8 +2794,6 @@ in
     dependencies = [ self.nui-nvim ];
   };
 
-  sg-nvim = callPackage ./non-generated/sg-nvim { };
-
   skim = buildVimPlugin {
     pname = "skim";
     inherit (skim) version;
@@ -3009,21 +2870,6 @@ in
     ];
   };
 
-  sniprun = callPackage ./non-generated/sniprun { };
-
-  # The GitHub repository returns 404, which breaks the update script
-  Spacegray-vim = buildVimPlugin {
-    pname = "Spacegray.vim";
-    version = "2021-07-06";
-    src = fetchFromGitHub {
-      owner = "ackyshake";
-      repo = "Spacegray.vim";
-      rev = "c699ca10ed421c462bd1c87a158faaa570dc8e28";
-      sha256 = "0ma8w6p5jh6llka49x5j5ql8fmhv0bx5hhsn5b2phak79yqg1k61";
-    };
-    meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
-  };
-
   spaceman-nvim = super.spaceman-nvim.overrideAttrs {
     # Optional telescope integration
     nvimSkipModule = "spaceman.adapters.telescope";
@@ -3281,11 +3127,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  # NOTE: this overrides a luaPackages-based plugin
-  telescope-nvim = super.telescope-nvim.overrideAttrs {
-    dependencies = [ self.plenary-nvim ];
-  };
-
   telescope-smart-history-nvim = super.telescope-smart-history-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
@@ -3507,26 +3348,6 @@ in
     ];
   };
 
-  # The GitHub repository returns 404, which breaks the update script
-  VimCompletesMe = buildVimPlugin {
-    pname = "VimCompletesMe";
-    version = "2022-02-18";
-    src = fetchFromGitHub {
-      owner = "ackyshake";
-      repo = "VimCompletesMe";
-      rev = "9adf692d7ae6424038458a89d4a411f0a27d1388";
-      sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0";
-    };
-    meta.homepage = "https://github.com/ackyshake/VimCompletesMe/";
-  };
-
-  vim2nix = buildVimPlugin {
-    pname = "vim2nix";
-    version = "1.0";
-    src = ./vim2nix;
-    dependencies = [ self.vim-addon-manager ];
-  };
-
   vimsence = super.vimsence.overrideAttrs {
     meta = with lib; {
       description = "Discord rich presence for Vim";
@@ -3643,8 +3464,6 @@ in
     passthru.python3Dependencies = ps: with ps; [ beancount ];
   };
 
-  vim-clap = callPackage ./non-generated/vim-clap { };
-
   vim-codefmt = super.vim-codefmt.overrideAttrs {
     dependencies = [ self.vim-maktaba ];
   };
@@ -3775,8 +3594,6 @@ in
     '';
   };
 
-  vim-markdown-composer = callPackage ./non-generated/vim-markdown-composer { };
-
   vim-matchup = super.vim-matchup.overrideAttrs {
     # Optional treesitter integration
     nvimSkipModule = "treesitter-matchup.third-party.query";
@@ -3794,19 +3611,6 @@ in
     dependencies = [ self.denops-vim ];
   };
 
-  # The GitHub repository returns 404, which breaks the update script
-  vim-pony = buildVimPlugin {
-    pname = "vim-pony";
-    version = "2018-07-27";
-    src = fetchFromGitHub {
-      owner = "jakwings";
-      repo = "vim-pony";
-      rev = "b26f01a869000b73b80dceabd725d91bfe175b75";
-      sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8";
-    };
-    meta.homepage = "https://github.com/jakwings/vim-pony/";
-  };
-
   vim-sensible = super.vim-sensible.overrideAttrs {
     patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ];
   };
@@ -3822,8 +3626,6 @@ in
     dependencies = [ self.vim-repeat ];
   };
 
-  vim-stationeers-ic10-syntax = callPackage ./non-generated/vim-stationeers-ic10-syntax { };
-
   vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
     postPatch =
       old.postPatch or ""

pkgs/applications/editors/vim/plugins/utils/update.py

@@ -40,7 +40,7 @@ treesitter = importlib.import_module("nvim-treesitter.update")
 
 
 HEADER = (
-    "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
+    "# GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!"
 )
 
 NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter"

pkgs/applications/editors/vim/plugins/utils/updater.nix

@@ -42,7 +42,7 @@ buildPythonApplication {
         neovim-unwrapped
         nurl
       ]
-    }" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts/pluginupdate-py}" )
+    }" --prefix PYTHONPATH : "${./.}:${../../../../../../maintainers/scripts/pluginupdate-py}" )
     wrapPythonPrograms
   '';
 

pkgs/applications/editors/vim/plugins/utils/vim-utils.nix

@@ -423,7 +423,7 @@ rec {
         vimBinary = "${vim}/bin/vim";
         inherit rtpPath;
       };
-    } ./vim-gen-doc-hook.sh
+    } ../hooks/vim-gen-doc-hook.sh
   ) { };
 
   vimCommandCheckHook = callPackage (
@@ -435,7 +435,7 @@ rec {
         vimBinary = "${neovim-unwrapped}/bin/nvim";
         inherit rtpPath;
       };
-    } ./vim-command-check-hook.sh
+    } ../hooks/vim-command-check-hook.sh
   ) { };
 
   neovimRequireCheckHook = callPackage (
@@ -447,7 +447,7 @@ rec {
         nvimBinary = "${neovim-unwrapped}/bin/nvim";
         inherit rtpPath;
       };
-    } ./neovim-require-check-hook.sh
+    } ../hooks/neovim-require-check-hook.sh
   ) { };
 
   inherit

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -34,6 +34,7 @@ https://github.com/tmhedberg/SimpylFold/,,
 https://github.com/vim-scripts/SmartCase/,,
 https://github.com/jaredgorski/SpaceCamp/,,
 https://github.com/chrisbra/SudoEdit.vim/,,
+https://github.com/vim-scripts/VimCompletesMe/,HEAD,
 https://github.com/hsitz/VimOrganizer/,,
 https://github.com/VundleVim/Vundle.vim/,,
 https://github.com/esneider/YUNOcommit.vim/,,
@@ -1439,6 +1440,7 @@ https://github.com/junegunn/vim-plug/,,
 https://github.com/powerman/vim-plugin-AnsiEsc/,,
 https://github.com/hasundue/vim-pluto/,HEAD,
 https://github.com/sheerun/vim-polyglot/,,
+https://github.com/jmcomets/vim-pony/,HEAD,
 https://github.com/haya14busa/vim-poweryank/,,
 https://github.com/prettier/vim-prettier/,,
 https://github.com/thinca/vim-prettyprint/,,

pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix

@@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2024.15.2024091301";
-    hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ=";
+    version = "2025.3.2025031001";
+    hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U=";
   };
 
   buildInputs = [ icu ];

pkgs/applications/networking/cluster/k3s/1_31/versions.nix

@@ -9,7 +9,7 @@
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "1.7.23-k3s2";
-  containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm";
+  containerdVersion = "2.0.2-k3s2";
+  containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s";
   criCtlVersion = "1.31.0-k3s2";
 }

pkgs/applications/networking/cluster/k3s/1_32/versions.nix

@@ -9,7 +9,7 @@
   k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
   k3sCNIVersion = "1.6.0-k3s1";
   k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
-  containerdVersion = "1.7.23-k3s2";
-  containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm";
+  containerdVersion = "2.0.2-k3s2";
+  containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s";
   criCtlVersion = "1.31.0-k3s2";
 }

pkgs/applications/networking/cluster/k3s/update-script.sh

@@ -11,10 +11,6 @@ trap "rm -rf ${WORKDIR}" EXIT
 NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
 NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
 OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s_1_${MINOR_VERSION}.version or (builtins.parseDrvName k3s_1_${MINOR_VERSION}.name).version" | tr -d '"')"
-cd ${NIXPKGS_K3S_PATH}
-
-cd 1_${MINOR_VERSION}
-
 
 LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
 curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
@@ -31,18 +27,24 @@ K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
     https://api.github.com/repos/k3s-io/k3s/git/refs/tags \
     | jq -r "map(select(.ref == \"refs/tags/${LATEST_TAG_NAME}\")) | .[0] | .object.sha")
 
-K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)
+PREFETCH_META=$(nix-prefetch-url --unpack --print-path https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)
+K3S_STORE_PATH=${PREFETCH_META#*$'\n'}
+K3S_REPO_SHA256=${PREFETCH_META%$'\n'*}
 
-FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
-curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD
+cd "$K3S_STORE_PATH"
+# Set the DRONE variables as they are expected to be set in version.sh
+DRONE_TAG="$LATEST_TAG_NAME"
+DRONE_COMMIT="$K3S_COMMIT"
+source "${K3S_STORE_PATH}/scripts/version.sh"
 
-FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
-curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
+K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
+    "https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-amd64.tar")
+CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
+    "https://github.com/rancher/plugins/archive/refs/tags/${VERSION_CNIPLUGINS}.tar.gz")
+CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \
+    "https://github.com/k3s-io/containerd/archive/refs/tags/${VERSION_CONTAINERD}.tar.gz")
 
-FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml
-curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml
-
-CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) )
+CHART_FILES=( $(yq eval --no-doc .spec.chart "${K3S_STORE_PATH}/manifests/traefik.yaml" | xargs -n1 basename) )
 # These files are:
 #   1. traefik-crd-20.3.1+up20.3.0.tgz
 #   2. traefik-20.3.1+up20.3.0.tgz
@@ -53,6 +55,8 @@ if [[ "${#CHART_FILES[@]}" != "2" ]]; then
     exit 1
 fi
 
+cd "${NIXPKGS_K3S_PATH}/1_${MINOR_VERSION}"
+
 CHARTS_URL=https://k3s.io/k3s-charts/assets
 # Get metadata for both files
 rm -f chart-versions.nix.update
@@ -95,39 +99,6 @@ while read -r name url; do
         '{$name: {"url": $url, "sha256": $sha256}}'
 done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json
 
-FILE_GO_MOD=${WORKDIR}/go.mod
-curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD
-
-
-K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \
-    | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//')
-K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
-    "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
-
-CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \
-    | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//')
-CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
-    "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
-
-# mimics https://github.com/k3s-io/k3s/blob/v1.26.5%2Bk3s1/scripts/version.sh#L25
-CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \
-    | head -n1 | awk '{print $4}' | sed -e 's/^v//')
-CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \
-    "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz")
-
-# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases
-if [ "$MINOR_VERSION" -gt 30 ]; then
-    CRI_CTL_REPO=sigs.k8s.io
-else
-    CRI_CTL_REPO=github.com/kubernetes-sigs
-fi
-CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \
-    | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
-
-setKV () {
-    sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix
-}
-
 FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
 cat >versions.nix <<EOF
@@ -138,13 +109,13 @@ cat >versions.nix <<EOF
   k3sVendorHash = "${FAKE_HASH}";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
-  k3sRootVersion = "${K3S_ROOT_VERSION}";
+  k3sRootVersion = "${VERSION_ROOT:1}";
   k3sRootSha256 = "${K3S_ROOT_SHA256}";
-  k3sCNIVersion = "${CNIPLUGINS_VERSION}";
+  k3sCNIVersion = "${VERSION_CNIPLUGINS:1}";
   k3sCNISha256 = "${CNIPLUGINS_SHA256}";
-  containerdVersion = "${CONTAINERD_VERSION}";
+  containerdVersion = "${VERSION_CONTAINERD:1}";
   containerdSha256 = "${CONTAINERD_SHA256}";
-  criCtlVersion = "${CRI_CTL_VERSION}";
+  criCtlVersion = "${VERSION_CRICTL:1}";
 }
 EOF
 

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

@@ -9,54 +9,54 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.88";
-        ptb = "0.0.134";
-        canary = "0.0.608";
-        development = "0.0.71";
+        stable = "0.0.89";
+        ptb = "0.0.135";
+        canary = "0.0.619";
+        development = "0.0.73";
       }
     else
       {
-        stable = "0.0.341";
-        ptb = "0.0.165";
-        canary = "0.0.717";
-        development = "0.0.82";
+        stable = "0.0.342";
+        ptb = "0.0.166";
+        canary = "0.0.727";
+        development = "0.0.84";
       };
   version = versions.${branch};
   srcs = rec {
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-lkphzS5Q7UH20rKJ4SfxyyqEGgoLlfO/hcGmoWWLcYY=";
+        hash = "sha256-74M2SAJLS8u37m2bEo/Yblq822EbWWZfpLf5emvTusE=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-KkyFFxg7yuvaj/V7r0ePB2mNz+GNqeoUVvjb9v2/PQY=";
+        hash = "sha256-tzStiIAP83+ns5ZJr2DCtgLhoPf49RBnZtx6+unXndk=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-Nh5CZyLo5Pf5PKV8LDeGH7KZuzQtQbdeKuVEJJqfTdA=";
+        hash = "sha256-2Jm0SjFMNw9Vlda9d2xywZlevxpay8DNx0krBr1sb4A=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-lxtkapeYRtKyp60YJC6lCvK0P8MSOlYRmQLR+hLuwws=";
+        hash = "sha256-zd8KpyBTdj+7jb1kRY99a48thdCRq3RNSC8oWKAQJXg=";
       };
     };
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-FXyF7uWwnNXPe5Qn2WZBXCr392RmHZR3Q2aQTojQ29o=";
+        hash = "sha256-4Z/Up7KRRTaWEMUjVPi/CXbdeoEka72ZG6r3AeVmVjg=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-M7ApSHRMZ8rzTHVZM32REPRTyaxUmbZfr9pj1uDlS9Y=";
+        hash = "sha256-/VvTAAeSS/hzdaLt9Fjj+g3lqRVwJ08nM6fJdP77L9c=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-k3iviK146CcitDIKm2huUgGkJy/Qki4z5/VW3EPuaxE=";
+        hash = "sha256-RRQyXgAKTkOweMM6FE9exRXZWiT13dFh8VioGp2z1KQ=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-3fPaqm9Tfr3t/96T9EX1oKCfVOw18DIiLWqBIiuSNIg=";
+        hash = "sha256-8qgWvcfWTL1FXSy5CeihpMxS3Ysa79ZFAlG1rAcoyUo=";
       };
     };
     aarch64-darwin = x86_64-darwin;

pkgs/applications/virtualization/docker/compose.nix

@@ -13,7 +13,7 @@ buildGoModule rec {
 
   postPatch = ''
     # entirely separate package that breaks the build
-    rm -rf e2e/
+    rm -rf pkg/e2e/
   '';
 
   vendorHash = "sha256-ISX+PpjapST9d/rFP0SPlFYyPb5NcwwQT6mhb1H1qEE=";

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix

@@ -9,13 +9,13 @@
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprscroller";
-  version = "0-unstable-2025-03-07";
+  version = "0-unstable-2025-03-24";
 
   src = fetchFromGitHub {
     owner = "dawsers";
     repo = "hyprscroller";
-    rev = "fb3b2ec63c85f22a107bd635890fcb1afc30b01f";
-    hash = "sha256-FErWOeUmyFWPNjE+EYWVvVwXGO7+4lVqZBwiapXa6Yw=";
+    rev = "5b62ca58790f8c2961da79af95efa458f6a814fe";
+    hash = "sha256-monOoefLpK2cUAPBlJlVt9BkoSELQmYVysj81zJ74i0=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/al/alpaca/package.nix

@@ -20,14 +20,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "5.0.6";
+  version = "5.2.0";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-iBce9ROWajUBq3GX/IU7yMoWTFNw98HnaE0kp+t73G0=";
+    hash = "sha256-uUGsdHrqzA5fZ4LNtX04H4ue9n4JQrkTYW2PCCFYFHc=";
   };
 
   nativeBuildInputs = [

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

@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchpatch,
   replaceVars,
   gobject-introspection,
   wrapGAppsHook3,
@@ -57,6 +58,13 @@ python3Packages.buildPythonPackage rec {
     ./prevent-install-and-copy.patch
     # patch to prevent update
     ./prevent-update.patch
+
+    # ps-util python package bounds are too strict for version 2.5.0
+    (fetchpatch {
+      name = "auto-cpufreq-2.5.0-ps-util-relax-constraints.patch";
+      url = "https://github.com/AdnanHodzic/auto-cpufreq/commit/8f026ac6497050c0e07c55b751c4b80401e932ec.patch";
+      sha256 = "sha256-hcEcuy7oW4fZgfOLSap3pnWk7H1Q757tgfl7HIUyWiM=";
+    })
   ];
 
   postPatch = ''

pkgs/by-name/av/avbroot/package.nix

@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "avbroot";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "chenxiaolong";
     repo = "avbroot";
     tag = "v${version}";
-    hash = "sha256-ncgi/oQAvvNRX8Vf4RKlro6hV+uCCsdBdjdjVyVvTUg=";
+    hash = "sha256-d0sYOTM9o100XJ+5WzjSGM41Ax+l6LHlM0/Lbwz8gVc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-E4CcgUfuttKClqvofOvI2QJVzhsYrAw1yK0VR1miDVk=";
+  cargoHash = "sha256-LrjzDser5J7fIfviAGxeCmaoeu4XV/aG54ptiVI3Mn4=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/bl/bluespec/package.nix

@@ -22,11 +22,23 @@
   asciidoctor,
   texliveFull,
   which,
+  makeWrapper,
+  cctools,
+  targetPackages,
   # install -m 644 lib/libstp.dylib /private/tmp/nix-build-bluespec-2024.07.drv-5/source/inst/lib/SAT
   # install: cannot stat 'lib/libstp.dylib': No such file or directory
   # https://github.com/B-Lang-org/bsc/pull/600 might fix it
   stubStp ? !stdenv.hostPlatform.isDarwin,
   withDocs ? true,
+  # With 23 core parallel 10 mins on r9 5900x
+  # Broken on darwin currently
+  withSuiteCheck ? false,
+  gnugrep,
+  time,
+  dejagnu,
+  systemc,
+  glibcLocales,
+  buildPackages,
 }:
 
 let
@@ -76,22 +88,56 @@ stdenv.mkDerivation rec {
     chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2
   '';
 
+  postPatch =
+    ''
+      patchShebangs \
+        src/vendor/stp/src/AST/genkinds.pl \
+        src/Verilog/copy_module.pl \
+        src/comp/update-build-version.sh \
+        src/comp/update-build-system.sh \
+        src/comp/wrapper.sh
+
+      substituteInPlace src/comp/Makefile \
+        --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'
+
+      # For darwin
+      # ld: library not found for -ltcl8.5
+      substituteInPlace ./platform.sh \
+        --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`'
+    ''
+    + lib.optionalString withSuiteCheck ''
+      substituteInPlace testsuite/bsc.options/verilog-e/verilog-e.exp \
+        --replace-fail "/bin/echo" "${lib.getExe' buildPackages.coreutils "echo"}"
+
+      substituteInPlace testsuite/test_list.sh testsuite/findfailures.csh \
+        --replace-fail "bin/csh" "${lib.getExe buildPackages.tcsh}"
+
+      patchShebangs \
+        testsuite/test_list.sh \
+        testsuite/findfailures.csh \
+        scripts/tool-find.sh \
+        testsuite/bsc.bluetcl/packages/expandPorts/compareOutput.pl \
+        testsuite/bsc.bsv_examples/AES/funcit.pl \
+        testsuite/bsc.bsv_examples/AES/makeVecs.pl \
+        testsuite/bsc.bsv_examples/AES/makeVecs192.pl \
+        testsuite/bsc.bsv_examples/AES/makeVecs256.pl \
+        testsuite/bsc.if/split/canonicalize.pl \
+        testsuite/bsc.interra/operators/Arith/generate/gen.pl \
+        testsuite/bsc.interra/operators/Arith/generate/sort.pl \
+        testsuite/bsc.interra/operators/BitSel/generate/gen.pl \
+        testsuite/bsc.interra/operators/BitSel/generate/sort.pl \
+        testsuite/bsc.interra/operators/Logic/generate/gen.pl \
+        testsuite/bsc.interra/operators/Logic/generate/sort.pl \
+        testsuite/bsc.preprocessor/ifdef/iftestcase-perl.pl \
+        testsuite/bsc.verilog/filter/basicinout.pl \
+        testsuite/scripts/collapse.pl \
+        testsuite/scripts/double-directory.pl \
+        testsuite/scripts/process-summary-file.pl \
+        testsuite/scripts/sort-by-time.pl \
+        testsuite/scripts/times-by-directory.pl
+    '';
+
   preBuild = ''
-    patchShebangs \
-      src/vendor/stp/src/AST/genkinds.pl \
-      src/Verilog/copy_module.pl \
-      src/comp/update-build-version.sh \
-      src/comp/update-build-system.sh \
-      src/comp/wrapper.sh
-
-    substituteInPlace src/comp/Makefile \
-      --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'
-
-    # For darwin
-    # ld: library not found for -ltcl8.5
-    substituteInPlace ./platform.sh \
-      --replace-fail 'TCLSH=/usr/bin/tclsh' 'TCLSH=`which tclsh`'
-
     # allow running bsc to bootstrap
     export LD_LIBRARY_PATH=$PWD/inst/lib/SAT
 
@@ -110,18 +156,26 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  nativeBuildInputs = [
-    automake
-    autoconf
-    asciidoctor
-    bison
-    flex
-    ghcWithPackages
-    perl
-    pkg-config
-    texliveFull
-    tcl
-  ];
+  nativeBuildInputs =
+    [
+      automake
+      autoconf
+      asciidoctor
+      bison
+      flex
+      ghcWithPackages
+      perl
+      pkg-config
+      texliveFull
+      tcl
+      makeWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
+      # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u'
+      # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1
+      cctools
+    ];
 
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals (stdenv.cc.isClang) [
@@ -141,17 +195,6 @@ stdenv.mkDerivation rec {
       "STP_STUB=1" # uses yices as a SMT solver and stub out STP
     ];
 
-  doCheck = true;
-
-  nativeCheckInputs = [
-    gmp-static
-    iverilog
-  ];
-
-  # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u'
-  # make[1]: *** [Makefile:97: smoke_test_bluesim] Error 1
-  checkTarget = lib.optionalString (!stdenv.hostPlatform.isDarwin) "check-smoke"; # this is the shortest check but "check-suite" tests much more
-
   installPhase =
     ''
       mkdir -p $out
@@ -167,6 +210,72 @@ stdenv.mkDerivation rec {
       mv inst/doc/*.pdf $doc/share/doc/bsc
     '';
 
+  postFixup = ''
+    # https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839
+    wrapProgram $out/bin/bsc --prefix PATH : ${
+      lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ])
+    }
+  '';
+
+  doCheck = true;
+
+  # TODO To fix check-suite:
+  # On darwin
+  # ```
+  # FAIL: `Cpreprocess_line.bsv.bsc-out' differs from `Cpreprocess_line.bsv.bsc-out.expected'
+
+  # FAIL: `sysGCD.bsc-vcomp-out.filtered' differs from `empty.expected'
+
+  # FAIL: module `' in `ImpArgConnect3.bsv' should compile to Verilog
+  # Caught error in sed: sed: can't read mkArgImpConnect3.v: No such file or directory
+  # FAIL: `mkArgImpConnect3.v.filtered' differs from `mkArgImpConnect3.v.expected.filtered'
+  # ```
+
+  checkTarget = if withSuiteCheck then "checkparallel" else "check-smoke"; # this is the shortest check but "check-suite" tests much more
+
+  # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+  LOCALE_ARCHIVE = lib.optionalString (
+    withSuiteCheck && stdenv.hostPlatform.isLinux
+  ) "${glibcLocales}/lib/locale/locale-archive";
+
+  nativeCheckInputs =
+    [
+      gmp-static
+      iverilog
+    ]
+    ++ lib.optionals withSuiteCheck [
+      time
+      dejagnu # for `/bin/runtest` in `check-suite`
+      gnugrep # `testsuite/bsc.interra/operators/Arith/arith.exp` and more
+    ];
+
+  checkInputs = lib.optionals withSuiteCheck [
+    systemc
+  ];
+
+  checkPhase = lib.optionalString withSuiteCheck ''
+    (
+      cd testsuite
+      set +e # disable exit on error
+      make -j $NIX_BUILD_CORES $checkTarget
+      test_exit_code=$?
+      set -e
+      failures=$(./findfailures.csh)
+      echo "$failures"
+      for failure in $failures; do
+        logpath="''${failure/%sum/log}"
+        echo "\nFAILURE LOG: $logpath"
+        cat "$logpath"
+        echo "END LOG: $logpath"
+      done
+
+      if [[ "$test_exit_code" != "0" || -n "$failures" ]]; then
+        echo "Some tests failed or the makefile failed to run"
+        exit 1
+      fi
+    )
+  '';
+
   meta = {
     description = "Toolchain for the Bluespec Hardware Definition Language";
     homepage = "https://github.com/B-Lang-org/bsc";

pkgs/by-name/ca/catppuccin-sddm-corners/package.nix

@@ -2,38 +2,32 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  libsForQt5,
-  unstableGitUpdater,
+  nix-update-script,
+  qt6,
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-sddm-corners";
-  version = "0-unstable-2024-05-07";
+  version = "0-unstable-2025-03-25";
 
   src = fetchFromGitHub {
     owner = "khaneliman";
     repo = "catppuccin-sddm-corners";
-    rev = "aca5af5ce0c9dff56e947938697dec40ea101e3e";
-    hash = "sha256-xtcNcjNQSG7SwlNw/EkAU93wFaku+cE1/r6c8c4FrBg=";
+    rev = "10831dea7298bd1c3262a7f48417b5af1b92ed99";
+    hash = "sha256-nQImL5eDMENNDCXEqgrL2eszWXtBpbVlzjMxNdpxZlQ=";
   };
 
   dontConfigure = true;
   dontBuild = true;
   dontWrapQtApps = true;
 
-  propagatedBuildInputs = with libsForQt5.qt5; [
-    qtgraphicaleffects
-    qtquickcontrols2
+  propagatedUserEnvPkgs = with qt6; [
+    qt5compat
+    qtwayland
+    qtquick3d
     qtsvg
   ];
 
-  postFixup = ''
-    mkdir -p $out/nix-support
-    echo ${libsForQt5.qt5.qtgraphicaleffects}  >> $out/nix-support/propagated-user-env-packages
-    echo ${libsForQt5.qt5.qtquickcontrols2}  >> $out/nix-support/propagated-user-env-packages
-    echo ${libsForQt5.qt5.qtsvg}  >> $out/nix-support/propagated-user-env-packages
-  '';
-
   installPhase = ''
     runHook preInstall
 
@@ -43,7 +37,7 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Soothing pastel theme for SDDM based on corners theme";

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

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

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

@@ -23,10 +23,10 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-7GJMEL6rERjLTBUbSNqBIMB+92dEbeWUIApcbYYRNgE=";
-      aarch64-linux = "sha256-ArsDoj3G4/oBSv152wa46URWZhCaQgk5gSgVeSjPtZg=";
-      x86_64-darwin = "sha256-7yrW8+bpY/Suo1xeUNcwzLctjdn4yJrmLOETdV6f2lY=";
-      aarch64-darwin = "sha256-0c5wvo+4+UMEDPL6hSw9w120DU+Du53S8NHJWkrcyKc=";
+      x86_64-linux = "sha256-xczcogpRXdFX34uAjbERWf9lj3uxLKpPlceyZ7KgTz0=";
+      aarch64-linux = "sha256-8Ju1qUGc68xxj7ikoAQzic5tdnnemhIo/UU2G55npeE=";
+      x86_64-darwin = "sha256-pJZxykfeQaaNFrP3x1Hj2huWngOQc3F4KjtGV8Rae8s=";
+      aarch64-darwin = "sha256-jEMgFbOy65wCLxcA961u3jFwav+KVSrpDYcvt/4Ea8A=";
     }
     .${system} or throwSystem;
 
@@ -35,7 +35,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "codeium";
-  version = "1.40.1";
+  version = "1.42.3";
   src = fetchurl {
     name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
     url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

pkgs/by-name/cp/cpu-x/package.nix

@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpu-x";
-  version = "5.1.2";
+  version = "5.1.3";
 
   src = fetchFromGitHub {
     owner = "X0rg";
     repo = "CPU-X";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c0bReW8rSTEEcvotBy9h8SXq0p+Xq1YhXGVYLBvP8VE=";
+    hash = "sha256-gD5sEeALbGwMBP2UDc28TnVBlbCRMIeqWkrq0oi97Nw=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/dd/ddnet/package.nix

@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/metainfo
   '';
 
-  preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && buildClient) ''
     # Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet
     install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet"
   '';
@@ -137,6 +137,6 @@ stdenv.mkDerivation rec {
       Scrumplex
       sirseruju
     ];
-    mainProgram = "DDNet";
+    mainProgram = "DDNet${lib.optionalString (!buildClient) "-Server"}";
   };
 }

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

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "distribution";
-  version = "3.0.0-rc.3";
+  version = "3.0.0-rc.4";
 
   src = fetchFromGitHub {
     owner = "distribution";
     repo = "distribution";
     tag = "v${version}";
-    hash = "sha256-GcgEYYBljhRyKiEex6FL4FScg+v0k7Qe7Tq6IsgXVhM=";
+    hash = "sha256-aDvcwsA1J1S7haNGvb2PikN51PpDqM93NJQKRH/acwM=";
   };
 
   vendorHash = null;

pkgs/by-name/fo/forgejo/package.nix

@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "10.0.2";
-  hash = "sha256-UxjhJA6o1LS/7/s0BzcaTSkXSsnKfjIMIjL6ASSot6k=";
+  version = "10.0.3";
+  hash = "sha256-bt1lgp6UiZeiZiIN3vZZbUygHVX1lEE5uOkPXrjk68o=";
   npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw=";
-  vendorHash = "sha256-ceV73QmxYEthjsA50ylojwC4dcTYAbE2UgxuxFqvi24=";
+  vendorHash = "sha256-b3+zxsKRylgfdW0Yiz0QryObMKdtiMCt0hB3DtAGFrQ=";
   lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"

pkgs/by-name/fw/fwupd/package.nix

@@ -84,17 +84,6 @@
 let
   isx86 = stdenv.hostPlatform.isx86;
 
-  # Dell isn't supported on Aarch64
-  haveDell = isx86;
-
-  # only redfish for x86_64
-  haveRedfish = stdenv.hostPlatform.isx86_64;
-
-  # only use msr if x86 (requires cpuid)
-  haveMSR = isx86;
-
-  # # Currently broken on Aarch64
-  # haveFlashrom = isx86;
   # Experimental
   haveFlashrom = isx86 && enableFlashrom;
 
@@ -141,7 +130,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.6";
+  version = "2.0.7";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -159,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-//y2kkCrj6E3kKxZIEK2bBUiZezB9j4xzR6WrBdcpqQ=";
+    hash = "sha256-Rus/GaLdoxC1vZskcZeKYE26ys7iBq6szgl2dh1UPsM=";
   };
 
   patches = [
@@ -262,7 +251,6 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.mesonEnable "docs" true)
       # We are building the official releases.
       (lib.mesonEnable "supported_build" true)
-      (lib.mesonEnable "launchd" false)
       (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
       (lib.mesonOption "installed_test_prefix" "${placeholder "installedTests"}")
       "--localstatedir=/var"
@@ -281,17 +269,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (!enablePassim) [
       (lib.mesonEnable "passim" false)
     ]
-    ++ lib.optionals (!haveDell) [
-      (lib.mesonEnable "plugin_synaptics_mst" false)
-    ]
-    ++ lib.optionals (!haveRedfish) [
-      (lib.mesonEnable "plugin_redfish" false)
-    ]
     ++ lib.optionals (!haveFlashrom) [
       (lib.mesonEnable "plugin_flashrom" false)
-    ]
-    ++ lib.optionals (!haveMSR) [
-      (lib.mesonEnable "plugin_msr" false)
     ];
 
   # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF