From 8596ce863871d8219b91e8acf1d2aa363aa688db Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 18:29:02 +0200 Subject: [PATCH 01/11] home: wm: i3bar: remove redundant '%' --- home/wm/i3bar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/wm/i3bar.nix b/home/wm/i3bar.nix index e9c85de..62d0d7b 100644 --- a/home/wm/i3bar.nix +++ b/home/wm/i3bar.nix @@ -40,8 +40,8 @@ in } { block = "battery"; - format = "{percentage}% ({time})"; - full_format = "{percentage}%"; + format = "{percentage} ({time})"; + full_format = "{percentage}"; } { block = "temperature"; From 878c92b67ebdd381e10fe13be8f9c464989fa49b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 18:44:10 +0200 Subject: [PATCH 02/11] pkgs: havm: use 'checkInputs' for test dependency --- pkgs/havm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/havm/default.nix b/pkgs/havm/default.nix index d8856a5..2e15de7 100644 --- a/pkgs/havm/default.nix +++ b/pkgs/havm/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghc - which # Used by tests + ]; + + checkInputs = [ + which ]; doCheck = true; From 02ffbcf970a1992ea2396dcd8e3510120e2829c3 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 18:59:05 +0200 Subject: [PATCH 03/11] pkgs: bw-pass: do not set 'phases' --- pkgs/bw-pass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/bw-pass/default.nix b/pkgs/bw-pass/default.nix index 95ae0da..b11e7ea 100644 --- a/pkgs/bw-pass/default.nix +++ b/pkgs/bw-pass/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { src = ./bw-pass; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper shellcheck ]; + dontUnpack = true; + buildPhase = '' shellcheck $src ''; From 4fe18ff4cdafb5f98054246d9aecc19a42d87fc5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 19:00:29 +0200 Subject: [PATCH 04/11] pkgs: comma: give path to source directly --- pkgs/comma/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/comma/default.nix b/pkgs/comma/default.nix index f932863..b034b9a 100644 --- a/pkgs/comma/default.nix +++ b/pkgs/comma/default.nix @@ -3,7 +3,7 @@ stdenvNoCC.mkDerivation rec { pname = "comma"; version = "0.1.0"; - src = ./. + "/comma"; + src = ./comma; phases = [ "buildPhase" "installPhase" "fixupPhase" ]; From 99462199bda9c15f88634a06a557c1be44ff688f Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 19:00:46 +0200 Subject: [PATCH 05/11] pkgs: comma: do not set 'phases' --- pkgs/comma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/comma/default.nix b/pkgs/comma/default.nix index b034b9a..1c10eb2 100644 --- a/pkgs/comma/default.nix +++ b/pkgs/comma/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { src = ./comma; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper shellcheck ]; + dontUnpack = true; + buildPhase = '' shellcheck $src ''; From 60e977611c5baa03fbb7c260557f4a0afc5d13c9 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 19:01:18 +0200 Subject: [PATCH 06/11] pkgs: diff-flake: do not set 'phases' --- pkgs/diff-flake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/diff-flake/default.nix b/pkgs/diff-flake/default.nix index 090aa6d..c085e67 100644 --- a/pkgs/diff-flake/default.nix +++ b/pkgs/diff-flake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { src = ./diff-flake; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper shellcheck ]; + dontUnpack = true; + buildPhase = '' shellcheck $src ''; From 5c1dd6500affe888de6b8051e7f416590cc9036c Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 19:50:44 +0200 Subject: [PATCH 07/11] pkgs: havm: use 'nativeBuildInputs' This is the correct one to use for a compiler like 'ghc'. --- pkgs/havm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/havm/default.nix b/pkgs/havm/default.nix index 2e15de7..51eb9f0 100644 --- a/pkgs/havm/default.nix +++ b/pkgs/havm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FDi4FZ8rjGqRkFlROtcJsv+mks7MmIXQGV4bZrwkQrA="; }; - buildInputs = [ + nativeBuildInputs = [ ghc ]; From b0e44755863d4a21adb9211a91adae51ff96f9e1 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 20:08:22 +0200 Subject: [PATCH 08/11] pkgs: i3-get-window-criteria: do not set 'phases' --- pkgs/i3-get-window-criteria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/i3-get-window-criteria/default.nix b/pkgs/i3-get-window-criteria/default.nix index 2e7ce03..acfde93 100644 --- a/pkgs/i3-get-window-criteria/default.nix +++ b/pkgs/i3-get-window-criteria/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { src = ./i3-get-window-criteria; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper shellcheck ]; + dontUnpack = true; + buildPhase = '' shellcheck $src ''; From add6326fdf101fa2a35da3902d194efb7c9f5bfb Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 20:10:41 +0200 Subject: [PATCH 09/11] pkgs: matrix-notifier: do not set 'phases' --- pkgs/matrix-notifier/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/matrix-notifier/default.nix b/pkgs/matrix-notifier/default.nix index a7b3a3c..76765a7 100644 --- a/pkgs/matrix-notifier/default.nix +++ b/pkgs/matrix-notifier/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-JiKPDrr9wyD2q5Vsac+OkFdvrDkx6mj/oC7XDVnka74="; }; - phases = [ "installPhase" "fixupPhase" ]; - nativeBuildInputs = [ makeWrapper ]; From 5937d439937cf32029c1e90523aef01ade90934b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 20:11:00 +0200 Subject: [PATCH 10/11] pkgs: unbound-zones-adblock: do not set 'phases' --- pkgs/unbound-zones-adblock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/unbound-zones-adblock/default.nix b/pkgs/unbound-zones-adblock/default.nix index 2f7ac3f..845c123 100644 --- a/pkgs/unbound-zones-adblock/default.nix +++ b/pkgs/unbound-zones-adblock/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec { src = unified-hosts-lists; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let From aceb4ef901d410f61fd5da8efff68b5a02c94ef5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 31 Aug 2021 20:11:11 +0200 Subject: [PATCH 11/11] pkgs: unified-hosts-lists: do not set 'phases' --- pkgs/unified-hosts-lists/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/unified-hosts-lists/default.nix b/pkgs/unified-hosts-lists/default.nix index 9fb052a..0da6354 100644 --- a/pkgs/unified-hosts-lists/default.nix +++ b/pkgs/unified-hosts-lists/default.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-7oYuGegrHVUvAvA16iR8OEe5eTMeSybShSa1PJOe5No="; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out