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

nix 0.15pre20231 as nixUnstable

Browse Source 
svn path=/nixpkgs/trunk/; revision=20243
This commit is contained in:
Rob Vermaas 2010-02-25 10:01:33 +00:00
parent 7d898c52df
commit c4332bb7a1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.14pre19767"; name = "nix-0.15pre20231";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/278172/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/303065/download/4/${name}.tar.bz2";
sha256 = "787f39d66b9548c8f56166e280ef53b3696e90d99b79f926e504235760146e04"; sha256 = "ecdb6669f98030b5e3c1aefed971e41eebb3a57b381f786637a8468c17d4c7f8";
}; };
buildInputs = [perl curl openssl]; buildInputs = [perl curl openssl];

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

@ -1498,6 +1498,10 @@ let
inherit fetchurl stdenv expat; inherit fetchurl stdenv expat;
}; };
sawmill = import ../tools/networking/sawmill {
inherit fetchurl stdenv mysql zlib openssl;
};
screen = import ../tools/misc/screen { screen = import ../tools/misc/screen {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
@ -1753,6 +1757,10 @@ let
inherit stdenv fetchurl neon fuse pkgconfig glib; inherit stdenv fetchurl neon fuse pkgconfig glib;
}; };
webalizer = import ../tools/networking/webalizer {
inherit stdenv fetchurl zlib libpng gd db4 geoip;
};
webdruid = builderDefsPackage ../tools/admin/webdruid { webdruid = builderDefsPackage ../tools/admin/webdruid {
inherit zlib libpng freetype gd which inherit zlib libpng freetype gd which
libxml2 geoip; libxml2 geoip;
@ -6808,7 +6816,7 @@ let
chrome = import ../applications/networking/browsers/chromium { chrome = import ../applications/networking/browsers/chromium {
inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng; inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng;
inherit (xlibs) libX11 libXext libXrender libXt ; inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver;
inherit (gtkLibs) gtk glib pango atk; inherit (gtkLibs) gtk glib pango atk;
inherit (gnome) GConf; inherit (gnome) GConf;
libjpeg = libjpeg62; libjpeg = libjpeg62;
@ -8949,14 +8957,11 @@ 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 aterm; inherit fetchurl stdenv perl curl bzip2 openssl aterm;
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 {