Merge pull request #230567 from r-ryantm/auto-update/ocamlPackages.yojson

ocamlPackages.yojson: 2.0.2 -> 2.1.0

authored by

Weijia Wang and committed by
GitHub
acb52d7a 5b0b0970

+11 -3
+2 -2
pkgs/development/ocaml-modules/yojson/default.nix
··· 2 2 3 3 buildDunePackage rec { 4 4 pname = "yojson"; 5 - version = "2.0.2"; 5 + version = "2.1.0"; 6 6 7 7 src = fetchurl { 8 8 url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; 9 - sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs="; 9 + sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ cppo ];
+9 -1
pkgs/development/tools/analysis/frama-c/default.nix
··· 1 - { lib, stdenv, fetchurl, makeWrapper, writeText 1 + { lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText 2 2 , graphviz, doxygen 3 3 , ocamlPackages, ltl2ba, coq, why3 4 4 , gdk-pixbuf, wrapGAppsHook ··· 52 52 url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; 53 53 hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg="; 54 54 }; 55 + 56 + patches = [ 57 + (fetchpatch { 58 + name = "fixes-yojson-2_1-support.patch"; 59 + url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch"; 60 + hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw="; 61 + }) 62 + ]; 55 63 56 64 postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; 57 65