Merge pull request #313494 from wahjava/update-fossil

This commit is contained in:
Sandro 2024-07-04 11:46:49 +02:00 committed by GitHub
commit 5643b580c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3,6 +3,7 @@
, tcl
, libiconv
, fetchurl
, fetchpatch
, buildPackages
, zlib
, openssl
@ -17,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fossil";
version = "2.23";
version = "2.24";
src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM=";
hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=";
};
# required for build time tool `./tools/translate.c`
@ -41,6 +42,27 @@ stdenv.mkDerivation (finalAttrs: {
lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
++ lib.optional withJson "--json";
patches = [
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f";
extraPrefix = "";
hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4=";
name = "fossil-disable-tests.patch";
})
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8";
extraPrefix = "";
hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU=";
name = "fossil-fix-json-test.patch";
})
(fetchpatch {
url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47";
extraPrefix = "";
hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0=";
name = "fossil-comment-utf-tests.patch";
})
];
preBuild = ''
export USER=nonexistent-but-specified-user
'';