Merge pull request #320233 from LeSuisse/iniparser-4.2.4

iniparser: 4.2.3 -> 4.2.4

1 files changed, 24 insertions, 26 deletions

diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 18057753efbd0..a35deb12e6837 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,35 +1,29 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchpatch
-, fetchFromGitHub
-, substituteAll
-, symlinkJoin
-, cmake
-, doxygen
-, ruby
-, validatePkgConfig
-, testers
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchFromGitHub,
+  substituteAll,
+  symlinkJoin,
+  cmake,
+  doxygen,
+  ruby,
+  validatePkgConfig,
+  testers,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "iniparser";
-  version = "4.2.3";
+  version = "4.2.4";
 
   src = fetchFromGitLab {
     owner = "iniparser";
     repo = "iniparser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA=";
+    hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-paths-pkgconfig-file.patch";
-      url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch";
-      hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI=";
-    })
-  ] ++ lib.optionals finalAttrs.doCheck [
+  patches = lib.optionals finalAttrs.doCheck [
     (substituteAll {
       # Do not let cmake's fetchContent download unity
       src = ./remove-fetchcontent-usage.patch;
@@ -50,11 +44,13 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    validatePkgConfig
+  ] ++ lib.optionals finalAttrs.doCheck [ ruby ];
 
-  cmakeFlags = [
-    "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}"
-  ];
+  cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" ];
 
   doCheck = false;
 
@@ -64,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests = {
     pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; });
+    iniparser-with-tests = finalAttrs.overrideAttrs (_: {
+      doCheck = true;
+    });
   };
 
   meta = with lib; {