Merge pull request #138536 from Stunkymonkey/misc-github

pkgs/misc/drivers/xboxdrv/default.nix

@@ -1,15 +1,27 @@
-{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config
+{ lib
-, libusb1, boost, glib, dbus-glib }:
+, 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 {
+  src = fetchFromGitHub {
-    url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz";
+    owner = "xboxdrv";
-    sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
+    repo = "xboxdrv";
+    rev = "v${version}";
+    hash = "sha256-R0Bt4xfzQA1EmZbf7lcWLwSSUayf5Y711QhlAVhiLrY=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

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 {
+  src = fetchFromGitHub {
-    url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
+    owner = "pipeseroni";
-    sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak";
+    repo = "pipes.sh";
+    rev = "v${version}";
+    hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];