* Compress Nix archives when pushing them.
This commit is contained in:
parent
9bcc31c941
commit
822c072cfa
4 changed files with 7 additions and 5 deletions
|
@ -1,3 +1,3 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
/tmp/nix/bin/nix --dump --file "$path" > $out || exit 1
|
/tmp/nix/bin/nix --dump --file "$path" | bzip2 > $out || exit 1
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
/tmp/nix/bin/nix --restore "$out" < $nar || exit 1
|
bunzip2 < $nar | /tmp/nix/bin/nix --restore "$out" || exit 1
|
||||||
|
|
|
@ -31,7 +31,7 @@ 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})(-s-([0-9a-z]{32}))?\.nar/;
|
next unless $fn =~ /-([0-9a-z]{32})(-s-([0-9a-z]{32}))?\.nar.bz2$/;
|
||||||
my $hash = $1;
|
my $hash = $1;
|
||||||
my $fshash = $3;
|
my $fshash = $3;
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ foreach my $hash (@ARGV) {
|
||||||
if ($path =~ /-s-([0-9a-z]{32}).nix$/) {
|
if ($path =~ /-s-([0-9a-z]{32}).nix$/) {
|
||||||
$name = "$name-s-$1";
|
$name = "$name-s-$1";
|
||||||
}
|
}
|
||||||
$name = $name . ".nar";
|
$name = $name . ".nar.bz2";
|
||||||
|
|
||||||
# Construct a Fix expression that creates a Nix archive.
|
# Construct a Fix expression that creates a Nix archive.
|
||||||
my $fixexpr =
|
my $fixexpr =
|
||||||
|
@ -65,4 +65,6 @@ foreach my $hash (@ARGV) {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Push the prebuilts to the server. !!! FIXME
|
# Push the prebuilts to the server. !!! FIXME
|
||||||
system "rsync -av -e ssh @pushlist eelco\@losser.st-lab.cs.uu.nl:/home/eelco/public_html/nix-dist/";
|
if (scalar @pushlist > 0) {
|
||||||
|
system "rsync -av -e ssh @pushlist eelco\@losser.st-lab.cs.uu.nl:/home/eelco/public_html/nix-dist/";
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue