Unverified Commit acb52d7a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

ocamlPackages.yojson: 2.0.2 -> 2.1.0
parents 5b0b0970 a296146f

pkgs/development/ocaml-modules/yojson/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


buildDunePackage rec {

  pname = "yojson";

  version = "2.0.2";

  version = "2.1.0";



  src = fetchurl {

    url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";

    sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs=";

    sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0=";

  };



  nativeBuildInputs = [ cppo ];

pkgs/development/tools/analysis/frama-c/default.nix

+9 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, makeWrapper, writeText

{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText

, graphviz, doxygen

, ocamlPackages, ltl2ba, coq, why3

, gdk-pixbuf, wrapGAppsHook
@@ -53,6 +53,14 @@ stdenv.mkDerivation rec { 
    hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg=";

  };



  patches = [

    (fetchpatch {

      name = "fixes-yojson-2_1-support.patch";

      url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch";

      hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw=";

    })

  ];



  postConfigure = "patchShebangs src/plugins/eva/gen-api.sh";



  strictDeps = true;