Merge master into staging-next

.github/PULL_REQUEST_TEMPLATE.md

@@ -38,10 +38,3 @@ For new packages please briefly describe the package or provide a link to its ho
 [nixos/tests]: https://github.com/NixOS/nixpkgs/blob/master/nixos/tests
 [pkgs/README.md]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md
 [pkgs/test]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/test
-
----
-
-Add a :+1: [reaction] to [pull requests you find important].
-
-[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
-[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

maintainers/README.md

@@ -145,18 +145,11 @@ When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the followi
 Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) when a group is collectively responsible for a collection of packages.
 Use taste and personal judgment when deciding if a team is warranted.
 
-Teams are allowed to define their own rules about membership.
+Teams should be organised around areas of maintenance interest and expertise, rather than employer or participation in another project or organization.
+For example, a team dedicated to maintaining support for a desktop environment or programming language in Nixpkgs makes sense, as does a team to maintain packaging of software from a given vendor, but a team exclusive to employees of a company or maintainers of another project does not.
 
-For example, some teams will represent a business or other group which wants to carefully track its members.
-Other teams may be very open about who can join, and allow anybody to participate.
-
-When reviewing changes to a team, read the team's scope and the context around the member list for indications about the team's membership policy.
-
-In any case, request reviews from the existing team members.
-If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond.
-
-> [!IMPORTANT]
-> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
+When reviewing changes to a team, request reviews from the existing team members.
+Feel free to merge changes to the team if the existing members are unresponsive.
 
 #### Synced GitHub teams
 

maintainers/maintainer-list.nix

@@ -6723,12 +6723,6 @@
     githubId = 392583;
     name = "Dirk-Willem van Gulik";
   };
-  disassembler = {
-    email = "disasm@gmail.com";
-    github = "disassembler";
-    githubId = 651205;
-    name = "Samuel Leathers";
-  };
   disserman = {
     email = "disserman@gmail.com";
     github = "divi255";
@@ -7188,12 +7182,6 @@
     name = "Louis Orleans";
     keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];
   };
-  dudymas = {
-    email = "jeremy.white@cloudposse.com";
-    github = "dudymas";
-    githubId = 928448;
-    name = "Jeremy White";
-  };
   dukc = {
     email = "ajieskola@gmail.com";
     github = "dukc";
@@ -7647,12 +7635,6 @@
     githubId = 161958668;
     name = "Élise Souche";
   };
-  elitak = {
-    email = "elitak@gmail.com";
-    github = "elitak";
-    githubId = 769073;
-    name = "Eric Litak";
-  };
   elizagamedev = {
     email = "eliza@eliza.sh";
     github = "elizagamedev";
@@ -11285,12 +11267,6 @@
     name = "Antoine Labarussias";
     keys = [ { fingerprint = "5CB5 9AA0 D180 1997 2FB3  E0EC 943A 1DE9 372E BE4E"; } ];
   };
-  invokes-su = {
-    email = "nixpkgs-commits@deshaw.com";
-    github = "invokes-su";
-    githubId = 88038050;
-    name = "Souvik Sen";
-  };
   io12 = {
     github = "io12";
     githubId = 7348004;
@@ -16051,13 +16027,6 @@
     githubId = 7802795;
     name = "Manoj Karthick";
   };
-  manveru = {
-    email = "m.fellinger@gmail.com";
-    matrix = "@manveru:matrix.org";
-    github = "manveru";
-    githubId = 3507;
-    name = "Michael Fellinger";
-  };
   maolonglong = {
     email = "shaolong.chen@outlook.it";
     github = "maolonglong";
@@ -19136,18 +19105,6 @@
     githubId = 3521180;
     name = "Tom Sydney Kerckhove";
   };
-  normalcea = {
-    name = "normalcea";
-    email = "normalc@posteo.net";
-    github = "normalcea";
-    githubId = 190049873;
-    keys = [
-      {
-        fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71";
-      }
-    ];
-    matrix = "@normalcea:matrix.org";
-  };
   norpol = {
     name = "Syd Lightyear";
     email = "norpol+nixpkgs@exaple.org";
@@ -23442,12 +23399,6 @@
     githubId = 30531572;
     name = "Robert James Hernandez";
   };
-  sargon = {
-    email = "danielehlers@mindeye.net";
-    github = "sargon";
-    githubId = 178904;
-    name = "Daniel Ehlers";
-  };
   sarunint = {
     email = "nixpkgs@sarunint.com";
     github = "sarunint";
@@ -27538,6 +27489,13 @@
     githubId = 27813;
     name = "Vincent Breitmoser";
   };
+  valpackett = {
+    email = "val@invisiblethingslab.com";
+    github = "valpackett";
+    githubId = 208340;
+    matrix = "@valpackett:mozilla.org";
+    name = "Val Packett";
+  };
   vamega = {
     email = "github@madiathv.com";
     github = "vamega";
@@ -27694,12 +27652,6 @@
     githubId = 116078858;
     keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754  4B05 0104 BC05 F41B 77B8"; } ];
   };
-  victormeriqui = {
-    name = "Victor Meriqui";
-    email = "victor.meriqui@ororatech.com";
-    github = "victormeriqui";
-    githubId = 1396008;
-  };
   videl = {
     email = "thibaut.smith@mailbox.org";
     github = "videl";
@@ -28375,12 +28327,6 @@
     githubId = 78392041;
     name = "Winter";
   };
-  wintrmvte = {
-    name = "Jakub Lutczyn";
-    email = "kubalutczyn@gmail.com";
-    github = "wintrmvte";
-    githubId = 41823252;
-  };
   wirew0rm = {
     email = "alex@wirew0rm.de";
     github = "wirew0rm";
@@ -28520,12 +28466,6 @@
     github = "wrrrzr";
     githubId = 161970349;
   };
-  wr0belj = {
-    name = "Jakub Wróbel";
-    email = "wrobel.jakub@protonmail.com";
-    github = "wr0belj";
-    githubId = 40501814;
-  };
   wr7 = {
     name = "wr7";
     email = "d-wr7@outlook.com";

maintainers/team-list.nix

@@ -141,13 +141,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  cloudposse = {
-    members = [ dudymas ];
-    scope = "Maintain atmos and applications made by the Cloud Posse team.";
-    shortName = "CloudPosse";
-    enableFeatureFreezePing = true;
-  };
-
   coq = {
     members = [
       cohencyril
@@ -195,17 +188,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  deshaw = {
-    # Verify additions to this team with at least one already existing member of the team.
-    members = [
-      de11n
-      despsyched
-      invokes-su
-    ];
-    scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
-    shortName = "D. E. Shaw employees";
-  };
-
   dhall = {
     members = [
       Gabriella439
@@ -363,17 +345,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  helsinki-systems = {
-    # Verify additions to this team with at least one already existing member of the team.
-    members = [
-      das_j
-      conni2461
-      helsinki-Jo
-    ];
-    scope = "Group registration for packages maintained by Helsinki Systems";
-    shortName = "Helsinki Systems employees";
-  };
-
   home-assistant = {
     members = [
       dotlambda
@@ -395,16 +366,6 @@ with lib.maintainers;
     shortName = "Infisical";
   };
 
-  iog = {
-    members = [
-      cleverca22
-      disassembler
-      manveru
-    ];
-    scope = "Input-Output Global employees, which maintain critical software";
-    shortName = "Input-Output Global employees";
-  };
-
   java = {
     github = "java";
     enableFeatureFreezePing = true;
@@ -556,18 +517,6 @@ with lib.maintainers;
     shortName = "Matrix";
   };
 
-  mercury = {
-    members = [
-      _9999years
-      Gabriella439
-      curran
-      lf-
-      jkachmar
-    ];
-    scope = "Group registry for packages maintained by Mercury";
-    shortName = "Mercury Employees";
-  };
-
   minimal-bootstrap = {
     members = [
       alejandrosame
@@ -680,17 +629,6 @@ with lib.maintainers;
     shortName = "OpenStack";
   };
 
-  ororatech = {
-    # email: nixdevs@ororatech.com
-    shortName = "OroraTech GmbH. employees";
-    scope = "Team for packages maintained by employees of OroraTech GmbH.";
-    # Edits to this list should only be done by an already existing member.
-    members = [
-      kip93
-      victormeriqui
-    ];
-  };
-
   pantheon = {
     github = "pantheon";
     enableFeatureFreezePing = true;
@@ -747,16 +685,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  redcodelabs = {
-    members = [
-      unrooted
-      wr0belj
-      wintrmvte
-    ];
-    scope = "Maintain Red Code Labs related packages and modules.";
-    shortName = "Red Code Labs";
-  };
-
   rocm = {
     github = "rocm";
   };

nixos/modules/services/matrix/continuwuity.nix

@@ -216,6 +216,8 @@ in
       startLimitBurst = 5;
       startLimitIntervalSec = 60;
       serviceConfig = {
+        Type = "notify";
+
         DynamicUser = true;
         User = cfg.user;
         Group = cfg.group;

nixos/modules/services/system/userborn.nix

@@ -35,6 +35,9 @@ let
   };
 
   userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig);
+  userbornStaticFiles =
+    pkgs.runCommand "static-userborn" { }
+      "mkdir -p $out; ${lib.getExe cfg.package} ${userbornConfigJson} $out";
 
   immutableEtc = config.system.etc.overlay.enable && !config.system.etc.overlay.mutable;
   # The filenames created by userborn.
@@ -51,12 +54,29 @@ in
 
     enable = lib.mkEnableOption "userborn";
 
+    static = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to generate the password files at build time and store them directly
+        in the system closure, without requiring any services at boot time.
+
+        This is STRICTLY intended for embedded appliance images that only have system
+        users with manually managed static user IDs, and CANNOT be used with generation
+        updates.
+
+        WARNING: In this mode, you MUST statically manage user IDs yourself, carefully.
+        Beware, UID reuse is a serious security issue and it's your responsibility
+        to avoid it over the entire lifetime of the system.
+      '';
+    };
+
     package = lib.mkPackageOption pkgs "userborn" { };
 
     passwordFilesLocation = lib.mkOption {
       type = lib.types.str;
-      default = if immutableEtc then "/var/lib/nixos" else "/etc";
-      defaultText = lib.literalExpression ''if immutableEtc then "/var/lib/nixos" else "/etc"'';
+      default = if immutableEtc && !cfg.static then "/var/lib/nixos" else "/etc";
+      defaultText = lib.literalExpression ''if immutableEtc && !config.services.userborn.static then "/var/lib/nixos" else "/etc"'';
       description = ''
         The location of the original password files.
 
@@ -83,8 +103,12 @@ in
         message = "system.activationScripts.users has to be empty to use userborn";
       }
       {
-        assertion = immutableEtc -> (cfg.passwordFilesLocation != "/etc");
-        message = "When `system.etc.overlay.mutable = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`";
+        assertion = (immutableEtc && !cfg.static) -> (cfg.passwordFilesLocation != "/etc");
+        message = "When `system.etc.overlay.mutable = false` and `services.userborn.static = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`";
+      }
+      {
+        assertion = !(cfg.static && config.system.switch.enable);
+        message = "You cannot use `services.userborn.static = true` with switchable configurations, it is ONLY indended for appliance images with fully static user IDs";
       }
     ];
 
@@ -110,7 +134,7 @@ in
             ) userCfg.users
           );
 
-      services.userborn = {
+      services.userborn = lib.mkIf (!cfg.static) {
         wantedBy = [ "sysinit.target" ];
         requiredBy = [ "sysinit-reactivation.target" ];
         after = [
@@ -166,20 +190,35 @@ in
       };
     };
 
-    # Statically create the symlinks to passwordFilesLocation when they're not
-    # inside /etc because we will not be able to do it at runtime in case of an
-    # immutable /etc!
-    environment.etc = lib.mkIf (cfg.passwordFilesLocation != "/etc") (
-      lib.listToAttrs (
-        lib.map (
-          file:
-          lib.nameValuePair file {
-            source = "${cfg.passwordFilesLocation}/${file}";
-            mode = "direct-symlink";
-          }
-        ) passwordFiles
-      )
-    );
+    environment.etc = lib.mkMerge [
+      (lib.mkIf cfg.static (
+        # In static mode, statically drop the files into an immutable /etc.
+        lib.listToAttrs (
+          lib.map (
+            file:
+            lib.nameValuePair file {
+              source = "${userbornStaticFiles}/${file}";
+              mode = if file == "shadow" then "0000" else "0644";
+            }
+          ) passwordFiles
+        )
+      ))
+
+      (lib.mkIf (!cfg.static && cfg.passwordFilesLocation != "/etc") (
+        # Statically create the symlinks to passwordFilesLocation when they're not
+        # inside /etc because we will not be able to do it at runtime in case of a
+        # (non-static) immutable /etc!
+        lib.listToAttrs (
+          lib.map (
+            file:
+            lib.nameValuePair file {
+              source = "${cfg.passwordFilesLocation}/${file}";
+              mode = "direct-symlink";
+            }
+          ) passwordFiles
+        )
+      ))
+    ];
   };
 
   meta.maintainers = with lib.maintainers; [ nikstur ];

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

@@ -17,7 +17,10 @@ let
   };
 in
 {
-  meta.maintainers = teams.helsinki-systems.members;
+  meta.maintainers = with lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   options.services.icingaweb2 = with types; {
     enable = mkEnableOption "the icingaweb2 web interface";

nixos/release-small.nix

@@ -110,8 +110,12 @@ rec {
       subversion
       tarball
       vim
-      tests-stdenv-gcc-stageCompare
       ;
+    tests.stdenv = {
+      inherit (nixpkgs'.tests.stdenv)
+        tests-stdenv-gcc-stageCompare
+        ;
+    };
   };
 
   tested =
@@ -163,7 +167,7 @@ rec {
           "nixos.tests.proxy"
           "nixos.tests.simple"
           "nixpkgs.jdk"
-          "nixpkgs.tests-stdenv-gcc-stageCompare"
+          "nixpkgs.tests.stdenv.tests-stdenv-gcc-stageCompare"
           "nixpkgs.opensshTest"
         ])
       ];

nixos/tests/all-tests.nix

@@ -1652,6 +1652,7 @@ in
   userborn-immutable-users = runTest ./userborn-immutable-users.nix;
   userborn-mutable-etc = runTest ./userborn-mutable-etc.nix;
   userborn-mutable-users = runTest ./userborn-mutable-users.nix;
+  userborn-static = runTest ./userborn-static.nix;
   ustreamer = runTest ./ustreamer.nix;
   uwsgi = runTest ./uwsgi.nix;
   v2ray = runTest ./v2ray.nix;

nixos/tests/icingaweb2.nix

@@ -1,9 +1,10 @@
 { pkgs, ... }:
 {
   name = "icingaweb2";
-  meta = {
-    maintainers = pkgs.lib.teams.helsinki-systems.members;
-  };
+  meta.maintainers = with pkgs.lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   nodes = {
     icingaweb2 =

nixos/tests/iscsi-multipath-root.nix

@@ -5,9 +5,6 @@ let
 in
 {
   name = "iscsi";
-  meta = {
-    maintainers = pkgs.lib.teams.deshaw.members;
-  };
 
   nodes = {
     target =

nixos/tests/iscsi-root.nix

@@ -5,9 +5,10 @@ let
 in
 {
   name = "iscsi";
-  meta = {
-    maintainers = lib.teams.deshaw.members ++ lib.teams.helsinki-systems.members;
-  };
+  meta.maintainers = with lib.maintainers; [
+    das_j
+    helsinki-Jo
+  ];
 
   nodes = {
     target =

nixos/tests/lvm2/systemd-stage-1.nix

@@ -70,7 +70,10 @@ import ../make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "lvm2-${flavour}-systemd-stage-1";
-    meta.maintainers = lib.teams.helsinki-systems.members;
+    meta.maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
 
     nodes.machine =
       { pkgs, lib, ... }:

nixos/tests/lvm2/thinpool.nix

@@ -6,7 +6,10 @@ import ../make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "lvm2-thinpool";
-    meta.maintainers = lib.teams.helsinki-systems.members;
+    meta.maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
 
     nodes.machine =
       { pkgs, lib, ... }:

nixos/tests/mysql/mariadb-galera.nix

@@ -19,9 +19,12 @@ let
     }:
     makeTest {
       name = "${name}-galera-mariabackup";
-      meta = {
-        maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+        izorkin
+      ];
 
       # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node,
       # and checking the table's presence on the other node.

nixos/tests/mysql/mysql-replication.nix

@@ -20,9 +20,11 @@ let
     }:
     makeTest {
       name = "${name}-replication";
-      meta = {
-        maintainers = lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+      ];
 
       nodes = {
         primary = {

nixos/tests/mysql/mysql.nix

@@ -25,9 +25,11 @@ let
     }:
     makeTest {
       inherit name;
-      meta = {
-        maintainers = lib.teams.helsinki-systems.members;
-      };
+      meta.maintainers = with lib.maintainers; [
+        conni2461
+        das_j
+        helsinki-Jo
+      ];
 
       nodes = {
         ${name} =

nixos/tests/redis.nix

@@ -20,9 +20,10 @@ let
     makeTest {
       inherit name;
       meta.maintainers = [
+        lib.maintainers.das_j
         lib.maintainers.flokli
-      ]
-      ++ lib.teams.helsinki-systems.members;
+        lib.maintainers.helsinki-Jo
+      ];
 
       nodes = {
         machine =

nixos/tests/userborn-static.nix

@@ -0,0 +1,57 @@
+{ lib, ... }:
+
+let
+  sysuserPassword = "$y$j9T$3aiOV/8CADAK22OK2QT3/0$67OKd50Z4qTaZ8c/eRWHLIM.o3ujtC1.n9ysmJfv639";
+
+  common = {
+    services.userborn = {
+      enable = true;
+      static = true;
+    };
+    boot.initrd.systemd.enable = true;
+    networking.useNetworkd = true;
+    system.etc.overlay = {
+      enable = true;
+      mutable = false;
+    };
+  };
+in
+
+{
+
+  name = "userborn-static";
+
+  meta.maintainers = with lib.maintainers; [
+    mic92
+    valpackett
+  ];
+
+  nodes.machine =
+    { ... }:
+    {
+      imports = [ common ];
+
+      users.users.sysuser = {
+        uid = 1337;
+        isSystemUser = true;
+        group = "wheel";
+        home = "/var/empty";
+        initialHashedPassword = sysuserPassword;
+      };
+    };
+
+  testScript = ''
+    with subtest("Correct mode on the password files"):
+      assert machine.succeed("stat -c '%a' /etc/passwd") == "644\n"
+      assert machine.succeed("stat -c '%a' /etc/group") == "644\n"
+      assert machine.succeed("stat -c '%a' /etc/shadow") == "0\n"
+
+    with subtest("Check files"):
+      print(machine.succeed("grpck -r"))
+      print(machine.succeed("pwck -r"))
+
+    with subtest("sysuser user is created"):
+      print(machine.succeed("getent passwd sysuser"))
+      assert "${sysuserPassword}" in machine.succeed("getent shadow sysuser"), "sysuser user password is not correct"
+  '';
+}

pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix

@@ -66,7 +66,6 @@ melpaBuild rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       abhisheksingh0x558
-      normalcea
     ];
   };
 }

pkgs/applications/editors/neovim/utils.nix

@@ -60,7 +60,7 @@ let
     };
 
   /**
-    * Builds a vim package (see ':h packages') with additionnal info:
+    * Builds a vim package (see ':h packages') with additional info:
     - the user lua configuration (specified by user)
     - the advised and advised by nixpkgs in passthru.initLua)
     - runtime dependencies (specified in plugins' "runtimeDeps")
@@ -110,7 +110,7 @@ let
       # viml config set by the user along with the plugin
       inherit userPluginViml;
 
-      # recommanded configuration set in vim plugins ".passthru.initLua"
+      # recommended configuration set in vim plugins ".passthru.initLua"
       inherit pluginAdvisedLua;
 
       # A Vim "package", see ':h packages'
@@ -135,8 +135,8 @@ let
     arguments (["-u" writeText "init.vim" GENERATEDRC)]).
     This makes it possible to write the config anywhere: on a per-project basis
     .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects.
-    Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded
-    anymore, $MYVIMRC wont be set etc
+    Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc won't be loaded
+    anymore, $MYVIMRC won't be set etc
   */
   makeNeovimConfig =
     {
@@ -344,7 +344,9 @@ let
 
           nativeBuildInputs = [ toNvimTreesitterGrammar ];
 
-          passthru = grammar.passthru or { };
+          passthru = grammar.passthru or { } // {
+            isTreesitterGrammar = true;
+          };
 
           meta = {
             platforms = lib.platforms.all;

pkgs/applications/editors/neovim/wrapper.nix

@@ -340,8 +340,7 @@ let
           unwrapped = neovim-unwrapped;
           initRc = neovimRcContent';
 
-          tests = callPackage ./tests {
-          };
+          tests = callPackage ./tests { };
         };
 
         meta = {

pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix

@@ -21,7 +21,10 @@ let
     vimUtils.toVimPlugin (
       runCommand "nvim-treesitter-queries-${language}"
         {
-          passthru = { inherit language; };
+          passthru = {
+            inherit language;
+            isTreesitterQuery = true;
+          };
           meta.description = "Queries for ${language} from nvim-treesitter";
         }
         ''
@@ -94,12 +97,7 @@ let
       ];
     in
     self.nvim-treesitter.overrideAttrs {
-      passthru.dependencies = [
-        (symlinkJoin {
-          name = "nvim-treesitter-grammars";
-          paths = grammarPlugins ++ queryPlugins;
-        })
-      ];
+      passthru.dependencies = grammarPlugins ++ queryPlugins;
     };
 
   withAllGrammars = withPlugins (_: allGrammars);

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

@@ -5,6 +5,7 @@
   vim,
   vimPlugins,
   buildEnv,
+  symlinkJoin,
   writeText,
   runCommand,
   makeWrapper,
@@ -200,12 +201,26 @@ let
           # and can simply pass `null`.
           depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt);
           startWithDeps = findDependenciesRecursively start;
-          allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
+          allPluginsAndGrammars = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
+
           allPython3Dependencies =
             ps: lib.flatten (map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
           python3Env = python3.withPackages allPython3Dependencies;
 
-          packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins;
+          partitionGrammars = lib.partition (
+            p: p.isTreesitterGrammar or false || p.isTreesitterQuery or false
+          );
+          allPluginsAndGrammarsPartitioned = partitionGrammars allPluginsAndGrammars;
+          allPlugins = allPluginsAndGrammarsPartitioned.wrong;
+          allGrammars = allPluginsAndGrammarsPartitioned.right;
+          allGrammarsSymlinked = symlinkJoin {
+            name = "nvim-treesitter-grammars";
+            paths = allGrammars;
+          };
+
+          packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" (
+            if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins
+          );
           packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt;
           # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection
           # for each plugin.

pkgs/applications/emulators/libretro/cores/beetle-saturn.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-saturn";
-  version = "0-unstable-2025-07-01";
+  version = "0-unstable-2026-01-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-saturn-libretro";
-    rev = "ccba5265f60f8e64a1984c9d14d383606193ea6a";
-    hash = "sha256-Ixjduv67sPJmf0BH8GaJyyTdpDV/e1UCWCeOb7vLggo=";
+    rev = "b4df47a9f0f30d09eb95b07a4435d0f435a2e95d";
+    hash = "sha256-IIjJdw7u/AaqnKCp6LXc4U0GehwrvEukTC54odCFYkU=";
   };
 
   makefile = "Makefile";

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

@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-01-10";
+  version = "0-unstable-2026-01-18";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "3f3b353350aae4f9584070c793bf19983886d910";
-    hash = "sha256-VFAs6bmMWRn737nfRd98vcFJkVQ6Z580COUmgl2aOY0=";
+    rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed";
+    hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/opentx/default.nix

@@ -84,7 +84,6 @@ mkDerivation rec {
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
-      elitak
       lopsided98
     ];
   };

pkgs/applications/networking/charles/default.nix

@@ -31,7 +31,7 @@ let
         desktopName = "Charles";
         exec = "charles %F";
         genericName = "Web Debugging Proxy";
-        icon = "charles-proxy";
+        icon = "charles-proxy" + lib.optionalString (lib.versionAtLeast version "5.0") "5";
         mimeTypes = [
           "application/x-charles-savedsession"
           "application/x-charles-savedsession+xml"
@@ -73,8 +73,24 @@ let
         mkdir -p $out/share/applications
         ln -s ${desktopItem}/share/applications/* $out/share/applications/
 
-        mkdir -p $out/share/icons
-        cp -r icon $out/share/icons/hicolor
+        ${
+          if lib.versionOlder version "4.0" then
+            ''
+              for size in 16 32 48 64 128 256 512; do
+                install -Dm644 icon/charles_icon$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/charles-proxy.png
+              done
+              install -Dm644 icon/charles_icon.svg $out/share/icons/hicolor/scalable/apps/charles-proxy.svg
+            ''
+          else
+            ''
+              mkdir -p $out/share/icons
+              cp -r icon $out/share/icons/hicolor
+              if [ -d "etc/mime" ]; then
+                mkdir -p $out/share/mime/packages
+                cp etc/mime/*.xml $out/share/mime/packages/
+              fi
+            ''
+        }
 
         runHook postInstall
       '';

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

@@ -310,11 +310,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-A6LxX2zMZAd/Db1VdAVqMplCW2qZx4MNyIpLwTBXkxU=",
+    "hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.72.0",
+    "rev": "v2.73.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

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

@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
     description = "Automatic device model synthesizer";
     homepage = "https://github.com/Qucs/adms";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ disassembler ];
     platforms = with lib.platforms; unix;
   };
 }

pkgs/by-name/ad/adw-gtk3/package.nix

@@ -35,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ciferkey
       Gliczy
-      normalcea
     ];
   };
 })

pkgs/by-name/ai/airsonic/package.nix

@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.gpl3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ disassembler ];
   };
 }

pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix

@@ -35,7 +35,7 @@ let
       homepage = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi";
       changelog = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi/releases/tag/${finalAttrs.src.tag}";
       license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ normalcea ];
+      maintainers = [ ];
       platforms = [ "aarch64-linux" ];
     };
   });

pkgs/by-name/am/amazon-ssm-agent/package.nix

@@ -174,7 +174,6 @@ buildGoModule rec {
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      manveru
       anthonyroussel
       arianvp
     ];

pkgs/by-name/an/antigravity/information.json

@@ -1,22 +1,22 @@
 {
-  "version": "1.13.3",
+  "version": "1.14.2",
   "vscodeVersion": "1.104.0",
   "sources": {
     "x86_64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-x64/Antigravity.tar.gz",
-      "sha256": "084dfbedf1049b363aa3ad7ba679eec8b80feaf29585accb90b5910ebb270048"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-x64/Antigravity.tar.gz",
+      "sha256": "dffb040c1efc67a1f6952c24dd71cffefa16094ceb35b3a7a4d0131e518ea449"
     },
     "aarch64-linux": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-arm/Antigravity.tar.gz",
-      "sha256": "0f71bce4d81fc02271e2bcaf2b57820e20762b149ef791720406817c6d189184"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-arm/Antigravity.tar.gz",
+      "sha256": "7911d56c9e3525256dbf92f661f03f272b4bce73dfcc3f053113d5dae46fac53"
     },
     "x86_64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-x64/Antigravity.zip",
-      "sha256": "8e6ba418883dccd8a4a70fd5d6882f8a919630d3166d83327180165ff7b4eb55"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-x64/Antigravity.zip",
+      "sha256": "f516b8ea7d3566140d70dd6825cd5a07b0c899370c08acfdc9b133c6d0ef5ded"
     },
     "aarch64-darwin": {
-      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-arm/Antigravity.zip",
-      "sha256": "ed95de92e852cac9ef1b264a0a304cf755a803129b54c1618682ec7bae1893dc"
+      "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-arm/Antigravity.zip",
+      "sha256": "014f5eeb231bf5e00837abbc45c47be5d68b542dad3cd969444becbd0bf12860"
     }
   }
 }

pkgs/by-name/as/asahi-audio/package.nix

@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/AsahiLinux/asahi-audio";
     changelog = "https://github.com/AsahiLinux/asahi-audio/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     platforms = [ "aarch64-linux" ];
   };
 })

pkgs/by-name/as/asahi-fwextract/package.nix

@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Asahi firmware extraction script";
     homepage = "https://github.com/AsahiLinux/asahi-installer";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "asahi-fwextract";
     platforms = [ "aarch64-linux" ];
   };

pkgs/by-name/at/atmos/package.nix

@@ -54,6 +54,5 @@ buildGoModule (finalAttrs: {
     description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)";
     mainProgram = "atmos";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.cloudposse ];
   };
 })

pkgs/by-name/ba/bankstown-lv2/package.nix

@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Lightweight psychoacoustic bass enhancement plugin";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      normalcea
       yuka
     ];
     platforms = lib.platforms.linux;

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

@@ -22,18 +22,20 @@
   libxmlb,
   libyaml,
   md4c,
+  webkitgtk_6_0,
+  libsecret,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
-  version = "0.6.3";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "kolunmi";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fiSCRBbS6vNyLWRnaeyQE48NO/LYCk5OdAX8f85H2YM=";
+    hash = "sha256-T0HQ1bjH2nd9+BJAvhSNcpYp25Jt0sNZxKeTY7EfsSw=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxmlb
     libyaml
     md4c
+    webkitgtk_6_0
+    libsecret
   ];
 
   preFixup = ''
@@ -78,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       dtomvan
-      normalcea
     ];
     mainProgram = "bazaar";
     platforms = lib.platforms.linux;

pkgs/by-name/bo/book-summary/package.nix

@@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "book-summary";
     homepage = "https://github.com/dvogt23/book-summary";
     license = lib.licenses.mit;
-    teams = with lib.teams; [ iog ];
   };
 }

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

@@ -48,7 +48,6 @@ buildRubyGem rec {
     homepage = "https://github.com/nix-community/bundix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       zimbatm
     ];
     platforms = lib.platforms.all;

pkgs/by-name/c-/c-intro-and-ref/package.nix

@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/c-intro-and-ref/";
     license = lib.licenses.fdl13Plus;
     maintainers = with lib.maintainers; [
-      normalcea
       rc-zb
     ];
     platforms = lib.platforms.all;

pkgs/by-name/ca/calamares/package.nix

@@ -126,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
       cc0
     ];
     maintainers = with lib.maintainers; [
-      manveru
       vlinkz
     ];
     platforms = lib.platforms.linux;

pkgs/by-name/cb/cbonsai/package.nix

@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     mainProgram = "cbonsai";
     homepage = "https://gitlab.com/jallbrit/cbonsai";
     license = with lib.licenses; [ gpl3Only ];
-    maintainers = with lib.maintainers; [ manveru ];
     platforms = lib.platforms.unix;
   };
 }

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

@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-GhH3bM/mj1fx6cxxtZXZvODJZoSszkBCE8lcq42sZbA=";
+    hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc=";
   };
 
-  cargoHash = "sha256-Eq0RSA8TYHKNRx5mg010iyrONigKR0GgGZ3fXnWOmG8=";
+  cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
 
   nativeBuildInputs = [
     just

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

@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BNOHYciE+/HGNJRvRK6imB4mx4B4Vqz9kVEqWP/DXvE=";
+    hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ=";
   };
 
-  cargoHash = "sha256-M3zyBsNFUQ5dwzJRlaC8m6o5U4teIgwl6jTDYSqW8qw=";
+  cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
 
   nativeBuildInputs = [
     just

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

@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xvvaRuYbUDNORCoBQ9FKIpGROoDoyg3k5CdUl2gjd0s=";
+    hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg=";
   };
 
-  cargoHash = "sha256-1j99crcOUGocmdCsKCN0gKRUd4s0YOJyHskiR/SqA7A=";
+  cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
 
   separateDebugInfo = true;
 

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

@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-TWFTHbkYlZh4yPBnTbVgB9Ld05mVbUTF6yIN3HJbhdo=";
+    hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI=";
   };
 
   cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";

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

@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gGURDSKOIroYGeZJrKayNMCC8GzB8OstkDl2jz/rm5A=";
+    hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0=";
   };
 
   cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo=";

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

@@ -19,7 +19,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
@@ -31,10 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
-  env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-12-31";
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-  };
+  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
   cargoBuildFlags = [ "--all" ];
 

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

@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-VO8r2r7zzFZU5gYBTxUpS/829QQvlVGsG798XfqqXR0=";
+    hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4=";
   };
 
-  cargoHash = "sha256-fjcYPA+kuhD9JLjoZkzAziJK8qF/a/gdSafmckLD8n0=";
+  cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
 
   buildFeatures = [ "nixos" ];
 

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

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

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

@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-8wYX3KCWXHwTb7NHg0wXxmxtVG+jOFU3EidIomPYY0s=";
+    hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g=";
   };
 
   cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";

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

@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-pcuTKKXt4qrs48hKfA4Pzjgx+4wNHgggbWW+yZ/1Sck=";
+    hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns=";
   };
 
   cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";

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

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

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

@@ -18,7 +18,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

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

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

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

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

@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6pGMk0p3Ry97z8NLtECpFgY2GHecj+6A4bcR3AMSV88=";
+    hash = "sha256-JlRGK3uac94r81MBaOZZ4hRcKD4fh/vgJBxic0BSWnY=";
   };
 
   cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";

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

@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-eDpwJRRX6RjOEtSOCGYpeJQldnwZ9gsqfkycHrP5w6c=";
+    hash = "sha256-4BXsjcAzu4twwIGqHQ4jvewO5oUns6yqY1n26KbIygQ=";
   };
 
   postPatch = ''

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

@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gn8Nxo5pwJciva34pSsSz2iSVT8ieS54MVPdC1kbrvs=";
+    hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo=";
   };
 
-  cargoHash = "sha256-xsVQyb9tki/bNV9wMavx8PYIimB7ZoOtwKL3gNPGuIM=";
+  cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
 
   nativeBuildInputs = [
     cmake

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

@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-7Iebf/AffJPeIJYVhaGW5GpgUGbkWDTz7A31Y0EPGqc=";
+    hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE=";
   };
 
   cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";

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

@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

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

@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.1";
+  version = "1.0.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

pkgs/by-name/cr/crystal2nix/package.nix

@@ -40,7 +40,6 @@ crystal.buildCrystalPackage rec {
     mainProgram = "crystal2nix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      manveru
       peterhoeg
     ];
   };

pkgs/by-name/cu/cucumber/package.nix

@@ -18,7 +18,6 @@ bundlerApp {
     license = lib.licenses.mit;
     mainProgram = "cucumber";
     maintainers = with lib.maintainers; [
-      manveru
       nicknovitski
       anthonyroussel
     ];

pkgs/by-name/cu/cursor-cli/package.nix

@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-FT4dPRYXWVLnl02KevhiMuh6F3P9Bu+YJXiWrQtH2vo=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-gZPjmxJxppni1tBL+4KNzP7It8vN0qG0e+xG42Cu/tM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-23P7GxKzb66HNYasW87wgSFvL7PseXrZJ29Gewqx1O0=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-+ZTHbrRzte79MPrgCBb+Yj8GZaPCcDjc0v9vLI8wmoI=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-kYXTaddjTkuz+tzWJHU4Bk80jABTbQdVKLjEKvSBgX8=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-6LNXzVh7hpAFZWCZUECJKIv9RzuWih3G/+9cFjof2zM=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-wOPvhIOkg8NQch5GLe5JbK2Xl2vTboVCPPMa+aMV+MI=";
+      url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-mUjH/9ADFgsCdCvUmSUMbepJUHA/4bz7I01c51tlAM8=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2026-01-09";
+  version = "0-unstable-2026-01-17";
 
   src = sources.${hostPlatform.system};
 

pkgs/by-name/da/damon/package.nix

@@ -21,7 +21,6 @@ buildGoModule {
     homepage = "https://github.com/hashicorp/damon";
     license = lib.licenses.mpl20;
     description = "Terminal UI (TUI) for HashiCorp Nomad";
-    teams = [ lib.teams.iog ];
     mainProgram = "damon";
   };
 }

pkgs/by-name/db/dbmate/package.nix

@@ -25,6 +25,5 @@ buildGoModule rec {
     homepage = "https://github.com/amacneil/dbmate";
     changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ manveru ];
   };
 }

pkgs/by-name/dc/dcgm/package.nix

@@ -170,7 +170,10 @@ stdenv.mkDerivation {
     description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs";
     homepage = "https://developer.nvidia.com/dcgm";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.deshaw ];
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
     mainProgram = "dcgmi";
     platforms = lib.platforms.linux;
   };

pkgs/by-name/dg/dgop/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dgop";
-  version = "0.1.12";
+  version = "0.1.13";
 
   src = fetchFromGitHub {
     owner = "AvengeMedia";
     repo = "dgop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ei6JMAai5azTy4iYLGp6vDd+ADMej+ysrZhlRv491g4=";
+    hash = "sha256-Frp1/AE5jznFWS52FgN9daI6Kgi0yPx7bZVoFuEIylw=";
   };
 
-  vendorHash = "sha256-MssJTtlKWzn+toNmE+QkXvLXtR7pR21cknXj89CSbwI=";
+  vendorHash = "sha256-NycCRxav1S/DW4fRlcLG5r5NsQQHbAE4zoOiF6Ut/bE=";
 
   ldflags = [
     "-w"

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

@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     description = "Disk information utility; displays everything 'df' does and more";
     homepage = "https://diskinfo-di.sourceforge.io/";
     license = lib.licenses.zlib;
-    maintainers = with lib.maintainers; [ manveru ];
     platforms = lib.platforms.all;
   };
 }

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

@@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      elitak
       yuannan
     ];
     platforms = lib.platforms.unix;

pkgs/by-name/dm/dms-shell/package.nix

@@ -26,13 +26,13 @@ buildGoModule (
   in
   {
     pname = "dms-shell";
-    version = "1.2.2";
+    version = "1.2.3";
 
     src = fetchFromGitHub {
       owner = "AvengeMedia";
       repo = "DankMaterialShell";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-OUduJ6EcH91C8A5Jt2ZHgJiZg9k5ZKipKPbuHzbQGaI=";
+      hash = "sha256-P//moH3z9r4PXirTzXVsccQINsK5AIlF9RWOBwK3vLc=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/core";

pkgs/by-name/do/dovecot/package.nix

@@ -192,9 +192,10 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "dovecot";
     maintainers = with lib.maintainers; [
+      das_j
       fpletz
+      helsinki-Jo
     ];
-    teams = [ lib.teams.helsinki-systems ];
     platforms = lib.platforms.unix;
   };
   passthru.tests = {

pkgs/by-name/do/dovecot_pigeonhole/package.nix

@@ -43,8 +43,10 @@ stdenv.mkDerivation rec {
     homepage = "https://pigeonhole.dovecot.org/";
     description = "Sieve plugin for the Dovecot IMAP server";
     license = lib.licenses.lgpl21Only;
-    maintainers = [ ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = lib.platforms.unix;
   };
 }

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

@@ -52,7 +52,6 @@ let
     homepage = "https://duckstation.org";
     license = lib.licenses.cc-by-nc-nd-40;
     maintainers = with lib.maintainers; [
-      normalcea
       matteopacini
     ];
   };

pkgs/by-name/ed/edgetx/package.nix

@@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [
-      elitak
       lopsided98
       wucke13
       xokdvium

pkgs/by-name/ej/ejson/package.nix

@@ -27,6 +27,5 @@ buildGoModule rec {
     mainProgram = "ejson";
     license = lib.licenses.mit;
     homepage = "https://github.com/Shopify/ejson";
-    maintainers = [ lib.maintainers.manveru ];
   };
 }

pkgs/by-name/em/embellish/package.nix

@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/getnf/embellish";
     changelog = "https://github.com/getnf/embellish/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     mainProgram = "io.github.getnf.embellish";
     platforms = lib.platforms.linux;
   };

pkgs/by-name/en/enter-tex/package.nix

@@ -76,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.gnome.org/World/gedit/enter-tex";
     description = "LaTeX editor for the GNOME desktop";
     maintainers = with lib.maintainers; [
-      manveru
       bobby285271
     ];
     license = lib.licenses.gpl3Plus;

pkgs/by-name/ex/exim/package.nix

@@ -200,8 +200,11 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "exim";
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ tv ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+      tv
+    ];
     changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog";
   };
 }

pkgs/by-name/fa/factorio/package.nix

@@ -224,7 +224,6 @@ let
       license = lib.licenses.unfree;
       maintainers = with lib.maintainers; [
         Baughn
-        elitak
         priegger
         lukegb
       ];

pkgs/by-name/fi/firejail/package.nix

@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
     homepage = "https://firejail.wordpress.com/";
+    mainProgram = "firejail";
   };
 }

pkgs/by-name/fl/flexoptix-app/package.nix

@@ -70,7 +70,10 @@ appimageTools.wrapAppImage {
     homepage = "https://www.flexoptix.net";
     changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog";
     license = lib.licenses.unfree;
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/by-name/ga/gaphor/package.nix

@@ -137,7 +137,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://gaphor.org/";
     changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     teams = [ lib.teams.gnome-circle ];
     mainProgram = "gaphor";
     platforms = lib.platforms.linux;

pkgs/by-name/ge/geoipupdate/package.nix

@@ -25,7 +25,10 @@ buildGoModule rec {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
     license = with lib.licenses; [ asl20 ];
-    teams = [ lib.teams.helsinki-systems ];
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+    ];
     mainProgram = "geoipupdate";
   };
 }

pkgs/by-name/gn/gnu-cim/package.nix

@@ -29,13 +29,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # lib.escapeShellArgs does not work
-  env.CFLAGS = lib.concatStringsSep " " [
-    "-Wno-error=implicit-function-declaration"
-    "-Wno-error=implicit-int"
-    "-Wno-error=return-mismatch"
-    "-Wno-error=incompatible-pointer-types"
-  ];
+  env.CFLAGS = "-std=gnu89";
 
   doCheck = true;
 

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

@@ -31,7 +31,6 @@ buildGoModule rec {
     changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
     mainProgram = "godspeed";
     broken = stdenv.hostPlatform.isDarwin;
   };

pkgs/by-name/go/google-fonts/package.nix

@@ -78,7 +78,6 @@ stdenvNoCC.mkDerivation {
     ];
     platforms = lib.platforms.all;
     hydraPlatforms = [ ];
-    maintainers = with lib.maintainers; [ manveru ];
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
   };
 }

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

@@ -24,7 +24,6 @@ buildGoModule rec {
     homepage = "https://github.com/redcode-labs/GoSH";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    teams = [ lib.teams.redcodelabs ];
     mainProgram = "GoSH";
   };
 }

pkgs/by-name/gr/grafana-reporter/package.nix

@@ -39,6 +39,5 @@ buildGoModule rec {
     mainProgram = "grafana-reporter";
     homepage = "https://github.com/IzakMarais/reporter";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.disassembler ];
   };
 }

pkgs/by-name/gr/gruvbox-plus-icons/package.nix

@@ -36,9 +36,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p $out/share/icons
     cp -r Gruvbox-Plus-Dark $out/share/icons/
+    cp -r Gruvbox-Plus-Light $out/share/icons/
     patchShebangs scripts/folders-color-chooser
     ./scripts/folders-color-chooser -c ${folder-color}
     gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark
+    gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Light
 
     runHook postInstall
   '';

pkgs/by-name/ha/haunt/package.nix

@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       to do things that aren't provided out-of-the-box.
     '';
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ normalcea ];
+    maintainers = [ ];
     inherit (guile.meta) platforms;
   };
 })

pkgs/by-name/hd/hdapsd/package.nix

@@ -2,19 +2,21 @@
   lib,
   stdenv,
   fetchurl,
+  pkg-config,
   udevCheckHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "hdapsd";
-  version = "20141203";
+  version = "20250908";
 
   src = fetchurl {
-    url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
-    sha256 = "0ppgrfabd0ivx9hyny3c3rv4rphjyxcdsd5svx5pgfai49mxnl36";
+    url = "https://github.com/linux-thinkpad/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
+    hash = "sha256-qENcOFJ9x5CkN72ZkTx/OL+gpwAYJlJomKvAjTklDYQ=";
   };
 
   nativeBuildInputs = [
+    pkg-config
     udevCheckHook
   ];
 
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Hard Drive Active Protection System Daemon";
     mainProgram = "hdapsd";
-    homepage = "http://hdaps.sf.net/";
+    homepage = "https://github.com/linux-thinkpad/hdapsd";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };