diff options
| author | Wolfgang Walther <walther@technowledgy.de> | 2025-07-24 11:08:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-24 11:08:43 +0000 |
| commit | 5f1ac3649bc72ffde8e2934f1b01190b46d5b44d (patch) | |
| tree | 0e191bd01243831ae63f027cb968dd08f8e87a81 | |
| parent | regsync: 0.8.3 -> 0.9.0 (#421318) (diff) | |
| download | nixpkgs-origin/revert-427219-ci-eval-asserts-linux.tar.gz | |
Revert "linux: remove assert on linux"origin/revert-427219-ci-eval-asserts-linux
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ply/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/test/nixos-functions/default.nix | 22 |
3 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 71673921d238..50c5d9683760 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -94,6 +94,8 @@ 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 diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 53d3553afc0a..3e1dfa296706 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -55,6 +55,5 @@ stdenv.mkDerivation rec { mic92 mbbx6spp ]; - platforms = lib.platforms.linux; }; } diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index 4cc738cfaebe..dc8e0b3ead31 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -21,14 +21,14 @@ let label = "test"; }; in -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; - } -) +pkgs.recurseIntoAttrs { + + nixos-test = + (pkgs.nixos { + system.nixos = dummyVersioning; + boot.loader.grub.enable = false; + fileSystems."/".device = "/dev/null"; + system.stateVersion = lib.trivial.release; + }).toplevel; + +} |