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

Removed references to setup-new-2.sh and setup-new.sh from all-packages.nix

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9737
This commit is contained in:
Yury G. Kudryashov 2007-11-17 14:34:34 +00:00
parent 51a3cde784
commit a4326fe9dc
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ocaml/default.nix
View File

@ -3,5 +3,5 @@ rec {
default = v_3_09_1; default = v_3_09_1;
v_3_08_0 = import ./3.08.0.nix (args // {stdenv = args.stdenv34;}); v_3_08_0 = import ./3.08.0.nix (args // {stdenv = args.stdenv34;});
v_3_09_1 = import ./3.09.1.nix args; v_3_09_1 = import ./3.09.1.nix args;
v_3_10_0 = import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;}); v_3_10_0 = import ./3.10.0.nix args;
} }

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

@ -297,7 +297,7 @@ rec {
stdenvNewSetupScript = overrideSetup stdenv ../stdenv/generic/setup-new.sh; stdenvNewSetupScript = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
substituteAll = import ../build-support/substitute/substitute-all.nix { substituteAll = import ../build-support/substitute/substitute-all.nix {
stdenv = stdenvNewSetupScript; inherit stdenv;
}; };
nukeReferences = import ../build-support/nuke-references/default.nix { nukeReferences = import ../build-support/nuke-references/default.nix {
@ -667,8 +667,7 @@ rec {
}; };
shebangfix = import ../tools/misc/shebangfix { shebangfix = import ../tools/misc/shebangfix {
inherit perl; inherit perl stdenv;
stdenv = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh;
}; };
smartmontools = import ../tools/system/smartmontools { smartmontools = import ../tools/system/smartmontools {
@ -939,23 +938,20 @@ rec {
# This new ghc stuff is under heavy development and might change ! # This new ghc stuff is under heavy development and might change !
# usage: see ghcPkgUtil.sh - use setup-new2 because of PATH_DELIMITER
ghcPkgUtil = runCommand "ghcPkgUtil-internal" ghcPkgUtil = runCommand "ghcPkgUtil-internal"
{ ghcPkgUtil = ../development/libraries/haskell/generic/ghcPkgUtil.sh; } { ghcPkgUtil = ../development/libraries/haskell/generic/ghcPkgUtil.sh; }
"mkdir -p $out/nix-support; cp $ghcPkgUtil \$out/nix-support/setup-hook;"; "mkdir -p $out/nix-support; cp $ghcPkgUtil \$out/nix-support/setup-hook;";
ghcsAndLibs = recurseIntoAttrs (import ../development/compilers/ghcs { ghcsAndLibs = recurseIntoAttrs (import ../development/compilers/ghcs {
inherit ghcboot fetchurl recurseIntoAttrs perl gnum4 gmp readline; inherit ghcboot fetchurl recurseIntoAttrs perl gnum4 gmp readline stdenv;
inherit ghcPkgUtil; inherit ghcPkgUtil;
stdenv = stdenvUsingSetupNew2;
lib = lib_unstable; lib = lib_unstable;
}); });
# creates ghc-X-wl wich adds the passed libraries to the env var GHC_PACKAGE_PATH # creates ghc-X-wl wich adds the passed libraries to the env var GHC_PACKAGE_PATH
createGhcWrapper = { ghcPackagedLibs ? false, ghc, libraries, name, suffix ? "ghc_wrapper_${ghc.name}" } : createGhcWrapper = { ghcPackagedLibs ? false, ghc, libraries, name, suffix ? "ghc_wrapper_${ghc.name}" } :
import ../development/compilers/ghc/createGhcWrapper { import ../development/compilers/ghc/createGhcWrapper {
inherit ghcPackagedLibs ghc name suffix libraries ghcPkgUtil; inherit ghcPackagedLibs ghc name suffix libraries ghcPkgUtil stdenv;
stdenv = stdenvUsingSetupNew2;
}; };
# the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg} # the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg}
@ -1078,7 +1074,7 @@ rec {
ocaml = getVersion "ocaml" ocaml_alts; ocaml = getVersion "ocaml" ocaml_alts;
ocaml_alts = import ../development/compilers/ocaml { ocaml_alts = import ../development/compilers/ocaml {
inherit fetchurl stdenv x11 ncurses stdenvUsingSetupNew2; inherit fetchurl stdenv x11 ncurses;
stdenv34 = overrideGCC stdenv gcc34; stdenv34 = overrideGCC stdenv gcc34;
}; };
@ -1204,9 +1200,8 @@ rec {
# This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need? # This expression is a quick hack now. But perhaps it helps you adding the configuration flags you need?
/* /*
php_unstable = (import ../development/interpreters/php_configurable) { php_unstable = (import ../development/interpreters/php_configurable) {
inherit mkDerivationByConfiguration; inherit mkDerivationByConfiguration stdenv;
lib = lib_unstable; lib = lib_unstable;
stdenv = stdenvUsingSetupNew2;
inherit fetchurl flex bison apacheHttpd mysql; # gettext; inherit fetchurl flex bison apacheHttpd mysql; # gettext;
inherit libxml2; inherit libxml2;
}; };
@ -1686,10 +1681,9 @@ rec {
}; };
facile = import ../development/libraries/facile { facile = import ../development/libraries/facile {
inherit fetchurl; inherit fetchurl stdenv;
# Actually, we don't need this version but we need native-code compilation # Actually, we don't need this version but we need native-code compilation
ocaml = ocaml_alts.v_3_10_0; ocaml = ocaml_alts.v_3_10_0;
stdenv = stdenvUsingSetupNew2;
}; };
ffmpeg = import ../development/libraries/ffmpeg { ffmpeg = import ../development/libraries/ffmpeg {
@ -2194,12 +2188,11 @@ rec {
qt4 = getVersion "qt4" qt4_alts; qt4 = getVersion "qt4" qt4_alts;
qt4_alts = import ../development/libraries/qt-4 { qt4_alts = import ../development/libraries/qt-4 {
inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff; fontconfig freetype pkgconfig libtiff stdenv;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext
inputproto fixesproto libXfixes; inputproto fixesproto libXfixes;
inherit (gnome) glib; inherit (gnome) glib;
stdenv = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh;
openglSupport = mesaSupported; openglSupport = mesaSupported;
mysqlSupport = true; mysqlSupport = true;
}; };
@ -3809,8 +3802,7 @@ rec {
}; };
jedit = import ../applications/jedit { jedit = import ../applications/jedit {
inherit fetchurl ant; inherit fetchurl ant stdenv;
stdenv = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh;
}; };
joe = import ../applications/editors/joe { joe = import ../applications/editors/joe {
@ -4376,8 +4368,7 @@ rec {
shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
saneBackends chmlib python libzip gmp sqlite libidn runCommand lib saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
openbabel ocaml facile; openbabel ocaml facile stdenv;
stdenv = stdenvUsingSetupNew2;
cdparanoia = cdparanoiaIII; cdparanoia = cdparanoiaIII;
inherit (xlibs) inherit (xlibs)
inputproto kbproto scrnsaverproto xextproto xf86miscproto inputproto kbproto scrnsaverproto xextproto xf86miscproto