remove scrypt from urbit build (in urcrypt now)

This commit is contained in:
Paul Driver 2020-10-10 18:04:26 -07:00
parent 8b9a41cb31
commit 227f27d620
4 changed files with 4 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{
pkgs,
debug,
argon2, ed25519, ent, urcrypt, libaes_siv, h2o, murmur3, scrypt, secp256k1, softfloat3, uv, ivory-header, ca-header
argon2, ed25519, ent, urcrypt, libaes_siv, h2o, murmur3, secp256k1, softfloat3, uv, ivory-header, ca-header
}:
let
@ -26,7 +26,7 @@ let
[ curl gmp sigseg openssl zlib lmdb ];
vendor =
[ argon2 softfloat3 ed25519 ent urcrypt libaes_siv h2o scrypt uv murmur3 secp256k1 ivory-header ca-header ];
[ argon2 softfloat3 ed25519 ent urcrypt libaes_siv h2o uv murmur3 secp256k1 ivory-header ca-header ];
urbit = pkgs.stdenv.mkDerivation {
inherit name meta;

View File

@ -12,5 +12,5 @@ import ./default.nix {
inherit (tlon)
ent urcrypt libaes_siv;
inherit (deps)
argon2 ed25519 h2o murmur3 scrypt secp256k1 softfloat3 uv ivory-header ca-header;
argon2 ed25519 h2o murmur3 secp256k1 softfloat3 uv ivory-header ca-header;
}

2
pkg/urbit/configure vendored
View File

@ -7,7 +7,7 @@ URBIT_VERSION="0.10.8"
pkg_config_deps="liburcrypt"
extra_libs="\
urcrypt curl gmp sigsegv ent h2o scrypt uv murmur3 \
urcrypt curl gmp sigsegv ent h2o uv murmur3 \
softfloat3 ssl z lmdb pthread \
"

View File

@ -6,7 +6,6 @@
/* functions
*/
static u3_weak
_cqes_hs(u3_atom p, c3_w pwd_w,
u3_atom s, c3_w sal_w,