Unverified Commit 87d7dac3 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

libjodycode: 4.0.1 -> 4.1, jdupes: 1.29.0 -> 1.31.1 (#447825)

parents babb07d7 c9c144dd

pkgs/by-name/jd/jdupes/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "jdupes";

  version = "1.29.0";

  version = "1.31.1";



  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "jbruchon";

    repo = "jdupes";

    rev = "v${finalAttrs.version}";

    hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o=";

    hash = "sha256-I1DtJokp43K9nZt73od4esK705nosIWEHLw4lydufbE=";

    # 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.
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "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"

pkgs/by-name/li/libjodycode/package.nix

+12 −2
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
  lib,

  stdenv,

  fetchFromGitea,

  fetchpatch,

  jdupes,

  fixDarwinDylibNames,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "libjodycode";

  version = "4.0.1";

  version = "4.1";



  outputs = [

    "out"
@@ -21,9 +22,18 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "jbruchon";

    repo = "libjodycode";

    rev = "v${finalAttrs.version}";

    hash = "sha256-9YdDw7xIuAArQtPYhDeT4AhSwi5fhVJeBl3R+J7PaCw=";

    hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY=";

  };



  patches = [

    # Fix linux build failure, drop after 4.1 release.

    (fetchpatch {

      name = "linux-build-fix.patch";

      url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch";

      hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo=";

    })

  ];



  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;



  env.PREFIX = placeholder "out";