fix: no rev found

nix-community · Apr 25, 2021 · 8f5f1e9 · 8f5f1e9
1 parent 4e922a0
commit 8f5f1e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/build.nix b/build.nix
@@ -156,13 +156,13 @@ let
           (
             e:
               let
-                key = if e ? rev    then "rev=${e.rev}"       else
-                      if e ? tag    then "tag=${e.tag}"       else
-                      if e ? branch then "branch=${e.branch}" else
-                      throw "No 'rev', 'tag' or 'branch' specified";
+                key = if e ? rev    then "?rev=${e.rev}"       else
+                      if e ? tag    then "?tag=${e.tag}"       else
+                      if e ? branch then "?branch=${e.branch}" else
+                      "";
               in
               {
-                name = "${e.url}?${key}";
+                name = "${e.url}${key}";
                 value = lib.filterAttrs (n: _: n == "rev" || n == "tag" || n == "branch") e // {
                   git = e.url;
                   replace-with = "nix-sources";

diff --git a/lib.nix b/lib.nix
@@ -79,7 +79,11 @@ rec
 
       extractRevision = source: lib.last (lib.splitString "#" source);
       extractPart = part: source: if lib.hasInfix part source then lib.last (lib.splitString part (lib.head (lib.splitString "#" source))) else null;
-      extractRepoUrl = source: let splitted = lib.head (lib.splitString "?" source); in lib.substring 4 (lib.stringLength splitted) splitted;
+      extractRepoUrl = source:
+        let
+          splitted = lib.head (lib.splitString "?" source);
+          split = lib.substring 4 (lib.stringLength splitted) splitted;
+        in lib.head (lib.splitString "#" split);
 
       parseLock = lock:
       let
@@ -98,7 +102,7 @@ rec
       packageLocks = builtins.map parseLock (lib.filter query cargolock.package);
 
       mkFetch = lock: {
-        key = lock.revision or lock.rev or lock.tag or lock.branch 
+        key = lock.rev or lock.tag or lock.branch or lock.revision
           or (throw "No 'rev', 'tag' or 'branch' available to specify key, nor a git revision was found in Cargo.lock");
         checkout = builtins.fetchGit ({
           url = lock.url;