From e7037007c20e0a18e214ed645c983f5d7df44c2b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 Jan 2024 07:47:08 +0100 Subject: [PATCH] gcl_2_6_13_pre: drop --- pkgs/development/compilers/gcl/2.6.13-pre.nix | 49 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/development/compilers/gcl/2.6.13-pre.nix diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix deleted file mode 100644 index a4d01cba729f..000000000000 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which -, texinfo, libX11, xorgproto, libXi, gmp, readline -, libXext, libXt, libXaw, libXmu } : - -assert stdenv ? cc ; -assert stdenv.cc.isGNU ; -assert stdenv.cc ? libc ; -assert stdenv.cc.libc != null ; - -stdenv.mkDerivation rec { - pname = "gcl"; - version = "2.6.13pre124"; - - src = fetchgit { - sha256 = "sha256-e4cUQlNSfdz+B3urlZ82pf7fTc6aoloUyDDorAUi5kc="; - url = "https://git.savannah.gnu.org/r/gcl.git"; - rev = "refs/tags/Version_${builtins.replaceStrings ["."] ["_"] version}"; - }; - - postPatch = '' - sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp - ''; - - sourceRoot = "${src.name}/gcl"; - - # breaks when compiling in parallel - enableParallelBuilding = false; - - patches = []; - - buildInputs = [ - mpfr m4 binutils emacs gmp - libX11 xorgproto libXi - libXext libXt libXaw libXmu - zlib which texinfo readline - ]; - - configureFlags = [ - "--enable-ansi" - ]; - - hardeningDisable = [ "pic" "bindnow" ]; - - meta = { - description = "GNU Common Lisp compiler working via GCC"; - maintainers = lib.teams.lisp.members; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fea746865f6d..3852baa77e9b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -300,6 +300,7 @@ mapAliases ({ garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 + gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20a9726b6882..34f5a60574cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16187,8 +16187,6 @@ with pkgs; inherit (llvmPackages_15) llvm; }; - gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 { }; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 { }; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 { };