diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-16 15:40:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-16 15:40:55 +0000 |
| commit | d113da8babd02f5d09bb9ee5e111509f50bceb2e (patch) | |
| tree | e523bb4cd8ec039b3551985fa5c1f9a61df2fffe | |
| parent | e535bc8ad0844af4a9ac6b919ca2c266a6d5e124 (diff) | |
* Added a Nix expression for Nix.
svn path=/nixpkgs/trunk/; revision=790
| -rwxr-xr-x | pkgs/misc/nix/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/misc/nix/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/system/populate-cache.nix | 1 |
4 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh new file mode 100755 index 0000000000000..aafa61da2caf8 --- /dev/null +++ b/pkgs/misc/nix/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh -e + +. $stdenv/setup + +tar xvfj $src +cd nix-* +./configure --prefix=$out \ + --with-store-dir=/nix/store --localstatedir=/nix/var +make +make install diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix new file mode 100644 index 0000000000000..2dff0ae6e3657 --- /dev/null +++ b/pkgs/misc/nix/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl}: + +derivation { + name = "nix-0.5pre789"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre789/nix-0.5pre789.tar.bz2; + md5 = "1c5c1cd6e8bf9b68cc9df3b70017ce15"; + }; + inherit stdenv; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 8dfa47e8521f2..beb669b6f0824 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -661,4 +661,8 @@ patch = gnupatch; }; + nix = (import ../misc/nix) { + inherit fetchurl stdenv; + }; + } diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index ca72269d70af0..56508f9cdda2f 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -46,5 +46,6 @@ let { pkgs.hello pkgs.nxml pkgs.uml + pkgs.nix ]; } |