From 02770696063aaf565d48e1e7d351f8241882e25f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 12:36:06 +0000 Subject: [PATCH 1/2] libjodycode: 3.1.2 -> 4.0 --- pkgs/by-name/li/libjodycode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix index 164fdb1f66e8..5dcd17a93262 100644 --- a/pkgs/by-name/li/libjodycode/package.nix +++ b/pkgs/by-name/li/libjodycode/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libjodycode"; - version = "3.1.2"; + version = "4.0"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "jbruchon"; repo = "libjodycode"; rev = "v${finalAttrs.version}"; - hash = "sha256-doTGeIElftC4SAcn3MTQ+DffQFMv1Elo28i/MFxjFzk="; + hash = "sha256-2G6jh+eVwri3RINiFxrc7xwoGTTxlGKsEQMu9YxWSzY="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; From 5bceb20f3b251709b864ef89ad9ed83ef9b38c2a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 17 Aug 2025 01:22:04 +0200 Subject: [PATCH 2/2] jdupes: 1.28.0 -> 1.29.0 Diff: https://codeberg.org/jbruchon/jdupes/compare/v1.28.0...v1.29.0 Release: https://codeberg.org/jbruchon/jdupes/releases/tag/v1.29.0 Changelog: https://codeberg.org/jbruchon/jdupes/src/branch/master/CHANGES.txt --- pkgs/by-name/jd/jdupes/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix index f630bcd8b926..a49d0c6c84c8 100644 --- a/pkgs/by-name/jd/jdupes/package.nix +++ b/pkgs/by-name/jd/jdupes/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "jdupes"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "jbruchon"; repo = "jdupes"; rev = "v${finalAttrs.version}"; - hash = "sha256-jRjVuN/FNDpKB+Ibi+Mkm+WhB16cz9c33dOOeiPdgr8="; + hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. @@ -27,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" + # don't link with ../libjodycode + "IGNORE_NEARBY_JC=1" + # link with system libjodycode (this case is erroneously missing in v1.29.0) + "LDFLAGS_EXTRA=-ljodycode" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "ENABLE_DEDUPE=1"