git.iko.soy/typeable/nixpkgs
on master help sign in
sup: remove (#68416)

sup: remove

commit8ab501545d8ae10e51b4da0ceb3012c3ed41223c authorJan Tojnar <jtojnar@gmail.com> dateTue 10 Sep 2019, 19:43 (7 years ago) parent26771adda7886c
10 files changed+2−273
pkgs/applications/networking/mailreaders/sup/.bundix/cache−4 pkgs/applications/networking/mailreaders/sup/Gemfile−9 pkgs/applications/networking/mailreaders/sup/Gemfile.lock−41 pkgs/applications/networking/mailreaders/sup/default.nix−28 pkgs/applications/networking/mailreaders/sup/gemset.nix−155 pkgs/development/libraries/xapian/default.nix−2 pkgs/development/ruby-modules/gem-config/default.nix−13 pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb−14 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−7
pkgs/applications/networking/mailreaders/sup/.bundix/cachedeleted−4
@@ -1,4 +0,0 @@
1−---
2−gem:
3− https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn
4− https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr
pkgs/applications/networking/mailreaders/sup/Gemfiledeleted−9
@@ -1,9 +0,0 @@
1−source "https://rubygems.org"
2−
3−gem 'rake'
4−gem 'sup'
5−gem 'gpgme'
6−
7−# Sup tries to `xapian-ruby` in its extconf instead of listing it as a
8−# dependency.
9−gem 'xapian-ruby', "~> 1.2.22"
pkgs/applications/networking/mailreaders/sup/Gemfile.lockdeleted−41
@@ -1,41 +0,0 @@
1−GEM
2− remote: https://rubygems.org/
3− specs:
4− chronic (0.9.1)
5− gpgme (2.0.18)
6− mini_portile2 (~> 2.3)
7− highline (2.0.2)
8− locale (2.1.2)
9− lockfile (2.1.3)
10− mime-types (3.2.2)
11− mime-types-data (~> 3.2015)
12− mime-types-data (3.2019.0331)
13− mini_portile2 (2.4.0)
14− ncursesw (1.4.10)
15− rake (12.3.2)
16− rmail-sup (1.0.1)
17− sup (0.22.1)
18− chronic (~> 0.9.1)
19− highline
20− locale (~> 2.0)
21− lockfile
22− mime-types (> 2.0)
23− ncursesw (~> 1.4.0)
24− rmail-sup (~> 1.0.1)
25− trollop (>= 1.12)
26− unicode (~> 0.4.4)
27− trollop (2.9.9)
28− unicode (0.4.4.4)
29− xapian-ruby (1.2.22)
30−
31−PLATFORMS
32− ruby
33−
34−DEPENDENCIES
35− gpgme
36− rake
37− sup
38− xapian-ruby (~> 1.2.22)
39−
40−BUNDLED WITH
41− 1.17.2
pkgs/applications/networking/mailreaders/sup/default.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ lib, bundlerApp, bundlerUpdateScript }:
2−
3−bundlerApp {
4− pname = "sup";
5− gemdir = ./.;
6− exes = [
7− "sup"
8− "sup-add"
9− "sup-config"
10− "sup-dump"
11− "sup-import-dump"
12− "sup-psych-ify-config-files"
13− "sup-recover-sources"
14− "sup-sync"
15− "sup-sync-back-maildir"
16− "sup-tweak-labels"
17− ];
18−
19− passthru.updateScript = bundlerUpdateScript "sup";
20−
21− meta = with lib; {
22− description = "A curses threads-with-tags style email client";
23− homepage = http://sup-heliotrope.github.io;
24− license = licenses.gpl2;
25− maintainers = with maintainers; [ cstrahan lovek323 manveru nicknovitski ];
26− platforms = platforms.unix;
27− };
28−}
pkgs/applications/networking/mailreaders/sup/gemset.nixdeleted−155
@@ -1,155 +0,0 @@
1−{
2− chronic = {
3− groups = ["default"];
4− platforms = [];
5− source = {
6− remotes = ["https://rubygems.org"];
7− sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
8− type = "gem";
9− };
10− version = "0.9.1";
11− };
12− gpgme = {
13− dependencies = ["mini_portile2"];
14− groups = ["default"];
15− platforms = [];
16− source = {
17− remotes = ["https://rubygems.org"];
18− sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
19− type = "gem";
20− };
21− version = "2.0.18";
22− };
23− highline = {
24− groups = ["default"];
25− platforms = [];
26− source = {
27− remotes = ["https://rubygems.org"];
28− sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
29− type = "gem";
30− };
31− version = "2.0.2";
32− };
33− locale = {
34− groups = ["default"];
35− platforms = [];
36− source = {
37− remotes = ["https://rubygems.org"];
38− sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
39− type = "gem";
40− };
41− version = "2.1.2";
42− };
43− lockfile = {
44− groups = ["default"];
45− platforms = [];
46− source = {
47− remotes = ["https://rubygems.org"];
48− sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
49− type = "gem";
50− };
51− version = "2.1.3";
52− };
53− mime-types = {
54− dependencies = ["mime-types-data"];
55− groups = ["default"];
56− platforms = [];
57− source = {
58− remotes = ["https://rubygems.org"];
59− sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
60− type = "gem";
61− };
62− version = "3.2.2";
63− };
64− mime-types-data = {
65− groups = ["default"];
66− platforms = [];
67− source = {
68− remotes = ["https://rubygems.org"];
69− sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
70− type = "gem";
71− };
72− version = "3.2019.0331";
73− };
74− mini_portile2 = {
75− groups = ["default"];
76− platforms = [];
77− source = {
78− remotes = ["https://rubygems.org"];
79− sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
80− type = "gem";
81− };
82− version = "2.4.0";
83− };
84− ncursesw = {
85− groups = ["default"];
86− platforms = [];
87− source = {
88− remotes = ["https://rubygems.org"];
89− sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
90− type = "gem";
91− };
92− version = "1.4.10";
93− };
94− rake = {
95− groups = ["default"];
96− platforms = [];
97− source = {
98− remotes = ["https://rubygems.org"];
99− sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
100− type = "gem";
101− };
102− version = "12.3.2";
103− };
104− rmail-sup = {
105− groups = ["default"];
106− platforms = [];
107− source = {
108− remotes = ["https://rubygems.org"];
109− sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
110− type = "gem";
111− };
112− version = "1.0.1";
113− };
114− sup = {
115− dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"];
116− groups = ["default"];
117− platforms = [];
118− source = {
119− remotes = ["https://rubygems.org"];
120− sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
121− type = "gem";
122− };
123− version = "0.22.1";
124− };
125− trollop = {
126− groups = ["default"];
127− platforms = [];
128− source = {
129− remotes = ["https://rubygems.org"];
130− sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4";
131− type = "gem";
132− };
133− version = "2.9.9";
134− };
135− unicode = {
136− groups = ["default"];
137− platforms = [];
138− source = {
139− remotes = ["https://rubygems.org"];
140− sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
141− type = "gem";
142− };
143− version = "0.4.4.4";
144− };
145− xapian-ruby = {
146− groups = ["default"];
147− platforms = [];
148− source = {
149− remotes = ["https://rubygems.org"];
150− sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
151− type = "gem";
152− };
153− version = "1.2.22";
154− };
155−}
pkgs/development/libraries/xapian/default.nix−2
@@ -37,7 +37,5 @@ let
3737 };
3838 };
3939in {
40− # xapian-ruby needs 1.2.22 as of 2017-05-06
41− xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
4240 xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
4341}
pkgs/development/ruby-modules/gem-config/default.nix−13
@@ -536,19 +536,6 @@ in
536536 ];
537537 };
538538
539− sup = attrs: {
540− dontBuild = false;
541− # prevent sup from trying to dynamically install `xapian-ruby`.
542− nativeBuildInputs = [ bundler rake ];
543− postPatch = ''
544− cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
545−
546− substituteInPlace lib/sup/crypto.rb \
547− --replace 'which gpg2' \
548− '${which}/bin/which gpg'
549− '';
550− };
551−
552539 rb-readline = attrs: {
553540 dontBuild = false;
554541 postPatch = ''
pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rbdeleted−14
@@ -1,14 +0,0 @@
1−require 'rubygems'
2−require 'rubygems/command.rb'
3−require 'rubygems/dependency_installer.rb'
4−require 'rbconfig'
5−
6−begin
7− Gem::Command.build_args = ARGV
8−rescue NoMethodError
9−end
10−
11−# create dummy rakefile to indicate success
12−f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
13−f.write("task :default\n")
14−f.close
pkgs/top-level/aliases.nix+1
@@ -343,6 +343,7 @@ mapAliases ({
343343 sshfsFuse = sshfs-fuse; # added 2016-09
344344 suil-qt5 = suil; # added 2018-05-01
345345 surf-webkit2 = surf; # added 2017-04-02
346+ sup = throw "deprecated in 2019-09-10: abandoned by upstream";
346347 system_config_printer = system-config-printer; # added 2016-01-03
347348 systool = sysfsutils; # added 2018-04-25
348349 tahoelafs = tahoe-lafs; # added 2018-03-26
pkgs/top-level/all-packages.nix+1−7
@@ -14117,7 +14117,7 @@ in
1411714117 x265 = callPackage ../development/libraries/x265 { };
1411814118
1411914119 inherit (callPackages ../development/libraries/xapian { })
14120− xapian_1_2_22 xapian_1_4;
14120+ xapian_1_4;
1412114121 xapian = xapian_1_4;
1412214122
1412314123 xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
@@ -19635,12 +19635,6 @@ in
1963519635
1963619636 speedread = callPackage ../applications/misc/speedread { };
1963719637
19638− sup = callPackage ../applications/networking/mailreaders/sup {
19639− bundlerApp = bundlerApp.override{
19640− ruby = ruby.override { cursesSupport = true; };
19641− };
19642− };
19643−
1964419638 synapse = callPackage ../applications/misc/synapse { };
1964519639
1964619640 synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {