diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/flake.nix | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/flake.nix')
-rw-r--r-- | nixpkgs/flake.nix | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/nixpkgs/flake.nix b/nixpkgs/flake.nix index 67ecfc6eb084..fa00bffcdf92 100644 --- a/nixpkgs/flake.nix +++ b/nixpkgs/flake.nix @@ -11,8 +11,7 @@ lib = import ./lib; - forAllSystems = f: lib.genAttrs lib.systems.flakeExposed (system: f system); - + forAllSystems = lib.genAttrs lib.systems.flakeExposed; in { lib = lib.extend (final: prev: { @@ -45,10 +44,32 @@ }).nixos.manual.x86_64-linux; }; + # The "legacy" in `legacyPackages` doesn't imply that the packages exposed + # through this attribute are "legacy" packages. Instead, `legacyPackages` + # is used here as a substitute attribute name for `packages`. The problem + # with `packages` is that it makes operations like `nix flake show + # nixpkgs` unusably slow due to the sheer number of packages the Nix CLI + # needs to evaluate. But when the Nix CLI sees a `legacyPackages` + # 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; }); nixosModules = { - notDetected = import ./nixos/modules/installer/scan/not-detected.nix; + notDetected = ./nixos/modules/installer/scan/not-detected.nix; + + /* + Make the `nixpkgs.*` configuration read-only. Guarantees that `pkgs` + is the way you initialize it. + + Example: + + { + imports = [ nixpkgs.nixosModules.readOnlyPkgs ]; + nixpkgs.pkgs = nixpkgs.legacyPackages.x86_64-linux; + } + */ + readOnlyPkgs = ./nixos/modules/misc/nixpkgs/read-only.nix; }; }; } |