Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ae22f8403a
|
|
@ -2726,6 +2726,12 @@
|
|||
github = "bmwalters";
|
||||
githubId = 4380777;
|
||||
};
|
||||
bnlrnz = {
|
||||
github = "bnlrnz";
|
||||
githubId = 11310385;
|
||||
name = "Ben Lorenz";
|
||||
email = "bnlrnz@gmail.com";
|
||||
};
|
||||
bobakker = {
|
||||
email = "bobakk3r@gmail.com";
|
||||
github = "bobakker";
|
||||
|
|
@ -14761,6 +14767,12 @@
|
|||
githubId = 16027994;
|
||||
name = "Nathan Viets";
|
||||
};
|
||||
nyadiia = {
|
||||
email = "nyadiia@pm.me";
|
||||
github = "nyadiia";
|
||||
githubId = 43252360;
|
||||
name = "Nadia";
|
||||
};
|
||||
nyanbinary = {
|
||||
email = "nyanbinary@keemail.me";
|
||||
matrix = "@niko:conduit.rs";
|
||||
|
|
@ -19512,6 +19524,12 @@
|
|||
fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19";
|
||||
}];
|
||||
};
|
||||
t4sm5n = {
|
||||
email = "t4sm5n@gmail.com";
|
||||
github = "t4sm5n";
|
||||
githubId = 28858039;
|
||||
name = "Tuomas Mäkinen";
|
||||
};
|
||||
tadeokondrak = {
|
||||
email = "me@tadeo.ca";
|
||||
github = "tadeokondrak";
|
||||
|
|
|
|||
|
|
@ -518,6 +518,7 @@ with lib.maintainers; {
|
|||
cpages
|
||||
dschrempf
|
||||
edwtjo
|
||||
kazenyuk
|
||||
minijackson
|
||||
peterhoeg
|
||||
sephalon
|
||||
|
|
|
|||
|
|
@ -1166,6 +1166,7 @@
|
|||
./services/networking/syncthing-relay.nix
|
||||
./services/networking/syncthing.nix
|
||||
./services/networking/tailscale.nix
|
||||
./services/networking/tailscale-auth.nix
|
||||
./services/networking/tayga.nix
|
||||
./services/networking/tcpcrypt.nix
|
||||
./services/networking/teamspeak3.nix
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ in {
|
|||
]);
|
||||
};
|
||||
|
||||
networking.networkmanager.enable = lib.mkDefault true;
|
||||
|
||||
systemd.packages = with pkgs.lomiri; [
|
||||
hfd-service
|
||||
lomiri-download-manager
|
||||
|
|
@ -73,6 +75,8 @@ in {
|
|||
ayatana-indicator-session
|
||||
]) ++ (with pkgs.lomiri; [
|
||||
telephony-service
|
||||
] ++ lib.optionals config.networking.networkmanager.enable [
|
||||
lomiri-indicator-network
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
@ -111,6 +115,8 @@ in {
|
|||
"/share/lomiri-app-launch"
|
||||
# TODO Try to get maliit stuff working
|
||||
"/share/maliit/plugins"
|
||||
# At least the network indicator is still under the unity name, due to leftover Unity-isms
|
||||
"/share/unity"
|
||||
# Data
|
||||
"/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it
|
||||
"/share/sounds"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,104 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
getExe
|
||||
maintainers
|
||||
mkEnableOption
|
||||
mkPackageOption
|
||||
mkIf
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
cfg = config.services.tailscaleAuth;
|
||||
in
|
||||
{
|
||||
options.services.tailscaleAuth = {
|
||||
enable = mkEnableOption "Enable tailscale.nginx-auth, to authenticate users via tailscale.";
|
||||
|
||||
package = mkPackageOption pkgs "tailscale-nginx-auth" {};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "tailscale-nginx-auth";
|
||||
description = "User which runs tailscale-nginx-auth";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "tailscale-nginx-auth";
|
||||
description = "Group which runs tailscale-nginx-auth";
|
||||
};
|
||||
|
||||
socketPath = mkOption {
|
||||
default = "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path of the socket listening to authorization requests.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.tailscale.enable = true;
|
||||
|
||||
users.users.${cfg.user} = {
|
||||
isSystemUser = true;
|
||||
inherit (cfg) group;
|
||||
};
|
||||
users.groups.${cfg.group} = { };
|
||||
|
||||
systemd.sockets.tailscale-nginx-auth = {
|
||||
description = "Tailscale NGINX Authentication socket";
|
||||
partOf = [ "tailscale-nginx-auth.service" ];
|
||||
wantedBy = [ "sockets.target" ];
|
||||
listenStreams = [ cfg.socketPath ];
|
||||
socketConfig = {
|
||||
SocketMode = "0660";
|
||||
SocketUser = cfg.user;
|
||||
SocketGroup = cfg.group;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.tailscale-nginx-auth = {
|
||||
description = "Tailscale NGINX Authentication service";
|
||||
requires = [ "tailscale-nginx-auth.socket" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = getExe cfg.package;
|
||||
RuntimeDirectory = "tailscale-nginx-auth";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
||||
BindPaths = [ "/run/tailscale/tailscaled.sock" ];
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
DeviceAllow = "";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictAddressFamilies = [ "AF_UNIX" ];
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ dan-theriault phaer ];
|
||||
}
|
||||
|
|
@ -28,7 +28,8 @@ in
|
|||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
A list of nginx virtual hosts to put behind the oauth2 proxy
|
||||
A list of nginx virtual hosts to put behind the oauth2 proxy.
|
||||
You can exclude specific locations by setting `auth_request off;` in the locations extraConfig setting.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -50,18 +51,27 @@ in
|
|||
] ++ optional (cfg.virtualHosts != []) {
|
||||
recommendedProxySettings = true; # needed because duplicate headers
|
||||
} ++ (map (vhost: {
|
||||
virtualHosts.${vhost}.locations = {
|
||||
"/oauth2/auth" = {
|
||||
proxyPass = cfg.proxy;
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Scheme $scheme;
|
||||
# nginx auth_request includes headers but not body
|
||||
proxy_set_header Content-Length "";
|
||||
proxy_pass_request_body off;
|
||||
'';
|
||||
virtualHosts.${vhost} = {
|
||||
locations = {
|
||||
"/oauth2/auth" = {
|
||||
proxyPass = cfg.proxy;
|
||||
extraConfig = ''
|
||||
auth_request off;
|
||||
proxy_set_header X-Scheme $scheme;
|
||||
# nginx auth_request includes headers but not body
|
||||
proxy_set_header Content-Length "";
|
||||
proxy_pass_request_body off;
|
||||
'';
|
||||
};
|
||||
"@redirectToAuth2ProxyLogin" = {
|
||||
return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri";
|
||||
extraConfig = ''
|
||||
auth_request off;
|
||||
'';
|
||||
};
|
||||
};
|
||||
"@redirectToAuth2ProxyLogin".return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri";
|
||||
"/".extraConfig = ''
|
||||
|
||||
extraConfig = ''
|
||||
auth_request /oauth2/auth;
|
||||
error_page 401 = @redirectToAuth2ProxyLogin;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +1,29 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
genAttrs
|
||||
maintainers
|
||||
mkAliasOptionModule
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
cfg = config.services.nginx.tailscaleAuth;
|
||||
cfgAuth = config.services.tailscaleAuth;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkAliasOptionModule [ "services" "nginx" "tailscaleAuth" "package" ] [ "services" "tailscaleAuth" "package" ])
|
||||
(mkAliasOptionModule [ "services" "nginx" "tailscaleAuth" "user" ] [ "services" "tailscaleAuth" "user" ])
|
||||
(mkAliasOptionModule [ "services" "nginx" "tailscaleAuth" "group" ] [ "services" "tailscaleAuth" "group" ])
|
||||
(mkAliasOptionModule [ "services" "nginx" "tailscaleAuth" "socketPath" ] [ "services" "tailscaleAuth" "socketPath" ])
|
||||
];
|
||||
|
||||
options.services.nginx.tailscaleAuth = {
|
||||
enable = mkEnableOption "Enable tailscale.nginx-auth, to authenticate nginx users via tailscale.";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "tailscale-nginx-auth" {};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "tailscale-nginx-auth";
|
||||
description = "User which runs tailscale-nginx-auth";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "tailscale-nginx-auth";
|
||||
description = "Group which runs tailscale-nginx-auth";
|
||||
};
|
||||
|
||||
expectedTailnet = mkOption {
|
||||
default = "";
|
||||
type = types.nullOr types.str;
|
||||
|
|
@ -33,14 +34,6 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
socketPath = mkOption {
|
||||
default = "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path of the socket listening to nginx authorization requests.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualHosts = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
|
@ -51,67 +44,14 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.tailscale.enable = true;
|
||||
services.tailscaleAuth.enable = true;
|
||||
services.nginx.enable = true;
|
||||
|
||||
users.users.${cfg.user} = {
|
||||
isSystemUser = true;
|
||||
inherit (cfg) group;
|
||||
};
|
||||
users.groups.${cfg.group} = { };
|
||||
users.users.${config.services.nginx.user}.extraGroups = [ cfg.group ];
|
||||
systemd.sockets.tailscale-nginx-auth = {
|
||||
description = "Tailscale NGINX Authentication socket";
|
||||
partOf = [ "tailscale-nginx-auth.service" ];
|
||||
wantedBy = [ "sockets.target" ];
|
||||
listenStreams = [ cfg.socketPath ];
|
||||
socketConfig = {
|
||||
SocketMode = "0660";
|
||||
SocketUser = cfg.user;
|
||||
SocketGroup = cfg.group;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.${config.services.nginx.user}.extraGroups = [ cfgAuth.group ];
|
||||
|
||||
systemd.services.tailscale-nginx-auth = {
|
||||
description = "Tailscale NGINX Authentication service";
|
||||
after = [ "nginx.service" ];
|
||||
wants = [ "nginx.service" ];
|
||||
requires = [ "tailscale-nginx-auth.socket" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package}";
|
||||
RuntimeDirectory = "tailscale-nginx-auth";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
||||
BindPaths = [ "/run/tailscale/tailscaled.sock" ];
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
DeviceAllow = "";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictAddressFamilies = [ "AF_UNIX" ];
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = genAttrs
|
||||
|
|
@ -121,7 +61,7 @@ in
|
|||
extraConfig = ''
|
||||
internal;
|
||||
|
||||
proxy_pass http://unix:${cfg.socketPath};
|
||||
proxy_pass http://unix:${cfgAuth.socketPath};
|
||||
proxy_pass_request_body off;
|
||||
|
||||
# Upstream uses $http_host here, but we are using gixy to check nginx configurations
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@ in {
|
|||
|
||||
boot.kernelParams = ["console=tty1" "console=${serialDevice}"];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
SUBSYSTEM=="cpu", CONST{arch}=="x86-64", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
|
||||
'';
|
||||
|
||||
virtualisation.lxd.agent.enable = lib.mkDefault true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,5 +57,14 @@ in
|
|||
|
||||
with subtest("lxd-agent has a valid path"):
|
||||
machine.succeed("incus exec ${instance-name} -- bash -c 'true'")
|
||||
|
||||
with subtest("guest supports cpu hotplug"):
|
||||
machine.succeed("incus config set ${instance-name} limits.cpu=1")
|
||||
count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip())
|
||||
assert count == 1, f"Wrong number of CPUs reported, want: 1, got: {count}"
|
||||
|
||||
machine.succeed("incus config set ${instance-name} limits.cpu=2")
|
||||
count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip())
|
||||
assert count == 2, f"Wrong number of CPUs reported, want: 2, got: {count}"
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -253,22 +253,35 @@ in {
|
|||
with subtest("ayatana indicators work"):
|
||||
open_starter()
|
||||
machine.send_chars("Indicators\n")
|
||||
machine.wait_for_text(r"(Indicators|Client|List|datetime|session)")
|
||||
machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")
|
||||
machine.screenshot("indicators_open")
|
||||
|
||||
# Element tab order within the indicator menus is not fully deterministic
|
||||
# Only check that the indicators are listed & their items load
|
||||
|
||||
with subtest("lomiri indicator network works"):
|
||||
# Select indicator-network
|
||||
machine.send_key("tab")
|
||||
# Don't go further down, first entry
|
||||
machine.send_key("ret")
|
||||
machine.wait_for_text(r"(Flight|Wi-Fi)")
|
||||
machine.screenshot("indicators_network")
|
||||
|
||||
machine.send_key("shift-tab")
|
||||
machine.send_key("ret")
|
||||
machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")
|
||||
|
||||
with subtest("ayatana indicator datetime works"):
|
||||
# Select ayatana-indicator-datetime
|
||||
machine.send_key("tab")
|
||||
machine.send_key("down")
|
||||
machine.send_key("ret")
|
||||
machine.wait_for_text("Time and Date Settings")
|
||||
machine.screenshot("indicators_timedate")
|
||||
|
||||
machine.send_key("shift-tab")
|
||||
machine.send_key("ret")
|
||||
machine.wait_for_text(r"(Indicators|Client|List|datetime|session)")
|
||||
machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)")
|
||||
|
||||
with subtest("ayatana indicator session works"):
|
||||
# Select ayatana-indicator-session
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gbsplay";
|
||||
version = "0.0.96";
|
||||
version = "0.0.97";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmitch";
|
||||
repo = "gbsplay";
|
||||
rev = version;
|
||||
sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU=";
|
||||
sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ let
|
|||
else throw "unsupported platform";
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pixelorama";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orama-Interactive";
|
||||
repo = "Pixelorama";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-+bQRUTEJluhcs5P87It9/oJOzrCcNFzDJVpixoQKXQc=";
|
||||
sha256 = "sha256-VEQjZ9kDqXz1hoT4PrsBtzoi1TYWyN+YcPMyf9qJMRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1049,8 +1049,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
publisher = "DavidAnson";
|
||||
version = "0.54.0";
|
||||
hash = "sha256-BrPFFRspJIz1U08hPbLziCmRUeZv2NhRrTCx6qvhOJw=";
|
||||
version = "0.55.0";
|
||||
hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
|
||||
|
|
@ -2352,6 +2352,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
k--kato.intellij-idea-keybindings = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "intellij-idea-keybindings";
|
||||
publisher = "k--kato";
|
||||
version = "1.7.0";
|
||||
hash = "sha256-mIcSZANZlj5iO2oLiJBUHn08rXVhu/9SKsRhlu/hcvI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog";
|
||||
description = "Visual Studio Code extension for IntelliJ IDEA keybindings";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=k--kato.intellij-idea-keybindings";
|
||||
homepage = "https://github.com/kasecato/vscode-intellij-idea-keybindings";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.t4sm5n ];
|
||||
};
|
||||
};
|
||||
|
||||
kahole.magit = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "magit";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
appimageTools.wrapAppImage rec {
|
||||
pname = "bazecor";
|
||||
version = "1.3.9";
|
||||
version = "1.3.11";
|
||||
|
||||
src = appimageTools.extract {
|
||||
inherit pname version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage";
|
||||
hash = "sha256-qve5xxhhyVej8dPDkZ7QQdeDUmqGO4pHJTykbS4RhAk=";
|
||||
hash = "sha256-iMurQDF0CBMnJnjmEgNIKYd8C5B4FguMi4Jqa3dHr3o=";
|
||||
};
|
||||
|
||||
# Workaround for https://github.com/Dygmalab/Bazecor/issues/370
|
||||
|
|
@ -26,7 +26,7 @@ appimageTools.wrapAppImage rec {
|
|||
|
||||
# also make sure to update the udev rules in ./10-dygma.rules; most recently
|
||||
# taken from
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.9/src/main/utils/udev.ts#L6
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6
|
||||
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.glib
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "metadata-cleaner";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "rmnvgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk=";
|
||||
hash = "sha256-0DaQvVG19X9mMYZeYBz0t/DEx4MACLMjTOGMkUv9OQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -41,9 +41,15 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff";
|
||||
hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU=";
|
||||
})
|
||||
# Allow compiling with markdown3
|
||||
# https://github.com/pdfpc/pdfpc/pull/716
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pdfpc/pdfpc/commit/08e66b9d432e9598c1ee9a78b2355728036ae1a1.patch";
|
||||
hash = "sha256-SKH2GQ5/6Is36xOFmSs89Yw/w7Fnma3FrNqwjOlUQKM=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF";
|
||||
cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A presenter console with multi-monitor support for PDF files";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.80";
|
||||
version = "1.0.81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jzz9mny59YM5PLcQvcus3gHuRSbl/OISAOjDoS/4Y78=";
|
||||
sha256 = "sha256-YdrJbT9Ozp1vlvQBYQNjJX6n3vIXYj3dmKhAsBPrvi8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uh2/4qdJQfqQdjXbOBkUVv2nF1AN+QRKRI0+yta+G5Q=";
|
||||
vendorHash = "sha256-YNbxV79XQBmd7oTanwLOMdmt2ds4ttX1ttr8vUycVzg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ callPackage, ... } @ args:
|
||||
let
|
||||
unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
|
||||
kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; };
|
||||
in
|
||||
unwrapped.overrideAttrs (oldAttrs: {
|
||||
passthru = oldAttrs.passthru // {
|
||||
packages = kodiPackages;
|
||||
withPackages = func: callPackage ./wrapper.nix {
|
||||
kodi = unwrapped;
|
||||
addons = kodiPackages.requiredKodiAddons (func kodiPackages);
|
||||
};
|
||||
};
|
||||
passthru =
|
||||
let
|
||||
finalKodi = oldAttrs.passthru.kodi;
|
||||
kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };
|
||||
in
|
||||
oldAttrs.passthru // {
|
||||
packages = kodiPackages;
|
||||
withPackages = func: callPackage ./wrapper.nix {
|
||||
kodi = finalKodi;
|
||||
addons = kodiPackages.requiredKodiAddons (func kodiPackages);
|
||||
};
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
, rtmpSupport ? true, rtmpdump
|
||||
, sambaSupport ? true, samba
|
||||
, udevSupport ? true, udev
|
||||
, opticalSupport ? true
|
||||
, usbSupport ? false, libusb-compat-0_1
|
||||
, vdpauSupport ? true, libvdpau
|
||||
, waylandSupport ? false, wayland, wayland-protocols
|
||||
|
|
@ -40,10 +41,6 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
|
|||
assert gbmSupport || waylandSupport || x11Support;
|
||||
|
||||
let
|
||||
kodiReleaseDate = "20240405";
|
||||
kodiVersion = "21.0";
|
||||
rel = "Omega";
|
||||
|
||||
# see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies
|
||||
|
||||
# We can build these externally but FindLibDvd.cmake forces us to build it
|
||||
|
|
@ -70,17 +67,17 @@ let
|
|||
};
|
||||
|
||||
groovy = fetchzip {
|
||||
url = "https://archive.apache.org/dist/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip";
|
||||
url = "mirror://apache/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip";
|
||||
sha256 = "sha256-OfZBiMVrhw6VqHRHCSC7ZV3FiZ26n4+F8hsskk+L6yU=";
|
||||
};
|
||||
|
||||
apache_commons_lang = fetchzip {
|
||||
url = "https://dlcdn.apache.org//commons/lang/binaries/commons-lang3-3.14.0-bin.zip";
|
||||
url = "mirror://apache/commons/lang/binaries/commons-lang3-3.14.0-bin.zip";
|
||||
sha512 = "sha512-eKF1IQ6PDtifb4pMHWQ2SYHIh0HbMi3qpc92lfbOo3uSsFJVR3n7JD0AdzrG17tLJQA4z5PGDhwyYw0rLeLsXw==";
|
||||
};
|
||||
|
||||
apache_commons_text = fetchzip {
|
||||
url = "https://dlcdn.apache.org//commons/text/binaries/commons-text-1.11.0-bin.zip";
|
||||
url = "mirror://apache/commons/text/binaries/commons-text-1.11.0-bin.zip";
|
||||
sha512 = "sha512-P2IvnrHSYRF70LllTMI8aev43h2oe8lq6rrMYw450PEhEa7OuuCjh1Krnc/A4OqENUcidVAAX5dK1RAsZHh8Dg==";
|
||||
};
|
||||
|
||||
|
|
@ -88,17 +85,23 @@ let
|
|||
++ lib.optional waylandSupport "wayland"
|
||||
++ lib.optional x11Support "x11";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kodi";
|
||||
version = kodiVersion;
|
||||
version = "21.0";
|
||||
kodiReleaseName = "Omega";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0=";
|
||||
repo = "xbmc";
|
||||
rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
|
||||
hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0=";
|
||||
};
|
||||
|
||||
# make derivations declared in the let binding available here, so
|
||||
# they can be overridden
|
||||
inherit libdvdcss libdvdnav libdvdread groovy
|
||||
apache_commons_lang apache_commons_text;
|
||||
|
||||
buildInputs = [
|
||||
gnutls libidn2 libtasn1 nasm p11-kit
|
||||
libxml2 python3Packages.python
|
||||
|
|
@ -168,17 +171,20 @@ in stdenv.mkDerivation {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
|
||||
"-Dlibdvdcss_URL=${libdvdcss}"
|
||||
"-Dlibdvdnav_URL=${libdvdnav}"
|
||||
"-Dlibdvdread_URL=${libdvdread}"
|
||||
"-Dgroovy_SOURCE_DIR=${groovy}"
|
||||
"-Dapache-commons-lang_SOURCE_DIR=${apache_commons_lang}"
|
||||
"-Dapache-commons-text_SOURCE_DIR=${apache_commons_text}"
|
||||
"-DGIT_VERSION=${kodiReleaseDate}"
|
||||
"-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
|
||||
"-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
|
||||
"-Dlibdvdread_URL=${finalAttrs.libdvdread}"
|
||||
"-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
|
||||
"-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
|
||||
"-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
|
||||
# Upstream derives this from the git HEADs hash and date.
|
||||
# LibreElec (minimal distro for kodi) uses the equivalent to this.
|
||||
"-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
|
||||
"-DENABLE_EVENTCLIENTS=ON"
|
||||
"-DENABLE_INTERNAL_CROSSGUID=OFF"
|
||||
"-DENABLE_INTERNAL_RapidJSON=OFF"
|
||||
"-DENABLE_OPTICAL=ON"
|
||||
"-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
|
||||
"-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
|
||||
"-DLIRC_DEVICE=/run/lirc/lircd"
|
||||
"-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
|
||||
"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
|
||||
|
|
@ -221,7 +227,8 @@ in stdenv.mkDerivation {
|
|||
--prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ]
|
||||
++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \
|
||||
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
|
||||
([ curl systemd libmad libvdpau libcec libcec_platform libass ]
|
||||
([ curl systemd libmad libcec libcec_platform libass ]
|
||||
++ lib.optional vdpauSupport libvdpau
|
||||
++ lib.optional nfsSupport libnfs
|
||||
++ lib.optional rtmpSupport rtmpdump)}"
|
||||
done
|
||||
|
|
@ -240,6 +247,7 @@ in stdenv.mkDerivation {
|
|||
passthru = {
|
||||
pythonPackages = python3Packages;
|
||||
ffmpeg = ffmpeg;
|
||||
kodi = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -249,4 +257,4 @@ in stdenv.mkDerivation {
|
|||
platforms = platforms.linux;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -64,13 +64,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XgLrPLswLmaB9FYXKEMLP+7KT/OY50z3JKz8DvMLrEE=";
|
||||
hash = "sha256-8Swqwyzu/WI9mG21bLF81Kk4kS2Ltg0GV9G3EcG/FnU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -83,8 +83,7 @@ let
|
|||
replaceStrings
|
||||
;
|
||||
|
||||
stdenv = stdenvNoCC;
|
||||
inherit (stdenv) hostPlatform targetPlatform;
|
||||
inherit (stdenvNoCC) hostPlatform targetPlatform;
|
||||
|
||||
# Prefix for binaries. Customarily ends with a dash separator.
|
||||
#
|
||||
|
|
@ -138,7 +137,7 @@ let
|
|||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = targetPrefix
|
||||
+ (if name != "" then name else "${bintoolsName}-wrapper");
|
||||
version = optionalString (bintools != null) bintoolsVersion;
|
||||
|
|
@ -346,7 +345,7 @@ stdenv.mkDerivation {
|
|||
done
|
||||
''
|
||||
|
||||
+ optionalString stdenv.targetPlatform.isDarwin ''
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
|
||||
''
|
||||
|
||||
|
|
@ -363,7 +362,7 @@ stdenv.mkDerivation {
|
|||
###
|
||||
### Remove certain timestamps from final binaries
|
||||
###
|
||||
+ optionalString (stdenv.targetPlatform.isDarwin && !(bintools.isGNU or false)) ''
|
||||
+ optionalString (targetPlatform.isDarwin && !(bintools.isGNU or false)) ''
|
||||
echo "export ZERO_AR_DATE=1" >> $out/nix-support/setup-hook
|
||||
''
|
||||
|
||||
|
|
@ -380,9 +379,9 @@ stdenv.mkDerivation {
|
|||
###
|
||||
### Ensure consistent LC_VERSION_MIN_MACOSX
|
||||
###
|
||||
+ optionalString stdenv.targetPlatform.isDarwin (
|
||||
+ optionalString targetPlatform.isDarwin (
|
||||
let
|
||||
inherit (stdenv.targetPlatform)
|
||||
inherit (targetPlatform)
|
||||
darwinPlatform darwinSdkVersion
|
||||
darwinMinVersion darwinMinVersionVariable;
|
||||
in ''
|
||||
|
|
|
|||
|
|
@ -82,9 +82,7 @@ let
|
|||
versionAtLeast
|
||||
;
|
||||
|
||||
inherit (stdenv) hostPlatform targetPlatform;
|
||||
|
||||
stdenv = stdenvNoCC;
|
||||
inherit (stdenvNoCC) hostPlatform targetPlatform;
|
||||
|
||||
includeFortifyHeaders' = if includeFortifyHeaders != null
|
||||
then includeFortifyHeaders
|
||||
|
|
@ -119,10 +117,10 @@ let
|
|||
|
||||
useGccForLibs = useCcForLibs
|
||||
&& libcxx == null
|
||||
&& !stdenv.targetPlatform.isDarwin
|
||||
&& !(stdenv.targetPlatform.useLLVM or false)
|
||||
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
|
||||
&& !(stdenv.targetPlatform.isiOS or false)
|
||||
&& !targetPlatform.isDarwin
|
||||
&& !(targetPlatform.useLLVM or false)
|
||||
&& !(targetPlatform.useAndroidPrebuilt or false)
|
||||
&& !(targetPlatform.isiOS or false)
|
||||
&& gccForLibs != null;
|
||||
gccForLibs_solib = getLib gccForLibs
|
||||
+ optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
|
||||
|
|
@ -249,17 +247,17 @@ let
|
|||
then cc.hardeningUnsupportedFlagsByTargetPlatform targetPlatform
|
||||
else (cc.hardeningUnsupportedFlags or []);
|
||||
|
||||
darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin (
|
||||
darwinPlatformForCC = optionalString targetPlatform.isDarwin (
|
||||
if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx"
|
||||
else targetPlatform.darwinPlatform
|
||||
);
|
||||
|
||||
darwinMinVersion = optionalString stdenv.targetPlatform.isDarwin (
|
||||
stdenv.targetPlatform.darwinMinVersion
|
||||
darwinMinVersion = optionalString targetPlatform.isDarwin (
|
||||
targetPlatform.darwinMinVersion
|
||||
);
|
||||
|
||||
darwinMinVersionVariable = optionalString stdenv.targetPlatform.isDarwin
|
||||
stdenv.targetPlatform.darwinMinVersionVariable;
|
||||
darwinMinVersionVariable = optionalString targetPlatform.isDarwin
|
||||
targetPlatform.darwinMinVersionVariable;
|
||||
in
|
||||
|
||||
assert includeFortifyHeaders' -> fortify-headers != null;
|
||||
|
|
@ -272,7 +270,7 @@ assert nativeTools == bintools.nativeTools;
|
|||
assert nativeLibc == bintools.nativeLibc;
|
||||
assert nativePrefix == bintools.nativePrefix;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = targetPrefix
|
||||
+ (if name != "" then name else "${ccName}-wrapper");
|
||||
version = optionalString (cc != null) ccVersion;
|
||||
|
|
@ -426,7 +424,7 @@ stdenv.mkDerivation {
|
|||
../setup-hooks/role.bash
|
||||
] ++ optional (cc.langC or true) ./setup-hook.sh
|
||||
++ optional (cc.langFortran or false) ./fortran-hook.sh
|
||||
++ optional (targetPlatform.isWindows) (stdenv.mkDerivation {
|
||||
++ optional (targetPlatform.isWindows) (stdenvNoCC.mkDerivation {
|
||||
name = "win-dll-hook.sh";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
|
|
@ -479,8 +477,8 @@ stdenv.mkDerivation {
|
|||
# break `useLLVM` into.)
|
||||
+ optionalString (isClang
|
||||
&& targetPlatform.isLinux
|
||||
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
|
||||
&& !(stdenv.targetPlatform.useLLVM or false)
|
||||
&& !(targetPlatform.useAndroidPrebuilt or false)
|
||||
&& !(targetPlatform.useLLVM or false)
|
||||
&& gccForLibs != null) (''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
|
||||
|
|
@ -689,7 +687,7 @@ stdenv.mkDerivation {
|
|||
done
|
||||
''
|
||||
|
||||
+ optionalString stdenv.targetPlatform.isDarwin ''
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, undmg
|
||||
, writeShellApplication
|
||||
, curl
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arc-browser";
|
||||
version = "1.38.0-48670";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-6LJEIkr1NA8HHxbLWtd/OTlPPErh05UTjVhjuZVcmTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "Arc.app";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications/Arc.app
|
||||
cp -R . $out/Applications/Arc.app
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "arc-browser-update-script";
|
||||
runtimeInputs = [ curl common-updater-scripts ];
|
||||
text = ''
|
||||
set -euo pipefail
|
||||
redirect_url="$(curl -s -L -f "https://releases.arc.net/release/Arc-latest.dmg" -o /dev/null -w '%{url_effective}')"
|
||||
# The url scheme is: https://releases.arc.net/release/Arc-1.23.4-56789.dmg
|
||||
# We strip everything before 'Arc-' and after '.dmg'
|
||||
version="''${redirect_url##*/Arc-}"
|
||||
version="''${version%.dmg}"
|
||||
update-source-version arc-browser "$version" --file=./pkgs/by-name/ar/arc-browser/package.nix
|
||||
'';
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Arc from The Browser Company";
|
||||
homepage = "https://arc.net/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ donteatoreo ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OgvPUk5q7DB9hakZzCUM2dlXMQzE/CGpg4pMDQCk7k0=";
|
||||
hash = "sha256-USBK3In/1Uor33wrab1iTt0akQTcjuHd7I86XfERzzg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MTOafmrlaW8WNUqsG2c/WnbG9ZKbq9zdou6buB4Qo/k=";
|
||||
cargoHash = "sha256-zEcll6X0iclDap40bQ1CXuVBQnVin8VwjpErm+/B0ZY=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "littlefs-fuse";
|
||||
version = "2.7.6";
|
||||
version = "2.7.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "littlefs-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iN6Ny1H7CyBzBRJyYKbXuzkap7+u+6tVkXo7Vnp1WV8=";
|
||||
hash = "sha256-MCmi0CBs3RLuYn+1BsS6pIeR/tHS1lGNyV3ZwlsnQCA=";
|
||||
};
|
||||
buildInputs = [ fuse ];
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec{
|
||||
pname = "makima";
|
||||
version = "0.4.4";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyber-sushi";
|
||||
repo = "makima";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3S4J4fdCn/eqgT9g0WmS5kQHr7LysBn03RzHvagm5jg=";
|
||||
hash = "sha256-x8vjTXB6kFJ9o6EGCtlX6eT/VrzLF17fIA2gDLFumzY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YCs37IYiYxjh2uBZvHliDZRu68J4mXCCYpWlPHtw+0Q=";
|
||||
cargoHash = "sha256-p4oMeDL7T/a9OCgMdriGtgHkZq8tZVzPspEsU4IPfAo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.1.4";
|
||||
version = "2.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W0vfYAEQYixbnOQhA59sj2uSAcbqoS/OMiB3TfXsv/Y=";
|
||||
hash = "sha256-NOPzznopH+PeSEMzO1vMHOSbmy9/v2yT4VC4kAsdbGw";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orchard";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-wuLlxyCyMgtKBW5MD7HJM3q+tsXOBTjGyNYuV9jDbEg=";
|
||||
hash = "sha256-mOlAMlvWEdkPxvhqrt7PHJjmtUBRsFwsSchHRQtaACc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "solitaire-tui";
|
||||
version = "0-unstable-2023-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brianstrauch";
|
||||
repo = "solitaire-tui";
|
||||
rev = "45fffc4b13dbf1056f25a01c612dd835ddab5501";
|
||||
hash = "sha256-xbqKtqFVvL+1x/SDoMEJ1LgnTy31LmZ/Je8K/bhP2bI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jFbxT0ekimBNjIHGgMmCUrwZTS3Sdop/MFQMVdBF/38=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/brianstrauch/solitaire-tui";
|
||||
description = "Klondike solitaire for the terminal";
|
||||
mainProgram = "solitaire-tui";
|
||||
maintainers = with maintainers; [ nyadiia ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -10,16 +10,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swww";
|
||||
version = "0.9.1";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LGFae";
|
||||
repo = "swww";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JtwNrdXZbmR7VZeRiXcLEEOq1z7bF8idjp2D1Zpf3Z4=";
|
||||
hash = "sha256-LvSPKg8cWlwKu4a+P/G0dOqV+aPsUq3axI1QqnLj4U8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FC3HeqWAMOTm2Tmzg+Sn/j0ZXyd8nsYH64MlwQwr8W0=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"bitcode-0.6.0" = "sha256-D1Jv9k9m6m7dXjU8s4YMEMC39FOUN7Ix9SvLKhM1yh0=";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
lz4
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "where-is-my-sddm-theme";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepanzubkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eIqSS+Kzf543HiY8WItyZ2vO1SHp7y9yOAD9hIzFPfg=";
|
||||
hash = "sha256-o9SpzSmHygHix3BUaMQRwLvgy2BdDsBXmiLDU+9u/6Q=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs =
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wlr-layout-ui";
|
||||
version = "1.4.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fdev31";
|
||||
repo = "wlr-layout-ui";
|
||||
rev = "${version}";
|
||||
hash = "sha256-3NV02/Lk43h3r17jwmSAqx7wofaHFJKDh+vaWwU17Gw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# The hyprland default.nix patches the version.h of hyprland so that the
|
||||
# version info moves to the commit key.
|
||||
substituteInPlace src/wlr_layout_ui/screens.py \
|
||||
--replace 'json.loads(subprocess.getoutput("hyprctl -j version"))["tag"]'\
|
||||
'json.loads(subprocess.getoutput("hyprctl -j version"))["commit"]'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyglet
|
||||
tomli
|
||||
tomli-w
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 files/wlr-layout-ui.desktop $out/share/applications/wlr-layout-ui.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple GUI to setup the screens layout on wlroots based systems";
|
||||
homepage = "https://github.com/fdev31/wlr-layout-ui/";
|
||||
maintainers = with maintainers; [ bnlrnz ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "wlrlui";
|
||||
platforms = subtractLists platforms.darwin platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "workout-tracker";
|
||||
version = "0.12.0";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jovandeginste";
|
||||
repo = "workout-tracker";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-INEo8jRJP0Jdsl28pLyrJEWAFwq5HpiOJIpwxOJ1vhU=";
|
||||
hash = "sha256-wBDLf4UfE3YXH2naub9Z//z5HWaTBuz6MyCQovZcsFI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "yamlscript";
|
||||
version = "0.1.52";
|
||||
version = "0.1.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
|
||||
hash = "sha256-VBb+mZXTzcP0oVjm3TWM38J3fSacQZwQ4WVVDgldHV4=";
|
||||
hash = "sha256-4ZjQYl4NdqbzyeEWDthBA8fWJFlIuMRtvHLtdlVYQmw=";
|
||||
};
|
||||
|
||||
executable = "ys";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zapzap";
|
||||
version = "5.2.1";
|
||||
version = "5.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zapzap-linux";
|
||||
repo = "zapzap";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Jswt/SWsrrXdJtaT3FAOuOCkrwlpy+lSJa6/gquMiwY=";
|
||||
hash = "sha256-KUWkpdT0v4Y85ga8NsF3fbiSjfhWXC+WpHESTPCW+oE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenvNoCC, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip, useVariableFont ? true }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fira-code";
|
||||
version = "6.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip";
|
||||
url = "https://github.com/tonsky/FiraCode/releases/download/${finalAttrs.version}/Fira_Code_v${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-UHOwZL9WpCHk6vZaqI/XfkZogKgycs5lWg1p0XdQt0A=";
|
||||
};
|
||||
|
|
@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype
|
||||
install -Dm644 -t $out/share/fonts/truetype ${if useVariableFont then "variable_ttf/*-VF.ttf" else "ttf/*.ttf"}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -31,4 +31,4 @@ stdenvNoCC.mkDerivation rec {
|
|||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,25 +1,39 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, imagemagick
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixos-icons";
|
||||
version = "2021-02-24";
|
||||
version = "0-unstable-2024-04-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nixos-artwork";
|
||||
rev = "488c22aad523c709c44169d3e88d34b4691c20dc";
|
||||
sha256 = "ZoanCzn4pqGB1fyMzMyGQVT0eIhNdL7ZHJSn1VZWVRs=";
|
||||
rev = "f84c13adae08e860a7c3f76ab3a9bef916d276cc";
|
||||
hash = "sha256-lO/2dLGK2f9pzLHudRIs4PUcGUliy7kfyt9r4CbhbVg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/icons";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"prefix="
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
}
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Icons of the Nix logo, in Freedesktop Icon Directory Layout";
|
||||
homepage = "https://github.com/NixOS/nixos-artwork";
|
||||
license = licenses.cc-by-40;
|
||||
maintainers = with maintainers; [];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gtk3
|
||||
, colloid-gtk-theme
|
||||
, gnome-themes-extra
|
||||
|
|
@ -30,27 +29,19 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "gtk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7EvKcyh9gH/QbiXKlyAKMSBXMF3DmbHD+wJD3Sq39DE=";
|
||||
hash = "sha256-pGL8vaE63ss2ZT2FoNDfDkeuCxjcbl02RmwwfHC/Vxg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 sassc ];
|
||||
|
||||
patches = [
|
||||
./colloid-src-git-reset.patch
|
||||
|
||||
# Can be removed next release
|
||||
# Adds compatibility with the 2.x.x versions of the catppuccin python package
|
||||
(fetchpatch {
|
||||
name = "catppuccin-python-compatibility.patch";
|
||||
url = "https://github.com/catppuccin/gtk/commit/355e12387f73b27cf4734a6a3eb431554fabb74f.patch";
|
||||
hash = "sha256-4vgZbNeGMtsQEitIWDCVb5o4fAjhVu3iIUttUYqtHPc=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -47,11 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
# Queried via pkg-config, would need to override a prefix variable
|
||||
# Needs CMake 3.28 or higher to do as part of the call, https://github.com/NixOS/nixpkgs/pull/275284
|
||||
# Override original prefixes
|
||||
substituteInPlace data/CMakeLists.txt \
|
||||
--replace 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'set(DBUS_SESSION_BUS_SERVICES_DIR "''${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/services")' \
|
||||
--replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
|
||||
--replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \
|
||||
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnats";
|
||||
version = "3.8.0";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats.c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fIm5RBX6m0zSeq2WvpIEi2+ibpnyqsFkeP0T9NS+sOw=";
|
||||
sha256 = "sha256-Tn88RRigL6C36AcFhUlLbLyqcqbBR8z6PKAQH4w/mYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, eth-keys
|
||||
, eth-utils
|
||||
, pycryptodome
|
||||
|
|
@ -10,22 +11,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "eth-keyfile";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "eth-keyfile";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk=";
|
||||
hash = "sha256-797yhHuU9/lm96YKxl3SZ5IQAwDxDSYkLkiBdAHh0Uk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'setuptools-markdown'" ""
|
||||
'';
|
||||
build-system = [ setuptools];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
eth-keys
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, asn1tools
|
||||
, coincurve
|
||||
, eth-hash
|
||||
|
|
@ -16,17 +17,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "eth-keys";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "eth-keys";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o=";
|
||||
hash = "sha256-vyyaLCG2uIHXX0t93DmFq8/u0rZL+nsBsH2gfgjziyo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
eth-typing
|
||||
eth-utils
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, eth-hash
|
||||
, eth-utils
|
||||
, hexbytes
|
||||
|
|
@ -11,17 +12,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "eth-rlp";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "eth-rlp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE=";
|
||||
hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hexbytes
|
||||
eth-utils
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
pname = "findpython";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-A2p4QbiOLzckM6WJsfCSGVGXN9KYnrX1Nw1wr7z4R2U=";
|
||||
hash = "sha256-VuUrQJqSvL1JXPmByFrPE387PlHMdptG66IZuxq3Uzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gpsoauth";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SWYXNYrnzK8P4oK9f7bmOiVdWUQHp8WvhNzIS7Y0msg=";
|
||||
hash = "sha256-BA+2aFxpFpi6cWGl4yepba7s7BmZ1ijvSBhtS23v3QM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, eth-utils
|
||||
, hypothesis
|
||||
, pytestCheckHook
|
||||
|
|
@ -9,18 +10,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hexbytes";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "hexbytes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-19oY/VPP6qkxHCkIgpC28fOOYKEYcNbVVGoHJmMmOl8=";
|
||||
hash = "sha256-8st1nQiGApt+aNl8/cftYk0ZzA+MxbLyGi53UWUlAjM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools];
|
||||
|
||||
nativeCheckInputs = [
|
||||
eth-utils
|
||||
hypothesis
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, mpiCheckPhaseHook
|
||||
|
|
@ -44,6 +46,12 @@ buildPythonPackage rec {
|
|||
|
||||
format = "other";
|
||||
|
||||
# https://github.com/NanoComp/meep/issues/2819
|
||||
postPatch = lib.optionalString (!pythonOlder "3.12") ''
|
||||
substituteInPlace configure.ac doc/docs/setup.py python/visualization.py \
|
||||
--replace-fail "distutils" "setuptools._distutils"
|
||||
'';
|
||||
|
||||
# MPI is needed in nativeBuildInputs too, otherwise MPI libs will be missing
|
||||
# at runtime
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -76,6 +84,9 @@ buildPythonPackage rec {
|
|||
cython
|
||||
autograd
|
||||
mpi4py
|
||||
]
|
||||
++ lib.optionals (!pythonOlder "3.12") [
|
||||
setuptools # used in python/visualization.py
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ mpi ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
}: rec {
|
||||
version = "3.7.0";
|
||||
format = "setuptools";
|
||||
version = "3.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrazer";
|
||||
repo = "openrazer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tjVWvJxcZ2maR99VRwMGCa+IK+1CjCc7jxAj4XkDUEw=";
|
||||
hash = "sha256-eV5xDFRQi0m95pL6e2phvblUbh5GEJ1ru1a62TnbGNk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, daemonize
|
||||
, dbus-python
|
||||
, fetchFromGitHub
|
||||
|
|
@ -10,6 +9,7 @@
|
|||
, pygobject3
|
||||
, pyudev
|
||||
, setproctitle
|
||||
, setuptools
|
||||
, wrapGAppsHook
|
||||
, notify2
|
||||
}:
|
||||
|
|
@ -20,17 +20,16 @@ in
|
|||
buildPythonPackage (common // {
|
||||
pname = "openrazer-daemon";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
sourceRoot = "${common.src.name}/daemon";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer"
|
||||
substituteInPlace openrazer_daemon/daemon.py \
|
||||
--replace-fail "plugdev" "openrazer"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
daemonize
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, numpy
|
||||
, openrazer-daemon
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -14,6 +15,8 @@ buildPythonPackage (common // {
|
|||
|
||||
sourceRoot = "${common.src.name}/pylib";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
let
|
||||
pname = "pynitrokey";
|
||||
version = "0.4.46";
|
||||
version = "0.4.47";
|
||||
mainProgram = "nitropy";
|
||||
in
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-y+D90Ja3YkB6WLQuyGOhV56g6ey7iITzNtOCxpRkzXE=";
|
||||
hash = "sha256-WOHDskGAZGhiU48JGV0yDhWIpFELFLHhn9g5sbchKKg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.16.6";
|
||||
version = "0.16.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ITf1uALQ0ZJMeZ4wbC7VqEL9LdoK67vqRpXD6LTWjUE=";
|
||||
hash = "sha256-zfjcXQCXysG+JMw00YES/GQk/yjHH9kCksb9SlZt9wo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, buildPythonPackage
|
||||
, eth-utils
|
||||
, hypothesis
|
||||
|
|
@ -8,20 +9,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rlp";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "pyrlp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY=";
|
||||
hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'setuptools-markdown'" ""
|
||||
'';
|
||||
build-system = [ setuptools];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
eth-utils
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, packaging
|
||||
, prettytable
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, solc
|
||||
, web3
|
||||
, withSolc ? false
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slither-analyzer";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,12 +26,12 @@ buildPythonPackage rec {
|
|||
owner = "crytic";
|
||||
repo = "slither";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MjO2ZYFat+byH0DEt2v/wPXaYL2lmlESgQCZXD4Jpt0=";
|
||||
hash = "sha256-KmbmljtmMtrJxgSMJjQ8fdk6RpEXcAVBuo24EsyMV8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -68,14 +68,19 @@ buildPythonPackage rec {
|
|||
"slither.vyper_parsing"
|
||||
];
|
||||
|
||||
# No Python tests
|
||||
doCheck = false;
|
||||
# Test if the binary works during the build phase.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = slither-analyzer;
|
||||
command = "HOME=$TMPDIR slither --version";
|
||||
};
|
||||
HOME="$TEMP" $out/bin/slither --version
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = slither-analyzer;
|
||||
command = "HOME=$TMPDIR slither --version";
|
||||
version = "${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, packaging
|
||||
, python-socketio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
|
@ -19,6 +20,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
python-socketio
|
||||
python-socketio.optional-dependencies.client
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"version": "1.2.1",
|
||||
"version": "1.2.2",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "1cbsl8s57c2f5bg75gyzh4i4mbalf2clzyw529fgzv4q1zdm5wix"
|
||||
"sha256": "103qjwh3lcckbillx9q5pi0s10xp65vygrwlzhnqbczcxrlsa3d1"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "00128rslq81wlz4ykarlzzbdw4w2cshhsx3qpir3g34cnmqp68h1"
|
||||
"sha256": "0nnv4b2rlnczhxa46n7cif5pxhqj5djzc1063r37z225wxs6lcqm"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "1yk6fqvzh84ikxdm4rkcgpzyn2giq3qxrh3bgp96vip5jklb0d8k"
|
||||
"sha256": "09iizd55k53wpg13yfm2xr2waan9qdkfn5x5v2f5rr1v4l3cj90i"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "0k06vmkirrxbn7rlf03bxadx0gmx9jgx8rj2kdngma30mi9lpdjz"
|
||||
"sha256": "0jgclzd0b36adj187c9qa2y7mkgwpzb1wy5apssdm49ng6b92lbs"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudsmith-cli";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_cli";
|
||||
inherit format version;
|
||||
hash = "sha256-gXbjmnMBx5FuJfWD+jW1KOpNEYit6oqhympN8qwqYlU=";
|
||||
hash = "sha256-MIoRLWk6G8uchQlGOYOsg3XliZ1wMrYSOhAEQrus+fQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deadnix";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astro";
|
||||
repo = "deadnix";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IcxupBqG3/h13sHgNYcO/oHKYfnK1LYd8Ehercz/Z/w=";
|
||||
hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8l4V9AWrBBnEsdZ0Vs4ruPdu+WQVo2ZbJBmhmo23s2g=";
|
||||
cargoHash = "sha256-14onbdsactPJ27GTzG+culsdnwHvGdDXwBD9ZMq192Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find and remove unused code in .nix source files";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-client-cli";
|
||||
version = "1.20.1";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimi";
|
||||
repo = "grpc-client-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r3gbQntlWZ8Y2KiJOVkpzdakKnQUX2NIhk3eAyjnIV4=";
|
||||
sha256 = "sha256-CD+p/Au+MVOV93VPQL2uD8DNKl3XfoJhOjdKcx8DFwQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-23DdG/lLwzpgSRk9S6p1aNMh+AFzhO2qX2EE1EUovz8=";
|
||||
vendorHash = "sha256-e8lz7IrGjx7oXLuNuIhwHW2IP4jfR9XB4HVDjpeH7/w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "generic gRPC command line client";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"name": "mongosh",
|
||||
"version": "2.2.3",
|
||||
"version": "2.2.4",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "mongosh",
|
||||
"version": "2.2.3",
|
||||
"version": "2.2.4",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@mongosh/cli-repl": "2.2.3"
|
||||
"@mongosh/cli-repl": "2.2.4"
|
||||
},
|
||||
"bin": {
|
||||
"mongosh": "bin/mongosh.js"
|
||||
|
|
@ -107,15 +107,15 @@
|
|||
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
|
||||
},
|
||||
"node_modules/@aws-sdk/client-cognito-identity": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.549.0.tgz",
|
||||
"integrity": "sha512-KrmjksANuWZTLx8JGtHXsHJ8bA72DoH5rMXhAUQSeSwGYlJKQWeBN9um4XtOOP6fMO9FtEorsG9cxJRk92M7Yw==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.556.0.tgz",
|
||||
"integrity": "sha512-HWd7PyXCuY1Z9KBaufbzpIvS2QeUAak5wfYwylW2DrEvt6A4tjWCBSbbSXNoawqCv/HitA39v953N/1PojJVVQ==",
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "3.0.0",
|
||||
"@aws-crypto/sha256-js": "3.0.0",
|
||||
"@aws-sdk/client-sts": "3.549.0",
|
||||
"@aws-sdk/core": "3.549.0",
|
||||
"@aws-sdk/credential-provider-node": "3.549.0",
|
||||
"@aws-sdk/client-sts": "3.556.0",
|
||||
"@aws-sdk/core": "3.556.0",
|
||||
"@aws-sdk/credential-provider-node": "3.556.0",
|
||||
"@aws-sdk/middleware-host-header": "3.535.0",
|
||||
"@aws-sdk/middleware-logger": "3.535.0",
|
||||
"@aws-sdk/middleware-recursion-detection": "3.535.0",
|
||||
|
|
@ -126,26 +126,26 @@
|
|||
"@aws-sdk/util-user-agent-browser": "3.535.0",
|
||||
"@aws-sdk/util-user-agent-node": "3.535.0",
|
||||
"@smithy/config-resolver": "^2.2.0",
|
||||
"@smithy/core": "^1.4.1",
|
||||
"@smithy/core": "^1.4.2",
|
||||
"@smithy/fetch-http-handler": "^2.5.0",
|
||||
"@smithy/hash-node": "^2.2.0",
|
||||
"@smithy/invalid-dependency": "^2.2.0",
|
||||
"@smithy/middleware-content-length": "^2.2.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.0",
|
||||
"@smithy/middleware-retry": "^2.3.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.1",
|
||||
"@smithy/middleware-retry": "^2.3.1",
|
||||
"@smithy/middleware-serde": "^2.3.0",
|
||||
"@smithy/middleware-stack": "^2.2.0",
|
||||
"@smithy/node-config-provider": "^2.3.0",
|
||||
"@smithy/node-http-handler": "^2.5.0",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"@smithy/url-parser": "^2.2.0",
|
||||
"@smithy/util-base64": "^2.3.0",
|
||||
"@smithy/util-body-length-browser": "^2.2.0",
|
||||
"@smithy/util-body-length-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.0",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.1",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.1",
|
||||
"@smithy/util-endpoints": "^1.2.0",
|
||||
"@smithy/util-middleware": "^2.2.0",
|
||||
"@smithy/util-retry": "^2.2.0",
|
||||
|
|
@ -157,13 +157,13 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/client-sso": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.549.0.tgz",
|
||||
"integrity": "sha512-lz+yflOAj5Q263FlCsKpNqttaCb2NPh8jC76gVCqCt7TPxRDBYVaqg0OZYluDaETIDNJi4DwN2Azcck7ilwuPw==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.556.0.tgz",
|
||||
"integrity": "sha512-unXdWS7uvHqCcOyC1de+Fr8m3F2vMg2m24GPea0bg7rVGTYmiyn9mhUX11VCt+ozydrw+F50FQwL6OqoqPocmw==",
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "3.0.0",
|
||||
"@aws-crypto/sha256-js": "3.0.0",
|
||||
"@aws-sdk/core": "3.549.0",
|
||||
"@aws-sdk/core": "3.556.0",
|
||||
"@aws-sdk/middleware-host-header": "3.535.0",
|
||||
"@aws-sdk/middleware-logger": "3.535.0",
|
||||
"@aws-sdk/middleware-recursion-detection": "3.535.0",
|
||||
|
|
@ -174,26 +174,26 @@
|
|||
"@aws-sdk/util-user-agent-browser": "3.535.0",
|
||||
"@aws-sdk/util-user-agent-node": "3.535.0",
|
||||
"@smithy/config-resolver": "^2.2.0",
|
||||
"@smithy/core": "^1.4.1",
|
||||
"@smithy/core": "^1.4.2",
|
||||
"@smithy/fetch-http-handler": "^2.5.0",
|
||||
"@smithy/hash-node": "^2.2.0",
|
||||
"@smithy/invalid-dependency": "^2.2.0",
|
||||
"@smithy/middleware-content-length": "^2.2.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.0",
|
||||
"@smithy/middleware-retry": "^2.3.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.1",
|
||||
"@smithy/middleware-retry": "^2.3.1",
|
||||
"@smithy/middleware-serde": "^2.3.0",
|
||||
"@smithy/middleware-stack": "^2.2.0",
|
||||
"@smithy/node-config-provider": "^2.3.0",
|
||||
"@smithy/node-http-handler": "^2.5.0",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"@smithy/url-parser": "^2.2.0",
|
||||
"@smithy/util-base64": "^2.3.0",
|
||||
"@smithy/util-body-length-browser": "^2.2.0",
|
||||
"@smithy/util-body-length-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.0",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.1",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.1",
|
||||
"@smithy/util-endpoints": "^1.2.0",
|
||||
"@smithy/util-middleware": "^2.2.0",
|
||||
"@smithy/util-retry": "^2.2.0",
|
||||
|
|
@ -205,14 +205,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/client-sso-oidc": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.549.0.tgz",
|
||||
"integrity": "sha512-FbB4A78ILAb8sM4TfBd+3CrQcfZIhe0gtVZNbaxpq5cJZh1K7oZ8vPfKw4do9JWkDUXPLsD9Bwz12f8/JpAb6Q==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.556.0.tgz",
|
||||
"integrity": "sha512-AXKd2TB6nNrksu+OfmHl8uI07PdgzOo4o8AxoRO8SHlwoMAGvcT9optDGVSYoVfgOKTymCoE7h8/UoUfPc11wQ==",
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "3.0.0",
|
||||
"@aws-crypto/sha256-js": "3.0.0",
|
||||
"@aws-sdk/client-sts": "3.549.0",
|
||||
"@aws-sdk/core": "3.549.0",
|
||||
"@aws-sdk/client-sts": "3.556.0",
|
||||
"@aws-sdk/core": "3.556.0",
|
||||
"@aws-sdk/middleware-host-header": "3.535.0",
|
||||
"@aws-sdk/middleware-logger": "3.535.0",
|
||||
"@aws-sdk/middleware-recursion-detection": "3.535.0",
|
||||
|
|
@ -223,26 +223,26 @@
|
|||
"@aws-sdk/util-user-agent-browser": "3.535.0",
|
||||
"@aws-sdk/util-user-agent-node": "3.535.0",
|
||||
"@smithy/config-resolver": "^2.2.0",
|
||||
"@smithy/core": "^1.4.1",
|
||||
"@smithy/core": "^1.4.2",
|
||||
"@smithy/fetch-http-handler": "^2.5.0",
|
||||
"@smithy/hash-node": "^2.2.0",
|
||||
"@smithy/invalid-dependency": "^2.2.0",
|
||||
"@smithy/middleware-content-length": "^2.2.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.0",
|
||||
"@smithy/middleware-retry": "^2.3.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.1",
|
||||
"@smithy/middleware-retry": "^2.3.1",
|
||||
"@smithy/middleware-serde": "^2.3.0",
|
||||
"@smithy/middleware-stack": "^2.2.0",
|
||||
"@smithy/node-config-provider": "^2.3.0",
|
||||
"@smithy/node-http-handler": "^2.5.0",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"@smithy/url-parser": "^2.2.0",
|
||||
"@smithy/util-base64": "^2.3.0",
|
||||
"@smithy/util-body-length-browser": "^2.2.0",
|
||||
"@smithy/util-body-length-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.0",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.1",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.1",
|
||||
"@smithy/util-endpoints": "^1.2.0",
|
||||
"@smithy/util-middleware": "^2.2.0",
|
||||
"@smithy/util-retry": "^2.2.0",
|
||||
|
|
@ -253,17 +253,17 @@
|
|||
"node": ">=14.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@aws-sdk/credential-provider-node": "^3.549.0"
|
||||
"@aws-sdk/credential-provider-node": "^3.556.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/client-sts": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.549.0.tgz",
|
||||
"integrity": "sha512-63IreJ598Dzvpb+6sy81KfIX5iQxnrWSEtlyeCdC2GO6gmSQVwJzc9kr5pAC83lHmlZcm/Q3KZr3XBhRQqP0og==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.556.0.tgz",
|
||||
"integrity": "sha512-TsK3js7Suh9xEmC886aY+bv0KdLLYtzrcmVt6sJ/W6EnDXYQhBuKYFhp03NrN2+vSvMGpqJwR62DyfKe1G0QzQ==",
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "3.0.0",
|
||||
"@aws-crypto/sha256-js": "3.0.0",
|
||||
"@aws-sdk/core": "3.549.0",
|
||||
"@aws-sdk/core": "3.556.0",
|
||||
"@aws-sdk/middleware-host-header": "3.535.0",
|
||||
"@aws-sdk/middleware-logger": "3.535.0",
|
||||
"@aws-sdk/middleware-recursion-detection": "3.535.0",
|
||||
|
|
@ -274,26 +274,26 @@
|
|||
"@aws-sdk/util-user-agent-browser": "3.535.0",
|
||||
"@aws-sdk/util-user-agent-node": "3.535.0",
|
||||
"@smithy/config-resolver": "^2.2.0",
|
||||
"@smithy/core": "^1.4.1",
|
||||
"@smithy/core": "^1.4.2",
|
||||
"@smithy/fetch-http-handler": "^2.5.0",
|
||||
"@smithy/hash-node": "^2.2.0",
|
||||
"@smithy/invalid-dependency": "^2.2.0",
|
||||
"@smithy/middleware-content-length": "^2.2.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.0",
|
||||
"@smithy/middleware-retry": "^2.3.0",
|
||||
"@smithy/middleware-endpoint": "^2.5.1",
|
||||
"@smithy/middleware-retry": "^2.3.1",
|
||||
"@smithy/middleware-serde": "^2.3.0",
|
||||
"@smithy/middleware-stack": "^2.2.0",
|
||||
"@smithy/node-config-provider": "^2.3.0",
|
||||
"@smithy/node-http-handler": "^2.5.0",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"@smithy/url-parser": "^2.2.0",
|
||||
"@smithy/util-base64": "^2.3.0",
|
||||
"@smithy/util-body-length-browser": "^2.2.0",
|
||||
"@smithy/util-body-length-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.0",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.0",
|
||||
"@smithy/util-defaults-mode-browser": "^2.2.1",
|
||||
"@smithy/util-defaults-mode-node": "^2.3.1",
|
||||
"@smithy/util-endpoints": "^1.2.0",
|
||||
"@smithy/util-middleware": "^2.2.0",
|
||||
"@smithy/util-retry": "^2.2.0",
|
||||
|
|
@ -304,18 +304,18 @@
|
|||
"node": ">=14.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@aws-sdk/credential-provider-node": "^3.549.0"
|
||||
"@aws-sdk/credential-provider-node": "^3.556.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/core": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.549.0.tgz",
|
||||
"integrity": "sha512-jC61OxJn72r/BbuDRCcluiw05Xw9eVLG0CwxQpF3RocxfxyZqlrGYaGecZ8Wy+7g/3sqGRC/Ar5eUhU1YcLx7w==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.556.0.tgz",
|
||||
"integrity": "sha512-vJaSaHw2kPQlo11j/Rzuz0gk1tEaKdz+2ser0f0qZ5vwFlANjt08m/frU17ctnVKC1s58bxpctO/1P894fHLrA==",
|
||||
"dependencies": {
|
||||
"@smithy/core": "^1.4.1",
|
||||
"@smithy/core": "^1.4.2",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/signature-v4": "^2.2.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/signature-v4": "^2.3.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"fast-xml-parser": "4.2.5",
|
||||
"tslib": "^2.6.2"
|
||||
|
|
@ -325,11 +325,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-cognito-identity": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.549.0.tgz",
|
||||
"integrity": "sha512-EADYw4JimdZ3mGhxtAXSdARNunw/4T7Vd82vvsvqavqL3S9jt5+2SrZ2/PYrweJHLRFggMHcBs82FRql1efMaA==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.556.0.tgz",
|
||||
"integrity": "sha512-PKYBjfpLHJZhrIv0M9eJ47yeDaV8NUMVe4vsiHG5tvlvwWGP84k9GJlr51U/s84OzIyXzVpiqP8PU5yKovUFIg==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-cognito-identity": "3.549.0",
|
||||
"@aws-sdk/client-cognito-identity": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
"@smithy/types": "^2.12.0",
|
||||
|
|
@ -354,16 +354,16 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-http": {
|
||||
"version": "3.535.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz",
|
||||
"integrity": "sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw==",
|
||||
"version": "3.552.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.552.0.tgz",
|
||||
"integrity": "sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/fetch-http-handler": "^2.5.0",
|
||||
"@smithy/node-http-handler": "^2.5.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
"@smithy/protocol-http": "^3.3.0",
|
||||
"@smithy/smithy-client": "^2.5.0",
|
||||
"@smithy/smithy-client": "^2.5.1",
|
||||
"@smithy/types": "^2.12.0",
|
||||
"@smithy/util-stream": "^2.2.0",
|
||||
"tslib": "^2.6.2"
|
||||
|
|
@ -373,15 +373,15 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-ini": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.549.0.tgz",
|
||||
"integrity": "sha512-k6IIrluZjQpzui5Din8fW3bFFhHaJ64XrsfYx0Ks1mb7xan84dJxmYP3tdDDmLzUeJv5h95ag88taHfjY9rakA==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.556.0.tgz",
|
||||
"integrity": "sha512-0Nz4ErOlXhe3muxWYMbPwRMgfKmVbBp36BAE2uv/z5wTbfdBkcgUwaflEvlKCLUTdHzuZsQk+BFS/gVyaUeOuA==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-sts": "3.549.0",
|
||||
"@aws-sdk/client-sts": "3.556.0",
|
||||
"@aws-sdk/credential-provider-env": "3.535.0",
|
||||
"@aws-sdk/credential-provider-process": "3.535.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.549.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.549.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.556.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/credential-provider-imds": "^2.3.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
|
|
@ -394,16 +394,16 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-node": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.549.0.tgz",
|
||||
"integrity": "sha512-f3YgalsMuywEAVX4AUm9tojqrBdfpAac0+D320ePzas0Ntbp7ItYu9ceKIhgfzXO3No7P3QK0rCrOxL+ABTn8Q==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.556.0.tgz",
|
||||
"integrity": "sha512-s1xVtKjyGc60O8qcNIzS1X3H+pWEwEfZ7TgNznVDNyuXvLrlNWiAcigPWGl2aAkc8tGcsSG0Qpyw2KYC939LFg==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/credential-provider-env": "3.535.0",
|
||||
"@aws-sdk/credential-provider-http": "3.535.0",
|
||||
"@aws-sdk/credential-provider-ini": "3.549.0",
|
||||
"@aws-sdk/credential-provider-http": "3.552.0",
|
||||
"@aws-sdk/credential-provider-ini": "3.556.0",
|
||||
"@aws-sdk/credential-provider-process": "3.535.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.549.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.549.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.556.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/credential-provider-imds": "^2.3.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
|
|
@ -431,12 +431,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-sso": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.549.0.tgz",
|
||||
"integrity": "sha512-BGopRKHs7W8zkoH8qmSHrjudj263kXbhVkAUPxVUz0I28+CZNBgJC/RfVCbOpzmysIQEpwSqvOv1y0k+DQzIJQ==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.556.0.tgz",
|
||||
"integrity": "sha512-ETuBgcnpfxqadEAqhQFWpKoV1C/NAgvs5CbBc5EJbelJ8f4prTdErIHjrRtVT8c02MXj92QwczsiNYd5IoOqyw==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-sso": "3.549.0",
|
||||
"@aws-sdk/token-providers": "3.549.0",
|
||||
"@aws-sdk/client-sso": "3.556.0",
|
||||
"@aws-sdk/token-providers": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
"@smithy/shared-ini-file-loader": "^2.4.0",
|
||||
|
|
@ -448,11 +448,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-provider-web-identity": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.549.0.tgz",
|
||||
"integrity": "sha512-QzclVXPxuwSI7515l34sdvliVq5leroO8P7RQFKRgfyQKO45o1psghierwG3PgV6jlMiv78FIAGJBr/n4qZ7YA==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.556.0.tgz",
|
||||
"integrity": "sha512-R/YAL8Uh8i+dzVjzMnbcWLIGeeRi2mioHVGnVF+minmaIkCiQMZg2HPrdlKm49El+RljT28Nl5YHRuiqzEIwMA==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-sts": "3.549.0",
|
||||
"@aws-sdk/client-sts": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
"@smithy/types": "^2.12.0",
|
||||
|
|
@ -463,21 +463,21 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/credential-providers": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.549.0.tgz",
|
||||
"integrity": "sha512-icbw8zCX2eSGPGBZLD6HKSgUMnpL95KzUikr94sVN81UuP1EnueaWj6gnErqP2Dr05ZEF9wMZxwd91qu8kVTNw==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.556.0.tgz",
|
||||
"integrity": "sha512-CnWP/AEF+sPeO8fabrHy4Oeo52xDFuDQMpjKcI7oJzGF6Ne2ZPTq6wTJQPLeXeg4OzLcK0tT3G4z/27MLdsLsw==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-cognito-identity": "3.549.0",
|
||||
"@aws-sdk/client-sso": "3.549.0",
|
||||
"@aws-sdk/client-sts": "3.549.0",
|
||||
"@aws-sdk/credential-provider-cognito-identity": "3.549.0",
|
||||
"@aws-sdk/client-cognito-identity": "3.556.0",
|
||||
"@aws-sdk/client-sso": "3.556.0",
|
||||
"@aws-sdk/client-sts": "3.556.0",
|
||||
"@aws-sdk/credential-provider-cognito-identity": "3.556.0",
|
||||
"@aws-sdk/credential-provider-env": "3.535.0",
|
||||
"@aws-sdk/credential-provider-http": "3.535.0",
|
||||
"@aws-sdk/credential-provider-ini": "3.549.0",
|
||||
"@aws-sdk/credential-provider-node": "3.549.0",
|
||||
"@aws-sdk/credential-provider-http": "3.552.0",
|
||||
"@aws-sdk/credential-provider-ini": "3.556.0",
|
||||
"@aws-sdk/credential-provider-node": "3.556.0",
|
||||
"@aws-sdk/credential-provider-process": "3.535.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.549.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.549.0",
|
||||
"@aws-sdk/credential-provider-sso": "3.556.0",
|
||||
"@aws-sdk/credential-provider-web-identity": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/credential-provider-imds": "^2.3.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
|
|
@ -561,11 +561,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@aws-sdk/token-providers": {
|
||||
"version": "3.549.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.549.0.tgz",
|
||||
"integrity": "sha512-rJyeXkXknLukRFGuMQOgKnPBa+kLODJtOqEBf929SpQ96f1I6ytdndmWbB5B/OQN5Fu5DOOQUQqJypDQVl5ibQ==",
|
||||
"version": "3.556.0",
|
||||
"resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.556.0.tgz",
|
||||
"integrity": "sha512-tvIiugNF0/+2wfuImMrpKjXMx4nCnFWQjQvouObny+wrif/PGqqQYrybwxPJDvzbd965bu1I+QuSv85/ug7xsg==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-sso-oidc": "3.549.0",
|
||||
"@aws-sdk/client-sso-oidc": "3.556.0",
|
||||
"@aws-sdk/types": "3.535.0",
|
||||
"@smithy/property-provider": "^2.2.0",
|
||||
"@smithy/shared-ini-file-loader": "^2.4.0",
|
||||
|
|
@ -1153,12 +1153,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/arg-parser": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.3.tgz",
|
||||
"integrity": "sha512-ugyyO8PJP7OLCFJzvl5Fm18ijUzzCUo5YZ9uHFzF4xP+rOgJ5Tm65tiIvmfVdb5J4ssFkvpErrlI/1TLja+JGg==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.4.tgz",
|
||||
"integrity": "sha512-pgLWPGPcYpZT3uZSeFB/HglFUYAsQgaKZTwuc+lQcyZxvrQZ+VeIhB4MREE/sbXpUowKtbfQXghXw09DwDd/uw==",
|
||||
"dependencies": {
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/i18n": "2.2.3",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/i18n": "2.2.4",
|
||||
"mongodb-connection-string-url": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1166,9 +1166,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/async-rewriter2": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.3.tgz",
|
||||
"integrity": "sha512-L0++OlTlg6g57wXcurwGbX3uD/EFuEne+ID16i0NJiaJ6CL/zW9h0FnbYC8yINmt4KdsrBh8BGiMbvAh3kcMgw==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.4.tgz",
|
||||
"integrity": "sha512-CjIZbzu72ai2yby6uymFwO/bgR0Nst3Q8Etfn7dukIDInpD/4OobQZZKY5IVah3BLFHVICJTg9S956EbLlmgbA==",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.22.8",
|
||||
"@babel/plugin-transform-destructuring": "^7.22.5",
|
||||
|
|
@ -1185,12 +1185,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/autocomplete": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.3.tgz",
|
||||
"integrity": "sha512-D42rGoxIXdIS2AayRk15lNHlsJu9eO1BavXVW9sLj7gFtSHP8TdtJU4Qpm6EyWJfILXx6a5SePoKE//TnlIg7Q==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.4.tgz",
|
||||
"integrity": "sha512-ZhfWGe2Vz7AiTnd8LKINeFZj3kc9HiRi9BmXK73zQQkJeV33KmDK7qeBS8kUbGwpZKj1pWtFdrBixpJ2ZivqHw==",
|
||||
"dependencies": {
|
||||
"@mongodb-js/mongodb-constants": "^0.8.10",
|
||||
"@mongosh/shell-api": "2.2.3",
|
||||
"@mongosh/shell-api": "2.2.4",
|
||||
"semver": "^7.5.4"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1198,25 +1198,25 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/cli-repl": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.3.tgz",
|
||||
"integrity": "sha512-N012EfVz3zeSv/pftYjdmjVisLllVBxhltAFpuDc7vhmr704vW9g8OIYK6NzojoVqCRFzKDzBwVqjXwbFavQOg==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.4.tgz",
|
||||
"integrity": "sha512-NawHTDmxkQIbhRtS7LZbHX3WLWgHe1ADH+JCiPdSHda39t8XYdIXLys8nBbH7NH6cQqsKXlMRAoggVY2zK1dWQ==",
|
||||
"dependencies": {
|
||||
"@mongosh/arg-parser": "2.2.3",
|
||||
"@mongosh/autocomplete": "2.2.3",
|
||||
"@mongosh/editor": "2.2.3",
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/history": "2.2.3",
|
||||
"@mongosh/i18n": "2.2.3",
|
||||
"@mongosh/import-node-fetch": "2.2.3",
|
||||
"@mongosh/js-multiline-to-singleline": "2.2.3",
|
||||
"@mongosh/logging": "2.2.3",
|
||||
"@mongosh/service-provider-core": "2.2.3",
|
||||
"@mongosh/service-provider-server": "2.2.3",
|
||||
"@mongosh/shell-api": "2.2.3",
|
||||
"@mongosh/shell-evaluator": "2.2.3",
|
||||
"@mongosh/snippet-manager": "2.2.3",
|
||||
"@mongosh/types": "2.2.3",
|
||||
"@mongosh/arg-parser": "2.2.4",
|
||||
"@mongosh/autocomplete": "2.2.4",
|
||||
"@mongosh/editor": "2.2.4",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/history": "2.2.4",
|
||||
"@mongosh/i18n": "2.2.4",
|
||||
"@mongosh/import-node-fetch": "2.2.4",
|
||||
"@mongosh/js-multiline-to-singleline": "2.2.4",
|
||||
"@mongosh/logging": "2.2.4",
|
||||
"@mongosh/service-provider-core": "2.2.4",
|
||||
"@mongosh/service-provider-server": "2.2.4",
|
||||
"@mongosh/shell-api": "2.2.4",
|
||||
"@mongosh/shell-evaluator": "2.2.4",
|
||||
"@mongosh/snippet-manager": "2.2.4",
|
||||
"@mongosh/types": "2.2.4",
|
||||
"@segment/analytics-node": "^1.3.0",
|
||||
"ansi-escape-sequences": "^5.1.2",
|
||||
"askcharacter": "^1.0.0",
|
||||
|
|
@ -1241,39 +1241,40 @@
|
|||
},
|
||||
"optionalDependencies": {
|
||||
"get-console-process-list": "^1.0.4",
|
||||
"glibc-version": "^1.0.0",
|
||||
"macos-export-certificate-and-key": "^1.1.1",
|
||||
"mongodb-crypt-library-version": "^1.0.3",
|
||||
"win-export-certificate-and-key": "^1.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@mongosh/editor": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.3.tgz",
|
||||
"integrity": "sha512-Fb0SysYxG5GyTp2BLeRcPDcqCwtyaY+lvUaA08jR6EYdIQ/P3diJ2/2zpY7kas3hIzMdCIcdDUFHp+bqK6eqnA==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.4.tgz",
|
||||
"integrity": "sha512-mv00Y2jve+xoGKX4eFMEDi0ts/wMPpy9PpyIP8T2R+/QxK05XvR3+yG+EnENWxbfdgXG0vQplhPmb0kAOYRbOA==",
|
||||
"dependencies": {
|
||||
"@mongosh/js-multiline-to-singleline": "2.2.3",
|
||||
"@mongosh/service-provider-core": "2.2.3",
|
||||
"@mongosh/shell-api": "2.2.3",
|
||||
"@mongosh/shell-evaluator": "2.2.3",
|
||||
"@mongosh/types": "2.2.3",
|
||||
"js-beautify": "^1.14.0"
|
||||
"@mongosh/js-multiline-to-singleline": "2.2.4",
|
||||
"@mongosh/service-provider-core": "2.2.4",
|
||||
"@mongosh/shell-api": "2.2.4",
|
||||
"@mongosh/shell-evaluator": "2.2.4",
|
||||
"@mongosh/types": "2.2.4",
|
||||
"js-beautify": "^1.15.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16.15.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@mongosh/errors": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.3.tgz",
|
||||
"integrity": "sha512-N0t/m9EWjwsC/a893/w/NGiHsP81GKtjoqw6rZ20wIzzcC0II9DgSKMes/BuNyVCKEWX25xTjZXCDGemYclLbg==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.4.tgz",
|
||||
"integrity": "sha512-5fjnXLZMFWKQSiPUivNSWLqsZ24GVqOfulAerByjmzRoeOi5hDV3MEvQmQvOxYa9Q65vhH4jEJTlrBlhy7H70Q==",
|
||||
"engines": {
|
||||
"node": ">=14.15.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@mongosh/history": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.3.tgz",
|
||||
"integrity": "sha512-y+OoUml8gv1nyLT4XxfgHw643VUuLCN6+2Qh+ZRBsNWhQ3GUIuIJziW3+MnlkNA8srEd3E1qodV6bNXlOe/sug==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.4.tgz",
|
||||
"integrity": "sha512-SRsRitYZuRyxVPmpT5AFCiqhcjRrMxCjVOBxu1nzimfaS9B5n10+Lr585uEtY+kUrnqToQ6HTqHRR01lXzrq0g==",
|
||||
"dependencies": {
|
||||
"mongodb-connection-string-url": "^3.0.0",
|
||||
"mongodb-redact": "^0.2.2"
|
||||
|
|
@ -1283,20 +1284,20 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/i18n": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.3.tgz",
|
||||
"integrity": "sha512-m3mVLMbt/qfjnvXUZszcvnbGt1cBBB2WMna5Vk92K7wEWY7xtrojAq4TQPzKlHLmSP12I2uUWbtSKosOHCWSwg==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.4.tgz",
|
||||
"integrity": "sha512-J93D75B8GD9MVQaTyKiJNcgjsq32DrHCBQ5N/u3E/HusCAR/XJ+9IWGkE8rW1Nnwx8RGvFi12UOxbC6UDkDMlQ==",
|
||||
"dependencies": {
|
||||
"@mongosh/errors": "2.2.3"
|
||||
"@mongosh/errors": "2.2.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.15.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@mongosh/import-node-fetch": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.3.tgz",
|
||||
"integrity": "sha512-w7nW4GCgvjfgxIZMk7708MOB/udRvHjLMfQTxYPUr4uRT6zZeOO5od0AXsvlqz6dvupcyjFJyDJoR9CVoYDpEA==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.4.tgz",
|
||||
"integrity": "sha512-cRTx3OPlvZDwUFziEgJIY/j5sUWykqI3MhFr0grPWK8uyKHjpaM3jPa++KYdPPy/NiE+payZh5XMBBbESmh1mg==",
|
||||
"dependencies": {
|
||||
"node-fetch": "^3.3.2"
|
||||
},
|
||||
|
|
@ -1305,9 +1306,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/js-multiline-to-singleline": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.3.tgz",
|
||||
"integrity": "sha512-M/lU0KRoF/n6vVX21z1cCjsoGM5i9Ty1fZ8QlSZKRsvH4M1H1fZyXvx0eYl2nFq1xb9dU55z8QGs2QlnZMmC9g==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.4.tgz",
|
||||
"integrity": "sha512-uki9gdwrvwSfSw2QNDqcIKxwDdqp6clbYQhVm8eOnAmEJc9UoiGr8kTvDblQFOjkjbXxhbnvgDaZ8YgcqNFt9w==",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.16.12",
|
||||
"@babel/types": "^7.21.2"
|
||||
|
|
@ -1317,14 +1318,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/logging": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.3.tgz",
|
||||
"integrity": "sha512-dhD2W1seSeexh+r0pxWW/+42hyfDsKTUQTgnCFchiZQmm25IVENZOhWCaBPZ8zgIkvPb4b6QswSNgdo4y05RSw==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.4.tgz",
|
||||
"integrity": "sha512-yzwgpjDSqqiS4wuWROhHsAQiZZimZ0jddlASfeezVz6R+oKgl336W1yafuAbMLJqqSDFEunlaRmbXwkjSfxP8Q==",
|
||||
"dependencies": {
|
||||
"@mongodb-js/devtools-connect": "^2.6.0",
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/history": "2.2.3",
|
||||
"@mongosh/types": "2.2.3",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/history": "2.2.4",
|
||||
"@mongosh/types": "2.2.4",
|
||||
"mongodb-log-writer": "^1.4.0",
|
||||
"mongodb-redact": "^0.2.2"
|
||||
},
|
||||
|
|
@ -1333,12 +1334,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/service-provider-core": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.3.tgz",
|
||||
"integrity": "sha512-9HOnVXrxPER1QzTwqPFj4srQd4UV4vGf4Y3f4igTAOpzdedlhLm5eDQQBLLQqpYNPbiKt1jPF7dg5EKX/hj+8g==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.4.tgz",
|
||||
"integrity": "sha512-C8MtEj8ZsgpbBWghzYdSB9dcnTbZz6DE+cmdECHfFVROUGH+ZVoxftOVRq7/lguLjTDQ4hOxcXukh2cF8SvOyg==",
|
||||
"dependencies": {
|
||||
"@aws-sdk/credential-providers": "^3.525.0",
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"bson": "^6.5.0",
|
||||
"mongodb": "^6.5.0",
|
||||
"mongodb-build-info": "^1.7.1"
|
||||
|
|
@ -1351,15 +1352,15 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/service-provider-server": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.3.tgz",
|
||||
"integrity": "sha512-j+8fy93qiyEpKvi7/6RfKFJ0RpGgjclH/XF18Ujbbl4wX6GBoF6Ls0TGWLAh5MQ6jJsSwQ4lYqLhjCUhx5IYHw==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.4.tgz",
|
||||
"integrity": "sha512-G39TiYp1Fqp97s01PiQyoo6yU//SFpNssKuvf79Y8WmbkvIEtMvW4d1pVrrs5OudgF155clFG/M7d2Tl4S4RUA==",
|
||||
"dependencies": {
|
||||
"@mongodb-js/devtools-connect": "^2.6.0",
|
||||
"@mongodb-js/oidc-plugin": "^0.4.0",
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/service-provider-core": "2.2.3",
|
||||
"@mongosh/types": "2.2.3",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/service-provider-core": "2.2.4",
|
||||
"@mongosh/types": "2.2.4",
|
||||
"@types/sinon-chai": "^3.2.4",
|
||||
"aws4": "^1.12.0",
|
||||
"mongodb": "^6.5.0",
|
||||
|
|
@ -1375,15 +1376,15 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/shell-api": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.3.tgz",
|
||||
"integrity": "sha512-zIvFpVd2jKzH+0zYJSosGU1neSjokkJVOgL8HteCBwlG6OODMHARyJsR7dyrC/GZ11st6NS/fYHZl9yz4LFs6A==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.4.tgz",
|
||||
"integrity": "sha512-KvSpGppwHv6HfV7W4LTRZY1gFK6J/yE0td2E52FW+B/MAnWAAyJz85nWjGEOpT/FnsZrqC7DV+a1JVpXOcvnVA==",
|
||||
"dependencies": {
|
||||
"@mongosh/arg-parser": "2.2.3",
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/history": "2.2.3",
|
||||
"@mongosh/i18n": "2.2.3",
|
||||
"@mongosh/service-provider-core": "2.2.3",
|
||||
"@mongosh/arg-parser": "2.2.4",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/history": "2.2.4",
|
||||
"@mongosh/i18n": "2.2.4",
|
||||
"@mongosh/service-provider-core": "2.2.4",
|
||||
"mongodb-redact": "^0.2.2"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1391,27 +1392,27 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/shell-evaluator": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.3.tgz",
|
||||
"integrity": "sha512-iplqy0C7iALdfBkCLDhetbVhaek09nRIijcLndt+JuFq1UngEypffZqxF16urHmMsYcL1rD/BPWcEPx0IvfVaQ==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.4.tgz",
|
||||
"integrity": "sha512-v5HTxC+0l+msdjNtaS9IiG1zfr/YL7nYBs/Hc4HkpbBa+LrnoorQbfTa0SIB7jBGkc2HnyswkSu5Wc6X0WQxdQ==",
|
||||
"dependencies": {
|
||||
"@mongosh/async-rewriter2": "2.2.3",
|
||||
"@mongosh/history": "2.2.3",
|
||||
"@mongosh/shell-api": "2.2.3"
|
||||
"@mongosh/async-rewriter2": "2.2.4",
|
||||
"@mongosh/history": "2.2.4",
|
||||
"@mongosh/shell-api": "2.2.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.15.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@mongosh/snippet-manager": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.3.tgz",
|
||||
"integrity": "sha512-4f65ORDa4eDWsIRu19lXer5b/Gjjv09Bxg41w2T0ZcKtdYxM5kwdm4e6GsCOR5dfA8cnjUbEXFnYr857dfNpYQ==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.4.tgz",
|
||||
"integrity": "sha512-Q043qO5cP3YMv3zpYUYUZCXogUbBioIfgMzOCCYMfWOXntJmPK0AwCZurQVjdA08tsznrYPa3rwX64amTHyj+A==",
|
||||
"dependencies": {
|
||||
"@mongosh/errors": "2.2.3",
|
||||
"@mongosh/import-node-fetch": "2.2.3",
|
||||
"@mongosh/shell-api": "2.2.3",
|
||||
"@mongosh/types": "2.2.3",
|
||||
"@mongosh/errors": "2.2.4",
|
||||
"@mongosh/import-node-fetch": "2.2.4",
|
||||
"@mongosh/shell-api": "2.2.4",
|
||||
"@mongosh/types": "2.2.4",
|
||||
"bson": "^6.5.0",
|
||||
"cross-spawn": "^7.0.3",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
|
|
@ -1423,9 +1424,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@mongosh/types": {
|
||||
"version": "2.2.3",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.3.tgz",
|
||||
"integrity": "sha512-rUp+LyA6llNbeTRZQTWuiSbjwktpjQQcDmG31lKwYlpxTYT84GEnqkj2ltsuMGpVE8QKEFfJsbKfQpvvYoSpJQ==",
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.4.tgz",
|
||||
"integrity": "sha512-FN6VHcmLXPWmE08EAdQOeDhHSZYGP0iVKANOZpI2ncXChEiOVVU2Z8x2fHIXksPsb0gxzv1+NOagpzjg6YuyOg==",
|
||||
"dependencies": {
|
||||
"@mongodb-js/devtools-connect": "^2.6.0"
|
||||
},
|
||||
|
|
@ -1819,9 +1820,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@smithy/signature-v4": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-2.2.1.tgz",
|
||||
"integrity": "sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw==",
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz",
|
||||
"integrity": "sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q==",
|
||||
"dependencies": {
|
||||
"@smithy/is-array-buffer": "^2.2.0",
|
||||
"@smithy/types": "^2.12.0",
|
||||
|
|
@ -2480,9 +2481,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001605",
|
||||
"resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz",
|
||||
"integrity": "sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ=="
|
||||
"version": "1.0.30001610",
|
||||
"resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz",
|
||||
"integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA=="
|
||||
},
|
||||
"node_modules/chalk": {
|
||||
"version": "2.4.2",
|
||||
|
|
@ -2747,9 +2748,9 @@
|
|||
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
|
||||
},
|
||||
"node_modules/electron-to-chromium": {
|
||||
"version": "1.4.728",
|
||||
"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.728.tgz",
|
||||
"integrity": "sha512-Ud1v7hJJYIqehlUJGqR6PF1Ek8l80zWwxA6nGxigBsGJ9f9M2fciHyrIiNMerSHSH3p+0/Ia7jIlnDkt41h5cw=="
|
||||
"version": "1.4.739",
|
||||
"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.739.tgz",
|
||||
"integrity": "sha512-koRkawXOuN9w/ymhTNxGfB8ta4MRKVW0nzifU17G1UwTWlBg0vv7xnz4nxDnRFSBe9nXMGRgICcAzqXc0PmLeA=="
|
||||
},
|
||||
"node_modules/emoji-regex": {
|
||||
"version": "9.2.2",
|
||||
|
|
@ -3187,6 +3188,29 @@
|
|||
"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/glibc-version": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmmirror.com/glibc-version/-/glibc-version-1.0.1.tgz",
|
||||
"integrity": "sha512-DHPD6Z5wY3ga11O3Izx3JSLDZve0SdRN4nAHC1XtagIjcwHk1OuseZpDr+VWPuTfoDn9H3mHtlKn2+7369raRQ==",
|
||||
"hasInstallScript": true,
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
"bindings": "^1.5.0",
|
||||
"node-addon-api": "^8.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"glibc-version": "bin/glibc-version.js"
|
||||
}
|
||||
},
|
||||
"node_modules/glibc-version/node_modules/node-addon-api": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-8.0.0.tgz",
|
||||
"integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
"node": "^18 || ^20 || >= 21"
|
||||
}
|
||||
},
|
||||
"node_modules/glob": {
|
||||
"version": "10.3.12",
|
||||
"resolved": "https://registry.npmmirror.com/glob/-/glob-10.3.12.tgz",
|
||||
|
|
@ -3885,9 +3909,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/node-abi": {
|
||||
"version": "3.57.0",
|
||||
"resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.57.0.tgz",
|
||||
"integrity": "sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==",
|
||||
"version": "3.59.0",
|
||||
"resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.59.0.tgz",
|
||||
"integrity": "sha512-HyyfzvTLCE8b1SX2nWimlra8cibEsypcSu/Az4SXMhWhtuctkwAX7qsEYNjUOIoYtPV884oN3wtYTN+iZKBtvw==",
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
"semver": "^7.3.5"
|
||||
|
|
@ -4610,9 +4634,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/socks": {
|
||||
"version": "2.8.1",
|
||||
"resolved": "https://registry.npmmirror.com/socks/-/socks-2.8.1.tgz",
|
||||
"integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==",
|
||||
"version": "2.8.3",
|
||||
"resolved": "https://registry.npmmirror.com/socks/-/socks-2.8.3.tgz",
|
||||
"integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
|
||||
"dependencies": {
|
||||
"ip-address": "^9.0.5",
|
||||
"smart-buffer": "^4.2.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "2.2.3",
|
||||
"integrity": "sha512-UJlGx/zM4VEYboBl2JgSGy2JLGg4+2BO4dHS9JrED94O/ss5T54sUI3KV0xWgh6RqafI78/wHGNZA3gquh5Baw==",
|
||||
"filename": "mongosh-2.2.3.tgz",
|
||||
"deps": "sha256-W0443c3AZ4e+xK8KUNPF+14ILoNVEJwitd0h51qLxh4="
|
||||
"version": "2.2.4",
|
||||
"integrity": "sha512-1T+ZwhdUrB8kk08zbyJr4cengVOyNdgKwRT4JXUvJCn9vvJoVSlAzsttn8Nlmj5IC6R6AijBsFlkF3wnuVKbZQ==",
|
||||
"filename": "mongosh-2.2.4.tgz",
|
||||
"deps": "sha256-87LGwA2sdmY/acH6Byziu1/xGV8c5PUZnp7cKVgOf+4="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json;
|
||||
tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json;
|
||||
tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json;
|
||||
tree-sitter-earthfile = lib.importJSON ./tree-sitter-earthfile.json;
|
||||
tree-sitter-eex = lib.importJSON ./tree-sitter-eex.json;
|
||||
tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json;
|
||||
tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"url": "https://github.com/glehmann/tree-sitter-earthfile",
|
||||
"rev": "9badbe4b107647672f627e7d6bddc8a0b61d1f50",
|
||||
"date": "2024-04-17T16:28:53+02:00",
|
||||
"path": "/nix/store/n7jprqmy1r5xgr0bl5d7rsz4xi10m9rf-tree-sitter-earthfile",
|
||||
"sha256": "0yslldcxpmi2hdgja1ygz3grsaj2jj52xm1dqdwlv296ahx5wqkh",
|
||||
"hash": "sha256-cGJeOlQmiU15wy3ULoqUQiqd3/jPByVfgyLW21mjVHs=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
|
|
@ -431,6 +431,10 @@ let
|
|||
orga = "mtoohey31";
|
||||
repo = "tree-sitter-koka";
|
||||
};
|
||||
"tree-sitter-earthfile" = {
|
||||
orga = "glehmann";
|
||||
repo = "tree-sitter-earthfile";
|
||||
};
|
||||
};
|
||||
|
||||
allGrammars =
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hack";
|
||||
version = "0.6.27";
|
||||
version = "0.6.28";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-TaXVHTUof/T+p0Zxpdf552uVqCr7jzQtNGKLKq7asqI=";
|
||||
hash = "sha256-RpMOtgLp9cvXr8lNqGmLvCSbBt7tt7au8hhDCaSERRo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qhD6PLvvfLkVr9rOB90Kw4/jDOw06h7TUe1YCjGad1g=";
|
||||
cargoHash = "sha256-KpG+T1rI14BgvWvRqiZ5y/n9+J1YRj4+j556zaY7aUA=";
|
||||
|
||||
# some necessary files are absent in the crate version
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
pname = "bun";
|
||||
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
|
|||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
hash = "sha256-OBlbE7tezlH5RGrRbL0TvjKq0deLA2VMGO/gJI1wHpQ=";
|
||||
hash = "sha256-dBiwVO4WreVyIlbJVEyPZj46Dy/3W49mXdo7CiQWiAo=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
hash = "sha256-8bpkzH0SqG7tgm6Q7+4AT9RfrFKnsSGuFt2S1JXGwrw=";
|
||||
hash = "sha256-XsyjcqKZ667iVTVsOKjaD9iORze0Zs8ZHiDYvuXQ07A=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
hash = "sha256-AUzjyCUi4OlU7VxfOCVmMXezsVrTSmYPH/QMv85oQ5k=";
|
||||
hash = "sha256-M6MoYPNCGBP0KuNnv8cOnm47FJyxI6MXzsX+FvHxAEA=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
hash = "sha256-0/Z0wkKm2RlNr1nLWU6U5mz0SluBDKaIJi4GG9LAxz4=";
|
||||
hash = "sha256-9H/1qR6ZHHy5/abq2SjoUbUX6Y92/8MQem2inuWhVC8=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trust-dns";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hickory-dns";
|
||||
repo = "hickory-dns";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE=";
|
||||
hash = "sha256-+vZnozPsORe7nK6jL/yt/wp2qjwBTqyxZYz+cXaKNFk=";
|
||||
};
|
||||
cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8=";
|
||||
cargoHash = "sha256-VLpl6eMOstD0FsuPeHngKQitv1jcb+0dx2pc8ic3Cf4=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,29 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGo121Module, fetchFromGitHub, lib }:
|
||||
|
||||
let
|
||||
generic = { subPackages, pname, postInstall ? "", mainProgram }:
|
||||
buildGoModule rec {
|
||||
buildGo121Module rec {
|
||||
inherit pname;
|
||||
version = "6.9.2";
|
||||
shortRev = "3a1ac58"; # for internal version info
|
||||
version = "6.11.0";
|
||||
shortRev = "9587df6"; # for internal version info
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sensu";
|
||||
repo = "sensu-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Xd15fkoSmQXbkyEMsBvc8ewLvn+wlsZoclfDjarp1FQ=";
|
||||
sha256 = "sha256-Vcay8vUYLjV65g526btQX0+m5n/cRocIKx7C2LuWeP4=";
|
||||
};
|
||||
|
||||
inherit subPackages postInstall;
|
||||
|
||||
vendorHash = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I=";
|
||||
vendorHash = "sha256-ADqU/ZJiyZ5hAkqFXExmA8fSZxzhx42QptYu3TIlgBc=";
|
||||
|
||||
patches = [
|
||||
# Without this, we get error messages like:
|
||||
# vendor/golang.org/x/sys/unix/mremap.go:41:10: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
|
||||
# The patch was generated by changing "go 1.16" to "go 1.21" and executing `go mod tidy`.
|
||||
./fix-go-version-error.patch
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -25,6 +25,9 @@ buildNpmPackage rec {
|
|||
|
||||
postInstall = ''
|
||||
cp -r dist $out/lib/node_modules/uptime-kuma/
|
||||
|
||||
# remove references to nodejs source
|
||||
rm -r $out/lib/node_modules/uptime-kuma/node_modules/@louislam/sqlite3/build-tmp-napi-v6
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -328,12 +328,12 @@ in
|
|||
assert isBuiltByBootstrapFilesCompiler prevStage.patchelf;
|
||||
stageFun prevStage {
|
||||
name = "bootstrap-stage-xgcc";
|
||||
overrides = final: prev: {
|
||||
overrides = self: super: {
|
||||
inherit (prevStage) ccWrapperStdenv coreutils gnugrep gettext bison texinfo zlib gnum4 perl patchelf;
|
||||
${localSystem.libc} = getLibc prevStage;
|
||||
gmp = prev.gmp.override { cxx = false; };
|
||||
gmp = super.gmp.override { cxx = false; };
|
||||
gcc-unwrapped =
|
||||
(prev.gcc-unwrapped.override (commonGccOverrides // {
|
||||
(super.gcc-unwrapped.override (commonGccOverrides // {
|
||||
# The most logical name for this package would be something like
|
||||
# "gcc-stage1". Unfortunately "stage" is already reserved for the
|
||||
# layers of stdenv, so using "stage" in the name of this package
|
||||
|
|
@ -376,7 +376,7 @@ in
|
|||
#
|
||||
configureFlags = (a.configureFlags or []) ++ [
|
||||
"--with-native-system-header-dir=/include"
|
||||
"--with-build-sysroot=${lib.getDev final.stdenv.cc.libc}"
|
||||
"--with-build-sysroot=${lib.getDev self.stdenv.cc.libc}"
|
||||
];
|
||||
|
||||
# This is a separate phase because gcc assembles its phase scripts
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ in
|
|||
inherit config overlays;
|
||||
stdenv = makeStdenv {
|
||||
inherit (prevStage) cc fetchurl;
|
||||
overrides = prev: final: { inherit (prevStage) fetchurl; };
|
||||
overrides = self: super: { inherit (prevStage) fetchurl; };
|
||||
} // {
|
||||
inherit (prevStage) fetchurl;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.77.0";
|
||||
version = "1.77.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mUigWOFNfo/tI/2Vf3r2FWw+LHQU7vGodnXnJ6bIwAM=";
|
||||
sha256 = "sha256-vDlT+gLizFGxKPdKYk2p+0Nk21exI0AEfJ77MNBsBxc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CmLRmtih3XSzjizJpcXwWuJ6eRpMwiaXtH2zaf7E9gU=";
|
||||
sha256 = "sha256-w/vsS206gKZ8PbfD2BAsYxasXWJEX72AMpmwyR/NCcU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-F8KkBeig0TofMRdg2puFjqPXB6TnUc15enodiE57pxA=";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nexttrace";
|
||||
version = "1.2.9";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxtrace";
|
||||
repo = "NTrace-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cnFFlEgq3zYIvVAe7ocw4oiqZQHINvrquBfylm2+dCw=";
|
||||
sha256 = "sha256-15ONnY0ST3e9FPyNkyUfQLgKUXjrMX2+4Op4WDumyyk=";
|
||||
};
|
||||
vendorHash = "sha256-eNRJxz/rbqf1mVRvE83JXUR3/F7XmBhfsOvxaSgDRjc=";
|
||||
vendorHash = "sha256-dlubG+2UvlZI0r9CU2ljCbLs1+t+xgwP2yrbiAt8MgQ=";
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube-bench";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e8iB66fXc8lKwFEZlkk4qbsgExKUrf5WpEVCOiHiZUg=";
|
||||
hash = "sha256-BS/jJbseLcWtK9BX7ZbVokSrboUaaTCIr4cwpixl1QI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8DWjuweGCx2yxocm1GvcP+O3QYWYUdOFKmu6neQfWI4=";
|
||||
vendorHash = "sha256-bq8nz4i40xd4O6/r2ZiUyAEKxmsoLCNKctqRV/GPQEU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
self = {
|
||||
addonDir = "/share/kodi/addons";
|
||||
|
||||
rel = "Omega";
|
||||
rel = kodi.kodiReleaseName;
|
||||
|
||||
inherit callPackage kodi hasKodiAddon requiredKodiAddons;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue