diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index 2193d0ea5bb..c32130986b8 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -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 { diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 68adc2abbf9..864ea27ede7 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 55a16f42f16..2af3e8fe560 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -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/"; diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index e1aa8252d13..7427d391c61 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 590962590e5..53ce654e41b 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 7562e36e4d9..d01fd389762 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index d40774b86b6..3805b55bcf1 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { "_generator" "show_versions" "test_make_imbalanced_iris" + "test_rusboost[SAMME.R]" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 922d543fd1d..f3f8c96a6f4 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 35f55bb2793..44402b36ec0 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -45,5 +45,7 @@ buildPythonPackage rec { license= licenses.bsd3; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # incompatible with nixpkgs scikitlearn version + broken = true; }; } diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ab70a7782ad..7ef78f9dfbb 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -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 diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 7ea4604ff37..fd161ecd753 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -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; }; } diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index d5379b849ad..ddfa83e30f5 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -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’ has no member named ‘second’ + broken = true; }; - } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 79f6a19ffcb..35759215182 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix index 1150c76d2b4..c6923773427 100644 --- a/pkgs/development/python-modules/uproot3/default.nix +++ b/pkgs/development/python-modules/uproot3/default.nix @@ -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 diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 9b1aa6cd051..94f464515ce 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -7,9 +7,7 @@ , ruby , which , fetchFromGitHub -, fetchgit , fetchurl -, fetchzip , fetchpatch , llvmPackages , rustPlatform diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 12e63686d51..718da8dca4a 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -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/"; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 720b73f3fe2..aec80f0ede0 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -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 ]; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index c8eb43a51c9..6e1a7b24b59 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + outputs = [ "out" "doc" "dev" ]; + meta = with lib; { description = "Source code renderer with syntax highlighting"; longDescription = ''