diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/nix-push.in | 30 | ||||
| -rwxr-xr-x | scripts/nix-switch.in | 8 |
2 files changed, 24 insertions, 14 deletions
diff --git a/scripts/nix-push.in b/scripts/nix-push.in index bb25019e8d35..4a6426fe0aed 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -8,17 +8,28 @@ foreach my $id (@ARGV) { # Get all paths referenced by the normalisation of the given # fstate expression. - system "nix -ih $id"; - if ($?) { die "`nix -ih' failed"; } + system "nix --install $id"; + if ($?) { die "`nix --install' failed"; } + my @paths; - open PATHS, "nix -qrh $id 2> /dev/null |" or die "nix -qrh"; + + open PATHS, "nix --query --refs $id 2> /dev/null |" or die "nix -qr"; while (<PATHS>) { chomp; - next unless /^\//; + die "bad: $_" unless /^\//; push @paths, $_; } close PATHS; + # Also add all normal forms that are contained in these paths. + open PATHS, "nix --query --generators --path @paths |" or die "nix -qg"; + while (<PATHS>) { + chomp; + die "bad: $_" unless /^\//; + push @paths, $_; + } + close PATHS; + # For each path, create a Fix expression that turns the path into # a Nix archive. foreach my $path (@paths) { @@ -38,7 +49,6 @@ foreach my $id (@ARGV) { my $fixexpr = "App(IncludeFix(\"nar/nar.fix\"), " . "[ (\"path\", Slice([\"$pathid\"], [(\"$path\", \"$pathid\", [])]))" . - ", (\"name\", \"$name\")" . "])"; my $fixfile = "/tmp/nix-push-tmp.fix"; @@ -53,13 +63,13 @@ foreach my $id (@ARGV) { die unless $nid =~ /^([0-9a-z]{32})$/; # Realise the Nix expression. - system "nix -ih $nid"; - if ($?) { die "`nix -ih' failed"; } - my $npath = `nix -qph $nid 2> /dev/null`; - $? and die "creating Nix archive"; + system "nix --install $nid"; + if ($?) { die "`nix --install' failed"; } + my $npath = `nix --query --list $nid 2> /dev/null`; + $? and die "`nix --query --list' failed"; chomp $npath; - push @pushlist, $npath; + push @pushlist, "$npath/*"; print "$path -> $npath\n"; } diff --git a/scripts/nix-switch.in b/scripts/nix-switch.in index 2ccb6b4e5786..ddaca4e227ad 100755 --- a/scripts/nix-switch.in +++ b/scripts/nix-switch.in @@ -15,11 +15,11 @@ $hash || die "no package hash specified"; my $linkdir = "@localstatedir@/nix/links"; # Build the specified package, and all its dependencies. -system "nix -ih $hash"; -if ($?) { die "`nix -ih' failed"; } +system "nix --install $hash"; +if ($?) { die "`nix --install' failed"; } -my $pkgdir = `nix -qph $hash`; -if ($?) { die "`nix -qph' failed"; } +my $pkgdir = `nix --query --list $hash`; +if ($?) { die "`nix --query --list' failed"; } chomp $pkgdir; # Figure out a generation number. |