diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-15 01:18:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 01:18:38 +0100 |
| commit | c6283e6e0611f1687726e8993d5007685a1c8714 (patch) | |
| tree | 89bc889049ef6bb36faa2c7f3e172f1c97a1f27a /nixos | |
| parent | ca7b1e64d78b1ecf49fb29462fa3c4a118fa9195 (diff) | |
| parent | f118d2be67c608fa4289cae800aefdb65af7e259 (diff) | |
| download | nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar.gz nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar.bz2 nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar.lz nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar.xz nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.tar.zst nixlib-c6283e6e0611f1687726e8993d5007685a1c8714.zip | |
Merge pull request #32751 from jtojnar/fwupd-1.0.2
fwupd: 1.0.1 → 1.0.4
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 4 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/fwupd.nix | 19 |
3 files changed, 24 insertions, 0 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 14113fe01bb4..1f4acd21eccf 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -87,4 +87,8 @@ in { "d /var/lib/fwupd 0755 root root -" ]; }; + + meta = { + maintainers = pkgs.fwupd.maintainers; + }; } diff --git a/nixos/release.nix b/nixos/release.nix index 984bf8ef0862..4b8bd0d30e4c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -258,6 +258,7 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; + tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix new file mode 100644 index 000000000000..bf4ef25130b3 --- /dev/null +++ b/nixos/tests/fwupd.nix @@ -0,0 +1,19 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: { + name = "fwupd"; + + meta = { + maintainers = pkgs.fwupd.meta.maintainers; + }; + + machine = { config, pkgs, ... }: { + services.fwupd.enable = true; + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ]; + virtualisation.memorySize = 768; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner"); + ''; +}) |