Merge pull request #115361 from SuperSandro2000/fix-collection24
This commit is contained in:
commit
8bad34a0f1
|
@ -1,10 +1,9 @@
|
||||||
{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
|
{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
|
||||||
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
|
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
|
||||||
, readline, gettext, libpng, libao, gfortran, perl
|
, 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);
|
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value
|
, 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)
|
, doSymlink ? true # symlink the executables to the default location (without dimension postfix)
|
||||||
|
@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
echo Building PALP optimized for ${dim} dimensions
|
echo Building PALP optimized for ${dim} dimensions
|
||||||
sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
|
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
|
# palp has no tests of its own. This test is an adapted sage test that failed
|
||||||
|
@ -42,14 +43,14 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p "$out/bin"
|
mkdir -p $out/bin
|
||||||
for file in poly class cws nef mori; do
|
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
|
done
|
||||||
'' + lib.optionalString doSymlink ''
|
'' + lib.optionalString doSymlink ''
|
||||||
cd "$out/bin"
|
cd $out/bin
|
||||||
for file in poly class cws nef mori; do
|
for file in poly class cws nef mori; do
|
||||||
ln -sf $file-6d.x $file.x
|
ln -sf $file-6d.x $file.x
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
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";
|
homepage = "https://github.com/zetzit/zz";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.marsam ];
|
maintainers = [ maintainers.marsam ];
|
||||||
|
|
|
@ -1,26 +1,32 @@
|
||||||
{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
|
{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "arb";
|
pname = "arb";
|
||||||
version = "2.17.0";
|
version = "2.17.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fredrik-johansson";
|
owner = "fredrik-johansson";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
|
sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
|
||||||
};
|
};
|
||||||
buildInputs = [mpir gmp mpfr flint];
|
|
||||||
|
buildInputs = [ mpir gmp mpfr flint ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-gmp=${gmp}"
|
"--with-gmp=${gmp}"
|
||||||
"--with-mpir=${mpir}"
|
"--with-mpir=${mpir}"
|
||||||
"--with-mpfr=${mpfr}"
|
"--with-mpfr=${mpfr}"
|
||||||
"--with-flint=${flint}"
|
"--with-flint=${flint}"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A library for arbitrary-precision interval arithmetic";
|
description = "A library for arbitrary-precision interval arithmetic";
|
||||||
homepage = "https://arblib.org/";
|
homepage = "https://arblib.org/";
|
||||||
license = lib.licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = teams.sage.members;
|
maintainers = teams.sage.members;
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,20 +1,24 @@
|
||||||
{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
|
{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "agate-sql";
|
pname = "agate-sql";
|
||||||
version = "0.5.5";
|
version = "0.5.5";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
|
sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ agate sqlalchemy crate ];
|
propagatedBuildInputs = [ agate sqlalchemy crate ];
|
||||||
|
|
||||||
meta = with lib; {
|
pythonImportsCheck = [ "agatesql" ];
|
||||||
description = "Adds SQL read/write support to agate.";
|
|
||||||
homepage = "https://github.com/wireservice/agate-sql";
|
meta = with lib; {
|
||||||
license = with licenses; [ mit ];
|
description = "Adds SQL read/write support to agate.";
|
||||||
maintainers = with maintainers; [ vrthra ];
|
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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,18 +5,22 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
version = "2016-01-04";
|
|
||||||
pname = "dopy";
|
pname = "dopy";
|
||||||
|
version = "2016-01-04";
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "Wiredcraft";
|
owner = "Wiredcraft";
|
||||||
repo = "dopy";
|
repo = "dopy";
|
||||||
rev = "cb443214166a4e91b17c925f40009ac883336dc3";
|
rev = "cb443214166a4e91b17c925f40009ac883336dc3";
|
||||||
sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
|
sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests six ];
|
propagatedBuildInputs = [ requests six ];
|
||||||
|
|
||||||
|
# contains no tests
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "dopy" ];
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
meta = with pkgs.lib; {
|
||||||
description = "Digital Ocean API python wrapper";
|
description = "Digital Ocean API python wrapper";
|
||||||
homepage = "https://github.com/Wiredcraft/dopy";
|
homepage = "https://github.com/Wiredcraft/dopy";
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn,
|
{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn
|
||||||
libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } :
|
, 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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "biboumi";
|
pname = "biboumi";
|
||||||
version = "9.0";
|
version = "9.0";
|
||||||
|
@ -10,22 +17,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy";
|
sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy";
|
||||||
};
|
};
|
||||||
|
|
||||||
louiz_catch = fetchgit {
|
|
||||||
url = "https://lab.louiz.org/louiz/Catch.git";
|
|
||||||
rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
|
|
||||||
sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./catch.patch ];
|
patches = [ ./catch.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ];
|
nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ];
|
||||||
buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd
|
buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ];
|
||||||
udns ];
|
|
||||||
buildFlags = [ "all" "man" ];
|
buildFlags = [ "all" "man" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
|
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;
|
doCheck = true;
|
||||||
|
|
|
@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fixes a failing dbf related test. Won't be needed on 1.0.6 or later.
|
# 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";
|
url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch";
|
||||||
sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7";
|
sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7";
|
||||||
})
|
})
|
||||||
|
@ -23,17 +23,22 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
agate-dbf
|
agate-dbf
|
||||||
agate-sql
|
agate-sql
|
||||||
six
|
six
|
||||||
setuptools # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = with python3.pkgs; [
|
checkInputs = with python3.pkgs; [
|
||||||
nose pytestCheckHook
|
nose
|
||||||
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "csvkit" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A suite of command-line tools for converting to and working with CSV";
|
description = "A suite of command-line tools for converting to and working with CSV";
|
||||||
maintainers = with maintainers; [ vrthra ];
|
maintainers = with maintainers; [ vrthra ];
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
homepage = "https://github.com/wireservice/csvkit";
|
homepage = "https://github.com/wireservice/csvkit";
|
||||||
|
# FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL)
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -402,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
|
buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
|
||||||
valgrind.dev
|
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" ''
|
(pkgs.writeText "zend_file_cache_config.patch" ''
|
||||||
--- a/ext/opcache/zend_file_cache.c
|
--- a/ext/opcache/zend_file_cache.c
|
||||||
+++ b/ext/opcache/zend_file_cache.c
|
+++ b/ext/opcache/zend_file_cache.c
|
||||||
|
|
Loading…
Reference in New Issue