From 258dd18bac4bf5dd03cf1098ffa35cb954f9e015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 5 Apr 2020 15:57:20 +0200 Subject: Upgrade to nixos-unstable --- pkgs/crypto/cardano-cli/default.nix | 2 +- pkgs/crypto/iota-cli-app/default.nix | 4 +- pkgs/mtop/default.nix | 2 +- pkgs/note/default.nix | 5 +- pkgs/private/webapps/aten/default.nix | 2 +- .../buildbot/plugins/buildslist/default.nix | 4 +- pkgs/python-packages/wokkel.nix | 2 +- pkgs/simp_le/default.nix | 32 -------- pkgs/telegram-cli/default.nix | 3 - pkgs/telegram-cli/telegram-cli.json | 10 +-- pkgs/telegram-cli/telegram-cli.patch | 90 ---------------------- pkgs/terminal-velocity/default.nix | 4 + pkgs/tiv/default.nix | 2 +- pkgs/webapps/mediagoblin/default.nix | 2 + pkgs/webapps/peertube/default.nix | 2 +- 15 files changed, 24 insertions(+), 142 deletions(-) delete mode 100644 pkgs/simp_le/default.nix delete mode 100644 pkgs/telegram-cli/telegram-cli.patch (limited to 'pkgs') diff --git a/pkgs/crypto/cardano-cli/default.nix b/pkgs/crypto/cardano-cli/default.nix index 4bd18d9..3cd5a4c 100644 --- a/pkgs/crypto/cardano-cli/default.nix +++ b/pkgs/crypto/cardano-cli/default.nix @@ -11,6 +11,6 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "1jra0635inm95xp7vg8l7s7ybijcy28956cd6jl8qw2p8bw0z1p3"; + cargoSha256 = "0j68dsqahvgpa9ms62149530lbfa55lmpd56rgdxkrh2z32lshs8"; verifyCargoDeps = true; } diff --git a/pkgs/crypto/iota-cli-app/default.nix b/pkgs/crypto/iota-cli-app/default.nix index 1a9d3ed..17d7714 100644 --- a/pkgs/crypto/iota-cli-app/default.nix +++ b/pkgs/crypto/iota-cli-app/default.nix @@ -1,6 +1,6 @@ -{ stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }: +{ stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-10_x }: let - nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-8_x; }; + nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-10_x; }; # built using node2nix -8 -l package-lock.json # and changing "./." to "src" packageEnv = import ./node-packages.nix { diff --git a/pkgs/mtop/default.nix b/pkgs/mtop/default.nix index 4a89430..3f6b6bc 100644 --- a/pkgs/mtop/default.nix +++ b/pkgs/mtop/default.nix @@ -1,6 +1,6 @@ { buildPerlPackage, fetchurl, perlPackages, lib }: buildPerlPackage rec { - name = "mtop-${version}"; + pname = "mtop"; version = "0.6.6"; src = fetchurl { url = "http://downloads.sourceforge.net/project/mtop/mtop/v${version}/mtop-${version}.tar.gz"; diff --git a/pkgs/note/default.nix b/pkgs/note/default.nix index 0c422bc..d5fcccd 100644 --- a/pkgs/note/default.nix +++ b/pkgs/note/default.nix @@ -1,8 +1,9 @@ { lib, buildPerlPackage, fetchurl, perlPackages }: buildPerlPackage rec { - name = "note-1.3.26"; + pname = "note"; + version = "1.3.26"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; + url = "mirror://cpan/authors/id/T/TL/TLINDEN/${pname}-${version}.tar.gz"; sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq"; }; outputs = ["out" "man"]; diff --git a/pkgs/private/webapps/aten/default.nix b/pkgs/private/webapps/aten/default.nix index 5a726e9..9c4e29f 100644 --- a/pkgs/private/webapps/aten/default.nix +++ b/pkgs/private/webapps/aten/default.nix @@ -22,7 +22,7 @@ let postInstall = let nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj"; + sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; }; in '' diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix index e5087e4..dc6104e 100644 --- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix +++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix @@ -1,4 +1,4 @@ -{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, python2, fetchurl, jq, yarn, nodejs }: +{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs }: let buildslist_src = mylibs.fetchedGit ./buildslist.json; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' @@ -6,7 +6,7 @@ let ''; nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj"; + sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; }; buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec { name = "buildslist-yarn-modules"; diff --git a/pkgs/python-packages/wokkel.nix b/pkgs/python-packages/wokkel.nix index b34caec..3237f2b 100644 --- a/pkgs/python-packages/wokkel.nix +++ b/pkgs/python-packages/wokkel.nix @@ -7,5 +7,5 @@ buildPythonPackage rec { sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016"; }; propagatedBuildInputs = [ twisted.extras.tls twisted incremental dateutil ]; - doChecks = false; + doCheck = false; } diff --git a/pkgs/simp_le/default.nix b/pkgs/simp_le/default.nix deleted file mode 100644 index eaefba3..0000000 --- a/pkgs/simp_le/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, python3Packages, bash }: - -python3Packages.buildPythonApplication rec { - pname = "simp_le-client"; - version = "0.17.0"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0m1jynar4calaffp2zdxr5yy9vnhw2qf2hsfxwzfwf8fqb5h7bjb"; - }; - - postPatch = '' - # drop upper bound of idna requirement - sed -ri "s/'(idna)<[^']+'/'\1'/" setup.py - substituteInPlace simp_le.py \ - --replace "/bin/sh" "${bash}/bin/sh" - ''; - - checkPhase = '' - $out/bin/simp_le --test - ''; - - propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; - - meta = with stdenv.lib; { - homepage = https://github.com/zenhack/simp_le; - description = "Simple Let's Encrypt client"; - license = licenses.gpl3; - maintainers = with maintainers; [ gebner makefu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/telegram-cli/default.nix b/pkgs/telegram-cli/default.nix index 6987748..87c93e5 100644 --- a/pkgs/telegram-cli/default.nix +++ b/pkgs/telegram-cli/default.nix @@ -1,8 +1,5 @@ { stdenv, mylibs, pkgconfig, libevent, lua, jansson, openssl, readline, zlib, libconfig }: stdenv.mkDerivation (mylibs.fetchedGithub ./telegram-cli.json // { - patches = [ - ./telegram-cli.patch - ]; buildInputs = [ pkgconfig libevent lua jansson openssl readline zlib libconfig ]; preBuild = '' sed -i -e 's@"/etc/" PROG_NAME "/server.pub"@"'$out'/etc/server.pub"@' main.c diff --git a/pkgs/telegram-cli/telegram-cli.json b/pkgs/telegram-cli/telegram-cli.json index 53e0a7b..2e7ed9a 100644 --- a/pkgs/telegram-cli/telegram-cli.json +++ b/pkgs/telegram-cli/telegram-cli.json @@ -1,15 +1,15 @@ { - "tag": "6547c0b-master", + "tag": "3da0e4a-master", "meta": { "name": "telegram-cli", - "url": "https://github.com/vysheng/tg", + "url": "https://github.com/kenorb-contrib/tg/", "branch": "master" }, "github": { - "owner": "vysheng", + "owner": "kenorb-contrib", "repo": "tg", - "rev": "6547c0b21b977b327b3c5e8142963f4bc246187a", - "sha256": "07sss5cnw2ygd7mp8f5532lmj7qm6ywqf4cjaq5g13i8igzqzwzj", + "rev": "3da0e4a54c3a63cee11aae3c23f2077adfc4949d", + "sha256": "0pvswzajipzkk1x5cyf10dw18ka9jalar0aa2i7y23ifm4ddnif4", "fetchSubmodules": true } } diff --git a/pkgs/telegram-cli/telegram-cli.patch b/pkgs/telegram-cli/telegram-cli.patch deleted file mode 100644 index 2d2b7b0..0000000 --- a/pkgs/telegram-cli/telegram-cli.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c -index db653f2..5e6a697 100644 ---- a/tgl/crypto/rsa_pem_openssl.c -+++ b/tgl/crypto/rsa_pem_openssl.c -@@ -36,6 +36,12 @@ TGLC_WRAPPER_ASSOC(rsa,RSA) - // TODO: Refactor crucial struct-identity into its own header. - TGLC_WRAPPER_ASSOC(bn,BIGNUM) - -+/* -+ * Since OpenSSL version 1.1.0 the RSA struct (rsa_st) is opaque, -+ * see also https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes -+ */ -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+ - TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { - RSA *ret = RSA_new (); - ret->e = unwrap_bn (TGLC_bn_new ()); -@@ -47,7 +53,30 @@ TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { - #define RSA_GETTER(M) \ - TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ - return wrap_bn (unwrap_rsa (key)->M); \ -- } \ -+ } -+ -+#else // OPENSSL_VERSION_NUMBER -+ -+TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) { -+ RSA *ret = RSA_new (); -+ BIGNUM *ret_e = unwrap_bn (TGLC_bn_new ()); -+ BIGNUM *ret_n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL)); -+ RSA_set0_key (ret, ret_n, ret_e, NULL); -+ TGLC_bn_set_word (wrap_bn (ret_e), e); -+ return wrap_rsa (ret); -+} -+ -+#define RSA_GETTER(M) \ -+TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \ -+ BIGNUM *rsa_n, *rsa_e, *rsa_d; \ -+ RSA_get0_key(unwrap_rsa (key), \ -+ (const BIGNUM **) &rsa_n, \ -+ (const BIGNUM **) &rsa_e, \ -+ (const BIGNUM **) &rsa_d); \ -+ return wrap_bn (rsa_ ## M); \ -+} -+ -+#endif // OPENSSL_VERSION_NUMBER - - RSA_GETTER(n); - RSA_GETTER(e); -@@ -60,4 +89,4 @@ TGLC_rsa *TGLC_pem_read_RSAPublicKey (FILE *fp) { - return wrap_rsa (PEM_read_RSAPublicKey (fp, NULL, NULL, NULL)); - } - --#endif -+#endif // TGL_AVOID_OPENSSL -diff --git a/tgl/mtproto-utils.c b/tgl/mtproto-utils.c -index 0948bc8..cfdb216 100644 ---- a/tgl/mtproto-utils.c -+++ b/tgl/mtproto-utils.c -@@ -98,7 +98,7 @@ static unsigned long long BN2ull (TGLC_bn *b) { - if (sizeof (unsigned long) == 8) { - return TGLC_bn_get_word (b); - } else if (sizeof (unsigned long long) == 8) { -- assert (0); // As long as nobody ever uses this code, assume it is broken. -+// assert (0); // As long as nobody ever uses this code, assume it is broken. - unsigned long long tmp; - /* Here be dragons, but it should be okay due to be64toh */ - TGLC_bn_bn2bin (b, (unsigned char *) &tmp); -@@ -112,7 +112,7 @@ static void ull2BN (TGLC_bn *b, unsigned long long val) { - if (sizeof (unsigned long) == 8 || val < (1ll << 32)) { - TGLC_bn_set_word (b, val); - } else if (sizeof (unsigned long long) == 8) { -- assert (0); // As long as nobody ever uses this code, assume it is broken. -+// assert (0); // As long as nobody ever uses this code, assume it is broken. - htobe64(val); - /* Here be dragons, but it should be okay due to htobe64 */ - TGLC_bn_bin2bn ((unsigned char *) &val, 8, b); -diff --git a/tgl/tl-parser/tl-parser.c b/tgl/tl-parser/tl-parser.c -index 524b196..aeadbd2 100644 ---- a/tgl/tl-parser/tl-parser.c -+++ b/tgl/tl-parser/tl-parser.c -@@ -1903,7 +1903,7 @@ struct tl_combinator_tree *tl_parse_args134 (struct tree *T) { - //assert (S->data); - char *name = S->data; - if (!name) { -- static char s[20]; -+ static char s[21]; - sprintf (s, "%lld", lrand48 () * (1ll << 32) + lrand48 ()); - name = s; - } diff --git a/pkgs/terminal-velocity/default.nix b/pkgs/terminal-velocity/default.nix index 9e79dee..1a015c0 100644 --- a/pkgs/terminal-velocity/default.nix +++ b/pkgs/terminal-velocity/default.nix @@ -15,6 +15,10 @@ buildPythonApplication rec { ./fix_build.patch ]; + preCheck = '' + # Needed for urwid test + export LC_ALL=en_US.UTF-8 + ''; propagatedBuildInputs = [ chardet urwid diff --git a/pkgs/tiv/default.nix b/pkgs/tiv/default.nix index c03aabe..3e7a56c 100644 --- a/pkgs/tiv/default.nix +++ b/pkgs/tiv/default.nix @@ -1,6 +1,6 @@ { buildPerlPackage, fetchurl, perlPackages }: buildPerlPackage rec { - name = "tiv-${version}"; + pname = "tiv"; version = "2015"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/tiv/src/tiv-${version}.tar.xz"; diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix index f6393fe..c20bcb4 100644 --- a/pkgs/webapps/mediagoblin/default.nix +++ b/pkgs/webapps/mediagoblin/default.nix @@ -28,6 +28,8 @@ let inherit (old) pname; sha256 = "02wxsc6bhqvzh8j6w758kvgqbnj14l796mvmrcms8fgfamd2lak9"; }; + doCheck = false; + doInstallCheck = false; }); amqp = super.amqp.overridePythonAttrs(old: rec { version = "1.4.9"; diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix index 8995419..9929106 100644 --- a/pkgs/webapps/peertube/default.nix +++ b/pkgs/webapps/peertube/default.nix @@ -3,7 +3,7 @@ let nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj"; + sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; }; patchedPackages = stdenv.mkDerivation (mylibs.fetchedGithub ./peertube.json // rec { patches = if ldap then [ ./ldap.patch ././yarn_fix_bluebird_ldap.patch ] else [ ./yarn_fix_bluebird.patch ]; -- cgit v1.2.3