Merge pull request #325942 from trofi/ell-iwd-update

NixOS · Jul 13, 2024 · 5124548 · 5124548
2 parents 5a56b5d + 6ca5b11
commit 5124548
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git 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;
 

diff --git 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" ]