chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux: remove assert on linux

Browse Source 
Asserting the hostplatform for `linux` is bad, because it can't be
caught by CI. For the `linux` package itself, it doesn't make a
difference, because it also has `meta.platforms = linux` set, so this
will fail evaluation - and in a way that can nicely be caught by CI.

(cherry picked from commit 0febbb4ff9)
This commit is contained in:
Wolfgang Walther
2025-07-21 20:11:42 +02:00
committed by github-actions[bot]
parent 3fa9874c53
commit ac946e166a
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/generic.nix
View File

@@ -91,8 +91,6 @@ let
# cgit) that are needed here should be included directly in Nixpkgs as # cgit) that are needed here should be included directly in Nixpkgs as
# files. # files.
assert stdenv.hostPlatform.isLinux;
let let
# Dirty hack to make sure that `version` & `src` have # Dirty hack to make sure that `version` & `src` have
# `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position # `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position

1
pkgs/os-specific/linux/ply/default.nix
View File

@@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
mic92 mic92
mbbx6spp mbbx6spp
]; ];
platforms = lib.platforms.linux;
}; };
} }

22
pkgs/test/nixos-functions/default.nix
View File

@@ -21,14 +21,14 @@ let
label = "test"; label = "test";
}; };
in in
pkgs.recurseIntoAttrs { lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
pkgs.recurseIntoAttrs {
nixos-test = nixos-test =
(pkgs.nixos { (pkgs.nixos {
system.nixos = dummyVersioning; system.nixos = dummyVersioning;
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
fileSystems."/".device = "/dev/null"; fileSystems."/".device = "/dev/null";
system.stateVersion = lib.trivial.release; system.stateVersion = lib.trivial.release;
}).toplevel; }).toplevel;
}
} )