fetchFromGitLab: force re-fetch when rev changes

maintainers/maintainer-list.nix

@@ -1,15 +1,14 @@
-/*
-  List of Aux maintainers.
+/* List of NixOS maintainers.
     ```nix
     handle = {
       # Required
       name = "Your name";
-     forgejo = "forgejoUsername";
-     forgejoId = your-forgejo-id;
 
-     # Optional, but at least one of email or matrix must be given
+      # Optional, but at least one of email, matrix or githubId must be given
       email = "address@example.org";
       matrix = "@user:example.org";
+      github = "GithubUsername";
+      githubId = your-github-id;
 
       keys = [{
         fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
@@ -23,16 +22,21 @@
     - `name` is a name that people would know and recognize you by,
     - `email` is your maintainer email address,
     - `matrix` is your Matrix user ID,
-   - `forgejo` is your forgejo handle (as it appears in the URL of your profile page, `https://git.auxolotl.org/<userhandle>`),
-   - `forgejoId` is your forgejo user ID, which can be found at `https://git.auxolotl.org/api/v1/users/<username>`,
+    - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
+    - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
     - `keys` is a list of your PGP/GPG key fingerprints.
 
-   `handle == forgejo` is strongly preferred whenever `forgejo` is an acceptable attribute name and is short and convenient.
+    Specifying a GitHub account ensures that you automatically:
+    - get invited to the @NixOS/nixpkgs-maintainers team ;
+    - once you are part of the @NixOS org, OfBorg will request you review
+      pull requests that modify a package for which you are a maintainer.
 
-   If `forgejo` begins with a numeral, `handle` should be prefixed with an underscore.
+    `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
+
+    If `github` begins with a numeral, `handle` should be prefixed with an underscore.
     ```nix
     _1example = {
-     forgejo = "1example";
+      github = "1example";
     };
     ```
 
@@ -47,6 +51,18 @@
 
     More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible.
 
-   When editing this file, please ensure that you have added yourself in alphabetical order of your handle.
+    When editing this file:
+     * keep the list alphabetically sorted, check with:
+         nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix
+     * test the validity of the format with:
+         nix-build lib/tests/maintainers.nix
+
+    See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
+
+    When adding a new maintainer, be aware of the current commit conventions
+    documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions)
+    file located in the root of the Nixpkgs repo.
 */
-{ }
+{
+
+}

pkgs/build-support/fetchsavannah/default.nix

@@ -2,7 +2,7 @@
 
 lib.makeOverridable (
 # cgit example, snapshot support is optional in cgit
-{ repo, rev, name ? "source-savannah.gnu.org-${repo}-${rev}"
+{ repo, rev, name ? "source"
 , ... # For hash agility
 }@args: fetchzip ({
   inherit name;