commit 12de1b3a387b53e577aef885ea766cd9f2d36238 · pyrox.dev/nixpkgs

+12 -11

nixos/modules/services/hardware/fwupd.nix

···

       51
       51
        
           # to install it because it would create a cyclic dependency between

     

       52
       52
        
           # the outputs. We also need to enable the remote,

     

       53
       53
        
           # which should not be done by default.

     

       54
       54
       -
           lib.optionalAttrs cfg.enableTestRemote (enableRemote cfg.package.installedTests "fwupd-tests")

     

       54
       54
       +
           lib.optionalAttrs

     

       55
       55
       +
             (cfg.daemonSettings.TestDevices or false)

     

       56
       56
       +
             (enableRemote cfg.package.installedTests "fwupd-tests")

     

       55
       57
        
         );

     

       56
       58
        
       

     

       57
       59
        
       in {

     
···

       86
       88
        
               '';

     

       87
       89
        
             };

     

       88
       90
        
       

     

       89
       89
       -
             enableTestRemote = mkOption {

     

       90
       90
       -
               type = types.bool;

     

       91
       91
       -
               default = false;

     

       92
       92
       -
               description = lib.mdDoc ''

     

       93
       93
       -
                 Whether to enable test remote. This is used by

     

       94
       94
       -
                 [installed tests](https://github.com/fwupd/fwupd/blob/master/data/installed-tests/README.md).

     

       95
       95
       -
               '';

     

       96
       96
       -
             };

     

       97
       97
       -
       

     

       98
       91
        
             package = mkPackageOption pkgs "fwupd" { };

     

       99
       92
        
       

     

       100
       93
        
             daemonSettings = mkOption {

     
···

       128
       121
        
                       or if this partition is not mounted at /boot/efi, /boot, or /efi

     

       129
       122
        
                     '';

     

       130
       123
        
                   };

     

       124
       124
       +
       

     

       125
       125
       +
                   TestDevices = mkOption {

     

       126
       126
       +
                     type = types.bool;

     

       127
       127
       +
                     default = false;

     

       128
       128
       +
                     description = lib.mdDoc ''

     

       129
       129
       +
                       Create virtual test devices and remote for validating daemon flows.

     

       130
       130
       +
                       This is only intended for CI testing and development purposes.

     

       131
       131
       +
                     '';

     

       132
       132
       +
                   };

     

       131
       133
        
                 };

     

       132
       134
        
               };

     

       133
       135
        
               default = {};

     
···

       159
       161
        
         config = mkIf cfg.enable {

     

       160
       162
        
           # Disable test related plug-ins implicitly so that users do not have to care about them.

     

       161
       163
        
           services.fwupd.daemonSettings = {

     

       162
       162
       -
             DisabledPlugins = cfg.package.defaultDisabledPlugins;

     

       163
       164
        
             EspLocation = config.boot.loader.efi.efiSysMountPoint;

     

       164
       165
        
           };

     

       165
       166

+5 -4

nixos/tests/installed-tests/fwupd.nix

···

       1
       1
       -
       { pkgs, lib, makeInstalledTest, ... }:

     

       1
       1
       +
       { pkgs, makeInstalledTest, ... }:

     

       2
       2
        
       

     

       3
       3
        
       makeInstalledTest {

     

       4
       4
        
         tested = pkgs.fwupd;

     

       5
       5
        
       

     

       6
       6
        
         testConfig = {

     

       7
       7
       -
           services.fwupd.enable = true;

     

       8
       8
       -
           services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin

     

       9
       9
       -
           services.fwupd.enableTestRemote = true;

     

       7
       7
       +
           services.fwupd = {

     

       8
       8
       +
             enable = true;

     

       9
       9
       +
             daemonSettings.TestDevices = true;

     

       10
       10
       +
           };

     

       10
       11
        
         };

     

       11
       12
        
       }

+1 -1

pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch

···

       80
       80
        
       @@ -56,12 +56,12 @@ configure_file(

     

       81
       81
        
          output: 'vendor.conf',

     

       82
       82
        
          configuration: con2,

     

       83
       83
       -
          install: true,

     

       83
       83
       +
          install: get_option('vendor_metadata'),

     

       84
       84
        
       -  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),

     

       85
       85
        
       +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),

     

       86
       86
        
        )

+1 -1

pkgs/by-name/fw/fwupd/installed-tests-path.patch

···

       6
       6
        
          output: 'fwupd-tests.conf',

     

       7
       7
        
          configuration: con2,

     

       8
       8
        
          install: true,

     

       9
       9
       -
       -  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),

     

       9
       9
       +
       -  install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),

     

       10
       10
        
       +  install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),

     

       11
       11
        
        )

     

       12
       12
        
       diff --git a/meson.build b/meson.build

+3 -15

pkgs/by-name/fw/fwupd/package.nix

···

       11
       11
        
       , libdrm

     

       12
       12
        
       , polkit

     

       13
       13
        
       , libxmlb

     

       14
       14
       -
       , glib

     

       15
       14
        
       , gusb

     

       16
       15
        
       , sqlite

     

       17
       16
        
       , libarchive

     
···

       121
       120
        
       in

     

       122
       121
        
       stdenv.mkDerivation (finalAttrs: {

     

       123
       122
        
         pname = "fwupd";

     

       124
       124
       -
         version = "1.9.12";

     

       123
       123
       +
         version = "1.9.13";

     

       125
       124
        
       

     

       126
       125
        
         # libfwupd goes to lib

     

       127
       126
        
         # daemon, plug-ins and libfwupdplugin go to out

     
···

       132
       131
        
           owner = "fwupd";

     

       133
       132
        
           repo = "fwupd";

     

       134
       133
        
           rev = finalAttrs.version;

     

       135
       135
       -
           hash = "sha256-hPRp61m/XTXFacYkBOb4SsG4fcFvWrdMfc+sxLk5/sQ=";

     

       134
       134
       +
           hash = "sha256-h2e9MFTb777xbNRlzKWXc5GUdu/BHSkJTaogEE5byjo=";

     

       136
       135
        
         };

     

       137
       136
        
       

     

       138
       137
        
         patches = [

     
···

       214
       213
        
           "-Dsysconfdir_install=${placeholder "out"}/etc"

     

       215
       214
        
           "-Defi_os_dir=nixos"

     

       216
       215
        
           "-Dplugin_modem_manager=enabled"

     

       216
       216
       +
           "-Dvendor_metadata=true"

     

       217
       217
        
           # We do not want to place the daemon into lib (cyclic reference)

     

       218
       218
        
           "--libexecdir=${placeholder "out"}/libexec"

     

       219
       219
        
         ] ++ lib.optionals (!enablePassim) [

     
···

       341
       341
        
             "grub.d/35_fwupd"

     

       342
       342
        
           ];

     

       343
       343
        
       

     

       344
       344
       -
           # DisabledPlugins key in fwupd/daemon.conf

     

       345
       345
       -
           defaultDisabledPlugins = [

     

       346
       346
       -
             "test"

     

       347
       347
       -
             "test_ble"

     

       348
       348
       -
           ];

     

       349
       349
       -
       

     

       350
       344
        
           # For updating.

     

       351
       345
        
           inherit test-firmware;

     

       352
       346
        
       

     
···

       371
       365
        
                 passthru_etc = set(${listToPy finalAttrs.passthru.filesInstalledToEtc})

     

       372
       366
        
                 assert len(package_etc - passthru_etc) == 0, f'fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {package_etc - passthru_etc}'

     

       373
       367
        
                 assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}'

     

       374
       374
       -
       

     

       375
       375
       -
                 config = configparser.RawConfigParser()

     

       376
       376
       -
                 config.read('${finalAttrs.finalPackage}/etc/fwupd/fwupd.conf')

     

       377
       377
       -
                 package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';')

     

       378
       378
       -
                 passthru_disabled_plugins = ${listToPy finalAttrs.passthru.defaultDisabledPlugins}

     

       379
       379
       -
                 assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}'

     

       380
       368
        
       

     

       381
       369
        
                 pathlib.Path(os.getenv('out')).touch()

     

       382
       370
        
               '';