Unverified Commit 1165c1a5 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #294903 from vbgl/liquidsoap-2.2.4 

liquidsoap: 2.2.3 → 2.2.4; ocamlPackages.cry: 1.0.1 → 1.0.2
parents 397aa093 aae884c8

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

+3 −3
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ 


buildDunePackage rec {

  pname = "cry";

  version = "1.0.1";

  version = "1.0.2";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-cry";

    rev = "v${version}";

    sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ=";

    hash = "sha256-wtilYOUOHElW8ZVxolMNomvT//ho2tACmoubEvU2bpQ=";

  };



  postPatch = ''

    substituteInPlace src/dune --replace bytes ""

    substituteInPlace src/dune --replace-warn bytes ""

  '';



  minimalOCamlVersion = "4.12";

pkgs/tools/audio/liquidsoap/full.nix

+3 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


let

  pname = "liquidsoap";

  version = "2.2.3";

  version = "2.2.4";

in

stdenv.mkDerivation {

  inherit pname version;
@@ -16,7 +16,7 @@ stdenv.mkDerivation { 
    owner = "savonet";

    repo = "liquidsoap";

    rev = "refs/tags/v${version}";

    hash = "sha256-oCMSdmdU3oHrq3QFEDQLdb3CLFYcWylxTqKWtGOoQW8=";

    hash = "sha256-aAW3PeobTRVi5mV321MHZ6RymvOY4DbZITjwcMwGwFo=";

  };



  postPatch = ''
@@ -76,6 +76,7 @@ stdenv.mkDerivation { 
    ocamlPackages.camomile

    ocamlPackages.uri

    ocamlPackages.fileutils

    ocamlPackages.magic-mime

    ocamlPackages.menhir # liquidsoap-lang

    ocamlPackages.menhirLib

    ocamlPackages.metadata
@@ -99,7 +100,6 @@ stdenv.mkDerivation { 
    ocamlPackages.frei0r

    ocamlPackages.gd4o

    ocamlPackages.graphics

    ocamlPackages.gstreamer

    ocamlPackages.imagelib

    ocamlPackages.inotify

    ocamlPackages.ladspa
@@ -108,7 +108,6 @@ stdenv.mkDerivation { 
    ocamlPackages.lilv

    ocamlPackages.lo

    ocamlPackages.mad

    ocamlPackages.magic

    ocamlPackages.ogg

    ocamlPackages.opus

    ocamlPackages.portaudio