Merge pull request #113098 from SuperSandro2000/fix-collection12
This commit is contained in:
Sandro
GitHub
commit
83c9307474
@ -1,6 +1,6 @@
|
||||
{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir
|
||||
, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }:
|
||||
with stdenv;
|
||||
{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub
|
||||
, lib, stdenv, formats, spacevim_config ? import ./init.nix }:
|
||||
|
||||
let
|
||||
format = formats.toml {};
|
||||
vim-customized = vim_configurable.customize {
|
||||
@ -11,7 +11,7 @@ let
|
||||
vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; };
|
||||
};
|
||||
spacevimdir = format.generate "init.toml" spacevim_config;
|
||||
in mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "spacevim";
|
||||
version = "1.5.0";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
|
||||
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ]
|
||||
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
|
||||
|
||||
postInstall = if stdenv.isDarwin then ''
|
||||
postInstall =
|
||||
if stdenv.isDarwin then ''
|
||||
mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources"
|
||||
cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns"
|
||||
mv $out/XyGrib/XyGrib.app $out/Applications
|
||||
@ -30,9 +31,11 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://opengribs.org";
|
||||
description = "Weather Forecast Visualization";
|
||||
longDescription = ''XyGrib is a leading opensource weather visualization package.
|
||||
longDescription = ''
|
||||
XyGrib is a leading opensource weather visualization package.
|
||||
It interacts with OpenGribs's Grib server providing a choice
|
||||
of global and large area atmospheric and wave models.'';
|
||||
of global and large area atmospheric and wave models.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ j03 SuperSandro2000 ];
|
||||
|
||||
@ -15,6 +15,8 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Synchronize your DNS to multiple providers from a simple DSL";
|
||||
homepage = "https://stackexchange.github.io/dnscontrol/";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonApplication rec {
|
||||
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
|
||||
'';
|
||||
|
||||
# tries to run not rully installed script
|
||||
# tries to run not fully installed script
|
||||
disabledTests = [ "test_command" ];
|
||||
|
||||
pythonImportsCheck = [ "codespell_lib" ];
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }:
|
||||
{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-i18n-address";
|
||||
version = "2.4.0";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -15,7 +16,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google's i18n address data packaged for Python";
|
||||
homepage = "https://pypi.org/project/google-i18n-address/";
|
||||
homepage = "https://github.com/mirumee/google-i18n-address";
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2020.12.22";
|
||||
version = "2021.2.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc";
|
||||
sha256 = "sha256-R6tqGxGd6JymFgQX+deDPOtlKlwUjL7uf+zGdNxUW/s=";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
||||
description = "Chromium HSTS Preload list as a Python package and updated daily";
|
||||
homepage = "https://github.com/sethmlarson/hstspreload";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -36,6 +36,7 @@ buildPythonPackage rec {
|
||||
"_generator"
|
||||
"show_versions"
|
||||
"test_make_imbalanced_iris"
|
||||
"test_rusboost[SAMME.R]"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -64,14 +64,17 @@ buildPythonPackage rec {
|
||||
PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# disable tests which touch network
|
||||
disabledTests = ''
|
||||
"test_discover"
|
||||
"test_filtered_compressed_cache"
|
||||
"test_get_dir"
|
||||
"test_remote_cat"
|
||||
"http"
|
||||
'';
|
||||
|
||||
# broken test
|
||||
"test_read_pattern_with"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data load and catalog system";
|
||||
|
||||
@ -45,5 +45,7 @@ buildPythonPackage rec {
|
||||
license= licenses.bsd3;
|
||||
maintainers = with maintainers; [ evax ];
|
||||
platforms = platforms.unix;
|
||||
# incompatible with nixpkgs scikitlearn version
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
# Test Inputs
|
||||
, glibcLocales
|
||||
, hypothesis
|
||||
, moto
|
||||
, pytestCheckHook
|
||||
# Darwin inputs
|
||||
, runtimeShell
|
||||
@ -54,7 +53,7 @@ buildPythonPackage rec {
|
||||
xlwt
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ];
|
||||
checkInputs = [ pytestCheckHook glibcLocales hypothesis ];
|
||||
|
||||
# doesn't work with -Werror,-Wunused-command-line-argument
|
||||
# https://github.com/NixOS/nixpkgs/issues/39687
|
||||
|
||||
@ -41,5 +41,7 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
# TypeError: __init__() got an unexpected keyword argument 'iid'
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -81,6 +81,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/TileDB-Inc/TileDB-Py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
# tiledb/core.cc:556:30: error: ‘struct std::array<long unsigned int, 2>’ has no member named ‘second’
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -45,6 +45,6 @@ buildPythonPackage rec {
|
||||
description = "PyTorch vision library";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ericsagnes SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,21 +1,24 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, isPy27
|
||||
, awkward0, backports_lzma, cachetools, lz4, pandas
|
||||
, pytestCheckHook, pytestrunner, pkgconfig, mock
|
||||
, pytestCheckHook, pkgconfig, mock
|
||||
, numpy, requests, uproot3-methods, xxhash, zstandard
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot3";
|
||||
version = "3.14.2";
|
||||
version = "3.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot3";
|
||||
rev = version;
|
||||
sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc=";
|
||||
sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awkward0
|
||||
|
||||
@ -7,9 +7,7 @@
|
||||
, ruby
|
||||
, which
|
||||
, fetchFromGitHub
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, llvmPackages
|
||||
, rustPlatform
|
||||
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for automating interactive applications";
|
||||
homepage = "http://expect.sourceforge.net/";
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace src/parallel --subst-var-by coreutils ${coreutils}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl procps ];
|
||||
|
||||
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
outputs = [ "out" "doc" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code renderer with syntax highlighting";
|
||||
longDescription = ''
|
||||
|
||||
Loading…
Reference in New Issue
Block a user