diff options
author | hlolli <hlolli@gmail.com> | 2018-11-12 20:28:14 +0100 |
---|---|---|
committer | hlolli <hlolli@gmail.com> | 2018-11-12 20:28:14 +0100 |
commit | e6ed52e8a0c463bf93a3b142291c807a3a499a44 (patch) | |
tree | 3225122e8e230c4e1bfa830f4068270135f728a7 /pkgs/development/interpreters/clojurescript | |
parent | a815f53c60b95716309bd711cbc9bf6de4050bcd (diff) | |
download | nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar.gz nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar.bz2 nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar.lz nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar.xz nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.tar.zst nixpkgs-e6ed52e8a0c463bf93a3b142291c807a3a499a44.zip |
lumo: use newer clj2nix which passes pkgs as an argument to deps.nix instead of import <pkgs>
Diffstat (limited to 'pkgs/development/interpreters/clojurescript')
-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 40276cf3c42..bc2d0e5be5a 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 b73c41b8f3d..8ce50b6e7b4 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;}); |