From c0f0e7f83d12d5ef595a934d53d763d9abd79b7e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 16 Jun 2023 22:27:10 +0200 Subject: [PATCH] undo whitespace change --- src/cljnix/core.clj | 88 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/cljnix/core.clj b/src/cljnix/core.clj index 8e1c0e7..7a1441b 100644 --- a/src/cljnix/core.clj +++ b/src/cljnix/core.clj @@ -338,52 +338,52 @@ :as opts}] (fs/with-temp-dir [cache-dir {:prefix "clj-cache"}] (transduce - (comp - ;; NOTE: the globbing below return $PREFIXdeps.edn paths, we need to filter still - (filter #(= "deps.edn" (fs/file-name %))) - (remove #(some (partial fs/ends-with? %) deps-ignore)) - (map fs/file) - (map (juxt identity #(-> % deps/slurp-deps :aliases keys - (->> (remove (set aliases-ignore)))))) - (mapcat aliases-combinations) - (map (fn [[deps-path aliases]] (get-deps! deps-path cache-dir aliases)))) - (completing - (fn [acc {:keys [mvn git]}] - (-> acc + (comp + ;; NOTE: the globbing below return $PREFIXdeps.edn paths, we need to filter still + (filter #(= "deps.edn" (fs/file-name %))) + (remove #(some (partial fs/ends-with? %) deps-ignore)) + (map fs/file) + (map (juxt identity #(-> % deps/slurp-deps :aliases keys + (->> (remove (set aliases-ignore)))))) + (mapcat aliases-combinations) + (map (fn [[deps-path aliases]] (get-deps! deps-path cache-dir aliases)))) + (completing + (fn [acc {:keys [mvn git]}] + (-> acc (update :mvn into mvn) (update :git into git))) - (fn [{:keys [mvn git]}] - (when lein? - (download-lein-deps cache-dir)) - (sorted-map-by - map-comparator - :lock-version LOCK-VERSION - :mvn-deps (->> (concat mvn (missing-mvn-deps mvn cache-dir)) - (sort-by :mvn-path) - (map add-to-nix-store!) - (map #(into (sorted-map-by map-comparator) - (select-keys % [:mvn-repo :mvn-path :hash :snapshot]))) - (distinct) - (into [])) - :git-deps (->> (concat git (missing-git-deps git cache-dir)) - (map #(update % :lib str)) - (sort-by :lib) - (map #(cond-> % - (nil? (:tag %)) - (dissoc :tag))) - (map add-to-nix-store!) - (map #(into (sorted-map-by map-comparator) - (select-keys % [:tag :lib :rev :url :git-dir :hash]))) - (distinct) - (reduce (fn [acc v] - (if (same-git-dep? (peek acc) v) - (conj (pop acc) (merge v (peek acc))) - (conj acc v))) - []))))) - - {:mvn extra-mvn - :git extra-git} - (fs/glob project-dir "**deps.edn"))))) + (fn [{:keys [mvn git]}] + (when lein? + (download-lein-deps cache-dir)) + (sorted-map-by + map-comparator + :lock-version LOCK-VERSION + :mvn-deps (->> (concat mvn (missing-mvn-deps mvn cache-dir)) + (sort-by :mvn-path) + (map add-to-nix-store!) + (map #(into (sorted-map-by map-comparator) + (select-keys % [:mvn-repo :mvn-path :hash :snapshot]))) + (distinct) + (into [])) + :git-deps (->> (concat git (missing-git-deps git cache-dir)) + (map #(update % :lib str)) + (sort-by :lib) + (map #(cond-> % + (nil? (:tag %)) + (dissoc :tag))) + (map add-to-nix-store!) + (map #(into (sorted-map-by map-comparator) + (select-keys % [:tag :lib :rev :url :git-dir :hash]))) + (distinct) + (reduce (fn [acc v] + (if (same-git-dep? (peek acc) v) + (conj (pop acc) (merge v (peek acc))) + (conj acc v))) + []))))) + + {:mvn extra-mvn + :git extra-git} + (fs/glob project-dir "**deps.edn"))))) (defn- check-main-class [& [_ value & more :as args]]