public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: Update to 1.2

Browse Source
This commit is contained in:
Eelco Dolstra
2012-12-07 13:46:07 +01:00
parent 88ca46bfa0
commit 1c24391251
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/default.nix
+10 -8
View File
@@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.1"; name = "nix-1.2";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324"; sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5";
}; };
buildNativeInputs = [ perl pkgconfig ]; buildNativeInputs = [ perl pkgconfig ];
@@ -27,8 +27,9 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
'' ''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
CFLAGS=-O3 CXXFLAGS=-O3 CFLAGS=-O3 CXXFLAGS=-O3
@@ -45,15 +46,16 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
'' ''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
CFLAGS=-O3 CXXFLAGS=-O3 CFLAGS=-O3 CXXFLAGS=-O3
'' + stdenv.lib.optionalString ( '' + stdenv.lib.optionalString (
stdenv.cross ? nix && stdenv.cross.nix ? system stdenv.cross ? nix && stdenv.cross.nix ? system
) ''--with-system=${stdenv.cross.nix.system}''; ) ''--with-system=${stdenv.cross.nix.system}'';
doInstallCheck = false; doInstallCheck = false;
}; };
pkgs/top-level/all-packages.nix
+4
View File
@@ -8841,10 +8841,14 @@ let
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
}; };
nixUnstable = nixStable;
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = config.nix.storeDir or "/nix/store"; storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
}; };
*/
nut = callPackage ../applications/misc/nut { }; nut = callPackage ../applications/misc/nut { };