b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: fetchgit -> fetchFromGitiles

Browse source 
This is only the easy cases -- some fetchgit uses that point to
Gitiles instances are in generated code, where the generating code
would have to know in advance if it was fetching from Gitiles or not.
I don't think this is worth it.
This commit is contained in:
Alyssa Ross 2019-12-02 22:29:40 +00:00
parent fe16f7d7f9
commit a8e63e4f74
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
6 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/misc/redis-desktop-manager/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, lib, fetchgit, pkgconfig, libssh2 { stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
, qtsvg, qttools, qtquick1, qtcharts , qtsvg, qttools, qtquick1, qtcharts
, qmake , qmake
}: }:
let let
breakpad_lss = fetchgit { breakpad_lss = fetchFromGitiles {
url = "https://chromium.googlesource.com/linux-syscall-support"; url = "https://chromium.googlesource.com/linux-syscall-support";
rev = "08056836f2b4a5747daff75435d10d649bed22f6"; rev = "08056836f2b4a5747daff75435d10d649bed22f6";
sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz"; sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
pname = "redis-desktop-manager"; pname = "redis-desktop-manager";
version = "0.9.1"; version = "0.9.1";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/uglide/RedisDesktopManager.git"; owner = "uglide";
repo = "RedisDesktopManager";
fetchSubmodules = true; fetchSubmodules = true;
rev = "refs/tags/${version}"; rev = version;
sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
}; };

6
pkgs/development/python-modules/gyp/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchgit , fetchFromGitiles
, isPy3k , isPy3k
}: }:
@ -9,8 +9,8 @@ buildPythonPackage {
version = "2015-06-11"; version = "2015-06-11";
disabled = isPy3k; disabled = isPy3k;
src = fetchgit { src = fetchFromGitiles {
url = "https://chromium.googlesource.com/external/gyp.git"; url = "https://chromium.googlesource.com/external/gyp";
rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043"; rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz"; sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz";
}; };

4
pkgs/os-specific/linux/chromium-xorg-conf/default.nix
View file

@ -1,6 +1,6 @@
{fetchgit }: { fetchFromGitiles }:
fetchgit { fetchFromGitiles {
name = "chromium-xorg-conf"; name = "chromium-xorg-conf";
url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf"; url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf";
rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514"; rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514";

16
pkgs/tools/security/chaps/default.nix
View file

@ -1,9 +1,10 @@
{ stdenv, fetchgit, fetchurl, trousers, leveldb, unzip, scons, pkgconfig { stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip
, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: , scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam
}:
let let
src_chromebase = fetchgit { src_chromebase = fetchFromGitiles {
url = "https://chromium.googlesource.com/chromium/src/base.git"; url = "https://chromium.googlesource.com/chromium/src/base";
rev = "2dfe404711e15e24e79799516400c61b2719d7af"; rev = "2dfe404711e15e24e79799516400c61b2719d7af";
sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5"; sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5";
}; };
@ -13,7 +14,7 @@ let
sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16"; sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16";
}; };
src_platform2 = fetchgit { src_platform2 = fetchFromGitiles {
url = "https://chromium.googlesource.com/chromiumos/platform2"; url = "https://chromium.googlesource.com/chromiumos/platform2";
rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b"; rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b";
sha256 = "15n1bsv6r7cny7arx0hdb223xzzbk7vkxg2r7xajhl4nsj39adjh"; sha256 = "15n1bsv6r7cny7arx0hdb223xzzbk7vkxg2r7xajhl4nsj39adjh";
@ -25,8 +26,9 @@ stdenv.mkDerivation rec {
name = "chaps-0.42-6812"; name = "chaps-0.42-6812";
version = "0.42-6812"; version = "0.42-6812";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/google/chaps-linux"; owner = "google";
repo = "chaps-linux";
rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7"; rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7";
sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1"; sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1";
}; };

4
pkgs/tools/system/minijail/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchgit, libcap }: { stdenv, fetchFromGitiles, libcap }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
shortname = "minijail"; shortname = "minijail";
name = "${shortname}-${version}"; name = "${shortname}-${version}";
version = "android-9.0.0_r3"; version = "android-9.0.0_r3";
src = fetchgit { src = fetchFromGitiles {
url = "https://android.googlesource.com/platform/external/minijail"; url = "https://android.googlesource.com/platform/external/minijail";
rev = version; rev = version;
sha256 = "1g1g52s3q61amcnx8cv1332sbixpck1bmjzgsrjiw5ix7chrzkp2"; sha256 = "1g1g52s3q61amcnx8cv1332sbixpck1bmjzgsrjiw5ix7chrzkp2";

6
pkgs/tools/system/vboot_reference/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }: { stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20180311"; version = "20180311";
@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
pname = "vboot_reference"; pname = "vboot_reference";
src = fetchgit { src = fetchFromGitiles {
url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
rev = checkout; rev = checkout;
sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj"; sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
}; };