mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-22 14:06:16 +02:00
* Working derivate sharing.
This commit is contained in:
parent
81304a6bb5
commit
9bcc31c941
2 changed files with 23 additions and 4 deletions
|
@ -7,6 +7,7 @@ my $tmpfile = "$prefix/var/nix/pull.tmp";
|
||||||
my $conffile = "$etcdir/prebuilts.conf";
|
my $conffile = "$etcdir/prebuilts.conf";
|
||||||
|
|
||||||
my @subs;
|
my @subs;
|
||||||
|
my @sucs;
|
||||||
|
|
||||||
open CONFFILE, "<$conffile";
|
open CONFFILE, "<$conffile";
|
||||||
|
|
||||||
|
@ -30,8 +31,9 @@ while (<CONFFILE>) {
|
||||||
my $fn = $1;
|
my $fn = $1;
|
||||||
next if $fn =~ /\.\./;
|
next if $fn =~ /\.\./;
|
||||||
next if $fn =~ /\//;
|
next if $fn =~ /\//;
|
||||||
next unless $fn =~ /([0-9a-z]{32})-([0-9a-z]{32})\.nar/;
|
next unless $fn =~ /-([0-9a-z]{32})(-s-([0-9a-z]{32}))?\.nar/;
|
||||||
my $hash = $2;
|
my $hash = $1;
|
||||||
|
my $fshash = $3;
|
||||||
|
|
||||||
print "registering $hash -> $url/$fn\n";
|
print "registering $hash -> $url/$fn\n";
|
||||||
|
|
||||||
|
@ -60,6 +62,12 @@ while (<CONFFILE>) {
|
||||||
push @subs, $hash;
|
push @subs, $hash;
|
||||||
push @subs, $nhash;
|
push @subs, $nhash;
|
||||||
|
|
||||||
|
# Does the name encode a successor relation?
|
||||||
|
if (defined $fshash) {
|
||||||
|
print "NORMAL $fshash -> $hash\n";
|
||||||
|
push @sucs, $fshash;
|
||||||
|
push @sucs, $hash;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close INDEX;
|
close INDEX;
|
||||||
|
@ -71,3 +79,6 @@ while (<CONFFILE>) {
|
||||||
|
|
||||||
system "nix --substitute @subs";
|
system "nix --substitute @subs";
|
||||||
if ($?) { die "`nix --substitute' failed"; }
|
if ($?) { die "`nix --substitute' failed"; }
|
||||||
|
|
||||||
|
system "nix --successor @sucs";
|
||||||
|
if ($?) { die "`nix --successor' failed"; }
|
||||||
|
|
|
@ -27,11 +27,19 @@ foreach my $hash (@ARGV) {
|
||||||
chomp $phash;
|
chomp $phash;
|
||||||
die unless $phash =~ /^([0-9a-z]{32})$/;
|
die unless $phash =~ /^([0-9a-z]{32})$/;
|
||||||
|
|
||||||
# Construct a Fix expression that creates a Nar archive.
|
# Construct a name for the Nix archive. If the file is an
|
||||||
|
# fstate successor, encode this into the name.
|
||||||
|
my $name = $phash;
|
||||||
|
if ($path =~ /-s-([0-9a-z]{32}).nix$/) {
|
||||||
|
$name = "$name-s-$1";
|
||||||
|
}
|
||||||
|
$name = $name . ".nar";
|
||||||
|
|
||||||
|
# Construct a Fix expression that creates a Nix archive.
|
||||||
my $fixexpr =
|
my $fixexpr =
|
||||||
"App(IncludeFix(\"nar/nar.fix\"), " .
|
"App(IncludeFix(\"nar/nar.fix\"), " .
|
||||||
"[ (\"path\", Path(\"$path\", Hash(\"$phash\"), [Include(\"$hash\")]))" .
|
"[ (\"path\", Path(\"$path\", Hash(\"$phash\"), [Include(\"$hash\")]))" .
|
||||||
", (\"name\", \"$phash.nar\")" .
|
", (\"name\", \"$name\")" .
|
||||||
"])";
|
"])";
|
||||||
|
|
||||||
my $fixfile = "/tmp/nix-push-tmp.fix";
|
my $fixfile = "/tmp/nix-push-tmp.fix";
|
||||||
|
|
Loading…
Reference in a new issue