nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-29 16:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fossil: 2.23 -> 2.24

Browse Source 
- add patches from upstream to fix/disable tests
This commit is contained in:
Ashish SHUKLA 2024-05-21 23:11:19 +02:00
parent e381a12881
commit 920b6be002
No known key found for this signature in database
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/version-management/fossil/default.nix
View File

@ -3,6 +3,7 @@
, tcl , tcl
, libiconv , libiconv
, fetchurl , fetchurl
, fetchpatch
, buildPackages , buildPackages
, zlib , zlib
, openssl , openssl
@ -17,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fossil"; pname = "fossil";
version = "2.23"; version = "2.24";
src = fetchurl { src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; 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` # required for build time tool `./tools/translate.c`
@ -41,6 +42,27 @@ stdenv.mkDerivation (finalAttrs: {
lib.optional (!withInternalSqlite) "--disable-internal-sqlite" lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
++ lib.optional withJson "--json"; ++ 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 = '' preBuild = ''
export USER=nonexistent-but-specified-user export USER=nonexistent-but-specified-user
''; '';