Merge branch 'master' into improved-make-overridable

6 files changed, 38 insertions, 15 deletions

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 78ab61f73a4..74079e82ea1 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -32,9 +32,9 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir_1_4;
+        elixir = elixir_1_5;
 
-        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
+        elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
@@ -49,7 +49,8 @@ let
                        debugInfo = true;
                      };
 
-        lfe = callPackage ../interpreters/lfe { };
+        lfe = lfe_1_2;
+        lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 
         # Non hex packages
         hex = callPackage ./hex {};
diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
index b77d5e6c589..d8d55c01120 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -1182,7 +1182,7 @@ let
                                 systems to query, augment and transform data
                                 according to Elixir matching rules. '';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/adap";
+              homepage = "https://github.com/awetzel/adap";
             };
           } // packageOverrides)
       ) {};
@@ -6660,7 +6660,7 @@ let
                                 requests and responds to preflight requests
                                 (OPTIONS)'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "http://github.com/mschae/cors_plug";
+              homepage = "https://github.com/mschae/cors_plug";
             };
           } // packageOverrides)
       ) {};
@@ -9498,7 +9498,7 @@ let
                                 H-metric are abstracted away - you provide them
                                 as functions.'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "http://github.com/herenowcoder/eastar";
+              homepage = "https://github.com/herenowcoder/eastar";
             };
           } // packageOverrides)
       ) {};
@@ -12266,7 +12266,7 @@ let
                                 response. This project is a rewrite for Elixir
                                 and Plug of basho webmachine.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/ewebmachine";
+              homepage = "https://github.com/awetzel/ewebmachine";
             };
           } // packageOverrides)
       ) {};
@@ -22613,7 +22613,7 @@ let
             meta = {
               description = ''JWT decoding library for Elixir'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/mschae/jwtex";
+              homepage = "https://github.com/mschae/jwtex";
             };
           } // packageOverrides)
       ) {};
@@ -30269,7 +30269,7 @@ let
                                 according to rfc7239 and fill `conn.remote_ip`
                                 with the root client ip.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/awetzel/plug_forwarded_peer";
+              homepage = "https://github.com/awetzel/plug_forwarded_peer";
             };
           } // packageOverrides)
       ) {};
@@ -30472,7 +30472,7 @@ let
             meta = {
               description = ''An elixir plug that serves HTTP range requests'';
               license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/TheSquad/plug_range";
+              homepage = "https://github.com/TheSquad/plug_range";
             };
           } // packageOverrides)
       ) {};
@@ -36106,7 +36106,7 @@ let
                                 use a rails-like trailing format:
                                 http://api.dev/resources.format'';
               license = stdenv.lib.licenses.asl20;
-              homepage = "http://github.com/mschae/trailing_format_plug";
+              homepage = "https://github.com/mschae/trailing_format_plug";
             };
           } // packageOverrides)
       ) {};
@@ -38938,7 +38938,7 @@ let
             meta = {
               description = ''stream zip archives while building them'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "http://github.com/dgvncsz0f/zipflow";
+              homepage = "https://github.com/dgvncsz0f/zipflow";
             };
           } // packageOverrides)
       ) {};
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index 69559a26c8f..4a1ec054361 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -46,7 +46,7 @@ let
     meta = {
       description = "Package manager for the Erlang VM https://hex.pm";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/hexpm/hex";
+      homepage = https://github.com/hexpm/hex;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index dd4ed5e1bbf..26d868a8e7c 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -56,4 +56,26 @@ rec {
         mkDerivation = pkgs.makeOverridable builder;
       };
 
+  /* Uses generic-builder to evaluate provided drv containing Elixir version
+  specific data.
+
+  drv: package containing version-specific args;
+  builder: generic builder for all Erlang versions;
+  args: arguments merged into version-specific args, used mostly to customize
+        dependencies;
+
+  Arguments passed to the generic-builder are overridable.
+
+  Please note that "mkDerivation" defined here is the one called from 1.2.nix
+  and similar files.
+  */
+  callLFE = drv: args:
+    let
+      inherit (stdenv.lib) versionAtLeast;
+      builder = callPackage ../interpreters/lfe/generic-builder.nix args;
+    in
+      callPackage drv {
+        mkDerivation = pkgs.makeOverridable builder;
+      };
+
 }
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index 6fc1587a38e..18abe1055b5 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -22,7 +22,7 @@ let
     meta = {
       description = "Erlang PostgreSQL Driver";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/semiocast/pgsql";
+      homepage = https://github.com/semiocast/pgsql;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index bf84ac286ba..61670d1f31c 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -28,7 +28,7 @@ let
     meta = {
       description = "WebDriver implementation in Erlang";
       license = stdenv.lib.licenses.mit;
-      homepage = "https://github.com/Quviq/webdrv";
+      homepage = https://github.com/Quviq/webdrv;
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };