From 6f7bace3b8d1b93ff0b58236dedd2fbdb309e23b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 2 Jul 2016 19:06:48 +0300 Subject: [PATCH] ejabberd: attempt to fix dependencies' determinism --- pkgs/servers/xmpp/ejabberd/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 3dcd92cde8e3..b830567e3036 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -54,17 +54,15 @@ in stdenv.mkDerivation rec { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - preBuild = '' - patchShebangs . - ''; - makeFlags = [ "deps" ]; + phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; + installPhase = '' for i in deps/*; do ( cd $i git reset --hard - git clean -fdx + git clean -ffdx git describe --always --tags > .rev rm -rf .git ) @@ -76,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0jrxd3v6p35wjrpw0jbb6m8nrm2lffhfgdcqmzcvsvjzji7nlkzx"; + outputHash = "08s1j0xa65xkrqw810wzgssngs67sz722jsvj7p02v4ra8jcl31f"; }; configureFlags =