From 50dd4a6cb2c8003d995459db7c9e8d8eee59cc08 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 22:09:48 +0200 Subject: [PATCH] beam-modules: deprecate phases --- pkgs/development/beam-modules/fetch-hex.nix | 11 ++++++----- .../beam-modules/fetch-rebar-deps.nix | 16 +++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 7f84e2360704..35e5036076ff 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -1,21 +1,22 @@ { lib, stdenv, fetchurl }: -{ pkg, version, sha256 -, meta ? {} +{ pkg +, version +, sha256 +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "hex-source-${pkg}-${version}"; + pname = "hex-source-${pkg}"; + inherit version; src = fetchurl { url = "https://repo.hex.pm/tarballs/${pkg}-${version}.tar"; inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; - unpackCmd = '' tar -xf $curSrc contents.tar.gz mkdir contents diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index d858b3d81aff..0cf2c4c6cb0b 100644 --- a/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -1,27 +1,33 @@ { lib, stdenv, rebar3 }: -{ name, version, sha256, src -, meta ? {} +{ name +, version +, sha256 +, src +, meta ? { } }: with lib; stdenv.mkDerivation ({ - name = "rebar-deps-${name}-${version}"; + pname = "rebar-deps-${name}"; + inherit version; - phases = [ "downloadPhase" "installPhase" ]; + dontUnpack = true; - downloadPhase = '' + prePhases = '' cp ${src} . HOME='.' DEBUG=1 ${rebar3}/bin/rebar3 get-deps ''; installPhase = '' + runHook preInstall mkdir -p "$out/_checkouts" for i in ./_build/default/lib/* ; do echo "$i" cp -R "$i" "$out/_checkouts" done + runHook postInstall ''; outputHashAlgo = "sha256";