diff options
| author | Eric Merritt <eric@merritt.tech> | 2016-03-30 10:17:59 -0700 |
|---|---|---|
| committer | Eric Merritt <eric@merritt.tech> | 2016-04-23 19:03:28 -0700 |
| commit | be5da0449e4d9ce9bb68b7a3eaf099155accf64b (patch) | |
| tree | 3db03cc9373d0c80d517a941b8c8c565b56fece9 /pkgs/development | |
| parent | 8dbcb4e35ecc2513dab1ed8cb6052f68ab0a6537 (diff) | |
| download | nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar.gz nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar.bz2 nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar.lz nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar.xz nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.tar.zst nixlib-be5da0449e4d9ce9bb68b7a3eaf099155accf64b.zip | |
beam-support: update registry to latest '59b836d'
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/beam-modules/build-mix.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/erlang/cuter/default.nix | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 12efc00b0509..70c186df8a06 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -8,7 +8,6 @@ , beamDeps ? [] , postPatch ? "" , compilePorts ? false -, installPhase ? null , meta ? {} , ... }@attrs: diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 03bab8c4aa95..fec600400cb2 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -12,6 +12,5 @@ let ## Non hex packages hex = callPackage ./hex {}; webdriver = callPackage ./webdriver {}; - elli = callPackage ./elli {}; }; in self // self.hexPackages diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index 378fb382f952..3c2690c01036 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "hex-registry"; - rev = "329ae2b"; + rev = "59b836d"; version = "0.0.0+build.${rev}"; src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex-pm-registry-snapshots"; inherit rev; - sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh"; + sha256 = "1l8m6ckn5ivhfiv3k4dymi6b7wg511fwymnpxd6ymfd39dq0n5b0"; }; installPhase = '' diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index a8806127d356..7d05a56bfdf8 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ {stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang, - erlangPackages, z3, python27 }: + beamPackages, z3, python27 }: stdenv.mkDerivation rec { name = "cuter"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { }; setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; - buildInputs = with erlangPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' |