Merge pull request #79961 from dtzWill/update/iwd-1.5

ell,iwd: 0.28, 1.5, minor touchups, drop tmpfiles snippet
This commit is contained in:
Jörg Thalheim 2020-02-13 10:53:51 +00:00 committed by GitHub
commit b300ccd7f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions

View file

@ -23,12 +23,7 @@ in {
systemd.packages = [ pkgs.iwd ];
systemd.services.iwd.wantedBy = [ "multi-user.target" ];
systemd.tmpfiles.rules = [
"d /var/lib/iwd 0700 root root -"
"d /var/lib/ead 0700 root root -"
];
};
meta.maintainers = with lib.maintainers; [ mic92 ];
meta.maintainers = with lib.maintainers; [ mic92 dtzWill ];
}

View file

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
version = "0.27";
version = "0.28";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "0pr9c4h535ggj54zfah9m3wziiwlig7r1hxpfx16s2s11ylrl9gd";
sha256 = "1am3ghji271364vmf2w5sxskvlhh4r2mwakza7vjjph16cvsv6a7";
};
patches = [

View file

@ -7,18 +7,18 @@
, coreutils
, docutils
, readline
, openssl
, python3Packages
, systemd
}:
stdenv.mkDerivation rec {
pname = "iwd";
version = "1.4";
version = "1.5";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
sha256 = "13sig2lbiyi4x74ag37gvdqx5w18w6hmq9hc1ir4a1cqqf50v61v";
sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6";
};
nativeBuildInputs = [
@ -32,9 +32,10 @@ stdenv.mkDerivation rec {
ell
python3Packages.python
readline
systemd
];
checkInputs = [ openssl ];
pythonPath = [
python3Packages.dbus-python
python3Packages.pygobject3
@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
doCheck = true;
postInstall = ''
cp -a test/* $out/bin/
mkdir -p $out/share