Merge pull request #2507 from lovek323/sup

sup: update to 0.18.0
This commit is contained in:
Michael Raskin 2014-06-09 11:25:48 +04:00
commit 2884f2c273
2 changed files with 34 additions and 18 deletions

View file

@ -1,32 +1,40 @@
{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which
, bundler, git }:
stdenv.mkDerivation rec {
version = "20140312";
version = "0.18.0";
name = "sup-${version}";
meta = {
homepage = http://supmua.org;
description = "A curses threads-with-tags style email client";
homepage = http://supmua.org;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.unix;
};
dontStrip = true;
src = fetchgit {
url = git://github.com/sup-heliotrope/sup.git;
rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d";
sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc";
src = fetchurl {
url = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz";
sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0";
};
buildInputs =
[ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
libiconvOrEmpty ];
[ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
libiconvOrEmpty git ];
buildPhase = "rake gem";
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildPhase = ''
# the builder uses git to get a listing of the files
git init >/dev/null
git add .
git commit -m "message" >/dev/null
gem build sup.gemspec
'';
installPhase = ''
export HOME=$TMP/home; mkdir -pv "$HOME"
@ -50,13 +58,13 @@ stdenv.mkDerivation rec {
# Don't install some dependencies -- we have already installed
# the dependencies but gem doesn't acknowledge this
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \
--ignore-dependencies
--bindir "$out/bin" --no-rdoc --no-ri sup-${version}.gem \
--ignore-dependencies >/dev/null
# specify ruby interpreter explicitly
sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir
cp bin/sup-sync-back-maildir "$out"/bin
cp bin/sup-sync-back-maildir "$out/bin"
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin"

View file

@ -9104,11 +9104,19 @@ let
inherit gettext highline iconv locale lockfile rmail_sup
text trollop unicode xapian_ruby which;
# See https://github.com/NixOS/nixpkgs/issues/1804 and
# https://github.com/NixOS/nixpkgs/issues/2146
bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler (
oldAttrs: {
dontPatchShebangs = 1;
}
);
chronic = chronic_0_9_1;
gpgme = ruby_gpgme;
mime_types = mime_types_1_25;
ncursesw_sup = ruby_ncursesw_sup;
rake = rake_10_1_0;
rake = rubyLibs.rake_10_1_0;
};
synfigstudio = callPackage ../applications/graphics/synfigstudio { };