git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115361 from SuperSandro2000/fix-collection24
commit8bad34a0f1956955f77e43ffb5c531d19678ad1f authorSandro <sandro.jaeckel@gmail.com> dateMon 8 Mar 2021, 02:23 (6 years ago) parent39acd7fd5106e9
9 files changed+64−44
pkgs/applications/science/math/giac/default.nix+1−2 pkgs/applications/science/math/palp/default.nix+8−7 pkgs/development/compilers/zz/default.nix+1−1 pkgs/development/libraries/arb/default.nix+10−4 pkgs/development/python-modules/agate-sql/default.nix+17−13 pkgs/development/python-modules/dopy/default.nix+6−2 pkgs/servers/xmpp/biboumi/default.nix+12−11 pkgs/tools/text/csvkit/default.nix+8−3 pkgs/top-level/php-packages.nix+1−1
pkgs/applications/science/math/giac/default.nix+1−2
@@ -1,10 +1,9 @@
11{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
22, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
33, readline, gettext, libpng, libao, gfortran, perl
4−, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
4+, enableGUI ? false, libGL, libGLU, xorg, fltk
55}:
66
7−assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
87assert (!blas.isILP64) && (!lapack.isILP64);
98
109stdenv.mkDerivation rec {
pkgs/applications/science/math/palp/default.nix+8−7
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value
45, doSymlink ? true # symlink the executables to the default location (without dimension postfix)
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
2526 '';
2627
2728 preBuild = ''
28− echo Building PALP optimized for ${dim} dimensions
29− sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
29+ echo Building PALP optimized for ${dim} dimensions
30+ sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
3031 '';
3132
3233 # palp has no tests of its own. This test is an adapted sage test that failed
@@ -42,14 +43,14 @@ stdenv.mkDerivation rec {
4243 '';
4344
4445 installPhase = ''
45− mkdir -p "$out/bin"
46+ mkdir -p $out/bin
4647 for file in poly class cws nef mori; do
47− cp -p $file.x "$out/bin/$file-${dim}d.x"
48+ cp -p $file.x "$out/bin/$file-${dim}d.x"
4849 done
4950 '' + lib.optionalString doSymlink ''
50− cd "$out/bin"
51+ cd $out/bin
5152 for file in poly class cws nef mori; do
52− ln -sf $file-6d.x $file.x
53+ ln -sf $file-6d.x $file.x
5354 done
5455 '';
5556
pkgs/development/compilers/zz/default.nix+1−1
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
3131 '';
3232
3333 meta = with lib; {
34− description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C";
34+ description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C";
3535 homepage = "https://github.com/zetzit/zz";
3636 license = licenses.mit;
3737 maintainers = [ maintainers.marsam ];
pkgs/development/libraries/arb/default.nix+10−4
@@ -1,26 +1,32 @@
1−{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
1+{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
2+
23stdenv.mkDerivation rec {
34 pname = "arb";
45 version = "2.17.0";
6+
57 src = fetchFromGitHub {
68 owner = "fredrik-johansson";
79 repo = pname;
810 rev = version;
911 sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
1012 };
11− buildInputs = [mpir gmp mpfr flint];
13+
14+ buildInputs = [ mpir gmp mpfr flint ];
15+
1216 configureFlags = [
1317 "--with-gmp=${gmp}"
1418 "--with-mpir=${mpir}"
1519 "--with-mpfr=${mpfr}"
1620 "--with-flint=${flint}"
1721 ];
22+
1823 doCheck = true;
24+
1925 meta = with lib; {
2026 description = "A library for arbitrary-precision interval arithmetic";
2127 homepage = "https://arblib.org/";
22− license = lib.licenses.lgpl21Plus;
28+ license = licenses.lgpl21Plus;
2329 maintainers = teams.sage.members;
24− platforms = lib.platforms.unix;
30+ platforms = platforms.unix;
2531 };
2632}
pkgs/development/python-modules/agate-sql/default.nix+17−13
@@ -1,20 +1,24 @@
11{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
22
33buildPythonPackage rec {
4− pname = "agate-sql";
5− version = "0.5.5";
4+ pname = "agate-sql";
5+ version = "0.5.5";
66
7− src = fetchPypi {
8− inherit pname version;
9− sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
10− };
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
10+ };
1111
12− propagatedBuildInputs = [ agate sqlalchemy crate ];
12+ propagatedBuildInputs = [ agate sqlalchemy crate ];
1313
14− meta = with lib; {
15− description = "Adds SQL read/write support to agate.";
16− homepage = "https://github.com/wireservice/agate-sql";
17− license = with licenses; [ mit ];
18− maintainers = with maintainers; [ vrthra ];
19− };
14+ pythonImportsCheck = [ "agatesql" ];
15+
16+ meta = with lib; {
17+ description = "Adds SQL read/write support to agate.";
18+ homepage = "https://github.com/wireservice/agate-sql";
19+ license = with licenses; [ mit ];
20+ maintainers = with maintainers; [ vrthra ];
21+ # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL)
22+ broken = true;
23+ };
2024}
pkgs/development/python-modules/dopy/default.nix+6−2
@@ -5,18 +5,22 @@
55}:
66
77buildPythonPackage {
8− version = "2016-01-04";
98 pname = "dopy";
9+ version = "2016-01-04";
1010
1111 src = pkgs.fetchFromGitHub {
1212 owner = "Wiredcraft";
1313 repo = "dopy";
1414 rev = "cb443214166a4e91b17c925f40009ac883336dc3";
15− sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
15+ sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
1616 };
1717
1818 propagatedBuildInputs = [ requests six ];
1919
20+ # contains no tests
21+ doCheck = false;
22+ pythonImportsCheck = [ "dopy" ];
23+
2024 meta = with pkgs.lib; {
2125 description = "Digital Ocean API python wrapper";
2226 homepage = "https://github.com/Wiredcraft/dopy";
pkgs/servers/xmpp/biboumi/default.nix+12−11
@@ -1,6 +1,13 @@
1−{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn,
2− libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } :
1+{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn
2+, libiconv, botan2, systemd, pkg-config, udns, python3Packages } :
33
4+let
5+ louiz_catch = fetchgit {
6+ url = "https://lab.louiz.org/louiz/Catch.git";
7+ rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
8+ sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
9+ };
10+in
411stdenv.mkDerivation rec {
512 pname = "biboumi";
613 version = "9.0";
@@ -10,22 +17,16 @@ stdenv.mkDerivation rec {
1017 sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy";
1118 };
1219
13− louiz_catch = fetchgit {
14− url = "https://lab.louiz.org/louiz/Catch.git";
15− rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
16− sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
17− };
18−
1920 patches = [ ./catch.patch ];
2021
2122 nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ];
22− buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd
23− udns ];
23+ buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ];
24+
2425 buildFlags = [ "all" "man" ];
2526
2627 preConfigure = ''
2728 substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
28− cp $louiz_catch/single_include/catch.hpp tests/
29+ cp ${louiz_catch}/single_include/catch.hpp tests/
2930 '';
3031
3132 doCheck = true;
pkgs/tools/text/csvkit/default.nix+8−3
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
1111
1212 patches = [
1313 # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later.
14− (fetchpatch{
14+ (fetchpatch {
1515 url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch";
1616 sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7";
1717 })
@@ -23,17 +23,22 @@ python3.pkgs.buildPythonApplication rec {
2323 agate-dbf
2424 agate-sql
2525 six
26− setuptools # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594
26+ setuptools
2727 ];
2828
2929 checkInputs = with python3.pkgs; [
30− nose pytestCheckHook
30+ nose
31+ pytestCheckHook
3132 ];
3233
34+ pythonImportsCheck = [ "csvkit" ];
35+
3336 meta = with lib; {
3437 description = "A suite of command-line tools for converting to and working with CSV";
3538 maintainers = with maintainers; [ vrthra ];
3639 license = licenses.mit;
3740 homepage = "https://github.com/wireservice/csvkit";
41+ # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL)
42+ broken = true;
3843 };
3944}
pkgs/top-level/php-packages.nix+1−1
@@ -402,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; {
402402 buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
403403 valgrind.dev
404404 ];
405− patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [
405+ patches = lib.optionals (lib.versionOlder php.version "7.4") [
406406 (pkgs.writeText "zend_file_cache_config.patch" ''
407407 --- a/ext/opcache/zend_file_cache.c
408408 +++ b/ext/opcache/zend_file_cache.c