diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b7a4fee6b0..7f09d5898d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1440,11 +1440,7 @@ let xpf = import ../tools/text/xml/xpf { inherit fetchurl stdenv python; - - libxml2 = import ../development/libraries/libxml2 { - inherit fetchurl stdenv zlib python; - pythonSupport = true; - }; + libxml2 = libxml2Python; }; xsel = import ../tools/misc/xsel { @@ -3585,15 +3581,14 @@ let inherit fetchurl stdenv libtool; }; - libxml2 = import ../development/libraries/libxml2 { + libxml2 = makeOverridable (import ../development/libraries/libxml2) { inherit fetchurl stdenv zlib python; pythonSupport = false; }; - libxml2Python = lowPrio (appendToName "with-python" (import ../development/libraries/libxml2 { - inherit fetchurl stdenv zlib python; + libxml2Python = libxml2.override { pythonSupport = true; - })); + }; libxslt = import ../development/libraries/libxslt { inherit fetchurl stdenv libxml2; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e2b1376c607..3f766da4c66 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -341,11 +341,11 @@ in { haskellPackages_ghc6102 = { darcs = ghcSupported; ghc = ghcSupported; - gtk2hs = ghcSupported; - leksah = ghcSupported; + gtk2hs = linux; + leksah = linux; lhs2tex = ghcSupported; haskellPlatform = ghcSupported; - xmonad = ghcSupported; + xmonad = linux; }; kde3 = {