diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-07-01 23:42:49 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-07-01 23:43:17 +0200 |
| commit | b6db9b95533c363e81f7487b4d797a304aad2aa4 (patch) | |
| tree | 84a65d846cafd84ad61174d62e12093834610a30 /pkgs/applications/version-management | |
| parent | 50bc786ce6678a2bae2b6869dc3d052c8102bd65 (diff) | |
| download | nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar.gz nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar.bz2 nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar.lz nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar.xz nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.tar.zst nixpkgs-b6db9b95533c363e81f7487b4d797a304aad2aa4.zip | |
src: update from 0.13 to 0.19
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/src/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/applications/version-management/src/path.patch | 30 |
2 files changed, 4 insertions, 45 deletions
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 0e98791d823..f6fdff16204 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,24 +1,16 @@ { stdenv, fetchurl, python, rcs, git }: stdenv.mkDerivation rec { - name = "src-0.13"; + name = "src-0.19"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "03x0slgi6bnzgfn7f9qbl6jma0pj7357kwdh832l3v8zafk41p51"; + sha256 = "0p56g09ndbmnxxjz2rn7fq3yjx572ywj0xdim9rz5cqnx0pmr71x"; }; - buildInputs = [ python ]; + buildInputs = [ python rcs git ]; - patches = [ ./path.patch ]; - - postPatch = '' - sed -i \ - -e 's|@python@|${python}|' \ - -e 's|@rcs@|${rcs}|' \ - -e 's|@git@|${git}|' \ - src srctest - ''; + preConfigure = "patchShebangs ."; makeFlags = [ "prefix=$(out)" ]; @@ -26,11 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple single-file revision control"; - homepage = http://www.catb.org/~esr/src/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/src/path.patch b/pkgs/applications/version-management/src/path.patch deleted file mode 100644 index ef500c8e04e..00000000000 --- a/pkgs/applications/version-management/src/path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur src-0.13-orig/src src-0.13/src ---- src-0.13-orig/src 2014-11-24 03:56:16.000000000 -0500 -+++ src-0.13/src 2014-11-26 16:32:32.925151003 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!@python@/bin/python - # - # src - simple revision control. - # -@@ -51,6 +51,8 @@ - - import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib - -+os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH'] -+ - version="0.13" - - def rfc3339(t): -diff -Naur src-0.13-orig/srctest src-0.13/srctest ---- src-0.13-orig/srctest 2014-11-21 08:12:00.000000000 -0500 -+++ src-0.13/srctest 2014-11-26 16:33:13.627715388 -0500 -@@ -12,7 +12,7 @@ - - # Set the PATH to include the current directory, so the repository - # head version of src can always be tested. --PATH="$(pwd)":$PATH -+PATH="$(pwd)":@git@/bin:$PATH - - trap "rm -fr $SANDBOX" 0 1 2 15 - |