Use fetchFromGitHub instead

3 files changed, 29 insertions, 16 deletions

diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr
index 5d92ae4afeae..017ebe62b495 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/mint/crystal2nix.cr
@@ -9,6 +9,7 @@ File.open "shards.nix", "w+" do |file|
   file.puts %({)
   yaml = YAML.parse(File.read("shard.lock"))
   yaml["shards"].each do |key, value|
+    owner, repo = value["github"].as_s.split("/")
     url = "https://github.com/#{value["github"]}"
     rev = if value["version"]?
             "v#{value["version"]}"
@@ -24,7 +25,8 @@ File.open "shards.nix", "w+" do |file|
     end
 
     file.puts %(  #{key} = {)
-    file.puts %(    url = "#{url}";)
+    file.puts %(    owner = "#{owner}";)
+    file.puts %(    repo = "#{repo}";)
     file.puts %(    rev = "#{rev}";)
     file.puts %(    sha256 = "#{sha256}";)
     file.puts %(  };)
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index f28b7db3a56d..619170d4a486 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
-{stdenv, lib, fetchgit, crystal, zlib, openssl, duktape}:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape}:
 let
   crystalPackages = lib.mapAttrs (name: src:
     stdenv.mkDerivation {
       name = lib.replaceStrings ["/"] ["-"] name;
-      src = fetchgit src;
+      src = fetchFromGitHub src;
       phases = "installPhase";
       installPhase = ''cp -r $src $out'';
       passthru = { libName = name; };
@@ -30,8 +30,9 @@ in
 stdenv.mkDerivation rec {
   version = "2018-05-27";
   name = "mint-${version}";
-  src = fetchgit {
-    url = "https://github.com/mint-lang/mint.git";
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
     rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
     sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz";
   };
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
   installPhase = ''true'';
 
   meta = {
-    description = "A refreshing language for the front-end web.";
+    description = "A refreshing language for the front-end web";
     homepage = https://mint-lang.com/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ manveru ];
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index ba42006c461a..dcf7454b4ca8 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -1,51 +1,61 @@
 {
   admiral = {
-    url = "https://github.com/jwaldrip/admiral.cr";
+    owner = "jwaldrip";
+    repo = "admiral.cr";
     rev = "v1.6.1";
     sha256 = "0y30b9b9rkz43afd3b9l24hs0r170qyc07r05kvydbv89376c53i";
   };
   ameba = {
-    url = "https://github.com/veelenga/ameba";
+    owner = "veelenga";
+    repo = "ameba";
     rev = "v0.6.0";
     sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
   };
   baked_file_system = {
-    url = "https://github.com/schovi/baked_file_system";
+    owner = "schovi";
+    repo = "baked_file_system";
     rev = "v0.9.6";
     sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
   };
   duktape = {
-    url = "https://github.com/jessedoyle/duktape.cr";
+    owner = "jessedoyle";
+    repo = "duktape.cr";
     rev = "v0.13.0";
     sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
   };
   kemal = {
-    url = "https://github.com/kemalcr/kemal";
+    owner = "kemalcr";
+    repo = "kemal";
     rev = "v0.22.0";
     sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
   };
   kilt = {
-    url = "https://github.com/jeromegn/kilt";
+    owner = "jeromegn";
+    repo = "kilt";
     rev = "v0.4.0";
     sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
   };
   radix = {
-    url = "https://github.com/luislavena/radix";
+    owner = "luislavena";
+    repo = "radix";
     rev = "v0.3.8";
     sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva";
   };
   string_inflection = {
-    url = "https://github.com/mosop/string_inflection";
+    owner = "mosop";
+    repo = "string_inflection";
     rev = "v0.2.1";
     sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m";
   };
   time_format = {
-    url = "https://github.com/vladfaust/time_format.cr";
+    owner = "vladfaust";
+    repo = "time_format.cr";
     rev = "v0.1.0";
     sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
   };
   tree_template = {
-    url = "https://github.com/anykeyh/tree_template";
+    owner = "anykeyh";
+    repo = "tree_template";
     rev = "3fcb71ee6852040077dd1a2c8c55c67f4a95ba4e";
     sha256 = "04w89wpnkna4ipyy3pxshqqwgk965hz1d31vqp0mrb0ilmpsywdk";
   };