From 3722e4fbcc4dec45d7a21f7d6fbd7d6182c5418c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:05:45 +0200 Subject: [PATCH 1/6] afuse: switch to fetchFromGitHub --- pkgs/os-specific/linux/afuse/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 75c44e111725..e5cc3bd9790a 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: -stdenv.mkDerivation { - name = "afuse-0.4.1"; +stdenv.mkDerivation rec { + pname = "afuse-0.4.1"; + version = "0.4.1"; - src = fetchurl { - url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz"; - sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; + src = fetchFromGitHub { + owner = "pcarrier"; + repo = "afuse"; + rev = "v${version}"; + hash = "sha256-JivJ/xRxUiR0Mnm41T0514kF+T7ePeGpk4IHhWApKBo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 2653630f27e645136a7631ca8aab4309613699fb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:06:19 +0200 Subject: [PATCH 2/6] bbswitch: switch to fetchFromGitHub --- pkgs/os-specific/linux/bbswitch/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index fbd34afdaf8f..4d081225f11e 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -10,9 +10,11 @@ in stdenv.mkDerivation { inherit name; - src = fetchurl { - url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz"; - sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; + src = fetchFromGitHub { + owner = "Bumblebee-Project"; + repo = "bbswitch"; + rev = "v${version}"; + hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; }; patches = [ From 41d512768f1ddb2bc64116e3b9d58d4ea63d0795 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:07:13 +0200 Subject: [PATCH 3/6] google-authenticator: switch to fetchFromGitHub --- .../os-specific/linux/google-authenticator/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index ce90a1d432f7..fcf75ac7821a 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pam, qrencode }: stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; version = "1.09"; - src = fetchurl { - url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db"; + src = fetchFromGitHub { + owner = "google"; + repo = "google-authenticator-libpam"; + rev = version; + hash = "sha256-DS0h6FWMNKnSSj039bH6iyWrERa5M7LBSkbyig6pyxY="; }; nativeBuildInputs = [ autoreconfHook ]; From 056df0bdddab64883469b7e6516fdc946629c044 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:07:31 +0200 Subject: [PATCH 4/6] lm-sensors: switch to fetchFromGitHub --- pkgs/os-specific/linux/lm-sensors/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 21324a5d6ce7..fda11400e8f5 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchzip, bison, flex, which, perl -, sensord ? false, rrdtool ? null +{ lib +, stdenv +, fetchFromGitHub +, bison +, flex +, which +, perl +, sensord ? false +, rrdtool ? null }: assert sensord -> rrdtool != null; @@ -7,16 +14,18 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { pname = "lm-sensors"; version = "3.6.0"; - dashedVersion = lib.replaceStrings ["."] ["-"] version; + dashedVersion = lib.replaceStrings [ "." ] [ "-" ] version; - src = fetchzip { - url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz"; - sha256 = "1ipf6wjx037sqyhy0r5jh4983h216anq9l68ckn2x5c3qc4wfmzn"; + src = fetchFromGitHub { + owner = "lm-sensors"; + repo = "lm-sensors"; + rev = "V${dashedVersion}"; + hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY="; }; nativeBuildInputs = [ bison flex which ]; buildInputs = [ perl ] - ++ lib.optional sensord rrdtool; + ++ lib.optional sensord rrdtool; makeFlags = [ "PREFIX=${placeholder "out"}" From c217af17c89040ba2c1fb1f21f9a3fd8e088efcf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:07:48 +0200 Subject: [PATCH 5/6] pflask: switch to fetchFromGitHub --- pkgs/os-specific/linux/pflask/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index f3e63133d1e1..92294b58e42a 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, python, wafHook }: +{ lib, stdenv, fetchFromGitHub, python, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; - version = "git-2015-12-17"; - rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; + version = "unstable-2015-12-17"; - src = fetchurl { - url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz"; - sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440"; + src = fetchFromGitHub { + owner = "ghedo"; + repo = "pflask"; + rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; + hash = "sha256-0RjitZd2JUK7WUEJuw4qhUx3joY5OI0Hh74mTzp7GmY="; }; nativeBuildInputs = [ wafHook ]; @@ -15,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight process containers for Linux"; - homepage = "https://ghedo.github.io/pflask/"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; + homepage = "https://ghedo.github.io/pflask/"; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; } From 997579a42a079932ac0a3498c314d6ed5e61f803 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 17:08:01 +0200 Subject: [PATCH 6/6] v86d: switch to fetchFromGitHub --- pkgs/os-specific/linux/v86d/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 36270cdfcc0e..254abb5838e8 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchurl -, kernel, klibc +{ lib +, stdenv +, fetchFromGitHub +, kernel +, klibc }: stdenv.mkDerivation rec { name = "v86d-${version}-${kernel.version}"; version = "0.1.10"; - src = fetchurl { - url = "https://github.com/mjanusz/v86d/archive/v86d-${version}.tar.gz"; - sha256 = "1flnpp8rc945cxr6jr9dlm8mi8gr181zrp2say4269602s1a4ymg"; + src = fetchFromGitHub { + owner = "mjanusz"; + repo = "v86d"; + rev = "v86d-${version}"; + hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA="; }; patchPhase = ''