diff options
author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2021-12-24 00:24:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-24 00:24:37 +0100 |
commit | 85b6f5299c2f3a58c5c3a40043e4f80e324806cb (patch) | |
tree | 5a0e47e44eb7e871fddbd5d3d97b4765d716f9e1 /pkgs | |
parent | 9726130c9abcb2ab6f757aa3a5bb11118ce6b023 (diff) | |
parent | 1d047ac77efe7d13afc6fd88602240b6e3ff2500 (diff) | |
download | nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar.gz nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar.bz2 nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar.lz nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar.xz nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.tar.zst nixpkgs-85b6f5299c2f3a58c5c3a40043e4f80e324806cb.zip |
Merge pull request #150542 from Stunkymonkey/treewide-github-1
treewide: switch to fetchFromGitHub part 1
Diffstat (limited to 'pkgs')
20 files changed, 135 insertions, 98 deletions
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 67851611f76..0edd45f2409 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchFromGitHub, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -6,9 +6,11 @@ stdenv.mkDerivation rec { pname = "setbfree"; version = "0.8.11"; - src = fetchzip { - url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0c2wc8nkrzsy0yic4y7hjz320m3d20r8152j9dk8nsnmgjmyr2ir"; + src = fetchFromGitHub { + owner = "pantherb"; + repo = "setBfree"; + rev = "v${version}"; + sha256 = "sha256-OYrsq3zVaotmS1KUgDIQbVQgxpfweMKiB17/PC1iXDA="; }; postPatch = '' diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index d85d065431f..7a9b030e821 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: stdenv.mkDerivation rec { pname = "kdev-php"; version = "5.6.2"; - src = fetchurl { - url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "sha256-P7u/KIf/1YkJ2uWsuVThILP87vaYSbHpx5CtnSR3YbU="; + src = fetchFromGitHub { + owner = "KDE"; + repo = "kdev-php"; + rev = "v${version}"; + sha256 = "sha256-hEumH7M6yAuH+jPShOmbKjHmuPRg2djaVy9Xt28eK38="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index cdc1a300b79..03d3fce67e7 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: stdenv.mkDerivation rec { pname = "kdev-python"; version = "5.6.2"; - src = fetchurl { - url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "sha256-Iw3puQ3ZS0eNfBvaZ4cxsP49IRqIMX3R+r3OPG771RI="; + src = fetchFromGitHub { + owner = "KDE"; + repo = "kdev-python"; + rev = "v${version}"; + sha256 = "sha256-xYElqpJjRtBRIyZGf6JaCvurQ+QrGrdLHxtuANYfCds="; }; cmakeFlags = [ diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 5d44c5dceea..299c335e76c 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.6.0"; + version = "1.6"; - src = fetchurl { - url = "https://github.com/BestImageViewer/geeqie/archive/refs/tags/v1.6.tar.gz"; - sha256 = "0ky248j6n8hszkwwi949i1ypm2l5444byaspaa6564d9rpij01aj"; + src = fetchFromGitHub { + owner = "BestImageViewer"; + repo = "geeqie"; + rev = "v${version}"; + sha256 = "sha256-fvqpimrtzNy2UStOw3qLfC8i8V1fSrmTTsvc1ihqPsU="; }; patches = [ diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index a0e52ab5d30..3e2037f6d45 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: +{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }: stdenv.mkDerivation rec { pname = "scantailor"; version = "0.9.12.1"; - src = fetchurl { - url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; + src = fetchFromGitHub { + owner = "scantailor"; + repo = "scantailor"; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 3c74aaaded4..6bddfabfb5b 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl }: -let - version = "15.04.6"; -in -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { pname = "curaengine"; - inherit version; + version = "15.04.6"; - src = fetchurl { - url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg"; + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "CuraEngine"; + rev = version; + sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0="; }; postPatch = '' diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 2d855d0c9fc..7068954baac 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, automake, autoconf, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "gsimplecal"; version = "2.2"; - src = fetchurl { - url = "https://github.com/dmedvinsky/gsimplecal/archive/v${version}.tar.gz"; - sha256 = "sha256-f19cnTX83LZT2d01B1EdWSaHcfHqpFPTo5glYkAokq8="; + src = fetchFromGitHub { + owner = "dmedvinsky"; + repo = "gsimplecal"; + rev = "v${version}"; + sha256 = "sha256-r7OitN7WSY7vxpQCraLyokgUNgvaVFjE17ghBGgxzuM="; }; postPatch = '' diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 68721c846f7..8f4bf10b100 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python27Packages, python3Packages, wmctrl, +{ lib, fetchFromGitHub, python27Packages, python3Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -12,9 +12,11 @@ license = licenses.gpl2; }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + rev = "v${version}"; + sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -34,9 +36,11 @@ license = licenses.gpl2; }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + rev = "v${version}"; + sha256 = "sha256-oJ7+R3ZWhUbNTTAw1AfMg2ur8vW1XEbsa5FgSTam1Ns="; }; # I'm not sure why we don't find PyQt5 here but there's a similar diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 1bdcd6ea8a6..d158c111c87 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,15 +1,14 @@ -{ lib, fetchzip, qt5, mkDerivation }: +{ lib, fetchFromGitHub, qt5, mkDerivation }: -let - version = "1.40.43"; -in -mkDerivation { +mkDerivation rec { pname = "qtbitcointrader"; - inherit version; + version = "1.40.43"; - src = fetchzip { - url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "07xbsi78cykpyxidp1bw5ahmymdrs2afg7b0lla7dfhagz18lzxv"; + src = fetchFromGitHub { + owner = "JulyIGHOR"; + repo = "QtBitcoinTrader"; + rev = "v${version}"; + sha256 = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8="; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 4d1dd54bba6..70543b5fa18 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, qt4 }: +{ lib, stdenv, fetchFromGitHub, qt4 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; version = "1b"; - src = fetchurl { - url = "https://github.com/nonpop/${pname}/archive/v${version}.tar.gz"; - sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx"; + src = fetchFromGitHub { + owner = "nonpop"; + repo = "xkblayout-state"; + rev = "v${version}"; + sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 988bf29f291..226907afe7e 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -1,11 +1,14 @@ -{ fetchurl, lib, stdenv, libXrandr}: +{ lib, stdenv, fetchFromGitHub, libXrandr}: stdenv.mkDerivation rec { - version = "0.02"; pname = "xrandr-invert-colors"; - src = fetchurl { - url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; - sha256 = "sha256-7rIiBV9zbiLzu5RO5legHfGiqUSU2BuwqOc1dX/7ozA="; + version = "0.02"; + + src = fetchFromGitHub { + owner = "zoltanp"; + repo = "xrandr-invert-colors"; + rev = "v${version}"; + sha256 = "sha256-MIbHNJFDQsvjPUbperTKKbHY5GSgItvRyV5OsfpzYT4="; }; buildInputs = [ libXrandr ]; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 4f23f3f9a82..1221684f15c 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "diamond"; version = "0.8.36"; - src = fetchurl { - url = "https://github.com/bbuchfink/diamond/archive/v${version}.tar.gz"; - sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; + src = fetchFromGitHub { + owner = "bbuchfink"; + repo = "diamond"; + rev = "v${version}"; + sha256 = "sha256-7uqOQOzkYN0RNwKBGUZ/Ny5NVZMoGByOk+GUvjdBzck="; }; patches = [ diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix index ef853d0cd47..bcf47e6b6a3 100644 --- a/pkgs/applications/science/biology/kssd/default.nix +++ b/pkgs/applications/science/biology/kssd/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, zlib, automake, autoconf, libtool }: +{ lib, stdenv, fetchFromGitHub, zlib, automake, autoconf, libtool }: stdenv.mkDerivation rec { pname = "kssd"; version = "1.1"; - src = fetchurl { - url = "https://github.com/yhg926/public_${pname}/archive/v${version}.tar.gz"; - sha256 = "1x3v31cxnww4w5zn15vy0bwk53llsa0f97ma6qbw89h152d2mx5x"; + src = fetchFromGitHub { + owner = "yhg926"; + repo = "public_kssd"; + rev = "v${version}"; + sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY="; }; buildInputs = [ zlib automake autoconf libtool ]; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 9d9e46bc780..f8ce14e4685 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { version = "3.6"; pname = "messer-slim"; - src = fetchurl { - url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; - sha256 = "sha256-djWUKB+NW2a/6oaAMcH0Ul/R/XPHvGDbwlfeFmkbMOY="; + src = fetchFromGitHub { + owner = "MesserLab"; + repo = "SLiM"; + rev = "v${version}"; + sha256 = "sha256-TSbGUfr8YzTRYTkbMfM2+K04Z3h5W4jakw+V4axOKm8="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index 215ee35d78a..0fd658b0add 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, eigen, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, zlib }: stdenv.mkDerivation rec { pname = "niftyseg"; version = "1.0"; - src = fetchurl { - url = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz"; - sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0"; + + src = fetchFromGitHub { + owner = "KCL-BMEIS"; + repo = "NiftySeg"; + rev = "v${version}"; + sha256 = "sha256-FDthq1ild9XOw3E3O7Lpfn6hBF1Frhv1NxfEA8500n8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 3186acf1508..754e12c03ee 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "clingo"; version = "5.5.1"; - src = fetchzip { - url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; + src = fetchFromGitHub { + owner = "potassco"; + repo = "clingo"; + rev = "v${version}"; sha256 = "sha256-KBCwGNkz5HqbgXbDxPVcqxMXC8B2+wRI8eZVVXMVpLI="; }; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index a62db90c9e0..25495a68683 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: -let version = "0.3.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lxterminal"; - inherit version; + version = "0.3.2"; - src = fetchurl { - url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; - sha256 = "1iafqmccsm3nnzwp6pb2c04iniqqnscj83bq1rvf58ppzk0bvih3"; + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxterminal"; + rev = version; + sha256 = "sha256-5J21Xvx43Ie01IxB2usyixDl+WZEeFHn2HXZsRS5imo="; }; configureFlags = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 7b773a61a5f..2c024a24ba3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, buildPythonApplication +{ lib, stdenv, fetchurl, fetchFromGitHub, python, buildPythonApplication , libselinux # Propagated to blivet , useNixUdev ? true @@ -58,9 +58,11 @@ in buildPythonApplication rec { version = "0.4.1"; disabled = python.isPy3k; - src = fetchurl { - url = "https://github.com/NixOS/nixpart/archive/v${version}.tar.gz"; - sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixpart"; + rev = "v${version}"; + sha256 = "sha256-edl3mRg9Bn9Bd6FJl4zf1WS7XRcHTL5ey9LuKhaZG7I="; }; propagatedBuildInputs = [ blivet ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 23096bb2eaf..fc82d824497 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, libusb1, pkg-config, ... }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, ... }: stdenv.mkDerivation rec { pname = "blink1"; version = "1.98a"; - src = fetchurl { - url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz"; - sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; + src = fetchFromGitHub { + owner = "todbot"; + repo = "blink1"; + rev = "v${version}"; + sha256 = "sha256-o4pOF6Gp70AL63ih6BNOpRTCs7+qzeZrEqaR4hYDTG8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 42188cfbfff..b88aeda0fc5 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , makeWrapper , gnugrep @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { pname = "easyrsa"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/OpenVPN/easy-rsa/archive/v${version}.tar.gz"; - sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; + src = fetchFromGitHub { + owner = "OpenVPN"; + repo = "easy-rsa"; + rev = "v${version}"; + sha256 = "sha256-zTdk8mv+gC/SHK813wZ6CWZf9Jm2XkKfAPU3feFpAkY="; }; preBuild = '' |