diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 02:23:38 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 02:23:38 +0200 |
| commit | 40a04291c9a4e39bf6e68a557982cbb3f814a10c (patch) | |
| tree | 312016ebfa493b6b6fed1e2e561d7fd23b94a021 /pkgs/build-support | |
| parent | 7cfd1c8c1bb04c0d42db3cb9a90f6791b9196b21 (diff) | |
| parent | 572786387d1669b24c84f5ec4e0ca6f8ebee4ba5 (diff) | |
| download | nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar.gz nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar.bz2 nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar.lz nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar.xz nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.tar.zst nixlib-40a04291c9a4e39bf6e68a557982cbb3f814a10c.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 3 | ||||
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 3 | ||||
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a5f81ef17940..8e060b87ebd3 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,7 @@ {stdenv, git, cacert}: let urlToName = url: rev: let - base = baseNameOf (stdenv.lib.removeSuffix "/" url); + inherit (stdenv.lib) removeSuffix splitString last; + base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3d656eba5fff..9e4f346f7a52 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -120,9 +120,8 @@ hash_from_ref(){ url_to_name(){ local url=$1 local ref=$2 - # basename removes the / and .git suffixes local base - base=$(basename "$url" .git) + base=$(basename "$url" .git | cut -d: -f2) if [[ $ref =~ ^[a-z0-9]+$ ]]; then echo "$base-${ref:0:7}" diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2275a065594f..36130289fbaa 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,10 @@ -{ stdenv, cacert, git, rust, rustRegistry }: +{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }: + +let + rustRegistry' = rustRegistry; +in { name, depsSha256 +, rustRegistry ? rustRegistry' , src ? null , srcs ? null , sourceRoot ? null @@ -11,6 +16,8 @@ , ... } @ args: let + lib = stdenv.lib; + fetchDeps = import ./fetchcargo.nix { inherit stdenv cacert git rust rustRegistry; }; |