diff options
author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2023-12-10 19:21:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-10 19:21:03 +0100 |
commit | 0dbbe1567e4e6d76baa70573cbd73345b4b8b5e4 (patch) | |
tree | 13683e616aff8ed5488c61214441a0779011451e /pkgs/applications | |
parent | 2f480818d7a73d6e6cd6b0bff465d5a637825fdb (diff) | |
parent | ac7d5d05c99ee6937a7221adf6264709cae9cb87 (diff) |
Merge pull request #272816 from Enzime/fix/taler-exchange-src
taler: fix determinism of `taler-exchange.src`
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/taler/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 6ba4bac67fcb8..474247d24b14c 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -9,22 +9,25 @@ let taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${version}"; - sha256 = "sha256-uwbgIzSjLN+KQCY134VfnCuBEtvCO3a6mEw++HoZDHs="; + sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ="; }; -in rec { - taler-exchange = stdenv.mkDerivation rec { + + taler-exchange = stdenv.mkDerivation { pname = "taler-exchange"; inherit version; src = fetchgit { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; - # REMOVEME: this should only be a problem for specifically v0.9.3 - # When fetching submodules without deep clone we get the following error: - # "Server does not allow request for unadvertised object" - deepClone = true; fetchSubmodules = true; - sha256 = "sha256-txWwW5vqTblNgVIXdDkpNNZOXpY0udMaz4Wog1GobzE="; + sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs="; + + # When fetching submodules without the .git folder we get the following error: + # "Server does not allow request for unadvertised object" + leaveDotGit = true; + postFetch = '' + rm -rf $out/.git + ''; }; nativeBuildInputs = [ @@ -76,7 +79,7 @@ in rec { }; }; - taler-merchant = stdenv.mkDerivation rec { + taler-merchant = stdenv.mkDerivation { pname = "taler-merchant"; inherit version; @@ -133,4 +136,6 @@ in rec { platforms = platforms.linux; }; }; +in { + inherit taler-exchange taler-merchant; } |