crystal: refactor and add 0.35.1

pkgs/development/compilers/crystal/default.nix

@@ -1,7 +1,29 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
+{ stdenv
-, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml
+, callPackage
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
+, fetchFromGitHub
-, callPackage }:
+, fetchurl
+, lib
+# Dependencies
+, boehmgc
+, coreutils
+, git
+, gmp
+, hostname
+, libatomic_ops
+, libevent
+, libiconv
+, libxml2
+, libyaml
+, llvmPackages
+, makeWrapper
+, openssl
+, pcre
+, pkgconfig
+, readline
+, tzdata
+, which
+, zlib
+}:
 
 # We need multiple binaries as a given binary isn't always able to build
 # (even slightly) older or newer versions.
@@ -43,11 +65,17 @@ let
   ] ++ extraBuildInputs
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
-
+  generic = (
-  generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
+    { version
+    , sha256
+    , binary
+    , doCheck ? true
+    , extraBuildInputs ? []
+    , buildFlags ? ["all" "docs"]
+    }:
       lib.fix (compiler: stdenv.mkDerivation {
         pname = "crystal";
-    inherit doCheck version;
+        inherit buildFlags doCheck version;
 
         src = fetchFromGitHub {
           owner = "crystal-lang";
@@ -59,6 +87,11 @@ let
         outputs = [ "out" "lib" "bin" ];
 
         postPatch = ''
+          # Add dependency of crystal to docs to avoid issue on flag changes between releases
+          # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
+          substituteInPlace Makefile \
+            --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
+
           substituteInPlace src/crystal/system/unix/time.cr \
             --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
 
@@ -101,17 +134,13 @@ let
 
         buildInputs = commonBuildInputs extraBuildInputs;
 
-    nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ];
+        nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
 
         makeFlags = [
           "CRYSTAL_CONFIG_VERSION=${version}"
         ];
 
-    buildFlags = [
+        LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config";
-      "all" "docs"
-    ];
-
-    LLVM_CONFIG = "${llvm}/bin/llvm-config";
 
         FLAGS = [
           "--release"
@@ -122,14 +151,14 @@ let
         # crystal used to build this one.
         CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
 
-    # We *have* to add `which` to the PATH or crystal is unable to build stuff
+        # We *have* to add `which` to the PATH or crystal is unable to build
-    # later if which is not available.
+        # stuff later if which is not available.
         installPhase = ''
           runHook preInstall
 
           install -Dm755 .build/crystal $bin/bin/crystal
           wrapProgram $bin/bin/crystal \
-          --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \
+            --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
             --suffix CRYSTAL_PATH : lib:$lib/crystal \
             --suffix CRYSTAL_LIBRARY_PATH : ${
               lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
@@ -159,7 +188,7 @@ let
 
         dontStrip = true;
 
-    checkTarget = "spec";
+        checkTarget = "compiler_spec";
 
         preCheck = ''
           export HOME=/tmp
@@ -177,10 +206,11 @@ let
           description = "A compiled language with Ruby like syntax and type inference";
           homepage = "https://crystal-lang.org/";
           license = licenses.asl20;
-      maintainers = with maintainers; [ manveru david50407 peterhoeg ];
+          maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
           platforms = builtins.attrNames archs;
         };
-  }));
+      })
+  );
 
 in rec {
   binaryCrystal_0_31 = genericBinary {
@@ -202,24 +232,30 @@ in rec {
   crystal_0_32 = generic {
     version = "0.32.1";
     sha256  = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
-    binary = binaryCrystal_0_31;
+    binary = crystal_0_31;
   };
 
   crystal_0_33 = generic {
     version = "0.33.0";
     sha256  = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
-    binary = binaryCrystal_0_31;
+    binary = crystal_0_32;
-    doCheck = false; # 4 checks are failing now
   };
 
   crystal_0_34 = generic {
     version = "0.34.0";
     sha256  = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";
     binary = crystal_0_33;
-    doCheck = false; # 4 checks are failing now
   };
 
-  crystal = crystal_0_34;
+  crystal_0_35 = generic {
+    version = "0.35.1";
+    sha256  = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";
+    binary = crystal_0_34;
+    # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789
+    extraBuildInputs = [ git ];
+  };
+
+  crystal = crystal_0_35;
 
   crystal2nix = callPackage ./crystal2nix.nix {};
 }

pkgs/top-level/all-packages.nix

@@ -8799,12 +8799,13 @@ in
   copper = callPackage ../development/compilers/copper {};
 
   inherit (callPackages ../development/compilers/crystal {
-    inherit (llvmPackages_10) stdenv clang llvm;
+    llvmPackages = llvmPackages_10;
   })
     crystal_0_31
     crystal_0_32
     crystal_0_33
     crystal_0_34
+    crystal_0_35
     crystal
     crystal2nix;