Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ let
# cgit) that are needed here should be included directly in Nixpkgs as
# files.

assert stdenv.hostPlatform.isLinux;

let
# Dirty hack to make sure that `version` & `src` have
# `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position
Expand Down
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/ply/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
mic92
mbbx6spp
];
platforms = lib.platforms.linux;
};
}
22 changes: 11 additions & 11 deletions pkgs/test/nixos-functions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ let
label = "test";
};
in
pkgs.recurseIntoAttrs {

nixos-test =
(pkgs.nixos {
system.nixos = dummyVersioning;
boot.loader.grub.enable = false;
fileSystems."/".device = "/dev/null";
system.stateVersion = lib.trivial.release;
}).toplevel;

}
lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
pkgs.recurseIntoAttrs {
nixos-test =
(pkgs.nixos {
system.nixos = dummyVersioning;
boot.loader.grub.enable = false;
fileSystems."/".device = "/dev/null";
system.stateVersion = lib.trivial.release;
}).toplevel;
}
)
Loading