From fee7e73538a25cac95e705c605f438df7e7eb71d Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Mon, 20 Mar 2017 00:23:06 -0400 Subject: [PATCH 1/3] Adding self as maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d6cb2722b33c3..514e62bb916b1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -82,6 +82,7 @@ bzizou = "Bruno Bzeznik "; c0dehero = "CodeHero "; calrama = "Moritz Maxeiner "; + calvertvl = "Victor Calvert "; campadrenalin = "Philip Horger "; canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; From bae9315a33e825cfb0a625fcdf91bec8df2ccad8 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Mon, 20 Mar 2017 00:25:50 -0400 Subject: [PATCH 2/3] src: 1.11 -> 1.12 --- pkgs/applications/version-management/src/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 2bff15adc69d9..d2bb688737208 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, python, rcs, git }: stdenv.mkDerivation rec { - name = "src-1.11"; + name = "src-${version}"; + version = "1.12"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "07kj0ri0s0vn8s54yvkyzaag332spxs0379r718b80y31c4mgbyl"; + sha256 = "1m6rjbizx9win3jkciyx176sfy98r5arb1g3l6aqnqam9gpr44zm"; }; buildInputs = [ python rcs git ]; @@ -16,10 +17,11 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Simple single-file revision control"; homepage = http://www.catb.org/~esr/src/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ calvertvl ]; }; } From 6e587c29dc78bb7944a685cfafbe4b6663a3cf97 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Mon, 20 Mar 2017 00:27:49 -0400 Subject: [PATCH 3/3] src: wrap to properly resolve rcs at runtime --- pkgs/applications/version-management/src/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index d2bb688737208..2fd45ec7fc02e 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, rcs, git }: +{ stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { name = "src-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1m6rjbizx9win3jkciyx176sfy98r5arb1g3l6aqnqam9gpr44zm"; }; - buildInputs = [ python rcs git ]; + buildInputs = [ python rcs git makeWrapper ]; preConfigure = '' patchShebangs . @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/src \ + --suffix PATH ":" "${rcs}/bin" + ''; + meta = with stdenv.lib; { description = "Simple single-file revision control"; homepage = http://www.catb.org/~esr/src/;