Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-17 00:01:52 +00:00 committed by GitHub
commit 43454c8a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 469 additions and 323 deletions

View file

@ -160,6 +160,10 @@ in
root * ${cfg.ui.package}/dist
file_server
}
handle_path /static/undefined/* {
root * ${cfg.ui.package}/dist
file_server
}
@for_backend {
path /api/* /pictrs/* /feeds/* /nodeinfo/*
}

View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.62.7";
version = "2.63.1";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-NQBFplrYh33zcKfXrcZpWrF3Uac7YXdxh3D+wixEzP0=";
hash = "sha256-ZUbWptE5BckAm/14ZPGJqTbbACC9cDOUUmzzmvuNUSA=";
};
vendorHash = null;

View file

@ -1,9 +1,9 @@
{ lib
, python3
, fetchFromGitHub
, copyDesktopItems
, wrapQtAppsHook
, fetchFromGitHub
, makeDesktopItem
, python3
, wrapQtAppsHook
}:
python3.pkgs.buildPythonApplication rec {
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "casualsnek";
repo = "onthespot";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
};
@ -54,11 +54,12 @@ python3.pkgs.buildPythonApplication rec {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = {
meta = with lib; {
description = " QT based Spotify music downloader written in Python";
homepage = "https://github.com/casualsnek/onthespot";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ onny ];
platforms = lib.platforms.linux;
changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ onny ];
platforms = platforms.linux;
};
}

View file

@ -3,44 +3,34 @@
}:
let
stableVersion = "2.2.35.1";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
extraArgs = rec {
mkOverride = attrname: version: sha256:
self: super: {
"${attrname}" = super."${attrname}".overridePythonAttrs (oldAttrs: {
inherit version;
src = oldAttrs.src.override {
inherit version sha256;
};
});
};
mkGui = args: callPackage (import ./gui.nix (args)) {
inherit (libsForQt5) wrapQtAppsHook;
};
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "sha256-iVvADwIp01HeZoDayvH1dilYRHRkRBTBR3Fh395JBq0=";
serverSrcHash = "sha256-41dbiSjvmsDNYr9/rRkeQVOnPSVND34xx1SNknCgHfc=";
mkServer = args: callPackage (import ./server.nix (args)) { };
in {
guiStable = mkGui {
stable = true;
sha256Hash = guiSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
};
guiPreview = mkGui {
stable = false;
sha256Hash = guiSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
};
serverStable = mkServer {
stable = true;
sha256Hash = serverSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
};
serverPreview = mkServer {
stable = false;
sha256Hash = serverSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
};
}

View file

@ -1,8 +1,6 @@
{ stable
, branch
{ channel
, version
, sha256Hash
, mkOverride
, hash
}:
{ lib
@ -11,18 +9,19 @@
, wrapQtAppsHook
}:
python3.pkgs.buildPythonPackage rec {
python3.pkgs.buildPythonApplication rec {
pname = "gns3-gui";
inherit version;
src = fetchFromGitHub {
inherit hash;
owner = "GNS3";
repo = pname;
rev = "v${version}";
sha256 = sha256Hash;
};
nativeBuildInputs = [
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
wrapQtAppsHook
];
@ -33,25 +32,24 @@ python3.pkgs.buildPythonPackage rec {
sentry-sdk
setuptools
sip_4 (pyqt5.override { withWebSockets = true; })
truststore
];
pythonRelaxDeps = [
"jsonschema"
"sentry-sdk"
];
doCheck = false; # Failing
dontWrapQtApps = true;
postFixup = ''
wrapQtApp "$out/bin/gns3"
'';
postPatch = ''
substituteInPlace requirements.txt \
--replace "psutil==" "psutil>=" \
--replace "jsonschema>=4.17.0,<4.18" "jsonschema" \
--replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk"
preFixup = ''
wrapQtApp "$out/bin/gns3"
'';
meta = with lib; {
description = "Graphical Network Simulator 3 GUI (${branch} release)";
description = "Graphical Network Simulator 3 GUI (${channel} release)";
longDescription = ''
Graphical user interface for controlling the GNS3 network simulator. This
requires access to a local or remote GNS3 server (it's recommended to

View file

@ -1,13 +1,12 @@
{ stable
, branch
{ channel
, version
, sha256Hash
, mkOverride
, hash
}:
{ lib
, python3
, fetchFromGitHub
, pkgsStatic
}:
python3.pkgs.buildPythonApplication {
@ -15,23 +14,25 @@ python3.pkgs.buildPythonApplication {
inherit version;
src = fetchFromGitHub {
inherit hash;
owner = "GNS3";
repo = "gns3-server";
rev = "refs/tags/v${version}";
sha256 = sha256Hash;
};
pythonRelaxDeps = [
"aiofiles"
"jsonschema"
"psutil"
"sentry-sdk"
];
# GNS3 2.3.26 requires a static BusyBox for the Docker integration
prePatch = ''
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
'';
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"jsonschema"
];
propagatedBuildInputs = with python3.pkgs; [
aiofiles
aiohttp
@ -47,6 +48,7 @@ python3.pkgs.buildPythonApplication {
py-cpuinfo
sentry-sdk
setuptools
truststore
yarl
zipstream
];
@ -59,7 +61,7 @@ python3.pkgs.buildPythonApplication {
'';
meta = with lib; {
description = "Graphical Network Simulator 3 server (${branch} release)";
description = "Graphical Network Simulator 3 server (${channel} release)";
longDescription = ''
The GNS3 server manages emulators such as Dynamips, VirtualBox or
Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST

View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "cozette";
version = "1.22.1";
version = "1.22.2";
src = fetchzip {
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip";
hash = "sha256-HnMds58yv9Ck6ONRjdIm3CNpAi1E4Zei2MaxcMjp7FQ=";
hash = "sha256-Y6StCbAsFJrRZtJu1IAsMYuyNhwe3YIlT41EhSXhCUE=";
};
installPhase = ''

View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.2.8";
hash = "sha256-mV7UAJx5F8li0xg3oaNljzbUr081e2c8l//b5kA/hRc=";
version = "8.2.9";
hash = "sha256-SEYLmUrn61CWoxD0TRPoZd4XcRBNSlUNUwcr5YpvF2w=";
});
in

View file

@ -110,6 +110,15 @@ let
sdl2 = super.sdl2.overrideLispAttrs (o: {
nativeLibs = [ pkgs.SDL2 ];
});
sdl2-image = super.sdl2-image.overrideLispAttrs (o: {
nativeLibs = [ pkgs.SDL2_image ];
});
sdl2-mixer = super.sdl2-mixer.overrideLispAttrs (o: {
nativeLibs = [ pkgs.SDL2_mixer ];
});
sdl2-ttf = super.sdl2-ttf.overrideLispAttrs (o: {
nativeLibs = [ pkgs.SDL2_ttf ];
});
lispbuilder-sdl-cffi = super.lispbuilder-sdl-cffi.overrideLispAttrs (o: {
nativeLibs = [ pkgs.SDL ];
});

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "awesomeversion";
version = "23.5.0";
version = "23.8.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-3bHE3U4MM/fQM9zBYfoLpAObay82vchjX9FpJukMGNg=";
hash = "sha256-7JJNO25UfzLs1jEO7XpqFFuEqpY4UecUk25hpONRjrI=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
version = "6.0.0";
version = "6.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-gIjb8+UEMf/wQSJOassMc9MBysTtieExFTIiSq1m/3Y=";
hash = "sha256-9uFKrr0C/RIklpW5KZj8pSv4oEibzSaAJWnTwYKyxD8=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "discord.py";
version = "2.3.1";
version = "2.3.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vbbTnmzYI6cbF7GWjPVGqy7KKDGpWQ+4q96/kGFjQ8Y=";
hash = "sha256-bZoYdDpk34x+Vw1pAZ3EcTFp2JJ/Ow0Jfof/XjqeRmY=";
};
propagatedBuildInputs = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-compute";
version = "1.13.0";
version = "1.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-k7chKcZEPImNpaBg0gIbwtEcKlfvL7uTBq+7USajdrk=";
hash = "sha256-AtGjz+ghJ+/WI8ppavkF2J6Hqq65pQYhWb3PN0f9j2Y=";
};
propagatedBuildInputs = [

View file

@ -1,15 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, defusedxml
, fetchFromGitHub
, protobuf
, pythonRelaxDepsHook
, websocket-client
, pyogg
, zeroconf
, requests
, pycryptodomex
, pyogg
, pytestCheckHook
, pythonRelaxDepsHook
, requests
, websocket-client
, zeroconf
}:
buildPythonPackage rec {
@ -20,10 +20,12 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "kokarare1212";
repo = "librespot-python";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM=";
};
pythonRelaxDeps = true;
nativeBuildInputs = [
pythonRelaxDepsHook
];
@ -38,13 +40,6 @@ buildPythonPackage rec {
zeroconf
];
pythonRelaxDeps = [
"protobuf"
"pyogg"
"requests"
"zeroconf"
];
# Doesn't include any tests
doCheck = false;
@ -55,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Open Source Spotify Client";
homepage = "https://github.com/kokarare1212/librespot-python";
changelog = "https://github.com/kokarare1212/librespot-python/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ onny ];
};

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyotp";
version = "2.8.0";
version = "2.9.0";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-wvXhfZ2pLY7B995jMasIEWuRFa26vLpuII1G/EmpjFo=";
hash = "sha256-NGtmQuDb3eO0/1qTC2ZMqCq/oRY1btSMxCx9ZZDTb2M=";
};
nativeCheckInputs = [

View file

@ -1,35 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, flask
, httpcore
, httpx
, flask
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, starlette
, trio
}:
buildPythonPackage rec {
pname = "respx";
version = "0.20.1";
version = "0.20.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "lundberg";
repo = pname;
rev = version;
hash = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U=";
hash = "sha256-OiBKNK8V9WNQDe29Q5+E/jjBWD0qFcYUzhYUWA+7oFc=";
};
patches = [
(fetchpatch {
name = "httpx-0.24-test-compatibility.patch";
url = "https://github.com/lundberg/respx/commit/b014780bde8e82a65fc6bb02d62b89747189565c.patch";
hash = "sha256-wz9YYUtdptZw67ddnzUCet2iTozKaW0jrTIS62I/HXo=";
})
];
propagatedBuildInputs = [
httpx
];
@ -52,12 +47,14 @@ buildPythonPackage rec {
"test_pass_through"
];
pythonImportsCheck = [ "respx" ];
pythonImportsCheck = [
"respx"
];
meta = with lib; {
description = "Python library for mocking HTTPX";
homepage = "https://lundberg.github.io/respx/";
changelog = "https://github.com/lundberg/respx/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/lundberg/respx/blob/${version}/CHANGELOG.md";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};

View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, aiohttp
, httpx
, pyopenssl
, requests
, trustme
}:
buildPythonPackage rec {
pname = "truststore";
version = "0.7.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-Q3HSHcqoG2DEXujL05lj3GLNu4jJ61i7VFxMou8c0cE=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
aiohttp
httpx
pyopenssl
requests
trustme
];
# tests requires networking
doCheck = false;
meta = with lib; {
homepage = "https://github.com/sethmlarson/truststore";
description = "Verify certificates using native system trust stores";
changelog = "https://github.com/sethmlarson/truststore/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ anthonyroussel ];
};
}

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.74.0";
version = "0.80.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0=";
hash = "sha256-+NxLQGgTFHOPyOs8yoZvtZj0D42V6qma+PHgTGwPJsg=";
};
nativeBuildInputs = [

View file

@ -1,8 +1,8 @@
{ lib, fetchFromGitHub }:
let
version = "1.0.1";
srcHash = "sha256-uwKLD3fW/em6UMkkyrWxAo7T//Hkzj6WjIp5qJVtBuc=";
vendorHash = "sha256-NYWJorVeRxbQTiirHK8gqpDddn2RsKsNWwDNdcONVQA=";
version = "1.0.2";
srcHash = "sha256-OeOKR9lTGXU2qumyXq3s/CI56IX4XiI/ZTRHNoY6MEI=";
vendorHash = "sha256-+2wQKNyCb9xtB1TeE1/oSMEvKoXVX9ARZxsNqE2rfrg=";
yarnHash = "sha256-QNeQwWU36A05zaARWmqEOhfyZRW68OgF4wTonQLYQfs=";
in
{
@ -31,6 +31,7 @@ in
meta = with lib; {
homepage = "https://woodpecker-ci.org/";
changelog = "https://github.com/woodpecker-ci/woodpecker/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ambroisie techknowlogick adamcstephens ];
};

View file

@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/nrempel/sleek";
license = licenses.mit;
maintainers = with maintainers; [ xrelkd ];
mainProgram = "sleek";
};
}

View file

@ -10,20 +10,20 @@
rustPlatform.buildRustPackage rec {
pname = "fnm";
version = "1.35.0";
version = "1.35.1";
src = fetchFromGitHub {
owner = "Schniz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EqaEbPMjDybsl8IsLyjDXVPaF9oH1DYRjNb94uBOxL8=";
sha256 = "sha256-qRnxXh3m/peMNAR/EV+lkwDI+Z6komF8GGFyF5UDOFg=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
cargoHash = "sha256-MkfgK+fm0kKZpFobNFtv6cVvTF/76U2Kzs/MxMwXHjs=";
cargoHash = "sha256-//DCxAC8Jf7g8SkG4NfwkM0NyWUdASuw1g4COFIY0mU=";
doCheck = false;

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pyenv";
version = "2.3.23";
version = "2.3.24";
src = fetchFromGitHub {
owner = "pyenv";
repo = "pyenv";
rev = "refs/tags/v${version}";
hash = "sha256-gvxun/izEC7KQVfuPe0yjYKqJyqaoTFYNSAldhfBKVc=";
hash = "sha256-hIScCDm15voOamgiRrgn303x2JsWXIF6Oe5PqGUGJQI=";
};
postPatch = ''

View file

@ -31,9 +31,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "1.0.2"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
dependencies = [
"memchr",
]
@ -94,9 +94,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
dependencies = [
"anstyle",
"windows-sys",
@ -186,15 +186,15 @@ dependencies = [
"polling",
"rustix 0.37.23",
"slab",
"socket2",
"socket2 0.4.9",
"waker-fn",
]
[[package]]
name = "async-lock"
version = "2.7.0"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
dependencies = [
"event-listener",
]
@ -225,7 +225,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -236,13 +236,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
[[package]]
name = "async-trait"
version = "0.1.72"
version = "0.1.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -259,9 +259,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "axum"
version = "0.6.19"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c"
checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
"axum-core",
@ -317,7 +317,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -373,9 +373,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.3.3"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
[[package]]
name = "block-buffer"
@ -487,11 +487,11 @@ dependencies = [
"warg-crypto",
"warg-protocol",
"warg-server",
"wasm-metadata 0.10.1",
"wasm-metadata",
"wasmparser 0.110.0",
"wat",
"wit-bindgen-rust-lib",
"wit-component 0.13.1",
"wit-component",
"wit-parser",
]
@ -524,7 +524,7 @@ dependencies = [
"warg-crypto",
"warg-protocol",
"windows-sys",
"wit-component 0.13.1",
"wit-component",
"wit-parser",
]
@ -532,12 +532,14 @@ dependencies = [
name = "cargo-component-macro"
version = "0.1.0"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"wit-bindgen-core",
"wit-bindgen-rust",
"wit-component 0.13.1",
"wit-bindgen-rust-lib",
"wit-component",
]
[[package]]
@ -565,9 +567,12 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.79"
version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
dependencies = [
"libc",
]
[[package]]
name = "cfg-if"
@ -599,9 +604,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.19"
version = "4.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
dependencies = [
"clap_builder",
"clap_derive",
@ -610,9 +615,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.19"
version = "4.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
dependencies = [
"anstream",
"anstyle",
@ -629,7 +634,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -655,9 +660,9 @@ dependencies = [
[[package]]
name = "const-oid"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "core-foundation"
@ -736,7 +741,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -747,20 +752,29 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
name = "der"
version = "0.7.7"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
dependencies = [
"const-oid",
"pem-rfc7468",
"zeroize",
]
[[package]]
name = "deranged"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
dependencies = [
"serde",
]
[[package]]
name = "derivative"
version = "2.2.0"
@ -884,7 +898,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -908,9 +922,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
dependencies = [
"errno-dragonfly",
"libc",
@ -1074,7 +1088,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1277,9 +1291,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
version = "1.0.2"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "humantime"
@ -1304,7 +1318,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"socket2",
"socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@ -1424,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
"rustix 0.38.4",
"rustix 0.38.8",
"windows-sys",
]
@ -1511,9 +1525,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
version = "0.4.3"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
[[package]]
name = "lock_api"
@ -1527,9 +1541,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.19"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "logos"
@ -1551,7 +1565,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex-syntax 0.6.29",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1565,9 +1579,9 @@ dependencies = [
[[package]]
name = "matchit"
version = "0.7.0"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
[[package]]
name = "memchr"
@ -1604,7 +1618,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1732,9 +1746,9 @@ dependencies = [
[[package]]
name = "num-complex"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
dependencies = [
"num-traits",
]
@ -1814,9 +1828,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.55"
version = "0.10.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
@ -1835,7 +1849,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -1846,9 +1860,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
version = "0.9.90"
version = "0.9.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
dependencies = [
"cc",
"libc",
@ -2001,29 +2015,29 @@ dependencies = [
[[package]]
name = "pin-project"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
name = "pin-project-lite"
version = "0.2.10"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
[[package]]
name = "pin-utils"
@ -2323,9 +2337,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.1"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [
"aho-corasick",
"memchr",
@ -2335,9 +2349,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.3.3"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [
"aho-corasick",
"memchr",
@ -2448,14 +2462,14 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.4"
version = "0.38.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
dependencies = [
"bitflags 2.3.3",
"bitflags 2.4.0",
"errno",
"libc",
"linux-raw-sys 0.4.3",
"linux-raw-sys 0.4.5",
"windows-sys",
]
@ -2571,22 +2585,22 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.176"
version = "1.0.183"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc"
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.176"
version = "1.0.183"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f"
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -2612,13 +2626,13 @@ dependencies = [
[[package]]
name = "serde_repr"
version = "0.1.15"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5"
checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -2644,14 +2658,15 @@ dependencies = [
[[package]]
name = "serde_with"
version = "3.1.0"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3"
checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49"
dependencies = [
"base64 0.21.2",
"chrono",
"hex",
"indexmap 1.9.3",
"indexmap 2.0.0",
"serde",
"serde_json",
"serde_with_macros",
@ -2660,14 +2675,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "3.1.0"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7"
dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -2755,6 +2770,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "socket2"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
dependencies = [
"libc",
"windows-sys",
]
[[package]]
name = "spdx"
version = "0.10.2"
@ -2805,9 +2830,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.27"
version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@ -2822,14 +2847,14 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]]
name = "tempfile"
version = "3.7.0"
version = "3.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
dependencies = [
"cfg-if",
"fastrand 2.0.0",
"redox_syscall 0.3.5",
"rustix 0.38.4",
"rustix 0.38.8",
"windows-sys",
]
@ -2865,7 +2890,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -2880,10 +2905,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.23"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
"deranged",
"itoa",
"serde",
"time-core",
@ -2898,9 +2924,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@ -2922,11 +2948,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.29.1"
version = "1.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
dependencies = [
"autocfg",
"backtrace",
"bytes",
"libc",
@ -2935,7 +2960,7 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"socket2 0.5.3",
"tokio-macros",
"windows-sys",
]
@ -2948,7 +2973,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -3031,7 +3056,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82"
dependencies = [
"bitflags 2.3.3",
"bitflags 2.4.0",
"bytes",
"futures-core",
"futures-util",
@ -3083,7 +3108,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
]
[[package]]
@ -3436,7 +3461,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"wasm-bindgen-shared",
]
@ -3470,7 +3495,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.27",
"syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3481,15 +3506,6 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wasm-encoder"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2f8e9778e04cbf44f58acc301372577375a666b966c50b03ef46144f80436a8"
dependencies = [
"leb128",
]
[[package]]
name = "wasm-encoder"
version = "0.31.1"
@ -3499,21 +3515,6 @@ dependencies = [
"leb128",
]
[[package]]
name = "wasm-metadata"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51db59397fc650b5f2fc778e4a5c4456cd856bed7fc1ec15f8d3e28229dc463"
dependencies = [
"anyhow",
"indexmap 2.0.0",
"serde",
"serde_json",
"spdx",
"wasm-encoder 0.30.0",
"wasmparser 0.108.0",
]
[[package]]
name = "wasm-metadata"
version = "0.10.1"
@ -3525,7 +3526,7 @@ dependencies = [
"serde",
"serde_json",
"spdx",
"wasm-encoder 0.31.1",
"wasm-encoder",
"wasmparser 0.110.0",
]
@ -3571,7 +3572,7 @@ dependencies = [
"leb128",
"memchr",
"unicode-width",
"wasm-encoder 0.31.1",
"wasm-encoder",
]
[[package]]
@ -3655,9 +3656,9 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.48.1"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
@ -3670,51 +3671,51 @@ dependencies = [
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
version = "0.48.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9"
[[package]]
name = "winnow"
version = "0.5.1"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11"
checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d"
dependencies = [
"memchr",
]
@ -3755,51 +3756,48 @@ dependencies = [
"warg-crypto",
"warg-protocol",
"warg-server",
"wasm-metadata 0.10.1",
"wasm-metadata",
"wasmparser 0.110.0",
"wit-component 0.13.1",
"wit-component",
"wit-parser",
]
[[package]]
name = "wit-bindgen"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5c3d15a04ce994fad2c5442a754b404ab1fee23c903a04a560f84f94fdf63c0"
source = "git+https://github.com/bytecodealliance/wit-bindgen#03154cb3de538d068ba9f37f28abe762c7574132"
dependencies = [
"bitflags 2.3.3",
"bitflags 2.4.0",
"wit-bindgen-rust-macro",
]
[[package]]
name = "wit-bindgen-core"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9658ec54d4a3c9e2f079bc65a131093337595b595fbf82f805008469838cdea"
source = "git+https://github.com/bytecodealliance/wit-bindgen#03154cb3de538d068ba9f37f28abe762c7574132"
dependencies = [
"anyhow",
"wit-component 0.12.0",
"wit-component",
"wit-parser",
]
[[package]]
name = "wit-bindgen-rust"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21ae6a6198ba9765771b977e2af985a0d5ac71b59f999da5c4ee1c7bbd8ca8dc"
source = "git+https://github.com/bytecodealliance/wit-bindgen#03154cb3de538d068ba9f37f28abe762c7574132"
dependencies = [
"anyhow",
"heck",
"wasm-metadata 0.9.0",
"wasm-metadata",
"wit-bindgen-core",
"wit-bindgen-rust-lib",
"wit-component 0.12.0",
"wit-component",
]
[[package]]
name = "wit-bindgen-rust-lib"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c31de8c6c77cac1fd4927c7584d1314cd5e838cfb40b53333d6dffc7a132dda"
source = "git+https://github.com/bytecodealliance/wit-bindgen#03154cb3de538d068ba9f37f28abe762c7574132"
dependencies = [
"heck",
"wit-bindgen-core",
@ -3808,32 +3806,15 @@ dependencies = [
[[package]]
name = "wit-bindgen-rust-macro"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2abe5c7c4c08468d01590aa96c8a684dd94fb9241a248af88eef7edac61e43"
source = "git+https://github.com/bytecodealliance/wit-bindgen#03154cb3de538d068ba9f37f28abe762c7574132"
dependencies = [
"anyhow",
"proc-macro2",
"syn 2.0.27",
"syn 2.0.28",
"wit-bindgen-core",
"wit-bindgen-rust",
"wit-bindgen-rust-lib",
"wit-component 0.12.0",
]
[[package]]
name = "wit-component"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "253bd426c532f1cae8c633c517c63719920535f3a7fada3589de40c5b734e393"
dependencies = [
"anyhow",
"bitflags 1.3.2",
"indexmap 2.0.0",
"log",
"wasm-encoder 0.30.0",
"wasm-metadata 0.9.0",
"wasmparser 0.108.0",
"wit-parser",
"wit-component",
]
[[package]]
@ -3843,11 +3824,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d843f4dfead0d465b09e8bfba4d3dcb1a1bcc857f87917d348c7fa401158bc5"
dependencies = [
"anyhow",
"bitflags 2.3.3",
"bitflags 2.4.0",
"indexmap 2.0.0",
"log",
"wasm-encoder 0.31.1",
"wasm-metadata 0.10.1",
"wasm-encoder",
"wasm-metadata",
"wasmparser 0.110.0",
"wit-parser",
]

View file

@ -9,19 +9,20 @@
rustPlatform.buildRustPackage {
pname = "cargo-component";
version = "unstable-2023-08-03";
version = "unstable-2023-08-16";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "d14cef65719d0d186218d1dfe5f04bbbf295dc80";
hash = "sha256-dFaboXF5NXPE2xcJWanyP5WYpqJBq+xKpi6snNfIWJg=";
rev = "26e55d87aff076e032fbcb58b794a35d3de650dc";
hash = "sha256-FCuFCLRLJ50ISlahMG6tL2qeeBQh1GQ/vBH6/q2zn44=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc=";
"wit-bindgen-0.9.0" = "sha256-/ozrGPnk2gYuofU7qn2qYJb6cL+7nOzj8FF0BgbKXDY=";
};
};

View file

@ -58,5 +58,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/launchbadge/sqlx";
license = licenses.asl20;
maintainers = with maintainers; [ greizgh xrelkd fd ];
mainProgram = "sqlx";
};
}

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.70.0";
version = "2.72.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "refs/tags/v${version}";
hash = "sha256-mr6tCZfnAM0e8cEtyen3oiV0Vt3cR/Z80RJ4NeMUaMs=";
hash = "sha256-0FKxZL+PY9cU64OzzfoxaHv6/neAJPwqOKcBsiSY3dw=";
};
nativeBuildInputs = [

View file

@ -1,4 +1,8 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "eksctl";
@ -40,5 +44,6 @@ buildGoModule rec {
homepage = "https://github.com/weaveworks/eksctl";
license = licenses.asl20;
maintainers = with maintainers; [ xrelkd Chili-Man ];
mainProgram = "eksctl";
};
}

View file

@ -0,0 +1,98 @@
{ stdenv
, lib
, fetchFromGitHub
, wrapQtAppsHook
, fpc
, lazarus
, xorg
, libqt5pas
, _7zz
, archiver
, brotli
, upx
, zpaq
, zstd
}:
stdenv.mkDerivation rec {
pname = "peazip";
version = "9.9.0";
src = fetchFromGitHub {
owner = "peazip";
repo = pname;
rev = version;
hash = "sha256-1UavigwVp/Gna2BOUECQrn/VQjov8wDw5EdPWX3mpvM=";
};
sourceRoot = "${src.name}/peazip-sources";
nativeBuildInputs = [
wrapQtAppsHook
lazarus
fpc
];
buildInputs = [
xorg.libX11
libqt5pas
];
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
buildPhase = ''
export HOME=$(mktemp -d)
cd dev
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi && [ -f pea ]
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi && [ -f peazip ]
cd ..
'';
installPhase = ''
runHook preInstall
# Executables
## Main programs
install -D dev/{pea,peazip} -t $out/lib/peazip
mkdir -p $out/bin
ln -s $out/lib/peazip/{pea,peazip} $out/bin/
## Symlink the available compression algorithm programs.
mkdir -p $out/lib/peazip/res/bin/7z
ln -s ${_7zz}/bin/7zz $out/lib/peazip/res/bin/7z/7z
mkdir -p $out/lib/peazip/res/bin/arc
ln -s ${archiver}/bin/arc $out/lib/peazip/res/bin/arc/
mkdir -p $out/lib/peazip/res/bin/brotli
ln -s ${brotli}/bin/brotli $out/lib/peazip/res/bin/brotli/
mkdir -p $out/lib/peazip/res/bin/upx
ln -s ${upx}/bin/upx $out/lib/peazip/res/bin/upx/
mkdir -p $out/lib/peazip/res/bin/zpaq
ln -s ${zpaq}/bin/zpaq $out/lib/peazip/res/bin/zpaq/
mkdir -p $out/lib/peazip/res/bin/zstd
ln -s ${zstd}/bin/zstd $out/lib/peazip/res/bin/zstd/
mkdir -p $out/share/peazip
ln -s $out/share/peazip $out/lib/peazip/res/share
cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/
install -D res/share/batch/freedesktop_integration/peazip.png -t "$out/share/icons/hicolor/256x256/apps"
install -D res/share/icons/peazip_{7z,rar,zip}.png -t "$out/share/icons/hicolor/256x256/mimetypes"
install -D res/share/batch/freedesktop_integration/peazip_{add,extract}.png -t "$out/share/icons/hicolor/256x256/actions"
install -D res/share/batch/freedesktop_integration/*.desktop -t "$out/share/applications"
runHook postInstall
'';
meta = with lib; {
description = "Cross-platform file and archive manager";
longDescription = ''
Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager.
Features volume spanning, compression, authenticated encryption.
Supports 7Z, 7-Zip sfx, ACE, ARJ, Brotli, BZ2, CAB, CHM, CPIO, DEB, GZ, ISO, JAR, LHA/LZH, NSIS, OOo, PEA, RAR, RPM, split, TAR, Z, ZIP, ZIPX, Zstandard.
'';
license = licenses.gpl3Only;
homepage = "https://peazip.github.io";
platforms = platforms.linux;
maintainers = with maintainers; [ annaaurora ];
};
}

View file

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "svg2pdf";
version = "0.5.0";
version = "0.6.0";
# This cargo package is usually a library, hence it does not track a
# Cargo.lock by default so we use fetchCrate
src = fetchCrate {
inherit version pname;
sha256 = "sha256-4n7aBVjXiVU7O7sOKN5eBrKZNYsKk8eDPdna9o7piJo=";
sha256 = "sha256-RZpJ2HNqO1y6ZQjxdd7LEH2yS5QyjSqQFuyU4BwFA+4=";
};
cargoHash = "sha256-5EEZoYvobbNOknwZWn71EDQSNPmYoegHoZW1Or8Xv2c=";
cargoHash = "sha256-wJr1K/PUewScGjVLBmg9lpDKyn5CIUK2zac9/+JvnbE=";
buildFeatures = [ "cli" ];
doCheck = true;

View file

@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/bytecodealliance/wit-bindgen";
license = licenses.asl20;
maintainers = with maintainers; [ xrelkd ];
mainProgram = "wit-bindgen";
};
}

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl
, libiconv, pcsclite, libassuan, libXt
, fetchpatch
, docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin
@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k=";
};
patches = [
(fetchpatch {
name = "CVE-2023-2977.patch";
url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch";
hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s=";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
zlib readline openssl libassuan

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssh-to-pgp";
version = "1.0.4";
version = "1.1.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "ssh-to-pgp";
rev = version;
sha256 = "sha256-WdSa7rLUGcn1XZSnbwglp4I432XzB3vXb6IO3biE+Js=";
sha256 = "sha256-3R/3YPYLdirK3QtiRNO2tpJRO2DKgN+K4txb9xwnQvQ=";
};
vendorHash = "sha256-J9HuZhjeXSS4ej1RM+yn2VGoSdiS39PDM4fScAh6Eps=";
vendorHash = "sha256-RCz2+IZdgmPnEakKxn/C3zFfRyWnMLB51Nm8VGOxBkc=";
nativeCheckInputs = [ gnupg ];
checkPhase = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "witness";
version = "0.1.13";
version = "0.1.14";
src = fetchFromGitHub {
owner = "testifysec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BQfJ6pHA4Yrp1zo22GQ2/JtU2UCOf1hUBqIqcIp7p3A=";
sha256 = "sha256-TUEbFkrS0OztTiY0OXiZsqraq3TINtC/DQEyCGPNXpE=";
};
proxyVendor = true;
vendorHash = "sha256-bSEV6cb+/RMkNzwbzfBkDM3PTIE8t8a6w9b1BI6YnCI=";
vendorHash = "sha256-L2NaEt64mgFZVta/F8/uUQ4djlra59JPcHJLGbFCQJs=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-emojicodes";
version = "0.1.3";
version = "0.2.2";
src = fetchFromGitHub {
owner = "blyxyas";
repo = "mdbook-emojicodes";
rev = "${version}.1";
hash = "sha256-SWT01R/+FuzkkOUd/2wpRo0HIaPEtzDelTSh7ewo9gQ=";
rev = "${version}";
hash = "sha256-wj3WVDDJmRh1g4E1iqxqmu6QNNVi9pOqZDnnDX3AnFo=";
};
cargoHash = "sha256-z9UKBBCr8R1I9k48JsEBnVokQDfaj9lt+qfIUvJ/5lE=";
cargoHash = "sha256-Ia7GdMadx1Jb1BB040eRmyIpK98CsN3yjruUxUNh3co=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱";
homepage = "https://github.com/blyxyas/mdbook-emojicodes";
changelog = "https://github.com/blyxyas/mdbook-emojicodes/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ blaggacao ];
};

View file

@ -34511,6 +34511,8 @@ with pkgs;
stdenv = gccStdenv;
};
peazip = libsForQt5.callPackage ../tools/archivers/peazip { };
peek = callPackage ../applications/video/peek { };
peertube = callPackage ../servers/peertube {

View file

@ -12913,6 +12913,8 @@ self: super: with self; {
trustme = callPackage ../development/python-modules/trustme { };
truststore = callPackage ../development/python-modules/truststore { };
trytond = callPackage ../development/python-modules/trytond { };
tskit = callPackage ../development/python-modules/tskit { };