From 0141f9aca023444eabcf4669c94bb37036208765 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 10 Jun 2022 02:02:19 +0200 Subject: [PATCH] eql: remove --- pkgs/development/compilers/eql/default.nix | 63 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/development/compilers/eql/default.nix diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix deleted file mode 100644 index 044ff1182f2b..000000000000 --- a/pkgs/development/compilers/eql/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }: - -stdenv.mkDerivation rec { - version = "unstable-2012-12-10"; - pname = "eql"; - src = fetchgit { - rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; - url = "https://gitlab.com/eql/eql.git"; - sha256 = "17h23qr7fyr9hvjgiq0yhacmjs43x06vh8978aq42ymcgipxdcww"; - }; - - buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - - env.NIX_CFLAGS_COMPILE = "-fPIC"; - - postPatch = '' - sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp - - # cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24. - find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \; - ''; - - buildPhase = '' - cd src - ecl -shell make-eql-lib.lisp - qmake eql_lib.pro - make - cd .. - - cd src - qmake eql_exe.pro - make - cd .. - cd src - ''; - - installPhase = '' - cd .. - mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib - cp -r . $out/lib/eql/build-dir - ln -s $out/lib/eql/build-dir/eql $out/bin - ln -s $out/lib/eql/build-dir/src/*.h $out/include - ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen - ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib - ''; - - meta = with lib; { - description = "Embedded Qt Lisp (ECL+Qt)"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.mit; - }; - - passthru = { - updateInfo = { - downloadPage = "http://password-taxi.at/EQL"; - method = "fetchgit"; - rev = src.rev; - url = src.url; - hash = src.sha256; - }; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 15e5a985b081..282c02048025 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -482,6 +482,7 @@ mapAliases ({ enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 + eql = throw "eql has been removed from nixpkgs, because it depended on qt4. eql5 exists, but is not currently pacakged in nixpkgs."; # added 2022-05-09 inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21 erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21 erlangR21 = erlang_21; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2aabc02d68d..7e64cf289ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15729,8 +15729,6 @@ with pkgs; eli = callPackage ../development/compilers/eli { }; - eql = callPackage ../development/compilers/eql { }; - erg = callPackage ../development/compilers/erg { }; elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;