diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/applications/networking/mailreaders | |
parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
download | nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
5 files changed, 166 insertions, 73 deletions
diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/pkgs/applications/networking/mailreaders/sup/.bundix/cache new file mode 100644 index 000000000000..5894e96022c8 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/sup/.bundix/cache @@ -0,0 +1,4 @@ +--- +gem: + https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn + https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile new file mode 100644 index 000000000000..a57feb5d21f3 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/sup/Gemfile @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +gem 'sup' +gem 'gpgme' + +# Sup tries to `xapian-ruby` in its extconf instead of listing it as a +# dependency. +gem 'xapian-ruby', "~> 1.2.15" diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock new file mode 100644 index 000000000000..fe8746b9f724 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock @@ -0,0 +1,34 @@ +GEM + remote: https://rubygems.org/ + specs: + chronic (0.9.1) + gpgme (2.0.7) + mini_portile (>= 0.5.0, <= 0.6.0) + highline (1.6.21) + locale (2.1.0) + lockfile (2.1.3) + mime-types (1.25.1) + mini_portile (0.6.0) + ncursesw (1.4.9) + rmail-sup (1.0.1) + sup (0.20.0) + chronic (~> 0.9.1) + highline + locale (~> 2.0) + lockfile + mime-types (~> 1.0) + ncursesw (~> 1.4.0) + rmail-sup (~> 1.0.1) + trollop (>= 1.12) + unicode (~> 0.4.4) + trollop (2.1.1) + unicode (0.4.4.2) + xapian-ruby (1.2.19.1) + +PLATFORMS + ruby + +DEPENDENCIES + gpgme + sup + xapian-ruby (~> 1.2.15) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 3d537d83f430..19715d7b255b 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,79 +1,19 @@ -{ 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 -, bundler, git }: +{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian +, pkgconfig, which }: -stdenv.mkDerivation rec { - version = "0.18.0"; - name = "sup-${version}"; +bundlerEnv { + name = "sup-0.20.0"; - meta = { + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { description = "A curses threads-with-tags style email client"; homepage = http://supmua.org; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; - broken = true; - }; - - dontStrip = true; - - src = fetchurl { - url = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz"; - sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0"; + license = with licenses; gpl2; + maintainers = with maintainers; [ cstrahan lovek323 ]; + platforms = platforms.unix; }; - - buildInputs = - [ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby - libiconvOrEmpty git ]; - - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - - buildPhase = '' - # the builder uses git to get a listing of the files - export EMAIL="nobody@in.here" - git init >/dev/null - git add . - git commit -m "message" >/dev/null - gem build sup.gemspec - ''; - - installPhase = '' - export HOME=$TMP/home; mkdir -pv "$HOME" - - GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${rmail_sup}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${unicode}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${xapian_ruby}/${ruby.gemPath}" - - # 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 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" - - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin" - done - - for prog in $out/gems/*/bin/*; do - [[ -e "$out/bin/$(basename $prog)" ]] - done - ''; } diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix new file mode 100644 index 000000000000..e39da3dac85e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/sup/gemset.nix @@ -0,0 +1,107 @@ +{ + "chronic" = { + version = "0.9.1"; + source = { + type = "gem"; + sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk"; + }; + }; + "gpgme" = { + version = "2.0.7"; + source = { + type = "gem"; + sha256 = "1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr"; + }; + dependencies = [ + "mini_portile" + ]; + }; + "highline" = { + version = "1.6.21"; + source = { + type = "gem"; + sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; + }; + }; + "locale" = { + version = "2.1.0"; + source = { + type = "gem"; + sha256 = "18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj"; + }; + }; + "lockfile" = { + version = "2.1.3"; + source = { + type = "gem"; + sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr"; + }; + }; + "mime-types" = { + version = "1.25.1"; + source = { + type = "gem"; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + "mini_portile" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn"; + }; + }; + "ncursesw" = { + version = "1.4.9"; + source = { + type = "gem"; + sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093"; + }; + }; + "rmail-sup" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g"; + }; + }; + "sup" = { + version = "0.20.0"; + source = { + type = "gem"; + sha256 = "1lpqgrqkv29xr1h1142qsbmknlshpgys7fc3w1nkyhib8s3ikamg"; + }; + dependencies = [ + "chronic" + "highline" + "locale" + "lockfile" + "mime-types" + "ncursesw" + "rmail-sup" + "trollop" + "unicode" + ]; + }; + "trollop" = { + version = "2.1.1"; + source = { + type = "gem"; + sha256 = "0z5dvh7glwqjprlihsjx67hfzy4whsjfhqj9akyyrby9q5va1i4k"; + }; + }; + "unicode" = { + version = "0.4.4.2"; + source = { + type = "gem"; + sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g"; + }; + }; + "xapian-ruby" = { + version = "1.2.19.1"; + source = { + type = "gem"; + sha256 = "1crfrmc8kf6qq1xcfcmgf213zg66badpg4d86n7y9x3i1f5lxlbv"; + }; + }; +} \ No newline at end of file |