summary refs log tree commit diff
path: root/pkgs/os-specific/linux/libsepol/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-11-12 09:20:45 +0000
committerAlyssa Ross <hi@alyssa.is>2021-11-21 13:51:54 +0000
commit28625f78619e77e48dde0c453f9ed5944f30b3d7 (patch)
tree76eef62d598d8af195e30e5cc34aa22721aaeb7b /pkgs/os-specific/linux/libsepol/default.nix
parent20fd3b100215364e6d88cf5a6becc91827ad0a73 (diff)
downloadnixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar.gz
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar.bz2
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar.lz
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar.xz
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.tar.zst
nixpkgs-28625f78619e77e48dde0c453f9ed5944f30b3d7.zip
selinux: 2.9, 3.0 -> 3.3
These are all released together, so I'm updating them all in a single
commit.
Diffstat (limited to 'pkgs/os-specific/linux/libsepol/default.nix')
-rw-r--r--pkgs/os-specific/linux/libsepol/default.nix23
1 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index e90c0894209..c1df217944c 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,31 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "libsepol";
-  version = "3.0";
-  se_release = "20191204";
+  version = "3.3";
   se_url = "https://github.com/SELinuxProject/selinux/releases/download";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
-    url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
-    sha256 = "0ygb6dh5lng91xs6xiqf5v0nxa68qmjc787p0s5h9w89364f2yjv";
+    url = "${se_url}/${version}/libsepol-${version}.tar.gz";
+    sha256 = "12r39ygn7aa1kz52wibfr4520m0cp75hlrn3i6rnjqa6p0zdz5rd";
   };
 
-  patches = [
-    # upstream build fix against -fno-common compilers like >=gcc-10
-    (fetchpatch {
-      url = "https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c.patch";
-      sha256 = "0aybv4kzbhx8xq6s82dsh4ib76k59qzh2bgxmk44iq5cjnqn5rd6";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      url = "https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0.patch";
-      sha256 = "1mphwdlj4d6mwmsp5xkpf6ci4rxhgbi3fm79d08h4jbzxaf4wny4";
-      stripLen = 1;
-    })
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
     substituteInPlace src/Makefile --replace 'all: $(LIBA) $(LIBSO)' 'all: $(LIBA)'
     sed -i $'/^\t.*LIBSO/d' src/Makefile
@@ -46,7 +31,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  passthru = { inherit se_release se_url; };
+  passthru = { inherit se_url; };
 
   meta = with lib; {
     description = "SELinux binary policy manipulation library";