From e0296b2d12ee5bc4129b90cfbd04041e9b791912 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 Dec 2020 15:05:15 +0100 Subject: [PATCH 1/7] =?UTF-8?q?fwupd:=201.5.1=20=E2=86=92=201.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://blogs.gnome.org/hughsie/2020/11/23/fwupd-1-5-2/ --- ...d-option-for-installation-sysconfdir.patch | 26 ------------------- .../linux/firmware/fwupd/default.nix | 22 +++++++--------- 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 6faa6079355..dce4af69aa2 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -122,32 +122,6 @@ index ed4eee70..76dbdb1d 100644 - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) -diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d829e153..e2917bbe 100644 ---- a/plugins/msr/meson.build -+++ b/plugins/msr/meson.build -@@ -5,7 +5,7 @@ install_data(['msr.quirk'], - ) - - install_data(['fwupd-msr.conf'], -- install_dir: join_paths(sysconfdir, 'modules-load.d') -+ install_dir: join_paths(sysconfdir_install, 'modules-load.d') - ) - - shared_module('fu_plugin_msr', -diff --git a/plugins/platform-integrity/meson.build b/plugins/platform-integrity/meson.build -index 6f1c4bc5..c5d043fc 100644 ---- a/plugins/platform-integrity/meson.build -+++ b/plugins/platform-integrity/meson.build -@@ -7,7 +7,7 @@ install_data([ - ) - - install_data(['fwupd-platform-integrity.conf'], -- install_dir: join_paths(sysconfdir, 'modules-load.d') -+ install_dir: join_paths(sysconfdir_install, 'modules-load.d') - ) - - shared_module('fu_plugin_platform_integrity', diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build index 92762791..08bb37ea 100644 --- a/plugins/redfish/meson.build diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 85f5bbbf5b1..7d38c767a08 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,7 +2,6 @@ { stdenv , fetchurl -, fetchpatch , fetchFromGitHub , substituteAll , gtk-doc @@ -15,8 +14,7 @@ , gusb , sqlite , libarchive -, glib-networking -, libsoup +, curl , help2man , libjcat , libxslt @@ -89,7 +87,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.5.1"; + version = "1.5.2"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -98,7 +96,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0fpxcl6bighiipyl4qspjhi0lwisrgq8jdahm68mk34rmrx50sgf"; + sha256 = "19vppg8s8yfg2wavg0czd0vlalxv22hzw0gd11nw2wa92jz91d9x"; }; patches = [ @@ -119,12 +117,6 @@ let # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) - - # Skip tests requiring network. - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/db15442c7c217610954786bd40779c14ed0e034b.patch"; - sha256 = "/jzpGMJcqLisjecKpSUfA8ZCU53n7BOPR6tMgEX/qL8="; - }) ]; nativeBuildInputs = [ @@ -152,14 +144,13 @@ let gusb sqlite libarchive - libsoup + curl elfutils gnu-efi libgudev colord libjcat libuuid - glib-networking json-glib umockdev bash-completion @@ -176,6 +167,11 @@ let mesonFlags = [ "-Dgtkdoc=true" "-Dplugin_dummy=true" + # We are building the official releases. + "-Dsupported_build=true" + # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd. + # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97 + "-Dsoup_session_compat=false" "-Dudevdir=lib/udev" "-Dsystemd_root_prefix=${placeholder "out"}" "-Dinstalled_test_prefix=${placeholder "installedTests"}" From 113a866cac325931d1af84a7bd1bd59171fa9f60 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 Dec 2020 15:09:16 +0100 Subject: [PATCH 2/7] =?UTF-8?q?fwupd:=201.5.2=20=E2=86=92=201.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://blogs.gnome.org/hughsie/2020/12/08/fwupd-1-5-3/ --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 7d38c767a08..eb984d54c78 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -87,7 +87,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.5.2"; + version = "1.5.3"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -96,7 +96,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "19vppg8s8yfg2wavg0czd0vlalxv22hzw0gd11nw2wa92jz91d9x"; + sha256 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86"; }; patches = [ From bc8ef726406405932d9d0219f02de94a5d97c18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Dec 2020 19:26:33 +0100 Subject: [PATCH 3/7] keystone: also build shared library --- pkgs/development/libraries/keystone/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index dc83209c147..869d7ae1b02 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa"; }; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + nativeBuildInputs = [ pkg-config cmake From 0fbbcb30579cc265b697dc6b7bbaf62ceac490e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Dec 2020 22:35:12 +0000 Subject: [PATCH 4/7] php73Packages.phpstan: 0.12.58 -> 0.12.59 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 7ac33ab3c15..6bd3fb00c4e 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.58"; + version = "0.12.59"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "1509z783rhrnlx32a3yg58sy81971dv1sf8nzs8am2m9qnpmdcll"; + sha256 = "0lp25d9b7w8lk4ffrd17mjw93i234qnfpwz42k8lww1lrk5abnfa"; }; phases = [ "installPhase" ]; From 66a8b5dba392440bf9ec1121c2df1de38b442652 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Dec 2020 22:48:20 +0000 Subject: [PATCH 5/7] php73Extensions.rdkafka: 4.0.4 -> 4.1.1 --- pkgs/development/php-packages/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index 98944d3bab6..64a2b8028c0 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "4.0.4"; - sha256 = "18a8p43i2g93fv7qzvk2hk66z5iv0mk1rqn097x49bjigliv60mn"; + version = "4.1.1"; + sha256 = "0s6cqd71z5jpqb98myk4askmbqphzzslf0d4vqlg2rig9q6fyv7x"; buildInputs = [ pkgs.rdkafka pcre' ]; From 68f212b0e3bd334e2c741db289d4c3282621f6f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 9 Dec 2020 23:42:10 +0000 Subject: [PATCH 6/7] php73Extensions.event: 3.0.1 -> 3.0.2 --- pkgs/development/php-packages/event/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 3145f88b701..781b5abbc38 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "3.0.1"; - sha256 = "12629hi2ddyavzgl5ala53fi8m55l0xsmqsywy040f0grzp9r6rc"; + version = "3.0.2"; + sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" From 112184c58d8faad82048688846ad5139afc36261 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 00:13:49 +0000 Subject: [PATCH 7/7] php73Packages.php-cs-fixer: 2.16.7 -> 2.17.0 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index de8e17f8f23..76465a77fd4 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "php-cs-fixer"; - version = "2.16.7"; + version = "2.17.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh"; + sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12"; }; phases = [ "installPhase" ];