crystal v1.8.2

CrunchyData · May 10, 2023 · cafeaef · cafeaef
1 parent cafe26e
commit cafeaef
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/crystal/crystal.nix b/crystal/crystal.nix
@@ -3,7 +3,6 @@
 , src
 , substituteAll
 , callPackage
-, version
   # build deps
 , llvmPackages
 , crystal_prebuilt
@@ -32,8 +31,9 @@
 lib.fix (compiler:
   stdenv.mkDerivation rec {
     pname = "crystal";
-    inherit src version;
+    inherit src;
     inherit (stdenv) isDarwin;
+    version = lib.removeSuffix "\n" (builtins.readFile (src + "/src/VERSION"));
 
     passthru = rec {
       # simple builder that sets a bunch of defaults

diff --git a/crystal/default.nix b/crystal/default.nix
@@ -20,21 +20,14 @@ let
   arch = archs.${system};
   src = pkgs.fetchurl src_urls.${arch};
 
-  gh_src = pkgs.fetchFromGitHub {
-    owner = "crystal-lang";
-    repo = "crystal";
-    rev = "a59a3dbd738269d5aad6051c3834fc70f482f469";
-    hash = "sha256-t+1vM1m62UftCvfa90Dg6nqt6Zseh/GP/Gc1VfOa4+c=";
-  };
-
   llvmPackages = pkgs.llvmPackages_15;
 
   packages = rec {
     crystal_prebuilt = pkgs.callPackage ./prebuilt.nix { inherit src version llvmPackages; };
     shards = pkgs.callPackage ./shards.nix { crystal = crystal_prebuilt; inherit (pkgs) fetchFromGitHub; };
     crystal = pkgs.callPackage ./crystal.nix {
-      inherit crystal_prebuilt shards version llvmPackages;
-      src = gh_src;
+      inherit crystal_prebuilt shards llvmPackages;
+      src = inputs.crystal-src;
     };
     crystalWrapped = pkgs.callPackage ./extra-wrapped.nix { inherit crystal; buildInputs = [ ]; };
     crystal_dev = crystal.override { release = false; };

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,6 +9,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    crystal-src = { url = "github:crystal-lang/crystal/release/1.8"; flake = false; };
     ameba-src = { url = "github:crystal-ameba/ameba/v1.4.2"; flake = false; };
   };