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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-13 12:21:09 +00:00 committed by GitHub
commit 6da245f62a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 159 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/caerbannog/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, fetchgit
, fetchFromSourcehut
, python3
, glib
, gobject-introspection
@ -18,8 +18,9 @@ python3.pkgs.buildPythonApplication rec {
version = "0.3";
format = "other";
src = fetchgit {
url = "https://git.sr.ht/~craftyguy/caerbannog";
src = fetchFromSourcehut {
owner = "~craftyguy";
repo = "caerbannog";
rev = version;
sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh";
};

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "90.0.4430.19",
"sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
"sha256bin64": "1155mk933xvhd8141dp210akkmbcchly3q4cr7v176id50dvpnxl",
"version": "91.0.4442.4",
"sha256": "0cmm2pimkghb6s956bkqf2k77lj69dz51nlydgkqbvw0sc8n784k",
"sha256bin64": "1hbfx8n51p7dwwz1vbp94jdmlb96vvxrbql2af4kmvx1bmzr2ism",
"deps": {
"gn": {
"version": "2021-02-09",

8
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -39,6 +39,12 @@
, gsettings-desktop-schemas
, gnome3
# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
, libvaSupport ? true, libva
# For Vulkan support (--enable-features=Vulkan)
, vulkanSupport ? true, vulkan-loader
}:
with lib;
@ -63,6 +69,8 @@ let
kerberos libdrm mesa coreutils
libxkbcommon wayland
] ++ optional pulseSupport libpulseaudio
++ optional libvaSupport libva
++ optional vulkanSupport vulkan-loader
++ [ gtk3 ];
suffix = if channel != "stable" then "-" + channel else "";

4
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.4.15";
sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv";
version = "7.4.16";
sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.2";
sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0";
version = "8.0.3";
sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m";
});
in base.withExtensions ({ all, ... }: with all; ([

25
pkgs/development/python-modules/beniget/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
, gast
}:
buildPythonPackage rec {
pname = "beniget";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1";
};
propagatedBuildInputs = [
gast
];
meta = {
description = "Extract semantic information about static Python code";
homepage = "https://github.com/serge-sans-paille/beniget";
license = lib.licenses.bsd3;
};
}

5
pkgs/development/python-modules/cadquery/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, toPythonModule
, isPy3k
, pythonOlder
, pythonAtLeast
@ -23,7 +24,7 @@
}:
let
pythonocc-core-cadquery = stdenv.mkDerivation {
pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation {
pname = "pythonocc-core-cadquery";
version = "0.18.2";
@ -61,7 +62,7 @@ let
"-DSMESH_LIB_PATH=${smesh}/lib"
"-DPYTHONOCC_WRAP_SMESH=TRUE"
];
};
});
in
buildPythonPackage rec {

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "0.18.2";
version = "0.18.3";
disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "0gi7qm02sdlmmmz6vi8d7b7kibgw4q67kix55y4jsvi0bvwc0i8w";
sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "fluent-logger";
version = "0.9.6";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73";
sha256 = "678bda90c513ff0393964b64544ce41ef25669d2089ce6c3b63d9a18554b9bfa";
};
prePatch = ''

69
pkgs/development/python-modules/pythran/default.nix Normal file
View File

@ -0,0 +1,69 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestrunner
, ply
, networkx
, decorator
, gast
, six
, numpy
, beniget
, pytestCheckHook
, scipy
, isPy3k
}:
buildPythonPackage rec {
pname = "pythran";
version = "0.9.8post3";
src = fetchFromGitHub {
owner = "serge-sans-paille";
repo = "pythran";
rev = version;
sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4=";
};
nativeBuildInputs = [
pytestrunner
];
propagatedBuildInputs = [
ply
networkx
decorator
gast
six
numpy
beniget
];
pythonImportsCheck = [
"pythran"
"pythran.backend"
"pythran.middlend"
"pythran.passmanager"
"pythran.toolchain"
"pythran.spec"
];
checkInputs = [
pytestCheckHook
numpy
scipy
];
# Test suite is huge.
# Also, in the future scipy will rely on it resulting in a circular test dependency
doCheck = false;
disabled = !isPy3k;
meta = {
description = "Ahead of Time compiler for numeric kernels";
homepage = https://github.com/serge-sans-paille/pythran;
license = lib.licenses.bsd3;
};
}

9
pkgs/development/python-modules/urllib3/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, brotli
, buildPythonPackage
, certifi
@ -46,6 +47,14 @@ buildPythonPackage rec {
trustme
];
disabledTests = if stdenv.hostPlatform.isAarch64 then
[
"test_connection_closed_on_read_timeout_preload_false"
"test_ssl_failed_fingerprint_verification"
]
else
null;
pythonImportsCheck = [ "urllib3" ];
meta = with lib; {

4
pkgs/development/tools/lazygit/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
version = "0.25.1";
version = "0.26";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A4Nim1jnyMHd5hxyLu8oZkQ9nDWxTmaX/25WX714ry4=";
sha256 = "sha256-9CiXbMYb+EoxBrVFiPuWAlRJvYAq8hpxVDFcymk7Ud0=";
};
vendorSha256 = null;

4
pkgs/development/tools/open-policy-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "open-policy-agent";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
sha256 = "sha256-WMCd7+SUpKagoutBqI98KnoOd/UwJqFrSh0RAJQvuSo=";
sha256 = "sha256-IiPUmLgkD50LxOT+ZEf/UZJ0192GYOy9xk8U94Q0BWc=";
};
vendorSha256 = null;

1
pkgs/servers/matrix-synapse/plugins/default.nix
View File

@ -3,4 +3,5 @@
{
matrix-synapse-ldap3 = callPackage ./ldap3.nix { };
matrix-synapse-pam = callPackage ./pam.nix { };
matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { };
}

18
pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix Normal file
View File

@ -0,0 +1,18 @@
{ buildPythonPackage, fetchFromGitHub, twisted }:
buildPythonPackage rec {
pname = "matrix-synapse-shared-secret-auth";
version = "1.0.2";
src = fetchFromGitHub {
owner = "devture";
repo = "matrix-synapse-shared-secret-auth";
rev = version;
sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz";
};
doCheck = false;
pythonImportsCheck = [ "shared_secret_authenticator" ];
propagatedBuildInputs = [ twisted ];
}

6
pkgs/tools/misc/pistol/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pistol";
version = "0.1.8";
version = "0.1.9";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj";
sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs=";
};
vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws";
vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q=";
doCheck = false;

4
pkgs/top-level/python-packages.nix
View File

@ -955,6 +955,8 @@ in {
bellows = callPackage ../development/python-modules/bellows { };
beniget = callPackage ../development/python-modules/beniget { };
bespon = callPackage ../development/python-modules/bespon { };
betacode = callPackage ../development/python-modules/betacode { };
@ -6794,6 +6796,8 @@ in {
python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
pythran = callPackage ../development/python-modules/pythran { };
pyeverlights = callPackage ../development/python-modules/pyeverlights { };
pytile = callPackage ../development/python-modules/pytile { };