diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 02:35:33 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 02:35:33 +0200 |
commit | a2230e848bc85e484ef14163ac90fdb7045855f7 (patch) | |
tree | 2a1cc4158e5aeca3b6022efec7cc11ee405b7757 /pkgs | |
parent | 1618010c141571c4d9a3fa9d340d009620c4520f (diff) | |
download | Nix-a2230e848bc85e484ef14163ac90fdb7045855f7.tar.gz Nix-a2230e848bc85e484ef14163ac90fdb7045855f7.tar.zst Nix-a2230e848bc85e484ef14163ac90fdb7045855f7.zip |
Move more packages to separate files
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/cnagios/cnagios.json | 15 | ||||
-rw-r--r-- | pkgs/cnagios/default.nix | 22 | ||||
-rw-r--r-- | pkgs/mutt-ics/default.nix | 5 | ||||
-rw-r--r-- | pkgs/mutt-ics/mutt-ics.json | 15 | ||||
-rw-r--r-- | pkgs/muttprint/0.73-4.diff.gz | bin | 0 -> 16525 bytes | |||
-rw-r--r-- | pkgs/muttprint/default.nix | 44 | ||||
-rw-r--r-- | pkgs/muttprint/regex.patch | 11 | ||||
-rw-r--r-- | pkgs/muttprint/two_edge.patch | 19 | ||||
-rw-r--r-- | pkgs/nagios-cli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/nagios-cli/nagios-cli.json | 15 | ||||
-rw-r--r-- | pkgs/nagnu/default.nix | 12 | ||||
-rw-r--r-- | pkgs/nagnu/nagnu.json | 15 | ||||
-rw-r--r-- | pkgs/pg_activity/default.nix | 5 | ||||
-rw-r--r-- | pkgs/pg_activity/pg_activity.json | 15 | ||||
-rw-r--r-- | pkgs/pgloader/default.nix | 16 | ||||
-rw-r--r-- | pkgs/pgloader/pgloader.json | 15 | ||||
-rw-r--r-- | pkgs/telegram-cli/default.nix | 16 | ||||
-rw-r--r-- | pkgs/telegram-cli/telegram-cli.json | 15 | ||||
-rw-r--r-- | pkgs/telegram-cli/telegram-cli.patch | 90 | ||||
-rw-r--r-- | pkgs/telegram-history-dump/default.nix | 9 | ||||
-rw-r--r-- | pkgs/telegram-history-dump/telegram-history-dump.json | 15 |
21 files changed, 371 insertions, 0 deletions
diff --git a/pkgs/cnagios/cnagios.json b/pkgs/cnagios/cnagios.json new file mode 100644 index 0000000..4c1c385 --- /dev/null +++ b/pkgs/cnagios/cnagios.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "3bd27fb-master", | ||
3 | "meta": { | ||
4 | "name": "cnagios", | ||
5 | "url": "https://github.com/dannywarren/cnagios", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "dannywarren", | ||
10 | "repo": "cnagios", | ||
11 | "rev": "3bd27fb40e68f61ffd01bea6234b919a667b6fe4", | ||
12 | "sha256": "0iy5pmlcz6y3if72nav22xqxniiv1v8ywi0927m6s459hkw5n2rb", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/cnagios/default.nix b/pkgs/cnagios/default.nix new file mode 100644 index 0000000..2e6c799 --- /dev/null +++ b/pkgs/cnagios/default.nix | |||
@@ -0,0 +1,22 @@ | |||
1 | { stdenv, fetchedGithub, perl, ncurses }: | ||
2 | stdenv.mkDerivation (fetchedGithub ./cnagios.json // { | ||
3 | configureFlags = [ | ||
4 | "--with-etc-dir=/etc/cnagios" | ||
5 | "--with-var-dir=/var/lib/naemon" | ||
6 | "--with-status-file=/var/lib/naemon/status.dat" | ||
7 | "--with-nagios-data=4" | ||
8 | ]; | ||
9 | |||
10 | prePatch = '' | ||
11 | sed -i -e "s/-lcurses/-lncurses/" Makefile.in | ||
12 | ''; | ||
13 | installPhase = '' | ||
14 | install -dm755 $out/share/doc/cnagios | ||
15 | install -Dm644 cnagiosrc $out/share/doc/cnagios/ | ||
16 | install -Dm644 cnagios.help $out/share/doc/cnagios/ | ||
17 | install -Dm644 cnagios.pl $out/share/doc/cnagios/ | ||
18 | install -dm755 $out/bin | ||
19 | install -Dm755 cnagios $out/bin/ | ||
20 | ''; | ||
21 | buildInputs = [ perl ncurses ]; | ||
22 | }) | ||
diff --git a/pkgs/mutt-ics/default.nix b/pkgs/mutt-ics/default.nix new file mode 100644 index 0000000..26f95eb --- /dev/null +++ b/pkgs/mutt-ics/default.nix | |||
@@ -0,0 +1,5 @@ | |||
1 | { python3Packages, fetchedGithub }: | ||
2 | with python3Packages; | ||
3 | buildPythonApplication (fetchedGithub ./mutt-ics.json // { | ||
4 | propagatedBuildInputs = [ icalendar ]; | ||
5 | }) | ||
diff --git a/pkgs/mutt-ics/mutt-ics.json b/pkgs/mutt-ics/mutt-ics.json new file mode 100644 index 0000000..ae8ed37 --- /dev/null +++ b/pkgs/mutt-ics/mutt-ics.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "d291187-master", | ||
3 | "meta": { | ||
4 | "name": "mutt-ics", | ||
5 | "url": "https://github.com/dmedvinsky/mutt-ics", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "dmedvinsky", | ||
10 | "repo": "mutt-ics", | ||
11 | "rev": "d29118788f291f67d34fefa6eda9f95846a2fe34", | ||
12 | "sha256": "0kqzngsvzjq5gpf60jhfmb2xzjznvk172khf4dlcb72n3ak4rb92", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/muttprint/0.73-4.diff.gz b/pkgs/muttprint/0.73-4.diff.gz new file mode 100644 index 0000000..c4f3cef --- /dev/null +++ b/pkgs/muttprint/0.73-4.diff.gz | |||
Binary files differ | |||
diff --git a/pkgs/muttprint/default.nix b/pkgs/muttprint/default.nix new file mode 100644 index 0000000..0863a7b --- /dev/null +++ b/pkgs/muttprint/default.nix | |||
@@ -0,0 +1,44 @@ | |||
1 | { stdenv, fetchurl, lib, psutils, dialog, texlive, makeWrapper, automake, autoconf, imagemagick, ghostscript, perl, perlPackages }: | ||
2 | stdenv.mkDerivation rec { | ||
3 | name = "muttprint-${version}"; | ||
4 | version = "0.73"; | ||
5 | src = fetchurl { | ||
6 | url = "http://downloads.sf.net/muttprint/${name}.tar.gz"; | ||
7 | sha256 = "1dny4niyibfgazwlzfcnb37jy6k140rs6baaj629z12rmahfdavw"; | ||
8 | }; | ||
9 | patches = [ | ||
10 | ./0.73-4.diff.gz | ||
11 | ./regex.patch | ||
12 | ./two_edge.patch | ||
13 | ]; | ||
14 | preConfigure = '' | ||
15 | aclocal | ||
16 | automake --add-missing --copy | ||
17 | autoconf | ||
18 | ''; | ||
19 | preBuild = '' | ||
20 | cd pics | ||
21 | convert -flop BabyTuX.eps BabyTuX.eps | ||
22 | for i in BabyTuX_color.eps BabyTuX.eps Debian_color.eps \ | ||
23 | Debian.eps Gentoo.eps Gentoo_color.eps ; do | ||
24 | convert $i $(basename $i .eps).png | ||
25 | done | ||
26 | convert penguin.eps penguin.jpg | ||
27 | cd .. | ||
28 | ''; | ||
29 | postInstall = '' | ||
30 | perlFlags= | ||
31 | for i in $(IFS=:; echo $PERL5LIB); do | ||
32 | perlFlags="$perlFlags -I$i" | ||
33 | done | ||
34 | |||
35 | sed -i "$out/bin/muttprint" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|" | ||
36 | sed -i "$out/bin/muttprint" -e "s|ENV{HOME}/.muttprintrc|ENV{XDG_CONFIG_HOME}/muttprint/muttprintrc|" | ||
37 | |||
38 | wrapProgram $out/bin/muttprint \ | ||
39 | --prefix PATH : ${lib.makeBinPath [ psutils dialog | ||
40 | (texlive.combine { inherit (texlive) scheme-basic utopia fancyvrb lastpage marvosym ucs cm-super; }) ]} | ||
41 | ''; | ||
42 | buildInputs = [ makeWrapper automake autoconf imagemagick ghostscript perl ] ++ | ||
43 | (with perlPackages; [ TimeDate FileWhich TextIconv ]); | ||
44 | } | ||
diff --git a/pkgs/muttprint/regex.patch b/pkgs/muttprint/regex.patch new file mode 100644 index 0000000..e99c4a2 --- /dev/null +++ b/pkgs/muttprint/regex.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- a/muttprint 2015-07-21 11:18:04.219578426 +1200 | ||
2 | +++ b/muttprint 2015-07-21 11:18:53.906243779 +1200 | ||
3 | @@ -1635,7 +1635,7 @@ | ||
4 | open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!"; | ||
5 | |||
6 | while (<AUX>) { | ||
7 | - ($numberOfPages) = /\\newlabel{LastPage}{{}{(\d+)}}/; | ||
8 | + ($numberOfPages) = /\\newlabel\{LastPage}\{\{}\{(\d+)}}/; | ||
9 | } | ||
10 | |||
11 | close AUX or fatalError "Could not close $auxfile:\n$!"; | ||
diff --git a/pkgs/muttprint/two_edge.patch b/pkgs/muttprint/two_edge.patch new file mode 100644 index 0000000..4a7290d --- /dev/null +++ b/pkgs/muttprint/two_edge.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | --- a/muttprint 2016-05-05 13:48:50.515950744 +1200 | ||
2 | +++ b/muttprint 2016-05-05 13:52:10.722623902 +1200 | ||
3 | @@ -643,14 +643,14 @@ | ||
4 | if ($Config{PAPERSAVE} eq "on") { | ||
5 | if ($useCups) { | ||
6 | $Config{PRINT_COMMAND} =~ | ||
7 | - s/\$CUPS_OPTIONS/ -o sides=two-sided-long-edge \$CUPS_OPTIONS/; | ||
8 | + s/\$CUPS_OPTIONS/ -o sides=two-sided-short-edge \$CUPS_OPTIONS/; | ||
9 | } else { # no cups | ||
10 | modifyPS("landscape"); | ||
11 | } | ||
12 | } else { # no papersave | ||
13 | if ($useCups) { | ||
14 | $Config{PRINT_COMMAND} =~ | ||
15 | - s/\$CUPS_OPTIONS/ -o sides=two-sided-short-edge \$CUPS_OPTIONS/; | ||
16 | + s/\$CUPS_OPTIONS/ -o sides=two-sided-long-edge \$CUPS_OPTIONS/; | ||
17 | } else { # no cups | ||
18 | modifyPS("portrait"); | ||
19 | } | ||
diff --git a/pkgs/nagios-cli/default.nix b/pkgs/nagios-cli/default.nix new file mode 100644 index 0000000..35e3790 --- /dev/null +++ b/pkgs/nagios-cli/default.nix | |||
@@ -0,0 +1,2 @@ | |||
1 | { python2Packages, fetchedGithub }: | ||
2 | python2Packages.buildPythonApplication (fetchedGithub ./nagios-cli.json) | ||
diff --git a/pkgs/nagios-cli/nagios-cli.json b/pkgs/nagios-cli/nagios-cli.json new file mode 100644 index 0000000..fc91227 --- /dev/null +++ b/pkgs/nagios-cli/nagios-cli.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "edc51ea-master", | ||
3 | "meta": { | ||
4 | "name": "nagios-cli", | ||
5 | "url": "https://github.com/tehmaze/nagios-cli", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "tehmaze", | ||
10 | "repo": "nagios-cli", | ||
11 | "rev": "edc51eaccf1086bb4469ce45c5e5155f2d71a2f9", | ||
12 | "sha256": "1qw5fv4niz079zqwmfr3kzjv8cc31rbhi9whdbv9c32qdi3h7vsp", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/nagnu/default.nix b/pkgs/nagnu/default.nix new file mode 100644 index 0000000..0056393 --- /dev/null +++ b/pkgs/nagnu/default.nix | |||
@@ -0,0 +1,12 @@ | |||
1 | { stdenv, fetchedGithub, ncurses, curl }: | ||
2 | stdenv.mkDerivation (fetchedGithub ./nagnu.json // rec { | ||
3 | buildInputs = [ ncurses curl ]; | ||
4 | installPhase = '' | ||
5 | mkdir -p $out/bin | ||
6 | cp nagnu $out/bin | ||
7 | mkdir -p $out/share/doc/nagnu | ||
8 | cp nagnu.conf.sample $out/share/doc/nagnu | ||
9 | mkdir -p $out/share/man/man8 | ||
10 | cp docs/nagnu.8 $out/share/man/man8 | ||
11 | ''; | ||
12 | }) | ||
diff --git a/pkgs/nagnu/nagnu.json b/pkgs/nagnu/nagnu.json new file mode 100644 index 0000000..60a8b07 --- /dev/null +++ b/pkgs/nagnu/nagnu.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "c7e65fc-master", | ||
3 | "meta": { | ||
4 | "name": "nagnu", | ||
5 | "url": "https://github.com/frlen/nagnu", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "frlen", | ||
10 | "repo": "nagnu", | ||
11 | "rev": "c7e65fc02f46a3756a4cc47953ea2f3e57a84728", | ||
12 | "sha256": "1i2jm8ibvqcc734daamnzc3hx8q0nsry1x12q0kr5yvcsdjjgyy3", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/pg_activity/default.nix b/pkgs/pg_activity/default.nix new file mode 100644 index 0000000..f47884a --- /dev/null +++ b/pkgs/pg_activity/default.nix | |||
@@ -0,0 +1,5 @@ | |||
1 | { python2Packages, fetchedGithub }: | ||
2 | with python2Packages; | ||
3 | buildPythonApplication (fetchedGithub ./pg_activity.json // { | ||
4 | propagatedBuildInputs = [ psycopg2 psutil ]; | ||
5 | }) | ||
diff --git a/pkgs/pg_activity/pg_activity.json b/pkgs/pg_activity/pg_activity.json new file mode 100644 index 0000000..4485d9a --- /dev/null +++ b/pkgs/pg_activity/pg_activity.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "v1.4.0", | ||
3 | "meta": { | ||
4 | "name": "pg_activity", | ||
5 | "url": "https://github.com/julmon/pg_activity/", | ||
6 | "branch": "refs/tags/v1.4.0" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "julmon", | ||
10 | "repo": "pg_activity", | ||
11 | "rev": "f26ae614c204254a805309026eebd5e9230b0214", | ||
12 | "sha256": "1bmvgrmna7vz2a6vknxm0k19vl9x7l6hn6vpfd7jgd53rz7c9w5p", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/pgloader/default.nix b/pkgs/pgloader/default.nix new file mode 100644 index 0000000..e4f24ea --- /dev/null +++ b/pkgs/pgloader/default.nix | |||
@@ -0,0 +1,16 @@ | |||
1 | { stdenv, fetchedGithub, sbcl, cacert, sqlite, freetds, libzip, curl, git, openssl, makeWrapper }: | ||
2 | stdenv.mkDerivation (fetchedGithub ./pgloader.json // { | ||
3 | buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ]; | ||
4 | LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; | ||
5 | buildPhase = '' | ||
6 | export PATH=$PATH:$out/bin | ||
7 | export HOME=$TMPDIR | ||
8 | make pgloader | ||
9 | ''; | ||
10 | dontStrip = true; | ||
11 | enableParallelBuilding = false; | ||
12 | installPhase = '' | ||
13 | install -Dm755 build/bin/pgloader "$out/bin/pgloader" | ||
14 | wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" | ||
15 | ''; | ||
16 | }) | ||
diff --git a/pkgs/pgloader/pgloader.json b/pkgs/pgloader/pgloader.json new file mode 100644 index 0000000..dfe310b --- /dev/null +++ b/pkgs/pgloader/pgloader.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "v3.5.2", | ||
3 | "meta": { | ||
4 | "name": "pgloader", | ||
5 | "url": "https://github.com/dimitri/pgloader", | ||
6 | "branch": "refs/tags/v3.5.2" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "dimitri", | ||
10 | "repo": "pgloader", | ||
11 | "rev": "63af7e7373975391446dcae151f5c61564849025", | ||
12 | "sha256": "1rd0k1x7ml6b6x526brachm13v51vx5ikpg64c8k8j29cskq2vqa", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/telegram-cli/default.nix b/pkgs/telegram-cli/default.nix new file mode 100644 index 0000000..4b82b35 --- /dev/null +++ b/pkgs/telegram-cli/default.nix | |||
@@ -0,0 +1,16 @@ | |||
1 | { stdenv, fetchedGithub, pkgconfig, libevent, lua, jansson, openssl, readline, zlib, libconfig }: | ||
2 | stdenv.mkDerivation (fetchedGithub ./telegram-cli.json // { | ||
3 | patches = [ | ||
4 | ./telegram-cli.patch | ||
5 | ]; | ||
6 | buildInputs = [ pkgconfig libevent lua jansson openssl readline zlib libconfig ]; | ||
7 | preBuild = '' | ||
8 | sed -i -e 's@"/etc/" PROG_NAME "/server.pub"@"'$out'/etc/server.pub"@' main.c | ||
9 | ''; | ||
10 | installPhase = '' | ||
11 | mkdir -p $out | ||
12 | install -Dm755 bin/telegram-cli $out/bin/telegram-cli | ||
13 | install -Dm644 tg-server.pub $out/etc/server.pub | ||
14 | install -Dm644 debian/telegram-cli.8 $out/man/man8/telegram-cli.8 | ||
15 | ''; | ||
16 | }) | ||
diff --git a/pkgs/telegram-cli/telegram-cli.json b/pkgs/telegram-cli/telegram-cli.json new file mode 100644 index 0000000..53e0a7b --- /dev/null +++ b/pkgs/telegram-cli/telegram-cli.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "6547c0b-master", | ||
3 | "meta": { | ||
4 | "name": "telegram-cli", | ||
5 | "url": "https://github.com/vysheng/tg", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "vysheng", | ||
10 | "repo": "tg", | ||
11 | "rev": "6547c0b21b977b327b3c5e8142963f4bc246187a", | ||
12 | "sha256": "07sss5cnw2ygd7mp8f5532lmj7qm6ywqf4cjaq5g13i8igzqzwzj", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/pkgs/telegram-cli/telegram-cli.patch b/pkgs/telegram-cli/telegram-cli.patch new file mode 100644 index 0000000..2d2b7b0 --- /dev/null +++ b/pkgs/telegram-cli/telegram-cli.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c | ||
2 | index db653f2..5e6a697 100644 | ||
3 | --- a/tgl/crypto/rsa_pem_openssl.c | ||
4 | +++ b/tgl/crypto/rsa_pem_openssl.c | ||
5 | @@ -36,6 +36,12 @@ TGLC_WRAPPER_ASSOC(rsa,RSA) | ||
6 | // TODO: Refactor crucial struct-identity into its own header. | ||
7 | TGLC_WRAPPER_ASSOC(bn,BIGNUM) | ||
8 | |||
9 | +/* | ||
10 | + * Since OpenSSL version 1.1.0 the RSA struct (rsa_st) is opaque, | ||
11 | + * see also https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes | ||
12 | + */ | ||
13 | +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
14 | + | ||
15 | TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { | ||
16 | RSA *ret = RSA_new (); | ||
17 | ret->e = unwrap_bn (TGLC_bn_new ()); | ||
18 | @@ -47,7 +53,30 @@ TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { | ||
19 | #define RSA_GETTER(M) \ | ||
20 | TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ | ||
21 | return wrap_bn (unwrap_rsa (key)->M); \ | ||
22 | - } \ | ||
23 | + } | ||
24 | + | ||
25 | +#else // OPENSSL_VERSION_NUMBER | ||
26 | + | ||
27 | +TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { | ||
28 | + RSA *ret = RSA_new (); | ||
29 | + BIGNUM *ret_e = unwrap_bn (TGLC_bn_new ()); | ||
30 | + BIGNUM *ret_n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL)); | ||
31 | + RSA_set0_key (ret, ret_n, ret_e, NULL); | ||
32 | + TGLC_bn_set_word (wrap_bn (ret_e), e); | ||
33 | + return wrap_rsa (ret); | ||
34 | +} | ||
35 | + | ||
36 | +#define RSA_GETTER(M) \ | ||
37 | +TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ | ||
38 | + BIGNUM *rsa_n, *rsa_e, *rsa_d; \ | ||
39 | + RSA_get0_key(unwrap_rsa (key), \ | ||
40 | + (const BIGNUM **) &rsa_n, \ | ||
41 | + (const BIGNUM **) &rsa_e, \ | ||
42 | + (const BIGNUM **) &rsa_d); \ | ||
43 | + return wrap_bn (rsa_ ## M); \ | ||
44 | +} | ||
45 | + | ||
46 | +#endif // OPENSSL_VERSION_NUMBER | ||
47 | |||
48 | RSA_GETTER(n); | ||
49 | RSA_GETTER(e); | ||
50 | @@ -60,4 +89,4 @@ TGLC_rsa *TGLC_pem_read_RSAPublicKey (FILE *fp) { | ||
51 | return wrap_rsa (PEM_read_RSAPublicKey (fp, NULL, NULL, NULL)); | ||
52 | } | ||
53 | |||
54 | -#endif | ||
55 | +#endif // TGL_AVOID_OPENSSL | ||
56 | diff --git a/tgl/mtproto-utils.c b/tgl/mtproto-utils.c | ||
57 | index 0948bc8..cfdb216 100644 | ||
58 | --- a/tgl/mtproto-utils.c | ||
59 | +++ b/tgl/mtproto-utils.c | ||
60 | @@ -98,7 +98,7 @@ static unsigned long long BN2ull (TGLC_bn *b) { | ||
61 | if (sizeof (unsigned long) == 8) { | ||
62 | return TGLC_bn_get_word (b); | ||
63 | } else if (sizeof (unsigned long long) == 8) { | ||
64 | - assert (0); // As long as nobody ever uses this code, assume it is broken. | ||
65 | +// assert (0); // As long as nobody ever uses this code, assume it is broken. | ||
66 | unsigned long long tmp; | ||
67 | /* Here be dragons, but it should be okay due to be64toh */ | ||
68 | TGLC_bn_bn2bin (b, (unsigned char *) &tmp); | ||
69 | @@ -112,7 +112,7 @@ static void ull2BN (TGLC_bn *b, unsigned long long val) { | ||
70 | if (sizeof (unsigned long) == 8 || val < (1ll << 32)) { | ||
71 | TGLC_bn_set_word (b, val); | ||
72 | } else if (sizeof (unsigned long long) == 8) { | ||
73 | - assert (0); // As long as nobody ever uses this code, assume it is broken. | ||
74 | +// assert (0); // As long as nobody ever uses this code, assume it is broken. | ||
75 | htobe64(val); | ||
76 | /* Here be dragons, but it should be okay due to htobe64 */ | ||
77 | TGLC_bn_bin2bn ((unsigned char *) &val, 8, b); | ||
78 | diff --git a/tgl/tl-parser/tl-parser.c b/tgl/tl-parser/tl-parser.c | ||
79 | index 524b196..aeadbd2 100644 | ||
80 | --- a/tgl/tl-parser/tl-parser.c | ||
81 | +++ b/tgl/tl-parser/tl-parser.c | ||
82 | @@ -1903,7 +1903,7 @@ struct tl_combinator_tree *tl_parse_args134 (struct tree *T) { | ||
83 | //assert (S->data); | ||
84 | char *name = S->data; | ||
85 | if (!name) { | ||
86 | - static char s[20]; | ||
87 | + static char s[21]; | ||
88 | sprintf (s, "%lld", lrand48 () * (1ll << 32) + lrand48 ()); | ||
89 | name = s; | ||
90 | } | ||
diff --git a/pkgs/telegram-history-dump/default.nix b/pkgs/telegram-history-dump/default.nix new file mode 100644 index 0000000..9215d5b --- /dev/null +++ b/pkgs/telegram-history-dump/default.nix | |||
@@ -0,0 +1,9 @@ | |||
1 | { stdenv, ruby, fetchedGithub }: | ||
2 | stdenv.mkDerivation (fetchedGithub ./telegram-history-dump.json // { | ||
3 | installPhase = '' | ||
4 | mkdir -p $out/lib $out/bin | ||
5 | cp -a $src $out/lib/telegram-history-dump | ||
6 | ln -s $out/lib/telegram-history-dump/telegram-history-dump.rb $out/bin/telegram-history-dump | ||
7 | ''; | ||
8 | buildInputs = [ ruby ]; | ||
9 | }) | ||
diff --git a/pkgs/telegram-history-dump/telegram-history-dump.json b/pkgs/telegram-history-dump/telegram-history-dump.json new file mode 100644 index 0000000..487df73 --- /dev/null +++ b/pkgs/telegram-history-dump/telegram-history-dump.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "468ea91-master", | ||
3 | "meta": { | ||
4 | "name": "telegram-history-dump", | ||
5 | "url": "https://github.com/tvdstaaij/telegram-history-dump", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "tvdstaaij", | ||
10 | "repo": "telegram-history-dump", | ||
11 | "rev": "468ea91e543529b54bc2c5ea28b1ea17f362fd3e", | ||
12 | "sha256": "1wmwiqacfa56bmwx50njnb15cg0fy6rbdrmrjd4xfbh8bs6yp0gh", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||