Merge branch 'master' into staging-next

Conflicts:
- pkgs/development/python-modules/flipr-api/default.nix
This commit is contained in:
Martin Weinelt 2023-03-12 18:59:12 +01:00
commit 704c5f0912
7 changed files with 18 additions and 17 deletions

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.44.4"; version = "0.44.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Y+7Q9b6c6oetlFUgSQXUcOuGywgrQGK9Lb6oiwiyp7M="; hash = "sha256-1wuK3rdc17fCAZjqJNReYYPy284BHyB3gp+xUt09oIY=";
}; };
vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y=";

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flipr-api"; pname = "flipr-api";
version = "1.4.4"; version = "1.5.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cnico"; owner = "cnico";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-LcxLJQ2MAif4yC+/SvO7IEa1lNOV67FgJU1UWT4ope4="; hash = "sha256-IAxB3i/HkwO5sjDh2aBCtijOcG0VIbatQjTWIh0inoM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -46,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python client for Flipr API"; description = "Python client for Flipr API";
homepage = "https://github.com/cnico/flipr-api"; homepage = "https://github.com/cnico/flipr-api";
changelog = "https://github.com/cnico/flipr-api/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sqlmap"; pname = "sqlmap";
version = "1.7.2"; version = "1.7.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM="; hash = "sha256-Madz55RkI+SEtkBep1rcQt2iIwd/LqfzCCKP+4jRHUE=";
}; };
postPatch = '' postPatch = ''

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "check_ssl_cert"; pname = "check_ssl_cert";
version = "2.60.0"; version = "2.61.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matteocorti"; owner = "matteocorti";
repo = "check_ssl_cert"; repo = "check_ssl_cert";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-BWzhsIiEjRb4Yq8vf3N1lnwT3uU1Unr/ThxfhEiMBtw="; hash = "sha256-BePgfyVtEhm81kDtjRt0P6O9zgWA4f+5pH//w9PxD8w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -25,14 +25,14 @@ let
in in
with py.pkgs; buildPythonApplication rec { with py.pkgs; buildPythonApplication rec {
pname = "awscli2"; pname = "awscli2";
version = "2.11.1"; # N.B: if you change this, check if overrides are still up-to-date version = "2.11.2"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-cli"; repo = "aws-cli";
rev = version; rev = version;
hash = "sha256-+gTs+TAv3gchtwGbiYwXjIfMYFWfkGW9Jk1Aru3mA3s="; hash = "sha256-GFdkE+XClm0L5Y+ZSwMW8gieNoRmNL3K8kVPxpH510k=";
}; };
postPatch = '' postPatch = ''

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "chaos"; pname = "chaos";
version = "0.4.0"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "chaos-client"; repo = "chaos-client";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-NA78zMge9AsfqO1px1FWCDKmWy1a0h8dtTotpgLazh4="; hash = "sha256-3snVQKmtIhyWNBbSLnBQIvz0bEFs8ur5FhTne3gb/h4=";
}; };
vendorHash = "sha256-KkT/mgU1BOwJcjxOBMCMq0hyxZAyoh25bi+s3ka6TOg="; vendorHash = "sha256-tyH3gqD5HpEvIoki0XnGDKD08iW8tENkCPuLC9GUDQk=";
subPackages = [ subPackages = [
"cmd/chaos/" "cmd/chaos/"

View File

@ -6,15 +6,15 @@
buildGoModule rec { buildGoModule rec {
pname = "kubesec"; pname = "kubesec";
version = "2.12.0"; version = "2.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "controlplaneio"; owner = "controlplaneio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0irZ3mCpXDWc/RovTK9d7AT/Gfbyt1R4WjCJFZ5RFdg="; sha256 = "sha256-9WhY1mJawMkSgqM50DO0y9bxGYW89N14gLirO5zVuzc=";
}; };
vendorSha256 = "sha256-sRIGehDuAjtpOAYYtqANua8LSzl/+WolZimMxlkG5X8="; vendorHash = "sha256-xcIFveR0MwpYGYhHKXwQPHF08620yilEtb+BdKZWrdw=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];