public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50270 from hlolli/lumo-cljs2nix-import

Browse Source 
use newer clj2nix which passes pkgs as an argument to deps.nix
This commit is contained in:
Silvan Mosberger
2018-11-13 04:06:13 +01:00
committed by GitHub
parent 5b4044ab55 e6ed52e8a0
commit 287a1de4cb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/clojurescript/lumo/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, clojure, { stdenv, lib, fetchurl, clojure,
nodejs, jre, unzip, nodePackages, nodejs, jre, unzip, nodePackages,
python, openssl }: python, openssl, pkgs }:
let # packageJSON=./package.json; let # packageJSON=./package.json;
version = "1.9.0"; 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 {}; cljpaths = cljdeps.makePaths {};
classp = cljdeps.makeClasspaths { classp = cljdeps.makeClasspaths {
extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
pkgs/development/interpreters/clojurescript/lumo/deps.nix
Generated
+5 -3
View File
@@ -1,5 +1,7 @@
# generated by clj2nix # generated by clj2nix-1.0.3
let repos = [ { pkgs ? import <nixpkgs> {} }:
let repos = [
"https://repo.clojars.org/" "https://repo.clojars.org/"
"https://repo1.maven.org/" "https://repo1.maven.org/"
"http://central.maven.org/maven2/" "http://central.maven.org/maven2/"
@@ -7,7 +9,7 @@ let repos = [
"http://oss.sonatype.org/content/repositories/public/" "http://oss.sonatype.org/content/repositories/public/"
"http://repo.typesafe.com/typesafe/releases/" "http://repo.typesafe.com/typesafe/releases/"
]; ];
pkgs = import <nixpkgs> {};
in rec { in rec {
makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; 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;}); makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});