Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-09-18 18:04:48 +00:00 committed by GitHub
commit 71d46fbcdf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
84 changed files with 2416 additions and 4072 deletions

View File

@ -429,8 +429,8 @@ checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs.
checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
# Attribute sets that are coercible to strings shouldn't be recursed into
checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix
# Multiple lists aren't concatenated together
checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix
# Multiple lists aren't concatenated together if their definitions are not equal
checkConfigError 'The option .* has conflicting definition values' config.value ./types-anything/lists.nix
# Check that all equalizable atoms can be used as long as all definitions are equal
checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix
checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix
@ -438,6 +438,7 @@ checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix
checkConfigOutput '^"/[^"]+"$' config.value.path ./types-anything/equal-atoms.nix
checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix
checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix
checkConfigOutput '^\[1,"a",{"x":null}\]$' config.value.list ./types-anything/equal-atoms.nix
# Functions can't be merged together
checkConfigError "The option .value.multiple-lambdas.<function body>. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix
checkConfigOutput '^true$' config.valueIsFunction.single-lambda ./types-anything/functions.nix

View File

@ -12,6 +12,7 @@
value.path = ./.;
value.null = null;
value.float = 0.1;
value.list = [1 "a" {x=null;}];
}
{
value.int = 0;
@ -20,6 +21,7 @@
value.path = ./.;
value.null = null;
value.float = 0.1;
value.list = [1 "a" {x=null;}];
}
];

View File

@ -6,10 +6,10 @@
config = lib.mkMerge [
{
value = [ null ];
value = [ "a value" ];
}
{
value = [ null ];
value = [ "another value" ];
}
];

View File

@ -253,12 +253,6 @@ rec {
mergeFunction = {
# Recursively merge attribute sets
set = (attrsOf anything).merge;
# Safe and deterministic behavior for lists is to only accept one definition
# listOf only used to apply mkIf and co.
list =
if length defs > 1
then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."
else (listOf anything).merge;
# This is the type of packages, only accept a single definition
stringCoercibleSet = mergeOneOption;
lambda = loc: defs: arg: anything.merge

View File

@ -89,6 +89,8 @@
- [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable).
- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable).
- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).
- [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).
@ -524,6 +526,8 @@
- Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details.
Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default.
- `zfs.latestCompatibleLinuxPackages` is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention.
- The `shadowstack` hardening flag has been added, though disabled by default.
- `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package.

View File

@ -698,6 +698,7 @@
./services/matrix/conduit.nix
./services/matrix/dendrite.nix
./services/matrix/hebbot.nix
./services/matrix/hookshot.nix
./services/matrix/maubot.nix
./services/matrix/mautrix-facebook.nix
./services/matrix/mautrix-meta.nix

View File

@ -1,9 +1,44 @@
{ config, lib, pkgs, ... }:
let cfg = config.programs.yubikey-touch-detector;
in {
{
config,
lib,
pkgs,
...
}:
let
inherit (lib) types;
cfg = config.programs.yubikey-touch-detector;
in
{
options = {
programs.yubikey-touch-detector = {
enable = lib.mkEnableOption "yubikey-touch-detector";
libnotify = lib.mkOption {
# This used to be true previously and using libnotify would be a sane default.
default = true;
type = types.bool;
description = ''
If set to true, yubikey-touch-detctor will send notifications using libnotify
'';
};
unixSocket = lib.mkOption {
default = true;
type = types.bool;
description = ''
If set to true, yubikey-touch-detector will send notifications to a unix socket
'';
};
verbose = lib.mkOption {
default = false;
type = types.bool;
description = ''
Enables verbose logging
'';
};
};
};
@ -12,6 +47,13 @@ in {
systemd.user.services.yubikey-touch-detector = {
path = [ pkgs.gnupg ];
environment = {
YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = builtins.toString cfg.libnotify;
YUBIKEY_TOUCH_DETECTOR_NOSOCKET = builtins.toString (!cfg.unixSocket);
YUBIKEY_TOUCH_DETECTOR_VERBOSE = builtins.toString cfg.verbose;
};
wantedBy = [ "graphical-session.target" ];
};
systemd.user.sockets.yubikey-touch-detector = {

View File

@ -0,0 +1,127 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.matrix-hookshot;
settingsFormat = pkgs.formats.yaml { };
configFile = settingsFormat.generate "matrix-hookshot-config.yml" cfg.settings;
in
{
options = {
services.matrix-hookshot = {
enable = lib.mkEnableOption "matrix-hookshot, a bridge between Matrix and project management services";
package = lib.mkPackageOption pkgs "matrix-hookshot" { };
registrationFile = lib.mkOption {
type = lib.types.path;
description = ''
Appservice registration file.
As it contains secret tokens, you may not want to add this to the publicly readable Nix store.
'';
example = lib.literalExpression ''
pkgs.writeText "matrix-hookshot-registration" \'\'
id: matrix-hookshot
as_token: aaaaaaaaaa
hs_token: aaaaaaaaaa
namespaces:
rooms: []
users:
- regex: "@_webhooks_.*:foobar"
exclusive: true
sender_localpart: hookshot
url: "http://localhost:9993"
rate_limited: false
\'\'
'';
};
settings = lib.mkOption {
description = ''
{file}`config.yml` configuration as a Nix attribute set.
For details please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/setup/sample-configuration.html).
'';
example = {
bridge = {
domain = "example.com";
url = "http://localhost:8008";
mediaUrl = "https://example.com";
port = 9993;
bindAddress = "127.0.0.1";
};
listeners = [
{
port = 9000;
bindAddress = "0.0.0.0";
resources = [ "webhooks" ];
}
{
port = 9001;
bindAddress = "localhost";
resources = [
"metrics"
"provisioning"
];
}
];
};
default = { };
type = lib.types.submodule {
freeformType = settingsFormat.type;
options = {
passFile = lib.mkOption {
type = lib.types.path;
default = "/var/lib/matrix-hookshot/passkey.pem";
description = ''
A passkey used to encrypt tokens stored inside the bridge.
File will be generated if not found.
'';
};
};
};
};
serviceDependencies = lib.mkOption {
type = with lib.types; listOf str;
default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = lib.literalExpression ''
lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = ''
List of Systemd services to require and wait for when starting the application service,
such as the Matrix homeserver if it's running on the same host.
'';
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.matrix-hookshot = {
description = "a bridge between Matrix and multiple project management services";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
preStart = ''
if [ ! -f '${cfg.settings.passFile}' ]; then
mkdir -p $(dirname '${cfg.settings.passFile}')
${pkgs.openssl}/bin/openssl genpkey -out '${cfg.settings.passFile}' -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096
fi
'';
serviceConfig = {
Type = "simple";
Restart = "always";
ExecStart = "${cfg.package}/bin/matrix-hookshot ${configFile} ${cfg.registrationFile}";
};
};
};
meta.maintainers = with lib.maintainers; [ flandweber ];
}

View File

@ -36,7 +36,6 @@ let
<transcode mimetype="video/x-flv" using="vlcmpeg" />
<transcode mimetype="application/ogg" using="vlcmpeg" />
<transcode mimetype="audio/ogg" using="ogg2mp3" />
<transcode mimetype="audio/x-flac" using="oggflac2raw"/>
</mimetype-profile-mappings>
<profiles>
<profile name="ogg2mp3" enabled="no" type="external">
@ -52,7 +51,7 @@ let
<accept-url>yes</accept-url>
<first-resource>yes</first-resource>
<accept-ogg-theora>yes</accept-ogg-theora>
<agent command="${libsForQt5.vlc}/bin/vlc"
<agent command="${lib.getExe vlc}"
arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit" />
<buffer size="14400000" chunk-size="512000" fill-size="120000" />
</profile>

View File

@ -54,6 +54,30 @@ in
'';
};
mirroredBoots = mkOption {
default = [ { path = "/boot"; } ];
example = [
{ path = "/boot1"; }
{ path = "/boot2"; }
];
description = ''
Mirror the boot configuration to multiple paths.
'';
type = with types; listOf (submodule {
options = {
path = mkOption {
example = "/boot1";
type = types.str;
description = ''
The path to the boot directory where the extlinux-compatible
configuration files will be written.
'';
};
};
});
};
populateCmd = mkOption {
type = types.str;
readOnly = true;
@ -72,11 +96,27 @@ in
builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"
+ lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"
+ lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
installBootLoader = pkgs.writeScript "install-extlinux-conf.sh" (''
#!${pkgs.runtimeShell}
set -e
'' + flip concatMapStrings cfg.mirroredBoots (args: ''
${builder} ${builderArgs} -d '${args.path}' -c "$@"
''));
in
mkIf cfg.enable {
system.build.installBootLoader = "${builder} ${builderArgs} -c";
system.build.installBootLoader = installBootLoader;
system.boot.loader.id = "generic-extlinux-compatible";
boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}";
assertions = [
{
assertion = cfg.mirroredBoots != [ ];
message = ''
You must not remove all elements from option 'boot.loader.generic-extlinux-compatible.mirroredBoots',
otherwise the system will not be bootable.
'';
}
];
};
}

View File

@ -685,7 +685,7 @@ in {
nix-misc = handleTest ./nix/misc.nix {};
nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;};
nix-required-mounts = runTest ./nix-required-mounts;
nix-serve = handleTest ./nix-serve.nix {};
nix-serve = runTest ./nix-serve.nix;
nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
nixops = handleTest ./nixops/default.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};

View File

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, ... }:
{ config, ... }:
{
name = "nix-serve";
nodes.machine = { pkgs, ... }: {
@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
testScript = let
pkgHash = builtins.head (
builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
builtins.match "${builtins.storeDir}/([^-]+).+" (toString config.node.pkgs.hello)
);
in ''
start_all()
@ -19,4 +19,4 @@ import ./make-test-python.nix ({ pkgs, ... }:
"curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
)
'';
})
}

View File

@ -38,11 +38,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shotwell";
version = "0.32.8";
version = "0.32.9";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
sha256 = "sha256-RwY8AXnl2A9TQ3PcVg4c6Ad6rdWE7u8GxSOkYOL5KcM=";
sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs=";
};
nativeBuildInputs = [

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
version = "0.7.0";
version = "0.7.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-bn+5LBqZNwrhVX0KfXNBS00rE+BybN/NJmL4lu/oua0=";
hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w=";
};
cargoHash = "sha256-ssjLfNPP8g+2IOv0AQb+Soe/0e1H2LoqFSpmljj/z3o=";
cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo=";
meta = with lib; {
description = "Simple tui to view & control docker containers";

View File

@ -312,9 +312,12 @@ let
# Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
# allowing us to use our rustc and our clang.
./patches/chromium-121-rust.patch
] ++ lib.optionals (chromiumVersionAtLeast "126") [
] ++ lib.optionals (versionRange "126" "129") [
# Rebased variant of patch right above to build M126+ with our rust and our clang.
./patches/chromium-126-rust.patch
] ++ lib.optionals (chromiumVersionAtLeast "129") [
# Rebased variant of patch right above to build M129+ with our rust and our clang.
./patches/chromium-129-rust.patch
];
postPatch = ''

View File

@ -0,0 +1,21 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 45086d6838cac..81132ad8ecb31 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1727,16 +1727,6 @@ config("runtime_library") {
configs += [ "//build/config/c++:runtime_library" ]
}
- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
- # library. The Rust symbols are marked as weak, so that they can be replaced by
- # the C++ symbols. This config ensures the C++ symbols exist and are strong in
- # order to cause that replacement to occur by explicitly linking in clang's
- # compiler-rt library.
- if (is_clang && !is_nacl && !is_cronet_build) {
- configs += [ "//build/config/clang:compiler_builtins" ]
- }
-
# TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
# configuration.
if (is_posix || is_fuchsia) {

View File

@ -1,22 +1,22 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0=";
hash_darwin = "sha256-303weqU04cCCwlLlSVnEyvKvHu09RjGFLmg5cf/exss=";
hash_darwin_aarch64 =
"sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak=";
hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE=";
version = "128.0.6613.137";
"sha256-TybJYKeMzm9FQp0Jqx82VF1OOiVSpS/QgNUEDlWG7Uc=";
hash_linux = "sha256-D8aKGKnbFT6YUhyhZUuz/XhCrUVS+Y7I7GaI6Qfv2bE=";
version = "129.0.6668.58";
};
deps = {
gn = {
hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=";
rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8";
hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";
rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";
url = "https://gn.googlesource.com/gn";
version = "2024-06-11";
version = "2024-08-19";
};
};
hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00=";
version = "128.0.6613.137";
hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg=";
version = "129.0.6668.58";
};
ungoogled-chromium = {
deps = {

View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubeone";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
hash = "sha256-H+EzSsXCjURMBJW9+1EWXsfO4faUXcTcYckK/QJYEFk=";
hash = "sha256-+9Dw6W/Tbg7zRC/ARuuXqZGTcMeSrtdoTvHtsQevigg=";
};
vendorHash = "sha256-z1BBE+PH2s7VxWNxneu5y2ZerfzCZNPJowZJVq821Kk=";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rke";
version = "1.6.0";
version = "1.6.2";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-ZxNU76W7IGSn1cdzmiLI/eMO3dAd8bUQX+1cvANci2k=";
hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c=";
};
vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM=";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.38.0";
version = "0.38.1";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-gg3FhPDXqnn3y/tcvlHTd0t8KxtPGTrN/2buBSVffBg=";
sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk=";
};
vendorHash = null;

View File

@ -1,29 +1,35 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, yarn
, fixup-yarn-lock
, nodejs
{
lib,
stdenv,
fetchFromGitHub,
fetchYarnDeps,
yarn,
fixup-yarn-lock,
nodejs,
olm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hydrogen-web";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "element-hq";
repo = "hydrogen-web";
rev = "v${finalAttrs.version}";
hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0=";
hash = "sha256-pXrmWPp4/MYIS1FHEGzAxGbh4OnTaiPudg+NauvA6Vc=";
};
offlineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w=";
hash = "sha256-j+BwlmL0ncaccy9qQbzb9GpDRC4KB9MwOR2ISx+vbLE=";
};
nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ];
nativeBuildInputs = [
yarn
fixup-yarn-lock
nodejs
];
configurePhase = ''
runHook preConfigure
@ -61,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = lib.teams.matrix.members;
license = lib.licenses.asl20;
platforms = lib.platforms.all;
inherit (olm.meta) knownVulnerabilities;
};
})

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "iroh";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-ZHBgsR17U0hWnRZ79S1/TXoOATofvlf3UloHQh1p8Oo=";
hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA=";
};
cargoHash = "sha256-j/Trm6Y64cOxBdHfP172E+YiORZ8B9ukJOpzrLTGI7k=";
cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [

View File

@ -5,12 +5,14 @@
, gnupg
, gawk
, procps
, notmuch
, withManpage ? false
}:
with python311.pkgs; buildPythonApplication rec {
pname = "alot";
version = "0.10";
version = "0.11";
pyproject = true;
outputs = [
"out"
@ -23,16 +25,18 @@ with python311.pkgs; buildPythonApplication rec {
src = fetchFromGitHub {
owner = "pazz";
repo = "alot";
rev = version;
sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis=";
rev = "refs/tags/${version}";
sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc=";
};
postPatch = ''
substituteInPlace alot/settings/manager.py \
--replace /usr/share "$out/share"
--replace-fail /usr/share "$out/share"
'';
nativeBuildInputs = lib.optional withManpage sphinx;
nativeBuildInputs = [
setuptools-scm
] ++ lib.optional withManpage sphinx;
propagatedBuildInputs = [
configobj
@ -53,6 +57,7 @@ with python311.pkgs; buildPythonApplication rec {
mock
procps
pytestCheckHook
notmuch
];
postBuild = lib.optionalString withManpage [
@ -80,7 +85,7 @@ with python311.pkgs; buildPythonApplication rec {
cp -r extra/themes $out/share/alot
substituteInPlace extra/completion/alot-completion.zsh \
--replace "python3" "${completionPython.interpreter}"
--replace-fail "python3" "${completionPython.interpreter}"
install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "veryfasttree";
version = "4.0.3";
version = "4.0.4";
src = fetchFromGitHub {
owner = "citiususc";
repo = "veryfasttree";
rev = "v${finalAttrs.version}";
hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA=";
hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo=";
};
nativeBuildInputs = [ cmake ];

View File

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "monitor";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
owner = "stsdc";
repo = "monitor";
rev = version;
hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20=";
hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU=";
fetchSubmodules = true;
};

View File

@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "c2patool";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "contentauth";
repo = pname;
rev = "v${version}";
hash = "sha256-f1Ec2dJGVjk9Jp5nmcVYwTyIlmnZmERj1pV9weVO3lI=";
hash = "sha256-OU1X8EB0IBABlXJklUUCOBhwbcnJNczzjnTl4e8/BYY=";
};
cargoHash = "sha256-wUGOabFTKLCEmg4zNPUklK3YddIIM4N3pev2TtlVthM=";
cargoHash = "sha256-0/fdQ9l4vm5Zy8QEvftKqt5GqPn+BkntyJoRiSaSbmU=";
# use the non-vendored openssl
OPENSSL_NO_VENDOR = 1;

View File

@ -1,6 +1,5 @@
{
lib,
fetchpatch,
buildGo123Module,
fetchFromGitHub,
git,
@ -9,24 +8,16 @@
buildGo123Module rec {
pname = "git-spice";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
rev = "refs/tags/v${version}";
hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k=";
hash = "sha256-VODBN+3xDa+sGynhnWnnhPy0VEKPWOQeh2Ge75OTS0A=";
};
vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs=";
# Fixes flaky test. Remove next release.
patches = [
(fetchpatch {
url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch";
hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k=";
})
];
vendorHash = "sha256-irYXuh0KmCmeZ2fKNduu7zpVqDQmmR7H2bNTMa2zOjI=";
subPackages = [ "." ];

View File

@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2024-07-22";
version = "0-unstable-2024-09-12";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Gruvbox-GTK-Theme";
rev = "f14a99e1369a6348a4ecd4a5b2d9c067b83f7b2a";
hash = "sha256-WuZX2A5nLk8vMlK0ZlDlbeb79wCCWrGUf2CbqfnbUzk=";
rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7";
hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];

View File

@ -0,0 +1,144 @@
{
stdenv,
lib,
fetchFromGitHub,
unstableGitUpdater,
buildPackages,
gnu-efi,
mtools,
openssl,
perl,
xorriso,
xz,
syslinux,
embedScript ? null,
additionalTargets ? { },
additionalOptions ? [ ],
}:
let
targets =
additionalTargets
// lib.optionalAttrs stdenv.isx86_64 {
"bin-x86_64-efi/ipxe.efi" = null;
"bin-x86_64-efi/ipxe.efirom" = null;
"bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-x86_64-efi/snp.efi" = null;
}
// lib.optionalAttrs stdenv.hostPlatform.isx86 {
"bin/ipxe.dsk" = null;
"bin/ipxe.usb" = null;
"bin/ipxe.iso" = null;
"bin/ipxe.lkrn" = null;
"bin/undionly.kpxe" = null;
}
// lib.optionalAttrs stdenv.isAarch32 {
"bin-arm32-efi/ipxe.efi" = null;
"bin-arm32-efi/ipxe.efirom" = null;
"bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-arm32-efi/snp.efi" = null;
}
// lib.optionalAttrs stdenv.isAarch64 {
"bin-arm64-efi/ipxe.efi" = null;
"bin-arm64-efi/ipxe.efirom" = null;
"bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-arm64-efi/snp.efi" = null;
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "ipxe";
version = "1.21.1-unstable-2024-09-13";
nativeBuildInputs = [
gnu-efi
mtools
openssl
perl
xorriso
xz
] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
depsBuildBuild = [ buildPackages.stdenv.cc ];
strictDeps = true;
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "c85ad1246890cf3c0c5f2ac6de06ab046ddd0043";
hash = "sha256-Py0mXcCj/NhVW3crngR9ZLHvH9N0QJeVmykc3k+yi6Y=";
};
# Calling syslinux on a FAT image isn't going to work on Aarch64.
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
substituteInPlace src/util/genfsimg --replace " syslinux " " true "
'';
# Hardening is not possible due to assembler code.
hardeningDisable = [
"pic"
"stackprotector"
];
makeFlags = [
"ECHO_E_BIN_ECHO=echo"
"ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
"CROSS=${stdenv.cc.targetPrefix}"
] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
enabledOptions = [
"PING_CMD"
"IMAGE_TRUST_CMD"
"DOWNLOAD_PROTO_HTTP"
"DOWNLOAD_PROTO_HTTPS"
] ++ additionalOptions;
configurePhase =
''
runHook preConfigure
for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done
substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo
''
+ lib.optionalString stdenv.hostPlatform.isx86 ''
substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux
''
+ ''
runHook postConfigure
'';
preBuild = "cd src";
buildFlags = lib.attrNames targets;
installPhase = ''
runHook preInstall
mkdir -p $out
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (
from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
) targets
)}
# Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
# let's provide it as a symlink to be compatible in this case.
ln -s undionly.kpxe $out/undionly.kpxe.0
runHook postInstall
'';
enableParallelBuilding = true;
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
meta = {
description = "Network boot firmware";
homepage = "https://ipxe.org/";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ sigmasquadron ];
};
})

View File

@ -7,7 +7,7 @@
CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
}:
let
version = "0.6.4";
version = "0.6.5";
in
rustPlatform.buildRustPackage {
pname = "mdbook-alerts";
@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
owner = "lambdalisue";
repo = "rs-mdbook-alerts";
rev = "v${version}";
hash = "sha256-bg3X7M2H553tGxH8cEkkT0XK20fWwkp2nTVEgtZ819s=";
hash = "sha256-vlp1tjtdbaH1sax3HAN665fspqRheHZzu5u/QjEejHg=";
};
cargoHash = "sha256-MMhpH3WIAXnjw6xOl2HNfrIFEwjHfVDPquWnFhhZCMU=";
cargoHash = "sha256-nzVvktweqrow7P/I8DhDoVJNj1COCeEhx6HLY536hYE=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View File

@ -6,17 +6,18 @@
lib,
}:
rustPlatform.buildRustPackage {
name = "nix-ld";
rustPlatform.buildRustPackage rec {
pname = "nix-ld";
version = "2.0.0";
src = fetchFromGitHub {
owner = "mic92";
repo = "nix-ld";
rev = "2.0.0";
rev = version;
hash = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg=";
};
cargoHash = "sha256-w6CQx9kOyBtM2nMwdFb+LtU4oHVEYrTNVmH1A6R5DHM=";
cargoHash = "sha256-BVulfs4zm3Iruq00H49QcxR3V+iZvePtLBTytdXfLP4=";
hardeningDisable = [ "stackprotector" ];

View File

@ -7,7 +7,7 @@
let
pname = "openfga-cli";
version = "0.6.0";
version = "0.6.1";
in
buildGoModule {
@ -17,7 +17,7 @@ buildGoModule {
owner = "openfga";
repo = "cli";
rev = "v${version}";
hash = "sha256-6bzVT+SnYAFDYdy5nyXPpmUuLsmjvUuaIlPkICjw30U=";
hash = "sha256-cAfBEhgHnzmSD8/pVi8VVjnC3O+WgokzdPSzvE5hDec=";
};
vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8=";

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "picocrypt-cli";
version = "2.07";
version = "2.08";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "CLI";
rev = version;
hash = "sha256-z6xtqo0VBLneXNaP6NdyuHTX905cqrzxvECIHVBGNlY=";
hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc=";
};
sourceRoot = "${src.name}/picocrypt";
vendorHash = "sha256-Nuo4oIJxp+liNLNXRvbFTE1ElEIM1OBp5CTb0KEV/7g=";
vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4=";
ldflags = [
"-s"

View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "tynany";
repo = "frr_exporter";
rev = "v${version}";
hash = "sha256-6a58COPlV6xyy/EAJmt+lXH23ULJY5ysMM6+3VDiTmE=";
hash = "sha256-SDtI7CvCeuRL1cXNsWGCl/zupVbgMxv5bzYYqJWTrMw=";
};
in
buildGoModule {
pname = "prometheus-frr-exporter";
vendorHash = "sha256-AvJzt9+81WDFXU0IOo9nqT/mEYixuhBIJfBx395Wsdo=";
vendorHash = "sha256-G+S4XORrg0AEKoAqYdmg+uW6x0Ub5diQTyQGY0iebHg=";
inherit src version;
ldflags = [

View File

@ -12,13 +12,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raspberrypi-eeprom";
version = "2024.07.30-2712";
version = "2024.09.10-2712";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-4rTq8O6TqE7vRr4o+/149FraYLmKFUQRUFffzC0aeIQ=";
hash = "sha256-SLPLZzSRsPDxGtFnFFu99z3HqGDLDNuMWbgUKdeJyuI=";
};
buildInputs = [ python3 ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "scalingo";
version = "1.33.0";
version = "1.34.0";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = version;
hash = "sha256-7hb1RU33wGeSESxY16pYJfQ2O3QOT92Em6jlh8oP/Zc=";
hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sn-pro";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "supernotes";
repo = "sn-pro";
rev = version;
hash = "sha256-G/DIHWs91HYVbrV/jZ4aFsCCjqORo8YeqcHGN0LZ8p4=";
hash = "sha256-7GrCEYgP6kfdlAWjNddmkwJrB/s1mFmugMGPPOM34JA=";
};
installPhase = ''

View File

@ -5,26 +5,26 @@
buildNpmPackage rec {
pname = "syn2mas";
version = "0.10.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "matrix-org";
owner = "element-hq";
repo = "matrix-authentication-service";
rev = "v${version}";
hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks=";
hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc=";
};
sourceRoot = "${src.name}/tools/syn2mas";
npmDepsHash = "sha256-Dk/aSkCbuHiZN5H/f692/Yef+f5SJDSXuSMbePkU66g=";
npmDepsHash = "sha256-pRa5qqLsI8Hx9v5tMPDkehczXZjWWAOjfDfLLh2V6Q4=";
dontBuild = true;
meta = with lib; {
meta = {
description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service";
homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas";
license = licenses.asl20;
maintainers = with maintainers; [ teutat3s ];
homepage = "https://github.com/element-hq/matrix-authentication-service/tree/main/tools/syn2mas";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ teutat3s ];
mainProgram = "syn2mas";
};
}

View File

@ -0,0 +1,55 @@
{
lib,
rustPlatform,
fetchgit,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage {
pname = "taler-depolymerization";
version = "0-unstable-2024-06-17";
src = fetchgit {
url = "https://git.taler.net/depolymerization.git/";
rev = "a0d27ac3bba22d4934ca9f7b244b0d9e45bb484f";
hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw=";
};
cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs=";
outputs = [
"out"
"doc"
];
postPatch = ''
# fix missing expression in test docs
substituteInPlace common/src/status.rs \
--replace-fail ' -> Requested' '() -> Requested'
'';
postInstall = ''
mkdir -p $doc/share/doc $out/share/examples
cp -R docs $doc/share/doc/taler-depolymerization
cp docs/*.conf $out/share/examples
'';
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
CoreFoundation
Security
SystemConfiguration
]
);
meta = {
description = "Wire gateway for Bitcoin/Ethereum";
homepage = "https://git.taler.net/depolymerization.git/";
license = lib.licenses.agpl3Only;
maintainers = [
# maintained by the team working on NGI-supported software, no group for this yet
];
};
}

View File

@ -37,12 +37,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "taler-wallet-core";
version = "0.13.1";
version = "0.13.3";
src = fetchgit {
url = "https://git.taler.net/wallet-core.git";
rev = "v${finalAttrs.version}";
hash = "sha256-1TM2kD4HfL3QPzZ3Xzq5Sfycevf94Pkw7HpEoMkujN8=";
hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA=";
};
nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.9.6";
version = "1.10.2";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "refs/tags/v${version}";
hash = "sha256-VonydbN7EiXnQIArOSKgNsIV7zIZQsLihZ41geSx1AA=";
hash = "sha256-AcKjh3DAUoIpsMr+K/T0FT5knbBx54pZmJKCK9HRZVQ=";
};
npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc=";

View File

@ -1,36 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, zig_0_11
, testers
, tigerbeetle
, nix-update-script
{
lib,
stdenvNoCC,
fetchzip,
testers,
tigerbeetle,
nix-update-script,
}:
let
# Read [these comments](pkgs/development/compilers/zig/hook.nix#L12-L30) on the default Zig flags, and the associated links. tigerbeetle stopped exposing the `-Doptimize` build flag, so we can't use the default Nixpkgs zig hook as-is. tigerbeetle only exposes a boolean `-Drelease` flag which we'll add in the tigerbeetle derivation in this file.
custom_zig_hook = zig_0_11.hook.overrideAttrs (previousAttrs: {
zig_default_flags = builtins.filter (flag: builtins.match "-Doptimize.*" flag == null) previousAttrs.zig_default_flags;
});
platform =
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
hash = builtins.getAttr platform {
"universal-macos" = "sha256-ls2QFCiPkXMTiCHo8AXb5bFl118zjtuQAGl26c4huwU=";
"x86_64-linux" = "sha256-QjQjP5p2fpOLWNGiU2aMMs2bUEFOWfBZrbPGLTOFozg=";
"aarch64-linux" = "sha256-DMxGakZBJhLTgZp7B9lwxilr6yhDVDe/GQCMFaRTWe4=";
};
in
stdenv.mkDerivation (finalAttrs: {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tigerbeetle";
version = "0.15.3";
version = "0.15.5";
src = fetchFromGitHub {
owner = "tigerbeetle";
repo = "tigerbeetle";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-3+uCMoOnyvI//ltEaqTIXytUxxgJrfMnFly11WCh66Q=";
src = fetchzip {
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
inherit hash;
};
env.TIGERBEETLE_RELEASE = finalAttrs.version;
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ custom_zig_hook ];
installPhase = ''
runHook preInstall
zigBuildFlags = [
"-Drelease"
"-Dgit-commit=0000000000000000000000000000000000000000"
];
mkdir -p $out/bin
cp $src/tigerbeetle $out/bin/tigerbeetle
runHook postInstall
'';
passthru = {
tests.version = testers.testVersion {
@ -45,7 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
description = "Financial accounting database designed to be distributed and fast";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ danielsidhion ];
platforms = lib.platforms.linux;
platforms = [
"x86_64-linux"
"aarch64-linux"
] ++ lib.platforms.darwin;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
mainProgram = "tigerbeetle";
};
})

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuxmux";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "edeneast";
repo = pname;
rev = "v${version}";
hash = "sha256-WtcEPvNC1GLOfX0ULUnGHtVO8CyHWQYAPCKwsUlKEzc=";
hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8=";
};
cargoHash = "sha256-OBaFBEsFjK7Mf2zqI60q6uSG5JnZiohQg79+Fm++tK4=";
cargoHash = "sha256-ZftnJ6SYfPzwgsS44YgL9tbwL8Y+7PahI0EfFbKdlqA=";
buildInputs = [ libiconv ];
nativeBuildInputs = [ pkg-config installShellFiles ];

View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
version = "0.22.0"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
dependencies = [
"gimli",
]
@ -100,9 +100,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.86"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arc-swap"
@ -112,9 +112,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
[[package]]
name = "arrayref"
version = "0.3.8"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@ -195,13 +195,13 @@ dependencies = [
[[package]]
name = "async-trait"
version = "0.1.81"
version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -214,7 +214,7 @@ dependencies = [
"futures",
"http-content-range",
"itertools 0.12.1",
"memmap2 0.9.4",
"memmap2 0.9.5",
"reqwest",
"reqwest-middleware",
"thiserror",
@ -292,9 +292,9 @@ dependencies = [
[[package]]
name = "axoupdater"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14cd170d3b144de5288b99c69f30b36ee5eba837bed33f458f39c890e2049162"
checksum = "fa6f92ef9ab41a352f403f709ef0f09cda1f461795de52085cd46ed831ead02e"
dependencies = [
"axoasset",
"axoprocess",
@ -324,17 +324,17 @@ dependencies = [
[[package]]
name = "backtrace"
version = "0.3.73"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide 0.7.4",
"miniz_oxide 0.8.0",
"object",
"rustc-demangle",
"windows-targets 0.52.6",
]
[[package]]
@ -471,9 +471,9 @@ dependencies = [
[[package]]
name = "bytemuck"
version = "1.17.1"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
[[package]]
name = "byteorder"
@ -543,9 +543,9 @@ dependencies = [
[[package]]
name = "cargo-util"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa"
checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d"
dependencies = [
"anyhow",
"core-foundation",
@ -572,9 +572,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
version = "1.1.15"
version = "1.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800"
dependencies = [
"jobserver",
"libc",
@ -632,9 +632,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.16"
version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
dependencies = [
"clap_builder",
"clap_derive",
@ -642,9 +642,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.15"
version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
dependencies = [
"anstream",
"anstyle",
@ -655,9 +655,9 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.5.24"
version = "4.5.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b"
checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0"
dependencies = [
"clap",
]
@ -692,7 +692,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -712,9 +712,9 @@ dependencies = [
[[package]]
name = "codspeed"
version = "2.7.1"
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0c6f324a032703f286b0fbbdb390971f914b41f3410e1615c59730e4b24ebc2"
checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
dependencies = [
"colored",
"libc",
@ -723,9 +723,9 @@ dependencies = [
[[package]]
name = "codspeed-criterion-compat"
version = "2.7.1"
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ae52f6f2545ffcd2ac1308f34043eb6ab81e4c741af419b348b2325574f48ee"
checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569"
dependencies = [
"codspeed",
"colored",
@ -800,9 +800,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
version = "0.2.13"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@ -926,9 +926,9 @@ dependencies = [
[[package]]
name = "dashmap"
version = "6.0.1"
version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
dependencies = [
"cfg-if",
"crossbeam-utils",
@ -1334,7 +1334,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -1402,9 +1402,9 @@ dependencies = [
[[package]]
name = "gimli"
version = "0.29.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
[[package]]
name = "glob"
@ -1414,9 +1414,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
version = "0.4.14"
version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
dependencies = [
"aho-corasick",
"bstr",
@ -1626,16 +1626,16 @@ dependencies = [
[[package]]
name = "hyper-rustls"
version = "0.27.2"
version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http",
"hyper",
"hyper-util",
"rustls",
"rustls-native-certs",
"rustls-native-certs 0.8.0",
"rustls-pki-types",
"tokio",
"tokio-rustls",
@ -1645,9 +1645,9 @@ dependencies = [
[[package]]
name = "hyper-util"
version = "0.1.7"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
dependencies = [
"bytes",
"futures-channel",
@ -1675,9 +1675,9 @@ dependencies = [
[[package]]
name = "ignore"
version = "0.4.22"
version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
dependencies = [
"crossbeam-deque",
"globset",
@ -1738,9 +1738,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "insta"
version = "1.39.0"
version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
dependencies = [
"console",
"lazy_static",
@ -1803,9 +1803,9 @@ dependencies = [
[[package]]
name = "ipnet"
version = "2.9.0"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
[[package]]
name = "is-terminal"
@ -1865,9 +1865,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "jiff"
version = "0.1.11"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "362be9c702bada57298130d0565e9c389e6d4024a541692f01819e21abc3e26a"
checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb"
dependencies = [
"jiff-tzdb-platform",
"serde",
@ -1876,15 +1876,15 @@ dependencies = [
[[package]]
name = "jiff-tzdb"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6"
checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653"
[[package]]
name = "jiff-tzdb-platform"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940"
checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329"
dependencies = [
"jiff-tzdb",
]
@ -1915,9 +1915,9 @@ dependencies = [
[[package]]
name = "junction"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa"
checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16"
dependencies = [
"scopeguard",
"windows-sys 0.52.0",
@ -1987,7 +1987,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
"redox_syscall 0.5.3",
"redox_syscall 0.5.4",
]
[[package]]
@ -2097,9 +2097,9 @@ dependencies = [
[[package]]
name = "memmap2"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@ -2150,7 +2150,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -2312,9 +2312,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.19.0"
version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe"
[[package]]
name = "oorandom"
@ -2342,15 +2342,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owo-colors"
version = "4.0.0"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
[[package]]
name = "parking"
version = "2.2.0"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@ -2395,7 +2395,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall 0.5.3",
"redox_syscall 0.5.4",
"smallvec",
"windows-targets 0.52.6",
]
@ -2468,9 +2468,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
version = "2.7.11"
version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea"
dependencies = [
"memchr",
"thiserror",
@ -2479,9 +2479,9 @@ dependencies = [
[[package]]
name = "pest_derive"
version = "2.7.11"
version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d"
dependencies = [
"pest",
"pest_generator",
@ -2489,22 +2489,22 @@ dependencies = [
[[package]]
name = "pest_generator"
version = "2.7.11"
version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
name = "pest_meta"
version = "2.7.11"
version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174"
dependencies = [
"once_cell",
"pest",
@ -2544,7 +2544,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -2666,9 +2666,9 @@ dependencies = [
[[package]]
name = "pretty_assertions"
version = "1.4.0"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@ -2784,7 +2784,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -2797,7 +2797,7 @@ dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -2817,6 +2817,7 @@ dependencies = [
"serde",
"thiserror",
"toml",
"toml_edit",
"tracing",
"url",
"uv-fs",
@ -2826,9 +2827,9 @@ dependencies = [
[[package]]
name = "quinn"
version = "0.11.3"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
dependencies = [
"bytes",
"pin-project-lite",
@ -2844,9 +2845,9 @@ dependencies = [
[[package]]
name = "quinn-proto"
version = "0.11.7"
version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea0a9b3a42929fad8a7c3de7f86ce0814cfa893328157672680e9fb1145549c5"
checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
dependencies = [
"bytes",
"rand",
@ -2861,15 +2862,15 @@ dependencies = [
[[package]]
name = "quinn-udp"
version = "0.5.4"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
dependencies = [
"libc",
"once_cell",
"socket2",
"tracing",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@ -2969,9 +2970,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.3"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
dependencies = [
"bitflags 2.6.0",
]
@ -3108,7 +3109,7 @@ dependencies = [
"pin-project-lite",
"quinn",
"rustls",
"rustls-native-certs",
"rustls-native-certs 0.7.3",
"rustls-pemfile",
"rustls-pki-types",
"serde",
@ -3193,9 +3194,9 @@ dependencies = [
[[package]]
name = "rgb"
version = "0.8.49"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cd5a1e95672f201913966f39baf355b53b5d92833431847295ae0346a5b939"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
dependencies = [
"bytemuck",
]
@ -3317,9 +3318,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustix"
version = "0.38.35"
version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@ -3330,9 +3331,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.12"
version = "0.23.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
dependencies = [
"once_cell",
"ring",
@ -3355,6 +3356,19 @@ dependencies = [
"security-framework",
]
[[package]]
name = "rustls-native-certs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
"rustls-pemfile",
"rustls-pki-types",
"schannel",
"security-framework",
]
[[package]]
name = "rustls-pemfile"
version = "2.1.3"
@ -3373,9 +3387,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
[[package]]
name = "rustls-webpki"
version = "0.102.7"
version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@ -3415,11 +3429,11 @@ dependencies = [
[[package]]
name = "schannel"
version = "0.1.23"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
dependencies = [
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@ -3444,7 +3458,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -3470,7 +3484,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -3510,22 +3524,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
version = "1.0.209"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.209"
version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -3536,14 +3550,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
name = "serde_json"
version = "1.0.127"
version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
"memchr",
@ -3706,9 +3720,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "supports-color"
version = "3.0.0"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f"
checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
dependencies = [
"is_ci",
]
@ -3774,9 +3788,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.76"
version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@ -3876,7 +3890,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -3887,7 +3901,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
"test-case-core",
]
@ -3909,7 +3923,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -3949,7 +3963,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -4063,7 +4077,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -4079,9 +4093,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
version = "0.1.15"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@ -4091,9 +4105,9 @@ dependencies = [
[[package]]
name = "tokio-util"
version = "0.7.11"
version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@ -4126,9 +4140,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.20"
version = "0.22.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
dependencies = [
"indexmap",
"serde",
@ -4184,7 +4198,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -4319,9 +4333,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
[[package]]
name = "unicode-ident"
version = "1.0.12"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-linebreak"
@ -4445,7 +4459,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
[[package]]
name = "uv"
version = "0.4.10"
version = "0.4.11"
dependencies = [
"anstream",
"anyhow",
@ -4573,7 +4587,7 @@ dependencies = [
"tempfile",
"thiserror",
"tokio",
"toml",
"toml_edit",
"tracing",
"uv-configuration",
"uv-fs",
@ -4937,7 +4951,7 @@ version = "0.0.1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
"textwrap",
]
@ -4949,12 +4963,10 @@ dependencies = [
"distribution-filename",
"fs-err",
"futures",
"pep440_rs",
"pypi-types",
"thiserror",
"tokio",
"tokio-util",
"tracing",
"uv-normalize",
"zip",
]
@ -5238,7 +5250,7 @@ dependencies = [
[[package]]
name = "uv-version"
version = "0.4.10"
version = "0.4.11"
[[package]]
name = "uv-virtualenv"
@ -5367,7 +5379,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
"wasm-bindgen-shared",
]
@ -5401,7 +5413,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -5452,9 +5464,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
version = "0.26.3"
version = "0.26.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
dependencies = [
"rustls-pki-types",
]
@ -5568,7 +5580,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -5579,7 +5591,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -5590,7 +5602,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -5601,7 +5613,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]
@ -5824,13 +5836,13 @@ checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437"
[[package]]
name = "wiremock"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717"
checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646"
dependencies = [
"assert-json-diff",
"async-trait",
"base64 0.21.7",
"base64 0.22.1",
"deadpool",
"futures",
"http",
@ -5883,9 +5895,9 @@ dependencies = [
[[package]]
name = "yansi"
version = "0.5.1"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "zerocopy"
@ -5905,7 +5917,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.76",
"syn 2.0.77",
]
[[package]]

View File

@ -16,14 +16,14 @@
python3Packages.buildPythonApplication rec {
pname = "uv";
version = "0.4.10";
version = "0.4.11";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = "refs/tags/${version}";
hash = "sha256-JI45AoTW3k1DP6RXCl8qfe6yl16PkS8xlpvl0FUISmk=";
hash = "sha256-a8mN2wag26BSL+2b5i4P1XN34J8jt+lZm2poZQdsAzM=";
};
cargoDeps = rustPlatform.importCargoLock {

View File

@ -9,6 +9,7 @@
, vala
, libadwaita
, libgee
, gettext
, granite7
, gtk4
, networkmanager
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
@ -52,6 +54,8 @@ stdenv.mkDerivation rec {
switchboard
];
strictDeps = true;
passthru = {
updateScript = nix-update-script { };
};

View File

@ -3,7 +3,7 @@
let ocamlPackages = coq.ocamlPackages;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.18" "8.20"; out = "2.1.4"; }
{ case = range "8.18" "8.20"; out = "2.1.7"; }
{ case = range "8.18" "8.19"; out = "2.1.2"; }
{ case = isEq "8.18"; out = "2.0.3+coq8.18"; }
] null;
@ -15,6 +15,8 @@ let ocamlPackages = coq.ocamlPackages;
release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328=";
release."2.1.4".rev = "v2.1.4";
release."2.1.4".sha256 = "sha256-Vwve1sCg5OsGmhDLlOyGCwP6A8g618IzD79vLPw/JtQ=";
release."2.1.7".rev = "v2.1.7";
release."2.1.7".sha256 = "sha256-HsLv2ziPIUK6Q5/xz8ZvaGWggUCK1AKv47U5M7SCcKU=";
inherit location; });
fetched = fetch (if version != null then version else defaultVersion);
in

View File

@ -1,41 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, static ? stdenv.hostPlatform.isStatic
, cxxStandard ? null
}:
stdenv.mkDerivation rec {
pname = "abseil-cpp";
version = "20211102.0";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = version;
sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk=";
};
patches = lib.optionals stdenv.isDarwin [
# Dont propagate the path to CoreFoundation. Otherwise, its impossible to build packages
# that require a different SDK other than the default one.
./cmake-core-foundation.patch
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
] ++ lib.optionals (cxxStandard != null) [
"-DCMAKE_CXX_STANDARD=${cxxStandard}"
];
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiolifx-themes";
version = "0.5.3";
version = "0.5.5";
pyproject = true;
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Djelibeybi";
repo = "aiolifx-themes";
rev = "refs/tags/v${version}";
hash = "sha256-e07moT5XKrJ8PYZFsnibxV9kxUptMNo+Q/noOkKllnI=";
hash = "sha256-Q4PlEnbdEUWYG/odD+xSG975lsRQqhOgFb//hk+PWIw=";
};
build-system = [ poetry-core ];

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "1.0.9";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-x2wzFXehwLZWkRsBv54kYa7aon02saZpBIIA1J+9Fdc=";
hash = "sha256-oZpq2qUAtqDaRhgW9SbbQY9z81VqrqXhRLmpaPto9+A=";
};
build-system = [ setuptools ];

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.40.5";
version = "0.40.6";
pyproject = true;
disabled = pythonOlder "3.8";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-VOeoIv1tVcgLfDAH8NKtqyL3x5puDwdxlJ2gqw213t8=";
hash = "sha256-c0ebEulI1wY/ws6eqgkMQbprq5bzv+hJW0WDPkW/sys=";
};
postPatch = ''

View File

@ -9,6 +9,7 @@
darwin,
fastapi,
fetchFromGitHub,
fetchpatch,
grpcio,
httpx,
hypothesis,
@ -69,6 +70,20 @@ buildPythonPackage rec {
hash = "sha256-3FmnQEpknYNzI3WlQ3kc8qa4LFcn1zpxKDbkATU7/48=";
};
patches = [
# Remove these on the next release
(fetchpatch {
name = "pydantic19-fastapi1.patch";
url = "https://github.com/chroma-core/chroma/commit/d62c13da29b7bff77bd7dee887123e3c57e2c19e.patch";
hash = "sha256-E3xmh9vQZH3NCfG6phvzM65NGwlcHmPgfU6FERKAJ60=";
})
(fetchpatch {
name = "no-union-types-pydantic1.patch";
url = "https://github.com/chroma-core/chroma/commit/2fd5b27903dffcf8bdfbb781a25bcecc17b27672.patch";
hash = "sha256-nmiA/lKZVrHKXumc+J4uVRiMwrnFrz2tgMpfcay5hhw=";
})
];
pythonRelaxDeps = [
"chroma-hnswlib"
"orjson"

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.133.0";
version = "2.134.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-oQrbUUDw2OdBQ5xypkbusW82tkxY9GQmHd61DCLMOeA=";
hash = "sha256-EHqXwTsUy2bWQ1OzogL0wQhodgcm4v6T3fz7Y+d4o4w=";
};
pythonRelaxDeps = [

View File

@ -1,32 +1,25 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
wheel,
sortedcontainers,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "portion";
version = "2.4.2";
version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "AlexandreDecan";
repo = "portion";
rev = "refs/tags/${version}";
hash = "sha256-URoyuE0yivUqPjJZbvATkAnTxicY4F2eiJ16rIUdY3Y=";
hash = "sha256-sNOieFenrWh6iDXCyCBedx+qIsS+daAr+WVBpkc8yVQ=";
};
build-system = [
setuptools
wheel
];
build-system = [ setuptools ];
dependencies = [ sortedcontainers ];
@ -34,11 +27,11 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
description = "Portion, a Python library providing data structure and operations for intervals";
homepage = "https://github.com/AlexandreDecan/portion";
changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md";
license = licenses.lgpl3;
maintainers = with maintainers; [ GaetanLepage ];
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}

View File

@ -19,33 +19,16 @@
gdb-pt-dump,
poetry-core,
}:
let
# The newest gdb-pt-dump is incompatible with pwndbg 2024.02.14.
# See https://github.com/martinradev/gdb-pt-dump/issues/29
gdb-pt-dump' = gdb-pt-dump.overrideAttrs (oldAttrs: {
version = "0-unstable-2023-11-11";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "89ea252f6efc5d75eacca16fc17ff8966a389690";
hash = "sha256-i+SAcZ/kgfKstJnkyCVMh/lWtrJJOHTYoJH4tVfYHrE=";
};
# This revision relies on the package being imported from within GDB, which
# won't work with pythonImportsCheck.
pythonImportsCheck = [ ];
});
in
buildPythonPackage rec {
pname = "pwndbg";
version = "2024.02.14";
version = "2024.08.29";
pyproject = true;
src = fetchFromGitHub {
owner = "pwndbg";
repo = "pwndbg";
rev = version;
hash = "sha256-/pDo2J5EtpWWCurD7H34AlTlQi7WziIRRxHxGm3K2yk=";
hash = "sha256-mpkUEP0GBwOfbbpogupmDvCo8dkbSGy1YtH8T55rX9g=";
};
nativeBuildInputs = [
@ -68,7 +51,7 @@ buildPythonPackage rec {
tabulate
typing-extensions
unicorn
gdb-pt-dump'
gdb-pt-dump
];
meta = {

View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "qbittorrent-api";
version = "2024.8.65";
version = "2024.9.66";
pyproject = true;
src = fetchPypi {
pname = "qbittorrent_api";
inherit version;
hash = "sha256-lC31v6WLNk0RZDFz1GOlqrd2kAijTHffZ7NsUsm2vAk=";
hash = "sha256-Vx5ShmEARDfQtIldTQuL0LkLUdo0QE/ANsLa4yq3OXo=";
};
propagatedBuildInputs = [

View File

@ -5,8 +5,8 @@
defusedxml,
fetchFromGitHub,
httpx,
mashumaro,
poetry-core,
pydantic,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "sfrbox-api";
version = "0.0.10";
version = "0.0.11";
pyproject = true;
disabled = pythonOlder "3.9";
@ -24,20 +24,19 @@ buildPythonPackage rec {
owner = "hacf-fr";
repo = "sfrbox-api";
rev = "refs/tags/v${version}";
hash = "sha256-xvtusgqCseXAmiPQBFFZnRS9KmuhzHhZUAj5aaqyFrE=";
hash = "sha256-Ec3UOserFijBK6goyM6AMOekfLgjBq8l/9sMKYnj240=";
};
pythonRelaxDeps = [
"defusedxml"
"pydantic"
];
build-system = [ poetry-core ];
dependencies = [
defusedxml
mashumaro
httpx
pydantic
];
passthru.optional-dependencies = {

View File

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "zha";
version = "0.0.32";
version = "0.0.33";
pyproject = true;
disabled = pythonOlder "3.12";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha";
rev = "refs/tags/${version}";
hash = "sha256-DIVzgTAlxzYqEPrLeX5e1At9EiEm0z+CzZ2bulgWINU=";
hash = "sha256-qcXKHIiEm1wqcQKRH+TqgQMPZbLqNnBiR6dbmLwxW1Y=";
};
postPatch = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.33";
version = "0.8.34";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-S3OK9qPnI8E1v5h9Tzx9cOZJVwPpYL4qs9JN0Uj6jzQ=";
hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY=";
};
vendorHash = "sha256-EYe1hjxlaqVbie4yOsnlzWxQDyxmj8+cbhCUdR9ObeQ=";
vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs=";
nativeBuildInputs = [ installShellFiles ];

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,6 @@ index 03f64e53..9e2ddcb6 100644
# Tauri
tauri = { version = "1.2.4", features = [
+ "updater",
"dialog-save",
"process-relaunch",
"window-close",
"notification-all",

View File

@ -80,7 +80,7 @@ rec {
offlineCache = fetchYarnDeps {
yarnLock = "${src}/desktop/yarn.lock";
sha256 = "sha256-I+c0zrybNv3iS+Wy+n+NlBalA6gLYuxBw00mAJbqgfU=";
hash = "sha256-vUV4yX+UvEKrP0vHxjGwtW2WyONGqHVmFor+WqWbkCc=";
};
packageJSON = ./package.json;
@ -107,7 +107,7 @@ rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tauri-plugin-log-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
"tauri-plugin-log-0.0.0" = "sha256-tM6oLJe/wwqDDNMKBeMa5nNVvsmi5b104xMOvtm974Y=";
};
};

View File

@ -26,7 +26,7 @@
"@tanstack/react-query": "4.36.1",
"@tanstack/react-query-devtools": "4.36.1",
"@tanstack/react-table": "8.10.7",
"@tauri-apps/api": "1.5.1",
"@tauri-apps/api": "1.5.3",
"dayjs": "1.11.10",
"framer-motion": "10.16.9",
"markdown-to-jsx": "7.3.2",
@ -36,14 +36,14 @@
"react-icons": "4.12.0",
"react-router": "6.20.0",
"react-router-dom": "6.20.0",
"tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store",
"tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store#v1",
"uuid": "9.0.1",
"xterm": "5.3.0",
"xterm-addon-fit": "0.7.0"
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "4.36.1",
"@tauri-apps/cli": "1.5.2",
"@tauri-apps/cli": "1.5.11",
"@types/node": "18.15.3",
"@types/react": "18.2.28",
"@types/react-dom": "18.2.13",
@ -54,10 +54,13 @@
"eslint": "8.44.0",
"eslint-config-prettier": "8.8.0",
"eslint-config-react-app": "7.0.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"prettier": "3.0.3",
"typescript": "5.0.4",
"vite": "4.4.9"
},
"resolutions": {
"lodash": "4.17.21"
}
}

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.10.4";
version = "1.10.5";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-I6MyeKKqAxDb2BT6Uvmudw953kof1DIrZf1zmidwURo=";
hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk=";
};
cargoHash = "sha256-tNYqUODqZSUb+p6JxZXWma5OE2v657yosObJ49Ei4+k=";
cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w=";
nativeBuildInputs = [
pkg-config

File diff suppressed because it is too large Load Diff

View File

@ -10,21 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.12.2";
version = "0.13.0";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
hash = "sha256-tMYuhUb1e/wTMZGwrAa3bz3INAld/ZtQzJqpeG0w/G8=";
hash = "sha256-Y5tnY8EZJcVhYyVTpvcT6DFbPSmmw3+knzkMVvQxQbI=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cargo-test-macro-0.1.0" = "sha256-yE8BJMTRBT3P29t5ygMCybs0CYDcFLVlxi1L0LkBV9Q=";
};
};
cargoHash = "sha256-X8wQvLSvZ7rrDfX423SDB5QDDMoeDDFvJZKO92CLycg=";
nativeBuildInputs = [ pkg-config ];

View File

@ -7,7 +7,7 @@ index 451fc48..ed45f4d 100644
snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);
-
+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", file); }
+ snprintf(file_path, sizeof(file_path), "%s", file);
if(read_file(file_path) == -1)
{
gerror("read_file failed\n");
@ -20,7 +20,7 @@ index 700cae9..9143d8b 100755
snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);
-
+ if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); }
+ snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file);
FILE * fp = gfile_fopen(file_path, "r");
if (fp == NULL)
{

View File

@ -1,104 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<root>
<controller id="1" dpi="0" type="DS4">
<configuration id="1">
<trigger type="" id="" name="" button_id="" switch_back="no" delay="0"/>
<mouse_options_list/>
<intensity_list/>
<button_map>
<button id="abs_axis_10" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="3"/>
</button>
<button id="abs_axis_9" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="0"/>
</button>
<button id="abs_axis_8" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="1"/>
</button>
<button id="abs_axis_7" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="2"/>
</button>
<button id="abs_axis_11" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="4"/>
</button>
<button id="abs_axis_12" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="5"/>
</button>
<button id="abs_axis_0" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="8"/>
</button>
<button id="abs_axis_1" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="9"/>
</button>
<button id="abs_axis_15" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="11"/>
</button>
<button id="abs_axis_16" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="12"/>
</button>
<button id="abs_axis_2" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="10"/>
</button>
<button id="abs_axis_3" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="13"/>
</button>
<button id="abs_axis_4" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="14"/>
</button>
<button id="abs_axis_5" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="15"/>
</button>
<button id="abs_axis_6" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="button" id="16"/>
</button>
</button_map>
<axis_map>
<axis id="rel_axis_0" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="0" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>
</axis>
<axis id="rel_axis_1" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="1" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>
</axis>
<axis id="rel_axis_2" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="3" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>
</axis>
<axis id="rel_axis_3" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="4" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>
</axis>
<axis id="abs_axis_13" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="2" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/>
</axis>
<axis id="abs_axis_14" label="">
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<event type="axis" id="5" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/>
</axis>
</axis_map>
<joystick_corrections_list/>
<force_feedback>
<device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>
<inversion enable="no"/>
<gain rumble="0" constant="0" spring="0" damper="0"/>
</force_feedback>
</configuration>
</controller>
</root>

View File

@ -1,103 +1,54 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch
, makeWrapper, curl, libusb1, xorg, libxml2
, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }:
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, bluez, libxml2, ncurses5, libmhash, xorg }:
let
gimx-config = fetchFromGitHub {
owner = "matlo";
repo = "GIMX-configurations";
rev = "c20300f24d32651d369e2b27614b62f4b856e4a0";
sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p";
hash = "sha256-t/Ttlvc9LCRW624oSsFaP8EmswJ3OAn86QgF1dCUjAs=";
};
in stdenv.mkDerivation rec {
pname = "gimx";
version = "unstable-2021-08-31";
version = "8.0";
src = fetchFromGitHub {
owner = "matlo";
repo = "GIMX";
rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz";
hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg=";
};
patches = [
./conf.patch
# gcc-13 build fixes:
# https://github.com/matlo/GIMX/pull/705
(fetchpatch {
name = "gcc-13-headers.patch";
url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch";
hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs=";
})
(fetchpatch {
name = "gcc-13-protos.patch";
url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch";
hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU=";
})
];
env.NIX_CFLAGS_COMPILE = "-Wno-error";
patches = [ ./conf.patch ./gcc14.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
curl libusb1 bluez libxml2 ncurses5 libmhash
xorg.libX11 xorg.libXi xorg.libXext
];
postPatch = lib.optionals gimxPdpGamepad ''
substituteInPlace ./shared/gimxcontroller/include/x360.h \
--replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213"
substituteInPlace ./loader/firmware/EMU360.hex \
--replace "1B210001" "1B211001" \
--replace "09210001" "09211001" \
--replace "5E048E021001" "6F0E13020001"
'';
buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash xorg.libX11 xorg.libXi ];
makeFlags = [ "build-core" ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=address"
"-Wno-error=deprecated-declarations"
"-Wno-error=use-after-free"
];
installPhase = ''
runHook preInstall
mkdir -p $out
substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo"
substituteInPlace ./core/Makefile --replace-fail "chmod ug+s" "echo"
export DESTDIR="$out"
make install-shared install-core
mv $out/usr/lib $out/lib
mv $out/usr/bin $out/bin
rmdir $out/usr
cp -r ${gimx-config}/Linux $out/share
makeWrapper $out/bin/gimx $out/bin/gimx-ds4 \
--add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \
--add-flags "-c $out/share/Dualshock4.xml"
runHook postInstall
'';
postInstall = ''
mkdir -p $out/share
cp -r ./loader/firmware $out/share/firmware
cp -r ${gimx-config}/Linux $out/share/config
cp -r ${./custom} $out/share/custom
makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \
--set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \
--add-flags "-c $out/share/custom/Dualshock4.xml"
makeWrapper $out/bin/gimx $out/bin/gimx-xboxonepad \
--set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \
--add-flags "-c $out/share/config/XOnePadUsb.xml"
'';
meta = with lib; {
homepage = "https://github.com/matlo/GIMX";
description = "Game Input Multiplexer";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ bb2020 ];
};
}

View File

@ -0,0 +1,26 @@
diff --git a/core/config_reader.c b/core/config_reader.c
index 451fc48..737d27c 100644
--- a/core/config_reader.c
+++ b/core/config_reader.c
@@ -17,7 +17,7 @@
#include "../directories.h"
#include "macros.h"
#include <errno.h>
-
+#include <stdlib.h>
/*
* These variables are used to read the configuration.
*/
diff --git a/core/gimx.c b/core/gimx.c
index 700cae9..693f72f 100755
--- a/core/gimx.c
+++ b/core/gimx.c
@@ -8,7 +8,7 @@
#include <errno.h> //to print errors
#include <string.h> //to print errors
#include <limits.h> //PATH_MAX
-
+#include <stdlib.h>
#ifndef WIN32
#include <termios.h> //to disable/enable echo
#include <unistd.h>

View File

@ -1,8 +1,8 @@
let
genericBuild =
{ pkgs, lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, autoreconfHook269, util-linux, nukeReferences, coreutils
, linuxKernel
, linuxPackages
, perl
, configFile ? "all"
@ -201,12 +201,8 @@ let
passthru = {
inherit enableMail kernelModuleAttribute;
latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [
builtins.attrValues
(builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel))
(builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)))
lib.last
];
latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages ;
# The corresponding userspace tools to this instantiation
# of the ZFS package set.
userspaceTools = genericBuild (outerArgs // {

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.13.7";
version = "0.13.8";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
hash = "sha256-A6rQ8zqpV6SBpiALIPMF1nZtGvUtzoiTE2Rioh3T1WA=";
hash = "sha256-zUpZdG2cdZ95L70qLG2HaUlD+G66XTi4f1V4+ZZAh30=";
};
vendorHash = "sha256-ByRCI4MuU8/ilbeNNOXSsTlBVHL5MkxLHItEGeGC9MQ=";
vendorHash = "sha256-rGOB1ikY3BgChvD1YZUF66g8P6gE29b/k9kxvHR0+WQ=";
subPackages = [
# The server

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2024.9.1";
version = "2024.9.2";
components = {
"3_day_blinds" = ps: with ps; [
];

View File

@ -408,7 +408,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2024.9.1";
hassVersion = "2024.9.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-jwkLlmwP9rxwGFVagVyVrO6scOMzuva1Pz706nb3Ato=";
hash = "sha256-qAnEdH1MDPsCKDubpYL5AswcsaPqGm+TrKdBcDD3np8=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-0+tXKnkcpjISqapvFh7nPKfPxJrSACuxulejk4pCPUQ=";
hash = "sha256-gWQU18GfnsxttRzpoN9WeNeHOgioTxF9DmG2SwNuzEY=";
};
build-system = with python.pkgs; [

View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20240906.0";
version = "20240909.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-iWSpwgp5mdAhuZgF+1uNL0aovjM7CZ4SbM0HHQktfAk=";
hash = "sha256-inxDdsJQ58Jg+3bc382l8z/PbChWI0pfZR/k+wyexvE=";
};
# there is nothing to strip in this package

View File

@ -15,7 +15,7 @@
, stdenv
}:
let
version = "2.0-1442";
version = "2.0-1455";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-D6Xdij92bDUchkSTT9/ADaNALqCyYwL9EnLqma48alg=";
hash = "sha256-R555u33S5jmqIKdDtRhMbfCMe5sG3x94naPX+qgrwHY=";
};
dontConfigure = true;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.33.0";
version = "2.34.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-6mmjIrG81uaNfRAXW0YORZfviFwJd1QyORfvMucNWdI=";
sha256 = "sha256-Ynhom4WX1ME6/uI0HQ83S1DgLYN1HjUxKk5CUL/Fgzk=";
};
vendorHash = "sha256-PWjcQD64DEJylRdSUA55iCcKHMdyMh5PrfWnhZz3LOg=";
vendorHash = "sha256-FHvppbAAKW2Nf5GKhMWoMuOgqAp6deOSE61hg7dASqo=";
ldflags = [
"-w"
@ -27,19 +27,19 @@ buildGoModule rec {
# Some tests require access to scaleway's API, failing when sandboxed
preCheck = ''
substituteInPlace internal/core/bootstrap_test.go \
--replace "TestInterruptError" "SkipInterruptError"
substituteInPlace core/bootstrap_test.go \
--replace-warn "TestInterruptError" "SkipInterruptError"
substituteInPlace internal/e2e/errors_test.go \
--replace "TestStandardErrors" "SkipStandardErrors"
--replace-warn "TestStandardErrors" "SkipStandardErrors"
substituteInPlace internal/e2e/human_test.go \
--replace "TestTestCommand" "SkipTestCommand" \
--replace "TestHumanCreate" "SkipHumanCreate" \
--replace "TestHumanList" "SkipHumanList" \
--replace "TestHumanUpdate" "SkipHumanUpdate" \
--replace "TestHumanGet" "SkipHumanGet" \
--replace "TestHumanDelete" "SkipHumanDelete"
--replace-warn "TestTestCommand" "SkipTestCommand" \
--replace-warn "TestHumanCreate" "SkipHumanCreate" \
--replace-warn "TestHumanList" "SkipHumanList" \
--replace-warn "TestHumanUpdate" "SkipHumanUpdate" \
--replace-warn "TestHumanGet" "SkipHumanGet" \
--replace-warn "TestHumanDelete" "SkipHumanDelete"
substituteInPlace internal/e2e/sdk_errors_test.go \
--replace "TestSdkStandardErrors" "SkipSdkStandardErrors"
--replace-warn "TestSdkStandardErrors" "SkipSdkStandardErrors"
'';
doInstallCheck = true;

View File

@ -1,114 +0,0 @@
{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages
, gnu-efi, mtools, openssl, perl, xorriso, xz
, syslinux ? null
, embedScript ? null
, additionalTargets ? {}
, additionalOptions ? []
}:
let
targets = additionalTargets // lib.optionalAttrs stdenv.isx86_64 {
"bin-x86_64-efi/ipxe.efi" = null;
"bin-x86_64-efi/ipxe.efirom" = null;
"bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-x86_64-efi/snp.efi" = null;
} // lib.optionalAttrs stdenv.hostPlatform.isx86 {
"bin/ipxe.dsk" = null;
"bin/ipxe.usb" = null;
"bin/ipxe.iso" = null;
"bin/ipxe.lkrn" = null;
"bin/undionly.kpxe" = null;
} // lib.optionalAttrs stdenv.isAarch32 {
"bin-arm32-efi/ipxe.efi" = null;
"bin-arm32-efi/ipxe.efirom" = null;
"bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-arm32-efi/snp.efi" = null;
} // lib.optionalAttrs stdenv.isAarch64 {
"bin-arm64-efi/ipxe.efi" = null;
"bin-arm64-efi/ipxe.efirom" = null;
"bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb";
"bin-arm64-efi/snp.efi" = null;
};
in
stdenv.mkDerivation rec {
pname = "ipxe";
version = "1.21.1-unstable-2024-08-15";
nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
depsBuildBuild = [ buildPackages.stdenv.cc ];
strictDeps = true;
src = fetchFromGitHub {
owner = "ipxe";
repo = "ipxe";
rev = "950f6b5861d8d6b247b37e4e1401d26d8f908ee8";
hash = "sha256-Zf2ZblKUyKPo0YdzQFeCEAnYkvWDsmuTS9htvSybpXo=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
substituteInPlace src/util/genfsimg --replace " syslinux " " true "
''; # calling syslinux on a FAT image isn't going to work
# not possible due to assembler code
hardeningDisable = [ "pic" "stackprotector" ];
env.NIX_CFLAGS_COMPILE = "-Wno-error";
makeFlags =
[ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
"CROSS=${stdenv.cc.targetPrefix}"
] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
enabledOptions = [
"PING_CMD"
"IMAGE_TRUST_CMD"
"DOWNLOAD_PROTO_HTTP"
"DOWNLOAD_PROTO_HTTPS"
] ++ additionalOptions;
configurePhase = ''
runHook preConfigure
for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done
substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo
'' + lib.optionalString stdenv.hostPlatform.isx86 ''
substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux
'' + ''
runHook postConfigure
'';
preBuild = "cd src";
buildFlags = lib.attrNames targets;
installPhase = ''
runHook preInstall
mkdir -p $out
${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to:
if to == null
then "cp -v ${from} $out"
else "cp -v ${from} $out/${to}") targets)}
# Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
# let's provide it as a symlink to be compatible in this case.
ln -s undionly.kpxe $out/undionly.kpxe.0
runHook postInstall
'';
enableParallelBuilding = true;
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
meta = with lib;
{ description = "Network boot firmware";
homepage = "https://ipxe.org/";
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "fh";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "DeterminateSystems";
repo = "fh";
rev = "v${version}";
hash = "sha256-HC/PNdBOm4mR2p6qI2P+aS+lFabKWSiPhiBSJUsmcv4=";
hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI=";
};
cargoHash = "sha256-pWPFiDRF9avZSSUtxDaTfl9ZVUEcnO/CY0VWByaGimo=";
cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE=";
nativeBuildInputs = [
installShellFiles

View File

@ -35,6 +35,9 @@ stdenv.mkDerivation {
--add-flags $out/libexec/nix-serve/nix-serve.psgi
'';
/** The nix package that nix-serve got its nix perl bindings from. */
passthru.nix = nix;
passthru.tests = {
nix-serve = nixosTests.nix-serve;
nix-serve-ssh = nixosTests.nix-serve-ssh;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vals";
version = "0.37.3";
version = "0.37.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "helmfile";
repo = pname;
sha256 = "sha256-RCvqoikROFpFvza24PGocdxFaOI6hZLSy3Jnag7Oz4s=";
sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8=";
};
vendorHash = "sha256-iKfNAQRsVUjhUmDH/HevnDnocQm4k9jEfW40+AncojM=";
vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY=";
proxyVendor = true;

View File

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "zx";
version = "8.1.6";
version = "8.1.7";
src = fetchFromGitHub {
owner = "google";
repo = "zx";
rev = version;
hash = "sha256-bjYfeEsKO4hkLfGBVqFTomh0P3dhlvvq+PqEiZHySLs=";
hash = "sha256-oQL3EI4yTQOi+BM9ZkTILYulWD13Pof3JC1KVLSJWcA=";
};
npmDepsHash = "sha256-bAxqxxqhRE3Vw6NtKK5dnM41ypgq7FIpgK0hEpZ53/Q=";
npmDepsHash = "sha256-colrMoVN5uGVBeCvDfEU9tjjW9qkaiSKHPmTZ83EgCk=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@ -12,18 +12,21 @@
, nixosTests
, pkg-config
, squashfsTools
, stdenv
, wimlib
}:
let
bins = [
cdrkit
coreutils
debootstrap
gnupg
gnutar
hivex
squashfsTools
] ++ lib.optionals stdenv.isx86_64 [
# repack-windows deps
cdrkit
hivex
wimlib
];
in

View File

@ -8830,8 +8830,6 @@ with pkgs;
ipv6calc = callPackage ../tools/networking/ipv6calc { };
ipxe = callPackage ../tools/misc/ipxe { };
irker = callPackage ../servers/irker { };
iroh = callPackage ../applications/networking/iroh { };