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

Remove all references to haskell-ng and haskellngPackages from Nixpkgs.

Browse Source
This commit is contained in:
Peter Simons 2015-09-15 11:46:20 +02:00
parent 21a3ebd013
commit 8836c58dc0
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/yi/wrapper.nix
View File

@ -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 # To use this for hacking of your Yi config file, drop into a shell
# with env attribute. # with env attribute.
{ stdenv, makeWrapper { stdenv, makeWrapper

2
pkgs/applications/kde-apps-15.04/packages.sh
View File

@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/applications/15.04.3/" \ "${KDE_MIRROR}/stable/applications/15.04.3/" \
"$@" -A '*.tar.xz' "$@" -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 $AUTONIX_DEPS_KF5 manifest.json

2
pkgs/desktops/plasma-5.3/packages.sh
View File

@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.2/" \ "${KDE_MIRROR}/stable/plasma/5.3.2/" \
"$@" -A '*.tar.xz' "$@" -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 $AUTONIX_DEPS_KF5 manifest.json

2
pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
View File

@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX
autonixDepsKf5="" autonixDepsKf5=""
if [[ -z $1 ]]; then if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
else else
autonixDepsKF5="$1/dist/build/kf5-deps" autonixDepsKF5="$1/dist/build/kf5-deps"
fi fi

2
pkgs/development/libraries/kde-frameworks-5.10/packages.sh
View File

@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.10/" \ "${KDE_MIRROR}/stable/frameworks/5.10/" \
"$@" -A '*.tar.xz' "$@" -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 $AUTONIX_DEPS_KF5 manifest.json

2
pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
View File

@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX
autonixDepsKf5="" autonixDepsKf5=""
if [[ -z $1 ]]; then if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
else else
autonixDepsKF5="$1/dist/build/kf5-deps" autonixDepsKF5="$1/dist/build/kf5-deps"
fi fi

2
pkgs/development/libraries/kde-frameworks-5.12/packages.sh
View File

@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.12/" \ "${KDE_MIRROR}/stable/frameworks/5.12/" \
"$@" -A '*.tar.xz' "$@" -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 $AUTONIX_DEPS_KF5 manifest.json

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

@ -809,7 +809,7 @@ let
dfilemanager = callPackage ../applications/misc/dfilemanager { }; dfilemanager = callPackage ../applications/misc/dfilemanager { };
diagrams-builder = callPackage ../tools/graphics/diagrams-builder { diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellngPackages) ghcWithPackages diagrams-builder; inherit (haskellPackages) ghcWithPackages diagrams-builder;
}; };
dialog = callPackage ../development/tools/misc/dialog { }; dialog = callPackage ../development/tools/misc/dialog { };

2
pkgs/top-level/release.nix
View File

@ -213,7 +213,7 @@ let
gnome_vfs = linux; gnome_vfs = linux;
}; };
haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler; haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages; haskellPackages = packagePlatforms pkgs.haskellPackages;
strategoPackages = { strategoPackages = {