jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #136284 from maxeaubrey/ell_0.43_iwd_1.17

Browse Source 
ell: 0.42 -> 0.43, iwd: 1.16 -> 1.17
This commit is contained in:
maxine [they] 2021-09-06 11:26:01 +02:00 committed by GitHub
commit 2f6c17537d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/ell/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
version = "0.42";
version = "0.43";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "sha256-GgQhSzVqGCpljWewtevCc9rpkks7devRNp5TN+5JNN4=";
sha256 = "sha256-ttKFKV8spxnkFpZHV4Dn9BxJdjxYLWYrHY+qq6uAOlg=";
};
nativeBuildInputs = [

13
pkgs/os-specific/linux/iwd/default.nix
View File

@ -8,16 +8,17 @@
, readline
, openssl
, python3Packages
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "iwd";
version = "1.16";
version = "1.17";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
sha256 = "sha256-Nu6vb5UOJ/KgmJZM4bMKwLpOoKMLcnZPYCqFBQjuCYY=";
sha256 = "sha256-uWWdKjxctz8fdiIkSiuOYNcZPhxEWDXaA8QPLnd/I9c=";
};
outputs = [ "out" "man" ]
@ -56,6 +57,14 @@ stdenv.mkDerivation rec {
"--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/"
];
patches = [
# Fix failure in test-eapol. Remove when bumping to 1.18
(fetchpatch {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39";
sha256 = "0n8ixrbfh428ajncakcb9kd2n4fw82kw9sfskn1d9ny0lrg39nvg";
})
];
postUnpack = ''
mkdir -p iwd/ell
ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h