Merge pull request juxt#60 from mikepjb/master

use tools.deps.alpha map

deps.edn

@@ -1,5 +1,6 @@
 {:paths ["src"]
- :deps {org.clojure/tools.deps.alpha {:mvn/version "0.6.496"}
+ :deps {org.clojure/tools.deps.alpha {:mvn/version "0.7.541"}
+        org.slf4j/slf4j-nop {:mvn/version "1.6.2"}
         me.raynes/fs {:mvn/version "1.4.6"}
         co.paralleluniverse/capsule {:mvn/version "1.0.3"}
         org.clojure/tools.cli {:mvn/version "0.4.1"}

src/mach/pack/alpha/impl/tools_deps.clj

@@ -53,13 +53,6 @@
 
   (cli/parse-opts ["-A:foo:bar" "-R:bug" "-C:blah/baz" "-A:definitely"] cli-spec))
 
-(defn system-edn
-  []
-  (-> "mach/pack/alpha/system_deps.edn"
-      io/resource
-      slurp
-      edn/read-string))
-
 (defn config-edn
   []
   (let [config-env (System/getenv "CLJ_CONFIG")
@@ -91,7 +84,7 @@
 ;; opts is return of cli-opts, except ::deps-path
 (defn parse-deps-map
   [deps-map {::keys [resolve-aliases makecp-aliases extra]}]
-  (let [deps-map (tools.deps.reader/merge-deps [(system-edn) (config-edn) deps-map])
+  (let [deps-map (tools.deps.reader/merge-deps [(tools.deps.reader/install-deps) (config-edn) deps-map])
 
         resolve-args (tools.deps/combine-aliases deps-map resolve-aliases)
         cp-args (tools.deps/combine-aliases deps-map makecp-aliases)]

src/mach/pack/alpha/one_jar.clj

@@ -5,7 +5,6 @@
     [clojure.tools.cli :as cli]
     [mach.pack.alpha.impl.tools-deps :as tools-deps]
     [mach.pack.alpha.impl.elodin :as elodin]
-    [mach.pack.alpha.impl.util :refer [system-edn]]
     [mach.pack.alpha.impl.lib-map :as lib-map]
     [mach.pack.alpha.impl.vfs :as vfs]
     [me.raynes.fs :as fs])