Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f979b589c780
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be459ef9ff5b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2020

  1. tup: 0.7.9 -> 0.7.10

    @ehmry
    ehmry committed Nov 6, 2020
    Copy the full SHA
    be459ef View commit details
Showing with 7 additions and 9 deletions.
  1. +7 −9 pkgs/development/tools/build-managers/tup/default.nix
16 changes: 7 additions & 9 deletions pkgs/development/tools/build-managers/tup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }:

stdenv.mkDerivation rec {
pname = "tup";
version = "0.7.9";
version = "0.7.10";
outputs = [ "bin" "man" "out" ];

src = fetchFromGitHub {
owner = "gittup";
repo = "tup";
rev = "v${version}";
sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f";
sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse pcre ];
buildInputs = [ fuse3 pcre ];

configurePhase = ''
sed -i 's/`git describe`/v${version}/g' src/tup/link.sh
@@ -30,11 +31,8 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
mkdir -p $out/bin
cp tup $out/bin/
mkdir -p $out/share/man/man1
cp tup.1 $out/share/man/man1/
install -D tup -t $bin/bin/
install -D tup.1 -t $man/share/man/man1/
'';

setupHook = ./setup-hook.sh;