From 05aff5f84265cc2640d5a9f3f9e635ed2eab71d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:14:38 +0100 Subject: [PATCH 01/11] biboumi: format, remove unused input --- pkgs/servers/xmpp/biboumi/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 74d8d9ae520..50d2cfa964e 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : +{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn +, libiconv, botan2, systemd, pkg-config, udns, python3Packages } : +let + louiz_catch = fetchgit { + url = "https://lab.louiz.org/louiz/Catch.git"; + rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 + sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; + }; +in stdenv.mkDerivation rec { pname = "biboumi"; version = "9.0"; @@ -10,22 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; - louiz_catch = fetchgit { - url = "https://lab.louiz.org/louiz/Catch.git"; - rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 - sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; - }; - patches = [ ./catch.patch ]; nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; - buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp $louiz_catch/single_include/catch.hpp tests/ + cp ${louiz_catch}/single_include/catch.hpp tests/ ''; doCheck = true; From 2d3effa0d046d6ca12b551159c6b314358142680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:58:01 +0100 Subject: [PATCH 02/11] pythonPackages.cairosvg: 2.5.1 -> 2.5.2 --- .../python-modules/cairosvg/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 0244f772be1..58b8c267306 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,25 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch -, cairocffi, cssselect2, defusedxml, pillow, tinycss2 -, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cairocffi +, cssselect2 +, defusedxml +, pillow +, tinycss2 +, pytestCheckHook +, pytest-runner +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "CairoSVG"; - version = "2.5.1"; - + version = "2.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bfa0deea7fa0b9b2f29e41b747a915c249dbca731a4667c2917e47ff96e773e0"; + sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w="; }; + buildInputs = [ pytest-runner ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytestCheckHook pytest-flake8 pytest-isort ]; + + pytestFlagsArray = [ + "cairosvg/test_api.py" + ]; + + pythonImportsCheck = [ "cairosvg" ]; meta = with lib; { homepage = "https://cairosvg.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 743c6a4187b9117d500576bc20b0e36650c34cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:58:56 +0100 Subject: [PATCH 03/11] pythonPackages.celery: add missing requirement --- pkgs/development/python-modules/celery/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index e1fb0b98ea0..f0fe81f85e2 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, billiard, click, click-didyoumean, click-repl, kombu, pytz, vine +, billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine , boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout }: @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "moto==1.3.7" moto ''; - propagatedBuildInputs = [ billiard click click-didyoumean click-repl kombu pytz vine ]; + propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ]; @@ -38,5 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/celery/celery/"; description = "Distributed task queue"; license = licenses.bsd3; + maintainers = [ ]; }; } From af3260763009ba50976502594a022d42a8b164b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 04:42:11 +0100 Subject: [PATCH 04/11] php-packages: cleanup --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c2ed5395e35..96d3e9b423b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -402,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + patches = lib.optionals (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c From 9718302d11cf50b3ff7a9b8114a3fb4157dc660b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:46:04 +0100 Subject: [PATCH 05/11] arb: format --- pkgs/development/libraries/arb/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 1c356b59d8a..527545e683f 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,26 +1,32 @@ -{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }: + stdenv.mkDerivation rec { pname = "arb"; version = "2.17.0"; + src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; }; - buildInputs = [mpir gmp mpfr flint]; + + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; + doCheck = true; + meta = with lib; { description = "A library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } From b7befb3522f2338c71bf0a51eb9e7c0d24d947f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:47:42 +0100 Subject: [PATCH 06/11] palp: format --- pkgs/applications/science/math/palp/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 97b5f88e55b..2866b4b9469 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value , doSymlink ? true # symlink the executables to the default location (without dimension postfix) @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { ''; preBuild = '' - echo Building PALP optimized for ${dim} dimensions - sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h + echo Building PALP optimized for ${dim} dimensions + sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h ''; # palp has no tests of its own. This test is an adapted sage test that failed @@ -42,14 +43,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" + mkdir -p $out/bin for file in poly class cws nef mori; do - cp -p $file.x "$out/bin/$file-${dim}d.x" + cp -p $file.x "$out/bin/$file-${dim}d.x" done '' + lib.optionalString doSymlink '' - cd "$out/bin" + cd $out/bin for file in poly class cws nef mori; do - ln -sf $file-6d.x $file.x + ln -sf $file-6d.x $file.x done ''; From 0207c32effd1b991cdc6986aae6f25854f0ba15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:49:31 +0100 Subject: [PATCH 07/11] giac: remove ? null --- pkgs/applications/science/math/giac/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 8c391e25322..f89fe3e1db3 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas , gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGL, libGLU, xorg, fltk }: -assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { From 089b96e21799af481bfb51075660652aa0a93a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:52:22 +0100 Subject: [PATCH 08/11] csvkit: add pythonImportCheck, mark broken --- pkgs/tools/text/csvkit/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 05e0cf119bf..1e1018ae56d 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. - (fetchpatch{ + (fetchpatch { url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; }) @@ -23,17 +23,22 @@ python3.pkgs.buildPythonApplication rec { agate-dbf agate-sql six - setuptools # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594 + setuptools ]; checkInputs = with python3.pkgs; [ - nose pytestCheckHook + nose + pytestCheckHook ]; + pythonImportsCheck = [ "csvkit" ]; + meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; homepage = "https://github.com/wireservice/csvkit"; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; }; } From 17badcf58ad1a05e3a5d3b6eaf9db336bcb6121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:53:42 +0100 Subject: [PATCH 09/11] pythonPackages.agate-sql: format, add pythonImportsCheck, mark broken --- .../python-modules/agate-sql/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 29bbfa81ed2..fb080bcc11b 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,20 +1,24 @@ { lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { - pname = "agate-sql"; - version = "0.5.5"; + pname = "agate-sql"; + version = "0.5.5"; - src = fetchPypi { - inherit pname version; - sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; + }; - propagatedBuildInputs = [ agate sqlalchemy crate ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; - meta = with lib; { - description = "Adds SQL read/write support to agate."; - homepage = "https://github.com/wireservice/agate-sql"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; - }; + pythonImportsCheck = [ "agatesql" ]; + + meta = with lib; { + description = "Adds SQL read/write support to agate."; + homepage = "https://github.com/wireservice/agate-sql"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; + }; } From c878b14107eea569142195b1e330191b3999f30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 19:45:50 +0100 Subject: [PATCH 10/11] zz: remove emojis from description --- pkgs/development/compilers/zz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index dade163c527..4713a1d9459 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "πŸΊπŸ™ ZetZ a zymbolic verifier and tranzpiler to bare metal C"; + description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C"; homepage = "https://github.com/zetzit/zz"; license = licenses.mit; maintainers = [ maintainers.marsam ]; From d5106e90dac8985a9a3acd33d1f25c24e7162fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 20:37:20 +0100 Subject: [PATCH 11/11] pythonPackages.dopy: add python importsCheck --- pkgs/development/python-modules/dopy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 538a861c9f4..9bd32d1ba4a 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -5,18 +5,22 @@ }: buildPythonPackage { - version = "2016-01-04"; pname = "dopy"; + version = "2016-01-04"; src = pkgs.fetchFromGitHub { owner = "Wiredcraft"; repo = "dopy"; rev = "cb443214166a4e91b17c925f40009ac883336dc3"; - sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; + sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; propagatedBuildInputs = [ requests six ]; + # contains no tests + doCheck = false; + pythonImportsCheck = [ "dopy" ]; + meta = with pkgs.lib; { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy";