diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index d941353f202..53d54a77a60 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -1,19 +1,10 @@ { pkgs }: #? import {} }: let - self = rec { - callPackage = pkgs.lib.callPackageWith (pkgs // self); - + hex = import ./hex-packages.nix { callPackage = self.callPackage; }; + callPackage = pkgs.lib.callPackageWith (pkgs // self // hex); buildErlang = callPackage ./build-erlang.nix {}; buildHex = callPackage ./build-hex.nix {}; - - rebar3-pc = callPackage ./hex/rebar3-pc.nix {}; - esqlite = callPackage ./hex/esqlite.nix {}; - goldrush = callPackage ./hex/goldrush.nix {}; - ibrowse = callPackage ./hex/ibrowse.nix {}; - jiffy = callPackage ./hex/jiffy.nix {}; - lager = callPackage ./hex/lager.nix {}; - meck = callPackage ./hex/meck.nix {}; }; -in self +in self // self.hex diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix new file mode 100644 index 00000000000..fe260f015aa --- /dev/null +++ b/pkgs/development/erlang-modules/hex-packages.nix @@ -0,0 +1,73 @@ +/* hex.nix is an auto-generated file -- DO NOT EDIT! */ +{ callPackage }: + +let + self = rec { + + esqlite = callPackage + ({ buildHex, rebar3-pc }: + buildHex { + name = "esqlite"; + version = "0.2.1"; + sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; + compilePort = true; + }) {}; + + ibrowse = callPackage + ({ buildHex, meck }: + buildHex { + name = "ibrowse"; + version = "4.2.2"; + sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q"; + erlangDeps = [ meck ]; + }) {}; + + meck = callPackage + ({ stdenv, buildHex }: + buildHex { + name = "meck"; + version = "0.8.3"; + sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak"; + + meta = { + description = "A mocking framework for Erlang"; + homepage = "https://github.com/eproxus/meck"; + license = stdenv.lib.licenses.apsl20; + }; + }) {}; + + goldrush = callPackage + ({ buildHex, fetchurl }: + buildHex { + name = "goldrush"; + version = "0.1.7"; + sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; + }) {}; + + jiffy = callPackage + ({ buildHex }: + buildHex { + name = "jiffy"; + version = "0.14.5"; + hexPkg = "barrel_jiffy"; + sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa"; + }) {}; + + lager = callPackage + ({ buildHex, goldrush }: + buildHex { + name = "lager"; + version = "3.0.2"; + sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; + erlangDeps = [ goldrush ]; + }) {}; + + rebar3-pc = callPackage + ({ buildHex, goldrush }: + buildHex { + name = "pc"; + version = "1.1.0"; + sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma"; + }) {}; + }; +in self diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix deleted file mode 100644 index 1fc3a2e91dc..00000000000 --- a/pkgs/development/erlang-modules/hex/esqlite.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex, rebar3-pc }: - -buildHex { - name = "esqlite"; - version = "0.2.1"; - sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; - compilePorts = true; -} diff --git a/pkgs/development/erlang-modules/hex/goldrush.nix b/pkgs/development/erlang-modules/hex/goldrush.nix deleted file mode 100644 index ddff7f6cc56..00000000000 --- a/pkgs/development/erlang-modules/hex/goldrush.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ buildHex, fetchurl }: - -buildHex { - name = "goldrush"; - version = "0.1.7"; - sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; -} diff --git a/pkgs/development/erlang-modules/hex/ibrowse.nix b/pkgs/development/erlang-modules/hex/ibrowse.nix deleted file mode 100644 index 6ed189eb39d..00000000000 --- a/pkgs/development/erlang-modules/hex/ibrowse.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex }: - -buildHex { - name = "ibrowse"; - version = "4.2.2"; - sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q"; -} - diff --git a/pkgs/development/erlang-modules/hex/jiffy.nix b/pkgs/development/erlang-modules/hex/jiffy.nix deleted file mode 100644 index b9f92c888a4..00000000000 --- a/pkgs/development/erlang-modules/hex/jiffy.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex }: - -buildHex { - name = "jiffy"; - version = "0.14.5"; - hexPkg = "barrel_jiffy"; - sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa"; -} diff --git a/pkgs/development/erlang-modules/hex/lager.nix b/pkgs/development/erlang-modules/hex/lager.nix deleted file mode 100644 index acfefd5757c..00000000000 --- a/pkgs/development/erlang-modules/hex/lager.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildHex, goldrush }: - -buildHex { - name = "lager"; - version = "3.0.2"; - sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; - erlangDeps = [ goldrush ]; -} diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix deleted file mode 100644 index 5af8a15a908..00000000000 --- a/pkgs/development/erlang-modules/hex/meck.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, buildHex }: - -buildHex { - name = "meck"; - version = "0.8.3"; - sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak"; - - meta = { - description = "A mocking framework for Erlang"; - homepage = "https://github.com/eproxus/meck"; - license = stdenv.lib.licenses.apsl20; - }; -} diff --git a/pkgs/development/erlang-modules/hex/rebar3-pc.nix b/pkgs/development/erlang-modules/hex/rebar3-pc.nix deleted file mode 100644 index 5bc45d3e3ab..00000000000 --- a/pkgs/development/erlang-modules/hex/rebar3-pc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ buildHex, goldrush }: - -buildHex { - name = "pc"; - version = "1.1.0"; - sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma"; -}