Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-02-05 06:01:20 +00:00 committed by GitHub
commit 63e54d6343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 162 additions and 114 deletions

View file

@ -68,7 +68,7 @@ in
systemd.services.syncplay = { systemd.services.syncplay = {
description = "Syncplay Service"; description = "Syncplay Service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target "]; after = [ "network-online.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}"; ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}";

View file

@ -6,24 +6,25 @@
, alsa-lib , alsa-lib
, pkg-config , pkg-config
, ffmpeg , ffmpeg
, dbus
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "songrec"; pname = "songrec";
version = "0.2.1"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marin-m"; owner = "marin-m";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c="; sha256 = "sha256-aHZH3sQNUUPcMRySy8Di0XUoFo4qjGi2pi0phLwORaA=";
}; };
cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10="; cargoSha256 = "sha256-EpkB43rMUJO6ouUV9TmQ+RSnGhX32DZHpKic1E6lUyU=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; buildInputs = [ alsa-lib dbus gtk3 openssl ffmpeg ];
postInstall = '' postInstall = ''
mv packaging/rootfs/usr/share $out/share mv packaging/rootfs/usr/share $out/share

View file

@ -2,12 +2,12 @@
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";
version = "2.36.3"; version = "2.37.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256:1sxsr70nm86fyx2m3wf694x1p6kvmkwxw6fqnslpbyjpyi9x73cd"; hash = "sha256-etbMd0qUAsd5B3QH+DBVI9QLROjZXkGr4sAUlO8cRek=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -5,8 +5,8 @@ let
description = "PrusaSlicer fork with more features and faster development cycle"; description = "PrusaSlicer fork with more features and faster development cycle";
versions = { versions = {
stable = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; stable = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; };
latest = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; latest = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; };
}; };
override = { version, sha256 }: super: { override = { version, sha256 }: super: {

View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rofi-emoji"; pname = "rofi-emoji";
version = "2.2.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mange"; owner = "Mange";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "01f9nw54mbwlj00mclf7qc2y95riaihzznbbmp0wc4c52pvxki4q"; sha256 = "sha256-y+WJYSiDXYvg+N3wok44hJ8Tuqrd3E63pZyiYx0NWXg=";
}; };
patches = [ patches = [

View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xplr"; pname = "xplr";
version = "0.17.1"; version = "0.17.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sayanarijit"; owner = "sayanarijit";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eRA9v5C6FFYs01a8cwnaVGliuNj026/ANSPC2FxEUws="; sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk=";
}; };
buildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "sha256-xali/nvYVpvKIFRlOZpDNE/rv7iUHJCU9QV6RctJSO8="; cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM=";
meta = with lib; { meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer"; description = "A hackable, minimal, fast TUI file explorer";

View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let let
version = "0.25.3"; version = "0.26.1";
sha256 = "1j7jw6vfki67dz9lkx3f94b9hi6d2bc504yy3nfppp3hx8nwxb37"; sha256 = "10l02cw0ypci9vaman1nm9z36fshqwwf0gk16rvsc82d02lv4iq5";
manifestsSha256 = "1akp1i3xasfjq6zqbk7mnbkhnzmq7if7v82q6zdp2678xrg6xps5"; manifestsSha256 = "0gffjmcxsf9c4f6g60nwq88snm6lar0qd53xp0csr4n5sy7zg6dm";
manifests = fetchzip { manifests = fetchzip {
url = url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256; inherit sha256;
}; };
vendorSha256 = "sha256-/VeJq6l3kSZ9qcYf2ypyyoXVKME+rig6aDdWDoRqNzA="; vendorSha256 = "sha256-IJGp4QWZbTzPHeawyjJI0aN4LP5ZV2mb5pUusfQ4rfE=";
postUnpack = '' postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests cp -r ${manifests} source/cmd/flux/manifests

View file

@ -1,30 +1,30 @@
{ lib { lib
, buildGoModule , buildGo117Module
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
, git , git
, go , go_1_17
, gnumake , gnumake
}: }:
buildGoModule rec { buildGo117Module rec {
pname = "kubebuilder"; pname = "kubebuilder";
version = "3.2.0"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes-sigs"; owner = "kubernetes-sigs";
repo = "kubebuilder"; repo = "kubebuilder";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk=";
}; };
vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A=";
subPackages = ["cmd"]; subPackages = ["cmd"];
ldflags = [ ldflags = [
"-X main.kubeBuilderVersion=v${version}" "-X main.kubeBuilderVersion=v${version}"
"-X main.goos=${go.GOOS}" "-X main.goos=${go_1_17.GOOS}"
"-X main.goarch=${go.GOARCH}" "-X main.goarch=${go_1_17.GOARCH}"
"-X main.gitCommit=v${version}" "-X main.gitCommit=v${version}"
"-X main.buildDate=v${version}" "-X main.buildDate=v${version}"
]; ];
@ -34,7 +34,7 @@ buildGoModule rec {
postInstall = '' postInstall = ''
mv $out/bin/cmd $out/bin/kubebuilder mv $out/bin/cmd $out/bin/kubebuilder
wrapProgram $out/bin/kubebuilder \ wrapProgram $out/bin/kubebuilder \
--prefix PATH : ${lib.makeBinPath [ go gnumake ]} --prefix PATH : ${lib.makeBinPath [ go_1_17 gnumake ]}
''; '';
allowGoReference = true; allowGoReference = true;

View file

@ -4,11 +4,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rocketchat-desktop"; pname = "rocketchat-desktop";
version = "3.7.6"; version = "3.7.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
sha256 = "sha256-lOiYj0eC/Mw2icdizK7wvBG2xuIBRkCF0aBJ24qzyK8="; sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -45,11 +45,11 @@ let
pname = "slack"; pname = "slack";
x86_64-darwin-version = "4.22.0"; x86_64-darwin-version = "4.23.0";
x86_64-darwin-sha256 = "094p9vyv56m5qfp9jh2205ijfqcp0dr6bkmiv0wxihy2rg20b5zp"; x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd";
x86_64-linux-version = "4.22.0"; x86_64-linux-version = "4.23.0";
x86_64-linux-sha256 = "0k84glxp653lxgfv5b65zvvysax7fr3lhsjgq76safk7g7cjc86i"; x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is";
aarch64-darwin-version = "4.22.0"; aarch64-darwin-version = "4.22.0";
aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4"; aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4";

View file

@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tutanota-desktop"; pname = "tutanota-desktop";
version = "3.89.25"; version = "3.91.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz"; name = "tutanota-desktop-${version}.tar.gz";
sha256 = "sha256-0j0vL45kpZeBBdW7NY8lvseYUhXGPoCbOdUtT97fMiI="; sha256 = "sha256-REoYLxU9p0lECKNwcDHidO+jTCKS1yQSzed9GSHSNGI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,11 +7,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "ffmpeg-normalize"; pname = "ffmpeg-normalize";
version = "1.22.4"; version = "1.22.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a20978538ae9a51bdbe5ef5aa0f87ede0f8efd2817ab240980de56eac36982e3"; sha256 = "20250fc28ce04636580577b2864e54e6bea9daf68e2d8afaeb78e131b182cd28";
}; };
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "love"; pname = "love";
version = "0.10.2"; version = "11.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "love2d"; owner = "love2d";
repo = "love"; repo = "love";
rev = version; rev = version;
sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spidermonkey"; pname = "spidermonkey";
version = "91.5.0"; version = "91.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha256 = "04y8nj1f065b3dn354f1ns3cm9xp4kljr5ippvmfdqr7cb4xjp7l"; sha256 = "sha256-NgSWlFBf9e3RoIZIDlo9Kf7dPwsNSoononGmbo/GzR8=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -2,24 +2,24 @@
, aiohttp , aiohttp
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy3k , pythonOlder
, pytest , pytest
, pytest-asyncio , pytest-asyncio
, pytest-cov
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aresponses"; pname = "aresponses";
version = "2.1.4"; version = "2.1.5";
format = "setuptools";
disabled = !isPy3k; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CircleUp"; owner = "CircleUp";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4="; sha256 = "sha256-9ZzIrj87TwxQi0YMlTHFPAp0V1oxfuL0+RMGXxUxFoE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,19 +34,20 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
aiohttp aiohttp
pytest-asyncio pytest-asyncio
pytest-cov
pytestCheckHook pytestCheckHook
]; ];
# Disable tests which requires network access
disabledTests = [ disabledTests = [
# Disable tests which requires network access
"test_foo" "test_foo"
"test_passthrough" "test_passthrough"
]; ];
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "aresponses" ]; pythonImportsCheck = [
"aresponses"
];
meta = with lib; { meta = with lib; {
description = "Asyncio testing server"; description = "Asyncio testing server";
@ -55,3 +56,4 @@ buildPythonPackage rec {
maintainers = with maintainers; [ makefu ]; maintainers = with maintainers; [ makefu ];
}; };
} }

View file

@ -11,23 +11,22 @@
, pythonOlder , pythonOlder
, pyyaml , pyyaml
, tomlkit , tomlkit
, typing-extensions
, ujson , ujson
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cattrs"; pname = "cattrs";
version = "1.8.0"; version = "1.10.0";
format = "pyproject"; format = "pyproject";
# https://cattrs.readthedocs.io/en/latest/history.html#id33:
# "Python 2, 3.5 and 3.6 support removal. If you need it, use a version below 1.1.0."
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Tinche"; owner = "python-attrs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-CKAsvRKS8kmLcyPA753mh6d3S04ObzO7xLPpmlmxrxI="; hash = "sha256-VbfQMMDO03eeUHAACxoX6a3DKmzoF9EfLuTpvaY6bWs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,6 +35,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
attrs attrs
] ++ lib.optionals (pythonOlder "3.7") [
typing-extensions
]; ];
checkInputs = [ checkInputs = [
@ -50,10 +51,10 @@ buildPythonPackage rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace setup.cfg \
--replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" ""
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'orjson = "^3.5.2"' "" --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \
--replace 'orjson = "^3.5.2"' "" \
--replace "[tool.poetry.group.dev.dependencies]" "[tool.poetry.dev-dependencies]"
substituteInPlace tests/test_preconf.py \ substituteInPlace tests/test_preconf.py \
--replace "from orjson import dumps as orjson_dumps" "" \ --replace "from orjson import dumps as orjson_dumps" "" \
--replace "from orjson import loads as orjson_loads" "" --replace "from orjson import loads as orjson_loads" ""
@ -76,11 +77,13 @@ buildPythonPackage rec {
"test_orjson" "test_orjson"
]; ];
pythonImportsCheck = [ "cattr" ]; pythonImportsCheck = [
"cattr"
];
meta = with lib; { meta = with lib; {
description = "Python custom class converters for attrs"; description = "Python custom class converters for attrs";
homepage = "https://github.com/Tinche/cattrs"; homepage = "https://github.com/python-attrs/cattrs";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View file

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "databricks-cli"; pname = "databricks-cli";
version = "0.16.2"; version = "0.16.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3e9a65a19a589b795ebbd9b3b16a8e470d612d57d6216ae44a9c7a735e4080e6"; sha256 = "sha256-GBiQaBg7YY31bJft0W8Iq7WXhX98wPgPFHdNwuZ7WQY=";
}; };
checkInputs = [ checkInputs = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "policy-sentry"; pname = "policy-sentry";
version = "0.12.1"; version = "0.12.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "salesforce"; owner = "salesforce";
repo = "policy_sentry"; repo = "policy_sentry";
rev = version; rev = version;
sha256 = "sha256-zXvZpX8yKPJpmhKdPhlxYUWUadGlr4WsmfJMgE3kzyQ="; sha256 = "sha256-6yG60vUsvLpIiZ3i1D3NZOL9bINaF5ydrDvewqpEmpA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydy"; pname = "pydy";
version = "0.5.0"; version = "0.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1b487a62b55a8c8664009b09bf789254b2c942cd704a380bedb1057418c94fa2"; sha256 = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI=";
}; };
checkInputs = [ checkInputs = [

View file

@ -0,0 +1,40 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "ent-go";
version = "0.10.0";
src = fetchFromGitHub {
owner = "ent";
repo = "ent";
rev = "v${version}";
sha256 = "sha256-TG08GRo1gNxC5iHt/Md5WVWaEQ1m2mUDGqpuxw8Pavg=";
};
vendorSha256 = "sha256-n5dS78SSBAEgE4/9jMZZhbOQZ3IGi9n3ErA0ioP9Tsg=";
subPackages = [ "cmd/ent" ];
ldflags = [
"-s"
"-w"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd ent \
--bash <($out/bin/ent completion bash) \
--fish <($out/bin/ent completion fish) \
--zsh <($out/bin/ent completion zsh)
'';
meta = with lib; {
description = "An entity framework for Go";
downloadPage = "https://github.com/ent/ent";
license = licenses.asl20;
homepage = "https://entgo.io/";
maintainers = with maintainers; [ superherointj ];
};
}

View file

@ -327,7 +327,7 @@ in buildFHSUserEnv rec {
name = "steam-run"; name = "steam-run";
targetPkgs = commonTargetPkgs; targetPkgs = commonTargetPkgs;
inherit multiPkgs extraBuildCommands; inherit multiPkgs extraBuildCommands profile;
inherit unshareIpc unsharePid; inherit unshareIpc unsharePid;

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vintagestory"; pname = "vintagestory";
version = "1.16.1"; version = "1.16.3";
src = fetchurl { src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
sha256 = "sha256-o3FMuMvWxj9ECj77H/q5QkpcFbcZ0eNQ1OS51pUal3c="; sha256 = "sha256-PpvTHG/EBKBhtlgIrAz/B+U1aHbZURN2cWTlZ/DkZQs=";
}; };
nativeBuildInputs = [ makeWrapper copyDesktopItems ]; nativeBuildInputs = [ makeWrapper copyDesktopItems ];

View file

@ -23,14 +23,14 @@ let
]); ]);
path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "3.4.2"; version = "3.5.0";
pname = "sabnzbd"; pname = "sabnzbd";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-Pl2i/k5tilPvMWLRtzZ2imOJQdZYKDAz8bt847ZAXF8="; sha256 = "sha256-Ay+y02kvFuwefT6f/8orClMiBK201AwSEWnPKgoeOFQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

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

View file

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: e8c59985fa8e2c65660f2103b75622018e99f6b3 revision: b8975cbd6552cc52044250143ffc440775a8a29e
ref: refs/tags/6.1.27 ref: refs/tags/6.1.28
specs: specs:
metasploit-framework (6.1.27) metasploit-framework (6.1.28)
actionpack (~> 6.0) actionpack (~> 6.0)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -31,7 +31,7 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.70) metasploit-payloads (= 2.0.71)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.18) metasploit_payloads-mettle (= 1.0.18)
mqtt mqtt
@ -128,23 +128,23 @@ GEM
arel-helpers (2.14.0) arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8) activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.551.0) aws-partitions (1.552.0)
aws-sdk-core (3.125.5) aws-sdk-core (3.126.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-ec2 (1.296.0) aws-sdk-ec2 (1.298.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.126.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0) aws-sdk-iam (1.66.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.126.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.53.0) aws-sdk-kms (1.54.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.126.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.111.3) aws-sdk-s3 (1.112.0)
aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-core (~> 3, >= 3.126.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4) aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0) aws-sigv4 (1.4.0)
@ -152,7 +152,7 @@ GEM
bcrypt (3.1.16) bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
bindata (2.4.10) bindata (2.4.10)
bson (4.14.0) bson (4.14.1)
builder (3.2.4) builder (3.2.4)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
cookiejar (0.3.3) cookiejar (0.3.3)
@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0) activemodel (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
railties (~> 6.0) railties (~> 6.0)
metasploit-payloads (2.0.70) metasploit-payloads (2.0.71)
metasploit_data_models (5.0.4) metasploit_data_models (5.0.4)
activerecord (~> 6.0) activerecord (~> 6.0)
activesupport (~> 6.0) activesupport (~> 6.0)
@ -298,7 +298,7 @@ GEM
hashery (~> 2.0) hashery (~> 2.0)
ruby-rc4 ruby-rc4
ttfunk ttfunk
pg (1.3.0) pg (1.3.1)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.6.1) puma (5.6.1)
nio4r (~> 2.0) nio4r (~> 2.0)

View file

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.1.27"; version = "6.1.28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-nc9Oxl5dLGU60jaQdkaErW51s4QsuD977bJubd9BA3A="; sha256 = "sha256-3l9yBnOejCVSo/zw46mGv3uBoArtyOPbjE1l8CoVNkg=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -104,60 +104,60 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0shhwh5wra3h5vibabdkx422vzs4bwp8kmvn1x46sqscmqk8hw9p"; sha256 = "0wr4jkylfkd89970hw3akfy7vyj54qz11gq3aar48j8p9px0gl17";
type = "gem"; type = "gem";
}; };
version = "1.551.0"; version = "1.552.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i6835n7d2ss3k3ljwbw8by0fagymk0122ill3i9ipghz21xpqld"; sha256 = "002hgcpsch33r82jd5imyxj0h2w4v8ymmby42rnxdisd03jkygy9";
type = "gem"; type = "gem";
}; };
version = "3.125.5"; version = "3.126.0";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0f45py2sgai3d7k67kp4hb9ljf8khfz6wd33sj1pdvj55pcg7zai"; sha256 = "0s0xdcrhmcgbh4m1g57dnw04g45zviv6a4r3qaw8468bm6bi16z6";
type = "gem"; type = "gem";
}; };
version = "1.296.0"; version = "1.298.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0gss3wi1csngmd2iirxznnhafr0yvgqnkr0cksz7dk9kqrly04gl"; sha256 = "0dr1lgg76syyqj12x8w0j6qvwn3410vdjhy0r9y8k930svrjlkh7";
type = "gem"; type = "gem";
}; };
version = "1.65.0"; version = "1.66.0";
}; };
aws-sdk-kms = { aws-sdk-kms = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "044nzbh16x4vx7kbjv1hfh553sp126kcdk2x99apr52j506sk87c"; sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2";
type = "gem"; type = "gem";
}; };
version = "1.53.0"; version = "1.54.0";
}; };
aws-sdk-s3 = { aws-sdk-s3 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "085nizd80w75djrch1c38g0xchw6hsyfcg039qp27aalwhxd44b4"; sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5";
type = "gem"; type = "gem";
}; };
version = "1.111.3"; version = "1.112.0";
}; };
aws-sigv4 = { aws-sigv4 = {
groups = ["default"]; groups = ["default"];
@ -204,10 +204,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vfwqzd89542xm8sc1ni6jvjy6wgycnri67q7agxnc5jmwawmcgf"; sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5";
type = "gem"; type = "gem";
}; };
version = "4.14.0"; version = "4.14.1";
}; };
builder = { builder = {
groups = ["default"]; groups = ["default"];
@ -684,12 +684,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "e8c59985fa8e2c65660f2103b75622018e99f6b3"; rev = "b8975cbd6552cc52044250143ffc440775a8a29e";
sha256 = "0w0387gnsvmjxmxkzf1chjrpavmdhi37d41ns8x6ab2xbv34xkwx"; sha256 = "0j1n2lmg0radikdy7j7d1ah82yxzhsly7w7wld92b34yfc374pyy";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.1.27"; version = "6.1.28";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -706,10 +706,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "07vjb7kdgr2wi9b5jk7a9niapvbwi7xk4jx9a521fm6p1fhrnlnn"; sha256 = "12fr3v5mjwlilnlccnbimamz6sq6kckf16vgzpfpgi8gjma3lgb9";
type = "gem"; type = "gem";
}; };
version = "2.0.70"; version = "2.0.71";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -977,10 +977,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0y16aa24ljnyhszqr6g3m0369rmx5xw6dgglipwhi6pn8dl678mr"; sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.3.1";
}; };
public_suffix = { public_suffix = {
groups = ["default"]; groups = ["default"];

View file

@ -13,8 +13,8 @@
let let
sha256 = "0vyvmfrq3jnwqqjf2rsd5qnnwvvq71165ws7smnxk5jn8lqkq6z1"; sha256 = "0vyvmfrq3jnwqqjf2rsd5qnnwvvq71165ws7smnxk5jn8lqkq6z1";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
specVersion = "4.113.0"; specVersion = "4.114.0";
specSha256 = "0r02h6a75ad2yahff62ilmlcnp3w4j4djkx187zyh9kdvf1lzqb9"; specSha256 = "1q0w2d3wb41f36rc04cdipfld9h3llcy1fndqmpymc1c55fc949r";
spec = fetchurl { spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256; sha256 = specSha256;
@ -24,7 +24,7 @@ in
buildPythonApplication rec { buildPythonApplication rec {
pname = "linode-cli"; pname = "linode-cli";
version = "5.15.0"; version = "5.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linode"; owner = "linode";

View file

@ -14863,6 +14863,8 @@ with pkgs;
emma = callPackage ../development/tools/analysis/emma { }; emma = callPackage ../development/tools/analysis/emma { };
ent-go = callPackage ../development/tools/ent { };
epm = callPackage ../development/tools/misc/epm { }; epm = callPackage ../development/tools/misc/epm { };
eresi = callPackage ../development/tools/analysis/eresi { }; eresi = callPackage ../development/tools/analysis/eresi { };