Unverified Commit 981817f0 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.luv: 0.5.12 -> 0.5.14 (#503553)

parents 3b8ea39f 5d7f24d5

pkgs/development/compilers/haxe/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
        ptmap

        camlp5

        sha

        luv

        luv-0-5-12

        extlib

      ]

    else
@@ -37,7 +37,7 @@ let 
        ptmap

        camlp5

        sha

        luv

        luv-0-5-12

        extlib-1-7-7

      ];

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

+49 −44
Original line number Diff line number Diff line 
# nixpkgs-update: no auto update

# haxe depends on specific version of luv

{

  lib,

  buildDunePackage,

  ocaml,

  fetchurl,

  ctypes,

  result,
@@ -11,27 +8,25 @@ 
  file,

}:



let

  generic =

    {

      version,

      sha256,

    }:

    buildDunePackage rec {

      pname = "luv";

  version = "0.5.12";



  minimalOCamlVersion = "4.03";

      inherit version;



      src = fetchurl {

        url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";

    sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";

        inherit sha256;

      };



  patches = [

    # backport of patch to fix incompatible pointer type. remove next update

    # https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2

    ./incompatible-pointer-type-fix.diff

  ];

      patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff;



      postConfigure = ''

    for f in src/c/vendor/configure/{ltmain.sh,configure}; do

      substituteInPlace "$f" --replace /usr/bin/file file

    done

        substituteInPlace "src/c/vendor/configure/ltmain.sh" --replace-fail /usr/bin/file file

      '';



      nativeBuildInputs = [ file ];
@@ -40,8 +35,7 @@ buildDunePackage rec { 
        result

      ];

      checkInputs = [ alcotest ];

  # Alcotest depends on fmt that needs 4.08 or newer

  doCheck = lib.versionAtLeast ocaml.version "4.08";

      doCheck = true;



      meta = {

        homepage = "https://github.com/aantron/luv";
@@ -58,4 +52,15 @@ buildDunePackage rec { 
          sternenseemann

        ];

      };

    };

in

{

  luv-0-5-12 = generic {

    version = "0.5.12";

    sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";

  };

  luv = generic {

    version = "0.5.14";

    sha256 = "sha256-jgG0pQyIds3ZjY4kXAaHxNxNiDrtFhrZxazh+x/arpk=";

  };

}

pkgs/top-level/ocaml-packages.nix

+6 −3
Original line number Diff line number Diff line
@@ -1147,9 +1147,12 @@ let 


        lutils = callPackage ../development/ocaml-modules/lutils { };



        luv = callPackage ../development/ocaml-modules/luv {

          inherit (pkgs) file;

        };

        inherit

          (callPackage ../development/ocaml-modules/luv {

          })

          luv-0-5-12

          luv

          ;



        lwd = callPackage ../development/ocaml-modules/lwd { };