Merge pull request #48044 from schneefux/pkg/fetchfromgithub

treewide: Use fetchFromGitHub instead of fetchurl

pkgs/applications/misc/moonlight-embedded/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, perl
+{ stdenv, fetchFromGitHub, cmake, perl
 , alsaLib, libevdev, libopus, udev, SDL2
 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
 , curl, expat, avahi, enet, libuuid
@@ -6,13 +6,14 @@
 
 stdenv.mkDerivation rec {
   name = "moonlight-embedded-${version}";
-  version = "2.4.6";
+  version = "2.4.7";
 
-  # fetchgit used to ensure submodules are available
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "irtimmer";
-    url = "git://github.com/irtimmer/moonlight-embedded";
+    repo = "moonlight-embedded";
-    rev = "refs/tags/v${version}";
+    rev = "v${version}";
-    sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1";
+    sha256 = "0ihgb0kh4rhbgn55s25rfbs8063zqvcyqn137jn3nsc0is1595a9";
+    fetchSubmodules = true;
   };
 
   outputs = [ "out" "man" ];

pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix

@@ -1,6 +1,6 @@
 { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
-{ mkDerivation, lib, fetchgit, fetchsvn
+{ mkDerivation, lib, fetchFromGitHub, fetchsvn
 , pkgconfig, pythonPackages, cmake, wrapGAppsHook
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -13,8 +13,9 @@ mkDerivation rec {
   inherit version;
 
   # Telegram-Desktop with submodules
-  src = fetchgit {
+  src = fetchFromGitHub {
-    url = "git://github.com/telegramdesktop/tdesktop";
+    owner = "telegramdesktop";
+    repo = "tdesktop";
     rev = "v${version}";
     sha256 = sha256Hash;
     fetchSubmodules = true;

pkgs/development/libraries/science/biology/mirtk/default.nix

@@ -1,14 +1,15 @@
-{ stdenv, lib, gtest, fetchgit, cmake, boost, eigen, python, vtk, zlib }:
+{ stdenv, lib, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
   name = "mirtk-${version}";
 
-  # uses submodules so can't use fetchFromGitHub
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "BioMedIA";
-    url = "https://github.com/BioMedIA/MIRTK.git";
+    repo = "MIRTK";
     rev = "v${version}";
     sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk";
+    fetchSubmodules = true;
   };
 
   cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";

pkgs/os-specific/linux/reptyr/default.nix

@@ -1,11 +1,13 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "0.6.2";
   name = "reptyr-${version}";
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
+    owner = "nelhage";
-    sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
+    repo = "reptyr";
+    rev = "reptyr-${version}";
+    sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8";
   };
 
   # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.

pkgs/tools/misc/i3minator/default.nix

@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pythonPackages, glibcLocales }:
+{ stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
 
 pythonPackages.buildPythonApplication rec {
   name = "i3minator-${version}";
   version = "0.0.4";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz";
+    owner = "carlesso";
-    sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
+    repo = "i3minator";
+    rev = version;
+    sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm";
   };
 
   LC_ALL = "en_US.UTF-8";

pkgs/tools/misc/sutils/default.nix

@@ -1,15 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, alsaLib }:
 
 stdenv.mkDerivation rec {
-   name = "sutils-0.1";
+   version = "0.2";
+   name = "sutils-${version}";
 
-   src = fetchurl {
+   src = fetchFromGitHub {
-     url = "https://github.com/baskerville/sutils/archive/0.1.tar.gz";
+     owner = "baskerville";
-     sha256 = "0xqk42vl82chy458d64fj68a4md4bxaip8n3xw9skxz0a1sgvks8";
+     repo = "sutils";
+     rev = version;
+     sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j";
    };
 
    hardeningDisable = [ "format" ];
 
+   buildInputs = [ alsaLib ];
+
    prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
 
    meta = {

pkgs/tools/networking/pingtcp/default.nix

@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "pingtcp-${version}";
   version = "0.0.3";
 
-  # This project uses git submodules, which fetchFromGitHub doesn't support:
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "LanetNetwork";
+    repo = "pingtcp";
     sha256 = "1cv84n30y03s1b83apxxyn2jv5ss1pywsahrfrpkb6zcgzzrcqn8";
     rev = "refs/tags/v${version}";
-    url = "https://github.com/LanetNetwork/pingtcp.git";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/tools/networking/shadowsocks-libev/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake
+{ stdenv, fetchFromGitHub, cmake
 , libsodium, mbedtls, libev, c-ares, pcre
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
@@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
   version = "3.2.0";
 
   # Git tag includes CMake build files which are much more convenient.
-  # fetchgit because submodules.
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "shadowsocks";
-    url = "https://github.com/shadowsocks/shadowsocks-libev";
+    repo = "shadowsocks-libev";
     rev = "refs/tags/v${version}";
     sha256 = "0i9vz5b2c2bkdl2k9kqzvqyrlpdl94lf7k7rzxds8hn2kk0jizhb";
+    fetchSubmodules = true;
   };
 
   buildInputs = [ libsodium mbedtls libev c-ares pcre ];

pkgs/tools/security/neopg/default.nix

@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitHub
 , cmake
 , sqlite
 , botan2
@@ -12,13 +12,14 @@
 
 stdenv.mkDerivation rec {
   name = "neopg-${version}";
-  version = "0.0.4";
+  version = "0.0.5";
 
-  # no fetchFromGitHub, as repo contains submodules
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "das-labor";
-    url = "https://github.com/das-labor/neopg.git";
+    repo = "neopg";
     rev = "v${version}";
-    sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
+    sha256 = "1ky3pwg6w8kyaa9iksfx6rryva87mbj1h3yi2mrzp2h7jhrfffpp";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/tools/security/nitrokey-app/default.nix

@@ -1,15 +1,16 @@
-{ stdenv, makeWrapper, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig
+{ stdenv, makeWrapper, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig
 , qtbase, qttranslations, qtsvg }:
 
 stdenv.mkDerivation rec {
   name = "nitrokey-app-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
-  # We use fetchgit instead of fetchFromGitHub because of necessary git submodules
+  src = fetchFromGitHub {
-  src = fetchgit {
+    owner = "Nitrokey";
-    url = "https://github.com/Nitrokey/nitrokey-app.git";
+    repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9";
+    sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
+    fetchSubmodules = true;
   };
 
   postPatch = ''

pkgs/tools/system/bootchart/default.nix

@@ -1,12 +1,14 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:
+{stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.7";
+  version = "0.14.8";
   name = "bootchart-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz";
+    owner = "mmeeks";
-    sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
+    repo = "bootchart";
+    rev = version;
+    sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx";
   };
 
   nativeBuildInputs = [ pkgconfig ];