ref: non-flake compatibility

since this is purely a legacy concern (both default.nix and shell.nix),
we avoid to include the flake-compat as a flake input.

(even though unused inputs are lazily fetched - for style & clarity)
This commit is contained in:
David Arnold 2021-05-28 15:07:11 -05:00
parent ded0db9e3f
commit ee9b4adfc8
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
7 changed files with 36 additions and 70 deletions

View file

@ -5,12 +5,9 @@
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs";
devshell-flake.url = "github:numtide/devshell";
flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
};
outputs = { self, nixpkgs, flake-utils, devshell-flake, flake-compat }:
{ modules = import ./modules; }
//
outputs = { self, nixpkgs, flake-utils, devshell-flake }:
(flake-utils.lib.eachDefaultSystem
(system:
let
@ -27,29 +24,23 @@
in
rec {
devShell = with pkgs; devshell.mkShell
{
imports = [
(devshell.importTOML ./devshell.toml)
];
};
{ imports = [ (devshell.importTOML ./devshell.toml) ]; };
packages = flake-utils.lib.flattenTree {
inherit (pkgs)
kubenix
kubernetes
kubectl
;
};
hydraJobs = {
inherit packages;
};
defaultPackage = pkgs.kubenix;
}
)
) //
{
modules = import ./src/modules;
overlay = final: prev: {
kubenix = prev.callPackage ./kubenix.nix { };
kubenix = prev.callPackage ./src/kubenix.nix { };
# up to date versions of their nixpkgs equivalents
kubernetes = prev.callPackage ./pkgs/applications/networking/cluster/kubernetes
{ };