From 3829a407936b07318f18660d7a9409539a22ffa8 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 13:55:02 +0200 Subject: [PATCH 1/3] libseccomp: format with nixpkgs-fmt Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index f3816c2ef0c..b4352c68da2 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -25,13 +25,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "https://github.com/seccomp/libseccomp"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; + platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" "riscv32-linux" - "sparc-linux" "sparc64-linux" + "riscv64-linux" + "riscv32-linux" + "sparc-linux" + "sparc64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; From 33842cacde06b4a1c67137cdbbdc76bd3c16e1f2 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 13:55:31 +0200 Subject: [PATCH 2/3] libseccomp: 2.4.3 -> 2.5.0 Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index b4352c68da2..7d5ced78882 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, getopt, makeWrapper, utillinux }: +{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"; + sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; }; outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ getopt makeWrapper ]; + buildInputs = [ getopt makeWrapper gperf ]; patchPhase = '' patchShebangs . From ae3fe42897039e0f8f2e19055f34e93fbe45db48 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 24 Aug 2020 14:10:53 +0200 Subject: [PATCH 3/3] libseccomp: enable RISC-V architecture Signed-off-by: Sascha Grunert --- pkgs/development/libraries/libseccomp/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 7d5ced78882..c33aa76ea2b 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" - "riscv32-linux" "sparc-linux" "sparc64-linux" ];