Merge pull request #146953 from piegamesde/gnome-extensions

pkgs/desktops/gnome/extensions/README.md

···
 
 ## Automatically packaged extensions
 
-The actual packages are created by `buildGnomeExtensions.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatic generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains provides new names for all extensions that collide.
+The actual packages are created by `buildGnomeExtension.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatic generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains new names for all extensions that collide.
 
 ### Extensions updates
 
···
 3. Update `supported_versions` in `./update-extensions.py` and re-run it
 4. Change `gnomeExtensions` to the new version
 5. Update `./extensionsRenames.nix` accordingly
+6. Update `all-packages.nix` accordingly (grep for `gnomeExtensions`)
 
 ## Manually packaged extensions
 

pkgs/desktops/gnome/extensions/extensionOverrides.nix

···
 , gjs
 , xprop
 }:
+let
+  # Helper method to reduce redundancy
+  patchExtension = name: override: super: (super // {
+    ${name} = super.${name}.overrideAttrs override;
+  });
+in
 # A set of overrides for automatically packaged extensions that require some small fixes.
 # The input must be an attribute set with the extensions' UUIDs as keys and the extension
 # derivations as values. Output is the same, but with patches applied.
 #
 # Note that all source patches refer to the built extension as published on extensions.gnome.org, and not
 # the upstream repository's sources.
-super: super // {
-
-  "[e-mail]" = super."[e-mail]".overrideAttrs (old: {
+super: lib.trivial.pipe super [
+  (patchExtension "[e-mail]" (old: {
     meta.maintainers = with lib.maintainers; [ eperuffo ];
-  });
+  }))
 
-  "[e-mail]" = super."[e-mail]".overrideAttrs (old: {
+  (patchExtension "[e-mail]" (old: {
     meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ];
-  });
+  }))
 
-  "[e-mail]" = super."[e-mail]".overrideAttrs (old: {
+  (patchExtension "[e-mail]" (old: {
     # Has a hard-coded path to a run-time dependency
     # https://github.com/NixOS/nixpkgs/issues/136111
     postPatch = ''
       substituteInPlace "extension.js" --replace "/usr/bin/ddcutil" "${ddcutil}/bin/ddcutil"
     '';
-  });
+  }))
 
-  "[e-mail]" = super."[e-mail]".overrideAttrs (old: {
+  (patchExtension "[e-mail]" (old: {
     # Requires gjs
     # https://github.com/NixOS/nixpkgs/issues/136112
     postPatch = ''
···
         substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"
       done
     '';
-  });
+  }))
 
-  "[e-mail]" = super."[e-mail]".overrideAttrs (old: {
+  (patchExtension "[e-mail]" (old: {
     buildInputs = [ xprop ];
 
     meta.maintainers = with lib.maintainers; [ rhoriguchi ];
-  });
-
-}
+  }))
+]

pkgs/top-level/all-packages.nix

···
   inherit (callPackage ../desktops/gnome/extensions { })
     gnomeExtensions
     gnome38Extensions
-    gnome40Extensions;
+    gnome40Extensions
+    gnome41Extensions
+  ;
 
   gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };