From cf2b5daa15bfe63e3b84af2f0135eadbe24bac4a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 20 Jun 2013 10:09:15 +1000 Subject: [PATCH] sup: update to latest version --- .../networking/mailreaders/sup/default.nix | 15 ++++++++------- pkgs/development/interpreters/ruby/generated.nix | 11 +++++++++++ pkgs/development/interpreters/ruby/patches.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index d71b0ed1e95..05833537026 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup -, xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic -, trollop, lockfile, gettext, iconv, locale, text }: +, xapian_ruby, gpgme, libiconvOrEmpty, rmail, mime_types, chronic, trollop +, lockfile, gettext, iconv, locale, text, highline }: stdenv.mkDerivation { - name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; + name = "sup-896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd"; meta = { homepage = http://supmua.org; @@ -16,12 +16,12 @@ stdenv.mkDerivation { dontStrip = true; src = fetchurl { - url = "https://github.com/sup-heliotrope/sup/archive/d21f027afcd6a4031de9619acd8dacbd2f2f4fd4.tar.gz"; - sha256 = "0syifva6pqrg3nyy7xx7nan9zswb4ls6bkk96vi9ki2ly1ymwcdp"; + url = "https://github.com/sup-heliotrope/sup/archive/896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd.tar.gz"; + sha256 = "0sknf4ha13m2478fa27qnm43bcn59g6qbd8f2nmv64k2zs7xnwmk"; }; buildInputs = - [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_full_alaveteli + [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby libiconvOrEmpty ]; buildPhase = "rake gem"; @@ -43,7 +43,8 @@ stdenv.mkDerivation { GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${xapian_ruby}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}" # Don't install some dependencies -- we have already installed # the dependencies but gem doesn't acknowledge this diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index aa31bb34423..2e899128252 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -105,6 +105,7 @@ g: # Get dependencies from patched gems uuidtools = g.uuidtools_2_1_3; websocket = g.websocket_1_0_7; xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5; + xapian_ruby = g.xapian_ruby_1_2_15_1; xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; @@ -1570,6 +1571,16 @@ specify.''; requiredGems = [ ]; sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm''; }; + xapian_ruby_1_2_15_1 = { + basename = ''xapian_ruby''; + meta = { + description = ''xapian libraries and ruby bindings''; + homepage = ''https://github.com/garaio/xapian-ruby''; + }; + name = ''xapian-ruby-1.2.15.1''; + requiredGems = [ ]; + sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; + }; xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 3c495526c8b..e236a71b554 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -101,6 +101,10 @@ in buildInputs = [ zlib libuuid ]; }; + xapian_ruby = { + buildInputs = [ zlib libuuid ]; + }; + rjb = { buildInputs = [ jdk ]; JAVA_HOME = jdk; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01b8dcc2ac9..1273d320984 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7869,6 +7869,7 @@ let chronic = rubyLibs.chronic; gettext = rubyLibs.gettext; gpgme = ruby_gpgme; + highline = rubyLibs.highline; iconv = rubyLibs.iconv; locale = rubyLibs.locale; lockfile = rubyLibs.lockfile; @@ -7878,7 +7879,7 @@ let rmail = rubyLibs.rmail; text = rubyLibs.text; trollop = rubyLibs.trollop; - xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5; + xapian_ruby = rubyLibs.xapian_ruby; }; msmtp = callPackage ../applications/networking/msmtp { };