Merge pull request #233 from Mic92/util-linux

no longer use out-dated aliases

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1664028844,
-        "narHash": "sha256-wwGqnvROHW54ma0h4q6GL5toKxTVVKvAypv0CcJkraU=",
+        "lastModified": 1664177230,
+        "narHash": "sha256-eyo88ffm16I0K9cdcePbOsQg4MDjf1EgIdkGTLB/7iA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72bdd03f0d5696412b25a93218acaad530570d30",
+        "rev": "ff9793cfd1a25145a7e591af604675b3d6f68987",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1664063819,
-        "narHash": "sha256-5wXa+9uboo7UizMDeUTMoANv3pm0g9ze1NdTleY3rCE=",
+        "lastModified": 1664201777,
+        "narHash": "sha256-cUW9DqELUNi1jNMwVSbfq4yl5YGyOfeu+UHUUImbby0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aee4db5b9eaccd3fb7f16c742685fef9dc355077",
+        "rev": "00f877f4927b6f7d7b75731b5a1e2ae7324eaf14",
         "type": "github"
       },
       "original": {

pkgs/sops-init-gpg-key/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, gnupg, coreutils, utillinux, unixtools }:
+{ stdenv, lib, makeWrapper, gnupg, coreutils, util-linux, unixtools }:
 
 stdenv.mkDerivation {
   name = "sops-init-gpg-key";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     install -m755 -D $src $out/bin/sops-init-gpg-key
     wrapProgram $out/bin/sops-init-gpg-key \
       --prefix PATH : ${lib.makeBinPath [
-        coreutils utillinux gnupg unixtools.hostname
+        coreutils util-linux gnupg unixtools.hostname
       ]}
   '';
 

pkgs/sops-install-secrets/shell.nix

@@ -1,4 +1,4 @@
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [ go delve utillinux gnupg ];
+  nativeBuildInputs = with pkgs; [ go delve util-linux gnupg ];
 }

pkgs/unit-tests.nix

@@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation {
   nativeBuildInputs = with pkgs; [
     bashInteractive
     gnupg
-    utillinux
+    util-linux
     nix
     sopsPkgs.sops-pgp-hook-test
   ] ++ pkgs.lib.optional (pkgs.stdenv.isLinux) sopsPkgs.sops-install-secrets.unittest;

shell.nix

@@ -5,8 +5,8 @@ pkgs.mkShell {
     go
     delve
     gnupg
-    utillinux
-    nixFlakes
+    util-linux
+    nix
     golangci-lint
   ];
   # delve does not compile with hardening enabled