mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-27 23:33:30 +00:00
fossil: 2.23 -> 2.24
- add patches from upstream to fix/disable tests
This commit is contained in:
parent
e381a12881
commit
920b6be002
@ -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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user