git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #138534 from Stunkymonkey/os-specific-github
commite04c24ca0264b16f37ef4fefdfffc8648e6a105a authorSandro <sandro.jaeckel@gmail.com> dateThu 23 Sep 2021, 11:22 (5 years ago) parent0ab6fd2997579a
6 files changed+57−35
compare with master
unifiedsplit
pkgs/os-specific/linux/afuse/default.nix+9−6 pkgs/os-specific/linux/bbswitch/default.nix+6−4 pkgs/os-specific/linux/google-authenticator/default.nix+6−4 pkgs/os-specific/linux/lm-sensors/default.nix+16−7 pkgs/os-specific/linux/pflask/default.nix+10−9 pkgs/os-specific/linux/v86d/default.nix+10−5
pkgs/os-specific/linux/afuse/default.nix+9−6
@@ -1,11 +1,14 @@
1−{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }:
1+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }:
22
3−stdenv.mkDerivation {
4− name = "afuse-0.4.1";
3+stdenv.mkDerivation rec {
4+ pname = "afuse-0.4.1";
5+ version = "0.4.1";
56
6− src = fetchurl {
7− url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz";
8− sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc";
7+ src = fetchFromGitHub {
8+ owner = "pcarrier";
9+ repo = "afuse";
10+ rev = "v${version}";
11+ hash = "sha256-JivJ/xRxUiR0Mnm41T0514kF+T7ePeGpk4IHhWApKBo=";
912 };
1013
1114 nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/os-specific/linux/bbswitch/default.nix+6−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, kernel, runtimeShell }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, runtimeShell }:
22
33let
44 baseName = "bbswitch";
@@ -10,9 +10,11 @@ in
1010stdenv.mkDerivation {
1111 inherit name;
1212
13− src = fetchurl {
14− url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
15− sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn";
13+ src = fetchFromGitHub {
14+ owner = "Bumblebee-Project";
15+ repo = "bbswitch";
16+ rev = "v${version}";
17+ hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4=";
1618 };
1719
1820 patches = [
pkgs/os-specific/linux/google-authenticator/default.nix+6−4
@@ -1,12 +1,14 @@
1−{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
1+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pam, qrencode }:
22
33stdenv.mkDerivation rec {
44 pname = "google-authenticator-libpam";
55 version = "1.09";
66
7− src = fetchurl {
8− url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
9− sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db";
7+ src = fetchFromGitHub {
8+ owner = "google";
9+ repo = "google-authenticator-libpam";
10+ rev = version;
11+ hash = "sha256-DS0h6FWMNKnSSj039bH6iyWrERa5M7LBSkbyig6pyxY=";
1012 };
1113
1214 nativeBuildInputs = [ autoreconfHook ];
pkgs/os-specific/linux/lm-sensors/default.nix+16−7
@@ -1,5 +1,12 @@
1−{ lib, stdenv, fetchzip, bison, flex, which, perl
2−, sensord ? false, rrdtool ? null
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, bison
5+, flex
6+, which
7+, perl
8+, sensord ? false
9+, rrdtool ? null
310}:
411
512assert sensord -> rrdtool != null;
@@ -7,16 +14,18 @@ assert sensord -> rrdtool != null;
714stdenv.mkDerivation rec {
815 pname = "lm-sensors";
916 version = "3.6.0";
10− dashedVersion = lib.replaceStrings ["."] ["-"] version;
17+ dashedVersion = lib.replaceStrings [ "." ] [ "-" ] version;
1118
12− src = fetchzip {
13− url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz";
14− sha256 = "1ipf6wjx037sqyhy0r5jh4983h216anq9l68ckn2x5c3qc4wfmzn";
19+ src = fetchFromGitHub {
20+ owner = "lm-sensors";
21+ repo = "lm-sensors";
22+ rev = "V${dashedVersion}";
23+ hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY=";
1524 };
1625
1726 nativeBuildInputs = [ bison flex which ];
1827 buildInputs = [ perl ]
19− ++ lib.optional sensord rrdtool;
28+ ++ lib.optional sensord rrdtool;
2029
2130 makeFlags = [
2231 "PREFIX=${placeholder "out"}"
pkgs/os-specific/linux/pflask/default.nix+10−9
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchurl, python, wafHook }:
1+{ lib, stdenv, fetchFromGitHub, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 pname = "pflask";
5− version = "git-2015-12-17";
6− rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
5+ version = "unstable-2015-12-17";
76
8− src = fetchurl {
9− url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
10− sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
7+ src = fetchFromGitHub {
8+ owner = "ghedo";
9+ repo = "pflask";
10+ rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
11+ hash = "sha256-0RjitZd2JUK7WUEJuw4qhUx3joY5OI0Hh74mTzp7GmY=";
1112 };
1213
1314 nativeBuildInputs = [ wafHook ];
@@ -15,9 +16,9 @@ stdenv.mkDerivation rec {
1516
1617 meta = {
1718 description = "Lightweight process containers for Linux";
18− homepage = "https://ghedo.github.io/pflask/";
19− license = lib.licenses.bsd2;
20− platforms = lib.platforms.linux;
19+ homepage = "https://ghedo.github.io/pflask/";
20+ license = lib.licenses.bsd2;
21+ platforms = lib.platforms.linux;
2122 maintainers = with lib.maintainers; [ ];
2223 };
2324}
pkgs/os-specific/linux/v86d/default.nix+10−5
@@ -1,14 +1,19 @@
1−{ lib, stdenv, fetchurl
2−, kernel, klibc
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, kernel
5+, klibc
36}:
47
58stdenv.mkDerivation rec {
69 name = "v86d-${version}-${kernel.version}";
710 version = "0.1.10";
811
9− src = fetchurl {
10− url = "https://github.com/mjanusz/v86d/archive/v86d-${version}.tar.gz";
11− sha256 = "1flnpp8rc945cxr6jr9dlm8mi8gr181zrp2say4269602s1a4ymg";
12+ src = fetchFromGitHub {
13+ owner = "mjanusz";
14+ repo = "v86d";
15+ rev = "v86d-${version}";
16+ hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA=";
1217 };
1318
1419 patchPhase = ''