dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fossil: 2.24 -> 2.25 (#357155)

Browse Source
This commit is contained in:
Sandro 2024-11-22 14:33:12 +01:00 committed by GitHub
commit 3934cda54d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
, tcl
, libiconv
, fetchurl
, fetchpatch
, buildPackages
, zlib
, openssl
@ -18,17 +17,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fossil";
version = "2.24";
version = "2.25";
src = fetchurl {
url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=";
hash = "sha256-5O6ceBUold+yp13pET/5NB17Del1wDOzUQYLv0DS/KE=";
};
# required for build time tool `./tools/translate.c`
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];
nativeBuildInputs = [ installShellFiles tcl ];
buildInputs = [ zlib openssl readline which ed ]
++ lib.optional stdenv.hostPlatform.isDarwin libiconv
@ -42,27 +41,6 @@ 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
'';