Branch: refs/heads/master
Home: https://github.com/NixOS/nix
Commit: e19fb7ebedabf5109379b80c5e42e89fa4437276
https://github.com/NixOS/nix/commit/e19fb7ebedabf5109379b80c5e42e89fa4437276
Author: Eelco Dolstra <[email protected]>
Date: 2012-05-01 (Tue, 01 May 2012)
Changed paths:
M release.nix
Log Message:
-----------
Do "make installcheck" for RPM builds
diff --git a/release.nix b/release.nix
index c0e423b..77579a1 100644
--- a/release.nix
+++ b/release.nix
@@ -180,6 +180,7 @@ let
{ extraPackages = [ "perl-DBD-SQLite" "perl-devel" "sqlite"
"sqlite-devel" "bzip2-devel" ]; };
memSize = 1024;
meta.schedulingPriority = prio;
+ postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck";
};
================================================================
Commit: e060c99447a445bbf1c527b8c712e3bf809ee694
https://github.com/NixOS/nix/commit/e060c99447a445bbf1c527b8c712e3bf809ee694
Author: Eelco Dolstra <[email protected]>
Date: 2012-05-01 (Tue, 01 May 2012)
Changed paths:
M scripts/nix-channel.in
Log Message:
-----------
Use mkpath instead of make_path
Perl <= 5.10 doesn't have make_path. See
e.g. http://hydra.nixos.org/build/2493981.
diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index 524ffa6..8f0fbba 100755
--- a/scripts/nix-channel.in
+++ b/scripts/nix-channel.in
@@ -2,7 +2,7 @@
use strict;
use File::Basename;
-use File::Path qw(make_path);
+use File::Path qw(mkpath);
use Nix::Config;
my $manifestDir = $Nix::Config::manifestDir;
@@ -21,7 +21,7 @@ my $nixDefExpr = "$home/.nix-defexpr";
# Figure out the name of the channels profile.
my $userName = getpwuid($<) or die "cannot figure out user name";
my $profile = "$Nix::Config::stateDir/profiles/per-user/$userName/channels";
-make_path(dirname $profile, mode => 0755);
+mkpath(dirname $profile, 0, 0755);
my %channels;
================================================================
Compare: https://github.com/NixOS/nix/compare/e145ac3...e060c99
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
