danderson/channel-scripts
0
0
Fork 0
forked from the-distro/channel-scripts
Code Pull requests Activity

* Remove dead patch propagation code.

Browse source 
git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@34858 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
This commit is contained in:
Eelco Dolstra 2014-09-10 12:16:36 +00:00
parent 3481bfaf40
commit 22ff163cca
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mirror-channel.pl
View file

@ -4,7 +4,6 @@
use strict;
use Nix::Manifest;
use Nix::GeneratePatches;
use Nix::Utils;
use Nix::Store;
use File::Basename;
@ -15,7 +14,7 @@ use Forks::Super 'bg_eval';
if (scalar @ARGV < 4 || scalar @ARGV > 6) {
print STDERR "Syntax: perl mirror-channel.pl <src-channel-url> <dst-channel-dir> <bucket-name> <nar-url> [<all-patches-manifest [<nix-exprs-url>]]\n";
print STDERR "Syntax: perl mirror-channel.pl <src-channel-url> <dst-channel-dir> <bucket-name> <nar-url> [<nix-exprs-url>]\n";
exit 1;
}
@ -27,8 +26,7 @@ my $srcChannelURL = $ARGV[0];
my $dstChannelPath = $ARGV[1];
my $bucketName = $ARGV[2];
my $cacheURL = $ARGV[3]; die if $cacheURL =~ /\/$/;
my $allPatchesManifest = $ARGV[4] || "";
my $nixexprsURL = $ARGV[5];
my $nixexprsURL = $ARGV[4];
die "$dstChannelPath doesn't exist\n" unless -d $dstChannelPath;
@ -206,16 +204,5 @@ foreach my $r (@results) {
}
# Read all the old patches and propagate the useful ones. We use the
# file "all-patches" to keep track of all patches that have been
# generated in the past, so that patches are not lost if (for
# instance) a package temporarily disappears from the source channel,
# or if multiple instances of this script are running concurrently.
my (%dummy, %allPatches);
readManifest($allPatchesManifest, \%dummy, \%allPatches)
if $allPatchesManifest ne "" && -f $allPatchesManifest;
propagatePatches \%allPatches, \%narFiles, \%patches;
# Make the temporary manifest available.
writeManifest("$dstChannelPath/MANIFEST", \%narFiles, \%patches);

2
mirror-nixos-branch.sh
View file

@ -60,7 +60,7 @@ else
perl -w ./mirror-channel.pl "$url/channel" "$tmpDir" \
nix-cache http://cache.nixos.org \
/data/releases/patches/all-patches "$url/job/nixos.channel/download/1"
"$url/job/nixos.channel/download/1"
# Generate the programs.sqlite database and put it in nixexprs.tar.xz.
mkdir $tmpDir/unpack

2
mirror-nixpkgs.sh
View file

@ -31,7 +31,7 @@ else
perl -w ./mirror-channel.pl "$url/channel" "$tmpDir" \
nix-cache http://cache.nixos.org \
/data/releases/patches/all-patches "$url/job/tarball/download/1"
"$url/job/tarball/download/1"
# Extract the manual.
$curl -L $url/job/manual/output/out | bzip2 -d | nix-store --restore $tmpDir/foo