git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #48044 from schneefux/pkg/fetchfromgithub

treewide: Use fetchFromGitHub instead of fetchurl

commitcde945a165f90cc9f3a102b81d84c343ec1c1076 authorRenaud <c0bw3b@users.noreply.github.com> dateWed 14 Nov 2018, 09:48 (8 years ago) parent4b5ffcbd81a96e
11 files changed+70−52
pkgs/applications/misc/moonlight-embedded/default.nix+8−7 pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+4−3 pkgs/development/libraries/science/biology/mirtk/default.nix+5−4 pkgs/os-specific/linux/reptyr/default.nix+6−4 pkgs/tools/misc/i3minator/default.nix+6−4 pkgs/tools/misc/sutils/default.nix+10−5 pkgs/tools/networking/pingtcp/default.nix+5−4 pkgs/tools/networking/shadowsocks-libev/default.nix+5−4 pkgs/tools/security/neopg/default.nix+7−6 pkgs/tools/security/nitrokey-app/default.nix+7−6 pkgs/tools/system/bootchart/default.nix+7−5
pkgs/applications/misc/moonlight-embedded/default.nix+8−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, cmake, perl
1+{ stdenv, fetchFromGitHub, cmake, perl
22, alsaLib, libevdev, libopus, udev, SDL2
33, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
44, curl, expat, avahi, enet, libuuid
@@ -6,13 +6,14 @@
66
77stdenv.mkDerivation rec {
88 name = "moonlight-embedded-${version}";
9− version = "2.4.6";
9+ version = "2.4.7";
1010
11− # fetchgit used to ensure submodules are available
12− src = fetchgit {
13− url = "git://github.com/irtimmer/moonlight-embedded";
14− rev = "refs/tags/v${version}";
15− sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1";
11+ src = fetchFromGitHub {
12+ owner = "irtimmer";
13+ repo = "moonlight-embedded";
14+ rev = "v${version}";
15+ sha256 = "0ihgb0kh4rhbgn55s25rfbs8063zqvcyqn137jn3nsc0is1595a9";
16+ fetchSubmodules = true;
1617 };
1718
1819 outputs = [ "out" "man" ];
pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+4−3
@@ -1,6 +1,6 @@
11{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
22
3−{ mkDerivation, lib, fetchgit, fetchsvn
3+{ mkDerivation, lib, fetchFromGitHub, fetchsvn
44, pkgconfig, pythonPackages, cmake, wrapGAppsHook
55, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
66, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -13,8 +13,9 @@ mkDerivation rec {
1313 inherit version;
1414
1515 # Telegram-Desktop with submodules
16− src = fetchgit {
17− url = "git://github.com/telegramdesktop/tdesktop";
16+ src = fetchFromGitHub {
17+ owner = "telegramdesktop";
18+ repo = "tdesktop";
1819 rev = "v${version}";
1920 sha256 = sha256Hash;
2021 fetchSubmodules = true;
pkgs/development/libraries/science/biology/mirtk/default.nix+5−4
@@ -1,14 +1,15 @@
1−{ stdenv, lib, gtest, fetchgit, cmake, boost, eigen, python, vtk, zlib }:
1+{ stdenv, lib, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }:
22
33stdenv.mkDerivation rec {
44 version = "2.0.0";
55 name = "mirtk-${version}";
66
7− # uses submodules so can't use fetchFromGitHub
8− src = fetchgit {
9− url = "https://github.com/BioMedIA/MIRTK.git";
7+ src = fetchFromGitHub {
8+ owner = "BioMedIA";
9+ repo = "MIRTK";
1010 rev = "v${version}";
1111 sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk";
12+ fetchSubmodules = true;
1213 };
1314
1415 cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";
pkgs/os-specific/linux/reptyr/default.nix+6−4
@@ -1,11 +1,13 @@
1−{ stdenv, fetchurl }:
1+{ stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 version = "0.6.2";
55 name = "reptyr-${version}";
6− src = fetchurl {
7− url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
8− sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
6+ src = fetchFromGitHub {
7+ owner = "nelhage";
8+ repo = "reptyr";
9+ rev = "reptyr-${version}";
10+ sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8";
911 };
1012
1113 # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
pkgs/tools/misc/i3minator/default.nix+6−4
@@ -1,12 +1,14 @@
1−{ stdenv, fetchurl, pythonPackages, glibcLocales }:
1+{ stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
22
33pythonPackages.buildPythonApplication rec {
44 name = "i3minator-${version}";
55 version = "0.0.4";
66
7− src = fetchurl {
8− url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz";
9− sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
7+ src = fetchFromGitHub {
8+ owner = "carlesso";
9+ repo = "i3minator";
10+ rev = version;
11+ sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm";
1012 };
1113
1214 LC_ALL = "en_US.UTF-8";
pkgs/tools/misc/sutils/default.nix+10−5
@@ -1,15 +1,20 @@
1−{ stdenv, fetchurl }:
1+{ stdenv, fetchFromGitHub, alsaLib }:
22
33stdenv.mkDerivation rec {
4− name = "sutils-0.1";
4+ version = "0.2";
5+ name = "sutils-${version}";
56
6− src = fetchurl {
7− url = "https://github.com/baskerville/sutils/archive/0.1.tar.gz";
8− sha256 = "0xqk42vl82chy458d64fj68a4md4bxaip8n3xw9skxz0a1sgvks8";
7+ src = fetchFromGitHub {
8+ owner = "baskerville";
9+ repo = "sutils";
10+ rev = version;
11+ sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j";
912 };
1013
1114 hardeningDisable = [ "format" ];
1215
16+ buildInputs = [ alsaLib ];
17+
1318 prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
1419
1520 meta = {
pkgs/tools/networking/pingtcp/default.nix+5−4
@@ -1,14 +1,15 @@
1−{ stdenv, fetchgit, cmake }:
1+{ stdenv, fetchFromGitHub, cmake }:
22
33stdenv.mkDerivation rec {
44 name = "pingtcp-${version}";
55 version = "0.0.3";
66
7− # This project uses git submodules, which fetchFromGitHub doesn't support:
8− src = fetchgit {
7+ src = fetchFromGitHub {
8+ owner = "LanetNetwork";
9+ repo = "pingtcp";
910 sha256 = "1cv84n30y03s1b83apxxyn2jv5ss1pywsahrfrpkb6zcgzzrcqn8";
1011 rev = "refs/tags/v${version}";
11− url = "https://github.com/LanetNetwork/pingtcp.git";
12+ fetchSubmodules = true;
1213 };
1314
1415 nativeBuildInputs = [ cmake ];
pkgs/tools/networking/shadowsocks-libev/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, cmake
1+{ stdenv, fetchFromGitHub, cmake
22, libsodium, mbedtls, libev, c-ares, pcre
33, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
44}:
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
88 version = "3.2.0";
99
1010 # Git tag includes CMake build files which are much more convenient.
11− # fetchgit because submodules.
12− src = fetchgit {
13− url = "https://github.com/shadowsocks/shadowsocks-libev";
11+ src = fetchFromGitHub {
12+ owner = "shadowsocks";
13+ repo = "shadowsocks-libev";
1414 rev = "refs/tags/v${version}";
1515 sha256 = "0i9vz5b2c2bkdl2k9kqzvqyrlpdl94lf7k7rzxds8hn2kk0jizhb";
16+ fetchSubmodules = true;
1617 };
1718
1819 buildInputs = [ libsodium mbedtls libev c-ares pcre ];
pkgs/tools/security/neopg/default.nix+7−6
@@ -1,5 +1,5 @@
11{ stdenv
2−, fetchgit
2+, fetchFromGitHub
33, cmake
44, sqlite
55, botan2
@@ -12,13 +12,14 @@
1212
1313stdenv.mkDerivation rec {
1414 name = "neopg-${version}";
15− version = "0.0.4";
15+ version = "0.0.5";
1616
17− # no fetchFromGitHub, as repo contains submodules
18− src = fetchgit {
19− url = "https://github.com/das-labor/neopg.git";
17+ src = fetchFromGitHub {
18+ owner = "das-labor";
19+ repo = "neopg";
2020 rev = "v${version}";
21− sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
21+ sha256 = "1ky3pwg6w8kyaa9iksfx6rryva87mbj1h3yi2mrzp2h7jhrfffpp";
22+ fetchSubmodules = true;
2223 };
2324
2425 nativeBuildInputs = [ pkgconfig ];
pkgs/tools/security/nitrokey-app/default.nix+7−6
@@ -1,15 +1,16 @@
1−{ stdenv, makeWrapper, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig
1+{ stdenv, makeWrapper, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig
22, qtbase, qttranslations, qtsvg }:
33
44stdenv.mkDerivation rec {
55 name = "nitrokey-app-${version}";
6− version = "1.3.1";
6+ version = "1.3.2";
77
8− # We use fetchgit instead of fetchFromGitHub because of necessary git submodules
9− src = fetchgit {
10− url = "https://github.com/Nitrokey/nitrokey-app.git";
8+ src = fetchFromGitHub {
9+ owner = "Nitrokey";
10+ repo = "nitrokey-app";
1111 rev = "v${version}";
12− sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9";
12+ sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
13+ fetchSubmodules = true;
1314 };
1415
1516 postPatch = ''
pkgs/tools/system/bootchart/default.nix+7−5
@@ -1,12 +1,14 @@
1−{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:
1+{stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }:
22
33stdenv.mkDerivation rec {
4− version = "0.14.7";
4+ version = "0.14.8";
55 name = "bootchart-${version}";
66
7− src = fetchurl {
8− url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz";
9− sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
7+ src = fetchFromGitHub {
8+ owner = "mmeeks";
9+ repo = "bootchart";
10+ rev = version;
11+ sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx";
1012 };
1113
1214 nativeBuildInputs = [ pkgconfig ];