diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-11-13 04:06:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 04:06:13 +0100 |
commit | 287a1de4cbbf54fd82e980b1644537b68964a17c (patch) | |
tree | ecfc9d2d9ae661e13d40f4ea9f24a3ed19b4869d /pkgs | |
parent | 5b4044ab55a544c5e690e174619aae07c1ef06f2 (diff) | |
parent | e6ed52e8a0c463bf93a3b142291c807a3a499a44 (diff) |
Merge pull request #50270 from hlolli/lumo-cljs2nix-import
use newer clj2nix which passes pkgs as an argument to deps.nix
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/interpreters/clojurescript/lumo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/clojurescript/lumo/deps.nix | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 40276cf3c42b8..bc2d0e5be5a8c 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, clojure, nodejs, jre, unzip, nodePackages, - python, openssl }: + python, openssl, pkgs }: let # packageJSON=./package.json; version = "1.9.0"; @@ -118,7 +118,7 @@ let # packageJSON=./package.json; ''; - cljdeps = import ./deps.nix; + cljdeps = import ./deps.nix { inherit pkgs; }; cljpaths = cljdeps.makePaths {}; classp = cljdeps.makeClasspaths { extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix index b73c41b8f3d79..8ce50b6e7b4b1 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix @@ -1,5 +1,7 @@ -# generated by clj2nix -let repos = [ +# generated by clj2nix-1.0.3 +{ pkgs ? import <nixpkgs> {} }: + + let repos = [ "https://repo.clojars.org/" "https://repo1.maven.org/" "http://central.maven.org/maven2/" @@ -7,7 +9,7 @@ let repos = [ "http://oss.sonatype.org/content/repositories/public/" "http://repo.typesafe.com/typesafe/releases/" ]; - pkgs = import <nixpkgs> {}; + in rec { makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); |