Remove all references to haskell-ng and haskellngPackages from Nixpkgs.
This commit is contained in:
parent
21a3ebd013
commit
8836c58dc0
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 { };
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue