Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ell: 0.66 -> 0.67, iwd: 2.18 -> 2.19 #325942

Merged
merged 2 commits into from
Jul 13, 2024
Merged

ell: 0.66 -> 0.67, iwd: 2.18 -> 2.19 #325942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afa6f75
ell: 0.66 -> 0.67
trofi Jul 9, 2024
6ca5b11
iwd: 2.18 -> 2.19
trofi Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions pkgs/os-specific/linux/ell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchgit
, fetchpatch
, autoreconfHook
, pkg-config
, dbus
Expand All @@ -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
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down