diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6dd1d5..163b555 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,10 @@ jobs: tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: cachix/install-nix-action@v13 + - uses: actions/checkout@v2.4.0 + - uses: cachix/install-nix-action@v16 with: - install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210429_d15a196/install + install_url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.8.0pre20220311_d532269/install extra_nix_config: experimental-features = nix-command flakes - name: Run Nix Flake Check diff --git a/flake.nix b/flake.nix index 5d8748b..810930e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,14 @@ } @ inputs: (inputs.flake-utils.lib.eachDefaultSystem ( system: let - pkgs = inputs.nixpkgs.legacyPackages."${system}".appendOverlays [ - self.overlay - inputs.devshell.overlay - ]; + pkgs = import inputs.nixpkgs { + overlays = [ + self.overlays.default + inputs.devshell.overlay + ]; + config.allowUnsupportedSystem = true; + inherit system; + }; lib = pkgs.lib; @@ -57,7 +61,7 @@ jobs = import ./jobs {inherit pkgs;}; - devShell = with pkgs; + devShells.default = with pkgs; devshell.mkShell {imports = [(devshell.importTOML ./devshell.toml)];}; @@ -87,7 +91,7 @@ )) // { nixosModules.kubenix = import ./modules; - overlay = final: prev: { + overlays.default = final: prev: { kubenix.evalModules = self.evalModules.${prev.system}; # up to date versions of their nixpkgs equivalents # kubernetes =