From 67ebe5ad6dffeb4fc70f72276f21232c44dc5a18 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 16 May 2021 11:02:35 +0900 Subject: [PATCH] haskellPackages.scrypt: move platform override to hackage2nix configuration --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/configuration-nix.nix | 5 ----- pkgs/development/haskell-modules/hackage-packages.nix | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c6b375bd978..304824ad9d2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -326,6 +326,7 @@ unsupported-platforms: rtlsdr: [ x86_64-darwin ] rubberband: [ x86_64-darwin ] sbv: [ aarch64-linux ] + scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 sdl2-mixer: [ x86_64-darwin ] sdl2-ttf: [ x86_64-darwin ] synthesizer-alsa: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e32a5b360ee..c5d8b418b51 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -772,9 +772,4 @@ self: super: builtins.intersectAttrs super { export HOME=$TMPDIR/home ''; }); - - # https://github.com/informatikr/scrypt/issues/8 - scrypt = overrideCabal super.scrypt { - platforms = pkgs.lib.platforms.x86; - }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1ddc8e2d20e..90125b51ecb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -228476,6 +228476,7 @@ self: { ]; description = "Stronger password hashing via sequential memory-hard functions"; license = lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {}; "scrz" = callPackage