From 8836c58dc07989e0d01b36147f3ca84aa2e4cfd7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Sep 2015 11:46:20 +0200 Subject: [PATCH] Remove all references to haskell-ng and haskellngPackages from Nixpkgs. --- pkgs/applications/editors/yi/wrapper.nix | 3 --- pkgs/applications/kde-apps-15.04/packages.sh | 2 +- pkgs/desktops/plasma-5.3/packages.sh | 2 +- pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh | 2 +- pkgs/development/libraries/kde-frameworks-5.10/packages.sh | 2 +- pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh | 2 +- pkgs/development/libraries/kde-frameworks-5.12/packages.sh | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/release.nix | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index a4dc3fe367a..916f296b3fc 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -1,6 +1,3 @@ -# Note: this relies on dyre patched for NIX_GHC which is done in -# haskell-ng only. -# # To use this for hacking of your Yi config file, drop into a shell # with env attribute. { stdenv, makeWrapper diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh index 875141341a7..a18324e513f 100755 --- a/pkgs/applications/kde-apps-15.04/packages.sh +++ b/pkgs/applications/kde-apps-15.04/packages.sh @@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.3/" \ "$@" -A '*.tar.xz' -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} $AUTONIX_DEPS_KF5 manifest.json diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh index c43c47296d6..68b20c49df9 100755 --- a/pkgs/desktops/plasma-5.3/packages.sh +++ b/pkgs/desktops/plasma-5.3/packages.sh @@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \ "${KDE_MIRROR}/stable/plasma/5.3.2/" \ "$@" -A '*.tar.xz' -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} $AUTONIX_DEPS_KF5 manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh index 2b220244c59..6122ddf4b3a 100755 --- a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh +++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh @@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX autonixDepsKf5="" if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin + autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin else autonixDepsKF5="$1/dist/build/kf5-deps" fi diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh index 6889773a55e..9d226db2c04 100755 --- a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh +++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh @@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \ "${KDE_MIRROR}/stable/frameworks/5.10/" \ "$@" -A '*.tar.xz' -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} $AUTONIX_DEPS_KF5 manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh index 2b220244c59..6122ddf4b3a 100755 --- a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh +++ b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh @@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX autonixDepsKf5="" if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin + autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin else autonixDepsKF5="$1/dist/build/kf5-deps" fi diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh index 7cce2d05fc9..b859a87f32f 100755 --- a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh +++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh @@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \ "${KDE_MIRROR}/stable/frameworks/5.12/" \ "$@" -A '*.tar.xz' -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} $AUTONIX_DEPS_KF5 manifest.json diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af367e3d49e..7fee06cda0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -809,7 +809,7 @@ let dfilemanager = callPackage ../applications/misc/dfilemanager { }; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { - inherit (haskellngPackages) ghcWithPackages diagrams-builder; + inherit (haskellPackages) ghcWithPackages diagrams-builder; }; dialog = callPackage ../development/tools/misc/dialog { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8d26d08a2c9..cb09a69136e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -213,7 +213,7 @@ let gnome_vfs = linux; }; - haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler; + haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; strategoPackages = {