build: remove obsolete (urcrypt-vendored) dependencies

default.nix

@@ -85,20 +85,12 @@ let
   # Local vendored packages defined in ./pkg.
   # For non-vendored nixpkgs specific package overrides, see ./nix/overlays.
   pkgsLocal = {
-    argon2u = callPackage ./nix/pkgs/argon2u { };
-
     ca-bundle = callPackage ./nix/pkgs/ca-bundle { };
 
-    ed25519 = callPackage ./nix/pkgs/ed25519 { };
-
     ent = callPackage ./nix/pkgs/ent { };
 
-    ge-additions = callPackage ./nix/pkgs/ge-additions { };
-
     libaes_siv = callPackage ./nix/pkgs/libaes_siv { inherit (pkgsNative) cmake; };
 
-    libscrypt = callPackage ./nix/pkgs/libscrypt { };
-
     murmur3 = callPackage ./nix/pkgs/murmur3 { };
 
     softfloat3 = callPackage ./nix/pkgs/softfloat3 { };

nix/pkgs/argon2u/default.nix

@@ -1,30 +0,0 @@
-{ stdenv, sources, enableParallelBuilding ? true }:
-
-stdenv.mkDerivation {
-  pname = "argon2u";
-  version = sources.argon2u.rev;
-  src = sources.argon2u;
-
-  postPatch = ''
-    substituteInPlace Makefile --replace 'ar rcs' '$(AR) rcs'
-  '';
-
-  buildPhase = ''
-    make libargon2.a
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{lib,include}
-    cp libargon2.a $out/lib/
-    cp include/argon2.h $out/include/
-    cp ./src/blake2/*.h $out/include/
-  '';
-
-  makeFlags = [
-    "AR=${stdenv.cc.targetPrefix}ar" # Fix cross-compilation
-  ];
-
-  NO_THREADS = true;
-
-  inherit enableParallelBuilding;
-}

nix/pkgs/ed25519/default.nix

@@ -1,21 +0,0 @@
-{ stdenv, sources }:
-
-stdenv.mkDerivation {
-  pname = "ed25519";
-  version = sources.ed25519.rev;
-  src = sources.ed25519;
-
-  buildPhase = ''
-    CFLAGS="-O3 -Wall -I$src/src"
-
-    for f in $(find src -type f -name '*.c'); do
-      $CC $CFLAGS -c $f -o "''${f//\//_}.o"
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{lib,include}
-    $AR rcs $out/lib/libed25519.a *.o
-    cp $src/src/*.h $out/include/
-  '';
-}

nix/pkgs/libscrypt/default.nix

@@ -1,35 +0,0 @@
-{ stdenv, sources }:
-
-stdenv.mkDerivation {
-  pname = "libscrypt";
-  version = sources.libscrypt.rev;
-  src = sources.libscrypt;
-
-  buildPhase = ''
-    sources=" \
-      crypto_scrypt-check \
-      crypto_scrypt-hash \
-      crypto_scrypt-hexconvert \
-      crypto_scrypt-nosse \
-      crypto-mcf \
-      crypto-scrypt-saltgen \
-      slowequals \
-      sha256 \
-      b64 \
-    "
-
-    CFLAGS="-I$src -Wall -ffast-math -O3 -D_FORTIFY_SOURCE=2 -fstack-protector"
-
-    for s in $sources; do 
-       $CC $CFLAGS -c $src/$s.c -o $s.o
-    done
-
-    $AR rcs libscrypt.a *.o
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{lib,include}
-    cp libscrypt.a $out/lib
-    cp $src/*.h $out/include/
-  '';
-}

nix/sources-pmnsh.json

@@ -55,10 +55,5 @@
         "pmnsh": {
             "prepare": "./configure"
         }
-    },
-    "ge-additions": {
-        "pmnsh": {
-            "make": "CFLAGS=-I../ed25519"
-        }
     }
 }

nix/sources.json

@@ -1,36 +1,4 @@
 {
-    "argon2u": {
-        "branch": "master",
-        "description": "With argon2u. Based off https://github.com/P-H-C/phc-winner-argon2",
-        "homepage": "",
-        "pmnsh": {
-            "include": ["include", "src/blake2"],
-            "make": "libargon2.a"
-        },
-        "owner": "urbit",
-        "repo": "argon2",
-        "rev": "a4c1e3f7138c2e577376beb99f964cf71e1c8b1b",
-        "sha256": "1j8a15fx2kn5aa3scmb5qnsfk627kfvsq5ppz9j0pv2d1xck527x",
-        "type": "tarball",
-        "url": "https://github.com/urbit/argon2/archive/a4c1e3f7138c2e577376beb99f964cf71e1c8b1b.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "ed25519": {
-        "branch": "master",
-        "description": "Submodule included by Urbit",
-        "homepage": null,
-        "pmnsh": {
-            "strip": 1,
-            "make": "all"
-        },
-        "owner": "urbit",
-        "repo": "ed25519",
-        "rev": "76385f2ebbbc9580a9c236952d68d11d73a6135c",
-        "sha256": "0s1spif4s9lgcwcny3fl2fvpbw6acqn3s8r6qxnrmkd9icgyw4cp",
-        "type": "tarball",
-        "url": "https://github.com/urbit/ed25519/archive/76385f2ebbbc9580a9c236952d68d11d73a6135c.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "h2o": {
         "branch": "master",
         "description": "H2O - the optimized HTTP/1, HTTP/2, HTTP/3 server",
@@ -101,21 +69,6 @@
         "url": "https://github.com/dfoxfranke/libaes_siv/archive/9681279cfaa6e6399bb7ca3afbbc27fc2e19df4b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "libscrypt": {
-        "branch": "master",
-        "description": null,
-        "homepage": null,
-        "pmnsh": {
-            "make": "libscrypt.a CFLAGS_EXTRA=-ffast-math"
-        },
-        "owner": "urbit",
-        "repo": "libscrypt",
-        "rev": "029693ff1cbe4f69d3a2da87d0f4f034f92cc0c2",
-        "sha256": "17pcxypzjmmrvacw45cacvibm6mlr9ip30hy30l1appsnywx679n",
-        "type": "tarball",
-        "url": "https://github.com/urbit/libscrypt/archive/029693ff1cbe4f69d3a2da87d0f4f034f92cc0c2.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "murmur3": {
         "branch": "master",
         "description": null,

pkg/ge-additions/shell.nix

@@ -1,8 +0,0 @@
-let
-
-  pkgs = import ../../default.nix { };
-
-in pkgs.shellFor {
-  name = "ge-additions";
-  packages = ps: [ ps.ge-additions ];
-}

pkg/urbit/compat/m1brew/ed25519.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,8 @@
-+.PHONY: all clean
-+
-+all: *.c *.h
-+	$(CC) -c -O3 -Wall -Werror *.c
-+	$(AR) rcs libed25519.a *.o
-+
-+clean:
-+	rm -f *.o *.a

pkg/urbit/compat/m1brew/libscrypt.patch

@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 783c537..3156ee2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,10 +12,9 @@ LDFLAGS_EXTRA?=-Wl,-z,relro
- 
- all: reference
- 
--OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
-+OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o slowequals.o
- 
--libscrypt.so.0: $(OBJS) 
--	$(CC) $(LDFLAGS) -shared -o libscrypt.so.0  $(OBJS) -lm -lc
-+libscrypt.a: $(OBJS) 
- 	ar rcs libscrypt.a  $(OBJS)
- 
- reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o

pkg/urbit/compat/mingw/ed25519.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,8 @@
-+.PHONY: all clean
-+
-+all: *.c *.h
-+	$(CC) -c -O3 -Wall -Werror *.c
-+	$(AR) rcs libed25519.a *.o
-+
-+clean:
-+	rm -f *.o *.a

pkg/urbit/compat/mingw/libscrypt.patch

@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 783c537..3156ee2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,10 +12,9 @@ LDFLAGS_EXTRA?=-Wl,-z,relro
- 
- all: reference
- 
--OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
-+OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o slowequals.o
- 
--libscrypt.so.0: $(OBJS) 
--	$(CC) $(LDFLAGS) -shared -o libscrypt.so.0  $(OBJS) -lm -lc
-+libscrypt.a: $(OBJS) 
- 	ar rcs libscrypt.a  $(OBJS)
- 
- reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o

shell.nix

@@ -23,7 +23,7 @@ let
   # 
   # Typically the inputs listed here also have a shell.nix in their respective
   # source directory you can use, to avoid the Haskell/GHC dependencies.
-  inputsFrom = with pkgsLocal; [ ent ge-additions herb libaes_siv urbit ];
+  inputsFrom = with pkgsLocal; [ ent herb urbit ];
 
   # Collect the named attribute from all dependencies listed in inputsFrom.
   mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom);