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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/iwd.nix
View File

@ -23,12 +23,7 @@ in {
systemd.packages = [ pkgs.iwd ]; systemd.packages = [ pkgs.iwd ];
systemd.services.iwd.wantedBy = [ "multi-user.target" ]; 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 ];
} }

4
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.27"; version = "0.28";
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/${pname}/${pname}.git";
rev = version; rev = version;
sha256 = "0pr9c4h535ggj54zfah9m3wziiwlig7r1hxpfx16s2s11ylrl9gd"; sha256 = "1am3ghji271364vmf2w5sxskvlhh4r2mwakza7vjjph16cvsv6a7";
}; };
patches = [ patches = [

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

@ -7,18 +7,18 @@
, coreutils , coreutils
, docutils , docutils
, readline , readline
, openssl
, python3Packages , python3Packages
, systemd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iwd"; pname = "iwd";
version = "1.4"; version = "1.5";
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 = "13sig2lbiyi4x74ag37gvdqx5w18w6hmq9hc1ir4a1cqqf50v61v"; sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,9 +32,10 @@ stdenv.mkDerivation rec {
ell ell
python3Packages.python python3Packages.python
readline readline
systemd
]; ];
checkInputs = [ openssl ];
pythonPath = [ pythonPath = [
python3Packages.dbus-python python3Packages.dbus-python
python3Packages.pygobject3 python3Packages.pygobject3
@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
doCheck = true;
postInstall = '' postInstall = ''
cp -a test/* $out/bin/ cp -a test/* $out/bin/
mkdir -p $out/share mkdir -p $out/share