Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-03-03 12:01:44 +00:00 committed by GitHub
commit 595d55c8a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 501 additions and 150 deletions

View file

@ -11938,6 +11938,12 @@
githubId = 146413;
name = "Tobias Poschwatta";
};
PowerUser64 = {
email = "blakelysnorth@gmail.com";
github = "PowerUser64";
githubId = 24578572;
name = "Blake North";
};
ppenguin = {
name = "Jeroen Versteeg";
email = "hieronymusv@gmail.com";

View file

@ -0,0 +1,83 @@
{ lib
, pkg-config
, stdenv
, fetchFromGitHub
, autoPatchelfHook
, alsa-lib
, cmake
, freetype
, libGL
, libX11
, libXcursor
, libXext
, libXinerama
, libXrandr
, libjack2
, libopus
, curl
, gtk3
, webkitgtk
}:
stdenv.mkDerivation rec {
pname = "sonobus";
version = "1.6.2";
src = fetchFromGitHub {
owner = "sonosaurus";
repo = "sonobus";
rev = version;
sha256 = "sha256-/Pb+PYmoCYA6Qcy/tR1Ejyt+rZ3pfJeWV4j7bQWYE58=";
fetchSubmodules = true;
};
nativeBuildInputs = [
autoPatchelfHook
cmake
pkg-config
];
buildInputs = [
alsa-lib
freetype
libjack2
libopus
curl
gtk3
webkitgtk
];
runtimeDependencies = [
libGL
libX11
libXcursor
libXext
libXinerama
libXrandr
];
postPatch = lib.optionalString (stdenv.isLinux) ''
# needs special setup on Linux, dunno if it can work on Darwin
# https://github.com/NixOS/nixpkgs/issues/19098
# Also, I get issues with linking without that, not sure why
sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt
patchShebangs linux/install.sh
'';
# The program does not provide any CMake install instructions
installPhase = lib.optionalString (stdenv.isLinux) ''
runHook preInstall
cd ../linux
./install.sh "$out"
runHook postInstall
'';
meta = with lib; {
description = "High-quality network audio streaming";
homepage = "https://sonobus.net/";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ PowerUser64 ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}

View file

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "111.0.5563.41",
"sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay",
"sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w",
"version": "111.0.5563.50",
"sha256": "1iygqlgr7qqac489kb0s4z5mwvchhi7wkibj84ziqcxlbqlfrmni",
"sha256bin64": "0pgrqb18hbp1q54flg0c63v85bi11m4rc6f25f0h0x90lvl65d05",
"deps": {
"gn": {
"version": "2022-12-12",

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU=";
hash = "sha256-/M/uAgAVqsd+jsVhiS+rDHM5HaryvDV5rXAIKMIHa1c=";
};
vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8=";
vendorHash = "sha256-CNWN8UWCy5EssUEyFrLMKW3HSr91/RZWMLUX9N2sY+0=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View file

@ -37,13 +37,13 @@
"vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk="
},
"akamai": {
"hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=",
"hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v3.3.0",
"rev": "v3.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y="
"vendorHash": "sha256-JOaw8rKH7eb3RiP/FD+M7VEXCRfVuarTjfEusz1yGmQ="
},
"alicloud": {
"hash": "sha256-Cf3plUhdewlq3MvOqZGcICP0j9R3vg0nZdBMrk/Et7k=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-fCs03D+Z/90w9Hup9Cppcx6irsP+oA0HK72tgVm+ZmA=",
"hash": "sha256-PvlW3BB2ZATZA18nOGgxMSWzjC8YIjUY9ofw7XwnbmU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.45.0",
"rev": "v3.46.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -382,11 +382,11 @@
"vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY="
},
"fastly": {
"hash": "sha256-oaBVVbeJdmzkx3hphW9Llh/ZUujo8QNeZd6guDkBiCY=",
"hash": "sha256-OODPVNHFW8hnpofWLvzn7qukngB8okZADYI5t9muHpQ=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
"rev": "v3.1.0",
"rev": "v3.2.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -621,11 +621,11 @@
"vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8="
},
"ksyun": {
"hash": "sha256-HtZ+uEbI+UFO51rj9P8rKWNjRZaX6QhIZ1c9TO1USvI=",
"hash": "sha256-F/A+hDjYTQS0NT0rslE792qNINghfdiQHRNnbMpyBdM=",
"homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun",
"owner": "kingsoftcloud",
"repo": "terraform-provider-ksyun",
"rev": "v1.3.62",
"rev": "v1.3.64",
"spdx": "MPL-2.0",
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ="
},
@ -1009,13 +1009,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=",
"hash": "sha256-VvL5lGPNtcjrtpB/p//7UXuUQxjV/+Deb+R3p+V8GtM=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v6.22.0",
"rev": "v6.23.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y="
"vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",

View file

@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "roboto-serif";
version = "1.007";
version = "1.008";
src = fetchurl {
url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip";
hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo=";
hash = "sha256-Nm9DcxL0CgA51nGeZJPWSCipgqwnNPlhj0wHyGhLaYQ=";
};
sourceRoot = ".";

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-iot";
version = "8.50.0";
version = "8.51.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tFI6iPvKWp69PKvkBrMQrkMZD03VHhLIIDy0VI5XLEA=";
hash = "sha256-Aqyvlb+a6Hos6zc6xkd249WUlk8RpdK475eozjwVDDA=";
};
propagatedBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-sts";
version = "3.1.0";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CpUMw2qdY+5a99WgFLp0p00kQVnuvf3yMOZqTztqnRA=";
hash = "sha256-1pCgIw2Glc5Fyp/eoJJXew80SJz7VDcg9vvUpeZpBYk=";
};
propagatedBuildInputs = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.3.1";
version = "3.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ=";
hash = "sha256-yywRVh0hL6kzpAkKRVIUBGGAAMvyHuNKWzCkUDRHO04=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, pandoc
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9iQZb9v8aV7hg6UqLfxWGByPWb8mn+14vktIvCRX4hg=";
};
passthru.optional-dependencies = {
update = [
requests
];
readme = [
pandoc
];
};
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"publicsuffixlist"
];
pytestFlagsArray = [
"publicsuffixlist/test.py"
];
meta = with lib; {
description = "Public Suffix List parser implementation";
homepage = "https://github.com/ko-zu/psl";
license = licenses.mpl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, gitpython
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pyexploitdb";
version = "0.2.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyExploitDb";
inherit version;
hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE=";
};
propagatedBuildInputs = [
gitpython
requests
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"pyExploitDb"
];
meta = with lib; {
description = "Library to fetch the most recent exploit-database";
homepage = "https://github.com/GoVanguard/pyExploitDb";
changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/Changelog.txt";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
version = "2.1.0-M7";
version = "2.1.0-RC6";
zshCompletion = fetchurl {
url =
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "sha256-ZKltN/m4ZyOr98k5z4HfPh6jbRUM6MIew+NWo7UAz9o=";
sha256 = "0b52qp0jb2bhb649r6cca0yd1cj8wsyp0f1j3pnmir6rizjwkm5q";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lua-language-server";
version = "3.6.11";
version = "3.6.13";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M=";
sha256 = "sha256-9TFTmTjj6FfPTfcgnQaHFYUtoM1VUMSpD7Yxk/Oeul0=";
fetchSubmodules = true;
};

View file

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.36.5";
version = "0.36.6";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-PQ59WTBRUwLM6/35ocnryp+hR8YKmgh3EkOSZ7OCYWs=";
sha256 = "sha256-ln6zySZ2fMzRPGdVikPYgtT89/J3Fw56fdrEkkOU/j8=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoHash = "sha256-6M4KUvTKifEUEJLMyVU8F1Ler6IK5TEUNHfUNMkJ09s=";
cargoHash = "sha256-ntnd5vWiMxP5p/IBSWotLqNR8UseJHdSPiaxUHWpOlo=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.13.14";
version = "1.13.16";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-9p5h58fXENaZCVpDX5b/FqK0i5bL/M3vP+8jKYLQDh0=";
hash = "sha256-3LJkWpksI9nep7QtEJdiEUZmwrWLyG/JKdu9YQh3KVk=";
};
cargoHash = "sha256-IJi8FfwBMTTJRdBA6ydpD4yQWrEVnavxgiWxRCDoAOI=";
cargoHash = "sha256-Wqikf248nZE2iQ6zU4bvz10PL/Z/WJ1srImi+bZ8s5w=";
meta = with lib; {
description = "Source code spell checker";

View file

@ -25,6 +25,7 @@
, libbfd_2_38
, libopcodes
, libopcodes_2_38
, libtraceevent
, openssl
, systemtap
, numactl
@ -105,6 +106,7 @@ stdenv.mkDerivation {
elfutils
newt
slang
libtraceevent
libunwind
zlib
openssl

View file

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2023-02-22T18-23-45Z";
version = "2023-02-27T18-10-45Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-Y11jqZiQUu0/YcrIGFJ2nOkPRG97sflluO3J0BJZ6kQ=";
sha256 = "sha256-0Qz64uNe5rkHOUepzCYUdeyP1ZXzY3Bi1LUvQw2quPA=";
};
vendorHash = "sha256-9QYRUCD2iR2jx8G1FbkQqqPqIuXKxAKDy9whMRhOVP4=";
vendorHash = "sha256-b/2/VTIVJyWNm6j+GyhbOKsIl9B0Nqw2fbpBw20Wicw=";
doCheck = false;

View file

@ -1,31 +1,50 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, asciidoc
, jansson, jose, http-parser, systemd
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, asciidoc
, jansson
, jose
, http-parser
, systemd
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "tang";
version = "7";
version = "12";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7";
repo = "tang";
rev = "refs/tags/v${version}";
hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE=";
};
configureFlags = [
"--localstatedir=/var"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
nativeBuildInputs = [
asciidoc
meson
ninja
pkg-config
];
nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ];
buildInputs = [ jansson jose http-parser systemd ];
buildInputs = [
jansson
jose
http-parser
systemd
];
outputs = [ "out" "man" ];
outputs = [
"out"
"man"
];
meta = {
description = "Server for binding data to network presence";
homepage = "https://github.com/latchset/tang";
changelog = "https://github.com/latchset/tang/releases/tag/v${version}";
maintainers = with lib.maintainers; [ fpletz ];
license = lib.licenses.gpl3Plus;
};

View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2023-02-23";
version = "2023-03-01";
pname = "oh-my-zsh";
rev = "8a008e1f51d451db21232edd6f1709e6c5ea334e";
rev = "a4a9a8cd8ccb4240a7c5df5f6766bd5340646e63";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "GXrDcM3MMDLHJ64xyyiORK6UPepFPaNbaZ5rNmV4zlk=";
sha256 = "2s9ZOix3lQKW7JJhuYKtjxh07HCODvIrJa7K2n9Pxzo=";
};
strictDeps = true;

View file

@ -25,14 +25,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.10.3"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.10.4"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-ogwJTsd2xrWp54utcyG1QO7hGxBC6S4hVlmmGESyPBQ=";
hash = "sha256-NXsXAyxlhW63vWP7oBh2hh0G+KjmGAZVRSdRUac+lgk=";
};
postPatch = ''

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.21.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8=";
sha256 = "sha256-noFMb/7OR1epmsaO7pDuov3TffNKuY1NgT5cKUFpJuY=";
};
cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM=";
cargoHash = "sha256-68KdTB7Dg3qEivgt9cOIBy310QbfUVAojfh9gotHycE=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2023-02-16T19-20-11Z";
version = "2023-02-28T00-12-59Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-UL49sZ8dBiXexmWt8rAUn2b2d58KJ8/5FyoojO7Y/68=";
sha256 = "sha256-tQ6cKP/AYNk1vzODE2qIRaf9PLT+/9iSG3c0Vg9GhgQ=";
};
vendorHash = "sha256-CdMpzYmJxOu4HvsQMJDZxRr7MWB4xN6ivEWldIptVnU=";
vendorHash = "sha256-ovOkFG8tRdQ0F+baXksDQuY4oL52wtokxasztrz2PcI=";
subPackages = [ "." ];

View file

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
'';
strictDeps = true;
nativeBuildInputs = [ pkg-config ]
# This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is
# needed here to access krb5-config in order to cross compile. See:
@ -96,7 +97,7 @@ stdenv.mkDerivation rec {
doCheck = true;
enableParallelChecking = false;
nativeCheckInputs = lib.optional (!stdenv.isDarwin) hostname;
nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname;
preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# construct a dummy HOME
export HOME=$(realpath ../dummy-home)

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sshpass";
version = "1.09";
version = "1.10";
src = fetchurl {
url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz";
sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c=";
sha256 = "sha256-rREGwgPLtWGFyjutjGzK/KO0BkaWGU2oefgcjXvf7to=";
};
meta = with lib; {

View file

@ -12,6 +12,7 @@ let
atLeast27 = lib.versionAtLeast version "2.7pre";
atLeast210 = lib.versionAtLeast version "2.10pre";
atLeast213 = lib.versionAtLeast version "2.13pre";
atLeast214 = lib.versionAtLeast version "2.14pre";
in
{ stdenv
, autoconf-archive
@ -43,6 +44,7 @@ in
, openssl
, perl
, pkg-config
, rapidcheck
, Security
, sqlite
, util-linuxMinimal
@ -109,6 +111,8 @@ self = stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
] ++ lib.optionals atLeast214 [
rapidcheck
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [
@ -167,6 +171,8 @@ self = stdenv.mkDerivation {
] ++ lib.optionals (!atLeast24) [
# option was removed in 2.4
"--disable-init-state"
] ++ lib.optionals atLeast214 [
"CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include"
] ++ lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [

View file

@ -124,7 +124,12 @@ in lib.makeExtensible (self: {
sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
};
nix_2_14 = common {
version = "2.14.1";
sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";
};
stable = self.nix_2_13;
unstable = self.stable;
unstable = self.nix_2_14;
})

View file

@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E=";
sha256 = "sha256-mBs/euuIcVU9ETzfgirg2K/l+sV0OCyyfduvHR5vvek=";
};
cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg=";
cargoHash = "sha256-OgoYWHMgHVkjyRKr0w3hPNfFpN3VmrkVohiaQclIiA0=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

View file

@ -1,43 +1,34 @@
{ lib
, stdenv
, asciidoc
, coreutils
, cryptsetup
, curl
, fetchFromGitHub
, fetchurl
, gnugrep
, gnused
, jansson
, jose
, libpwquality
, luksmeta
, makeWrapper
, meson
, ninja
, pkg-config
, asciidoc
, makeWrapper
, jansson
, jose
, cryptsetup
, curl
, libpwquality
, luksmeta
, coreutils
, tpm2-tools
, gnugrep
, gnused
}:
stdenv.mkDerivation rec {
pname = "clevis";
version = "18";
version = "19";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8=";
rev = "refs/tags/v${version}";
hash = "sha256-3J3ti/jRiv+p3eVvJD7u0ko28rPd8Gte0mCJaVaqyOs=";
};
patches = [
# sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl
(fetchurl {
url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch";
sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM=";
})
];
postPatch = ''
for f in $(find src/ -type f); do
grep -q "/bin/cat" "$f" && substituteInPlace "$f" \
@ -51,15 +42,34 @@ stdenv.mkDerivation rec {
--prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin"
'';
nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ];
buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta tpm2-tools ];
nativeBuildInputs = [
asciidoc
makeWrapper
meson
ninja
pkg-config
];
outputs = [ "out" "man" ];
buildInputs = [
cryptsetup
curl
jansson
jose
libpwquality
luksmeta
tpm2-tools
];
meta = {
outputs = [
"out"
"man"
];
meta = with lib; {
description = "Automated Encryption Framework";
homepage = "https://github.com/latchset/clevis";
maintainers = with lib.maintainers; [ ];
license = lib.licenses.gpl3Plus;
changelog = "https://github.com/latchset/clevis/releases/tag/v${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,43 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "ioc-scan";
version = "1.5.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "cisagov";
repo = "ioc-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-dRrLd41HVVHJse7nkem8Cy+ltfJRnJiWrX/WShMfcOw=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov" ""
'';
propagatedBuildInputs = with python3.pkgs; [
docopt
];
nativeCheckInputs = with python3.pkgs; [
pyfakefs
pytestCheckHook
];
pythonImportsCheck = [
"ioc_scan"
];
meta = with lib; {
description = "Tool to search a filesystem for indicators of compromise (IoC)";
homepage = "https://github.com/cisagov/ioc-scanner";
changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/v${version}";
license = with licenses; [ cc0 ];
maintainers = with maintainers; [ fab ];
};
}

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.3.4"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.5"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: b37bae6ba447ad490205554e35ae2d0b54561f08
ref: refs/tags/6.3.4
revision: a5332d9785cb7c8d0bbc3f0d8532287858b15aea
ref: refs/tags/6.3.5
specs:
metasploit-framework (6.3.4)
metasploit-framework (6.3.5)
actionpack (~> 7.0)
activerecord (~> 7.0)
activesupport (~> 7.0)
@ -31,7 +31,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.108)
metasploit-payloads (= 2.0.113)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.20)
mqtt
@ -128,19 +128,19 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.716.0)
aws-partitions (1.720.0)
aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.366.0)
aws-sdk-ec2 (1.367.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.75.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.62.0)
aws-sdk-kms (1.63.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.119.1)
@ -236,7 +236,7 @@ GEM
activemodel (~> 7.0)
activesupport (~> 7.0)
railties (~> 7.0)
metasploit-payloads (2.0.108)
metasploit-payloads (2.0.113)
metasploit_data_models (6.0.2)
activerecord (~> 7.0)
activesupport (~> 7.0)
@ -286,12 +286,12 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (1.4.5)
pg (1.4.6)
public_suffix (5.0.1)
puma (6.1.0)
puma (6.1.1)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack (2.2.6.3)
rack-protection (3.0.5)
rack
rack-test (2.0.2)

View file

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.3.4";
version = "6.3.5";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-HlW30Y+fEAB3URY2/tnAf1RR02gduBjZcHLc7eyz5dM=";
sha256 = "sha256-T6MrvTnaTE+Pvx3UwzBZmw9jWcL4qr4TDbyCCqI6O0g=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1";
sha256 = "0f9dc7igx4wxza0vim2fg15hj1bgi6js2a2w2fkr2h8mi019nrgs";
type = "gem";
};
version = "1.716.0";
version = "1.720.0";
};
aws-sdk-core = {
groups = ["default"];
@ -124,10 +124,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1caq5zkjxn06lk9jzf3izm2b94f9zj738nr4x83zx95warj3v2qp";
sha256 = "1xxfa17xv9rl2xd0wp4vh9ddjj9zzb93nbb8y2n34phz7l2yxd0w";
type = "gem";
};
version = "1.366.0";
version = "1.367.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -144,10 +144,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr";
sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
type = "gem";
};
version = "1.62.0";
version = "1.63.0";
};
aws-sdk-s3 = {
groups = ["default"];
@ -604,12 +604,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "b37bae6ba447ad490205554e35ae2d0b54561f08";
sha256 = "1lz5ngnfvp3jf3ciif0xd39m2m3zq3czwdhna5vh044ziz8vfm8y";
rev = "a5332d9785cb7c8d0bbc3f0d8532287858b15aea";
sha256 = "0j1v7ai0m0mw1l9vxapqq9cn63wvb4qc7m0xpy7lyk6s76yjp8sg";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.3.4";
version = "6.3.5";
};
metasploit-model = {
groups = ["default"];
@ -626,10 +626,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqm9vzh562vckxcc751bc4yr4fgprlwjjmwq1sjw7zhh27bmz82";
sha256 = "0wmck8jldfdhfvax8dqa3dbxq76sn10xsvs02gf9wbs9zcp0nypi";
type = "gem";
};
version = "2.0.108";
version = "2.0.113";
};
metasploit_data_models = {
groups = ["default"];
@ -907,10 +907,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
type = "gem";
};
version = "1.4.5";
version = "1.4.6";
};
public_suffix = {
groups = ["default"];
@ -927,10 +927,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k";
sha256 = "1j1hx19hh0hhnfcyn075i8rzxxv4vjrny0q1ywzfdbflbwzg7b21";
type = "gem";
};
version = "6.1.0";
version = "6.1.1";
};
racc = {
groups = ["default"];
@ -947,10 +947,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";
type = "gem";
};
version = "2.2.6.2";
version = "2.2.6.3";
};
rack-protection = {
groups = ["default"];
@ -1353,7 +1353,7 @@
version = "3.0.5";
};
sqlite3 = {
dependencies = ["mini_portile2"];
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {

View file

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "openrisk";
version = "0.0.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-8DGwNoucLpdazf9r4PZrN4DEOMpTr5U7tal2Rab92pA=";
};
vendorHash = "sha256-BLowqqlMLDtsthS4uKeycmtG7vASG25CARGpUcuibcw=";
meta = with lib; {
description = "Tool that generates an AI-based risk score";
homepage = "https://github.com/projectdiscovery/openrisk";
changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "step-cli";
version = "0.23.2";
version = "0.23.3";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-d21TQRPRDEDYj7Fqf7R7mHj2tLPd/EXNkeL56KyLgIg=";
hash = "sha256-gJsezi7yczVagR7faQvehyGWW6E7sfDXrJEVdsUSSp0=";
};
ldflags = [
@ -25,7 +25,7 @@ buildGoModule rec {
rm command/certificate/remote_test.go
'';
vendorHash = "sha256-Oh8tldLuM3j17OUX1TkgyOL9Ae/x1H8FrB2lNbtZ8pI=";
vendorHash = "sha256-YsZGs5/QQLdnXOeEnDXevlnJrOBoLkdYqTj2ZIoUOkA=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

View file

@ -0,0 +1,47 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "trustymail";
version = "0.8.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "cisagov";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hKiQWAOzUjmoCcEH9OTgkgU7s1V+Vv3+93OLkqDRDoU=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov" ""
'';
propagatedBuildInputs = with python3.pkgs; [
dnspython
docopt
publicsuffixlist
pydns
pyspf
requests
] ++ publicsuffixlist.optional-dependencies.update;
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
];
pythonImportsCheck = [
"trustymail"
];
meta = with lib; {
description = "Tool to scan domains and return data based on trustworthy email best practices";
homepage = "https://github.com/cisagov/trustymail";
changelog = "https://github.com/cisagov/trustymail/releases/tag/v${version}";
license = with licenses; [ cc0 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,42 +1,42 @@
{ lib, fetchpatch, python3 }:
{ lib
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "csvkit";
version = "1.0.5";
version = "1.1.1";
format = "setuptools";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv";
hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM=";
};
patches = [
# Fixes a failing dbf related test. Won't be needed on 1.0.6 or later.
(fetchpatch {
url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch";
sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7";
})
];
propagatedBuildInputs = with python3.pkgs; [
agate
agate-excel
agate-dbf
agate-sql
six
setuptools
];
nativeCheckInputs = with python3.pkgs; [
nose
pytestCheckHook
];
pythonImportsCheck = [ "csvkit" ];
pythonImportsCheck = [
"csvkit"
];
disabledTests = [
# Test is comparing CLI output
"test_decimal_format"
];
meta = with lib; {
changelog = "https://github.com/wireservice/csvkit/blob/${version}/CHANGELOG.rst";
description = "A suite of command-line tools for converting to and working with CSV";
maintainers = with maintainers; [ vrthra ];
license = licenses.mit;
homepage = "https://github.com/wireservice/csvkit";
license = licenses.mit;
maintainers = with maintainers; [ vrthra ];
};
}

View file

@ -8549,6 +8549,8 @@ with pkgs;
iodine = callPackage ../tools/networking/iodine { };
ioc-scan = callPackage ../tools/security/ioc-scan { };
ioccheck = callPackage ../tools/security/ioccheck { };
ioping = callPackage ../tools/system/ioping { };
@ -26918,6 +26920,8 @@ with pkgs;
trust-dns = callPackage ../servers/dns/trust-dns { };
trustymail = callPackage ../tools/security/trustymail { };
tunctl = callPackage ../os-specific/linux/tunctl { };
twa = callPackage ../tools/networking/twa { };
@ -30482,6 +30486,8 @@ with pkgs;
sonixd = callPackage ../applications/audio/sonixd { };
sonobus = callPackage ../applications/audio/sonobus { };
sosreport = python3Packages.callPackage ../applications/logging/sosreport { };
spectmorph = callPackage ../applications/audio/spectmorph { };
@ -39109,6 +39115,8 @@ with pkgs;
openring = callPackage ../applications/misc/openring { };
openrisk = callPackage ../tools/security/openrisk { };
openvino = callPackage ../development/libraries/openvino {
python = python3;
};

View file

@ -7693,6 +7693,8 @@ self: super: with self; {
publicsuffix = callPackage ../development/python-modules/publicsuffix { };
publicsuffixlist = callPackage ../development/python-modules/publicsuffixlist { };
pubnub = callPackage ../development/python-modules/pubnub { };
pubnubsub-handler = callPackage ../development/python-modules/pubnubsub-handler { };
@ -8091,6 +8093,8 @@ self: super: with self; {
pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { };
pyexploitdb = callPackage ../development/python-modules/pyexploitdb { };
pyezviz = callPackage ../development/python-modules/pyezviz { };
pyface = callPackage ../development/python-modules/pyface { };