about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-08-26 18:23:55 +0200
committerSilvan Mosberger <infinisil@icloud.com>2019-08-26 18:23:55 +0200
commit1ffdf01777360f548cc7c10ef5b168cbe78fd183 (patch)
treebe0d58c6630a28db146c139c72d6f1b82ee14851
parenta3aec20f266c57d989524f02b1243b4ad24020a2 (diff)
downloadnixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar.gz
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar.bz2
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar.lz
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar.xz
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.tar.zst
nixlib-1ffdf01777360f548cc7c10ef5b168cbe78fd183.zip
crystal2nix: Put it into pkgs
-rw-r--r--pkgs/development/compilers/crystal/crystal2nix.cr (renamed from pkgs/development/compilers/mint/crystal2nix.cr)2
-rw-r--r--pkgs/development/compilers/crystal/crystal2nix.nix16
-rw-r--r--pkgs/development/compilers/crystal/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix3
4 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/crystal/crystal2nix.cr
index f608102a37b4..0610de5cfa4d 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/crystal/crystal2nix.cr
@@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file|
 
     sha256 = ""
     args = ["--url", url, "--rev", rev]
-    Process.run("nix-prefetch-git", args: args) do |x|
+    Process.run("@nixPrefetchGit@", args: args) do |x|
       x.error.each_line { |e| puts e }
       sha256 = PrefetchJSON.from_json(x.output).sha256
     end
diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix
new file mode 100644
index 000000000000..ac69b9b3d965
--- /dev/null
+++ b/pkgs/development/compilers/crystal/crystal2nix.nix
@@ -0,0 +1,16 @@
+{ lib, crystal, nix-prefetch-git }:
+crystal.buildCrystalPackage {
+  pname = "crystal2nix";
+  version = "unstable-2018-07-31";
+
+  nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git";
+  unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr";
+
+  crystalBinaries.crystal2nix.src = "crystal2nix.cr";
+
+  meta = with lib; {
+    description = "Utility to convert Crystal's shard.lock files to a Nix file";
+    license = licenses.mit;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0cb0a3733ed0..c7a74880e448 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -212,4 +212,6 @@ in rec {
   };
 
   crystal = crystal_0_30;
+
+  crystal2nix = callPackage ./crystal2nix.nix {};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe997367c83..d788224cf396 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7453,7 +7453,8 @@ in
     crystal_0_27
     crystal_0_29
     crystal_0_30
-    crystal;
+    crystal
+    crystal2nix;
 
   icr = callPackage ../development/tools/icr {};