From 8be7956fc053f137f530fd04f954ae7de0e5f239 Mon Sep 17 00:00:00 2001
From: Ghost <>
Date: Mon, 1 Jul 2024 16:24:13 +0000
Subject: [PATCH] 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: https://git.auxolotl.org/auxolotl/core/pulls/14
Co-authored-by: Ghost <>
Co-committed-by: Ghost <>
---
 pkgs/build-support/fetchgitlab/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 749883f..21440b2 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/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 ? []