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

nix: Update to 1.8

Browse Source
This commit is contained in:
Eelco Dolstra 2014-12-14 05:29:24 +01:00
parent 188c038897
commit e115bdecd8
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/package-management/nix/default.nix
View File

@ -5,16 +5,18 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.7"; name = "nix-1.8";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92"; sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c";
}; };
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ curl openssl boehmgc sqlite ]; buildInputs = [ curl openssl sqlite ];
propagatedBuildInputs = [ boehmgc ];
# Note: bzip2 is not passed as a build input, because the unpack phase # Note: bzip2 is not passed as a build input, because the unpack phase
# would end up using the wrong bzip2 when cross-compiling. # would end up using the wrong bzip2 when cross-compiling.
@ -22,6 +24,7 @@ stdenv.mkDerivation rec {
postUnpack = postUnpack =
'' export CPATH="${bzip2}/include" '' export CPATH="${bzip2}/include"
export LIBRARY_PATH="${bzip2}/lib" export LIBRARY_PATH="${bzip2}/lib"
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
''; '';
configureFlags = configureFlags =
@ -32,7 +35,6 @@ stdenv.mkDerivation rec {
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
CFLAGS=-O3 CXXFLAGS=-O3
''; '';
makeFlags = "profiledir=$(out)/etc/profile.d"; makeFlags = "profiledir=$(out)/etc/profile.d";
@ -55,7 +57,6 @@ stdenv.mkDerivation rec {
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
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}'';
@ -66,9 +67,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
# due to builder args bug; see
# https://github.com/NixOS/nix/commit/b224ac15201c57b40ea855f5a98b1bd166c1c7f6
broken = stdenv.isDarwin;
description = "Powerful package manager that makes package management reliable and reproducible"; description = "Powerful package manager that makes package management reliable and reproducible";
longDescription = '' longDescription = ''
Nix is a powerful package manager for Linux and other Unix systems that Nix is a powerful package manager for Linux and other Unix systems that

6
pkgs/tools/package-management/nix/unstable.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
, pkgconfig, boehmgc, perlPackages, bash , pkgconfig, boehmgc, perlPackages
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
postUnpack = postUnpack =
'' export CPATH="${bzip2}/include" '' export CPATH="${bzip2}/include"
export LIBRARY_PATH="${bzip2}/lib" export LIBRARY_PATH="${bzip2}/lib"
export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal" export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
''; '';
configureFlags = configureFlags =
@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
CFLAGS=-O3
''; '';
makeFlags = "profiledir=$(out)/etc/profile.d"; makeFlags = "profiledir=$(out)/etc/profile.d";
@ -58,7 +57,6 @@ stdenv.mkDerivation rec {
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state --disable-init-state
--enable-gc --enable-gc
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}'';

3
pkgs/top-level/all-packages.nix
View File

@ -12590,10 +12590,13 @@ let
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
}; };
/*
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";
}; };
*/
nixUnstable = nixStable;
nixops = callPackage ../tools/package-management/nixops { }; nixops = callPackage ../tools/package-management/nixops { };