From a6dd310a67868c66795a81dd9e0812585fa342b9 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:13:44 +0200 Subject: [PATCH 01/16] reptyr: use fetchFromGitHub instead of fetchurl --- pkgs/os-specific/linux/reptyr/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 4b83e478dd1c..d8880542e518 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/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 { - url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz"; - sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7"; + src = fetchFromGitHub { + owner = "nelhage"; + repo = "reptyr"; + rev = "reptyr-${version}"; + sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8"; }; # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. From caff6f5d5de6bad62ab2c9eb135ed5738965e300 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:24:25 +0200 Subject: [PATCH 02/16] sutils: use fetchFromGitHub instead of fetchurl --- pkgs/tools/misc/sutils/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 8d4f00ee8478..6b2f065a0acf 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sutils-0.1"; + version = "0.1"; + name = "sutils-${version}"; - src = fetchurl { - url = "https://github.com/baskerville/sutils/archive/0.1.tar.gz"; - sha256 = "0xqk42vl82chy458d64fj68a4md4bxaip8n3xw9skxz0a1sgvks8"; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "sutils"; + rev = version; + sha256 = "0rvkc1y7rpw62d00n37pwfzvpvbbhzm6jvr2sb195l2dw53ya8d6"; }; hardeningDisable = [ "format" ]; From aa5fd37bba23b55152de564c89f236640f3e6392 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:28:03 +0200 Subject: [PATCH 03/16] sutils: 0.1 -> 0.2 --- pkgs/tools/misc/sutils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 6b2f065a0acf..c96ac41fb268 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { - version = "0.1"; + version = "0.2"; name = "sutils-${version}"; src = fetchFromGitHub { owner = "baskerville"; repo = "sutils"; rev = version; - sha256 = "0rvkc1y7rpw62d00n37pwfzvpvbbhzm6jvr2sb195l2dw53ya8d6"; + sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j"; }; hardeningDisable = [ "format" ]; + buildInputs = [ alsaLib ]; + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; meta = { From b7d587fff77a6c7a4d90ef3f8394b71c98f73c77 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:30:33 +0200 Subject: [PATCH 04/16] pingtcp: use fetchFromGitHub instead of fetchgit --- pkgs/tools/networking/pingtcp/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 8fb9b066bf1c..2d13515d83d7 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/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 = fetchgit { + src = fetchFromGitHub { + owner = "LanetNetwork"; + repo = "pingtcp"; sha256 = "1cv84n30y03s1b83apxxyn2jv5ss1pywsahrfrpkb6zcgzzrcqn8"; rev = "refs/tags/v${version}"; - url = "https://github.com/LanetNetwork/pingtcp.git"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; From fc1aaf86139930f4313a0475d080875bbd5378f4 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:33:06 +0200 Subject: [PATCH 05/16] i3minator: use fetchFromGitHub instead of fetchurl --- pkgs/tools/misc/i3minator/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 7ffab069779c..898ecd9df4a8 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/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 { - url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz"; - sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; + src = fetchFromGitHub { + owner = "carlesso"; + repo = "i3minator"; + rev = version; + sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm"; }; LC_ALL = "en_US.UTF-8"; From 8d4c3a08e36b981ba3cf67c3aed43e642e969a55 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:33:48 +0200 Subject: [PATCH 06/16] moonlight-embedded: use fetchFromGitHub instead of fetchgit --- pkgs/applications/misc/moonlight-embedded/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 5aaaa7a0e37b..9f34d4266c64 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/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 @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; version = "2.4.6"; - # fetchgit used to ensure submodules are available - src = fetchgit { - url = "git://github.com/irtimmer/moonlight-embedded"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "irtimmer"; + repo = "moonlight-embedded"; + rev = "v${version}"; sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1"; + fetchSubmodules = true; }; outputs = [ "out" "man" ]; From 027ee440b5b0d48ecadd089fde4d36427f378460 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:34:47 +0200 Subject: [PATCH 07/16] shadowsocks-libev: use fetchFromGitHub instead of fetchgit --- pkgs/tools/networking/shadowsocks-libev/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 09fa69dd37c4..7e6c5f56dc77 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/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 = fetchgit { - url = "https://github.com/shadowsocks/shadowsocks-libev"; + src = fetchFromGitHub { + owner = "shadowsocks"; + repo = "shadowsocks-libev"; rev = "refs/tags/v${version}"; sha256 = "0i9vz5b2c2bkdl2k9kqzvqyrlpdl94lf7k7rzxds8hn2kk0jizhb"; + fetchSubmodules = true; }; buildInputs = [ libsodium mbedtls libev c-ares pcre ]; From 1952a19c61dc0d36c796ca1a151b73cff6a47e43 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:43:13 +0200 Subject: [PATCH 08/16] bootchart: use fetchFromGitHub instead of fetchurl --- pkgs/tools/system/bootchart/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 9cba7df21b7d..37217bba2e95 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/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"; name = "bootchart-${version}"; - src = fetchurl { - url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz"; - sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; + src = fetchFromGitHub { + owner = "mmeeks"; + repo = "bootchart"; + rev = version; + sha256 = "178p7z5npx2ksqx477454n1l5560ncbpjh65j9dr001wmwzqzh5q"; }; nativeBuildInputs = [ pkgconfig ]; From 3d5939f3d2026f9d8fc5a43f1eaafa5f03608b1d Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:47:30 +0200 Subject: [PATCH 09/16] bootchart: 0.14.7 -> 0.14.8 --- pkgs/tools/system/bootchart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 37217bba2e95..9842bd85783a 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }: stdenv.mkDerivation rec { - version = "0.14.7"; + version = "0.14.8"; name = "bootchart-${version}"; src = fetchFromGitHub { owner = "mmeeks"; repo = "bootchart"; rev = version; - sha256 = "178p7z5npx2ksqx477454n1l5560ncbpjh65j9dr001wmwzqzh5q"; + sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx"; }; nativeBuildInputs = [ pkgconfig ]; From 953f495e8bf9fabd867dafd7bf5a0a28fb9f1fdf Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 13:48:08 +0200 Subject: [PATCH 10/16] moonlight-embedded: 2.4.6 -> 2.4.7 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 9f34d4266c64..76c2ba69d35b 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "irtimmer"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1"; + sha256 = "0ihgb0kh4rhbgn55s25rfbs8063zqvcyqn137jn3nsc0is1595a9"; fetchSubmodules = true; }; From 15e23e5d92c74658a5e5ee0c2cbd6b5530319709 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:04:21 +0200 Subject: [PATCH 11/16] neopg: use fetchFromGitHub instead of fetchgit --- pkgs/tools/security/neopg/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 84c4a68aba0a..cf5f760cda47 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchgit +, fetchFromGitHub , cmake , sqlite , botan2 @@ -14,11 +14,12 @@ stdenv.mkDerivation rec { name = "neopg-${version}"; version = "0.0.4"; - # no fetchFromGitHub, as repo contains submodules - src = fetchgit { - url = "https://github.com/das-labor/neopg.git"; + src = fetchFromGitHub { + owner = "das-labor"; + repo = "neopg"; rev = "v${version}"; sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; + fetchSubmodules = true; }; nativeBuildInputs = [ pkgconfig ]; From eb5eacb0e9c1815edce856b7461abd8b58c63897 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:23:03 +0200 Subject: [PATCH 12/16] nitrokey-app: use fetchFromGitHub instead of fetchgit --- pkgs/tools/security/nitrokey-app/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 67e388d5728b..2c5b733964ef 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/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"; - # We use fetchgit instead of fetchFromGitHub because of necessary git submodules - src = fetchgit { - url = "https://github.com/Nitrokey/nitrokey-app.git"; + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-app"; rev = "v${version}"; sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9"; + fetchSubmodules = true; }; postPatch = '' From 031737126c72c2cdc117dcc42472a8475f835bb8 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:28:14 +0200 Subject: [PATCH 13/16] neopg: 0.0.4 -> 0.0.5 --- pkgs/tools/security/neopg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index cf5f760cda47..7cb442bdf627 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { name = "neopg-${version}"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "das-labor"; repo = "neopg"; rev = "v${version}"; - sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; + sha256 = "1ky3pwg6w8kyaa9iksfx6rryva87mbj1h3yi2mrzp2h7jhrfffpp"; fetchSubmodules = true; }; From 3831ed4ad2fc15c73ec404440920f1f955a15463 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:28:51 +0200 Subject: [PATCH 14/16] nitrokey-app: 1.3.1 -> 1.3.2 --- pkgs/tools/security/nitrokey-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 2c5b733964ef..e7f7547e4ad9 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nitrokey-app-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9"; + sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2"; fetchSubmodules = true; }; From 314593950e0a726d6ccab7fc26338ff765fcf884 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:29:28 +0200 Subject: [PATCH 15/16] tdesktop: use fetchFromGitHub instead of fetchgit --- .../instant-messengers/telegram/tdesktop/generic.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index e8f2c135fa8a..d35126a66714 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/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 { - url = "git://github.com/telegramdesktop/tdesktop"; + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "tdesktop"; rev = "v${version}"; sha256 = sha256Hash; fetchSubmodules = true; From d81a96e601b352453ccc328cac42d13907b362c0 Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 8 Oct 2018 14:33:55 +0200 Subject: [PATCH 16/16] mirtk: use fetchFromGitHub instead of fetchgit --- .../libraries/science/biology/mirtk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 6ecc5159a3bc..ce2050e82e6d 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/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 = fetchgit { - url = "https://github.com/BioMedIA/MIRTK.git"; + src = fetchFromGitHub { + owner = "BioMedIA"; + repo = "MIRTK"; rev = "v${version}"; sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk"; + fetchSubmodules = true; }; cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";