diff options
| author | Scott Stevenson <scott@stevenson.io> | 2016-07-11 17:11:31 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-11 18:11:31 +0200 |
| commit | 8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce (patch) | |
| tree | e53895c1ae3e2d2e9e06445e9d1876721238ba70 /pkgs/tools/misc/rcm | |
| parent | 8f98fcd73b61acfe60c1fed5825edc6c2c7153be (diff) | |
| download | nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar.gz nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar.bz2 nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar.lz nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar.xz nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.tar.zst nixpkgs-8c81c234d3a3fa9aa38d8ae1c427c66a083c3bce.zip | |
rcm: 1.2.3 -> 1.3.0 (#16847)
Diffstat (limited to 'pkgs/tools/misc/rcm')
| -rw-r--r-- | pkgs/tools/misc/rcm/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/rcm/fix-rcmlib-path.patch | 116 |
2 files changed, 51 insertions, 71 deletions
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 59eccbb1ab6..efc42ee73ec 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "rcm-1.2.3"; + name = "rcm-1.3.0"; src = fetchurl { - url = https://thoughtbot.github.io/rcm/dist/rcm-1.2.3.tar.gz; - sha256 = "0gwpclbc152jkclj3w83s2snx3dcgljwr75q1z8czl3yar7d8bsh"; + url = https://thoughtbot.github.io/rcm/dist/rcm-1.3.0.tar.gz; + sha256 = "ddcf638b367b0361d8e063c29fd573dbe1712d1b83e8d5b3a868e4aa45ffc847"; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch b/pkgs/tools/misc/rcm/fix-rcmlib-path.patch index 45bd32a2d2b..e7d600d2a1f 100644 --- a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch +++ b/pkgs/tools/misc/rcm/fix-rcmlib-path.patch @@ -1,68 +1,48 @@ -*** rcm-1.2.3/bin/lsrc.in.orig 2014-05-09 04:57:39.000000000 -0700 ---- rcm-1.2.3/bin/lsrc.in 2015-01-24 14:27:48.786595479 -0800 -*************** -*** 1,6 **** - #!@SHELL@ - -! : ${RCM_LIB:=$(dirname "$0")/../share/rcm} - . "$RCM_LIB/rcm.sh" - - pushdir() { ---- 1,6 ---- - #!@SHELL@ - -! RCM_LIB=@rcm@/share/rcm - . "$RCM_LIB/rcm.sh" - - pushdir() { -*** rcm-1.2.3/bin/mkrc.in.orig 2014-05-09 04:57:39.000000000 -0700 ---- rcm-1.2.3/bin/mkrc.in 2015-01-24 14:27:48.786595479 -0800 -*************** -*** 1,6 **** - #!@SHELL@ - -! : ${RCM_LIB:=$(dirname "$0")/../share/rcm} - . "$RCM_LIB/rcm.sh" - - destination() { ---- 1,6 ---- - #!@SHELL@ - -! RCM_LIB=@rcm@/share/rcm - . "$RCM_LIB/rcm.sh" - - destination() { -*** rcm-1.2.3/bin/rcdn.in.orig 2014-05-09 04:57:39.000000000 -0700 ---- rcm-1.2.3/bin/rcdn.in 2015-01-24 14:27:48.786595479 -0800 -*************** -*** 1,6 **** - #!@SHELL@ - -! : ${RCM_LIB:=$(dirname "$0")/../share/rcm} - . "$RCM_LIB/rcm.sh" - - remove_link() { ---- 1,6 ---- - #!@SHELL@ - -! RCM_LIB=@rcm@/share/rcm - . "$RCM_LIB/rcm.sh" - - remove_link() { -*** rcm-1.2.3/bin/rcup.in.orig 2014-05-09 04:57:39.000000000 -0700 ---- rcm-1.2.3/bin/rcup.in 2015-01-24 14:27:48.786595479 -0800 -*************** -*** 1,6 **** - #!@SHELL@ - -! : ${RCM_LIB:=$(dirname "$0")/../share/rcm} - . "$RCM_LIB/rcm.sh" - - link_or_copy() { ---- 1,6 ---- - #!@SHELL@ - -! RCM_LIB=@rcm@/share/rcm - . "$RCM_LIB/rcm.sh" - - link_or_copy() { +diff --git a/bin/lsrc.in b/bin/lsrc.in +index fcf5fbe..119d659 100755 +--- a/bin/lsrc.in ++++ b/bin/lsrc.in +@@ -1,6 +1,6 @@ + #!@SHELL@ + +-: ${RCM_LIB:=$(dirname "$0")/../share/rcm} ++RCM_LIB=@rcm@/share/rcm + . "$RCM_LIB/rcm.sh" + + pushdir() { +diff --git a/bin/mkrc.in b/bin/mkrc.in +index da22a63..a6bb0ad 100755 +--- a/bin/mkrc.in ++++ b/bin/mkrc.in +@@ -1,6 +1,6 @@ + #!@SHELL@ + +-: ${RCM_LIB:=$(dirname "$0")/../share/rcm} ++RCM_LIB=@rcm@/share/rcm + . "$RCM_LIB/rcm.sh" + + destination() { +diff --git a/bin/rcdn.in b/bin/rcdn.in +index ae7aad8..c210599 100755 +--- a/bin/rcdn.in ++++ b/bin/rcdn.in +@@ -1,6 +1,6 @@ + #!@SHELL@ + +-: ${RCM_LIB:=$(dirname "$0")/../share/rcm} ++RCM_LIB=@rcm@/share/rcm + . "$RCM_LIB/rcm.sh" + + remove_link() { +diff --git a/bin/rcup.in b/bin/rcup.in +index bdae664..2076f53 100755 +--- a/bin/rcup.in ++++ b/bin/rcup.in +@@ -1,6 +1,6 @@ + #!@SHELL@ + +-: ${RCM_LIB:=$(dirname "$0")/../share/rcm} ++RCM_LIB=@rcm@/share/rcm + . "$RCM_LIB/rcm.sh" + + print_ln_v() { |