From afa6f75b75020d204a38092e1e148128542f6380 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 9 Jul 2024 22:39:05 +0100 Subject: [PATCH 1/2] ell: 0.66 -> 0.67 Changes: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.67 --- pkgs/os-specific/linux/ell/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index c4f91658f4484..6514937463619 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, fetchpatch , autoreconfHook , pkg-config , dbus @@ -10,27 +9,16 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.66"; + version = "0.67"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-FqJbAE2P6rKKUMwcDShCKNDQu4RRifEGrbE7F4gSpm0="; + hash = "sha256-PIxPhKqsxybkLQerkQ15kTRh0oW812lWbCGEig11KQk="; }; - patches = [ - # Without the revert TCP dbus tests fail to bind the port and fail. - # Seemingly a known dbus bug: https://gitlab.freedesktop.org/dbus/dbus/-/issues/28 - (fetchpatch { - name = "revert-tcp-tests.patch"; - url = "https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=7863e06b18b9cce56392b65928e927297108337d"; - hash = "sha256-8+M1k0hGE64CHmK1T5/zW8+Q76pIjl5SMaYktRqpudg="; - revert = true; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -44,6 +32,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Runs multiple dbus instances on the same port failing the bind. + enableParallelChecking = false; + # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; From 6ca5b11ad8ec0624343614c927fbd844205fe5df Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 9 Jul 2024 22:39:57 +0100 Subject: [PATCH 2/2] iwd: 2.18 -> 2.19 Changes: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.19 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 174949a7af4da..f19c73f7bfc5d 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.18"; + version = "2.19"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-icPYxbCkfgv3v/FIVnrwKoHuLh9Sx2fcpQPO3kXJe4A="; + hash = "sha256-LIzcV8OvtHItMpgFVHDQhUisD3kaMPMESd3cgOaIu/8="; }; outputs = [ "out" "man" "doc" ]