b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-12-25 00:01:28 +00:00 committed by GitHub
parent f04946ad25 2262feb78d
commit e38de71da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/emacs/generic.nix
View file

@ -25,6 +25,7 @@
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
, nativeComp ? false
, withPgtk ? false
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
, toolkit ? (
if withGTK2 then "gtk2"
@ -150,6 +151,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
++ lib.optional withPgtk "--with-pgtk"
;
installTargets = [ "tags" "install" ];

4
pkgs/development/libraries/hwloc/default.nix
View file

@ -8,11 +8,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "hwloc";
version = "2.6.0";
version = "2.7.0";
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
sha256 = "0fm8ky2qx5aq4dwx3slmgyvjc93fpplxbsldhkzrdhi89vj77w71";
sha256 = "1q440fwvhnxz6j8k5bn3bxj86b3lzbr8fgib78l4iq6gxd9yx302";
};
configureFlags = [

6
pkgs/development/python-modules/bimmer-connected/default.nix
View file

@ -8,11 +8,12 @@
, pyjwt
, pytestCheckHook
, requests-mock
, time-machine
}:
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.8.2";
version = "0.8.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
hash = "sha256-/AkQ7hEjzgL4/ruXqTdchh+N8PY5q3ILNKKo43EOGg4=";
hash = "sha256-twVI84YCW+t9ar2vHN1OEiY5tT4/pHP29GnpWprdeHs=";
};
nativeBuildInputs = [
@ -39,6 +40,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
requests-mock
time-machine
];
meta = with lib; {

4
pkgs/development/python-modules/lightwave2/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "lightwave2";
version = "0.7.9";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "0cd36d7f7710afa7094fce422422196532d4fbccfa31bfcb642e1674a137900a";
sha256 = "2f18ee4aba0431236a4c48a032de6714cfb56ff1e97c86d48cfe619eb961b21a";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyisy/default.nix
View file

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pyisy";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "automicus";
repo = "PyISY";
rev = "v${version}";
sha256 = "1bxp13m83qm1n1ddyw6mdz0ijfksjg4ki85w4n8i597f3xazm8q4";
sha256 = "1mj9na64nq0ls8d9x3304ai7lixaglpr646p3m2a4s5qlmm4il3m";
};
postPatch = ''

4
pkgs/development/python-modules/python-ecobee-api/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "python-ecobee-api";
version = "0.2.14";
version = "0.2.15";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QfVOgX/psFB/l9dPBcaHh+2v9+7LjDCUAvaEQjUrxmA=";
sha256 = "91929b0dda6acc2af6661d0fb539eb6375323d7529d3d64b67915efb1dc1a6ca";
};
propagatedBuildInputs = [

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

@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.687";
version = "2.0.690";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-iO33SutzL302AHpUQwljLig7DWTLIx5JTn+51BNTbLU=";
sha256 = "sha256-DF528R5cJQ5CRieEXz9Wm/71bWLon/RBVInhlty/UEQ=";
};
nativeBuildInputs = with py.pkgs; [

4
pkgs/development/tools/clj-kondo/default.nix
View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "clj-kondo";
version = "2021.12.01";
version = "2021.12.19";
src = fetchurl {
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-AH2MAz++jjBNHWAsUOWkfdzyWzGfmcDBNKcJp4xbPxQ=";
sha256 = "sha256-CjqzsYT3Hc2Ej7ALHkuKwBPHMAQkQQilUZhuC3hcZQg=";
};
extraNativeImageBuildArgs = [

3
pkgs/shells/fish/default.nix
View file

@ -2,7 +2,6 @@
, lib
, fetchurl
, coreutils
, util-linux
, which
, gnused
, gnugrep
@ -253,8 +252,6 @@ let
EOF
'' + optionalString stdenv.isLinux ''
sed -e "s| ul| ${util-linux}/bin/ul|" \
-i "$out/share/fish/functions/__fish_print_help.fish"
for cur in $out/share/fish/functions/*.fish; do
sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \
-i "$cur"

2
pkgs/stdenv/generic/make-derivation.nix
View file

@ -282,7 +282,7 @@ else let
++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (
lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}"
++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"

4
pkgs/tools/misc/direnv/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "direnv";
version = "2.30.0";
version = "2.30.1";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "sha256-URA4aXtxahNwQDif9HpsM+WS7CGOYO2WHa69Q5pmG5A=";
sha256 = "sha256-4ojoV6BtPOaMnDierxlfkOuaP1KZGYNMImSURA33tfg=";
};
vendorSha256 = "sha256-YhgQUl9fdictEtz6J88vEzznGd8Ipeb9AYo/p1ZLz5k=";

2
pkgs/tools/security/metasploit/Gemfile
View file

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.20"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.21"

28
pkgs/tools/security/metasploit/Gemfile.lock
View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: c2234acba2d212b4eb940904e595a43edb352a4e
ref: refs/tags/6.1.20
revision: 0b16a2cd771a6afd286188da1c60c9fd772ab0f1
ref: refs/tags/6.1.21
specs:
metasploit-framework (6.1.20)
metasploit-framework (6.1.21)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -128,23 +128,23 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.541.0)
aws-sdk-core (3.124.0)
aws-partitions (1.543.0)
aws-sdk-core (3.125.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.287.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-ec2 (1.288.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.64.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-iam (1.65.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.52.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-kms (1.53.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.109.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-s3 (1.110.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
@ -152,7 +152,7 @@ GEM
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
bindata (2.4.10)
bson (4.12.1)
bson (4.13.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)

4
pkgs/tools/security/metasploit/default.nix
View file

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.20";
version = "6.1.21";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-O34ion1Hywk/Y+KmCqU3qp+/Bo+ky5SRzstjxj7LvzQ=";
sha256 = "sha256-43abc6XUmLZZ+KuaAqyT/fJT+79JWKeRRA41NJOWoPY=";
};
nativeBuildInputs = [ makeWrapper ];

34
pkgs/tools/security/metasploit/gemset.nix
View file

@ -104,60 +104,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x2ppv99avlnm53nf75dc8sjfi8kfajc1kbnhc7vbrjzz04ywjy0";
sha256 = "07ydbhiyncl0l1dwy09z8inf72x1k961qlcwwg62l4yacv0a74wq";
type = "gem";
};
version = "1.541.0";
version = "1.543.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1chpydvgwa48rbd67k39fpg2vjp21v3kmjygbjqv1l1sqn6rjbvw";
sha256 = "06mkw688mrhz4j2d2ajzigr87041hxczy2w45j0iv1mnvs5yrhan";
type = "gem";
};
version = "3.124.0";
version = "3.125.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gwhniprki7y357z1kprycrxq0g3j72ahqcimxa326xjw0mba8jz";
sha256 = "0s67sgpv7b6asg3am157brsclq15p8r3fm2gc741zz546xfbfpm3";
type = "gem";
};
version = "1.287.0";
version = "1.288.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gnjxnmba0wh4ikz7lsgrfzcfmasbqcl4c8r9cvvsw7lk090nkbb";
sha256 = "0gss3wi1csngmd2iirxznnhafr0yvgqnkr0cksz7dk9kqrly04gl";
type = "gem";
};
version = "1.64.0";
version = "1.65.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1br4h5zwb5ir2bf6y0hnlwafkmghxi2fbjqx86agyv838ndy9npd";
sha256 = "044nzbh16x4vx7kbjv1hfh553sp126kcdk2x99apr52j506sk87c";
type = "gem";
};
version = "1.52.0";
version = "1.53.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yc96imi4v043rdxa94ncg15aapzp1i5qx076rv25zxqcbkdwzwd";
sha256 = "1587v0xh0hcrxn0ki0ahx70kkpny4pm32fj4bh7500wzvjki6d6v";
type = "gem";
};
version = "1.109.0";
version = "1.110.0";
};
aws-sigv4 = {
groups = ["default"];
@ -204,10 +204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc";
sha256 = "0ir2fml3d6gjzqhiqpxl8rqmgrp5lqrx8xdwz9cmcnxhfzmqgxbp";
type = "gem";
};
version = "4.12.1";
version = "4.13.0";
};
builder = {
groups = ["default"];
@ -664,12 +664,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "c2234acba2d212b4eb940904e595a43edb352a4e";
sha256 = "0d5zrczccqybrs8r9jx4iw3bz7xa6yjhm9p2cczhkjs7gni24ziv";
rev = "0b16a2cd771a6afd286188da1c60c9fd772ab0f1";
sha256 = "1xm0js9k8d8f8j8sfn29pzxm7wpxjfn056mbz1cvd66llmrrnxp3";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.20";
version = "6.1.21";
};
metasploit-model = {
groups = ["default"];