diff --git a/nixos/lib/tests/test_openssl.nix b/nixos/lib/tests/test_openssl.nix new file mode 100644 index 0000000000000000000000000000000000000000..44c13ff105bb4d31035b5ff45fdc9285365709f1 --- /dev/null +++ b/nixos/lib/tests/test_openssl.nix @@ -0,0 +1,6 @@ +openssl: +{ test_version = + { expected = "1.1.1k"; + expr = "${openssl.version}"; + }; +} diff --git a/nixos/openssl-111k.nix b/nixos/openssl-111k.nix index aff3434c4dcbb0287e1a1e24b8028c25a3535d22..38fd4a8995fb030c5ccc8040c619328f37babfa1 100644 --- a/nixos/openssl-111k.nix +++ b/nixos/openssl-111k.nix @@ -1,4 +1,4 @@ -self: super: { +self: super: rec { openssl_1_1 = super.openssl_1_1.overrideAttrs (old: rec { version = "1.1.1k"; pname = "openssl"; @@ -8,4 +8,5 @@ self: super: { sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; }; }); + openssl = openssl_1_1; } diff --git a/nixos/unit-tests.nix b/nixos/unit-tests.nix index 75016a17d128fabe11f4ecaad65dba3471ed863d..b9bb6748501db6e00e1798b193f474f85630e16f 100644 --- a/nixos/unit-tests.nix +++ b/nixos/unit-tests.nix @@ -5,14 +5,11 @@ let # Total the numbers in a list. sum = builtins.foldl' (a: b: a + b) 0; - # A helper for loading tests. - loadTest = moduleUnderTest: testModule: - (import testModule (pkgs.callPackage moduleUnderTest { })); - # A list of tests to run. Manually updated for now, alas. Only tests in # this list will be run! testModules = - [ (loadTest ./lib/ini.nix ./lib/tests/test_ini.nix) + [ (import ./lib/tests/test_ini.nix (pkgs.callPackage ./lib/ini.nix { })) + (import ./lib/tests/test_openssl.nix pkgs.openssl) ]; # Count up the tests we're going to run.