From b6d6778447d9bf240f1954d2b3ca3de70e067ea8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:55:55 +0200 Subject: [PATCH 1/8] aspcud: switch to fetchFromGitHub --- pkgs/tools/misc/aspcud/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index a50bc311f247..ef1b6a5a4ca5 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchzip -, boost, clasp, cmake, gringo, re2c +{ lib +, stdenv +, fetchFromGitHub +, boost +, clasp +, cmake +, gringo +, re2c }: stdenv.mkDerivation rec { version = "1.9.5"; pname = "aspcud"; - src = fetchzip { - url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; + src = fetchFromGitHub { + owner = "potassco"; + repo = "aspcud"; + rev = "v${version}"; + hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; From f4431f535c680da3e19d7ab37fe15f27e2e39ff4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:56:10 +0200 Subject: [PATCH 2/8] ccze: switch to fetchFromGitHub --- pkgs/tools/misc/ccze/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix index 348cbb1f529c..874653c7f6c3 100644 --- a/pkgs/tools/misc/ccze/default.nix +++ b/pkgs/tools/misc/ccze/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, autoconf, ncurses, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { pname = "ccze"; version = "0.2.1-2"; - src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; - sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; + src = fetchFromGitHub { + owner = "madhouse"; + repo = "ccze"; + rev = "ccze-${version}"; + hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c="; }; buildInputs = [ autoconf ncurses pcre ]; From c1429659c7508afd42726773395d64600158f702 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:56:31 +0200 Subject: [PATCH 3/8] contacts: switch to fetchFromGitHub --- pkgs/tools/misc/contacts/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 7b652f36a19f..e0b1613735f8 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook, Foundation, AddressBook }: stdenv.mkDerivation { version = "1.1a-3"; pname = "contacts"; - src = fetchurl { - url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; - sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; + src = fetchFromGitHub { + owner = "dhess"; + repo = "contacts"; + rev = "4092a3c6615d7a22852a3bafc44e4aeeb698aa8f"; + hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A="; }; nativeBuildInputs = [ xcbuildHook ]; @@ -19,10 +21,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = "http://www.gnufoo.org/contacts/contacts.html"; - license = licenses.gpl2; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; + license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = lib.platforms.darwin; + platforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.darwin; }; } From 4d0269b8cec47d27476a2535ea4be897cc510036 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:56:50 +0200 Subject: [PATCH 4/8] profile-sync-daemon: switch to fetchFromGitHub --- pkgs/tools/misc/profile-sync-daemon/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index d0bd0c76a839..c14d3b07a37c 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, util-linux, coreutils}: +{ lib, stdenv, fetchFromGitHub, util-linux, coreutils }: stdenv.mkDerivation rec { - version = "6.44"; pname = "profile-sync-daemon"; + version = "6.44"; - src = fetchurl { - url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "sha256-+iQr7T99X/jYYgq0xNHLPCJG5mZU/6dN76Z1FB51Z54="; + src = fetchFromGitHub { + owner = "graysky2"; + repo = "profile-sync-daemon"; + rev = "v${version}"; + hash = "sha256-7sEC2b4mzgbDTFgpH5abZ/kiwEmGdbKkTLiD73Efdls="; }; installPhase = '' From 85c54d59ebdb5c14ad7d72947dbf0ad6ec7dfd12 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:57:09 +0200 Subject: [PATCH 5/8] sdate: switch to fetchFromGitHub --- pkgs/tools/misc/sdate/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 69c9d726713b..899d3259b261 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; - src = fetchurl { - url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "1lfnsb8prac8rspnxcawd138jyhyivwf35rrmfvwq6dhsx23c6vy"; + + src = fetchFromGitHub { + owner = "ChristophBerg"; + repo = "sdate"; + rev = version; + hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8="; }; buildInputs = [ autoreconfHook ]; From 8ee398d0162287efe48c6ed9efaf6d8379b1b63e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:57:27 +0200 Subject: [PATCH 6/8] tio: switch to fetchFromGitHub --- pkgs/tools/misc/tio/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index a25b821c7e3d..9b8e76f10c43 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "tio"; version = "1.32"; - src = fetchzip { - url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; - sha256 = "0lwqdm73kshi9qs8pks1b4by6yb9jf3bbyw3bv52xmggnr5s1hcv"; + src = fetchFromGitHub { + owner = "tio"; + repo = "tio"; + rev = "v${version}"; + hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM="; }; nativeBuildInputs = [ autoreconfHook ]; From dfc987cd7c983d1c88d9e89a53e236e2a47628cc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:57:42 +0200 Subject: [PATCH 7/8] txt2man: switch to fetchFromGitHub --- pkgs/tools/misc/txt2man/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 27ff219a6e13..b522665e34fa 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchFromGitHub, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; version = "1.7.1"; - src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; + src = fetchFromGitHub { + owner = "mvertes"; + repo = "txt2man"; + rev = "${pname}-${version}"; + hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s="; }; preConfigure = '' From 11d9481a9eda474b1cbc7aa4a86f9ccb2d6d6285 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 19 Sep 2021 18:57:57 +0200 Subject: [PATCH 8/8] xtitle: switch to fetchFromGitHub --- pkgs/tools/misc/xtitle/default.nix | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 2820958443ed..975b24103d59 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,24 +1,25 @@ -{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - pname = "xtitle"; - version = "0.4.4"; + pname = "xtitle"; + version = "0.4.4"; - src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; - sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; - }; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "xtitle"; + rev = version; + hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg="; + }; + buildInputs = [ libxcb git xcbutil xcbutilwm ]; - buildInputs = [ libxcb git xcbutil xcbutilwm ]; + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - - meta = { - description = "Outputs X window titles"; - homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ lib.maintainers.meisternu ]; - license = "Custom"; - platforms = lib.platforms.linux; - }; + meta = { + description = "Outputs X window titles"; + homepage = "https://github.com/baskerville/xtitle"; + maintainers = [ lib.maintainers.meisternu ]; + license = "Custom"; + platforms = lib.platforms.linux; + }; }