diff --git a/default.nix b/default.nix index c7d0c26..2a86cce 100644 --- a/default.nix +++ b/default.nix @@ -1,14 +1,33 @@ -( - import - ( - let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - {src = ./.;} -) -.defaultNix +{pkgs ? import {}}: let + flake-self = + ( + import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + {src = ./.;} + ) + .outputs; + + rev = (builtins.fetchGit ./.).rev; +in { + nixos = pkgs.callPackage ./package.nix { + flake = true; + inherit rev; + }; + + nixosLegacy = pkgs.callPackage ./package.nix { + flake = false; + inherit rev; + }; + + inherit flake-self; + + module = import ./module.nix flake-self; +} diff --git a/flake.lock b/flake.lock index f10bb5c..e04c03f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { diff --git a/module.nix b/module.nix index 3305558..1c92ce1 100644 --- a/module.nix +++ b/module.nix @@ -1,4 +1,4 @@ -{ +self: { options, config, pkgs, @@ -17,7 +17,7 @@ in { package = lib.mkOption { type = types.package; - default = import ./default.nix; + default = self.packages.${pkgs.system}.nixos; description = "Package to use for nixos-cli"; };