diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/elogind/default.nix | 49 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/eudev/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/mdevd/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/s6-linux-init/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 39 |
5 files changed, 121 insertions, 23 deletions
diff --git a/pkgs/os-specific/linux/elogind/default.nix b/pkgs/os-specific/linux/elogind/default.nix new file mode 100644 index 000000000000..c93391a5ff96 --- /dev/null +++ b/pkgs/os-specific/linux/elogind/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub +, meson, m4, gperf, gettext, pkgconfig, libxslt, ninja +, libcap, libudev +, enablePam ? true, pam +, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 }: + +stdenv.mkDerivation rec { + name = "elogind-${version}"; + version = "239.2"; + + src = fetchFromGitHub { + owner = "elogind"; + repo = "elogind"; + rev = "v${version}"; + sha256 = "17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6"; + }; + + postPatch = '' + for f in man/*.xml; do + substituteInPlace $f \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd \ + --replace http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd + done + + patchShebangs . + + set -x + ''; + + preConfigure = '' + mesonFlagsArray+=(-Drootprefix=$out) + mesonFlagsArray+=(-Dsysconfdir=$out/etc) + mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) + mesonFlagsArray+=(-Dcgroup-controller=elogind) + ''; + + buildInputs = [ libcap libudev ] ++ lib.optional enablePam pam; + nativeBuildInputs = [ meson m4 gperf gettext pkgconfig libxslt ninja docbook_xsl ]; + + strictDeps = true; + + meta = with lib; { + homepage = https://github.com/elogind/elogind; + description = "logind, extracted to a standalone package"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 771f012c2c21..7e8c9e413380 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.6"; + version = "3.2.7"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1qdpnvsv3qqwy6jl4i4b1dn212y6nvawpaladb7plfping9p2n46"; + sha256 = "0qphgfw1vh2f73yjggkh5icxfq5gg811a0j6b22zkhaks95n211h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix new file mode 100644 index 000000000000..05e1452beb9c --- /dev/null +++ b/pkgs/os-specific/linux/mdevd/default.nix @@ -0,0 +1,26 @@ +{ lib, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "mdevd"; + version = "0.1.0.2"; + sha256 = "1m7n2g499l2chwya1a13ng2nqiwd3zhvpj4vrkd8x2mamsan7rxx"; + + description = "Kernel event manager compatible with mdev.conf"; + platforms = lib.platforms.linux; + + outputs = [ "bin" "dev" "doc" "out" ]; + + configureFlags = [ + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + ]; + + postInstall = '' + find . -type f -executable -delete + mv examples/ $doc/share/doc/mdevd + mv doc $doc/share/doc/mdevd/html + ''; +} diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix new file mode 100644 index 000000000000..2fca6aaa8c99 --- /dev/null +++ b/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -0,0 +1,26 @@ +{ lib, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "s6-linux-init"; + version = "0.4.0.0"; + sha256 = "0zpd6n30cf8847240f658gw40sh64lm1mbaxr19q6rryvs5rpb6l"; + + description = "Automated /sbin/init creation for s6-based Linux systems"; + platforms = lib.platforms.linux; + + outputs = [ "bin" "dev" "doc" "out" ]; + + configureFlags = [ + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + ]; + + postInstall = '' + find . -type f -executable -delete + mv doc $doc/share/doc/s6-linux-init/html + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e9ee8797ff1..0285a8a3b78f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2511,8 +2511,6 @@ with pkgs; stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv; }; - execline = skawarePackages.execline; - exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -5225,14 +5223,6 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = skawarePackages.s6-dns; - - s6-linux-utils = skawarePackages.s6-linux-utils; - - s6-networking = skawarePackages.s6-networking; - - s6-portable-utils = skawarePackages.s6-portable-utils; - sablotron = callPackage ../tools/text/xml/sablotron { }; safecopy = callPackage ../tools/system/safecopy { }; @@ -11546,8 +11536,6 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - nsss = skawarePackages.nsss; - ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -12242,8 +12230,6 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; - skalibs = skawarePackages.skalibs; - skawarePackages = recurseIntoAttrs { buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; @@ -12252,16 +12238,31 @@ with pkgs; s6 = callPackage ../tools/system/s6 { }; s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; s6-networking = callPackage ../tools/networking/s6-networking { }; s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + mdevd = callPackage ../os-specific/linux/mdevd { }; nsss = callPackage ../development/libraries/nsss { }; utmps = callPackage ../development/libraries/utmps { }; - }; + inherit (skawarePackages) + execline + mdevd + nsss + s6 + s6-dns + s6-linux-init + s6-linux-utils + s6-networking + s6-portable-utils + s6-rc + skalibs + utmps; + skydive = callPackage ../tools/networking/skydive { }; slang = callPackage ../development/libraries/slang { }; @@ -12575,8 +12576,6 @@ with pkgs; uthash = callPackage ../development/libraries/uthash { }; - utmps = skawarePackages.utmps; - ucommon = ucommon_openssl; ucommon_openssl = callPackage ../development/libraries/ucommon { @@ -13728,10 +13727,6 @@ with pkgs; boost = boost159; }; - s6 = skawarePackages.s6; - - s6-rc = skawarePackages.s6-rc; - supervise = callPackage ../tools/system/supervise { }; spamassassin = callPackage ../servers/mail/spamassassin { @@ -14067,6 +14062,8 @@ with pkgs; dstat = callPackage ../os-specific/linux/dstat { }; + elogind = callPackage ../os-specific/linux/elogind { }; + # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { buildGoPackage = buildGo110Package; |