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] 2022-06-22 12:02:03 +00:00 committed by GitHub
commit 2d797ca635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 141 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/gmtp/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
# ld: gmtp-preferences.o:src/main.h:72: multiple definition of
# `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here
# TODO: can be removed when 1.4.0 is released.
#NIX_CFLAGS_COMPILE = "-fcommon";
NIX_CFLAGS_COMPILE = "-fcommon";
preFixup = ''
gappsWrapperArgs+=(--add-flags "--datapath $out/share");

6
pkgs/applications/misc/rofi-rbw/default.nix
View File

@ -2,14 +2,14 @@
buildPythonApplication rec {
pname = "rofi-rbw";
version = "0.5.0";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "fdw";
repo = "rofi-rbw";
rev = version;
hash = "sha256-1RDwb8lKls6+X/XtARbi4F7sK4nT03Iy3Wb9N1LEa5o=";
rev = "refs/tags/${version}";
hash = "sha256-BL7aLHKhLAGAT5+NXqzAW2g17XB1PjgRgJuxLh8fFk8=";
};
propagatedBuildInputs = [ configargparse ];

6
pkgs/applications/networking/cluster/tanka/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tanka";
version = "0.20.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU=";
sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ=";
};
vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU=";
vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc=";
doCheck = false;

6
pkgs/applications/networking/ipfs-cluster/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ipfs-cluster";
version = "1.0.0";
version = "1.0.1";
vendorSha256 = "sha256-b0k1V1+JikGemSQjyiKcH7cgyDEt0Nn5aVUf6nnE+/0=";
vendorSha256 = "sha256-V+fqyrol+hXjjaCBlAs6f7FeqBqa2jTmMO2bvb6HfgY=";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
rev = "v${version}";
sha256 = "sha256-vwu+Fj7PegbK9pmnsNuEl/AQz2gejRiFAAAov5+VNMQ=";
sha256 = "sha256-dwV5fx52QS2QiBUV8gkJ47tBqT54tEOfSpdXF6hmeLQ=";
};
meta = with lib; {

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1145";
version = "1.11.1.1149";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-+UIJo+4NUW3EIzXLE8kl30JeRjFJ9pJXITvSFTz4FSQ=";
sha256 = "sha256-IIhonPSwpADNAuv9DQIKrdsJcGAlX+6uHe+jvA6i3KQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ansible/core.nix
View File

@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "ansible-core";
version = "2.13.0";
version = "2.13.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-COD7SnGNlnplTnDNpXz5MgGGkyndHPW4pCZ8V8XEyNM=";
sha256 = "sha256-q9R4zv8aCrqV6UzquNyCD0B7zA8AM9xUaEDN3CmjaVg=";
};
# ansible_connection is already wrapped, so don't pass it through

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

@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
version = "5.2.0";
version = "5.3.0";
pname = "approvaltests";
format = "setuptools";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
sha256 = "sha256-PrO6NC+ARv0o1KHv+ekPwkEi4VpBIj+YjWRrCSFMHI8=";
sha256 = "sha256-nKTMWdXnxAf+UBUHkx+LAY29A/QXH+AtPjC296aarjU=";
};
propagatedBuildInputs = [

17
pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
View File

@ -5,18 +5,20 @@
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-eventgrid";
version = "10.1.0";
version = "10.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4da3bf142d31bc25d80ee26641b95b7f52eb1baf4f326b9954e9f0613944ef3c";
hash = "sha256-jJ+gvJmOTz2YXQ9BDrFgXCybplgwvOYZ5Gv7FHLhxQA=";
};
propagatedBuildInputs = [
@ -24,13 +26,14 @@ buildPythonPackage rec {
msrestazure
azure-mgmt-core
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.eventgrid" ];
pythonImportsCheck = [
"azure.mgmt.eventgrid"
];
meta = with lib; {
description = "This is the Microsoft Azure EventGrid Management Client Library";

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "bitlist";
version = "0.7.0";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg=";
sha256 = "sha256-43Oh1ERGsW12HOqpbIa7rzLKrP9tIjckZhHwZSmBypE=";
};
propagatedBuildInputs = [

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "1.2.1";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PzGWqBL3276hlcS9beW920Ei75hAxLXxttD8zDPWELE=";
hash = "sha256-ctkBzwZ5Caba1JucxCKF7kJs/eZHJz4YSrV3tNyTEXU=";
};
postPatch = ''

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.92";
version = "2.1.93";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LEHbS6rSKQl1APWYjNS8y1edtXDRqSuhfftcuM67K44=";
hash = "sha256-7aXpKbGjJrkMS6l2B6jR1XWn7t3WLyztePEyMQaJkbk=";
};
nativeBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "12.1.3";
version = "12.1.4";
format = "setuptools";
disabled = !isPy3k;
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-7dZ7bSPV0GSlbJfNkOpmH6j/12cgvxmbWhJsaGn4HgE=";
sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA=";
};
propagatedBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.4.1";
version = "1.4.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-PVRNfpV6LwZNzSQaDJnDztNUdzosa2yIdXRLXpPMVW4=";
hash = "sha256-o6qAeZSjXK/V5TKFCsnVvCbDH6lQTts1ClJ5scmDeVQ=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/pysigma/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.6.2";
version = "0.6.3";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "pySigma";
rev = "v${version}";
hash = "sha256-/SZe4pzlhlkzW84WOjPOibfdznf5uLHL5RsNnT/EL9M=";
rev = "refs/tags/v${version}";
hash = "sha256-39wp12YDM0Wnl+8tNS6XsoYF+5xM7uQRpUtlo3A2PYE=";
};
nativeBuildInputs = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.30";
version = "2.27.31";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yo18xUnD0Q28s8acG1Pj/9EnAInBABplwenhAX615wQ=";
sha256 = "sha256-b6uXuZ/qUrnHtGak3ZPga7MlvH50IEdeh4MQJqjdNcw=";
};
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.1223";
version = "2.0.1226";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-/5HJucSOQyfX0Og3fCGhuegye79huw4LPlNkzgCO+qM=";
hash = "sha256-hAHIrf1oZMPpciKTUiM+EuP4TDtb0lYI7hlZXWkIyV4=";
};
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.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "AppThreat";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-r0+USVnMLLGVMBV1gcCGECj8JG0FrHmMEynZKkSzYhY=";
hash = "sha256-hudPySVFewKrXI5FAYBCPTkjI4W7/kmnNwhnjxMhkrw=";
};
propagatedBuildInputs = with python3.pkgs; [

6
pkgs/development/tools/misc/act/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.26";
version = "0.2.28";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DBiBJf4hEjn/sJXjAvsiARWz66sDBIz0hFEdCgS8D4g=";
sha256 = "sha256-wHBdmNFi//0nAgqRjTJYE3H+06HrW9l+xLVB97/XrnY=";
};
vendorSha256 = "sha256-5RvFdtEZEQBWvkUKIcV/A+tCSy9V9DJj4HujGQgTxq0=";
vendorSha256 = "sha256-bWNDBoLGiV/eSUW/AE/yzvJN7NYCnT1GjzP3VmDVAg8=";
doCheck = false;

10
pkgs/servers/http/envoy/default.nix
View File

@ -23,8 +23,8 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.21.1";
rev = "af50070ee60866874b0a9383daf9364e884ded22";
version = "1.21.4";
rev = "782ba5e5ab9476770378ec9f1901803e0d38ac41";
};
in
buildBazelPackage rec {
@ -35,7 +35,7 @@ buildBazelPackage rec {
owner = "envoyproxy";
repo = "envoy";
inherit (srcVer) rev;
hash = "sha256:11mm72zmb479ss585jzqzhklyyqmdadnvr91ghzvjxc0j2a1hrr4";
hash = "sha256-SthKDMQs5yNU0iouAPVsDeCPKcsBXmO9ebDwu58UQRs=";
postFetch = ''
chmod -R +w $out
@ -85,8 +85,8 @@ buildBazelPackage rec {
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-23Z6SbKnbah/NCrdMrXhrNFFASd/8xRH3fSyIE++heA=";
aarch64-linux = "sha256-dMOu0HYUIUJ+XEtctjaZZ1jGGQq+cHbay8+KwR5XqP0=";
x86_64-linux = "sha256-/SA+WFHcMjk6iLwuEmuBIzy3pMhw7TThIEx292dv6IE=";
aarch64-linux = "sha256-0XdeirdIP7+nKy8zZbr2uHN2RZ4ZFOJt9i/+Ow1s/W4=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2022-06-15";
version = "2022-06-19";
pname = "oh-my-zsh";
rev = "8168ec0174e7e3212be20ecc74810155772abff1";
rev = "4c82a2eedf0c43d47601ffa8b0303ed1326fab8f";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "KbxVZ/sHwZEm8EzCR8ZOJdhiYnRyMLuUetBRxuj5izU=";
sha256 = "evFMOZUVpF8Qv3os+hx8Z7nC216sZclxO1g9ZaO//QU=";
};
strictDeps = true;

60
pkgs/tools/misc/hyperledger-fabric/default.nix
View File

@ -1,35 +1,55 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "hyperledger-fabric";
version = "1.3.0";
goPackagePath = "github.com/hyperledger/fabric";
# taken from https://github.com/hyperledger/fabric/blob/v1.3.0/Makefile#L108
subPackages = [
"common/tools/configtxgen"
"common/tools/configtxlator"
"common/tools/cryptogen"
"common/tools/idemixgen"
"cmd/discover"
"peer"
"orderer"
];
version = "2.4.3";
commit = "9711fb5d0c16297584f5c53123f589110828736f";
src = fetchFromGitHub {
owner = "hyperledger";
repo = "fabric";
rev = "v${version}";
sha256 = "08qrrxzgkqg9v7n3y8f2vggyqx9j65wisxi17hrabz5mzaq299xs";
sha256 = "sha256-gXVahzpuIUWAHq4gJ1rbq943zIuWrl/ojDMQDFfI14I=";
};
doCheck = true;
vendorSha256 = null;
postPatch = ''
# Broken
rm cmd/peer/main_test.go
'';
subPackages = [
"cmd/configtxgen"
"cmd/configtxlator"
"cmd/cryptogen"
"cmd/discover"
"cmd/ledgerutil"
"cmd/orderer"
"cmd/osnadmin"
"cmd/peer"
];
ldflags = lib.mapAttrsToList
(n: v: "github.com/hyperledger/fabric/common/metadata.${n}=${v}") {
Version = version;
CommitSha = commit;
};
meta = with lib; {
description = "An implementation of blockchain technology, leveraging familiar and proven technologies";
description = "High-performance, secure, permissioned blockchain network";
longDescription = ''
Hyperledger Fabric is an enterprise-grade permissioned distributed ledger
framework for developing solutions and applications. Its modular and
versatile design satisfies a broad range of industry use cases. It offers
a unique approach to consensus that enables performance at scale while
preserving privacy.
'';
homepage = "https://wiki.hyperledger.org/display/fabric";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@ -20,12 +20,12 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2022.05.18";
version = "2022.6.22.1";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "sha256-OntZ0vtLOc6LqOC5xaN/4g5WJPRqI0a0rmarEyDjUTQ=";
sha256 = "sha256-7kAancx+koWxTxMinD3O/fOH5Zf09Pdz2rMmqv47gww=";
};
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];

6
pkgs/tools/security/nuclei/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.7.2";
version = "2.7.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-knpsoDVDGxG85YiD7pc+XDV7BgCSpNRFRuN+qM3Gv/U=";
sha256 = "sha256-E0oEB7N1+XyyoGrIgR7IECyKFRV5oDiEwZncVbq5urs=";
};
vendorSha256 = "sha256-e17QpSXttso1crvBj0vrfuJliIDcXoXJzWt87ulSZXQ=";
vendorSha256 = "sha256-oqM/rOaqL/6un9J9OEconmobvzUwmuz0Hi+C7CR8Yak=";
modRoot = "./v2";
subPackages = [

14
pkgs/tools/system/colorls/Gemfile.lock
View File

@ -1,17 +1,21 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
clocale (0.0.4)
colorls (1.4.3)
colorls (1.4.6)
addressable (~> 2.7)
clocale (~> 0)
filesize (~> 0)
manpages (~> 0)
rainbow (>= 2.2, < 4.0)
unicode-display_width (~> 1.7)
unicode-display_width (>= 1.7, < 3.0)
filesize (0.2.0)
manpages (0.6.1)
rainbow (3.0.0)
unicode-display_width (1.7.0)
public_suffix (4.0.7)
rainbow (3.1.1)
unicode-display_width (2.1.0)
PLATFORMS
ruby
@ -20,4 +24,4 @@ DEPENDENCIES
colorls
BUNDLED WITH
2.1.4
2.3.9

35
pkgs/tools/system/colorls/gemset.nix
View File

@ -1,4 +1,15 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.8.0";
};
clocale = {
groups = ["default"];
platforms = [];
@ -10,15 +21,15 @@
version = "0.0.4";
};
colorls = {
dependencies = ["clocale" "filesize" "manpages" "rainbow" "unicode-display_width"];
dependencies = ["addressable" "clocale" "filesize" "manpages" "rainbow" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9d99qzgxw8wwa4z1vkdnr70fppx2g9shma6dz3ihjhajj2xvmq";
sha256 = "16r9c61lamjiig4rxfx1rs0bagqq8lbz88vf1250zkvq4fdk93p9";
type = "gem";
};
version = "1.4.3";
version = "1.4.6";
};
filesize = {
groups = ["default"];
@ -40,24 +51,34 @@
};
version = "0.6.1";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.7";
};
rainbow = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.0.0";
version = "3.1.1";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
type = "gem";
};
version = "1.7.0";
version = "2.1.0";
};
}

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

@ -997,7 +997,9 @@ with pkgs;
acpica-tools = callPackage ../tools/system/acpica-tools { };
act = callPackage ../development/tools/misc/act { };
act = callPackage ../development/tools/misc/act {
buildGoModule = buildGo118Module;
};
actdiag = with python3.pkgs; toPythonApplication actdiag;