From f450ee1472cc5e7b001f8020484d8a8da2002cb6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 3 May 2023 16:26:35 -0400 Subject: [PATCH] lunatic: 0.12.0 -> 0.13.2 Diff: https://github.com/lunatic-solutions/lunatic/compare/v0.12.0...v0.13.2 Changelog: https://github.com/lunatic-solutions/lunatic/blob/v0.13.2/CHANGELOG.md --- .../interpreters/lunatic/default.nix | 27 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index b056b7a133b4..637c7710975e 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.12.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7fxccufM5tunbutABEtsa6++OLTsS72oA219zvf+KN8="; + hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; }; - cargoSha256 = "sha256-sHSQUvHTwyqMrGmwpblqpS4HfFiWGb+70a1uloDu2wY="; + cargoHash = "sha256-ALjlQsxmZVREyi3ZGMJMv/38kkMjYh+hTSr/0avYJVs="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; checkFlags = [ # requires simd support which is not always available on hydra @@ -23,7 +38,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; - changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/RELEASES.md"; + changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b5e2329b05..df886478f7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9785,9 +9785,7 @@ with pkgs; lshw = callPackage ../tools/system/lshw { }; - lunatic = callPackage ../development/interpreters/lunatic { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lunatic = callPackage ../development/interpreters/lunatic { }; lux = callPackage ../tools/video/lux { };