ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-16 12:02:44 +00:00 committed by GitHub
commit ec85a5daac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.14.3";
version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ch8ho4T3R9qwQiaP+n5Q21x62Ip3ibtqDJIDnobbh5c=";
hash = "sha256-AfRL2u1wMXXCCfKyrD0F96hXap88TQx7D1fjFWGKDy4=";
};
propagatedBuildInputs = [

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

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "2.5.1";
version = "2.5.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-w/av9U42fC4g7NUw7PSW+K822klH4e1xYFPh7I4jrRA=";
hash = "sha256-pMUevLUHYVJqgFRSd2dhwbc4KFUGy9cWsuMMwQ1atRk=";
};
nativeBuildInputs = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dropbox";
version = "11.31.0";
version = "11.32.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "dropbox";
repo = "dropbox-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-mbBVivrpXYNuVbXeHRyy07LxPbtYvaL3JleK7QXOxi0=";
hash = "sha256-eb4GhmQJk60x02sFEYPF9x07lVRhVMFKYd9owO78S00=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigtable/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.10.0";
version = "2.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nicUpEaPhDBmWU2jP/R01d54xu9tgNUxZVD4gZGAyAw=";
hash = "sha256-f4wMYlmex0QrcJrl33VyOZgbURYnIjeWDR7rz4MzMJw=";
};
propagatedBuildInputs = [

19
pkgs/development/python-modules/growattserver/default.nix
View File

@ -7,31 +7,28 @@
buildPythonPackage rec {
pname = "growattserver";
version = "1.2.0";
disabled = pythonOlder "3.6";
version = "1.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = version;
sha256 = "0v9clmz4qg6krmbsbfsrhsan824y2mqvwxsxb0fzfgaszxwkpm30";
hash = "sha256-dS5Ng89aYzfegdFlyt1eo7vhva2ME77pQV2hkd/iNq8=";
};
propagatedBuildInputs = [
requests
];
postPatch = ''
# https://github.com/indykoning/PyPi_GrowattServer/issues/2
substituteInPlace setup.py \
--replace "tag = os.environ['LATEST_TAG']" "" \
--replace "version=tag," 'version="${version}",'
'';
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "growattServer" ];
pythonImportsCheck = [
"growattServer"
];
meta = with lib; {
description = "Python package to retrieve information from Growatt units";

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.32.1";
version = "2.34.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fjahaMetgZaH+IzdyaZSkVbasgc0bqQL+1ae0OJriT0=";
sha256 = "sha256-3Go0w/7jcv1XzZ7ypSdPzMZgzEj2+sMlrIm4X1r34MA=";
};
checkInputs = [

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

@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "trytond";
version = "6.4.1";
version = "6.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8Ah1zNQzcVgYSqCIGRN+6o8qzVPd3WzygGtVnyojHuk=";
sha256 = "sha256-ylRyTpTnciZiBeG/Mx9PGBXFdh4q3qENeygY3NDDPKU=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.9.2";
version = "7.9.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-JFCYHiPvKYveHYf6SWkmovuvas5+9IGpsnQWqVIaTto=";
hash = "sha256-tTtfrIapIaC3oidqWRntkZ1T1eKZ9/ggKbZk2cMiPSQ=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -32,14 +32,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1212";
version = "2.0.1217";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-/SrxLqPtMPj9kvig2x9BzhlDsQClWWu+hZ1nyvXCyxA=";
hash = "sha256-z1MKLFR/js27/9VxbOOx9LxcKTXOMZpOqUtMjPeIpds=";
};
nativeBuildInputs = with py.pkgs; [

4
pkgs/development/tools/appthreat-depscan/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "appthreat-depscan";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "AppThreat";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-pe8bEMpK0pHLoTRSE0eEbARbU3Pyqv1PFOYvF6D4Trw=";
hash = "sha256-r0+USVnMLLGVMBV1gcCGECj8JG0FrHmMEynZKkSzYhY=";
};
propagatedBuildInputs = with python3.pkgs; [

7
pkgs/os-specific/linux/firejail/fix-opengl-support.patch
View File

@ -1,7 +0,0 @@
--- a/etc/inc/whitelist-run-common.inc.org 2022-05-07 11:27:32.264849186 +0200
+++ b/etc/inc/whitelist-run-common.inc 2022-05-07 11:27:55.577778211 +0200
@@ -13,3 +13,4 @@
whitelist /run/systemd/resolve/resolv.conf
whitelist /run/systemd/resolve/stub-resolv.conf
whitelist /run/udev/data
+whitelist /run/opengl-driver # NixOS

9
pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch
View File

@ -1,9 +0,0 @@
--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200
+++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200
@@ -83,3 +83,6 @@
whitelist ${HOME}/.kde4/share/config/oxygenrc
whitelist ${HOME}/.kde4/share/icons
whitelist ${HOME}/.local/share/qt5ct
+
+# NixOS specific to resolve binary paths
+whitelist ${HOME}/.nix-profile

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.60.0";
version = "1.61.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sR+DZhpAkPpurPs6jSBVphYp12z8qulcQSl3ngcCrcs=";
sha256 = "sha256-tEYvbR7uQe7WLtkYt0xXFGLu8w4q8bhf9HqDbGXF+T8=";
};
buildInputs = [ openssl ];

6
pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "blackbox_exporter";
version = "0.20.0";
version = "0.21.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "blackbox_exporter";
sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA=";
sha256 = "sha256-u7MCZnzzEoPSk/SVlFRSc47YikQJ0lIxE4wchSN+aec=";
};
vendorSha256 = "sha256-KFLR0In4txQQp5dt8P0yAFtf82b4SBq2xMnlz+vMuuU=";
vendorSha256 = "sha256-7V5WEEy/Rz1QjscPD2Kz+viGkKQsWjs+8QN/3W7D+Ik=";
# dns-lookup is performed for the tests
doCheck = false;

4
pkgs/servers/sickbeard/sickgear.nix
View File

@ -4,13 +4,13 @@ let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "0.25.31";
version = "0.25.35";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
sha256 = "11l537c7d6mrbvn24bfkzydb96mwzhr8z5rl6imiphjzr0f8qyyp";
sha256 = "0hc43wfa256nkjm7bvsr6b7xsyilm1ks4x16kvpprqmj1symlkz3";
};
dontBuild = true;

35
pkgs/tools/security/graphqlmap/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "graphqlmap";
version = "unstable-2022-01-17";
format = "setuptools";
src = fetchFromGitHub {
owner = "swisskyrepo";
repo = "GraphQLmap";
rev = "98997bd7cf647aac7378b72913241060464749b1";
hash = "sha256-lGnhNwtDc8KoPlwJ1p2FYq0NQ8PhSR3HgtluU7uxa/c=";
};
propagatedBuildInputs = with python3.pkgs; [
requests
];
# Tests are not available
doCheck = false;
pythonImportsCheck = [
"graphqlmap"
];
meta = with lib; {
description = "Tool to interact with a GraphQL endpoint";
homepage = "https://github.com/swisskyrepo/GraphQLmap";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

10
pkgs/tools/security/grype/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
@ -6,13 +7,13 @@
buildGoModule rec {
pname = "grype";
version = "0.37.0";
version = "0.39.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LcJtEzwChafG269cGZV3iBSlkjQSGIxSMZNj/5HbXVw=";
hash = "sha256-Lmklcal39jbvwkJaUit3JTmafa26oDx25WzW1oQUSoc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -25,7 +26,7 @@ buildGoModule rec {
'';
};
vendorSha256 = "sha256-7f/kHCWUYilhJeyB6UBJ6yJVFf4Ij6ZBwaeKTaQrZdY=";
vendorSha256 = "sha256-fIxVkJSREZ86KW1SMJqHSByHFTdyJfSiestIZCMsnJI=";
nativeBuildInputs = [
installShellFiles
@ -68,5 +69,8 @@ buildGoModule rec {
'';
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab jk ];
# Need updated macOS SDK
# https://github.com/NixOS/nixpkgs/issues/101229
broken = (stdenv.isDarwin && stdenv.isx86_64);
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -14367,6 +14367,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
graphqlmap = callPackage ../tools/security/graphqlmap { };
groovy = callPackage ../development/interpreters/groovy { };
inherit (callPackages ../applications/networking/cluster/hadoop { })