diff --git a/pkgs-ng/stdenv/nix-linux/default.fix b/pkgs-ng/stdenv/nix-linux/default.fix index 9c4490847a0..305a9081869 100644 --- a/pkgs-ng/stdenv/nix-linux/default.fix +++ b/pkgs-ng/stdenv/nix-linux/default.fix @@ -3,19 +3,7 @@ system = bootStdenv.system; prehook = ./prehook.sh; posthook = ./posthook.sh; - initialPath = [ - pkgs.coreutils - pkgs.findutils - pkgs.diffutils - pkgs.gnused - pkgs.gnugrep - pkgs.gawk - pkgs.gnutar - pkgs.gzip - pkgs.binutils - pkgs.gnumake - pkgs.gcc - ]; + initialPath = (import ../nix/path.fix) {pkgs = pkgs}; param1 = pkgs.bash; param2 = pkgs.gcc; param3 = pkgs.binutils; diff --git a/pkgs-ng/stdenv/nix/default.fix b/pkgs-ng/stdenv/nix/default.fix index f06dd332570..e7f343d375f 100644 --- a/pkgs-ng/stdenv/nix/default.fix +++ b/pkgs-ng/stdenv/nix/default.fix @@ -3,19 +3,7 @@ system = bootStdenv.system; prehook = ./prehook.sh; posthook = ./posthook.sh; - initialPath = [ - pkgs.coreutils - pkgs.findutils - pkgs.diffutils - pkgs.gnused - pkgs.gnugrep - pkgs.gawk - pkgs.gnutar - pkgs.gzip - pkgs.binutils - pkgs.gnumake - pkgs.gcc - ]; + initialPath = (import ./path.fix) {pkgs = pkgs}; param1 = pkgs.bash; param2 = pkgs.gcc; param3 = pkgs.binutils; diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix index 64e9fb3109c..85186e97325 100644 --- a/pkgs-ng/system/all-packages-generic.fix +++ b/pkgs-ng/system/all-packages-generic.fix @@ -4,8 +4,6 @@ {system, stdenv}: rec { - subversion = "./xxxxxxxxxxxxxx/y/z/a/b/c/d/e/ffffffffffffffffffffff"; - ### BUILD SUPPORT fetchurl = (import ../build-support/fetchurl) { @@ -115,7 +113,7 @@ ### APPLICATIONS -/* subversion = (import ../applications/version-management/subversion) { + subversion = (import ../applications/version-management/subversion) { fetchurl = fetchurl; stdenv = stdenv; localServer = false; @@ -128,6 +126,6 @@ libxml2 = ""; expat = ""; swig = ""; - }; */ + }; } diff --git a/pkgs-ng/system/user-environment.fix b/pkgs-ng/system/user-environment.fix index 8e93fcd0bb4..942d0a4fefa 100644 --- a/pkgs-ng/system/user-environment.fix +++ b/pkgs-ng/system/user-environment.fix @@ -12,6 +12,7 @@ # management user interface. selectedPkgs = [ pkgs.aterm +# pkgs.subversion ]; # Create a user environment. diff --git a/pkgs-ng/tools/compression/bzip2/default.fix b/pkgs-ng/tools/compression/bzip2/default.fix index f49e057f707..1684edd1659 100644 --- a/pkgs-ng/tools/compression/bzip2/default.fix +++ b/pkgs-ng/tools/compression/bzip2/default.fix @@ -1,10 +1,10 @@ -{stdenv, fetchurl}: derivation - { name = "bzip2-1.0.2" - , system = stdenv.system - , builder = ./builder.sh - , src = fetchurl - { url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz - , md5 = "ee76864958d568677f03db8afad92beb" - } - , stdenv = stdenv - } +{stdenv, fetchurl}: derivation { + name = "bzip2-1.0.2"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz; + md5 = "ee76864958d568677f03db8afad92beb"; + }; + stdenv = stdenv; +}