diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/flake.nix | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/flake.nix')
-rw-r--r-- | nixpkgs/flake.nix | 58 |
1 files changed, 8 insertions, 50 deletions
diff --git a/nixpkgs/flake.nix b/nixpkgs/flake.nix index 1e20fcd40ebe..c48d6c68e583 100644 --- a/nixpkgs/flake.nix +++ b/nixpkgs/flake.nix @@ -18,58 +18,16 @@ in { lib = lib.extend (final: prev: { - nixosSystem = { modules, ... } @ args: - import ./nixos/lib/eval-config.nix (args // { - modules = - let - vmConfig = (import ./nixos/lib/eval-config.nix - (args // { - modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ]; - })).config; - - vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix - (args // { - modules = modules ++ [ - ./nixos/modules/virtualisation/qemu-vm.nix - { virtualisation.useBootLoader = true; } - ({ config, ... }: { - virtualisation.useEFIBoot = - config.boot.loader.systemd-boot.enable || - config.boot.loader.efi.canTouchEfiVariables; - }) - ]; - })).config; - - moduleDeclarationFile = - let - # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't - # mean that the evaluator always keeps track of its position. If there - # are too many levels of indirection, the position gets lost at some point. - intermediatePos = builtins.unsafeGetAttrPos "modules" args; - in - if intermediatePos == null then null else intermediatePos.file; - # Add the invoking file as error message location for modules - # that don't have their own locations; presumably inline modules. - addModuleDeclarationFile = - m: if moduleDeclarationFile == null then m else { - _file = moduleDeclarationFile; - imports = [ m ]; - }; + nixos = import ./nixos/lib { lib = final; }; - in - map addModuleDeclarationFile 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; - - system.build = { - vm = vmConfig.system.build.vm; - vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; - }; - } - ]; + 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; + } ]; }); }); |