diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-12 14:48:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 14:48:04 +0200 |
| commit | 157bbb0a4b3262ee92d7bbb57515855285de0e30 (patch) | |
| tree | d7dcf4f4eb835bb39b44a39cbab40b8093de7a69 | |
| parent | 17e2fbf2dcded334556c6c204c4b4a2ca3f10db2 (diff) | |
| parent | 4e31f77b3314ef40658a7d60159b2e62960b441b (diff) | |
Merge pull request #138536 from Stunkymonkey/misc-github
| -rw-r--r-- | pkgs/misc/drivers/xboxdrv/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/pipes/default.nix | 10 |
2 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index bd4022526ed41..7031f79413054 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config -, libusb1, boost, glib, dbus-glib }: +{ lib +, stdenv +, fetchFromGitHub +, sconsPackages +, libX11 +, pkg-config +, libusb1 +, boost +, glib +, dbus-glib +}: let version = "0.8.8"; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "xboxdrv"; inherit version; - src = fetchurl { - url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; - sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; + src = fetchFromGitHub { + owner = "xboxdrv"; + repo = "xboxdrv"; + rev = "v${version}"; + hash = "sha256-R0Bt4xfzQA1EmZbf7lcWLwSSUayf5Y711QhlAVhiLrY="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index be605192acce4..9962601875067 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, makeWrapper, coreutils, ncurses }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; version = "1.3.0"; - src = fetchurl { - url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; + src = fetchFromGitHub { + owner = "pipeseroni"; + repo = "pipes.sh"; + rev = "v${version}"; + hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc="; }; nativeBuildInputs = [ makeWrapper ]; |