From dcbef734c6bd006e4af6c3d1ecb0bfcb3a28b09b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:30:36 +0100 Subject: [PATCH 1/8] badvpn: switch to fetchFromGitHub --- pkgs/tools/networking/badvpn/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index 8d1174ac328a..b1fc3b5b9b60 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }: stdenv.mkDerivation rec { pname = "badvpn"; version = "1.999.130"; - src = fetchurl { - url = "https://github.com/ambrop72/badvpn/archive/${version}.tar.gz"; - sha256 = "sha256-v9S7/r1ydLzseSVYyaL9YOOc2S4EZzglreXQQVR2YQk="; + + src = fetchFromGitHub { + owner = "ambrop72"; + repo = "badvpn"; + rev = version; + sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY="; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl From d702c7ab8dbe123af71325dd2041f1f31e321a9b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:31:00 +0100 Subject: [PATCH 2/8] nxengine-evo: switch to fetchFromGitHub --- pkgs/games/nxengine-evo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix index e3df235b7573..4660423a3509 100644 --- a/pkgs/games/nxengine-evo/default.nix +++ b/pkgs/games/nxengine-evo/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchpatch , fetchurl +, fetchFromGitHub , cmake , libpng , SDL2 @@ -10,9 +11,11 @@ stdenv.mkDerivation rec { pname = "nxengine-evo"; version = "2.6.4"; - src = fetchurl { - url = "https://github.com/nxengine/nxengine-evo/archive/v${version}.tar.gz"; - sha256 = "1xir74l0vrzrpyl7sfqfxp083dakbix26hd0arwf2y57w1mbjas8"; + src = fetchFromGitHub { + owner = "nxengine"; + repo = "nxengine-evo"; + rev = "v${version}"; + sha256 = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A="; }; assets = fetchurl { url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; From 9c257d65c0e745c4637f0560d082e5645e2c53b9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:48:02 +0100 Subject: [PATCH 3/8] laminar: switch to fetchFromGitHub --- .../tools/continuous-integration/laminar/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index dc1eac59ceda..05f96c0695b6 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchFromGitHub , cmake , capnproto , sqlite @@ -25,9 +26,11 @@ let in stdenv.mkDerivation rec { pname = "laminar"; version = "1.1"; - src = fetchurl { - url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"; + src = fetchFromGitHub { + owner = "ohwgiles"; + repo = "laminar"; + rev = version; + sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; From 4cf304289f43e177f069f8da4c87bfbb381b76d5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:48:28 +0100 Subject: [PATCH 4/8] pyside: switch to fetchFromGitHub --- .../python-modules/pyside/apiextractor.nix | 10 ++++++---- .../python-modules/pyside/generatorrunner.nix | 13 +++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index ab8c6eb78407..058414747440 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { pname = "pyside-apiextractor"; version = "0.10.10"; - src = fetchurl { - url = "https://github.com/PySide/Apiextractor/archive/${version}.tar.gz"; - sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; + src = fetchFromGitHub { + owner = "PySide"; + repo = "Apiextractor"; + rev = version; + sha256 = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 532ee6b2b24e..f1e002daf4c5 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); +in stdenv.mkDerivation rec { pname = "pyside-generatorrunner"; version = "0.6.16"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; - sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; + src = fetchFromGitHub { + owner = "PySide"; + repo = "Generatorrunner"; + rev = version; + sha256 = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg="; }; outputs = [ "out" "dev" ]; From 6a8737b8222e059409c26496bc526fbcf1da67b9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:48:51 +0100 Subject: [PATCH 5/8] libmx: switch to fetchFromGitHub --- pkgs/development/libraries/libmx/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index f4256de6981b..683c21095e6b 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchFromGitHub , libtool, pkg-config, automake, autoconf, intltool , glib, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { pname = "libmx"; version = "1.4.7"; - src = fetchurl { - url = "https://github.com/clutter-project/mx/archive/${version}.tar.gz"; - sha256 = "8a7514ea33c1dec7251d0141e24a702e7701dc9f00348cbcf1816925b7f74dbc"; + src = fetchFromGitHub { + owner = "clutter-project"; + repo = "mx"; + rev = version; + sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk="; }; # remove the following superfluous checks From e1e5974551ccbc257472f5d305ebd8defd5d1a76 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:49:02 +0100 Subject: [PATCH 6/8] libmowgli: switch to fetchFromGitHub --- pkgs/development/libraries/libmowgli/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index e227c09b2b61..a2a3971844bc 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libmowgli"; version = "2.1.3"; - src = fetchurl { - url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz"; - sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; + src = fetchFromGitHub { + owner = "atheme"; + repo = "libmowgli-2"; + rev = "v${version}"; + sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0="; }; meta = with lib; { From dace3e7c0eabe9050a898e279532cc10ce7b5c54 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:49:13 +0100 Subject: [PATCH 7/8] libinotify-kqueue: switch to fetchFromGitHub --- .../libraries/libinotify-kqueue/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 1f147b0ad5c5..d01407b43d0f 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libinotify-kqueue"; version = "20180201"; - src = fetchzip { - url = "https://github.com/libinotify-kqueue/libinotify-kqueue/archive/${version}.tar.gz"; - sha256 = "0dkh6n0ghhcl7cjkjmpin118h7al6i4vlkmw57vip5f6ngr6q3pl"; + src = fetchFromGitHub { + owner = "libinotify-kqueue"; + repo = "libinotify-kqueue"; + rev = version; + sha256 = "sha256-9A5s8rPGlRv3KbxOukk0VB2IQrDxVjklO5RB+IA1cDY="; }; nativeBuildInputs = [ autoreconfHook ]; From 9c2ad237b930d71ff9fa3d3c0ee560ef32283313 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 3 Jan 2022 00:49:24 +0100 Subject: [PATCH 8/8] libfaketime: switch to fetchFromGitHub --- pkgs/development/libraries/libfaketime/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 34c957715dde..7ac48a705a80 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, perl, coreutils }: +{ lib, stdenv, fetchFromGitHub, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; version = "0.9.9"; - src = fetchurl { - url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz"; - sha256 = "sha256-V9AYEVA2HAqbXI7vBbETkvYTStosLZmOkuY9rtY5ZHw="; + src = fetchFromGitHub { + owner = "wolfcw"; + repo = "libfaketime"; + rev = "v${version}"; + sha256 = "sha256-P1guVggteGtoq8+eeE966hDPkRwsn0m7oLCohyPrIb4="; }; patches = [