diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 36f5fb3c13d8..8ef2cedbf076 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -9,24 +9,13 @@ assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { pname = "gcl"; - version = "2.6.12"; + version = "2.6.14"; src = fetchurl { - sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"; - url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gcl/gcl-${version}.tar.gz"; + hash = "sha256-CfNBfFEqoXM6Y4gJ06Y6wpDuuUSL6CeV9bZoG9MHNFo="; }; - patches = [(fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch"; - sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh"; - })]; - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475 - postPatch = '' - substituteInPlace h/elf64_i386_reloc.h \ - --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:' - ''; - buildInputs = [ mpfr m4 binutils emacs gmp libX11 xorgproto libXi @@ -38,13 +27,6 @@ stdenv.mkDerivation rec { "--enable-ansi" ]; - hardeningDisable = [ "pic" "bindnow" ]; - - # -fcommon: workaround build failure on -fno-common toolchains: - # ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of - # `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here - env.NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon"; - meta = with lib; { description = "GNU Common Lisp compiler working via GCC"; maintainers = lib.teams.lisp.members; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab06b33fe22c..5670bbec2d83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26035,9 +26035,7 @@ with pkgs; # GNU Common Lisp gcl = wrapLisp { - pkg = callPackage ../development/compilers/gcl { - gmp = gmp4; - }; + pkg = callPackage ../development/compilers/gcl { }; faslExt = "o"; };