Merge pull request #231 from ryantm/revert-163-rtm-2-21-recursive-nix

Revert "contrib: add direct tests for agenix "

.github/workflows/ci.yaml

@@ -9,9 +9,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: cachix/install-nix-action@v22
       with:
-        extra_nix_config: |
+        extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm"
-          system-features = nixos-test recursive-nix benchmark big-parallel kvm
-          extra-experimental-features = recursive-nix nix-command flakes
     - run: nix build
     - run: nix build .#doc
     - run: nix fmt . -- --check
@@ -22,9 +20,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: cachix/install-nix-action@v22
       with:
-        extra_nix_config: |
+        extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm"
-          system-features = nixos-test recursive-nix benchmark big-parallel kvm
-          extra-experimental-features = recursive-nix nix-command flakes
     - run: nix build
     - run: nix build .#doc
     - run: nix fmt . -- --check

pkgs/agenix.nix

@@ -9,10 +9,8 @@
   substituteAll,
   ageBin ? "${rage}/bin/rage",
   shellcheck,
-}: let
+}:
-  bin = "${placeholder "out"}/bin/agenix";
+stdenv.mkDerivation rec {
-in
-  stdenv.mkDerivation rec {
   pname = "agenix";
   version = "0.15.0";
   src = substituteAll {
@@ -24,34 +22,16 @@ in
     src = ./agenix.sh;
   };
   dontUnpack = true;
-    doInstallCheck = true;
-    installCheckInputs = [shellcheck];
-    postInstallCheck = ''
-      shellcheck ${bin}
-      ${bin} -h | grep ${version}
 
-      mkdir -p /tmp/home/.ssh
+  doCheck = true;
-      cp -r "${../example}" /tmp/home/secrets
+  checkInputs = [shellcheck];
-      chmod -R u+rw /tmp/home/secrets
+  postCheck = ''
-      export HOME=/tmp/home
+    shellcheck $src
-      (
-      umask u=rw,g=r,o=r
-      cp ${../example_keys/user1.pub} $HOME/.ssh/id_ed25519.pub
-      chown $UID $HOME/.ssh/id_ed25519.pub
-      )
-      (
-      umask u=rw,g=,o=
-      cp ${../example_keys/user1} $HOME/.ssh/id_ed25519
-      chown $UID $HOME/.ssh/id_ed25519
-      )
-
-      cd /tmp/home/secrets
-      test $(${bin} -d secret1.age) = "hello"
   '';
 
   installPhase = ''
-      install -D $src ${bin}
+    install -D $src ${placeholder "out"}/bin/agenix
   '';
 
   meta.description = "age-encrypted secrets for NixOS";
-  }
+}