diff options
| -rw-r--r-- | flake.nix | 27 | ||||
| -rw-r--r-- | modules/system/flake-overrides.nix | 17 |
2 files changed, 24 insertions, 20 deletions
@@ -2,35 +2,22 @@ # WARNING this is very much still experimental. description = "A collection of darwin modules"; - outputs = { self, nixpkgs }: - let - versionsModule = { lib, ... }: { - _file = ./flake.nix; - config = { - system.darwinVersionSuffix = ".${nixpkgs.shortRev or "dirty"}"; - system.darwinRevision = lib.mkIf (self ? rev) self.rev; - - system.nixpkgsVersionSuffix = ".${lib.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified or "19700101")}.${nixpkgs.shortRev or "dirty"}"; - system.nixpkgsRevision = lib.mkIf (nixpkgs ? rev) nixpkgs.rev; - }; - }; - in - { - + outputs = { self, nixpkgs }: { lib = { # TODO handle multiple architectures. evalConfig = import ./eval-config.nix { inherit (nixpkgs) lib; }; darwinSystem = { modules, inputs ? {}, ... }@args: self.lib.evalConfig (args // { inputs = { inherit nixpkgs; darwin = self; } // inputs; - modules = modules ++ [ versionsModule ]; + modules = modules ++ [ self.darwinModules.flakeOverrides ]; }); }; - darwinModules.lnl = import ./modules/examples/lnl.nix; - darwinModules.simple = import ./modules/examples/simple.nix; - darwinModules.ofborg = import ./modules/examples/ofborg.nix; - darwinModules.hydra = import ./modules/examples/hydra.nix; + darwinModules.flakeOverrides = ./modules/system/flake-overrides.nix; + darwinModules.hydra = ./modules/examples/hydra.nix; + darwinModules.lnl = ./modules/examples/lnl.nix; + darwinModules.ofborg = ./modules/examples/ofborg.nix; + darwinModules.simple = ./modules/examples/simple.nix; checks.x86_64-darwin.simple = (self.lib.darwinSystem { modules = [ self.darwinModules.simple ]; diff --git a/modules/system/flake-overrides.nix b/modules/system/flake-overrides.nix new file mode 100644 index 0000000..9a6c506 --- /dev/null +++ b/modules/system/flake-overrides.nix @@ -0,0 +1,17 @@ +{ lib, inputs, ... }: + +with lib; + +let + inherit (inputs) darwin nixpkgs; +in + +{ + config = { + system.darwinVersionSuffix = ".${darwin.shortRev or "dirty"}"; + system.darwinRevision = mkIf (darwin ? rev) darwin.rev; + + system.nixpkgsVersionSuffix = ".${substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified or "19700101")}.${nixpkgs.shortRev or "dirty"}"; + system.nixpkgsRevision = mkIf (nixpkgs ? rev) nixpkgs.rev; + }; +} |