Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b4044ab55a5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 287a1de4cbbf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 12, 2018

  1. lumo: use newer clj2nix which passes pkgs as an argument to deps.nix … 

    …instead of import <pkgs>
    @hlolli
    hlolli committed Nov 12, 2018
    Copy the full SHA
    e6ed52e View commit details

Commits on Nov 13, 2018

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

    use newer clj2nix which passes pkgs as an argument to deps.nix
    @infinisil
    infinisil authored Nov 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    287a1de View commit details
Showing with 7 additions and 5 deletions.
  1. +2 −2 pkgs/development/interpreters/clojurescript/lumo/default.nix
  2. +5 −3 pkgs/development/interpreters/clojurescript/lumo/deps.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/clojurescript/lumo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"];
8 changes: 5 additions & 3 deletions pkgs/development/interpreters/clojurescript/lumo/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.