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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-11-27 12:01:45 +00:00 committed by GitHub
parent d3e80e4be3 e0e58321cc
commit 86adbaf70c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 65 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/maestral-qt/default.nix
View file

@ -56,9 +56,11 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
homepage = "https://maestral.app";
changelog = "https://github.com/samschott/maestral/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg sfrijters ];
platforms = platforms.linux;
homepage = "https://maestral.app";
mainProgram = "maestral_qt";
};
}

4
pkgs/applications/office/tagainijisho/default.nix
View file

@ -1,11 +1,11 @@
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
mkDerivation rec {
pname = "tagainijisho";
version = "1.2.1";
version = "1.2.2";
src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8=";
hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94=";
};
nativeBuildInputs = [ cmake ];

12
pkgs/applications/version-management/mercurial/default.nix
View file

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.3.0";
version = "6.3.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg=";
sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE=";
sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@ -157,9 +157,9 @@ let
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
# Test broken with recent versions of git due to default policy change
# https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302
test-convert-git.t
# Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3.
# https://bz.mercurial-scm.org/show_bug.cgi?id=6760
test-https.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"

1
pkgs/build-support/docker/default.nix
View file

@ -19,7 +19,6 @@
, pigz
, rsync
, runCommand
, runCommandNoCC
, runtimeShell
, shadow
, skopeo

36
pkgs/development/python-modules/flake8-import-order/default.nix
View file

@ -1,25 +1,45 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }:
{ lib
, buildPythonPackage
, fetchPypi
, flake8
, pycodestyle
, pylama
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "flake8-import-order";
version = "0.18.1";
version = "0.18.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
};
propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
propagatedBuildInputs = [
pycodestyle
];
checkInputs = [ pytest flake8 pycodestyle pylama ];
checkInputs = [
flake8
pycodestyle
pylama
pytestCheckHook
];
checkPhase = ''
pytest --strict
'';
pythonImportsCheck = [
"flake8_import_order"
];
meta = with lib; {
description = "Flake8 and pylama plugin that checks the ordering of import statements";
homepage = "https://github.com/PyCQA/flake8-import-order";
changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst";
license = with licenses; [ lgpl3 mit ];
maintainers = with maintainers; [ ];
};
}

5
pkgs/development/python-modules/geomet/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "geomet";
version = "0.3.1";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "geomet";
repo = "geomet";
rev = "refs/tags/${version}";
hash = "sha256-7QfvGQlg4nTr1rwTyvTNm6n/jFptLtpBKMjjQj6OXCQ=";
hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw=";
};
propagatedBuildInputs = [
@ -32,6 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa";
homepage = "https://github.com/geomet/geomet";
changelog = "https://github.com/geomet/geomet/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ turion ris ];
};

5
pkgs/development/python-modules/globus-sdk/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.14.0";
version = "3.15.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA=";
hash = "sha256-g4QdVxZmlr4iVL0n/XG+dKm5CCjKO4oi5Xw+lgH+xv8=";
};
propagatedBuildInputs = [
@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
homepage = "https://github.com/globus/globus-sdk-python";
changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ixxie ];
};

5
pkgs/development/python-modules/holidays/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.17";
version = "0.17.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nxa2Dwe+KgPKqj1sqLDWau6JkLcgag0TlM4x+tK0JC4=";
hash = "sha256-EWBFNfZq2dj4TlHBcQKWDof8OBn4RESvaLHrh1aGZjA=";
};
propagatedBuildInputs = [
@ -39,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Generate and work with holidays in Python";
homepage = "https://github.com/dr-prodigy/python-holidays";
changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}";
license = licenses.mit;
maintainers = with maintainers; [ jluttine ];
};

7
pkgs/development/python-modules/homematicip/default.nix
View file

@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.9";
version = "1.0.10";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "hahn-th";
repo = "homematicip-rest-api";
rev = "refs/tags/${version}";
hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA=";
hash = "sha256-CnZHR5JyZm4T6Fm5VumZJujQvEdw59c7GSwcyO7EXXY=";
};
propagatedBuildInputs = [
@ -86,6 +86,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for the homematicIP REST API";
homepage = "https://github.com/hahn-th/homematicip-rest-api";
changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${version}";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};

5
pkgs/development/python-modules/hvplot/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "hvplot";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-U93+BnQ8TVkk+x5ZdlW/oU6A/q9XpDi/0oRC02rHwrY=";
hash = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs=";
};
propagatedBuildInputs = [
@ -37,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A high-level plotting API for the PyData ecosystem built on HoloViews";
homepage = "https://hvplot.pyviz.org";
changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
};

5
pkgs/development/python-modules/pydeps/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydeps";
version = "1.10.24";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-yDHIZk6+9K5hg4Q6pydd4NwnxSU1+u+dGUiUQph9ccY=";
hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0=";
};
buildInputs = [
@ -54,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module dependency visualization";
homepage = "https://github.com/thebjorn/pydeps";
changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ fab ];
};

7
pkgs/os-specific/linux/kernel/perf/default.nix
View file

@ -78,7 +78,10 @@ stdenv.mkDerivation {
patchShebangs pmu-events/jevents.py
'';
makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags;
makeFlags = [ "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" ] ++ kernel.makeFlags
++ lib.optional (!withGtk) "NO_GTK2=1"
++ lib.optional (!withZstd) "NO_LIBZSTD=1"
++ lib.optional (!withLibcap) "NO_LIBCAP=1";
hardeningDisable = [ "format" ];
@ -127,7 +130,7 @@ stdenv.mkDerivation {
doCheck = false; # requires "sparse"
installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ];
installTargets = [ "install" "install-man" ];
# TODO: Add completions based on perf-completion.sh
postInstall = ''

4
pkgs/servers/misc/oven-media-engine/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "oven-media-engine";
version = "0.14.14";
version = "0.14.16";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
sha256 = "sha256-ur3CnkIOtGRJJKfYIrlJ6bqkO06C6unizCUb9Ea9nGI=";
sha256 = "sha256-c9DyjVQ/s0bWueTFrNNoknhZhirrdLSkV6qTOqKk6GQ=";
};
sourceRoot = "source/src";