b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #113098 from SuperSandro2000/fix-collection12

Browse source
This commit is contained in:
Sandro 2021-02-17 13:28:08 +01:00 committed by GitHub
parent c9150d6eeb a748566693
commit 83c9307474
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/editors/spacevim/default.nix
View file

@ -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 {

33
pkgs/applications/misc/xygrib/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:
stdenv.mkDerivation rec {
version = "1.2.6.1";
@ -13,26 +13,29 @@ 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 ''
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
wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib"
'' else ''
wrapQtApp $out/XyGrib/XyGrib
mkdir -p $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
'';
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
wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib"
'' else ''
wrapQtApp $out/XyGrib/XyGrib
mkdir -p $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
'';
meta = with lib; {
homepage = "https://opengribs.org";
description = "Weather Forecast Visualization";
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.'';
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.
'';
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ j03 SuperSandro2000 ];

2
pkgs/applications/networking/dnscontrol/default.nix
View file

@ -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/";

2
pkgs/development/python-modules/codespell/default.nix
View file

@ -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" ];

5
pkgs/development/python-modules/google-i18n-address/default.nix
View file

@ -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
pkgs/development/python-modules/hstspreload/default.nix
View file

@ -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 ];
};
}

1
pkgs/development/python-modules/imbalanced-learn/default.nix
View file

@ -36,6 +36,7 @@ buildPythonPackage rec {
"_generator"
"show_versions"
"test_make_imbalanced_iris"
"test_rusboost[SAMME.R]"
];
meta = with lib; {

9
pkgs/development/python-modules/intake/default.nix
View file

@ -64,14 +64,17 @@ buildPythonPackage rec {
PATH=$out/bin:$PATH
'';
# disable tests which touch network
disabledTests = ''
disabledTests = [
# disable tests which touch network
"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";

2
pkgs/development/python-modules/mlxtend/default.nix
View file

@ -45,5 +45,7 @@ buildPythonPackage rec {
license= licenses.bsd3;
maintainers = with maintainers; [ evax ];
platforms = platforms.unix;
# incompatible with nixpkgs scikitlearn version
broken = true;
};
}

3
pkgs/development/python-modules/pandas/default.nix
View file

@ -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

2
pkgs/development/python-modules/skorch/default.nix
View file

@ -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;
};
}

3
pkgs/development/python-modules/tiledb/default.nix
View file

@ -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;
};
}

2
pkgs/development/python-modules/torchvision/default.nix
View file

@ -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 ];
};
}

11
pkgs/development/python-modules/uproot3/default.nix
View file

@ -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

2
pkgs/misc/vim-plugins/overrides.nix
View file

@ -7,9 +7,7 @@
, ruby
, which
, fetchFromGitHub
, fetchgit
, fetchurl
, fetchzip
, fetchpatch
, llvmPackages
, rustPlatform

2
pkgs/tools/misc/expect/default.nix
View file

@ -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/";

2
pkgs/tools/misc/parallel/default.nix
View file

@ -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 ];

2
pkgs/tools/text/source-highlight/default.nix
View file

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
outputs = [ "out" "doc" "dev" ];
meta = with lib; {
description = "Source code renderer with syntax highlighting";
longDescription = ''