From 7bd84011ef7575b2d36d94d944e6bc1aa3f56140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 12 Jul 2020 17:48:37 +0100
Subject: [PATCH] fix sops nixos module

---
 modules/sops/default.nix                 | 2 +-
 pkgs/sops-install-secrets/nixos-test.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/sops/default.nix b/modules/sops/default.nix
index bfb44d3..f972866 100644
--- a/modules/sops/default.nix
+++ b/modules/sops/default.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.sops;
   users = config.users.users;
-  sops-install-secrets = pkgs.callPackage ../../pkgs/sops-install-secrets {};
+  sops-install-secrets = (pkgs.callPackage ../.. {}).sops-install-secrets;
   secretType = types.submodule ({ config, ... }: {
     options = {
       name = mkOption {
diff --git a/pkgs/sops-install-secrets/nixos-test.nix b/pkgs/sops-install-secrets/nixos-test.nix
index de5d2cd..b4ef967 100644
--- a/pkgs/sops-install-secrets/nixos-test.nix
+++ b/pkgs/sops-install-secrets/nixos-test.nix
@@ -1,6 +1,7 @@
 { makeTest ? import <nixpkgs/nixos/tests/make-test-python.nix>, pkgs ? import <nixpkgs> }:
 {
  ssh-keys = makeTest {
+  name = "sops-ssh-keys";
   nodes.server = { ... }: {
     imports = [ ../../modules/sops ];
     services.openssh.enable = true;
@@ -22,6 +23,7 @@
  };
 
  pgp-keys = makeTest {
+   name = "sops-pgp-keys";
    nodes.server = { pkgs, lib, ... }: {
      imports = [ ../../modules/sops ];
       sops.gnupgHome = "/run/gpghome";