git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74862 from alyssais/fetchgittiles

fetchFromGitiles: init

commit26df2f4e9e861383e5b3f0f589c90a06e2d42b7b authorMichael Raskin <7c6f434c@mail.ru> dateTue 17 Dec 2019, 15:23 (7 years ago) parente726201a8e63e4
9 files changed+48−22
doc/builders/fetchers.xml+11 pkgs/applications/misc/redis-desktop-manager/default.nix+6−5 pkgs/build-support/fetchgitiles/default.nix+10 pkgs/development/python-modules/gyp/default.nix+3−3 pkgs/os-specific/linux/chromium-xorg-conf/default.nix+2−2 pkgs/tools/security/chaps/default.nix+9−7 pkgs/tools/system/minijail/default.nix+2−2 pkgs/tools/system/vboot_reference/default.nix+3−3 pkgs/top-level/all-packages.nix+2
doc/builders/fetchers.xml+11
@@ -105,6 +105,17 @@ stdenv.mkDerivation {
105105 </para>
106106 </listitem>
107107 </varlistentry>
108+ <varlistentry>
109+ <term>
110+ <literal>fetchFromGitiles</literal>
111+ </term>
112+ <listitem>
113+ <para>
114+ This is used with Gitiles repositories. The arguments expected
115+ are similar to fetchgit.
116+ </para>
117+ </listitem>
118+ </varlistentry>
108119 <varlistentry>
109120 <term>
110121 <literal>fetchFromBitbucket</literal>
pkgs/applications/misc/redis-desktop-manager/default.nix+6−5
@@ -1,11 +1,11 @@
1−{ stdenv, lib, fetchgit, pkgconfig, libssh2
1+{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2
22, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
33, qtsvg, qttools, qtquick1, qtcharts
44, qmake
55}:
66
77let
8− breakpad_lss = fetchgit {
8+ breakpad_lss = fetchFromGitiles {
99 url = "https://chromium.googlesource.com/linux-syscall-support";
1010 rev = "08056836f2b4a5747daff75435d10d649bed22f6";
1111 sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
1717 pname = "redis-desktop-manager";
1818 version = "0.9.1";
1919
20− src = fetchgit {
21− url = "https://github.com/uglide/RedisDesktopManager.git";
20+ src = fetchFromGitHub {
21+ owner = "uglide";
22+ repo = "RedisDesktopManager";
2223 fetchSubmodules = true;
23− rev = "refs/tags/${version}";
24+ rev = version;
2425 sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
2526 };
2627
pkgs/build-support/fetchgitiles/default.nixnew file+10
@@ -0,0 +1,10 @@
1+{ fetchzip, lib }:
2+
3+{ url, rev, name ? "source", ... } @ args:
4+
5+fetchzip ({
6+ inherit name;
7+ url = "${url}/+archive/${rev}.tar.gz";
8+ stripRoot = false;
9+ meta.homepage = url;
10+} // removeAttrs args [ "url" "rev" ]) // { inherit rev; }
pkgs/development/python-modules/gyp/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv
22, buildPythonPackage
3−, fetchgit
3+, fetchFromGitiles
44, isPy3k
55}:
66
@@ -9,8 +9,8 @@ buildPythonPackage {
99 version = "2015-06-11";
1010 disabled = isPy3k;
1111
12− src = fetchgit {
13− url = "https://chromium.googlesource.com/external/gyp.git";
12+ src = fetchFromGitiles {
13+ url = "https://chromium.googlesource.com/external/gyp";
1414 rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
1515 sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz";
1616 };
pkgs/os-specific/linux/chromium-xorg-conf/default.nix+2−2
@@ -1,6 +1,6 @@
1−{fetchgit }:
1+{ fetchFromGitiles }:
22
3−fetchgit {
3+fetchFromGitiles {
44 name = "chromium-xorg-conf";
55 url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf";
66 rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514";
pkgs/tools/security/chaps/default.nix+9−7
@@ -1,9 +1,10 @@
1−{ stdenv, fetchgit, fetchurl, trousers, leveldb, unzip, scons, pkgconfig
2−, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }:
1+{ stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip
2+, scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam
3+}:
34
45let
5− src_chromebase = fetchgit {
6− url = "https://chromium.googlesource.com/chromium/src/base.git";
6+ src_chromebase = fetchFromGitiles {
7+ url = "https://chromium.googlesource.com/chromium/src/base";
78 rev = "2dfe404711e15e24e79799516400c61b2719d7af";
89 sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5";
910 };
@@ -13,7 +14,7 @@ let
1314 sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16";
1415 };
1516
16− src_platform2 = fetchgit {
17+ src_platform2 = fetchFromGitiles {
1718 url = "https://chromium.googlesource.com/chromiumos/platform2";
1819 rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b";
1920 sha256 = "15n1bsv6r7cny7arx0hdb223xzzbk7vkxg2r7xajhl4nsj39adjh";
@@ -25,8 +26,9 @@ stdenv.mkDerivation rec {
2526 name = "chaps-0.42-6812";
2627 version = "0.42-6812";
2728
28− src = fetchgit {
29− url = "https://github.com/google/chaps-linux";
29+ src = fetchFromGitHub {
30+ owner = "google";
31+ repo = "chaps-linux";
3032 rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7";
3133 sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1";
3234 };
pkgs/tools/system/minijail/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchgit, libcap }:
1+{ stdenv, fetchFromGitiles, libcap }:
22
33stdenv.mkDerivation rec {
44 pname = "minijail";
55 version = "android-10.0.0_r9";
66
7− src = fetchgit {
7+ src = fetchFromGitiles {
88 url = "https://android.googlesource.com/platform/external/minijail";
99 rev = version;
1010 sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22";
pkgs/tools/system/vboot_reference/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }:
1+{ stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }:
22
33stdenv.mkDerivation rec {
44 version = "20180311";
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
66
77 pname = "vboot_reference";
88
9− src = fetchgit {
10− url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
9+ src = fetchFromGitiles {
10+ url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
1111 rev = checkout;
1212 sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
1313 };
pkgs/top-level/all-packages.nix+2
@@ -360,6 +360,8 @@ in
360360
361361 fetchFromGitLab = callPackage ../build-support/fetchgitlab {};
362362
363+ fetchFromGitiles = callPackage ../build-support/fetchgitiles {};
364+
363365 fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {};
364366
365367 fetchNuGet = callPackage ../build-support/fetchnuget { };