chez: 9.5.1 -> 9.5.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 19 insertions, 34 deletions

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 5b02aed274f8..9216c7791433 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }:
+{ stdenv, fetchFromGitHub
+, coreutils, cctools
+, ncurses, libiconv, libX11, libuuid
+}:
 
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
-  version = "9.5.1";
+  version = "9.5.2";
 
-  src = fetchgit {
-    url    = "https://github.com/cisco/chezscheme.git";
-    rev    = "bc117fd4d567a6863689fec6814882a0f04e577a";
-    sha256 = "1adzw7bgdz0p4xmccc6awdkb7bp6xba9mnlsh3r3zvblqfci8i70";
+  src = fetchFromGitHub {
+    owner  = "cisco";
+    repo   = "ChezScheme";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1gsjmsvsj31q5l9bjvm869y7bakrvl41yq94vyqdx8zwcr1bmpjf";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
-  buildInputs = [ ncurses libiconv libX11 ];
+  buildInputs = [ ncurses libiconv libX11 libuuid ];
 
   enableParallelBuilding = true;
 
@@ -49,41 +53,22 @@ stdenv.mkDerivation rec {
   ** for.
   */
   configurePhase = ''
-    ./configure --threads \
-      --installprefix=$out --installman=$out/share/man \
-      --workarea=work
+    ./configure --threads --installprefix=$out --installman=$out/share/man
   '';
 
   /*
-  ** Install the kernel.o file, so we can compile C applications that
-  ** link directly to the Chez runtime (for booting their own files, or
-  ** embedding.)
-  **
-  ** Ideally in the future this would be less of a hack and could be
-  ** done by Chez itself. Alternatively, there could just be a big
-  ** case statement matching to the different stdenv.hostPlatform.platform
-  ** values...
+  ** Clean up some of the examples from the build output.
   */
   postInstall = ''
-    m="$(ls ./work/boot)"
-    if [ "x''${m[1]}" != "x" ]; then
-      >&2 echo "ERROR: more than one bootfile build found; this is a nixpkgs error"
-      exit 1
-    fi
-
-    kernel=./work/boot/$m/kernel.o
-    kerneldest=$out/lib/csv${version}/$m/
-
-    echo installing $kernel to $kerneldest
-    cp $kernel $kerneldest/kernel.o
+    rm -rf $out/lib/csv${version}/examples
   '';
 
   meta = {
-    description = "A powerful and incredibly fast R6RS Scheme compiler";
-    homepage    = https://cisco.github.io/ChezScheme/;
-    license     = stdenv.lib.licenses.asl20;
-    platforms   = stdenv.lib.platforms.unix;
+    description  = "A powerful and incredibly fast R6RS Scheme compiler";
+    homepage     = https://cisco.github.io/ChezScheme/;
+    license      = stdenv.lib.licenses.asl20;
+    maintainers  = with stdenv.lib.maintainers; [ thoughtpolice ];
+    platforms    = stdenv.lib.platforms.unix;
     badPlatforms = [ "aarch64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
   };
 }