dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-07 06:17:43 +00:00 committed by GitHub
commit cc5dccaa91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/hydrus/default.nix
View File

@ -10,14 +10,14 @@
pythonPackages.buildPythonPackage {
pname = "hydrus";
version = "413";
version = "420";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "9fbed11bef499e01a6799b298bea7d0967d30430";
sha256 = "1dl7qpzmlxl376lzm0chmwvf4nl55wz6fwcsw0ikb33rm8r33gq4";
rev = "067c4862a0ed8dd9264b464c69975b520139809f";
sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9";
};
nativeBuildInputs = [

4
pkgs/applications/misc/orca/default.nix
View File

@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
version = "3.38.0";
version = "3.38.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1vkg6p1dlrgx1yyscmy0m58inaq4ljshbdxw0nhi1nwqk3bpjchw";
sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld";
};
patches = [

1
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
python3
ruby
glib # for gdbus-codegen
] ++ stdenv.lib.optionals stdenv.isLinux [
wayland # for wayland-scanner
];

4
pkgs/development/python-modules/aiohttp-jinja2/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }:
buildPythonPackage rec {
pname = "aiohttp-jinja2";
@ -11,7 +11,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp jinja2 ];
checkInputs = [ pytest pytest-aiohttp ];
checkInputs = [ pytest pytest-aiohttp pytestcov ];
checkPhase = ''
pytest -W ignore::DeprecationWarning

4
pkgs/development/python-modules/cloudflare/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "cloudflare";
version = "2.8.13";
version = "2.8.14";
src = fetchPypi {
inherit pname version;
sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f";
sha256 = "5787892fdee3a6408b4290de0371426ab778a7ebf44decad9d843cab1ef0a1ac";
};
propagatedBuildInputs = [

8
pkgs/tools/misc/fd/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fd";
version = "8.1.1";
version = "8.2.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
sha256 = "0qzqnsjkq8i4gzn9273algx33kr1hzgxid8lnqp4awy2zxm4ksiq";
sha256 = "1g9jnf9h2s33l5q9z892vmvj78phwd4hfvspvnraxj4lvjp707ia";
};
cargoSha256 = "1d7hfgl9l4b9bnq2qcpvdq5rh7lpz33r19hw3wwgnqh142q67m7r";
cargoSha256 = "0yavp67fb4vqygww9kjzdi7gr7dj4aw47s03dkwlz526rhkhappw";
nativeBuildInputs = [ installShellFiles ];
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
installManPage doc/fd.1
installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish}
installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd
installShellCompletion --zsh contrib/completion/_fd
'';
meta = with lib; {

4
pkgs/tools/networking/ytcc/default.nix
View File

@ -19,11 +19,11 @@ python3Packages.buildPythonApplication rec {
# Disable tests that touch network or shell out to commands
checkPhase = ''
pytest . -k 'not get_channels \
pytest . -k "not get_channels \
and not play_video \
and not download_videos \
and not update_all \
and not add_channel_duplicate'
and not add_channel_duplicate"
'';
meta = {

6
pkgs/top-level/perl-packages.nix
View File

@ -598,10 +598,10 @@ let
Appcpm = buildPerlModule {
pname = "App-cpm";
version = "0.995";
version = "0.996";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.995.tar.gz";
sha256 = "b17fb0b7f97eb86430952bf387b6f08b5252413cb97474d1bf26e3376a4cc496";
url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz";
sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ];