dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Nix 0.13.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18175
This commit is contained in:
Eelco Dolstra 2009-11-05 23:47:53 +00:00
parent dca59abcca
commit ade60645af
2 changed files with 12 additions and 5 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

@ -4,14 +4,14 @@
, supportOldDBs ? true , supportOldDBs ? true
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "nix-0.12"; name = "nix-0.13";
src = fetchurl { src = fetchurl {
url = http://nixos.org/releases/nix/nix-0.12/nix-0.12.tar.bz2; url = "http://hydra.nixos.org/build/118589/download/4/${name}.tar.bz2";
sha256 = "44454670876ad0e96d551c94ba993903b84594ccf57fef17bc2d92b1f6b155b1"; sha256 = "6da44cacb7185e67dff39a2339c42f9c722081bac0dc593565bd89674beb1f94";
}; };
buildInputs = [perl curl openssl]; buildInputs = [perl curl openssl];
configureFlags = '' configureFlags = ''
@ -21,6 +21,10 @@ stdenv.mkDerivation {
--disable-init-state --disable-init-state
''; '';
doCheck = true;
passthru = { inherit aterm; };
meta = { meta = {
description = "The Nix Deployment System"; description = "The Nix Deployment System";
homepage = http://nixos.org/; homepage = http://nixos.org/;

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

@ -8450,6 +8450,8 @@ let
}; };
# The bleeding edge. # The bleeding edge.
nixUnstable = nix;
/*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm242fixes; aterm = aterm242fixes;
@ -8458,6 +8460,7 @@ let
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
*/
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {