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

Merge pull request #68063 from dtzWill/update/ell-0.22-iwd-0.20

Browse Source 
ell: 0.21 -> 0.22, iwd: 0.19 -> 0.20, add myself to maintainers
This commit is contained in:
worldofpeace 2019-09-13 21:09:00 -04:00 committed by GitHub
commit a412701c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 16 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 { stdenv.mkDerivation rec {
pname = "ell"; pname = "ell";
version = "0.21"; version = "0.22";
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 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy"; sha256 = "0dk4j1b8sy4j6w91cq5ga99f3hln9fgh79ayi9kvn8xgzksmhjdp";
}; };
patches = [ patches = [

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

@ -1,16 +1,34 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }: { stdenv
, fetchgit
, fetchpatch
, autoreconfHook
, pkgconfig
, ell
, coreutils
, readline
, python3Packages
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iwd"; pname = "iwd";
version = "0.20";
version = "0.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 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz"; sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf";
}; };
patches = [
# Undo creating ReadWritePaths as instalation target.
(fetchpatch {
name = "revert-create-dirs-on-install.patch";
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb";
sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx";
revert = true;
})
];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkgconfig pkgconfig
@ -19,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ell ell
readline
python3Packages.python python3Packages.python
readline
]; ];
pythonPath = [ pythonPath = [
@ -29,13 +47,13 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
"--with-dbus-datadir=${placeholder "out"}/etc/"
"--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
"--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
"--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
"--localstatedir=/var/"
"--enable-wired"
"--enable-external-ell" "--enable-external-ell"
"--enable-wired"
"--localstatedir=/var/"
"--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
"--with-dbus-datadir=${placeholder "out"}/share/"
"--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
"--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
]; ];
postUnpack = '' postUnpack = ''
@ -60,11 +78,13 @@ stdenv.mkDerivation rec {
--replace /bin/false ${coreutils}/bin/false --replace /bin/false ${coreutils}/bin/false
''; '';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
description = "Wireless daemon for Linux"; description = "Wireless daemon for Linux";
license = licenses.lgpl21; license = licenses.lgpl21;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.mic92 ]; maintainers = with maintainers; [ dtzWill ];
}; };
} }