From 52f8bec64b4fdf074fbe9ab8ffacd1cdff6a146d Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 10 Sep 2017 23:39:14 +0200
Subject: [PATCH] hex2nix: 0.0.5 -> 0.0.6
---
pkgs/development/beam-modules/default.nix | 1 +
.../tools/erlang/hex2nix/default.nix | 25 +++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index a57cbc4d508b..1d4cef685148 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -80,6 +80,7 @@ let
version = "0.8.2";
sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
};
+
# Non hex packages. Examples how to build Rebar/Mix packages with and
# without helper functions buildRebar3 and buildMix.
hex = callPackage ./hex {};
diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index 982bda41cde5..01d54c01bc78 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -1,19 +1,34 @@
-{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons, getopt }:
+{ stdenv, fetchFromGitHub, buildRebar3, buildHex
+, getopt_0_8_2, erlware_commons_1_0_0 }:
+
+let
+ ibrowse_4_4_0 = buildHex {
+ name = "ibrowse";
+ version = "4.4.0";
+ sha256 = "1hpic1xgksfm00mbl1kwmszca6jmjca32s7gdd8g11i0hy45k3ka";
+ };
+ jsx_2_8_2 = buildHex {
+ name = "jsx";
+ version = "2.8.2";
+ sha256 = "0k7lnmwqbgpmh90wy30kc0qlddkbh9r3sjlyayaqsz1r1cix7idl";
+ };
+
+in
buildRebar3 rec {
name = "hex2nix";
- version = "0.0.5";
+ version = "0.0.6";
src = fetchFromGitHub {
owner = "erlang-nix";
repo = "hex2nix";
rev = "${version}";
- sha256 = "07bk18nib4xms8q1i4sv53drvlyllm47map4c95669lsh0j08sax";
+ sha256 = "17rkzg836v7z2xf0i5m8zqfvr23dbmw1bi3c83km92f9glwa1dbf";
};
- beamDeps = [ ibrowse jsx erlware_commons getopt ];
+ beamDeps = [ ibrowse_4_4_0 jsx_2_8_2 erlware_commons_1_0_0 getopt_0_8_2 ];
- DEBUG=1;
+ enableDebugInfo = true;
installPhase = ''
runHook preInstall