fetchFromGitLab: force re-fetch when rev changes (#14)

There are a few instances of `fetchFromGitLab` in the repo, for instance `gtk-doc.src`.

My primary goal when writing this was changing the output derivation following #11. This is doable with a lot less diff in `fetchFromGitLab`, but it's worth asking whether both fetchers should be different and why. I think a lot of the divergence comes from years of random commits rather than from design.

Reviewed-by: @isabelroses

Co-authored-by: Julie B. <no-reply@bbjubjub.fr>
Reviewed-on: auxolotl/core#14
Co-authored-by: Ghost <>
Co-committed-by: Ghost <>

maintainers/maintainer-list.nix

@@ -1,14 +1,15 @@
-/* List of NixOS maintainers.
+/*
+  List of Aux maintainers.
    ```nix
    handle = {
      # Required
      name = "Your name";
+     forgejo = "forgejoUsername";
+     forgejoId = your-forgejo-id;
 
-      # Optional, but at least one of email, matrix or githubId must be given
+     # Optional, but at least one of email or matrix 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";
@@ -22,21 +23,16 @@
    - `name` is a name that people would know and recognize you by,
    - `email` is your maintainer email address,
    - `matrix` is your Matrix user ID,
-    - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
+   - `forgejo` is your forgejo handle (as it appears in the URL of your profile page, `https://git.auxolotl.org/<userhandle>`),
-    - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
+   - `forgejoId` is your forgejo user ID, which can be found at `https://git.auxolotl.org/api/v1/users/<username>`,
    - `keys` is a list of your PGP/GPG key fingerprints.
 
-    Specifying a GitHub account ensures that you automatically:
+   `handle == forgejo` is strongly preferred whenever `forgejo` is an acceptable attribute name and is short and convenient.
-    - 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.
 
-    `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
+   If `forgejo` begins with a numeral, `handle` should be prefixed with an underscore.
-
-    If `github` begins with a numeral, `handle` should be prefixed with an underscore.
    ```nix
    _1example = {
-      github = "1example";
+     forgejo = "1example";
    };
    ```
 
@@ -51,18 +47,6 @@
 
    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:
+   When editing this file, please ensure that you have added yourself in alphabetical order of your handle.
-     * 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/fetchgit/default.nix

@@ -27,6 +27,7 @@ lib.makeOverridable (
 , # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
   # needed for netrcPhase
   netrcImpureEnvVars ? []
+, passthru ? {}
 , meta ? {}
 , allowedRequisites ? null
 }:
@@ -103,7 +104,7 @@ stdenvNoCC.mkDerivation {
 
   inherit preferLocalBuild meta allowedRequisites;
 
-  passthru = {
+  passthru = passthru // {
     gitRepoUrl = url;
   };
 }

pkgs/build-support/fetchgithub/default.nix

@@ -1,22 +1,30 @@
 { lib, fetchgit, fetchzip }:
 
 lib.makeOverridable (
-{ owner, repo, rev, name ? "source"
+{ owner, repo, rev
+, name ? null # Override with null to use the default value
+, pname ? "source-${githubBase}-${owner}-${repo}"
 , fetchSubmodules ? false, leaveDotGit ? null
 , deepClone ? false, private ? false, forceFetchGit ? false
 , sparseCheckout ? []
 , githubBase ? "github.com", varPrefix ? null
+, passthru ? { }
 , meta ? { }
 , ... # For hash agility
 }@args:
 
 let
+  name = if args.name or null != null then args.name
+  else "${pname}-${rev}";
 
   position = (if args.meta.description or null != null
     then builtins.unsafeGetAttrPos "description" args.meta
     else builtins.unsafeGetAttrPos "rev" args
   );
   baseUrl = "https://${githubBase}/${owner}/${repo}";
+  newPassthru = passthru // {
+    inherit rev owner repo;
+  };
   newMeta = meta // {
     homepage = meta.homepage or baseUrl;
   } // lib.optionalAttrs (position != null) {
@@ -53,16 +61,19 @@ let
   fetcherArgs = (if useFetchGit
     then {
       inherit rev deepClone fetchSubmodules sparseCheckout; url = gitRepoUrl;
+      passthru = newPassthru;
     } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
     else {
       url = "${baseUrl}/archive/${rev}.tar.gz";
 
-      passthru = {
+      passthru = newPassthru // {
         inherit gitRepoUrl;
       };
     }
   ) // privateAttrs // passthruAttrs // { inherit name; };
 in
 
-fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; }
+(fetcher fetcherArgs).overrideAttrs (finalAttrs: previousAttrs: {
+  meta = newMeta;
+})
 )

pkgs/build-support/fetchgitlab/default.nix

@@ -2,7 +2,9 @@
 
 lib.makeOverridable (
 # gitlab example
-{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
+{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", group ? null
+, pname ? lib.concatStringsSep "-" ([ "source" domain ] ++ (lib.optional (group != null) group) ++ [ owner repo ])
+, name ? "${pname}-${rev}"
 , fetchSubmodules ? false, leaveDotGit ? false
 , deepClone ? false, forceFetchGit ? false
 , sparseCheckout ? []

pkgs/build-support/fetchsavannah/default.nix

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

pkgs/by-name/py/python/python-modules/build/default.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "1.1.1";
+  version = "1.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "pypa";
     repo = "build";
     rev = "refs/tags/${version}";
-    hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k=";
+    hash = "sha256-G0g+1v19sQMUuQlZKGELZOwwX07i7TIdEdaYzr8bKtI=";
   };
 
   postPatch = ''

pkgs/top-level/base-packages.nix

@@ -104,14 +104,6 @@ with pkgs;
 
   stringsWithDeps = lib.stringsWithDeps;
 
-  ### Evaluating the entire Nixpkgs naively will fail, make failure fast
-  AAAAAASomeThingsFailToEvaluate = throw ''
-    Please be informed that this pseudo-package is not the only part
-    of Nixpkgs that fails to evaluate. You should not evaluate
-    entire Nixpkgs without some special measures to handle failing
-    packages, like using pkgs/top-level/release-attrpaths-superset.nix.
-  '';
-
   tests = callPackages ../test { };
 
   # These are used when buiding compiler-rt / libgcc, prior to building libc.