[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
225/376: Pass through --set from nix-install-package command line to nix
From: |
Ludovic Courtès |
Subject: |
225/376: Pass through --set from nix-install-package command line to nix-env |
Date: |
Wed, 28 Jan 2015 22:05:13 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 9dd54bc7bbc404e8e4513b712e0af9ac5b4439bd
Author: Shell Turner <address@hidden>
Date: Tue Sep 16 18:05:00 2014 +0100
Pass through --set from nix-install-package command line to nix-env
---
scripts/nix-install-package.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in
index 23f6efb..c109652 100755
--- a/scripts/nix-install-package.in
+++ b/scripts/nix-install-package.in
@@ -15,6 +15,7 @@ my $source;
my $fromURL = 0;
my @extraNixEnvArgs = ();
my $interactive = 1;
+my $op = "--install";
while (scalar @args) {
my $arg = shift @args;
@@ -29,6 +30,9 @@ while (scalar @args) {
die "$0: ‘--profile’ requires an argument\n" if !defined $profile;
push @extraNixEnvArgs, "-p", $profile;
}
+ elsif ($arg eq "--set") {
+ $op = "--set";
+ }
elsif ($arg eq "--non-interactive") {
$interactive = 0;
}
@@ -129,7 +133,7 @@ if (defined $binaryCacheURL) {
print "\nInstalling package...\n";
-system("$Nix::Config::binDir/nix-env", "--install", $outPath, "--force-name",
$drvName, @extraNixEnvArgs) == 0
+system("$Nix::Config::binDir/nix-env", $op, $outPath, "--force-name",
$drvName, @extraNixEnvArgs) == 0
or barf "nix-env failed: $?";
- 205/376: Update spec file, (continued)
- 205/376: Update spec file, Ludovic Courtès, 2015/01/28
- 201/376: Add Make flag to disable optimization, Ludovic Courtès, 2015/01/28
- 213/376: configure: Force regeneration of Makefile.config, Ludovic Courtès, 2015/01/28
- 212/376: attrNames: Don't allocate duplicates of the symbols, Ludovic Courtès, 2015/01/28
- 216/376: Handle cycles when printing a value, Ludovic Courtès, 2015/01/28
- 211/376: Fix off-by-one, Ludovic Courtès, 2015/01/28
- 215/376: Add ‘seq’ primop, Ludovic Courtès, 2015/01/28
- 209/376: Store Attrs inside Bindings, Ludovic Courtès, 2015/01/28
- 208/376: Remove bogus comment, Ludovic Courtès, 2015/01/28
- 219/376: Add ‘deepSeq’ primop, Ludovic Courtès, 2015/01/28
- 225/376: Pass through --set from nix-install-package command line to nix-env,
Ludovic Courtès <=
- 214/376: Add a function ‘valueSize’, Ludovic Courtès, 2015/01/28
- 145/376: Use proper quotes everywhere, Ludovic Courtès, 2015/01/28
- 226/376: Add --force-name support for --set in nix-env, to support nix-install-package --set, Ludovic Courtès, 2015/01/28
- 220/376: Don't evaluate inside a "throw", Ludovic Courtès, 2015/01/28
- 217/376: Rename strictForceValue -> forceValueDeep, Ludovic Courtès, 2015/01/28
- 227/376: Updated documentation for nix-install-package to mention --set flag, Ludovic Courtès, 2015/01/28
- 228/376: Fix use of PAGER during tests, Ludovic Courtès, 2015/01/28
- 221/376: Remove release notes Hydra product, Ludovic Courtès, 2015/01/28
- 218/376: Make forceValueDeep work on values with cycles, Ludovic Courtès, 2015/01/28
- 229/376: Remove bash requirement, Ludovic Courtès, 2015/01/28