From 533724820cb605463230339e6e080c4a73fa8ec5 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Tue, 7 Nov 2023 03:06:11 +0100 Subject: [PATCH] use "source" for niv source names this removes a difference to how Nix currently fetches flake references. using a constant is preferrable because renaming the source won't force downstream rebuilds of store objects cached from when flakes were used. upstream fix: https://github.com/nmattia/niv/pull/379 --- nix/sources.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nix/sources.nix b/nix/sources.nix index fe3dadf..c28977d 100644 --- a/nix/sources.nix +++ b/nix/sources.nix @@ -7,22 +7,16 @@ let # fetch_file = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } + builtins_fetchurl { inherit (spec) url sha256; name = "source"; } else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; + pkgs.fetchurl { inherit (spec) url sha256; name = "source"; }; fetch_tarball = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + builtins_fetchTarball { name = "source"; inherit (spec) url sha256; } else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + pkgs.fetchzip { name = "source"; inherit (spec) url sha256; }; fetch_git = name: spec: let