diff --git a/README.md b/README.md index c61d1bf..b9db4b0 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Otherwise, add the input, ``` flake-parts.url = "github:hercules-ci/flake-parts"; - flake-parts.inputs.nixpkgs.follows = "nixpkgs"; ``` then slide `mkFlake` between your outputs function head and body, diff --git a/flake.lock b/flake.lock index 7d199d9..027c74b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,17 @@ { "nodes": { - "nixpkgs": { + "nixpkgs-lib": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "type": "github" }, "original": { + "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", @@ -18,7 +20,7 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs-lib": "nixpkgs-lib" } } }, diff --git a/flake.nix b/flake.nix index 3fd3e80..dd038a8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Flake basics described using the module system"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-lib.url = "github:NixOS/nixpkgs/nixos-unstable?dir=lib"; }; - outputs = { self, nixpkgs, ... }: { - lib = import ./lib.nix { inherit (nixpkgs) lib; }; + outputs = { self, nixpkgs-lib, ... }: { + lib = import ./lib.nix { inherit (nixpkgs-lib) lib; }; templates = { default = { path = ./template/default; diff --git a/template/default/flake.nix b/template/default/flake.nix index 78d9b6e..8ecef23 100644 --- a/template/default/flake.nix +++ b/template/default/flake.nix @@ -2,7 +2,6 @@ description = "Description for the project"; inputs = { - flake-parts.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; diff --git a/template/multi-module/flake.nix b/template/multi-module/flake.nix index e7b7935..1f27514 100644 --- a/template/multi-module/flake.nix +++ b/template/multi-module/flake.nix @@ -2,7 +2,6 @@ description = "Description for the project"; inputs = { - flake-parts.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; };