about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorgilice <104317939+gilice@users.noreply.github.com>2023-03-25 20:18:55 +0100
committergilice <104317939+gilice@users.noreply.github.com>2023-03-28 17:37:00 +0200
commit91793861d5d50160d578277ab2acb417cdf9081d (patch)
tree4f99e18abc3a3de1e3402b5f67958b7d75042960 /pkgs
parentb1c1d5c8145940cae66715674559641b435c2ef3 (diff)
jsoncpp: 1.9.4 -> 1.9.5
Removed the fetchpatch because the issue appears to be already fixed:
https://github.com/open-source-parsers/jsoncpp/issues/1235#issuecomment-772772285
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/jsoncpp/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index d9cf9a6c43464..41e9a2d0a03ad 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -4,14 +4,13 @@
 , cmake
 , python3
 , validatePkgConfig
-, fetchpatch
 , secureMemory ? false
 , enableStatic ? stdenv.hostPlatform.isStatic
 }:
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
-  version = "1.9.4";
+  version = "1.9.5";
 
   outputs = ["out" "dev"];
 
@@ -19,17 +18,9 @@ stdenv.mkDerivation rec {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
+    sha256 = "sha256-OyfJD19g8cT9wOD0hyJyEw4TbaxZ9eY04396U/7R+hs=";
   };
 
-  patches = [
-    # Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235.
-    (fetchpatch {
-      url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch";
-      sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg";
-    })
-  ];
-
   /* During darwin bootstrap, we have a cp that doesn't understand the
    * --reflink=auto flag, which is used in the default unpackPhase for dirs
    */