From fc6bd2bdfedf2a67d41cc6339ffa241375832941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 18 Mar 2023 15:54:42 +0100 Subject: [PATCH] drop deprecated overlay/devShell output --- flake.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 7d9c3d1..bcc42e8 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ suffix-version = version: attrs: nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair (name + version) value) attrs; suffix-stable = suffix-version "-22_11"; in { - overlay = final: prev: let + overlays.default = final: prev: let localPkgs = import ./default.nix {pkgs = final;}; in { inherit (localPkgs) sops-install-secrets sops-init-gpg-key sops-pgp-hook sops-import-keys-hook sops-ssh-to-age; @@ -46,12 +46,11 @@ (suffix-stable packages-stable)); defaultPackage = forAllSystems (system: self.packages.${system}.sops-init-gpg-key); - devShell = forAllSystems ( - system: - nixpkgs.legacyPackages.${system}.callPackage ./shell.nix {} - ); - devShells = forAllSystems (system: { - unit-tests = nixpkgs.legacyPackages.${system}.callPackage ./pkgs/unit-tests.nix {}; + devShells = forAllSystems (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix {}; + default = pkgs.callPackage ./shell.nix {}; }); }; }