colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.luv: 0.5.11 -> 0.5.12 (#226435)

Browse Source 
* ocamlPackages.luv: 0.5.11 -> 0.5.12

* haxe: 4.2.5 -> 4.3.3

---------

Co-authored-by: Ulrik Strid <ulrik@strid.tech>
This commit is contained in:
R. RyanTM 2024-01-17 05:42:30 -08:00 committed by GitHub
parent a19e19df55
commit 33860c4ffe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/haxe/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }:
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, pcre2, neko, mbedtls_2, Security }:
let
ocamlDependencies = version:
@ -37,7 +37,8 @@ let
pname = "haxe";
inherit version;
buildInputs = [ zlib pcre neko ]
buildInputs = [ zlib neko ]
++ (if lib.versionAtLeast version "4.3" then [pcre2] else [pcre])
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
++ ocamlDependencies version;
@ -124,8 +125,8 @@ in {
version = "4.1.5";
sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0";
};
haxe_4_2 = generic {
version = "4.2.5";
sha256 = "sha256-Y0gx6uOQX4OZgg8nK4GJxRR1rKh0S2JUjZQFVQ4cfTs=";
haxe_4_3 = generic {
version = "4.3.3";
sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y=";
};
}

8
pkgs/development/ocaml-modules/luv/default.nix
View File

@ -6,12 +6,13 @@
buildDunePackage rec {
pname = "luv";
version = "0.5.11";
useDune2 = true;
version = "0.5.12";
minimalOCamlVersion = "4.03";
src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
sha256 = "sha256-zOz0cxGzhLi3Q36qyStNCz8JGXHtECQfZysMKiyKOkM=";
sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";
};
postConfigure = ''
@ -23,6 +24,7 @@ buildDunePackage rec {
nativeBuildInputs = [ file ];
propagatedBuildInputs = [ ctypes result ];
checkInputs = [ alcotest ];
# Alcotest depends on fmt that needs 4.08 or newer
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -16317,12 +16317,12 @@ with pkgs;
inherit (callPackage ../development/compilers/haxe {
inherit (darwin.apple_sdk.frameworks) Security;
})
haxe_4_2
haxe_4_3
haxe_4_1
haxe_4_0
;
haxe = haxe_4_2;
haxe = haxe_4_3;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;