From 124ffb8b10b43973bc8756ba1005f03f608effd0 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Tue, 10 Jun 2025 23:58:10 +0800 Subject: [PATCH] use builtin fetchers to prevent importing from derivation --- default.nix | 5 +++-- lib/repoSource.nix | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 876cd6e63..e2067e750 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ pkgs ? ( import { overrides = [ - (final: prev: if prev ? nur then prev else { nur = ./. { pkgs = final; }; }) + (final: prev: if prev ? nur then prev else { nur = import ./. { pkgs = final; }; }) ]; } ), @@ -28,7 +28,8 @@ let lockedRevisions lib ; - inherit (nurpkgs) fetchgit fetchzip; + fetchgit = builtins.fetchGit or nurpkgs.fetchgit; + fetchzip = builtins.fetchTarball or nurpkgs.fetchzip; }; createRepo = diff --git a/lib/repoSource.nix b/lib/repoSource.nix index f28a21411..da3520554 100644 --- a/lib/repoSource.nix +++ b/lib/repoSource.nix @@ -47,6 +47,14 @@ else if (lib.hasPrefix "https://gitlab.com" attr.url || type == "gitlab") && !su else fetchgit { inherit (attr) url; - inherit (revision) rev sha256; - fetchSubmodules = submodules; + inherit (revision) rev; } + // ( + if fetchgit == builtins.fetchGit or null then + { inherit submodules; } + else + { + inherit (revision) sha256; + fetchSubmodules = submodules; + } + )