Merge staging-next into staging

1 files changed, 32 insertions, 7 deletions

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 887c09691eb82..b10d45d8a4b69 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -1,21 +1,46 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig }:
+{ stdenv
+, fetchgit
+, autoreconfHook
+, pkgconfig
+, dbus
+}:
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.20";
+  version = "0.21";
+
+  outputs = [ "out" "dev" ];
 
   src = fetchgit {
-     url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
+     url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
      rev = version;
-     sha256 = "1g143dbc7cfks63k9yi2m8hpgfp9jj5b56s3hyxjzxm9dac3yn6c";
+     sha256 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  patches = [
+    ./fix-dbus-tests.patch
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    autoreconfHook
+  ];
+
+  checkInputs = [
+    dbus
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = https://git.kernel.org/pub/scm/libs/ell/ell.git;
+    homepage = https://01.org/ell;
     description = "Embedded Linux Library";
-    license = licenses.lgpl21;
+    longDescription = ''
+      The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems.
+    '';
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ mic92 dtzWill ];
   };