Merge pull request #138551 from Stunkymonkey/tools-github-1

pkgs/tools: switch to fetchFromGitHub part 1

pkgs/tools/audio/dir2opus/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }:
+{ lib, stdenv, fetchFromGitHub, python, mutagen, wrapPython, opusTools, mpg123 }:
 
 let version = "0.12.2"; in
 stdenv.mkDerivation rec {
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ wrapPython ];
   propagatedBuildInputs = [ opusTools mpg123 ];
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
+    owner = "ehmry";
-    name = "${pname}-${version}.tar.gz";
+    repo = "dir2opus";
-    sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
+    rev = version;
+    hash = "sha256-ZEsXwqxikWxFOz99wTI3rEK/rEYA+BSWGrCwW4q+FFc=";
   };
 
   postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus";

pkgs/tools/backup/wal-e/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, python3Packages, lzop, postgresql, pv }:
+{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }:
 
 python3Packages.buildPythonApplication rec {
   pname = "wal-e";
@@ -6,9 +6,11 @@ python3Packages.buildPythonApplication rec {
 
   namePrefix = "";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz";
+    owner = "wal-e";
-    sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow=";
+    repo = "wal-e";
+    rev = "v${version}";
+    hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4=";
   };
 
   # needs tox
@@ -27,7 +29,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
     homepage = "https://github.com/wal-e/wal-e";
-    maintainers = [];
+    maintainers = [ ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
   };

pkgs/tools/backup/zbackup/default.nix

@@ -1,13 +1,18 @@
-{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
+{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "zbackup";
   version = "1.4.4";
-  src = fetchurl {
+
-    url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz";
+  src = fetchFromGitHub {
-    sha256 = "11csla7n44lg7x6yqg9frb21vnkr8cvnh6ardibr3nj5l39crk7g";
+    owner = "zbackup";
+    repo = "zbackup";
+    rev = version;
+    hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
   };
+
   buildInputs = [ zlib openssl protobuf lzo libunwind ];
   nativeBuildInputs = [ cmake protobufc ];
+
   meta = {
     description = "A versatile deduplicating backup tool";
     homepage = "http://zbackup.org/";

pkgs/tools/filesystems/bcache-tools/default.nix

@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }:
 
 stdenv.mkDerivation rec {
   pname = "bcache-tools";
   version = "1.0.7";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    name = "${pname}-${version}.tar.gz";
+    owner = "g2p";
-    url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
+    repo = "bcache-tools";
-    sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
+    rev = "v${version}";
+    hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4=";
   };
 
   nativeBuildInputs = [ pkg-config ];

pkgs/tools/graphics/jbig2enc/default.nix

@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
+{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation rec {
   pname = "jbig2enc";
   version = "0.28";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz";
+    owner = "agl";
-    sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3";
+    repo = "jbig2enc";
+    rev = "${version}-dist";
+    hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY=";
   };
 
   propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ];

pkgs/tools/networking/openssh/default.nix

@@ -1,7 +1,8 @@
-{ callPackage, fetchurl, fetchpatch, autoreconfHook }:
+{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:
 let
-  common = opts: callPackage (import ./common.nix opts) {};
+  common = opts: callPackage (import ./common.nix opts) { };
-in {
+in
+{
 
   openssh = common rec {
     pname = "openssh";
@@ -20,9 +21,11 @@ in {
     version = "8.4p1";
     extraDesc = " with high performance networking patches";
 
-    src = fetchurl {
+    src = fetchFromGitHub {
-      url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
+      owner = "rapier1";
-      sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540";
+      repo = "openssh-portable";
+      rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}";
+      hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY=";
     };
 
     extraPatches = [

pkgs/tools/networking/sipsak/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, c-ares, openssl ? null }:
 
 stdenv.mkDerivation rec {
   pname = "sipsak";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "--std=gnu89";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz";
+    owner = "sipwise";
-    sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374";
+    repo = "sipsak";
+    rev = "mr${version}";
+    hash = "sha256-y9P6t3xjazRNT6lDZAx+CttdyXruC6Q14b8XF9loeU4=";
   };
 
   meta = with lib; {

pkgs/tools/networking/tcptraceroute/default.nix

@@ -1,16 +1,22 @@
-{ lib, stdenv  , fetchurl, libpcap, libnet
+{ lib
+, stdenv
+, fetchFromGitHub
+, libpcap
+, libnet
 }:
 
 stdenv.mkDerivation rec {
-   pkgname = "tcptraceroute";
+  pname = "tcptraceroute";
-   name = "${pkgname}-${version}";
   version = "1.5beta7";
 
-   src = fetchurl {
+  src = fetchFromGitHub {
-     url = "https://github.com/mct/${pkgname}/archive/${name}.tar.gz";
+    owner = "mct";
-     sha256 = "1rz8bgc6r1isb40awv1siirpr2i1paa2jc1cd3l5pg1m9522xzap";
+    repo = "tcptraceroute";
+    rev = "${pname}-${version}";
+    hash = "sha256-KU4MLWtOFzzNr+I99fRbhBokhS1JUNL+OgVltkOGav4=";
   };
 
+
   # for reasons unknown --disable-static configure flag doesn't disable static
   # linking.. we instead override CFLAGS with -static omitted
   preBuild = ''

pkgs/tools/networking/tracebox/default.nix

@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }:
 
 stdenv.mkDerivation rec {
   pname = "tracebox";
   version = "0.2";
 
-  src = fetchzip {
+  src = fetchFromGitHub {
-    url = "https://github.com/tracebox/tracebox/archive/v${version}.zip";
+    owner = "tracebox";
-    sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns";
+    repo = "tracebox";
+    rev = "v${version}";
+    hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];