diff --git a/flake-module.nix b/flake-module.nix index 93a2246..6aef0b2 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -1,8 +1,11 @@ localFlake: -{ inputs, ... }: +{ ... }: +let + devenvModule = { ... }@args: localFlake.inputs.devenv.flakeModule (args // {inputs = localFlake.inputs // args.inputs;}); +in { imports = [ - localFlake.inputs.devenv.flakeModule + devenvModule ]; perSystem = { system, pkgs, ... }: { diff --git a/flake.lock b/flake.lock index 35b9895..f7d6e2d 100644 --- a/flake.lock +++ b/flake.lock @@ -50,8 +50,9 @@ "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "flake-parts_2": { diff --git a/flake.nix b/flake.nix index 94fa4ea..be367fe 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; devenv.url = "github:cachix/devenv"; nix2container.url = "github:nlewo/nix2container"; nix2container.inputs.nixpkgs.follows = "nixpkgs";