Merge pull request #201979 from LibreCybernetics/update-exempi

pkgs/development/libraries/exempi/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "exempi";
-  version = "2.5.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
-    sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
+    sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0=";
   };
 
   configureFlags = [
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   doCheck = stdenv.isLinux && stdenv.is64bit;
+  dontDisableStatic = doCheck;
 
   meta = with lib; {
     description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";

pkgs/development/python-modules/python-xmp-toolkit/default.nix

@@ -2,7 +2,6 @@
 , exempi
 , fetchFromGitHub
 , mock
-, pythonOlder
 , pytz
 , lib, stdenv
 }:
@@ -26,8 +25,6 @@ buildPythonPackage {
 
   buildInputs = [ exempi ];
 
-  checkInputs = lib.optionals (pythonOlder "3.3") [ mock ];
-
   propagatedBuildInputs = [ pytz ];
 
   postPatch = ''
@@ -38,6 +35,10 @@ buildPythonPackage {
   # hangs on darwin + sandbox
   doCheck = !stdenv.isDarwin;
 
+  preCheck = ''
+    rm test/{test_exempi,test_files}.py
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
     description = "Python XMP Toolkit for working with metadata";

pkgs/top-level/all-packages.nix

@@ -6461,11 +6461,7 @@ with pkgs;
 
   exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { };
 
-  exempi = callPackage ../development/libraries/exempi {
-    stdenv = if stdenv.isDarwin then stdenv
-             else gcc9Stdenv;
-    boost  = if stdenv.isDarwin then boost else boost15x;
-  };
+  exempi = callPackage ../development/libraries/exempi { };
 
   executor = with python3Packages; toPythonApplication executor;