Merge pull request #32240 from tohl/master

ccl and sbcl updated, tested on nixos x86_64

pkgs/development/compilers/ccl/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }:
+{ stdenv, fetchurl, gcc, glibc, m4, coreutils }:
 
 let
   options = rec {
     /* TODO: there are also MacOS, FreeBSD and Windows versions */
     x86_64-linux = {
       arch = "linuxx86";
-      sha256 = "0g6mkl207ri3ib9w85i9w0sv7srz784pbxidz0d95p6qkvg6shba";
+      sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q";
       runtime = "lx86cl64";
       kernel = "linuxx8664";
     };
@@ -17,7 +17,7 @@ let
     };
     armv7l-linux = {
       arch = "linuxarm";
-      sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q";
+      sha256 = "0p0l1dzsygb6i1xxgbipjpxkn46xhq3jm41a34ga1qqp4x8lkr62";
       runtime = "armcl";
       kernel = "linuxarm";
     };
@@ -30,21 +30,13 @@ assert builtins.hasAttr stdenv.system options;
 
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
-  version  = "1.11";
-  revision = "16313";
+  version  = "1.11.5";
 
-  src = fetchsvn {
-    url = "http://svn.clozure.com/publicsvn/openmcl/release/${version}/${cfg.arch}/ccl";
-    rev = revision;
+  src = fetchurl {
+    url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz";
     sha256 = cfg.sha256;
   };
 
-  patches = fetchpatch {
-    name = "ccl-1.11-glibc-2.26.patch";
-    url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch;
-    sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd";
-  };
-
   buildInputs = [ gcc glibc m4 ];
 
   CCL_RUNTIME = cfg.runtime;
@@ -52,7 +44,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
-      --replace "svnversion" "echo ${revision}" \
       --replace "/bin/rm"    "${coreutils}/bin/rm" \
       --replace "/bin/echo"  "${coreutils}/bin/echo"
 

pkgs/development/compilers/sbcl/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, writeText, sbclBootstrap
+{ stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.system)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
@@ -9,16 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.1.0.20171104";
+  version = "1.4.2";
 
-  #src = fetchurl {
-  #  url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-  #  sha256 = "1qdaf847g5p2zgq00ax5hdy4r82bl3ss382psd0kkca1h83cdiz8";
-  #};
-  src = fetchgit {
-    url    = "https://git.code.sf.net/p/sbcl/sbcl";
-    sha256 = "1fq34h8h8pax5q17w84kwv5amiaag3ikkq3cdmb31r64736mxi6r";
-    rev    = "11aa57d23bc464d6a6867a80e946907404ceadd1";
+  src = fetchurl {
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    sha256 = "05s7wsx6bsnx4h6w3d8yim9apbvi8ih0glmvkmgjz7nrad4abjwd";
   };
 
   patchPhase = ''