about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-04-28 23:18:24 +0200
committerSilvan Mosberger <infinisil@icloud.com>2019-04-28 23:18:24 +0200
commit4e5dc335e5c368db5a9991f9060b9b261367e2c8 (patch)
treeb376a28bd6bbeb53e50f5aa831ca8ff2ec6b25fc
parent02c823a541782d8263b365513af5f31c247bd1db (diff)
downloadnixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar.gz
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar.bz2
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar.lz
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar.xz
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.tar.zst
nixlib-4e5dc335e5c368db5a9991f9060b9b261367e2c8.zip
leksah: Point to upstream repository for using it
The build in nixpkgs was broken for forever. Trying to fix it would be
painful, as leksah uses a lot of overrides and custom versions. In
addition, leksah works best with the GHC version matching your project,
which means we'd have to make sure it builds for each of our GHC
versions.
-rw-r--r--pkgs/development/tools/haskell/leksah/default.nix21
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
deleted file mode 100644
index ec2fb334a3b3..000000000000
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, ghcWithPackages, gtk3, makeWrapper }:
-
-let
-leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
-in stdenv.mkDerivation {
-  name = "leksah-${leksahEnv.version}";
-
-  buildInputs = [ gtk3 ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out/bin
-    makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \
-      --prefix PATH : "${leksahEnv}/bin" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = {
-    broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81eab30b55d0..ca5b8dd0fe57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12726,9 +12726,8 @@ in
 
   lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
 
-  leksah = callPackage ../development/tools/haskell/leksah {
-    inherit (haskellPackages) ghcWithPackages;
-  };
+  leksah = throw ("To use leksah, refer to the instructions in " +
+    "https://github.com/leksah/leksah.");
 
   libgme = callPackage ../development/libraries/audio/libgme { };