summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeona Maroni <dev@leona.is>2023-09-03 16:44:44 +0200
committerLeona Maroni <dev@leona.is>2023-09-09 19:38:46 +0200
commit0b72a1e93de66e0e17949b860a057c4cbfcecd7e (patch)
treec28162c4b246bfe1af029f0e172799017918ec2d
parentc2b0edbf1f74b67643402ff0ae251fe6f604d851 (diff)
downloadnixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar.gz
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar.bz2
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar.lz
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar.xz
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.tar.zst
nixpkgs-0b72a1e93de66e0e17949b860a057c4cbfcecd7e.zip
ell: 0.57 -> 0.58
-rw-r--r--pkgs/os-specific/linux/ell/default.nix16
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index bde39a41b52..bef36ac4a12 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -3,18 +3,20 @@
 , autoreconfHook
 , pkg-config
 , dbus
+, fetchpatch
+, sysctl
 }:
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.57";
+  version = "0.58";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    sha256 = "sha256-9d9WMCByQ1TKWpzWe5msts1LG+BKKqwCgaMBbD74/+4=";
+    hash = "sha256-CwUwwvyT541aIvypVMqRhHkVJLna121Cme+v7c0FLWo=";
   };
 
   nativeBuildInputs = [
@@ -24,8 +26,18 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = [
     dbus
+    # required as the sysctl test works on some machines
+    sysctl
   ];
 
+  patches = [
+    # /proc/sys/net/core/somaxconn doesn't always exist in the nix build environment
+    (fetchpatch {
+      name = "skip-sysctl-test-if-sysfs-not-available.patch";
+      url = "https://patchwork.kernel.org/project/ell/patch/526DA75D-01AB-4D85-BF5C-5F25E5C39480@kloenk.dev/raw/";
+      hash = "sha256-YYGYWQ67cbMLt6RnqZmHt+tpvVIDKPbSCqPIouk6alU=";
+    })
+  ];
   enableParallelBuilding = true;
 
   # tests sporadically fail on musl