Improve git deps parsing

edolstra · Mar 31, 2022 · 1a7d76a · 1a7d76a
1 parent 149164a
commit 1a7d76a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/flake.nix b/flake.nix
@@ -17,7 +17,16 @@
           (pkg:
 
             let
-              isGit = builtins.match ''git\+(.*)\?rev=([0-9a-f]+)(#.*)?'' pkg.source;
+              gitRegexp = x: builtins.match "git\+(.*)\?((branch=(.+)#([0-9a-f]+)(#.*)?)|(rev=([0-9a-f]+)(#.*)?))" x;
+              isGit = x: let gitArr = gitRegexp x; in
+                if isNull gitArr then
+                  null
+                else
+                    let url_ = builtins.elemAt gitArr 0;
+                     url = builtins.substring 1 (builtins.stringLength url_ - 2) url_;
+                     rev5 = builtins.elemAt gitArr 4;
+                     rev8 = builtins.elemAt gitArr 7;
+                    in if isNull rev5 then [url rev8] else [url rev5];
               isRegistry = builtins.match ''registry\+(.*)'' pkg.source;
             in