From 699a374e8a24edbd3296240f6da5d454e7fb3c21 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Thu, 7 Jul 2022 22:53:39 +0000 Subject: [PATCH] starlark: Patch tests to unbreak on aarch64 Pull in the patch from the submitted pull request to upstream to fix the unit test data that doesn't tolerate floating point approximation. - Unbreaks aarch64-linux - Fixes the build for aarch64-darwin --- pkgs/development/interpreters/starlark/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/starlark/default.nix b/pkgs/development/interpreters/starlark/default.nix index 10059b34dc2e..c61e511102d7 100644 --- a/pkgs/development/interpreters/starlark/default.nix +++ b/pkgs/development/interpreters/starlark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { pname = "starlark"; version = "unstable-2022-03-02"; @@ -12,10 +12,18 @@ buildGoModule rec { vendorSha256 = "sha256-lgL5o3MQfZekZ++BNESwV0LeoTxwEZfziQAe99zm4RY="; + patches = [ + # Fix floating point imprecision issue in the test suite. + # https://github.com/google/starlark-go/pull/409 + (fetchpatch { + url = "https://github.com/google/starlark-go/commit/be6ed3bfcc376e5bf6fe2257ae89ddfb00d14e2c.patch"; + sha256 = "sha256-A0tHPso6SfFn73kICcA9/5n3JHd7hMdQMGty+4L6T4k="; + }) + ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/google/starlark-go"; description = "An interpreter for Starlark, implemented in Go"; license = licenses.bsd3;