gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-10-22 18:01:15 +00:00
committed by GitHub
parent fc25d94010 f918cedb26
commit c93daf97af
22 changed files with 301 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/config/console.nix
+1 -1
View File
@@ -116,7 +116,7 @@ in
{ console.keyMap = with config.services.xserver;
mkIf cfg.useXkbConfig
(pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
'${pkgs.ckbcomp}/bin/ckbcomp' \
'${pkgs.buildPackages.ckbcomp}/bin/ckbcomp' \
${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)
"-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"
} \
pkgs/applications/misc/blender/default.nix
+2 -2
View File
@@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "2.93.2";
version = "2.93.5";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4=";
sha256 = "1fsw8w80h8k5w4zmy659bjlzqyn5i198hi1kbpzfrdn8psxg2bfj";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ lib
, rustPlatform
, fetchFromGitHub
, withOpenCL ? true
, ocl-icd
}:
rustPlatform.buildRustPackage rec {
pname = "lucky-commit";
version = "2.1.0";
src = fetchFromGitHub {
owner = "not-an-aardvark";
repo = pname;
rev = "v${version}";
sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg";
};
cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY=";
buildInputs = lib.optional withOpenCL [ ocl-icd ];
cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";
# disable tests that require gpu
cargoTestFlags = [ "--no-default-features" ];
meta = with lib; {
description = "Change the start of your git commit hashes to whatever you want";
homepage = "https://github.com/not-an-aardvark/lucky-commit";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "lucky_commit";
};
}
pkgs/development/python-modules/adb-shell/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "adb-shell";
version = "0.4.1";
version = "0.4.2";
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg=";
sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/buildout/default.nix
+27 -8
View File
@@ -1,18 +1,37 @@
{ lib, buildPythonPackage, fetchPypi }:
{ buildPythonPackage
, fetchFromGitHub
, lib
, pip
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.13.4";
pname = "zc-buildout";
version = "3.0.0b2";
src = fetchPypi {
inherit pname version;
sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63";
src = fetchFromGitHub {
owner = "buildout";
repo = "buildout";
rev = version;
sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid";
};
propagatedBuildInputs = [
setuptools
pip
wheel
];
doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg"
pythonImportsCheck = [ "zc.buildout" ];
meta = with lib; {
homepage = "http://www.buildout.org";
description = "A software build and configuration system";
downloadPage = "https://github.com/buildout/buildout";
homepage = "https://www.buildout.org";
license = licenses.zpl21;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ superherointj ];
};
}
pkgs/development/python-modules/colorcet/default.nix
+13 -10
View File
@@ -1,12 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi
, nbsmoke
, param
, pyct
, nbsmoke
, flake8
, pytest
, pytest-mpl
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -24,25 +23,29 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
flake8
pytest-mpl
pytestCheckHook
];
checkPhase = ''
preCheck = ''
export HOME=$(mktemp -d)
mkdir -p $HOME/.config/matplotlib
echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
ln -s $HOME/.config/matplotlib $HOME/.matplotlib
# requires other backends to be available
pytest colorcet -k 'not matplotlib_default_colormap_plot'
'';
disabledTests = [
"matplotlib_default_colormap_plot"
];
pythonImportsCheck = [
"colorcet"
];
meta = with lib; {
description = "Collection of perceptually uniform colormaps";
homepage = "https://colorcet.pyviz.org";
license = licenses.cc-by-40;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}
pkgs/development/python-modules/hvplot/default.nix
+5 -18
View File
@@ -1,18 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
, bokeh
, buildPythonPackage
, colorcet
, fetchPypi
, holoviews
, pandas
, pytest
, parameterized
, nbsmoke
, flake8
, coveralls
, xarray
, networkx
, streamz
, colorcet
, pythonImportsCheckHook
}:
@@ -29,7 +21,6 @@ buildPythonPackage rec {
pythonImportsCheckHook
];
checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ];
propagatedBuildInputs = [
bokeh
colorcet
@@ -37,11 +28,7 @@ buildPythonPackage rec {
pandas
];
preCheck = ''
export HOME=$(mktemp -d)
'';
# many tests require a network connection
# Many tests require a network connection
doCheck = false;
pythonImportsCheck = [
@@ -52,6 +39,6 @@ buildPythonPackage rec {
description = "A high-level plotting API for the PyData ecosystem built on HoloViews";
homepage = "https://hvplot.pyviz.org";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}
pkgs/development/python-modules/intake/default.nix
+28 -20
View File
@@ -1,67 +1,71 @@
{ lib
, buildPythonPackage
, fetchPypi
, appdirs
, bokeh
, buildPythonPackage
, dask
, entrypoints
, fetchFromGitHub
, fsspec
, holoviews
, hvplot
, fsspec
, intake-parquet
, jinja2
, msgpack
, msgpack-numpy
, numpy
, pandas
, panel
, intake-parquet
, pyarrow
, pytestCheckHook
, pythonOlder
, python-snappy
, pythonOlder
, pyyaml
, requests
, ruamel_yaml
, six
, tornado
}:
buildPythonPackage rec {
pname = "intake";
version = "0.6.3";
version = "0.6.4";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "194cdd6lx92zcpkn3wgm490kxvw0c58ziix8hcihsr5ayfr1wdsl";
};
propagatedBuildInputs = [
appdirs
bokeh
dask
entrypoints
fsspec
holoviews
hvplot
jinja2
msgpack-numpy
msgpack
msgpack-numpy
numpy
pandas
panel
pyarrow
python-snappy
pyyaml
requests
ruamel_yaml
six
tornado
];
checkInputs = [
fsspec
intake-parquet
pyarrow
pytestCheckHook
];
postPatch = ''
# Is in setup_requires but not used in setup.py...
substituteInPlace setup.py --replace "'pytest-runner'" ""
substituteInPlace setup.py \
--replace "'pytest-runner'" ""
'';
# test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
@@ -72,7 +76,7 @@ buildPythonPackage rec {
'';
disabledTests = [
# disable tests which touch network and are broken
# Disable tests which touch network and are broken
"test_discover"
"test_filtered_compressed_cache"
"test_get_dir"
@@ -82,6 +86,10 @@ buildPythonPackage rec {
"test_remote_arr"
];
pythonImportsCheck = [
"intake"
];
meta = with lib; {
description = "Data load and catalog system";
homepage = "https://github.com/ContinuumIO/intake";
pkgs/development/python-modules/jaeger-client/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ buildPythonPackage
, fetchPypi
, lib
, opentracing
, threadloop
, thrift
, tornado
}:
buildPythonPackage rec {
pname = "jaeger-client";
version = "4.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3";
};
propagatedBuildInputs = [
threadloop
thrift
tornado
opentracing
];
# FIXME: Missing dependencies: tchannel, opentracing_instrumentation
# opentracing_instrumentation: Requires "tornado" lower than 6. Current is 6.1.
# https://github.com/uber-common/opentracing-python-instrumentation/pull/115
doCheck = false;
pythonImportsCheck = [ "jaeger_client" ];
meta = with lib; {
description = "Jaeger bindings for Python OpenTracing API";
downloadPage = "https://pypi.org/project/jaeger-client/";
homepage = "https://github.com/jaegertracing/jaeger-client-python";
license = licenses.asl20;
maintainers = with maintainers; [ superherointj ];
};
}
pkgs/development/python-modules/jupyter-server-mathjax/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib, buildPythonPackage, fetchPypi
, jupyter-packaging
, jupyter_server
, pytest-tornasync
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jupyter-server-mathjax";
version = "0.2.3";
src = fetchPypi {
inherit version;
pname = "jupyter_server_mathjax";
sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451";
};
nativeBuildInputs = [
jupyter-packaging
];
propagatedBuildInputs = [
jupyter_server
];
checkInputs = [
pytest-tornasync
pytestCheckHook
];
pythonImportsCheck = [ "jupyter_server_mathjax" ];
meta = with lib; {
description = "MathJax resources as a Jupyter Server Extension";
homepage = "http://jupyter.org";
license = licenses.bsd3;
maintainers = with maintainers; [ jonringer ];
};
}
pkgs/development/python-modules/nbdime/default.nix
+2
View File
@@ -18,6 +18,7 @@
, tornado
, requests
, GitPython
, jupyter-server-mathjax
, notebook
, jinja2
}:
@@ -59,6 +60,7 @@ buildPythonPackage rec {
py
setuptools
six
jupyter-server-mathjax
nbformat
colorama
pygments
pkgs/development/python-modules/param/default.nix
+21 -11
View File
@@ -1,28 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, flake8
, nose
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "param";
version = "1.11.1";
version = "1.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "b9857df01495bd55ddafb214fd1ed017d20699ce42ec2a0fd190d99caa03099f";
src = fetchFromGitHub {
owner = "holoviz";
repo = pname;
rev = "v${version}";
sha256 = "02zmd4bwyn8b4q1l9jgddc70ii1i7bmynacanl1cvbr6la4v9b2c";
};
checkInputs = [ flake8 nose ];
checkInputs = [
pytestCheckHook
];
# tests not included with pypi release
doCheck = false;
postPatch = ''
# Version is not set properly
substituteInPlace setup.py \
--replace 'version=get_setup_version("param"),' 'version="${version}",'
'';
pythonImportsCheck = [
"param"
];
meta = with lib; {
description = "Declarative Python programming using Parameters";
homepage = "https://github.com/pyviz/param";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}
pkgs/development/python-modules/pyct/default.nix
+12 -8
View File
@@ -3,9 +3,9 @@
, fetchPypi
, isPy27
, param
, pytestCheckHook
, pyyaml
, requests
, pytest
}:
buildPythonPackage rec {
@@ -17,22 +17,26 @@ buildPythonPackage rec {
sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
};
doCheck = !isPy27;
checkInputs = [ pytest ];
propagatedBuildInputs = [
param
pyyaml
requests
];
checkPhase = ''
pytest
'';
checkInputs = [
pytestCheckHook
];
doCheck = !isPy27;
pythonImportsCheck = [
"pyct"
];
meta = with lib; {
description = "Cli for python common tasks for users";
description = "ClI for Python common tasks for users";
homepage = "https://github.com/pyviz/pyct";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}
pkgs/development/python-modules/pywizlight/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "pywizlight";
version = "0.4.8";
version = "0.4.10";
src = fetchFromGitHub {
owner = "sbidy";
repo = pname;
rev = "v${version}";
sha256 = "0zagdb90bxmf06fzpljhqgsgzg36zc1yhdibacfrx8bmnx3l657h";
sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/threadloop/default.nix
+30
View File
@@ -0,0 +1,30 @@
{ buildPythonPackage
, fetchPypi
, lib
, tornado
}:
buildPythonPackage rec {
pname = "threadloop";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "8b180aac31013de13c2ad5c834819771992d350267bddb854613ae77ef571944";
};
propagatedBuildInputs = [
tornado
];
doCheck = false; # ImportError: cannot import name 'ThreadLoop' from 'threadloop'
pythonImportsCheck = [ "threadloop" ];
meta = with lib; {
description = "A library to run tornado coroutines from synchronous Python";
homepage = "https://github.com/GoodPete/threadloop";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
}
pkgs/development/python-modules/z3c-checkversions/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, python
, zc_buildout
, zc-buildout
, zope_testrunner
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d";
};
propagatedBuildInputs = [ zc_buildout ];
propagatedBuildInputs = [ zc-buildout ];
checkInputs = [ zope_testrunner ];
doCheck = !python.pkgs.isPy27;
checkPhase = ''
pkgs/servers/piping-server-rust/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "piping-server-rust";
version = "0.9.1";
src = fetchFromGitHub {
owner = "nwtgck";
repo = pname;
rev = "v${version}";
sha256 = "16jzl0nk14gzb5kvilr17f02b41ma7xwh8y0g42pm9sb7jdbcn7g";
};
cargoSha256 = "sha256-SDAxXYX51/4S7zRTdNZK9uSjKHKrAXpDJgRRDyu6qug=";
meta = with lib; {
description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
homepage = "https://github.com/nwtgck/piping-server-rust";
changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "piping-server";
};
}
pkgs/tools/misc/diffoscope/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "187";
version = "188";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-oXWdXJhf8OOxBcLumjeWW0Xev0LjcTScAw9baDOs6ls=";
sha256 = "sha256-kB3EnmnQYqal4cdzwArH+QdHe5wnUOnbjbQAz52g1Us=";
};
outputs = [ "out" "man" ];
pkgs/tools/security/terrascan/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terrascan";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ=";
sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg=";
};
vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";
pkgs/top-level/all-packages.nix
+4
View File
@@ -8451,6 +8451,8 @@ with pkgs;
pinnwand = callPackage ../servers/pinnwand { };
piping-server-rust = callPackage ../servers/piping-server-rust { };
pirate-get = callPackage ../tools/networking/pirate-get { };
pipr = callPackage ../applications/misc/pipr { };
@@ -26207,6 +26209,8 @@ with pkgs;
lscolors = callPackage ../applications/misc/lscolors { };
lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { };
luddite = with python3Packages; toPythonApplication luddite;
lumail = callPackage ../applications/networking/mailreaders/lumail {
pkgs/top-level/python-aliases.nix
+1 -1
View File
@@ -85,5 +85,5 @@ mapAliases ({
tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
WazeRouteCalculator = wazeroutecalculator; # 2021-09-29
websocket_client = websocket-client;
zc_buildout221 = zc_buildout; # added 2021-07-21
zc-buildout221 = zc-buildout; # added 2021-07-21
})
pkgs/top-level/python-packages.nix
+7 -1
View File
@@ -3835,6 +3835,8 @@ in {
j2cli = callPackage ../development/python-modules/j2cli { };
jaeger-client = callPackage ../development/python-modules/jaeger-client { };
janus = callPackage ../development/python-modules/janus { };
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
@@ -4013,6 +4015,8 @@ in {
pkgs-docker = pkgs.docker;
};
jupyter-server-mathjax = callPackage ../development/python-modules/jupyter-server-mathjax { };
jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };
@@ -9122,6 +9126,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo;
};
threadloop = callPackage ../development/python-modules/threadloop { };
threadpool = callPackage ../development/python-modules/threadpool { };
threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };
@@ -10009,7 +10015,7 @@ in {
zarr = callPackage ../development/python-modules/zarr { };
zc_buildout = callPackage ../development/python-modules/buildout { };
zc-buildout = callPackage ../development/python-modules/buildout { };
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };