ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 05:45:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove scrypt from urbit build (in urcrypt now)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/pkgs/urbit/default.nix
View File

@ -1,7 +1,7 @@
{ {
pkgs, pkgs,
debug, 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 let
@ -26,7 +26,7 @@ let
[ curl gmp sigseg openssl zlib lmdb ]; [ curl gmp sigseg openssl zlib lmdb ];
vendor = 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 { urbit = pkgs.stdenv.mkDerivation {
inherit name meta; inherit name meta;

2
nix/pkgs/urbit/shell.nix
View File

@ -12,5 +12,5 @@ import ./default.nix {
inherit (tlon) inherit (tlon)
ent urcrypt libaes_siv; ent urcrypt libaes_siv;
inherit (deps) 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" pkg_config_deps="liburcrypt"
extra_libs="\ extra_libs="\
urcrypt curl gmp sigsegv ent h2o scrypt uv murmur3 \ urcrypt curl gmp sigsegv ent h2o uv murmur3 \
softfloat3 ssl z lmdb pthread \ softfloat3 ssl z lmdb pthread \
" "

1
pkg/urbit/jets/e/scr.c
View File

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