diff options
Diffstat (limited to 'stdlib/source/program/aedifex/dependency')
-rw-r--r-- | stdlib/source/program/aedifex/dependency/deployment.lux | 28 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 6 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/status.lux | 6 |
3 files changed, 15 insertions, 25 deletions
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 0fdf7956f..edfa3142b 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -6,9 +6,7 @@ [control ["." try (#+ Try)] [concurrency - ["." promise (#+ Promise)]] - [security - ["!" capability]]] + ["." promise (#+ Promise)]]] [data [binary (#+ Binary)] ["." product] @@ -19,17 +17,12 @@ [collection ["." dictionary] ["." set (#+ Set)] - ["." list ("#\." monoid)]] - [format - ["." xml]]] + ["." list ("#\." monoid)]]] [time - ["." instant (#+ Instant)]] - [world - [program (#+ Program)] - ["." file (#+ Path File Directory)]]] + ["." instant (#+ Instant)]]] ["." /// #_ - ["#" local] - ["#." hash (#+ Hash SHA-1 MD5)] + [repository (#+ Repository)] + ["#." hash (#+ Hash)] ["#." package (#+ Package)] ["#." artifact (#+ Artifact) ["#/." time] @@ -37,16 +30,14 @@ ["#/." extension (#+ Extension)] ["#/." versioning] ["#/." snapshot - ["#/." version (#+ Version) + ["#/." version ["#/." value]]]] - ["#." metadata + ["#." metadata #_ ["#/." artifact] ["#/." snapshot (#+ Metadata)]] ["#." dependency (#+ Dependency) [resolution (#+ Resolution)] - ["#/." status (#+ Status)]] - ["#." repository (#+ Repository) - ["#/." origin]]]) + ["#/." status (#+ Status)]]]) (def: (with_status repository version_template [artifact type] [data status]) (-> (Repository Promise) ///artifact.Version Dependency [Binary Status] (Promise (Try Any))) @@ -150,8 +141,7 @@ (def: #export (all repository resolution) (-> (Repository Promise) Resolution (Promise (Try (Set Artifact)))) - (do {! (try.with promise.monad)} - [] + (let [! (try.with promise.monad)] (|> (dictionary.entries resolution) (monad.map ! (function (_ [dependency package]) (..one repository dependency package))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 2d92e1438..138ee31bf 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -33,7 +33,9 @@ ["." i64]]] [world [net (#+ URL) - ["." uri]]]] + ["." uri] + ["." http #_ + ["#" client]]]]] ["." // (#+ Dependency) ["#." status (#+ Status)] ["/#" // #_ @@ -214,7 +216,7 @@ ///package.repositories (try\map set.to_list) (try.default (list)) - (list\map (|>> (///repository/remote.repository #.None) + (list\map (|>> (///repository/remote.repository http.default #.None) ///repository.async)) (list\compose repositories))] [successes failures resolution] (recur sub_repositories diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index 8c4db9ddd..f501ebc8b 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -27,12 +27,10 @@ ..any_equivalence ($_ sum.equivalence ///hash.equivalence - ///hash.equivalence - ) + ///hash.equivalence) ($_ product.equivalence ///hash.equivalence - ///hash.equivalence - ) + ///hash.equivalence) )) (def: #export (verified payload) |