importCargoLock: git deps with rev, branch or tag

pkgs/build-support/rust/import-cargo-lock.nix

@@ -12,14 +12,15 @@ let
   # Parse a git source into different components.
   parseGit = src:
     let
-      parts = builtins.match ''git\+([^?]+)(\?rev=(.*))?#(.*)?'' src;
-      rev = builtins.elemAt parts 2;
+      parts = builtins.match ''git\+([^?]+)(\?(rev|tag|branch)=(.*))?#(.*)'' src;
+      type = builtins.elemAt parts 2; # rev, tag or branch
+      value = builtins.elemAt parts 3;
     in
       if parts == null then null
       else {
         url = builtins.elemAt parts 0;
-        sha = builtins.elemAt parts 3;
-      } // lib.optionalAttrs (rev != null) { inherit rev; };
+        sha = builtins.elemAt parts 4;
+      } // lib.optionalAttrs (type != null) { inherit type value; };
 
   packages = (builtins.fromTOML (builtins.readFile lockFile)).package;
 
@@ -137,7 +138,7 @@ let
         cat > $out/.cargo-config <<EOF
         [source."${gitParts.url}"]
         git = "${gitParts.url}"
-        ${lib.optionalString (gitParts ? rev) "rev = \"${gitParts.rev}\""}
+        ${lib.optionalString (gitParts ? type) "${gitParts.type} = \"${gitParts.value}\""}
         replace-with = "vendored-sources"
         EOF
       ''

pkgs/build-support/rust/test/import-cargo-lock/default.nix

@@ -1,8 +1,12 @@
 { callPackage }:
 
+# Build like this from nixpkgs root:
+# $ nix-build -A tests.importCargoLock
 {
   basic = callPackage ./basic { };
   gitDependency = callPackage ./git-dependency { };
-  gitDependencyNoRev = callPackage ./git-dependency-no-rev { };
+  gitDependencyRev = callPackage ./git-dependency-rev { };
+  gitDependencyTag = callPackage ./git-dependency-tag { };
+  gitDependencyBranch = callPackage ./git-dependency-branch { };
   maturin = callPackage ./maturin { };
 }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "git-dependency-branch"
+version = "0.1.0"
+authors = ["Daniël de Kok <me@danieldk.eu>"]
+edition = "2018"
+
+[dependencies]
+rand = { git = "https://github.com/rust-random/rand.git", branch = "master" }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix

@@ -1,21 +1,21 @@
 { rustPlatform }:
 
 rustPlatform.buildRustPackage {
-  pname = "git-dependency-no-rev";
+  pname = "git-dependency-branch";
   version = "0.1.0";
 
   src = ./.;
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
+      "rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z";
     };
   };
 
   doInstallCheck = true;
 
   installCheckPhase = ''
-    $out/bin/git-dependency-no-rev
+    $out/bin/git-dependency-branch
   '';
 }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "git-dependency-no-rev"
+name = "git-dependency-rev"
 version = "0.1.0"
 authors = ["Daniël de Kok <me@danieldk.eu>"]
 edition = "2018"
 
 [dependencies]
-rand = { git = "https://github.com/rust-random/rand.git" }
+rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix

@@ -0,0 +1,21 @@
+{ rustPlatform }:
+
+rustPlatform.buildRustPackage {
+  pname = "git-dependency-rev";
+  version = "0.1.0";
+
+  src = ./.;
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
+    };
+  };
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    $out/bin/git-dependency-rev
+  '';
+}

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs

@@ -0,0 +1,9 @@
+use rand::Rng;
+
+fn main() {
+    let mut rng = rand::thread_rng();
+
+    // Always draw zero :).
+    let roll: u8 = rng.gen_range(0..1);
+    assert_eq!(roll, 0);
+}

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "git-dependency-tag"
+version = "0.1.0"
+authors = ["Daniël de Kok <me@danieldk.eu>"]
+edition = "2018"
+
+[dependencies]
+rand = { git = "https://github.com/rust-random/rand.git", tag = "0.8.3" }

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix

@@ -0,0 +1,21 @@
+{ rustPlatform }:
+
+rustPlatform.buildRustPackage {
+  pname = "git-dependency-tag";
+  version = "0.1.0";
+
+  src = ./.;
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
+    };
+  };
+
+  doInstallCheck = true;
+
+  installCheckPhase = ''
+    $out/bin/git-dependency-tag
+  '';
+}

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs

@@ -0,0 +1,9 @@
+use rand::Rng;
+
+fn main() {
+    let mut rng = rand::thread_rng();
+
+    // Always draw zero :).
+    let roll: u8 = rng.gen_range(0..1);
+    assert_eq!(roll, 0);
+}