diff options
Diffstat (limited to 'nixpkgs/flake.nix')
| -rw-r--r-- | nixpkgs/flake.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nixpkgs/flake.nix b/nixpkgs/flake.nix index fa00bffcdf92..f16bc7d05fce 100644 --- a/nixpkgs/flake.nix +++ b/nixpkgs/flake.nix @@ -9,7 +9,8 @@ nixpkgs = self; }; - lib = import ./lib; + libVersionInfoOverlay = import ./lib/flake-version-info.nix self; + lib = (import ./lib).extend libVersionInfoOverlay; forAllSystems = lib.genAttrs lib.systems.flakeExposed; in @@ -20,13 +21,7 @@ nixosSystem = args: import ./nixos/lib/eval-config.nix ( - args // { - modules = args.modules ++ [{ - system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; - system.nixos.revision = final.mkIf (self ? rev) self.rev; - }]; - } // lib.optionalAttrs (! args?system) { + args // { inherit (self) lib; } // lib.optionalAttrs (! args?system) { # Allow system to be set modularly in nixpkgs.system. # We set it to null, to remove the "legacy" entrypoint's # non-hermetic default. @@ -53,7 +48,11 @@ # attribute it displays `omitted` instead of evaluating all packages, # which keeps `nix flake show` on Nixpkgs reasonably fast, though less # information rich. - legacyPackages = forAllSystems (system: import ./. { inherit system; }); + legacyPackages = forAllSystems (system: + (import ./. { inherit system; }).extend (final: prev: { + lib = prev.lib.extend libVersionInfoOverlay; + }) + ); nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; |