From 685914c7e323721d6af561b73d069557979ec750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C5=8Dshin?= <git@wholezero.org>
Date: Wed, 2 Jan 2019 10:35:34 -0800
Subject: [PATCH] Sort deps

---
 .gitmodules | 42 +++++++++++++++++++++---------------------
 meson.build | 36 +++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 83769058b1..dd558f464c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
-[submodule "subprojects/softfloat3"]
-	path = subprojects/softfloat3
-	url = https://github.com/urbit/berkeley-softfloat-3.git
-[submodule "subprojects/ed25519"]
-	path = subprojects/ed25519
-	url = https://github.com/urbit/ed25519.git
-[submodule "subprojects/libscrypt"]
-	path = subprojects/libscrypt
-	url = https://github.com/urbit/libscrypt.git
-[submodule "subprojects/murmur3"]
-	path = subprojects/murmur3
-	url = https://github.com/urbit/murmur3.git
-[submodule "subprojects/libuv"]
-	path = subprojects/libuv
-	url = https://github.com/urbit/libuv.git
-[submodule "subprojects/h2o"]
-	path = subprojects/libh2o
-	url = https://github.com/urbit/h2o.git
 [submodule "subprojects/argon2"]
 	path = subprojects/argon2
 	url = https://github.com/urbit/argon2.git
-[submodule "subprojects/secp256k1"]
-	path = subprojects/secp256k1
-	url = https://github.com/urbit/secp256k1.git
+[submodule "subprojects/ed25519"]
+	path = subprojects/ed25519
+	url = https://github.com/urbit/ed25519.git
+[submodule "subprojects/h2o"]
+	path = subprojects/libh2o
+	url = https://github.com/urbit/h2o.git
+[submodule "subprojects/libuv"]
+	path = subprojects/libuv
+	url = https://github.com/urbit/libuv.git
+[submodule "subprojects/libscrypt"]
+	path = subprojects/libscrypt
+	url = https://github.com/urbit/libscrypt.git
 [submodule "subprojects/libsni"]
 	path = subprojects/libsni
 	url = https://github.com/urbit/sniproxy
+[submodule "subprojects/murmur3"]
+	path = subprojects/murmur3
+	url = https://github.com/urbit/murmur3.git
+[submodule "subprojects/secp256k1"]
+	path = subprojects/secp256k1
+	url = https://github.com/urbit/secp256k1.git
+[submodule "subprojects/softfloat3"]
+	path = subprojects/softfloat3
+	url = https://github.com/urbit/berkeley-softfloat-3.git
diff --git a/meson.build b/meson.build
index 69d4654c35..32a2861aeb 100644
--- a/meson.build
+++ b/meson.build
@@ -318,31 +318,29 @@ elif osdet != 'openbsd'
 endif
 
 # For these libs we provide fallback bundle
-urbitscrypt_dep = dependency('libscrypt', version: '>=0.1.21', fallback: ['libscrypt', 'libscrypt_dep'])
-
-ed25519_dep = dependency('ed25519', version: '>=0.1.0', fallback: ['ed25519', 'ed25519_dep'])
-murmur3_dep = dependency('murmur3', version: '>=0.1.0', fallback: ['murmur3', 'murmur3_dep'])
-softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfloat3', 'softfloat3_dep'])
-libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
-libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep'])
 argon2_dep = dependency('argon2', version: '>=1', fallback: ['argon2', 'argon2_dep'])
-secp256k1_dep = dependency('libsecp256k1', version: '>=0.1.0', fallback: ['secp256k1', 'secp256k1_dep'])
-
+ed25519_dep = dependency('ed25519', version: '>=0.1.0', fallback: ['ed25519', 'ed25519_dep'])
+libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep'])
+libscrypt_dep = dependency('libscrypt', version: '>=0.1.21', fallback: ['libscrypt', 'libscrypt_dep'])
 libsni_dep = dependency('libsni', version: '>=0.5.0', fallback: ['libsni', 'libsni_dep'])
+libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
+murmur3_dep = dependency('murmur3', version: '>=0.1.0', fallback: ['murmur3', 'murmur3_dep'])
+secp256k1_dep = dependency('libsecp256k1', version: '>=0.1.0', fallback: ['secp256k1', 'secp256k1_dep'])
+softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfloat3', 'softfloat3_dep'])
 
-deps = [openssl_dep,
+deps = [argon2_dep,
         curl_dep,
-        libuv_dep,
-        libh2o_dep,
-        secp256k1_dep,
-        gmp_dep,
-        sigsegv_dep,
-        urbitscrypt_dep,
         ed25519_dep,
+        gmp_dep,
+        libh2o_dep,
+        libscrypt_dep,
+        libsni_dep,
+        libuv_dep,
         murmur3_dep,
-        argon2_dep,
-        softfloat3_dep,
-        libsni_dep]
+        openssl_dep,
+        secp256k1_dep,
+        sigsegv_dep,
+        softfloat3_dep]
 
 executable('urbit',
 sources : sources,