From 915b7c3c0ebc55319d04740ce64bd6e386081182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Nov 2024 15:34:28 +0100 Subject: [PATCH] move lint and cross-build to flake.nix --- default.nix | 9 --------- flake.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index efc7b59..1e17c35 100644 --- a/default.nix +++ b/default.nix @@ -17,12 +17,3 @@ rec { # backwards compatibility inherit (pkgs) ssh-to-pgp; } -// (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { - lint = pkgs.callPackage ./pkgs/lint.nix { - inherit sops-install-secrets; - }; - - cross-build = pkgs.callPackage ./pkgs/cross-build.nix { - inherit sops-install-secrets; - }; -}) diff --git a/flake.nix b/flake.nix index 724eda1..1b95647 100644 --- a/flake.nix +++ b/flake.nix @@ -99,6 +99,14 @@ (pkgs.callPackage ./formatter.nix { inputs = privateInputs; }).config.build.check; + + cross-build = pkgs.callPackage ./pkgs/cross-build.nix { + sops-install-secrets = self.packages.${system}.sops-install-secrets; + }; + + lint = pkgs.callPackage ./pkgs/lint.nix { + sops-install-secrets = self.packages.${system}.sops-install-secrets; + }; } // (suffix-stable packages-stable) // nixpkgs.lib.optionalAttrs pkgs.stdenv.isLinux tests