commit a58c728d5f9f01c283eb2e25dd54c049dab7533c · pyrox.dev/nixpkgs

+17 -17

pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch

··· 1 1 diff --git a/data/meson.build b/data/meson.build 2 - index 2ae29ce5..342cac92 100644 2 + index 9176aa34..1a0298a9 100644 3 3 --- a/data/meson.build 4 4 +++ b/data/meson.build 5 5 @@ -26,7 +26,7 @@ endif ··· 12 12 install_data(['power.quirk', 'cfi.quirk'], 13 13 install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) 14 14 diff --git a/data/pki/meson.build b/data/pki/meson.build 15 - index 2a7d0f24..091981f7 100644 15 + index 499b7201..1be13607 100644 16 16 --- a/data/pki/meson.build 17 17 +++ b/data/pki/meson.build 18 18 @@ -12,13 +12,13 @@ install_data([ ··· 31 31 ) 32 32 endif 33 33 34 - @@ -26,11 +26,11 @@ if supported_pkcs7 == '1' 34 + @@ -26,11 +26,11 @@ if supported_pkcs7 35 35 install_data([ 36 36 'LVFS-CA.pem', 37 37 ], ··· 46 46 ) 47 47 endif 48 48 diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build 49 - index 02d8777b..2c89d593 100644 49 + index 87e794b1..ebeeeca7 100644 50 50 --- a/data/remotes.d/meson.build 51 51 +++ b/data/remotes.d/meson.build 52 52 @@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' ··· 83 83 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), 84 84 ) 85 85 diff --git a/meson.build b/meson.build 86 - index 394f40fa..7b602c73 100644 86 + index b91dd037..a8de7810 100644 87 87 --- a/meson.build 88 88 +++ b/meson.build 89 - @@ -187,6 +187,12 @@ endif 89 + @@ -195,6 +195,12 @@ endif 90 90 mandir = join_paths(prefix, get_option('mandir')) 91 91 localedir = join_paths(prefix, get_option('localedir')) 92 92 ··· 100 100 gio = dependency('gio-2.0', version : '>= 2.45.8') 101 101 giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) 102 102 diff --git a/meson_options.txt b/meson_options.txt 103 - index c1b483cb..047dbdd8 100644 103 + index d00038db..c84652ca 100644 104 104 --- a/meson_options.txt 105 105 +++ b/meson_options.txt 106 106 @@ -1,3 +1,4 @@ 107 107 +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') 108 108 option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') 109 - option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') 109 + option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) 110 110 option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') 111 111 diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build 112 - index e9f12879..a0126dbb 100644 112 + index 00b7ecda..789f34ca 100644 113 113 --- a/plugins/dell-esrt/meson.build 114 114 +++ b/plugins/dell-esrt/meson.build 115 115 @@ -38,6 +38,6 @@ configure_file( ··· 121 121 ) 122 122 endif 123 123 diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build 124 - index 3ea47456..40dbd116 100644 124 + index 1a278375..f57ae530 100644 125 125 --- a/plugins/msr/meson.build 126 126 +++ b/plugins/msr/meson.build 127 127 @@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'], ··· 134 134 shared_module('fu_plugin_msr', 135 135 fu_hash, 136 136 diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build 137 - index 4a0a8664..7d9ba77d 100644 137 + index 8717d50f..9a703723 100644 138 138 --- a/plugins/redfish/meson.build 139 139 +++ b/plugins/redfish/meson.build 140 - @@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish', 140 + @@ -51,7 +51,7 @@ shared_module('fu_plugin_redfish', 141 141 ) 142 142 143 143 install_data(['redfish.conf'], ··· 147 147 148 148 if get_option('tests') 149 149 diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build 150 - index 1ba9562f..c074f770 100644 150 + index aa6c8ce1..61734c4d 100644 151 151 --- a/plugins/thunderbolt/meson.build 152 152 +++ b/plugins/thunderbolt/meson.build 153 - @@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', 153 + @@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', 154 154 ) 155 155 156 156 install_data(['thunderbolt.conf'], ··· 158 158 + install_dir: join_paths(sysconfdir_install, 'fwupd') 159 159 ) 160 160 # we use functions from 2.52 in the tests 161 - if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') 161 + if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') 162 162 diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build 163 - index 04cbd51a..9a8c43de 100644 163 + index 2d9ba819..0feb5f6b 100644 164 164 --- a/plugins/uefi-capsule/meson.build 165 165 +++ b/plugins/uefi-capsule/meson.build 166 166 @@ -21,7 +21,7 @@ if host_machine.system() == 'linux' ··· 172 172 ) 173 173 elif host_machine.system() == 'freebsd' 174 174 backend_srcs += 'fu-uefi-backend-freebsd.c' 175 - @@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man') 175 + @@ -112,7 +112,7 @@ if get_option('compat_cli') and get_option('man') 176 176 endif 177 177 178 178 install_data(['uefi_capsule.conf'],

+2 -2

pkgs/os-specific/linux/firmware/fwupd/default.nix

··· 117 117 118 118 self = stdenv.mkDerivation rec { 119 119 pname = "fwupd"; 120 - version = "1.8.0"; 120 + version = "1.8.1"; 121 121 122 122 # libfwupd goes to lib 123 123 # daemon, plug-ins and libfwupdplugin go to out ··· 126 126 127 127 src = fetchurl { 128 128 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; 129 - sha256 = "LAliLnOSowtORQQ0M4z2cNQzKMLyE/RsX//xAWifrps="; 129 + sha256 = "sha256-V1ZGZELrkTT7QM3IpG+eAQAyR8jqyC+l2LFvZCA3W3k="; 130 130 }; 131 131 132 132 patches = [

+4 -4

pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch

··· 1 1 diff --git a/meson.build b/meson.build 2 - index 4330512e..e53b70ab 100644 2 + index b91dd037..01d70a61 100644 3 3 --- a/meson.build 4 4 +++ b/meson.build 5 - @@ -403,7 +403,7 @@ endif 6 - if build_standalone and get_option('plugin_uefi_capsule') 7 - efiboot = dependency('efiboot') 5 + @@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() 6 + conf.set('HAVE_EFI_TIME_T', '1') 7 + endif 8 8 9 9 - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') 10 10 + efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi')

+6 -6

pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch

··· 1 1 diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build 2 - index d6a2ed68..12c82a95 100644 2 + index 1afa28e1..3da81d30 100644 3 3 --- a/libfwupdplugin/meson.build 4 4 +++ b/libfwupdplugin/meson.build 5 - @@ -216,7 +216,8 @@ fwupdplugin = library( 5 + @@ -220,7 +220,8 @@ fwupdplugin = library( 6 6 ], 7 - link_args : vflag, 7 + link_args : cc.get_supported_link_arguments([vflag]), 8 8 link_depends : fwupdplugin_mapfile, 9 9 - install : true 10 10 + install : true, ··· 12 12 ) 13 13 14 14 fwupdplugin_pkgg = import('pkgconfig') 15 - @@ -276,7 +277,8 @@ if get_option('introspection') 15 + @@ -280,7 +281,8 @@ if introspection.allowed() 16 16 girtargets, 17 17 fwupd_gir[0], 18 18 ], ··· 23 23 24 24 # Verify the map file is correct -- note we can't actually use the generated 25 25 diff --git a/meson.build b/meson.build 26 - index 38aa36b0..3fb7e579 100644 26 + index b91dd037..f97b4c26 100644 27 27 --- a/meson.build 28 28 +++ b/meson.build 29 - @@ -521,7 +521,7 @@ if build_standalone 29 + @@ -504,7 +504,7 @@ if build_standalone 30 30 if host_machine.system() == 'windows' 31 31 plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) 32 32 else

+7 -7

pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch

··· 1 1 diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build 2 - index b8ec916f0..38209b363 100644 2 + index b8ec916f..38209b36 100644 3 3 --- a/data/installed-tests/meson.build 4 4 +++ b/data/installed-tests/meson.build 5 5 @@ -83,5 +83,5 @@ configure_file( ··· 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 13 - index d8bd9fdc7..ff924d373 100644 13 + index b91dd037..d7e20b18 100644 14 14 --- a/meson.build 15 15 +++ b/meson.build 16 - @@ -187,8 +187,8 @@ else 16 + @@ -188,8 +188,8 @@ else 17 17 datadir = join_paths(prefix, get_option('datadir')) 18 18 sysconfdir = join_paths(prefix, get_option('sysconfdir')) 19 19 localstatedir = join_paths(prefix, get_option('localstatedir')) ··· 21 21 - installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) 22 22 + installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) 23 23 + installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) 24 + daemon_dir = join_paths(libexecdir, 'fwupd') 24 25 endif 25 26 mandir = join_paths(prefix, get_option('mandir')) 26 - localedir = join_paths(prefix, get_option('localedir')) 27 - @@ -487,6 +487,7 @@ gnome = import('gnome') 27 + @@ -492,6 +492,7 @@ gnome = import('gnome') 28 28 i18n = import('i18n') 29 29 30 30 conf.set_quoted('FWUPD_PREFIX', prefix) ··· 33 33 conf.set_quoted('FWUPD_LIBDIR', libdir) 34 34 conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) 35 35 diff --git a/meson_options.txt b/meson_options.txt 36 - index d00038dbc..be1c45b40 100644 36 + index d00038db..be1c45b4 100644 37 37 --- a/meson_options.txt 38 38 +++ b/meson_options.txt 39 39 @@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: ··· 45 45 option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') 46 46 option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) 47 47 diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c 48 - index 4d19e560f..91cfaa616 100644 48 + index 4d19e560..91cfaa61 100644 49 49 --- a/plugins/redfish/fu-self-test.c 50 50 +++ b/plugins/redfish/fu-self-test.c 51 51 @@ -27,7 +27,7 @@ fu_test_is_installed_test(void)