From 8c63762d643e371d892fbd6a264e8057c880e60d Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sun, 31 Mar 2013 19:00:50 -0700 Subject: [PATCH] - fetchbzr and nix-prefetch-bzr now only export, instead of cloning - The option for cloning in nix-prefetch-bzr is removed - ssl certificates are now ignored by fetchbzr This means that no .bzr directory is downloaded. Without this change, the hash of the result is unpredictable, probably because of timestamping in the .bzr directory. Currently, the only package using fetchbzr is kicad. --- pkgs/build-support/fetchbzr/builder.sh | 2 +- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 88aab7891b48..17567fdadd23 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -bzr checkout --lightweight "$url" -r "$revision" "$out" +bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url" stopNest diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 167892fbb794..9ff86c20ae3f 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -50,12 +50,7 @@ if test -z "$finalPath"; then trap "rm -rf $tmpPath" EXIT # Perform the checkout. - if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1 - then - bzr export $revarg "$tmpFile" "$url" >&2 - else - bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2 - fi + bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url" # Compute the hash. hash=$(nix-hash --type $hashType $hashFormat $tmpFile)