mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
tests.config: Simplify example
authy was about to be removed, so this test had to be updated.
This commit is contained in:
parent
c115010a8b
commit
837966790c
@ -2,22 +2,19 @@
|
|||||||
lib.recurseIntoAttrs {
|
lib.recurseIntoAttrs {
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/175196
|
# https://github.com/NixOS/nixpkgs/issues/175196
|
||||||
|
# This test has since been simplified to test the recursion without
|
||||||
|
# the fluff to make it look like a real-world example.
|
||||||
|
# The requirement we test here is:
|
||||||
|
# - `permittedInsecurePackages` must be allowed to
|
||||||
|
# use `pkgs` to retrieve at least *some* information.
|
||||||
|
#
|
||||||
|
# Instead of `builtins.seq`, the list may be constructed based on actual package info.
|
||||||
allowPkgsInPermittedInsecurePackages =
|
allowPkgsInPermittedInsecurePackages =
|
||||||
let pkgs = import ../.. {
|
let pkgs = import ../.. {
|
||||||
config = {
|
config = {
|
||||||
permittedInsecurePackages =
|
permittedInsecurePackages = builtins.seq pkgs.glibc.version [];
|
||||||
tempAllow pkgs.authy "2.1.0" [ "electron-9.4.4" ];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# A simplification of `tempAllow` that doesn't check the version, but
|
|
||||||
# has the same strictness characteristics. Actually checking a version
|
|
||||||
# here would add undue maintenance.
|
|
||||||
#
|
|
||||||
# Original:
|
|
||||||
# tempAllow = p: v: pa:
|
|
||||||
# lib.optionals (lib.assertMsg (p.version == v) "${p.name} is no longer at version ${v}, consider removing the tempAllow") pa;
|
|
||||||
#
|
|
||||||
tempAllow = p: v: pa: builtins.seq v builtins.seq p.version pa;
|
|
||||||
|
|
||||||
in pkgs.hello;
|
in pkgs.hello;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user