From 44a74d1b8f75f71cbe4320c9c34690a5e8565936 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Mon, 3 Jan 2022 16:00:02 +0100 Subject: [PATCH] hevm: unbreak on aarch64-linux (cherry picked from commit 1468f4479bee1b334515be92f5e5f7032c71ba08) This is from https://github.com/NixOS/nixpkgs/pull/153344. --- .../configuration-hackage2nix/main.yaml | 2 -- .../haskell-modules/hackage-packages.nix | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51cb1fc37f9a..b161109649a4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -459,7 +459,6 @@ unsupported-platforms: hbro: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hbro-contrib: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hcwiid: [ x86_64-darwin, aarch64-darwin ] - hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux HFuse: [ x86_64-darwin, aarch64-darwin ] hidapi: [ x86_64-darwin, aarch64-darwin ] hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ] @@ -514,7 +513,6 @@ unsupported-platforms: reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ] rtlsdr: [ x86_64-darwin, aarch64-darwin ] rubberband: [ x86_64-darwin, aarch64-darwin ] - sbv: [ aarch64-linux ] scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 sdl2-mixer: [ x86_64-darwin, aarch64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4af3e4f2dfbf..8d79fde29b06 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -131796,10 +131796,6 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -238841,10 +238837,6 @@ self: { testSystemDepends = [ z3 ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) z3;}; @@ -238879,10 +238871,6 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; }) {inherit (pkgs) z3;}; "sbv_8_17" = callPackage @@ -238916,10 +238904,6 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-darwin" "armv7l-linux" "i686-linux" "x86_64-darwin" - "x86_64-linux" - ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) z3;};