From 7fbb9e8d04bedeb74c415a74ee6f79c577e67a18 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 23 Dec 2020 13:16:44 +0900 Subject: [PATCH 1/5] beam-modules: add fetch-mix-deps --- pkgs/development/beam-modules/default.nix | 1 + .../beam-modules/fetch-mix-deps.nix | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/beam-modules/fetch-mix-deps.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 4f312129b38..2392f778bc0 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -33,6 +33,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix new file mode 100644 index 00000000000..31f0821e81d --- /dev/null +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert }: + +{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: + +with stdenvNoCC.lib; + +stdenvNoCC.mkDerivation ({ + name = "mix-deps-${name}-${version}"; + + phases = [ "configurePhase" "downloadPhase" ]; + + nativeBuildInputs = [ elixir hex cacert ]; + + inherit src; + + MIX_ENV = mixEnv; + MIX_REBAR = "${rebar}/bin/rebar"; + MIX_REBAR3 = "${rebar3}/bin/rebar3"; + MIX_DEBUG = if debug then 1 else 0; + + configurePhase = '' + mkdir -p $out/deps + mkdir -p $out/.hex + export HEX_HOME="$out/.hex"; + export MIX_HOME="$TEMPDIR/.mix"; + export MIX_DEPS_PATH="$out/deps"; + ''; + + downloadPhase = '' + ln -s ${src}/mix.exs ./mix.exs + ln -s ${src}/mix.lock ./mix.lock + mix deps.get --only ${mixEnv} + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + inherit meta; +}) From 28b8e38666067bcfb8b4f62ed7c4531fb8c00563 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 31 Dec 2020 12:27:08 +0900 Subject: [PATCH 2/5] add git dependency --- pkgs/development/beam-modules/fetch-mix-deps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 31f0821e81d..efdaba4368c 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert }: +{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert, git }: { name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation ({ phases = [ "configurePhase" "downloadPhase" ]; - nativeBuildInputs = [ elixir hex cacert ]; + nativeBuildInputs = [ elixir hex cacert git ]; inherit src; From 10d464e887fbacf87ac7f82250ca35ca04e25368 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 3 Jan 2021 12:09:49 +0900 Subject: [PATCH 3/5] remove exporting of .hex --- pkgs/development/beam-modules/fetch-mix-deps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index efdaba4368c..513e5629183 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation ({ configurePhase = '' mkdir -p $out/deps mkdir -p $out/.hex - export HEX_HOME="$out/.hex"; + export HEX_HOME="$TEMPDIR/.hex"; export MIX_HOME="$TEMPDIR/.mix"; export MIX_DEPS_PATH="$out/deps"; ''; From 39c85b0bcfe1f807389225492d6efa72c58fa192 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 10 Jan 2021 17:46:10 +0900 Subject: [PATCH 4/5] use correct commands to set local rebar and rebar3 --- pkgs/development/beam-modules/fetch-mix-deps.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 513e5629183..5103e63dce5 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -14,16 +14,19 @@ stdenvNoCC.mkDerivation ({ inherit src; MIX_ENV = mixEnv; - MIX_REBAR = "${rebar}/bin/rebar"; - MIX_REBAR3 = "${rebar3}/bin/rebar3"; MIX_DEBUG = if debug then 1 else 0; + DEBUG = if debug then 1 else 0; # for rebar3 configurePhase = '' - mkdir -p $out/deps - mkdir -p $out/.hex export HEX_HOME="$TEMPDIR/.hex"; export MIX_HOME="$TEMPDIR/.mix"; - export MIX_DEPS_PATH="$out/deps"; + export MIX_DEPS_PATH="$out"; + + # Rebar + mix local.rebar rebar "${rebar}/bin/rebar" + mix local.rebar rebar3 "${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" + export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" ''; downloadPhase = '' From f38079ff95813ff20ca8b8077e187baa54e90240 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 1 Feb 2021 09:58:51 +0900 Subject: [PATCH 5/5] use lib only where required use standard phases --- pkgs/development/beam-modules/fetch-mix-deps.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index 5103e63dce5..020a82ad70b 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -1,14 +1,10 @@ -{ stdenvNoCC, elixir, hex, rebar, rebar3, cacert, git }: +{ stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: { name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: -with stdenvNoCC.lib; - stdenvNoCC.mkDerivation ({ name = "mix-deps-${name}-${version}"; - phases = [ "configurePhase" "downloadPhase" ]; - nativeBuildInputs = [ elixir hex cacert git ]; inherit src; @@ -29,9 +25,9 @@ stdenvNoCC.mkDerivation ({ export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" ''; - downloadPhase = '' - ln -s ${src}/mix.exs ./mix.exs - ln -s ${src}/mix.lock ./mix.lock + dontBuild = true; + + installPhase = '' mix deps.get --only ${mixEnv} ''; @@ -39,6 +35,6 @@ stdenvNoCC.mkDerivation ({ outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit meta; })