Compare commits

...
Author SHA1 Message Date
Austin Horstman 0500f78822 tests/firefox: avoid building librewolf
Scrub Librewolf on Darwin and exclude shared wrapper tests that require the real package, leaving generic wrapper behavior covered by Firefox and Floorp.
2026-06-20 13:14:05 -05:00
Austin Horstman 3ed3edbcc8 tests/darwinScrublist: add parallel-full
Scrub the default GNU Parallel package on Darwin so the module test does not build the failing DBD::CSV dependency.
2026-06-20 12:58:32 -05:00
Austin Horstman 0d0be75878 flake: allow insecure librewolf in tests
Use a test-only nixpkgs import so Librewolf module tests can evaluate while the upstream package is marked insecure.
2026-06-20 12:54:26 -05:00
dependabot[bot]andGitHub c19c71f69c flake: bump nixpkgs from ffa10e2 to 3e41b24
Bumps [nixpkgs](https://github.com/NixOS/nixpkgs) from `ffa10e2` to `3e41b24`.
- [Commits](https://github.com/NixOS/nixpkgs/compare/ffa10e26ae11d676b2db836259889f1f571cb14f...3e41b24abd260e8f71dbe2f5737d24122f972158)

---
updated-dependencies:
- dependency-name: nixpkgs
  dependency-version: 3e41b24abd260e8f71dbe2f5737d24122f972158
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-06-20 01:52:49 +00:00
5 changed files with 66 additions and 37 deletions
Generated
+3 -3
View File
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1780365719,
"narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
"lastModified": 1781607440,
"narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
"rev": "3e41b24abd260e8f71dbe2f5737d24122f972158",
"type": "github"
},
"original": {
+16 -4
View File
@@ -64,10 +64,22 @@
"x86_64-linux"
];
testPkgsFor =
system:
import nixpkgs {
inherit system;
config.allowInsecurePredicate =
pkg:
builtins.elem (nixpkgs.lib.getName pkg) [
"librewolf"
"librewolf-unwrapped"
];
};
testChunks =
system:
let
pkgs = nixpkgs.legacyPackages.${system};
pkgs = testPkgsFor system;
inherit (pkgs) lib;
# Create chunked test packages for better CI parallelization
@@ -122,7 +134,7 @@
buildTests =
system:
let
pkgs = nixpkgs.legacyPackages.${system};
pkgs = testPkgsFor system;
tests = import ./tests { inherit pkgs; };
renameTestPkg = n: nixpkgs.lib.nameValuePair "test-${n}";
in
@@ -131,7 +143,7 @@
buildTestsNoBig =
system:
let
pkgs = nixpkgs.legacyPackages.${system};
pkgs = testPkgsFor system;
tests = import ./tests {
inherit pkgs;
enableBig = false;
@@ -144,7 +156,7 @@
buildTestsNoBigIfd =
system:
let
pkgs = nixpkgs.legacyPackages.${system};
pkgs = testPkgsFor system;
tests = import ./tests {
inherit pkgs;
enableBig = false;
+3
View File
@@ -110,6 +110,8 @@ let
"less"
"lesspipe"
"lf"
"librewolf"
"librewolf-unwrapped"
"lieer"
"lsd"
"ludusavi"
@@ -148,6 +150,7 @@ let
"openssh"
"openstackclient"
"papis"
"parallel-full"
"patdiff"
"pay-respects"
"pet"
+36 -30
View File
@@ -1,4 +1,8 @@
{ lib, name }:
{
lib,
name,
excludeTests ? [ ],
}:
let
withDefaultStateVersion = module: {
imports = [ module ];
@@ -18,32 +22,34 @@ builtins.mapAttrs
]
)
)
{
"${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
"${name}-null-package" = ./null-package.nix;
"${name}-final-package" = ./final-package.nix;
"${name}-global-extensions-assertions" = ./global-extensions-assertions.nix;
"${name}-policies" = ./policies.nix;
"${name}-profiles-bookmarks" = ./profiles/bookmarks;
"${name}-profiles-bookmarks-attrset" = ./profiles/bookmarks/attrset.nix;
"${name}-profiles-containers" = ./profiles/containers;
"${name}-profiles-containers-duplicate-ids" = ./profiles/containers/duplicate-ids.nix;
"${name}-profiles-containers-id-out-of-range" = ./profiles/containers/id-out-of-range.nix;
"${name}-profiles-containers-id-zero" = ./profiles/containers/id-zero.nix;
"${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
"${name}-profiles-extensions" = ./profiles/extensions;
"${name}-profiles-extensions-assertions" = ./profiles/extensions/assertions.nix;
"${name}-profiles-extensions-extensible" = ./profiles/extensions/extensible.nix;
"${name}-profiles-extensions-per-extension-force" = ./profiles/extensions/per-extension-force.nix;
"${name}-profiles-extensions-per-extension-force-assertions" =
./profiles/extensions/per-extension-force-assertions.nix;
"${name}-profiles-extensions-exhaustive" = ./profiles/extensions/exhaustive.nix;
"${name}-profiles-extensions-exact" = ./profiles/extensions/exact.nix;
"${name}-profiles-handlers" = ./profiles/handlers;
"${name}-profiles-overwrite" = ./profiles/overwrite;
"${name}-profiles-search" = ./profiles/search;
"${name}-profiles-settings" = ./profiles/settings;
"${name}-profiles-userchrome" = ./profiles/userchrome;
"${name}-state-version-19_09" = ./state-version-19_09.nix;
"${name}-profiles-shared-path" = ./profiles/shared-path.nix;
}
(
removeAttrs {
"${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
"${name}-null-package" = ./null-package.nix;
"${name}-final-package" = ./final-package.nix;
"${name}-global-extensions-assertions" = ./global-extensions-assertions.nix;
"${name}-policies" = ./policies.nix;
"${name}-profiles-bookmarks" = ./profiles/bookmarks;
"${name}-profiles-bookmarks-attrset" = ./profiles/bookmarks/attrset.nix;
"${name}-profiles-containers" = ./profiles/containers;
"${name}-profiles-containers-duplicate-ids" = ./profiles/containers/duplicate-ids.nix;
"${name}-profiles-containers-id-out-of-range" = ./profiles/containers/id-out-of-range.nix;
"${name}-profiles-containers-id-zero" = ./profiles/containers/id-zero.nix;
"${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
"${name}-profiles-extensions" = ./profiles/extensions;
"${name}-profiles-extensions-assertions" = ./profiles/extensions/assertions.nix;
"${name}-profiles-extensions-extensible" = ./profiles/extensions/extensible.nix;
"${name}-profiles-extensions-per-extension-force" = ./profiles/extensions/per-extension-force.nix;
"${name}-profiles-extensions-per-extension-force-assertions" =
./profiles/extensions/per-extension-force-assertions.nix;
"${name}-profiles-extensions-exhaustive" = ./profiles/extensions/exhaustive.nix;
"${name}-profiles-extensions-exact" = ./profiles/extensions/exact.nix;
"${name}-profiles-handlers" = ./profiles/handlers;
"${name}-profiles-overwrite" = ./profiles/overwrite;
"${name}-profiles-search" = ./profiles/search;
"${name}-profiles-settings" = ./profiles/settings;
"${name}-profiles-userchrome" = ./profiles/userchrome;
"${name}-state-version-19_09" = ./state-version-19_09.nix;
"${name}-profiles-shared-path" = ./profiles/shared-path.nix;
} excludeTests
)
@@ -2,4 +2,12 @@
import ./common.nix {
inherit lib;
name = "librewolf";
# These shared tests force the real browser wrapper or package into the test
# derivation. Librewolf is insecure in nixpkgs, so keep testing the shared
# module logic through Firefox and Floorp instead.
excludeTests = [
"librewolf-final-package"
"librewolf-policies"
"librewolf-profiles-bookmarks"
];
}