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

Merge pull request #145070 from ymatsiuk/ell_iwd

Browse Source 
ell: 0.44 -> 0.45; iwd: 1.17 -> 1.19
This commit is contained in:
Bernardo Meurer 2021-11-08 11:16:35 -08:00 committed by GitHub
commit 3a3bdc57e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,14 +7,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ell"; pname = "ell";
version = "0.44"; version = "0.45";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
rev = version; rev = version;
sha256 = "sha256-8korsEvlQOtfyuGkzFun1Xbuc4uhI2I0YpACUfxlpIM="; sha256 = "sha256-W+IXubPuA/BQzD/LknCeJQgTXUH6I/rUrKBMeEzcBlw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -8,17 +8,16 @@
, readline , readline
, openssl , openssl
, python3Packages , python3Packages
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iwd"; pname = "iwd";
version = "1.17"; version = "1.19";
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version; rev = version;
sha256 = "sha256-uWWdKjxctz8fdiIkSiuOYNcZPhxEWDXaA8QPLnd/I9c="; sha256 = "sha256-sMET4ouZ33SZRnkqJBadVvIDYMCOi7pib6d1zt1EJ8k=";
}; };
outputs = [ "out" "man" ] outputs = [ "out" "man" ]
@ -57,14 +56,6 @@ stdenv.mkDerivation rec {
"--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" "--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 = '' postUnpack = ''
mkdir -p iwd/ell mkdir -p iwd/ell
ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h