diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-17 15:23:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-17 15:23:08 +0000 |
commit | 26df2f4e9e861383e5b3f0f589c90a06e2d42b7b (patch) | |
tree | 8b7ccfd449306512bfdb9b09de23d5ff8edc5827 /pkgs/tools | |
parent | e726201cc8027551134134fb0e844b9ed1527256 (diff) | |
parent | a8e63e4f74bfd96ec7a840c6d4d7be098a1ea1d8 (diff) | |
download | nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar.gz nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar.bz2 nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar.lz nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar.xz nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.tar.zst nixpkgs-26df2f4e9e861383e5b3f0f589c90a06e2d42b7b.zip |
Merge pull request #74862 from alyssais/fetchgittiles
fetchFromGitiles: init
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/security/chaps/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/system/minijail/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index e81567c3ed8..c8ee9506968 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchgit, fetchurl, trousers, leveldb, unzip, scons, pkgconfig -, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: +{ stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip +, scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam +}: let - src_chromebase = fetchgit { - url = "https://chromium.googlesource.com/chromium/src/base.git"; + src_chromebase = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/base"; rev = "2dfe404711e15e24e79799516400c61b2719d7af"; sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5"; }; @@ -13,7 +14,7 @@ let sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16"; }; - src_platform2 = fetchgit { + src_platform2 = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform2"; rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b"; sha256 = "15n1bsv6r7cny7arx0hdb223xzzbk7vkxg2r7xajhl4nsj39adjh"; @@ -25,8 +26,9 @@ stdenv.mkDerivation rec { name = "chaps-0.42-6812"; version = "0.42-6812"; - src = fetchgit { - url = "https://github.com/google/chaps-linux"; + src = fetchFromGitHub { + owner = "google"; + repo = "chaps-linux"; rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7"; sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1"; }; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index af9e06e9d1a..9debd9a33d8 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchgit, libcap }: +{ stdenv, fetchFromGitiles, libcap }: stdenv.mkDerivation rec { pname = "minijail"; version = "android-10.0.0_r9"; - src = fetchgit { + src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; rev = version; sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22"; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 0bf8a7e85dc..bce6d0c4185 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: +{ stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }: stdenv.mkDerivation rec { version = "20180311"; @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "vboot_reference"; - src = fetchgit { - url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; + src = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference"; rev = checkout; sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj"; }; |