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

ell: 0.65 -> 0.66, iwd: 2.17 -> 2.18
This commit is contained in:
Franz Pletz 2024-07-04 00:56:30 +02:00 committed by GitHub
commit ac5e958a38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions

View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchgit
, fetchpatch
, autoreconfHook
, pkg-config
, dbus
@ -9,16 +10,27 @@
stdenv.mkDerivation rec {
pname = "ell";
version = "0.65";
version = "0.66";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
rev = version;
hash = "sha256-q0C9KfWHxdmrG7xcbb8zpFL4ro+BJb7BL2tyKdFIhew=";
hash = "sha256-FqJbAE2P6rKKUMwcDShCKNDQu4RRifEGrbE7F4gSpm0=";
};
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

View File

@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
version = "2.17";
version = "2.18";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
hash = "sha256-o/Q8vUtB4Yiz1x+/6+8LUKUQNtiAmwcdh++/tTUN4mM=";
hash = "sha256-icPYxbCkfgv3v/FIVnrwKoHuLh9Sx2fcpQPO3kXJe4A=";
};
outputs = [ "out" "man" "doc" ]