lib: fix formatting

flake: remove 'aarch64-darwin'
'pyopenssl' has been marked as broken on this sytem, so remove it from my supported systems to avoid breaking 'nix flake check'.
2022-06-22 16:06:58 +02:00 · 2022-06-22 16:05:28 +02:00 · 2022-06-22 16:04:01 +02:00 · 2022-06-22 16:04:01 +02:00
10 changed files with 79 additions and 48 deletions
--- a/flake.lock
+++ b/flake.lock
@ -21,6 +21,22 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "futils": {
      "locked": {
        "lastModified": 1653893745,
@ -39,16 +55,22 @@
    },
    "home-manager": {
      "inputs": {
+        "flake-compat": "flake-compat",
        "nixpkgs": [
          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt",
+        "utils": [
+          "futils"
        ]
      },
      "locked": {
-        "lastModified": 1653943687,
-        "narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=",
+        "lastModified": 1655858799,
+        "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837",
+        "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18",
        "type": "github"
      },
      "original": {
@ -60,11 +82,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1653845079,
-        "narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=",
+        "lastModified": 1655624069,
+        "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7",
+        "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
        "type": "github"
      },
      "original": {
@ -74,13 +96,45 @@
        "type": "github"
      }
    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1653339422,
+        "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
    "nur": {
      "locked": {
-        "lastModified": 1653970042,
-        "narHash": "sha256-EcphYipFvqkFV9PrWUUz034G7WQHZwYVwzGiyU5384A=",
+        "lastModified": 1655884594,
+        "narHash": "sha256-ZwmYvED9P9RmMvQkV+PeZ5vGQyDDaR5y8A5vuRnrac0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "83f9a7c7287210b20da844b1ccd7c79cb696f51e",
+        "rev": "4a38042992499ce141a38e7dc5a105c31fd77b98",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -25,6 +25,7 @@
      ref = "master";
      inputs = {
        nixpkgs.follows = "nixpkgs";
+        utils.follows = "futils";
      };
    };

@ -68,7 +69,6 @@
      inherit (futils.lib) eachSystem system;

      mySystems = [
-        system.aarch64-darwin
        system.aarch64-linux
        system.x86_64-darwin
        system.x86_64-linux
--- a/lib/default.nix
+++ b/lib/default.nix
@ -15,6 +15,4 @@ let
    mapModules ./. (file: import file { inherit self lib pkgs inputs; })
  );
 in
-mylib.extend (self: super:
-  foldr (a: b: a // b) { } (attrValues super)
-)
+mylib.extend (self: super: foldr (a: b: a // b) { } (attrValues super))
--- a/pkgs/bw-pass/default.nix
+++ b/pkgs/bw-pass/default.nix
@ -1,4 +1,4 @@
-{ lib, bitwarden-cli, coreutils, jq, keyutils, makeWrapper, rofi, shellcheck, stdenvNoCC }:
+{ lib, bitwarden-cli, coreutils, jq, keyutils, makeWrapper, rofi, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "bw-pass";
  version = "0.1.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/change-audio/default.nix
+++ b/pkgs/change-audio/default.nix
@ -1,4 +1,4 @@
-{ lib, libnotify, makeWrapper, pamixer, shellcheck, stdenvNoCC }:
+{ lib, libnotify, makeWrapper, pamixer, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "change-audio";
  version = "0.3.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/change-backlight/default.nix
+++ b/pkgs/change-backlight/default.nix
@ -1,4 +1,4 @@
-{ lib, brightnessctl, libnotify, makeWrapper, shellcheck, stdenvNoCC }:
+{ lib, brightnessctl, libnotify, makeWrapper, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "change-backlight";
  version = "0.1.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/comma/default.nix
+++ b/pkgs/comma/default.nix
@ -1,4 +1,4 @@
-{ lib, fzf, makeWrapper, nix-index, shellcheck, stdenvNoCC }:
+{ lib, fzf, makeWrapper, nix-index, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "comma";
  version = "0.1.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/diff-flake/default.nix
+++ b/pkgs/diff-flake/default.nix
@ -1,4 +1,4 @@
-{ lib, coreutils, git, gnused, makeWrapper, shellcheck, stdenvNoCC }:
+{ lib, coreutils, git, gnused, makeWrapper, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "diff-flake";
  version = "0.2.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/drone-rsync/default.nix
+++ b/pkgs/drone-rsync/default.nix
@ -1,4 +1,4 @@
-{ lib, makeWrapper, openssh, rsync, shellcheck, sshpass, stdenvNoCC }:
+{ lib, makeWrapper, openssh, rsync, sshpass, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
  pname = "drone-rsync";
  version = "0.1.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/i3-get-window-criteria/default.nix
+++ b/pkgs/i3-get-window-criteria/default.nix
@ -1,4 +1,4 @@
-{ lib, coreutils, gnused, makeWrapper, shellcheck, stdenvNoCC, xorg }:
+{ lib, coreutils, gnused, makeWrapper, stdenvNoCC, xorg }:
 stdenvNoCC.mkDerivation rec {
  pname = "i3-get-window-criteria";
  version = "0.1.0";
@ -7,14 +7,11 @@ stdenvNoCC.mkDerivation rec {

  buildInputs = [
    makeWrapper
-    shellcheck
  ];

  dontUnpack = true;

-  buildPhase = ''
-    shellcheck $src
-  '';
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin
Author	SHA1	Message	Date
Bruno BELANYI	e5b82f0902	lib: fix formatting All checks were successful continuous-integration/drone/push Build is passing Details	2022-06-22 16:06:58 +02:00
Bruno BELANYI	fc63759c1a	flake: remove 'aarch64-darwin' 'pyopenssl' has been marked as broken on this sytem, so remove it from my supported systems to avoid breaking 'nix flake check'.	2022-06-22 16:05:28 +02:00
Bruno BELANYI	4ea0f8bc51	flake: bump inputs	2022-06-22 16:04:01 +02:00
Bruno BELANYI	abc67487a3	pkgs: remove 'shellcheck' as a 'buildPhase' I already verify those scripts with my pre-commit hook. And that way avoid spurious build failures in case a (transitive) dependency is broken.	2022-06-22 16:04:01 +02:00