From 8913c682cf8131c4d9183a70a1977f6f1c0bb002 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 25 Dec 2017 15:02:17 +0100
Subject: [PATCH] Doh
---
src/lib/Hydra/Plugin/SubversionInput.pm | 4 ++--
src/root/reproduce.tt | 6 +++---
src/script/nix-prefetch-git | 2 +-
src/script/nix-prefetch-hg | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/Hydra/Plugin/SubversionInput.pm b/src/lib/Hydra/Plugin/SubversionInput.pm
index db05bb3c..2de1c6c2 100644
--- a/src/lib/Hydra/Plugin/SubversionInput.pm
+++ b/src/lib/Hydra/Plugin/SubversionInput.pm
@@ -65,8 +65,8 @@ sub fetchInput {
# Hm, if the Nix Perl bindings supported filters in
# addToStore(), then we wouldn't need to make a copy here.
my $tmpDir = File::Temp->newdir("hydra-svn-export.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die;
- (system "svn", "export", $wcPath, "$tmpDir/svn-export", "--quiet") == 0 or die "svn export failed";
- $storePath = addToStore("$tmpDir/svn-export", 1, "sha256");
+ (system "svn", "export", $wcPath, "$tmpDir/source", "--quiet") == 0 or die "svn export failed";
+ $storePath = addToStore("$tmpDir/source", 1, "sha256");
}
$sha256 = queryPathHash($storePath); $sha256 =~ s/sha256://;
diff --git a/src/root/reproduce.tt b/src/root/reproduce.tt
index 41316ce6..a8cd54c5 100644
--- a/src/root/reproduce.tt
+++ b/src/root/reproduce.tt
@@ -99,7 +99,7 @@ inputDir=
[%+ IF input.type == "git" %]
-inputDir="$tmpDir/[% input.name %]/git-export"
+inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then
info "fetching Git input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."
@@ -121,7 +121,7 @@ args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revisio
[%+ ELSIF input.type == "hg" %]
-inputDir="$tmpDir/[% input.name %]/hg-archive"
+inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then
info "fetching Mercurial input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."
@@ -143,7 +143,7 @@ args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revisio
[%+ ELSIF input.type == "svn" %]
-inputDir="$tmpDir/[% input.name %]/svn-export"
+inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then
info "fetching Subversion input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."
diff --git a/src/script/nix-prefetch-git b/src/script/nix-prefetch-git
index 0846c7ec..13acb003 100755
--- a/src/script/nix-prefetch-git
+++ b/src/script/nix-prefetch-git
@@ -240,7 +240,7 @@ else
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
- tmpFile="$tmpPath/git-export"
+ tmpFile="$tmpPath/source"
mkdir "$tmpFile"
# Perform the checkout.
diff --git a/src/script/nix-prefetch-hg b/src/script/nix-prefetch-hg
index adb25537..06b92dd9 100755
--- a/src/script/nix-prefetch-hg
+++ b/src/script/nix-prefetch-hg
@@ -38,7 +38,7 @@ if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
- tmpArchive="$tmpPath/hg-archive"
+ tmpArchive="$tmpPath/source"
# Perform the checkout.
if [[ $url != /* ]]; then