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";

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
   '';

pkgs/comma/default.nix

@@ -3,15 +3,15 @@ stdenvNoCC.mkDerivation rec {
   pname = "comma";
   version = "0.1.0";
 
-  src = ./comma;
+  src = ./. + "/comma";
+
+  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
 
   buildInputs = [
     makeWrapper
     shellcheck
   ];
 
-  dontUnpack = true;
-
   buildPhase = ''
     shellcheck $src
   '';

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
   '';

pkgs/havm/default.nix

@@ -8,12 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-FDi4FZ8rjGqRkFlROtcJsv+mks7MmIXQGV4bZrwkQrA=";
   };
 
-  nativeBuildInputs = [
+  buildInputs = [
     ghc
-  ];
-
-  checkInputs = [
-    which
+    which # Used by tests
   ];
 
   doCheck = true;

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
   '';

pkgs/matrix-notifier/default.nix

@@ -10,6 +10,8 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "sha256-JiKPDrr9wyD2q5Vsac+OkFdvrDkx6mj/oC7XDVnka74=";
   };
 
+  phases = [ "installPhase" "fixupPhase" ];
+
   nativeBuildInputs = [
     makeWrapper
   ];

pkgs/unbound-zones-adblock/default.nix

@@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = unified-hosts-lists;
 
-  dontUnpack = true;
+  phases = [ "installPhase" ];
 
   installPhase =
     let

pkgs/unified-hosts-lists/default.nix

@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec {
     sha256 = "sha256-7oYuGegrHVUvAvA16iR8OEe5eTMeSybShSa1PJOe5No=";
   };
 
-  dontUnpack = true;
+  phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out