From d77bab14ab67d7f8474ea4c0d69f5cfc22ba3852 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 28 Dec 2018 01:14:11 +0000 Subject: [PATCH] tup: 0.7.5 -> 0.7.8 --- .../development/tools/build-managers/tup/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index fd27d927bd57..19256e39c33c 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, fuse, pkgconfig }: +{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: stdenv.mkDerivation rec { name = "tup-${version}"; - version = "0.7.5"; + version = "0.7.8"; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23"; + sha256 = "07dmz712zbs5kayf98kywp7blssgh0y2gc1623jbsynmqwi77mcb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; + buildInputs = [ fuse pcre ]; configurePhase = '' - sed -i 's/`git describe`/v${version}/g' Tupfile + sed -i 's/`git describe`/v${version}/g' src/tup/link.sh + sed -i 's/pcre-confg/pkg-config pcre/g' Tupfile Tuprules.tup ''; # Regular tup builds require fusermount to have suid, which nix cannot @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { # generate' instead buildPhase = '' ./build.sh + ./build/tup init ./build/tup generate script.sh ./script.sh '';