Merge pull request #238956 from fpletz/pkgs/jool-4.1.10

jool: 4.1.9 -> 4.1.10
This commit is contained in:
Nick Cao
2023-06-21 20:15:55 -06:00
committed by GitHub
3 changed files with 2 additions and 14 deletions
-5
View File
@@ -10,11 +10,6 @@ stdenv.mkDerivation {
src = sourceAttrs.src;
patches = [ (fetchpatch {
url = "https://github.com/NICMx/Jool/commit/490ddb0933061cab3c2a7952dffc61789deed565.patch";
hash = "sha256-1dpMth0ocPHujlk+96St1a63RipcWiL/CdmSz4O87Lg=";
}) ];
outputs = [
"out"
"man"
-7
View File
@@ -12,13 +12,6 @@ stdenv.mkDerivation {
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
patches = [
(fetchpatch {
url = "https://git.launchpad.net/ubuntu/+source/jool/plain/debian/patches/0001-Linux-6.2.patch?id=3708a5b6c492b7d8e9f78596e61ae8f74ec9640f";
hash = "sha256-GkyDY6tcJp7Xd28mrDorEJHxsEowZBJP7BRAdPpsyF8=";
})
];
prePatch = ''
sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile
'';
+2 -2
View File
@@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
version = "4.1.9";
version = "4.1.10";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
rev = "refs/tags/v${version}";
hash = "sha256-sKrjn/XQANiXfkjNiFfvAkmONyQjVigFBKgcGkuIPs0=";
hash = "sha256-98XbBdSmgcepPZxX6hoPim+18lHLbrjqlbipB92nyAc=";
};
}