From 440608bc32916329c9f3c0f2bd9a8d1152ed5da8 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 14 Oct 2020 21:48:00 -0400 Subject: Gave the Location type its own module. --- stdlib/source/program/aedifex/dependency.lux | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'stdlib/source/program/aedifex/dependency.lux') diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 3128bb3f3..52a1f00c5 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -29,10 +29,10 @@ [net (#+ URL) ["." uri]]]] ["." // #_ - ["#." extension] ["#." hash] ["#." artifact (#+ Artifact) - ["#/." type]]]) + ["#/." type] + ["#/." extension]]]) (type: #export Repository URL) @@ -219,10 +219,10 @@ (let [[artifact type] dependency prefix (format repository uri.separator (//artifact.path artifact))] (do (try.with io.monad) - [library (..download (format prefix "." type)) - sha1 (..verified-hash dependency library (format prefix //extension.sha1) //hash.sha1 ..sha1 ..sha1-does-not-match) - md5 (..verified-hash dependency library (format prefix //extension.md5) //hash.md5 ..md5 ..md5-does-not-match) - pom (..download (format prefix //extension.pom))] + [library (..download (format prefix (//artifact/extension.extension type))) + sha1 (..verified-hash dependency library (format prefix //artifact/extension.sha1) //hash.sha1 ..sha1 ..sha1-does-not-match) + md5 (..verified-hash dependency library (format prefix //artifact/extension.md5) //hash.md5 ..md5 ..md5-does-not-match) + pom (..download (format prefix //artifact/extension.pom))] (:: io.monad wrap (do try.monad [pom (encoding.from-utf8 pom) -- cgit v1.2.3