Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixosImages: add to pkgs #153551

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

nixosImages: add to pkgs #153551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97a79a4
nixosImages: add to pkgs
jonringer Jan 5, 2022
fa50987
nixosImages: conditionally add to pkgs
jonringer Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ res: pkgs: super:

with pkgs;


{

# A stdenv capable of building 32-bit binaries. On x86_64-linux,
Expand Down Expand Up @@ -34201,4 +34202,24 @@ with pkgs;
};

zthrottle = callPackage ../tools/misc/zthrottle { };

# Only expose images for mono-platform stdenv's
#
# Conditional logic must use super, as using pkgs will
# cause infinite recursion when trying to determine a fixed point

} // lib.optionalAttrs (super.stdenv.isLinux && (super.hostPlatform.system == super.targetPlatform.system)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
} // lib.optionalAttrs (super.stdenv.isLinux && (super.hostPlatform.system == super.targetPlatform.system)) {
} // lib.optionalAttrs (super.stdenv.isLinux && super.hostPlatform.system == super.targetPlatform.system) {

Technically unnecessary, just liked how they read.

### Conditionally add nixosImages for testing purposes

nixosImages = let
inherit (hostPlatform) system;
release-packages = (import ../../nixos/release.nix) {
# make impure settings do not leak into images
nixpkgs = { outPath = lib.cleanSource ../../.; revCount = 130979; shortRev = "gfedcba"; };
stableBranch = false;
supportedSystems = [ system ];
configuration = { };
};
in lib.mapAttrs (name: value: value.${system})
{ inherit (release-packages) iso_minimal iso_gnome iso_plasma5 amazonImage; };
}