Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
+11
-20
@@ -204,8 +204,8 @@ lib.mapAttrs mkLicense (
|
||||
};
|
||||
|
||||
bola11 = {
|
||||
url = "https://blitiri.com.ar/p/bola/";
|
||||
fullName = "Buena Onda License Agreement 1.1";
|
||||
spdxId = "BOLA-1.1";
|
||||
fullName = "Buena Onda License Agreement v1.1";
|
||||
};
|
||||
|
||||
boost = {
|
||||
@@ -326,8 +326,8 @@ lib.mapAttrs mkLicense (
|
||||
};
|
||||
|
||||
capec = {
|
||||
fullName = "Common Attack Pattern Enumeration and Classification";
|
||||
url = "https://capec.mitre.org/about/termsofuse.html";
|
||||
fullName = "Common Attack Pattern Enumeration and Classification License";
|
||||
spdxId = "CAPEC-tou";
|
||||
};
|
||||
|
||||
clArtistic = {
|
||||
@@ -765,14 +765,7 @@ lib.mapAttrs mkLicense (
|
||||
|
||||
hpndSellVariantSafetyClause = {
|
||||
fullName = "HPND - sell variant with safety critical systems clause";
|
||||
url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo/-/blob/68a5b6d98ae34749cca889f4373b4043d00bfe6a/src/voodoo_dga.c#L12-33";
|
||||
# TODO: if the license gets accepted to spdx then
|
||||
# add spdxId
|
||||
# else
|
||||
# remove license
|
||||
# && replace reference with whatever this license is supposed to be then
|
||||
# https://github.com/spdx/license-list-XML/issues/2922
|
||||
# spdxId = "HPND-sell-variant-safety-clause";
|
||||
spdxId = "HPND-sell-variant-critical-systems";
|
||||
};
|
||||
|
||||
hpndDec = {
|
||||
@@ -1262,8 +1255,8 @@ lib.mapAttrs mkLicense (
|
||||
};
|
||||
|
||||
paratype = {
|
||||
fullName = "ParaType Free Font Licensing Agreement";
|
||||
url = "https://web.archive.org/web/20161209023955/http://www.paratype.ru/public/pt_openlicense_eng.asp";
|
||||
spdxId = "ParaType-Free-Font-1.3";
|
||||
fullName = "ParaType Free Font Licensing Agreement v1.3";
|
||||
};
|
||||
|
||||
parity70 = {
|
||||
@@ -1342,7 +1335,8 @@ lib.mapAttrs mkLicense (
|
||||
# Gentoo seems to treat it as a license:
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/licenses/SGMLUG?id=7d999af4a47bf55e53e54713d98d145f935935c1
|
||||
sgmlug = {
|
||||
fullName = "SGML UG SGML Parser Materials license";
|
||||
spdxId = "SGMLUG-PM";
|
||||
fullName = "SGMLUG Parser Materials License";
|
||||
};
|
||||
|
||||
sissl11 = {
|
||||
@@ -1439,11 +1433,8 @@ lib.mapAttrs mkLicense (
|
||||
};
|
||||
|
||||
tekHvcLicense = {
|
||||
spdxId = "TekHVC";
|
||||
fullName = "TekHVC License";
|
||||
url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/7f8305c779ac6948d7261764f5ffb8ae9aa975b1/COPYING#L138-171";
|
||||
# TODO: add spdxId when it gets accepted to spdx
|
||||
# https://tools.spdx.org/app/license_requests/458
|
||||
# https://github.com/spdx/license-list-XML/issues/2757
|
||||
};
|
||||
|
||||
torque11 = {
|
||||
@@ -1464,8 +1455,8 @@ lib.mapAttrs mkLicense (
|
||||
};
|
||||
|
||||
tost = {
|
||||
spdxId = "Pixar";
|
||||
fullName = "Tomorrow Open Source Technology License 1.0";
|
||||
url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";
|
||||
};
|
||||
|
||||
ubdlException = {
|
||||
|
||||
@@ -36,16 +36,23 @@ in
|
||||
|
||||
i18n = {
|
||||
glibcLocales = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = pkgs.glibcLocales.override {
|
||||
allLocales = lib.elem "all" cfg.supportedLocales;
|
||||
locales = cfg.supportedLocales;
|
||||
};
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default =
|
||||
if pkgs.glibcLocales != null then
|
||||
pkgs.glibcLocales.override {
|
||||
allLocales = lib.elem "all" cfg.supportedLocales;
|
||||
locales = cfg.supportedLocales;
|
||||
}
|
||||
else
|
||||
null;
|
||||
defaultText = lib.literalExpression ''
|
||||
pkgs.glibcLocales.override {
|
||||
allLocales = lib.elem "all" config.i18n.supportedLocales;
|
||||
locales = config.i18n.supportedLocales;
|
||||
}
|
||||
if pkgs.glibcLocales != null then
|
||||
pkgs.glibcLocales.override {
|
||||
allLocales = lib.elem "all" config.i18n.supportedLocales;
|
||||
locales = config.i18n.supportedLocales;
|
||||
}
|
||||
else
|
||||
null
|
||||
'';
|
||||
example = lib.literalExpression "pkgs.glibcLocales";
|
||||
description = ''
|
||||
@@ -186,7 +193,9 @@ in
|
||||
|
||||
environment.systemPackages =
|
||||
# We increase the priority a little, so that plain glibc in systemPackages can't win.
|
||||
lib.optional (cfg.supportedLocales != [ ]) (lib.setPrio (-1) cfg.glibcLocales);
|
||||
lib.optional (cfg.glibcLocales != null && cfg.supportedLocales != [ ]) (
|
||||
lib.setPrio (-1) cfg.glibcLocales
|
||||
);
|
||||
|
||||
environment.sessionVariables = {
|
||||
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
|
||||
@@ -200,7 +209,7 @@ in
|
||||
// cfg.extraLocaleSettings
|
||||
);
|
||||
|
||||
systemd.globalEnvironment = lib.mkIf (cfg.supportedLocales != [ ]) {
|
||||
systemd.globalEnvironment = lib.mkIf (cfg.glibcLocales != null && cfg.supportedLocales != [ ]) {
|
||||
LOCALE_ARCHIVE = "${cfg.glibcLocales}/lib/locale/locale-archive";
|
||||
};
|
||||
|
||||
|
||||
@@ -83,6 +83,15 @@ in
|
||||
{
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# Hyprland needs permissions to give itself SCHED_RR on startup:
|
||||
# https://github.com/hyprwm/Hyprland/blob/main/src/init/initHelpers.cpp
|
||||
security.wrappers.Hyprland = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
capabilities = "cap_sys_nice+ep";
|
||||
source = lib.getExe cfg.package;
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ cfg.portalPackage ];
|
||||
|
||||
@@ -95,7 +95,9 @@ in
|
||||
include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"
|
||||
${pkgs.stdenv.cc.libc}/share/locale/** r,
|
||||
${pkgs.stdenv.cc.libc}/share/locale.alias r,
|
||||
${config.i18n.glibcLocales}/lib/locale/locale-archive r,
|
||||
${lib.optionalString (
|
||||
config.i18n.glibcLocales != null
|
||||
) "${config.i18n.glibcLocales}/lib/locale/locale-archive r,"}
|
||||
${etcRule "localtime"}
|
||||
${pkgs.tzdata}/share/zoneinfo/** r,
|
||||
${pkgs.stdenv.cc.libc}/share/i18n/** r,
|
||||
|
||||
@@ -77,6 +77,8 @@ let
|
||||
BindReadOnlyPaths = [
|
||||
"/etc"
|
||||
"/run/systemd"
|
||||
]
|
||||
++ lib.optionals (config.i18n.glibcLocales != null) [
|
||||
"${config.i18n.glibcLocales}"
|
||||
]
|
||||
++ mapAttrsToList (name: inbox: inbox.description) cfg.inboxes
|
||||
|
||||
@@ -39,8 +39,12 @@ let
|
||||
|
||||
# Ensure that clipboard works for non-ASCII characters
|
||||
sed -i -e '/.*SessionVariables.*/ a\
|
||||
LANG=${config.i18n.defaultLocale}\
|
||||
LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive
|
||||
LANG=${config.i18n.defaultLocale}${
|
||||
lib.optionalString (config.i18n.glibcLocales != null) ''
|
||||
\
|
||||
LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive
|
||||
''
|
||||
}
|
||||
' $out/sesman.ini
|
||||
|
||||
${cfg.extraConfDirCommands}
|
||||
|
||||
@@ -58,7 +58,11 @@
|
||||
--set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \
|
||||
--set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \
|
||||
--set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \
|
||||
--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \
|
||||
${
|
||||
lib.optionalString (
|
||||
config.i18n.glibcLocales != null
|
||||
) "--set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive"
|
||||
} \
|
||||
--set SYSTEMD ${config.systemd.package}
|
||||
)
|
||||
'';
|
||||
|
||||
@@ -353,7 +353,6 @@ in
|
||||
# Legacy environment variables. These were used by the activation script,
|
||||
# but some other script might still depend on them, although unlikely.
|
||||
installBootLoader = config.system.build.installBootLoader;
|
||||
localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
|
||||
distroId = config.system.nixos.distroId;
|
||||
perl = pkgs.perl.withPackages (
|
||||
p: with p; [
|
||||
@@ -376,6 +375,9 @@ in
|
||||
# option, as opposed to `system.extraDependencies`.
|
||||
passedChecks = concatStringsSep " " config.system.checks;
|
||||
}
|
||||
// lib.optionalAttrs (config.i18n.glibcLocales != null) {
|
||||
localeArchive = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
|
||||
}
|
||||
// lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != [ ]) {
|
||||
closureInfo = pkgs.closureInfo {
|
||||
rootPaths = [
|
||||
|
||||
@@ -815,6 +815,7 @@ let
|
||||
};
|
||||
# initialize wallet, creates macaroon needed by exporter
|
||||
systemd.services.lnd.postStart = ''
|
||||
until [ -f /var/lib/lnd/tls.cert ]; do sleep 1; done
|
||||
${pkgs.curl}/bin/curl \
|
||||
--retry 20 \
|
||||
--retry-delay 1 \
|
||||
@@ -2051,7 +2052,7 @@ let
|
||||
{
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
instance = "/run/varnish/varnish";
|
||||
instance = "/var/run/varnishd";
|
||||
group = "varnish";
|
||||
};
|
||||
metricProvider = {
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
common-updater-scripts,
|
||||
curl,
|
||||
openssl_1_1,
|
||||
openssl_3_5,
|
||||
bzip2,
|
||||
sqlite,
|
||||
}:
|
||||
@@ -33,7 +34,7 @@ let
|
||||
binaries = [
|
||||
"sublime_text"
|
||||
"plugin_host-3.3"
|
||||
"plugin_host-3.8"
|
||||
"plugin_host-3.${if lib.versionAtLeast buildVersion "4205" then "14" else "8"}"
|
||||
crashHandlerBinary
|
||||
];
|
||||
primaryBinary = "sublime_text";
|
||||
@@ -90,12 +91,20 @@ let
|
||||
for binary in ${builtins.concatStringsSep " " binaries}; do
|
||||
patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \
|
||||
--set-rpath ${lib.makeLibraryPath neededLibraries}:${lib.getLib stdenv.cc.cc}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}:$out \
|
||||
$binary
|
||||
done
|
||||
|
||||
# Unable to get plugin_host-3.14 not crash with Python from Nixpkgs
|
||||
${lib.optionalString (lib.versionAtLeast buildVersion "4205") "patchelf --set-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
sqlite
|
||||
openssl_3_5
|
||||
]
|
||||
} libpython3.14.so.1.0"}
|
||||
|
||||
# Rewrite pkexec argument. Note that we cannot delete bytes in binary.
|
||||
sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' ${primaryBinary}
|
||||
${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i -e 's,/bin/cp\\x00,cp\\x00\\x00\\x00\\x00\\x00\\x00,g' ${primaryBinary}"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -106,6 +115,7 @@ let
|
||||
# No need to patch these libraries, it works well with our own
|
||||
rm libcrypto.so.1.1 libssl.so.1.1
|
||||
${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"}
|
||||
${lib.optionalString (lib.versionAtLeast buildVersion "4205") "rm libcrypto.so.3 libssl.so.3"}
|
||||
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
@@ -116,7 +126,7 @@ let
|
||||
dontWrapGApps = true; # non-standard location, need to wrap the executables manually
|
||||
|
||||
postFixup = ''
|
||||
sed -i 's#/usr/bin/pkexec#pkexec\x00\x00\x00\x00\x00\x00\x00\x00\x00#g' "$out/${primaryBinary}"
|
||||
${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i 's#/usr/bin/pkexec#pkexec\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00#g' \"$out/${primaryBinary}\""}
|
||||
|
||||
wrapProgram $out/${primaryBinary} \
|
||||
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
|
||||
|
||||
@@ -11,9 +11,9 @@ in
|
||||
} { };
|
||||
|
||||
sublime4-dev = common {
|
||||
buildVersion = "4199";
|
||||
buildVersion = "4205";
|
||||
dev = true;
|
||||
x64sha256 = "Nrhwv+ox/SW21c8wZtuX9mzHQ+o9ghsI50dU2kDvCX0=";
|
||||
aarch64sha256 = "3vCXj53f2Qlt/Ab3hNNng+Y4Ch85Dp0G8srTVBtd6zU=";
|
||||
x64sha256 = "1Tg8m4FNrVOeHK6VSmlua30pW4Bu7Gz+sT0t/w01UyM=";
|
||||
aarch64sha256 = "K94UipUVZRh8xJKYW35be0u9L/VHpZ+FYhC26v41b3U=";
|
||||
} { };
|
||||
}
|
||||
|
||||
@@ -2084,8 +2084,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-graphql-syntax";
|
||||
publisher = "GraphQL";
|
||||
version = "1.3.8";
|
||||
hash = "sha256-10x2kX9Gc7O/tGRDPZfy1cKdCIvGTCXcD2bDokIz7TU=";
|
||||
version = "1.3.10";
|
||||
hash = "sha256-EY6BHl5ICcs3FuuenoadDXLLPSe8+2VAAydqo/YrtaE=";
|
||||
};
|
||||
meta = {
|
||||
description = "Adds full GraphQL syntax highlighting and language support such as bracket matching";
|
||||
@@ -5200,8 +5200,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "volar";
|
||||
publisher = "Vue";
|
||||
version = "3.2.8";
|
||||
hash = "sha256-lbTE5UP4JSpqoXHzS6HPBX2pOQjeBSmHhxqy0thawfc=";
|
||||
version = "3.2.9";
|
||||
hash = "sha256-LkoytGAAZwjm3Mm3EixCHjnh1dkxB0lKMv5KJVYSwGY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "quicknes";
|
||||
version = "0-unstable-2026-04-20";
|
||||
version = "0-unstable-2026-05-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "QuickNES_Core";
|
||||
rev = "7848e1ac22b1c69d056ae4cb57710651ff1dd169";
|
||||
hash = "sha256-cgoLO1572XoDDBJiEFglWtbo3vk5EXu/U3Pn7zrxqM8=";
|
||||
rev = "a0ec494c417f365c578f3dacadb04383e4a99ade";
|
||||
hash = "sha256-q1AS4mASF2gaiGyuM6a/Z57bp0DPRQADlM+snb3iNSg=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore rec {
|
||||
core = "snes9x2010";
|
||||
version = "0-unstable-2026-05-05";
|
||||
version = "0-unstable-2026-05-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "snes9x2010";
|
||||
rev = "d9cba8a41b3407ebb929816a7033e0407fd7b2d0";
|
||||
hash = "sha256-OdJStJK823PayWS+bmwG+kDrdx6KeVWYiSAu61C9UFs=";
|
||||
rev = "bc82e8281ddbbd487875866f5db27cdb9838d319";
|
||||
hash = "sha256-laAXE4U5ROKe2QnYbUrvJ4xRPv1hzllDZ8ei01IwqKA=";
|
||||
};
|
||||
|
||||
makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "virtualjaguar";
|
||||
version = "0-unstable-2026-05-01";
|
||||
version = "0-unstable-2026-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "virtualjaguar-libretro";
|
||||
rev = "e04f953915731c15f5f9cb9b8ae44630c901f23f";
|
||||
hash = "sha256-jjF3vyVuxViyZP1wbxZduBhURYylGdS3BKxzKnPBm7Q=";
|
||||
rev = "18828045f76a803206ebffc9b8d57842287b7552";
|
||||
hash = "sha256-lHQsApSoZNvyTp6D3lOBHyLCQ321cirUVXZRHXvIdP4=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -562,13 +562,13 @@
|
||||
"vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU="
|
||||
},
|
||||
"hashicorp_dns": {
|
||||
"hash": "sha256-ErvlkaFiIHEXUZYDJZmqEgGpZ75mnLRhhsULRvTm7Rc=",
|
||||
"hash": "sha256-sdJpv5Am1tlKyaUkmByrZauzRGZUeAirf7k9a/Fv0S0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/dns",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-dns",
|
||||
"rev": "v3.5.0",
|
||||
"rev": "v3.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-P4018IUQ4MfdPHP20rHvuzeFSxLHBcoJuLHS/TNAHLk="
|
||||
"vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc="
|
||||
},
|
||||
"hashicorp_external": {
|
||||
"hash": "sha256-rHMmGzYvsE5GT0E71UUIXjDG9+v52LI69/gdP2xuI7w=",
|
||||
|
||||
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
|
||||
"--without-libfam"
|
||||
];
|
||||
|
||||
# gcc 15 C23 default breaks K&R () prototypes and errors on -Wincompatible-pointer-types
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
groff
|
||||
|
||||
-246
@@ -1,246 +0,0 @@
|
||||
{
|
||||
"name": "amp-cli",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1778343260-gb9a37d"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring/-/keyring-1.1.10.tgz",
|
||||
"integrity": "sha512-PTMyX7FVZGP4s0LcjgrFonek7Sr9ZTdi0TgpR4/4RQmC2TiDcjpdZOXxRMe2aP+5N89Ix9RG9QWclgqRHLk/Xw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
},
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/Brooooooklyn"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@napi-rs/keyring-darwin-arm64": "1.1.10",
|
||||
"@napi-rs/keyring-darwin-x64": "1.1.10",
|
||||
"@napi-rs/keyring-freebsd-x64": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm-gnueabihf": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-arm64-musl": "1.1.10",
|
||||
"@napi-rs/keyring-linux-riscv64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-x64-gnu": "1.1.10",
|
||||
"@napi-rs/keyring-linux-x64-musl": "1.1.10",
|
||||
"@napi-rs/keyring-win32-arm64-msvc": "1.1.10",
|
||||
"@napi-rs/keyring-win32-ia32-msvc": "1.1.10",
|
||||
"@napi-rs/keyring-win32-x64-msvc": "1.1.10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-darwin-arm64": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-arm64/-/keyring-darwin-arm64-1.1.10.tgz",
|
||||
"integrity": "sha512-qdXBVypPNgTzso5F/YXWy5dOfFEb9eo43uROMlvwlhj7Aw137iwqwHiqlxR0teFKA33cWnem+ZKeVSIPoobtNA==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-darwin-x64": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-darwin-x64/-/keyring-darwin-x64-1.1.10.tgz",
|
||||
"integrity": "sha512-53DgSzhTAJwxR3KCyggHWcLwp+cw2v1zAhBiqNn1P8XwSJSba7HzFwsei6zZMn7bn3UY1ngIHEtaA74UUJVJyw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-freebsd-x64": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-freebsd-x64/-/keyring-freebsd-x64-1.1.10.tgz",
|
||||
"integrity": "sha512-pI6lect/Dp8NnV+g3w1hmYLt69FbSwKFAHn77vjeUaIT5H9C0ikAgwLk89Sd8/Ei/AHHldGkrLeWkNjnIiHfoQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"freebsd"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm-gnueabihf": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm-gnueabihf/-/keyring-linux-arm-gnueabihf-1.1.10.tgz",
|
||||
"integrity": "sha512-w4psOx5m1ltvNLABT/BpIzP5roVcglR1kDhzZgSEOIIrf2i4FKPQqUIo5UQtjsu+AqhhYwnlnketKDf4h+D06g==",
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm64-gnu": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-gnu/-/keyring-linux-arm64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-YMC+ZLj3RldGD2Q5wzlZbc8vTh5Fteln+FpB2lw7EbDib3mmIribNH1NG21E4SwculFRDkVJqYGzwIhafloT8Q==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-arm64-musl": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-arm64-musl/-/keyring-linux-arm64-musl-1.1.10.tgz",
|
||||
"integrity": "sha512-X/Gr5q2vJW7HMpcWRKj7eXer00a1PYb3zt3xsEG/VbcEo5A973pJANTBhYuoW098O/b7ORkunFt9WSbCgenw2A==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-riscv64-gnu": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-riscv64-gnu/-/keyring-linux-riscv64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-vA3R4NVBlU0TVDHavwr5hSqePSs9OwTzzzFlTbZzqgh9s7OqcSwNT096nbr5dRjuQfG9o4/xvjfvVJ4v5z0Egg==",
|
||||
"cpu": [
|
||||
"riscv64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-x64-gnu": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-gnu/-/keyring-linux-x64-gnu-1.1.10.tgz",
|
||||
"integrity": "sha512-qbKE72UeVOrIoiYYHh7joTpDIgQCZpW5OJHG4Ir19GHLdQwNZGKLfFxrTT2DvZ5EXwFJWbOp4Dew4OvvQ0E63g==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-linux-x64-musl": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-linux-x64-musl/-/keyring-linux-x64-musl-1.1.10.tgz",
|
||||
"integrity": "sha512-niLWyjD/JxQwlOTPeldIx8Xnf03Mp4ooorpWJMWbMuVz/6hSyLVghY/BDYu2Oaxhc+XlTEjmqwhoTWYhmti5eA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"linux"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-arm64-msvc": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-arm64-msvc/-/keyring-win32-arm64-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-VBlqZ0MF5ksc/Z+yxoL2+p6TDu2rqBOcgZ+HwXzSfgFnfnuPds7xOVdFwwaiJbj9CsCrgnByr1jtHRvfEQ6Iiw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-ia32-msvc": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-ia32-msvc/-/keyring-win32-ia32-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-0AvwivxgtjdpTCZCFAQUCxFA45DNKXOsdZYXBCIDfPIpUPgLxhIAsg6q7NJK00r1M24StwwfD+AzZDu14J1PKQ==",
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring-win32-x64-msvc": {
|
||||
"version": "1.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@napi-rs/keyring-win32-x64-msvc/-/keyring-win32-x64-msvc-1.1.10.tgz",
|
||||
"integrity": "sha512-T02DfUUvp3epOJ5lC7hcM5ff6xaLhIfymBf0LEa0oQMi+yCVoDrgjeKeGCUGwtVJWfphu58Tf9twX+hRiAD0dg==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"win32"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 10"
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1778343260-gb9a37d",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1778343260-gb9a37d.tgz",
|
||||
"integrity": "sha512-TY4lL2lqwt+NtBa3ngKZSYfY5Z1qBAOd4UQMCT0nsUKatQGtSOIMec+zQSv6tr0L+z2jrDUzD0cpRkBDkLQjsQ==",
|
||||
"license": "Amp Commercial License",
|
||||
"dependencies": {
|
||||
"@napi-rs/keyring": "1.1.10"
|
||||
},
|
||||
"bin": {
|
||||
"amp": "dist/main.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,90 +1,106 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchzip,
|
||||
ripgrep,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
gzip,
|
||||
makeWrapper,
|
||||
testers,
|
||||
ripgrep,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
cctools,
|
||||
darwin,
|
||||
rcodesign,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1778343260-gb9a37d";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-48FyPDniLNQoeZ+SaheTvzLCYL3r95e9VDCW4Y5gMq8=";
|
||||
let
|
||||
platforms = {
|
||||
# Upstream also publishes linux-x64, which is optimized for AVX2. Use the
|
||||
# baseline build for nixpkgs so the x86_64-linux package works on all
|
||||
# supported x86_64 CPUs instead of depending on the build user's CPU flags.
|
||||
x86_64-linux = "linux-x64-baseline";
|
||||
aarch64-linux = "linux-arm64";
|
||||
x86_64-darwin = "darwin-x64";
|
||||
aarch64-darwin = "darwin-arm64";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1779094967-g3f6594";
|
||||
|
||||
# Create a minimal package.json with just the dependency we need (without devDependencies)
|
||||
cat > package.json <<EOF
|
||||
{
|
||||
"name": "amp-cli",
|
||||
"version": "0.0.0",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "${finalAttrs.version}"
|
||||
},
|
||||
"bin": {
|
||||
"amp": "./bin/amp-wrapper.js"
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
# Create wrapper bin directory
|
||||
mkdir -p bin
|
||||
|
||||
# Create a wrapper script that will be installed by npm
|
||||
cat > bin/amp-wrapper.js << EOF
|
||||
#!/usr/bin/env node
|
||||
import('@sourcegraph/amp/dist/main.js')
|
||||
EOF
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-Ce7TaJuSrha+NcFmppMm/byAFosBR2I/zMY4KA5JXuE=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
];
|
||||
src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
makeWrapper
|
||||
];
|
||||
]
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
strictDeps = true;
|
||||
|
||||
npmFlags = [
|
||||
"--no-audit"
|
||||
"--no-fund"
|
||||
"--ignore-scripts"
|
||||
];
|
||||
dontUnpack = true;
|
||||
dontStrip = true;
|
||||
dontFixup = !stdenvNoCC.hostPlatform.isLinux;
|
||||
|
||||
# Disable build and prune steps
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/amp \
|
||||
--prefix PATH : ${lib.makeBinPath [ ripgrep ]} \
|
||||
--set AMP_SKIP_UPDATE_CHECK 1
|
||||
mkdir -p $out/bin $out/libexec/amp-cli
|
||||
gunzip -c $src > $out/libexec/amp-cli/amp
|
||||
chmod +x $out/libexec/amp-cli/amp
|
||||
|
||||
makeWrapper $out/libexec/amp-cli/amp $out/bin/amp \
|
||||
--set AMP_SKIP_UPDATE_CHECK 1 \
|
||||
--prefix PATH : ${lib.makeBinPath [ ripgrep ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "HOME=$(mktemp -d) amp --version";
|
||||
postPhases = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "postPatchelf" ];
|
||||
postPatchelf = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
|
||||
'${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/libexec/amp-cli/amp \
|
||||
-change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
|
||||
'${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/libexec/amp-cli/amp
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/amp";
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
passthru = {
|
||||
sources = lib.mapAttrs (
|
||||
system': platform:
|
||||
fetchurl {
|
||||
url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-ZBqt8UWDY0SlYOOrJZib+UXdZ1cQxyRNp3T7fr+gcNs=";
|
||||
aarch64-linux = "sha256-qztHMb4EJBOuEQh0OZ33dqx/MUy5LEPgLry6h+rmwVo=";
|
||||
x86_64-darwin = "sha256-meedgFtc+DA4NoR0XJuLSX/gmiMKCZLACfPBbk6wfLk=";
|
||||
aarch64-darwin = "sha256-0v3yM9zQ6ToWBHyPvrmPTP0lfPb1tCoAd6eNgHs3ZkM=";
|
||||
}
|
||||
.${system'};
|
||||
}
|
||||
) platforms;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph";
|
||||
homepage = "https://ampcode.com/";
|
||||
downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp";
|
||||
downloadPage = "https://ampcode.com/install";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
keegancsmith
|
||||
burmudar
|
||||
];
|
||||
mainProgram = "amp";
|
||||
platforms = builtins.attrNames platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nodejs nix-update
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
version=$(npm view @sourcegraph/amp version)
|
||||
version=$(curl -fsSL https://static.ampcode.com/cli/cli-version.txt)
|
||||
|
||||
# Generate updated lock file
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
npm i --package-lock-only @sourcegraph/amp@"$version"
|
||||
rm -f package.json # package.json is not used by buildNpmPackage
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")/../../../.."
|
||||
|
||||
# Update version and hashes
|
||||
cd -
|
||||
nix-update amp-cli --version "$version"
|
||||
for system in \
|
||||
x86_64-linux \
|
||||
aarch64-linux \
|
||||
x86_64-darwin \
|
||||
aarch64-darwin
|
||||
do
|
||||
update-source-version amp-cli "$version" \
|
||||
--source-key="sources.$system" \
|
||||
--ignore-same-version \
|
||||
--ignore-same-hash
|
||||
done
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
@@ -7,24 +8,28 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "agg";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "agg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6UenPE6mmmvliaIuGdQj/FrlmoJvmBJgfo0hW+uRaxM=";
|
||||
hash = "sha256-64VyCTGjzey6AHEAfk5V/Qoffe5+sDaDNve54M7tmf4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w=";
|
||||
cargoHash = "sha256-/WS5nAFKnP/CsU5+Pf5rtNN4LWaXVjlidLzH7DWYds0=";
|
||||
|
||||
__impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"/System/Library/Fonts"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
|
||||
description = "Command-line tool for generating animated GIF files from asciicast files produced by asciinema terminal recorder";
|
||||
homepage = "https://github.com/asciinema/agg";
|
||||
changelog = "https://github.com/asciinema/agg/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
|
||||
let
|
||||
source = {
|
||||
version = "2.34.0";
|
||||
hash = "sha256-ZHPrNQ36+bS5wwoiKUQKkGLnKhHKpftI3kQ08ItReWI=";
|
||||
npmDepsHash = "sha256-8y0+3zj3UH5wi9Nbl7X5rne0/tzz6Bf7HrxZpYVYZ3Y=";
|
||||
clientNpmDepsHash = "sha256-xna4tZK40dOew380exp/XR32ekyiFVCTWgWNE9BpTl8=";
|
||||
version = "2.35.0";
|
||||
hash = "sha256-KJ+/p6Szblof7fPeHkikOVK10xvcyVgpeFMx6cOOEgc=";
|
||||
npmDepsHash = "sha256-iqH32SWpoILLb9JQjgF+lrkZXHlbXTi3XFsvNKup934=";
|
||||
clientNpmDepsHash = "sha256-jSjw/Y+1VYlG8pKqOzNzrZRTUeIyBPdOAhZqEbC2qiA=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -60,7 +60,7 @@ let
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.11.1";
|
||||
version = "3.12.0";
|
||||
pname = "botan";
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "randombit";
|
||||
repo = "botan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AzQ/IblJF2atUXBTwI+84gmcceVQ6aMMElS3wOsfUDM=";
|
||||
hash = "sha256-2ODTjqsWSmlornOKh5m6pOX7cNOBHS3+ALblRyC8lPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,9 +18,6 @@
|
||||
}:
|
||||
|
||||
# TODO: fix python. See configure log.
|
||||
# fix -Dnullptr=0 cludge below.
|
||||
# The error is
|
||||
# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ecasound";
|
||||
@@ -64,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env.CXXFLAGS = "-std=c++11";
|
||||
configureFlags = [
|
||||
"--enable-liblilv"
|
||||
"--with-extra-cppflags=-Dnullptr=0"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emmylua_ls";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmmyLuaLs";
|
||||
repo = "emmylua-analyzer-rust";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2HC2BeT4x4QGjj2tKB0yM9Bh7zsQ/S0xX/KaJvlgq2o=";
|
||||
hash = "sha256-aNY7XQSUlLh3+Gs/9uMNAaHpITPZI7W7vHiLn5Mdjuk=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildAndTestSubdir = "crates/emmylua_ls";
|
||||
|
||||
cargoHash = "sha256-AruojLPjozzajHksLDfi39Qq6gvnHem2glgS454yxVQ=";
|
||||
cargoHash = "sha256-UIn0U9lW0EXbcGirIIWUzqtY1MgcXLQVHhFNTZRqw8g=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -17,8 +17,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
build-system = with python3Packages; [ pdm-backend ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rich"
|
||||
"argcomplete"
|
||||
"requests"
|
||||
"rich"
|
||||
];
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "15.0.0";
|
||||
version = "15.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZSUT0f3U6tmJLtSdpTorAYxJExdR+zVan+Gua3BIcDM=";
|
||||
hash = "sha256-bNdTvjWs43qO3gAtaKZR5CgGmOnJmNWrJUbm6Xv+q+g=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-J0UvU/rXUpxJEn/p+ScO8omFwHY2JD3kq7zGes0ohQ8=";
|
||||
vendorHash = "sha256-gR8FIVk+D40ALLdM+AzMkIUWLsBlWgoLp3DfEQa3a0s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.41.2";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4jwEviWYzan97pVn0RWfWU4XS8c27L4ZJUwa2iGlFxY=";
|
||||
hash = "sha256-QYSzJdyjJ5SvPkI/uf/wu8MdM76W+djai6zD38IJpos=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-4znN1YR3AX2SKeCJjUS8cm6WGcOGPXI27xrQCotBjgQ=";
|
||||
npmDepsHash = "sha256-hKNEJ/MAseYs8WLr36h40pYv+5nef8EPhZIfmPKYJPY=";
|
||||
|
||||
dontPatchElf = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{ wrapCC, gcc16 }:
|
||||
wrapCC (
|
||||
gcc16.cc.override {
|
||||
name = "gfortran";
|
||||
langFortran = true;
|
||||
langCC = false;
|
||||
langC = false;
|
||||
profiledCompiler = false;
|
||||
}
|
||||
)
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "github-mcp-server";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "github-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-atda50YVT577YabcHRO/xQU68DUFpwPS2GAWScSUaKg=";
|
||||
hash = "sha256-y6QGF2g9FhDxtWR//kaI5Xt2o+MwaNWCf2t0t61/vww=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fVNMtCpodsr1Z9E21osHb+e63ZQqFKYwi4fz4OsTJe0=";
|
||||
|
||||
Generated
+23
-25
@@ -5,11 +5,11 @@ GEM
|
||||
asciidoctor (2.0.26)
|
||||
base64 (0.3.0)
|
||||
builder (3.3.0)
|
||||
concurrent-ruby (1.3.5)
|
||||
concurrent-ruby (1.3.6)
|
||||
crass (1.0.6)
|
||||
creole (0.5.0)
|
||||
date (3.5.0)
|
||||
erb (6.0.0)
|
||||
date (3.5.1)
|
||||
erb (6.0.4)
|
||||
expression_parser (0.9.0)
|
||||
gemojione (4.3.3)
|
||||
json
|
||||
@@ -45,57 +45,55 @@ GEM
|
||||
mime-types (~> 3.4)
|
||||
rugged (~> 1.5)
|
||||
htmlentities (4.4.2)
|
||||
i18n (1.14.7)
|
||||
i18n (1.14.8)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.16.0)
|
||||
kramdown (2.5.1)
|
||||
rexml (>= 3.3.9)
|
||||
json (2.19.5)
|
||||
kramdown (2.5.2)
|
||||
rexml (>= 3.4.4)
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
logger (1.7.0)
|
||||
loofah (2.24.1)
|
||||
loofah (2.25.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2025.0924)
|
||||
mime-types-data (3.2026.0414)
|
||||
mini_portile2 (2.8.9)
|
||||
multi_json (1.17.0)
|
||||
mustache (1.1.1)
|
||||
multi_json (1.21.1)
|
||||
mustache (1.1.2)
|
||||
mustache-sinatra (2.0.0)
|
||||
mustache (~> 1.0)
|
||||
mustermann (3.0.4)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
nokogiri (1.18.10)
|
||||
mustermann (3.1.1)
|
||||
nokogiri (1.19.3)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
octicons (19.21.0)
|
||||
octicons (19.25.0)
|
||||
org-ruby (0.9.12)
|
||||
rubypants (~> 0.2)
|
||||
psych (5.2.6)
|
||||
psych (5.3.1)
|
||||
date
|
||||
stringio
|
||||
racc (1.8.1)
|
||||
rack (3.2.4)
|
||||
rack (3.2.6)
|
||||
rack-protection (4.2.1)
|
||||
base64 (>= 0.1.0)
|
||||
logger (>= 1.6.0)
|
||||
rack (>= 3.0.0, < 4)
|
||||
rack-session (2.1.1)
|
||||
rack-session (2.1.2)
|
||||
base64 (>= 0.1.0)
|
||||
rack (>= 3.0.0)
|
||||
rackup (2.2.1)
|
||||
rackup (2.3.1)
|
||||
rack (>= 3)
|
||||
rdoc (6.15.1)
|
||||
rdoc (6.17.0)
|
||||
erb
|
||||
psych (>= 4.0.0)
|
||||
tsort
|
||||
rexml (3.4.4)
|
||||
rouge (3.30.0)
|
||||
rss (0.3.1)
|
||||
rss (0.3.2)
|
||||
rexml
|
||||
ruby2_keywords (0.0.5)
|
||||
rubypants (0.7.1)
|
||||
rugged (1.9.0)
|
||||
sinatra (4.2.1)
|
||||
@@ -117,11 +115,11 @@ GEM
|
||||
rack (>= 2.2.4, < 4)
|
||||
sprockets-helpers (1.4.0)
|
||||
sprockets (>= 2.2)
|
||||
stringio (3.1.8)
|
||||
stringio (3.2.0)
|
||||
therubyrhino (2.1.2)
|
||||
therubyrhino_jar (>= 1.7.4, < 1.7.9)
|
||||
therubyrhino_jar (1.7.8)
|
||||
tilt (2.6.1)
|
||||
tilt (2.7.0)
|
||||
tsort (0.2.0)
|
||||
twitter-text (1.14.7)
|
||||
unf (~> 0.1.0)
|
||||
@@ -129,7 +127,7 @@ GEM
|
||||
unf_ext
|
||||
unf_ext (0.0.9.1)
|
||||
useragent (0.16.11)
|
||||
webrick (1.9.1)
|
||||
webrick (1.9.2)
|
||||
wikicloth (0.8.3)
|
||||
builder
|
||||
expression_parser
|
||||
|
||||
Generated
+44
-55
@@ -34,10 +34,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
|
||||
sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
};
|
||||
crass = {
|
||||
groups = [ "default" ];
|
||||
@@ -64,20 +64,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1rbfqkzr6i8b6538z16chvrkgywf5p5vafsgmnbmvrmh0ingsx2y";
|
||||
sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
};
|
||||
erb = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0y95ynlfngs0s5x1w6mwralszhbi9d75lcdbdkqk75wcklzqjc17";
|
||||
sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
version = "6.0.4";
|
||||
};
|
||||
expression_parser = {
|
||||
groups = [ "default" ];
|
||||
@@ -189,20 +189,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
|
||||
sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.7";
|
||||
version = "1.14.8";
|
||||
};
|
||||
json = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "098m3q2jrx4xbf0knrbmflsynmmb5x9q9b0bzpmj7jmm1cr30mna";
|
||||
sha256 = "0n9ch455pnvl9vxs2f3j77bpdmxg5g3mn3vyr9wxa0a87raii2i1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.16.0";
|
||||
version = "2.19.5";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = [ "rexml" ];
|
||||
@@ -210,10 +210,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7";
|
||||
sha256 = "1yh2gwpwhh0p4vc0aabzn0hb55av0wkcq3gh3w8zkdk69hh4598v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = [ "kramdown" ];
|
||||
@@ -245,10 +245,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
|
||||
sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.24.1";
|
||||
version = "2.25.1";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = [
|
||||
@@ -269,10 +269,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
|
||||
sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2025.0924";
|
||||
version = "3.2026.0414";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = [ "default" ];
|
||||
@@ -289,20 +289,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
|
||||
sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.0";
|
||||
version = "1.21.1";
|
||||
};
|
||||
mustache = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch";
|
||||
sha256 = "003cyf76zmki1lnh55cvir7dkn0s70dm909dxn6sfk9m00s2886l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
};
|
||||
mustache-sinatra = {
|
||||
dependencies = [ "mustache" ];
|
||||
@@ -316,15 +316,14 @@
|
||||
version = "2.0.0";
|
||||
};
|
||||
mustermann = {
|
||||
dependencies = [ "ruby2_keywords" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
|
||||
sha256 = "163i29mdcr1h0nximk3d51a1fgp7vz3sfasn8p1rjm2d4g3p0qac";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.4";
|
||||
version = "3.1.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = [
|
||||
@@ -335,20 +334,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
|
||||
sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.10";
|
||||
version = "1.19.3";
|
||||
};
|
||||
octicons = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1np1wipr98padazkah6flc1iqhs8n2k02w6inrd5v12f75fxw3w9";
|
||||
sha256 = "0n60z2nnpp1zn3rk6na67rp2v7ihk00sr28j837qbwgakqaza76j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "19.21.0";
|
||||
version = "19.25.0";
|
||||
};
|
||||
org-ruby = {
|
||||
dependencies = [ "rubypants" ];
|
||||
@@ -370,10 +369,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
|
||||
sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6";
|
||||
version = "5.3.1";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
@@ -390,10 +389,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
|
||||
sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.4";
|
||||
version = "3.2.6";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = [
|
||||
@@ -419,10 +418,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1sg4laz2qmllxh1c5sqlj9n1r7scdn08p3m4b0zmhjvyx9yw0v8b";
|
||||
sha256 = "1s7zcxlmg88a6dam4aqbgk9xkpy6dkdfqmmcszkkliy3q3w38m2r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
};
|
||||
rackup = {
|
||||
dependencies = [ "rack" ];
|
||||
@@ -430,10 +429,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp";
|
||||
sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
};
|
||||
rdoc = {
|
||||
dependencies = [
|
||||
@@ -445,10 +444,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8";
|
||||
sha256 = "1dq2bani47fzyqpb4psizfmzxiznvzlajmdikdgik67wd3jx8l0g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.15.1";
|
||||
version = "6.17.0";
|
||||
};
|
||||
RedCloth = {
|
||||
groups = [ "default" ];
|
||||
@@ -486,20 +485,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0dv74a07j3ih5ykyszs1k2cjvgs5c1pzrvcb1wc2bfai8p038qml";
|
||||
sha256 = "1yhya0dfd3ghy70amzd15ssh7y81jhblnzx01fhcscnq69nl9l1v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.1";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.5";
|
||||
version = "0.3.2";
|
||||
};
|
||||
rubypants = {
|
||||
groups = [ "default" ];
|
||||
@@ -587,10 +576,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1v74k5yw7ndikr53wgbjn6j51p83qnzqbn9z4b53r102jcx3ri4r";
|
||||
sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.8";
|
||||
version = "3.2.0";
|
||||
};
|
||||
therubyrhino = {
|
||||
dependencies = [ "therubyrhino_jar" ];
|
||||
@@ -618,10 +607,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
|
||||
sha256 = "1cvaikq1dcbfl008i16c1pi1gmdax7vfkvmhch64jdkakyk9nnqd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
};
|
||||
tsort = {
|
||||
groups = [ "default" ];
|
||||
@@ -680,10 +669,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
|
||||
sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
};
|
||||
wikicloth = {
|
||||
dependencies = [
|
||||
|
||||
@@ -39,27 +39,27 @@ let
|
||||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b";
|
||||
hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI=";
|
||||
rev = "babee77020ff82b571d723ce2c0262e2ec0ee3f1";
|
||||
hash = "sha256-GWcNNw08XoKaZs/BTW9nPAEMHL8wqbhbUm56PUtEan4=";
|
||||
};
|
||||
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "13b59bf1d84054b8ccd29cdc6b1303f69e8f9e77";
|
||||
hash = "sha256-k/mTHiLbZdnslC24fjcrzqsZYMyVaAADGEqngqJcC2c=";
|
||||
rev = "4c1ae3cd6f9076271cd64acde8cbef1d1287f27f";
|
||||
hash = "sha256-x7OXe0q9ml8PIxWyTEx3j3tvSgIPp8kg5HwlLWIzNuk=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amber";
|
||||
version = "0-unstable-2025-02-03";
|
||||
version = "0-unstable-2026-04-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "amber";
|
||||
rev = "3f078e41d86ca1a5881560f00e26198f59bb8ac0";
|
||||
hash = "sha256-pAotVFmtEGp9GKmDD0vrbfbO+Xt2URmM8gYCjl0LEnk=";
|
||||
rev = "fc02f9bad7ddaf5ca685ad01c3a0668d19910fbf";
|
||||
hash = "sha256-en+q6pLBTiVRg5XdP2qmPfkPnywYqEOsm2/er3m75Jw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -96,9 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin amber image_diff
|
||||
wrapProgram $out/bin/amber \
|
||||
--suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.lavapipe =
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "google-lighthouse";
|
||||
version = "13.2.0";
|
||||
version = "13.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleChrome";
|
||||
repo = "lighthouse";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D/HQP34/EGJLWgRneiYP8eByUNSjKwQQLD0FScgYAVo=";
|
||||
hash = "sha256-5GFaM6R836Z/EKTvDLF0/aLox5VltcwgLSWzAmn77EY=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-DKFPnSj3jujCWb+KitgTZaIJB8XkHJBoncaNvzcuIVU=";
|
||||
hash = "sha256-tzN0rAHahBs4n6KCCAS2xoCxXmaZVtmB4WSNxia9TME=";
|
||||
};
|
||||
|
||||
yarnBuildScript = "build-report";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jpsxdec";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "m35";
|
||||
repo = "jpsxdec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PZOc5mpnUiUyydWyfZjWuPG4w+tRd6WLJ6YQMqu/95I=";
|
||||
hash = "sha256-X55/FKfPLSwl7veB0LOmXeFEh5zJ10zKdTbCUnnyB5g=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/jpsxdec";
|
||||
|
||||
@@ -14,23 +14,23 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kiro-cli";
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
|
||||
src =
|
||||
let
|
||||
darwinDmg = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
|
||||
hash = "sha256-z+eTOA5PTKYEcjdzHL4/LeFqUO61eXhdl0Yn3dzwtw0=";
|
||||
hash = "sha256-lHBlzPFeT9m54dbFBXm7l/bJIVcBJqodZ6xKD9XThJc=";
|
||||
};
|
||||
in
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
|
||||
hash = "sha256-QU8akDY0VrNMrcwuQJHZIUiJrCnjYzshmsaqviY0+PY=";
|
||||
hash = "sha256-zLizK/0m9PdIzN4IMicq7/95lWahj7sdLzEEYpv/o+E=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
|
||||
hash = "sha256-hFJN6FFE3uY1Wdjibb+PoXIKF6W70osg/euxSuLqCZA=";
|
||||
hash = "sha256-B4NElbGE0M7P6eGrd90UYvoeqN1fEoe+2g1/M1wM3ZY=";
|
||||
};
|
||||
x86_64-darwin = darwinDmg;
|
||||
aarch64-darwin = darwinDmg;
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libxcb,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
libxcb,
|
||||
versionCheckHook,
|
||||
withClipboard ? true,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "motus";
|
||||
version = "0.4.0";
|
||||
|
||||
@@ -23,8 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-6MKEHnB2MJVB4cNvz3JYlhuzxhzsA+Pq5OkpLNoAEyU=";
|
||||
|
||||
buildAndTestSubdir = "crates/motus-cli";
|
||||
|
||||
# The CLI crate version was not bumped to match the v0.4.0 release tag:
|
||||
# https://github.com/oleiade/motus/issues/58
|
||||
postPatch = ''
|
||||
@@ -32,12 +31,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '#[command(version = "0.3.1")]' '#[command(version = "${finalAttrs.version}")]'
|
||||
'';
|
||||
|
||||
buildNoDefaultFeatures = !withClipboard;
|
||||
|
||||
buildInputs = lib.optionals (withClipboard && stdenv.hostPlatform.isLinux) [ libxcb ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
buildAndTestSubdir = "crates/motus-cli";
|
||||
buildNoDefaultFeatures = !withClipboard;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
installShellFiles,
|
||||
makeWrapper,
|
||||
maven,
|
||||
mvnd,
|
||||
nix-update-script,
|
||||
runCommand,
|
||||
stdenv,
|
||||
@@ -19,16 +18,15 @@ let
|
||||
x86_64-darwin = "darwin-amd64";
|
||||
x86_64-linux = "linux-amd64";
|
||||
};
|
||||
inherit (platformMap.${stdenv.system}) os arch;
|
||||
in
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
maven.buildMavenPackage (finalAttrs: {
|
||||
pname = "mvnd";
|
||||
version = "1.0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "maven-mvnd";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-/ODRS6xaxkn7okUh8phN1GUNG7tDAKjmAIQn8NrC+ag=";
|
||||
};
|
||||
|
||||
@@ -42,7 +40,7 @@ maven.buildMavenPackage rec {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
mvnDepsParameters = mvnParameters;
|
||||
mvnDepsParameters = finalAttrs.mvnParameters;
|
||||
mvnParameters = lib.concatStringsSep " " (
|
||||
[
|
||||
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
|
||||
@@ -69,7 +67,7 @@ maven.buildMavenPackage rec {
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/mvnd-home
|
||||
|
||||
cp -r dist/target/maven-mvnd-${version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
|
||||
cp -r dist/target/maven-mvnd-${finalAttrs.version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
|
||||
makeWrapper $out/mvnd-home/bin/mvnd $out/bin/mvnd \
|
||||
--set-default MVND_HOME $out/mvnd-home
|
||||
|
||||
@@ -89,13 +87,13 @@ maven.buildMavenPackage rec {
|
||||
package =
|
||||
runCommand "mvnd"
|
||||
{
|
||||
inherit version;
|
||||
inherit (finalAttrs) version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \
|
||||
--suffix PATH : ${lib.makeBinPath [ mvnJdk ]}
|
||||
makeWrapper ${finalAttrs.finalPackage}/bin/mvnd $out/bin/mvnd \
|
||||
--suffix PATH : ${lib.makeBinPath [ finalAttrs.mvnJdk ]}
|
||||
'';
|
||||
};
|
||||
});
|
||||
@@ -108,4 +106,4 @@ maven.buildMavenPackage rec {
|
||||
maintainers = with lib.maintainers; [ nathanregner ];
|
||||
mainProgram = "mvnd";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
makeWrapper,
|
||||
electron_39, # as in upstream bundle, see https://github.com/NixOS/nixpkgs/pull/510075
|
||||
electron_40, # see https://github.com/NixOS/nixpkgs/pull/521495
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
autoPatchelfHook,
|
||||
@@ -91,7 +91,7 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${electron_39}/bin/electron $out/bin/obsidian \
|
||||
makeWrapper ${electron_40}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
@@ -41,13 +41,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peergos";
|
||||
repo = "web-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OA9Wt8nkXaYRu2gE9jyL6CYGv3OQd5uFUZQ1jCxD0KE=";
|
||||
hash = "sha256-lvgiVjNbXWKrEYe8kCgAi4hwdvawZysjGJiDSInKYsM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
stubsSrc = fetchFromGitHub {
|
||||
owner = "JetBrains";
|
||||
repo = "phpstorm-stubs";
|
||||
rev = "3327932472f512d2eb9e122b19702b335083fd9d";
|
||||
hash = "sha256-WN5DAvaw4FfHBl2AqSo1OcEthUm3lOpikdB78qy3cyY=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "phpantom-lsp";
|
||||
version = "0.7.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AJenbo";
|
||||
repo = "phpantom_lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZmtOdoxXkwn2IDg7RyQ9KG0RNz5mrGDMcESfcOSR3Ig=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p stubs/jetbrains
|
||||
cp -a ${finalAttrs.passthru.stubsSrc} stubs/jetbrains/phpstorm-stubs
|
||||
chmod u+wx stubs/jetbrains/phpstorm-stubs
|
||||
|
||||
echo "${finalAttrs.passthru.stubsSrc.rev}" \
|
||||
> stubs/jetbrains/phpstorm-stubs/.commit
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-pXP4qItYgmUXVx9XwMdS6WLVc5lP7P4VX9+0TbhYrUc=";
|
||||
|
||||
checkFlags = [
|
||||
"--test"
|
||||
"completion_inheritance"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit stubsSrc;
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script { })
|
||||
./update-php-stubs.sh
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/AJenbo/phpantom_lsp/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Fast, lightweight PHP language server written in Rust";
|
||||
homepage = "https://github.com/AJenbo/phpantom_lsp";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "phpantom_lsp";
|
||||
maintainers = with lib.maintainers; [ nanoyaki ];
|
||||
};
|
||||
})
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash curl gnused gnugrep nix-prefetch-github jq
|
||||
|
||||
file="./pkgs/by-name/ph/phpantom-lsp/package.nix"
|
||||
|
||||
version="$(grep -oP 'version = "\K[\d\.]+' "$file")"
|
||||
curl -O "https://raw.githubusercontent.com/AJenbo/phpantom_lsp/refs/tags/$version/stubs.lock"
|
||||
stubsVersion="$(grep -oP 'commit = "\K[^"]+' ./stubs.lock)"
|
||||
rm stubs.lock
|
||||
|
||||
stubsHash="$(
|
||||
nix-prefetch-github --rev "$stubsVersion" "JetBrains" "phpstorm-stubs" --json \
|
||||
2> /dev/null \
|
||||
| jq -r '.hash'
|
||||
)"
|
||||
|
||||
sed -i 's/\(rev = "\)[^"]*/\1'"$stubsVersion"'/' "$file"
|
||||
sed -i '/stubsSrc/,/}/ s#\(hash = "\)[^"]*#\1'"$stubsHash"'#' "$file"
|
||||
@@ -3,11 +3,13 @@
|
||||
"chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=",
|
||||
"desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
|
||||
"extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=",
|
||||
"file_picker": "sha256-qbbO532AN54xpJSQhZ9F2yVN6fmKWcz3x8jPzMiIetE=",
|
||||
"floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=",
|
||||
"flutter_smart_dialog": "sha256-sehrQraEWmYvUd9pdG4l3edbtR4yTcJOqPbuhzIrih4=",
|
||||
"flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
|
||||
"font_awesome_flutter": "sha256-EcrAmglNHxm16gWTi4nYbTfKx0CCprllIyvlvYlz8wY=",
|
||||
"get": "sha256-zQ2m29nKCEjGvresMaDBo1oYfQ6WrFVbMSitcGmxyhU=",
|
||||
"material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=",
|
||||
"material_design_icons_flutter": "sha256-t2ENlgb3ZRIc6jvufVwKGcty+3Te6/+XP10YDBrosYM=",
|
||||
"media_kit": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_libs_android_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_libs_ios_video": "sha256-mB3GN5Sc4oxUaW7xOgORaRzP9hKcRpcPxhmraKs/AMg=",
|
||||
@@ -16,8 +18,8 @@
|
||||
"media_kit_native_event_loop": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"media_kit_video": "sha256-tly3av5ojuasf+bXkOzLImcEm9oP25Y2flQDMV21T1s=",
|
||||
"native_device_orientation": "sha256-8abnUV7ZTAo0DAjekf353ey6xFvxfilTfbQOUWIahtk=",
|
||||
"screen_brightness_android": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=",
|
||||
"screen_brightness_platform_interface": "sha256-jxf+KDQAPzCi9+SVK0fUpHG/sR77pk0c76GUZEw04MI=",
|
||||
"screen_brightness_android": "sha256-iKH0yi89HxEe+yNpFvMpL7jJ5X6AbfeSBz3adIGkFtY=",
|
||||
"screen_brightness_platform_interface": "sha256-iKH0yi89HxEe+yNpFvMpL7jJ5X6AbfeSBz3adIGkFtY=",
|
||||
"super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=",
|
||||
"webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=",
|
||||
"window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo="
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
let
|
||||
srcInfo = lib.importJSON ./src-info.json;
|
||||
description = "Third-party Bilibili client developed in Flutter";
|
||||
version = "2.0.7";
|
||||
version = "2.0.7.2";
|
||||
in
|
||||
flutter341.buildFlutterApplication {
|
||||
pname = "piliplus";
|
||||
|
||||
@@ -442,16 +442,6 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
"cupertino_icons": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "cupertino_icons",
|
||||
"sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.9"
|
||||
},
|
||||
"dart_style": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -657,12 +647,13 @@
|
||||
"file_picker": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "1d4afa261268e59863af47b9f9dd9a230502d4c702b9d9183353646fe6d5b6e1",
|
||||
"url": "https://pub.dev"
|
||||
"path": ".",
|
||||
"ref": "dev",
|
||||
"resolved-ref": "8cf6cfa7078aa69c2c7b08d9ad636a1040456852",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.0.0-beta.1"
|
||||
"source": "git",
|
||||
"version": "12.0.0-beta.3"
|
||||
},
|
||||
"file_selector_linux": {
|
||||
"dependency": "transitive",
|
||||
@@ -943,11 +934,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_svg",
|
||||
"sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
|
||||
"sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.4"
|
||||
"version": "2.3.0"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@@ -984,11 +975,12 @@
|
||||
"font_awesome_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "font_awesome_flutter",
|
||||
"sha256": "f50ce90dbe26d977415b9540400d6778bef00894aced6358ae578abd92b14b10",
|
||||
"url": "https://pub.dev"
|
||||
"path": ".",
|
||||
"ref": "v10.9.0",
|
||||
"resolved-ref": "cf4a19ece5cb296d73d90f0d73106f779c85fa26",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/font_awesome_flutter.git"
|
||||
},
|
||||
"source": "hosted",
|
||||
"source": "git",
|
||||
"version": "10.9.0"
|
||||
},
|
||||
"get": {
|
||||
@@ -1036,11 +1028,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "gtk",
|
||||
"sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
|
||||
"sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"hive_ce": {
|
||||
"dependency": "direct main",
|
||||
@@ -1417,7 +1409,7 @@
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "const",
|
||||
"resolved-ref": "c11f18c031f1045900dc3e817f7519eb863c2550",
|
||||
"resolved-ref": "2bb68d1de3c7bb8c6117fce54d43da65a2387163",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/material_design_icons_flutter.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1916,32 +1908,32 @@
|
||||
"description": {
|
||||
"path": "screen_brightness_android",
|
||||
"ref": "dev",
|
||||
"resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9",
|
||||
"resolved-ref": "9823a66d9a0af8d9f5d0d9e98f87bb17e399235e",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "2.1.3"
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"screen_brightness_ios": {
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"name": "screen_brightness_ios",
|
||||
"sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5",
|
||||
"sha256": "0792d8f98852558f831b4b75241c46047b884598b3f4d982b37dc2dd43e2b2e1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"screen_brightness_platform_interface": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "screen_brightness_platform_interface",
|
||||
"ref": "dev",
|
||||
"resolved-ref": "0696d1f3665511496bfeb842f02deada5cd57ff9",
|
||||
"resolved-ref": "9823a66d9a0af8d9f5d0d9e98f87bb17e399235e",
|
||||
"url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "2.1.0"
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"screen_retriever": {
|
||||
"dependency": "direct main",
|
||||
@@ -1997,11 +1989,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sentry",
|
||||
"sha256": "1f78300740739ff4b4920802687879231554350eab73eb229778f463aabda440",
|
||||
"sha256": "f04095a25ff02b202a914174c73ec309570aa93d61098cb4a0a9e715b4aaa465",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.19.0"
|
||||
"version": "9.20.0"
|
||||
},
|
||||
"share_plus": {
|
||||
"dependency": "direct main",
|
||||
@@ -2163,11 +2155,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite_common",
|
||||
"sha256": "5e8377564d95166761a968ed96104e0569b6b6cc611faac92a36ab8a169112c3",
|
||||
"sha256": "f8a08a13fb8f0f8c590df89d745000bed44a673ed94bac846739e1a016875c21",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.5.6+1"
|
||||
"version": "2.5.7"
|
||||
},
|
||||
"sqflite_darwin": {
|
||||
"dependency": "transitive",
|
||||
@@ -2384,11 +2376,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_web",
|
||||
"sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
|
||||
"sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
"version": "2.4.3"
|
||||
},
|
||||
"url_launcher_windows": {
|
||||
"dependency": "transitive",
|
||||
@@ -2414,11 +2406,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics",
|
||||
"sha256": "6409a25046024f0f8c5d8a59fec314081e81f9d436b66ca4015a8b49772bf445",
|
||||
"sha256": "4d35a36400983c3457c289d4d553b5308f506ea84f7e51c7a564651b5525209a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"vector_graphics_codec": {
|
||||
"dependency": "transitive",
|
||||
@@ -2434,11 +2426,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics_compiler",
|
||||
"sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
|
||||
"sha256": "98e7e94de127b46a86ef46197fff84ff99f3d3b80a708390d717ad731efef598",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "direct main",
|
||||
@@ -2484,11 +2476,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "wakelock_plus_platform_interface",
|
||||
"sha256": "14b2e5b9e35c2631e656913c47adecdd71633ae92896a27a64c8f1fcfabc21cc",
|
||||
"sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
"version": "1.5.1"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
@@ -2555,11 +2547,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32",
|
||||
"sha256": "ba7d5750e3441caa1bbe31d9e516348fcf8dfcb32aa29ef87a844a59f4d1f1d0",
|
||||
"sha256": "a1fc9eb9248baa05dfc12ed5b66e377b3e23f095eec078e0371622b9033810d9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.0"
|
||||
"version": "6.2.0"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"rev": "b7b40c557e708ace77ed65098005193eb89b8208",
|
||||
"revCount": 4940,
|
||||
"commitDate": 1777948879,
|
||||
"hash": "sha256-E0ezM87Ecw54XD/MccPhRjg4iQ8LJRewQKbH/bPV9MI="
|
||||
"rev": "ad6c0e0d157650a76d22c3634cd93f433ed6eeb0",
|
||||
"revCount": 4956,
|
||||
"commitDate": 1778812800,
|
||||
"hash": "sha256-yLbivIJHYtRfmlAeR78GY6+9vKZtLePc0uID/JxgHng="
|
||||
}
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
--- pilot-link/configure.ac
|
||||
+++ pilot-link/configure.ac
|
||||
@@ -63,8 +63,8 @@
|
||||
dnl Eat -Werror so configure will run properly, if the user provided it
|
||||
enable_werror=no
|
||||
save_CFLAGS="$CFLAGS"
|
||||
-CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g)
|
||||
-CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g)
|
||||
+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g')
|
||||
+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g')
|
||||
if test "x$CFLAGS" != "x$save_CFLAGS"; then
|
||||
dnl -Werror was set; treat it as implicit --enable-werror below
|
||||
enable_werror="yes"
|
||||
@@ -392,11 +392,8 @@
|
||||
dnl Determine if system popt is good enough
|
||||
save_LIBS="$LIBS"
|
||||
AC_CHECK_HEADER(popt.h,
|
||||
- AC_CHECK_DECL(POPT_BIT_SET,
|
||||
- AC_CHECK_LIB(popt, poptStrippedArgv,,
|
||||
- [with_included_popt="yes"]),
|
||||
- [with_included_popt="yes"],
|
||||
- [#include <popt.h>]),
|
||||
+ AC_CHECK_LIB(popt, poptStrippedArgv,,
|
||||
+ [with_included_popt="yes"]),
|
||||
[with_included_popt="yes"]
|
||||
)
|
||||
LIBS="$save_LIBS"
|
||||
@@ -19,20 +19,19 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "pilot-link";
|
||||
version = "0.13.0-unstable-2022-09-26";
|
||||
version = "0.13.0-unstable-2026-04-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desrod";
|
||||
repo = "pilot-link";
|
||||
rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf";
|
||||
hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I";
|
||||
rev = "fa3c832fb0aabd9465664309168abf278fd38f2a";
|
||||
hash = "sha256-EZwE2iO1QZCzv5uVYTpUaHS9tIlBASs5W8i9f3QV4Ks=";
|
||||
};
|
||||
|
||||
# Resolve build issues on modern systems.
|
||||
# https://github.com/desrod/pilot-link/issues/16
|
||||
# https://aur.archlinux.org/packages/pilot-link-git
|
||||
patches = [
|
||||
./configure-checks.patch
|
||||
./incompatible-pointer-type.patch
|
||||
]
|
||||
++ lib.optionals enableConduits [ ./format-string-literals.patch ]
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plutovg";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sammycage";
|
||||
repo = "plutovg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4TvbNsElDL7WX3yXLDM5nwHFCHQdUclk6HQ5MbPUEZE=";
|
||||
hash = "sha256-JP/nNHszTABIat79vcUqFdtv+/Z13D28aYKEt7BALCw=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "remnote";
|
||||
version = "1.26.8";
|
||||
version = "1.26.11";
|
||||
src = fetchurl {
|
||||
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
|
||||
hash = "sha256-enFTy+RIYrvq9ScLPExSaKDGQy+MLSbKAQTREIkJB28=";
|
||||
hash = "sha256-3F1lC/3ek6k3x6qZ4WswJRe/QYEy3iTNMhMmLtR6i0U=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -0,0 +1,525 @@
|
||||
diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
|
||||
index c78746a..4186648 100644
|
||||
--- a/src/node/desktop/package-lock.json
|
||||
+++ b/src/node/desktop/package-lock.json
|
||||
@@ -10,7 +10,7 @@
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0-only",
|
||||
"dependencies": {
|
||||
- "@electron/fuses": "2.0.0",
|
||||
+ "@electron/fuses": "2.1.1",
|
||||
"@vueuse/core": "13.6.0",
|
||||
"crc": "4.3.2",
|
||||
"electron-store": "11.0.2",
|
||||
@@ -30,7 +30,7 @@
|
||||
"devDependencies": {
|
||||
"@electron-forge/cli": "7.11.1",
|
||||
"@electron-forge/plugin-webpack": "7.11.1",
|
||||
- "@electron/packager": "19.0.5",
|
||||
+ "@electron/packager": "20.0.0",
|
||||
"@eslint/eslintrc": "3.3.4",
|
||||
"@eslint/js": "10.0.1",
|
||||
"@types/chai": "5.2.3",
|
||||
@@ -48,7 +48,7 @@
|
||||
"chai": "6.2.2",
|
||||
"copy-webpack-plugin": "14.0.0",
|
||||
"css-loader": "7.1.4",
|
||||
- "electron": "39.8.7",
|
||||
+ "electron": "41.3.0",
|
||||
"electron-mocha": "13.1.0",
|
||||
"eslint": "10.0.0",
|
||||
"fork-ts-checker-webpack-plugin": "9.1.0",
|
||||
@@ -57,7 +57,7 @@
|
||||
"json-schema-to-typescript": "15.0.4",
|
||||
"lint-staged": "16.2.7",
|
||||
"mocha": "11.7.5",
|
||||
- "nan": "2.25.0",
|
||||
+ "nan": "2.26.2",
|
||||
"node-loader": "2.1.0",
|
||||
"prettier": "3.8.1",
|
||||
"process": "0.11.10",
|
||||
@@ -1220,9 +1220,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/fuses": {
|
||||
- "version": "2.0.0",
|
||||
- "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-2.0.0.tgz",
|
||||
- "integrity": "sha512-lyb1zK3YHeWUjaz7yiK0GnxSPduwASKMyiDbCtbn3spP6EEt+UWtktggWehG0icFrXAk3GwvcJ4nCrJO0N9IhQ==",
|
||||
+ "version": "2.1.1",
|
||||
+ "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-2.1.1.tgz",
|
||||
+ "integrity": "sha512-38ho27/mtUV/LpsZ1LCDJUomKBBSUZDk/qBH4FNNtoN5fmnkmWDcIp5pm1Kv3InqhRjKZKs7Jzx+wWZNMArHrA==",
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"electron-fuses": "dist/bin.js"
|
||||
@@ -1409,14 +1409,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/packager": {
|
||||
- "version": "19.0.5",
|
||||
- "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-19.0.5.tgz",
|
||||
- "integrity": "sha512-HSWJp5ZTYkavzoLViPBK8sUaINrHbhHMueMrYpQea5DkzOplxYCgAKmy+FKsBk7WUm6iYZZ0gJe8f8nIEScqJQ==",
|
||||
+ "version": "20.0.0",
|
||||
+ "resolved": "https://registry.npmjs.org/@electron/packager/-/packager-20.0.0.tgz",
|
||||
+ "integrity": "sha512-kl4c4LcsrQflg0wAi3mqpmmZFRdTYoZFLZPBP9YeEIvWwQR1NmkZphwT7558UeLOdhr6Ac5l83r8W69KaJBedg==",
|
||||
"dev": true,
|
||||
"license": "BSD-2-Clause",
|
||||
"dependencies": {
|
||||
"@electron/asar": "^4.0.1",
|
||||
- "@electron/get": "^4.0.2",
|
||||
+ "@electron/get": "^5.0.0",
|
||||
"@electron/notarize": "^3.1.0",
|
||||
"@electron/osx-sign": "^2.2.0",
|
||||
"@electron/universal": "^3.0.1",
|
||||
@@ -1426,13 +1426,11 @@
|
||||
"extract-zip": "^2.0.1",
|
||||
"filenamify": "^6.0.0",
|
||||
"galactus": "^2.0.2",
|
||||
- "get-package-info": "^1.0.0",
|
||||
"graceful-fs": "^4.2.11",
|
||||
"junk": "^4.0.1",
|
||||
"parse-author": "^2.0.0",
|
||||
"plist": "^3.1.0",
|
||||
"resedit": "^2.0.3",
|
||||
- "resolve": "^1.22.10",
|
||||
"semver": "^7.7.2",
|
||||
"yargs-parser": "^22.0.0"
|
||||
},
|
||||
@@ -1447,15 +1445,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/packager/node_modules/@electron/get": {
|
||||
- "version": "4.0.2",
|
||||
- "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.2.tgz",
|
||||
- "integrity": "sha512-n9fRt/nzzOOZdDtTP3kT6GVdo0ro9FgMKCoS520kQMIiKBhpGmPny6yK/lER3tOCKr+wLYW1O25D9oI6ZinwCA==",
|
||||
+ "version": "5.0.0",
|
||||
+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.0.0.tgz",
|
||||
+ "integrity": "sha512-pjoBpru1KdEtcExBnuHAP1cAc/5faoedw0hzJkL3o4/IJp7HNF1+fbrdxT3gMYRX2oJfvnA/WXeCTVQpYYxyJA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"debug": "^4.1.1",
|
||||
"env-paths": "^3.0.0",
|
||||
- "got": "^14.4.5",
|
||||
"graceful-fs": "^4.2.11",
|
||||
"progress": "^2.0.3",
|
||||
"semver": "^7.6.3",
|
||||
@@ -1465,65 +1462,7 @@
|
||||
"node": ">=22.12.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
- "global-agent": "^3.0.0"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/@sindresorhus/is": {
|
||||
- "version": "7.2.0",
|
||||
- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz",
|
||||
- "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=18"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sindresorhus/is?sponsor=1"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/cacheable-lookup": {
|
||||
- "version": "7.0.0",
|
||||
- "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
|
||||
- "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=14.16"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/cacheable-request": {
|
||||
- "version": "13.0.18",
|
||||
- "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.18.tgz",
|
||||
- "integrity": "sha512-rFWadDRKJs3s2eYdXlGggnBZKG7MTblkFBB0YllFds+UYnfogDp2wcR6JN97FhRkHTvq59n2vhNoHNZn29dh/Q==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "@types/http-cache-semantics": "^4.0.4",
|
||||
- "get-stream": "^9.0.1",
|
||||
- "http-cache-semantics": "^4.2.0",
|
||||
- "keyv": "^5.5.5",
|
||||
- "mimic-response": "^4.0.0",
|
||||
- "normalize-url": "^8.1.1",
|
||||
- "responselike": "^4.0.2"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=18"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/decompress-response": {
|
||||
- "version": "10.0.0",
|
||||
- "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz",
|
||||
- "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "mimic-response": "^4.0.0"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=20"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
+ "undici": "^7.24.4"
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/packager/node_modules/env-paths": {
|
||||
@@ -1568,165 +1507,6 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
- "node_modules/@electron/packager/node_modules/get-stream": {
|
||||
- "version": "9.0.1",
|
||||
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
|
||||
- "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "@sec-ant/readable-stream": "^0.4.1",
|
||||
- "is-stream": "^4.0.1"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=18"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/got": {
|
||||
- "version": "14.6.6",
|
||||
- "resolved": "https://registry.npmjs.org/got/-/got-14.6.6.tgz",
|
||||
- "integrity": "sha512-QLV1qeYSo5l13mQzWgP/y0LbMr5Plr5fJilgAIwgnwseproEbtNym8xpLsDzeZ6MWXgNE6kdWGBjdh3zT/Qerg==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "@sindresorhus/is": "^7.0.1",
|
||||
- "byte-counter": "^0.1.0",
|
||||
- "cacheable-lookup": "^7.0.0",
|
||||
- "cacheable-request": "^13.0.12",
|
||||
- "decompress-response": "^10.0.0",
|
||||
- "form-data-encoder": "^4.0.2",
|
||||
- "http2-wrapper": "^2.2.1",
|
||||
- "keyv": "^5.5.3",
|
||||
- "lowercase-keys": "^3.0.0",
|
||||
- "p-cancelable": "^4.0.1",
|
||||
- "responselike": "^4.0.2",
|
||||
- "type-fest": "^4.26.1"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=20"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sindresorhus/got?sponsor=1"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/http2-wrapper": {
|
||||
- "version": "2.2.1",
|
||||
- "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
|
||||
- "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "quick-lru": "^5.1.1",
|
||||
- "resolve-alpn": "^1.2.0"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=10.19.0"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/is-stream": {
|
||||
- "version": "4.0.1",
|
||||
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
|
||||
- "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=18"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/keyv": {
|
||||
- "version": "5.6.0",
|
||||
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
|
||||
- "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "@keyv/serialize": "^1.1.1"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/lowercase-keys": {
|
||||
- "version": "3.0.0",
|
||||
- "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
|
||||
- "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/mimic-response": {
|
||||
- "version": "4.0.0",
|
||||
- "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
|
||||
- "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/normalize-url": {
|
||||
- "version": "8.1.1",
|
||||
- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz",
|
||||
- "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=14.16"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/p-cancelable": {
|
||||
- "version": "4.0.1",
|
||||
- "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-4.0.1.tgz",
|
||||
- "integrity": "sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=14.16"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/responselike": {
|
||||
- "version": "4.0.2",
|
||||
- "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz",
|
||||
- "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "dependencies": {
|
||||
- "lowercase-keys": "^3.0.0"
|
||||
- },
|
||||
- "engines": {
|
||||
- "node": ">=20"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
- "node_modules/@electron/packager/node_modules/type-fest": {
|
||||
- "version": "4.41.0",
|
||||
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
|
||||
- "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
|
||||
- "dev": true,
|
||||
- "license": "(MIT OR CC0-1.0)",
|
||||
- "engines": {
|
||||
- "node": ">=16"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
"node_modules/@electron/rebuild": {
|
||||
"version": "3.7.2",
|
||||
"resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.2.tgz",
|
||||
@@ -2384,13 +2164,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
- "node_modules/@keyv/serialize": {
|
||||
- "version": "1.1.1",
|
||||
- "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
|
||||
- "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
|
||||
- "dev": true,
|
||||
- "license": "MIT"
|
||||
- },
|
||||
"node_modules/@leichtgewicht/ip-codec": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
|
||||
@@ -2606,13 +2379,6 @@
|
||||
"node": ">=14"
|
||||
}
|
||||
},
|
||||
- "node_modules/@sec-ant/readable-stream": {
|
||||
- "version": "0.4.1",
|
||||
- "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
|
||||
- "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
|
||||
- "dev": true,
|
||||
- "license": "MIT"
|
||||
- },
|
||||
"node_modules/@sindresorhus/is": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
|
||||
@@ -4389,19 +4155,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
- "node_modules/byte-counter": {
|
||||
- "version": "0.1.0",
|
||||
- "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
|
||||
- "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">=20"
|
||||
- },
|
||||
- "funding": {
|
||||
- "url": "https://github.com/sponsors/sindresorhus"
|
||||
- }
|
||||
- },
|
||||
"node_modules/bytes": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
||||
@@ -5797,15 +5550,15 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/electron": {
|
||||
- "version": "39.8.7",
|
||||
- "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.7.tgz",
|
||||
- "integrity": "sha512-B3TmzbUEeIvrhJ0QcoFp8/tgnVA3vsm0wkdYWzC22hsk9zTVqkzyrrz40cjd0nMTTIrGWxxfDO2tdQTCMe9Bjw==",
|
||||
+ "version": "41.3.0",
|
||||
+ "resolved": "https://registry.npmjs.org/electron/-/electron-41.3.0.tgz",
|
||||
+ "integrity": "sha512-2Q5aeocmFdeheZGDUTrAvSR3t+n0c3d104AJWWEnt7syJU0tE4VdibMYaPtQ47QuXSoUf0/xSsfUUvu/uSXIfg==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/get": "^2.0.0",
|
||||
- "@types/node": "^22.7.7",
|
||||
+ "@types/node": "^24.9.0",
|
||||
"extract-zip": "^2.0.1"
|
||||
},
|
||||
"bin": {
|
||||
@@ -5932,13 +5685,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron/node_modules/@types/node": {
|
||||
- "version": "22.19.11",
|
||||
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.11.tgz",
|
||||
- "integrity": "sha512-BH7YwL6rA93ReqeQS1c4bsPpcfOmJasG+Fkr6Y59q83f9M1WcBRHR2vM+P9eOisYRcN3ujQoiZY8uk5W+1WL8w==",
|
||||
+ "version": "24.12.4",
|
||||
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.4.tgz",
|
||||
+ "integrity": "sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
- "undici-types": "~6.21.0"
|
||||
+ "undici-types": "~7.16.0"
|
||||
}
|
||||
},
|
||||
"node_modules/electron/node_modules/fs-extra": {
|
||||
@@ -5977,9 +5730,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron/node_modules/undici-types": {
|
||||
- "version": "6.21.0",
|
||||
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
|
||||
- "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
|
||||
+ "version": "7.16.0",
|
||||
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
|
||||
+ "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -7073,16 +6826,6 @@
|
||||
"url": "https://opencollective.com/webpack"
|
||||
}
|
||||
},
|
||||
- "node_modules/form-data-encoder": {
|
||||
- "version": "4.1.0",
|
||||
- "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.1.0.tgz",
|
||||
- "integrity": "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw==",
|
||||
- "dev": true,
|
||||
- "license": "MIT",
|
||||
- "engines": {
|
||||
- "node": ">= 18"
|
||||
- }
|
||||
- },
|
||||
"node_modules/forwarded": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
|
||||
@@ -9948,9 +9691,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/nan": {
|
||||
- "version": "2.25.0",
|
||||
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.25.0.tgz",
|
||||
- "integrity": "sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==",
|
||||
+ "version": "2.26.2",
|
||||
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
|
||||
+ "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
|
||||
"devOptional": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -13055,6 +12798,17 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
+ "node_modules/undici": {
|
||||
+ "version": "7.25.0",
|
||||
+ "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz",
|
||||
+ "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==",
|
||||
+ "dev": true,
|
||||
+ "license": "MIT",
|
||||
+ "optional": true,
|
||||
+ "engines": {
|
||||
+ "node": ">=20.18.1"
|
||||
+ }
|
||||
+ },
|
||||
"node_modules/undici-types": {
|
||||
"version": "7.18.2",
|
||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
|
||||
diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
|
||||
index 613361f..b75506a 100644
|
||||
--- a/src/node/desktop/package.json
|
||||
+++ b/src/node/desktop/package.json
|
||||
@@ -29,7 +29,7 @@
|
||||
"devDependencies": {
|
||||
"@electron-forge/cli": "7.11.1",
|
||||
"@electron-forge/plugin-webpack": "7.11.1",
|
||||
- "@electron/packager": "19.0.5",
|
||||
+ "@electron/packager": "20.0.0",
|
||||
"@eslint/eslintrc": "3.3.4",
|
||||
"@eslint/js": "10.0.1",
|
||||
"@types/chai": "5.2.3",
|
||||
@@ -47,7 +47,7 @@
|
||||
"chai": "6.2.2",
|
||||
"copy-webpack-plugin": "14.0.0",
|
||||
"css-loader": "7.1.4",
|
||||
- "electron": "39.8.7",
|
||||
+ "electron": "41.3.0",
|
||||
"electron-mocha": "13.1.0",
|
||||
"eslint": "10.0.0",
|
||||
"fork-ts-checker-webpack-plugin": "9.1.0",
|
||||
@@ -56,7 +56,7 @@
|
||||
"json-schema-to-typescript": "15.0.4",
|
||||
"lint-staged": "16.2.7",
|
||||
"mocha": "11.7.5",
|
||||
- "nan": "2.25.0",
|
||||
+ "nan": "2.26.2",
|
||||
"node-loader": "2.1.0",
|
||||
"prettier": "3.8.1",
|
||||
"process": "0.11.10",
|
||||
@@ -69,7 +69,7 @@
|
||||
"webpack": "5.105.4"
|
||||
},
|
||||
"dependencies": {
|
||||
- "@electron/fuses": "2.0.0",
|
||||
+ "@electron/fuses": "2.1.1",
|
||||
"@vueuse/core": "13.6.0",
|
||||
"crc": "4.3.2",
|
||||
"electron-store": "11.0.2",
|
||||
@@ -26,7 +26,7 @@
|
||||
zip,
|
||||
|
||||
boost190,
|
||||
electron_39,
|
||||
electron_41,
|
||||
fontconfig,
|
||||
gnumake,
|
||||
hunspellDicts,
|
||||
@@ -45,7 +45,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_39;
|
||||
electron = electron_41;
|
||||
boost = boost190;
|
||||
|
||||
mathJaxSrc = fetchzip {
|
||||
@@ -201,6 +201,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Partly taken from https://github.com/rstudio/rstudio/pull/17470
|
||||
./electron-41.patch
|
||||
|
||||
# Hack RStudio to only use the input R and provided libclang.
|
||||
(replaceVars ./r-location.patch {
|
||||
R = lib.getBin R;
|
||||
@@ -249,9 +252,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "rstudio-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
inherit (finalAttrs) src patches;
|
||||
postPatch = "cd ${finalAttrs.npmRoot}";
|
||||
hash = "sha256-lO+wJk0HWYrKO1Rqz8laVpZK5RUfA9ijYvtPEtVf1r4=";
|
||||
hash = "sha256-MuTY+vjtbgbk73dm6bsCUmi34z/HCDnB5/RLkZ/rrVo=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rust-parallel";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "aaronriekenberg";
|
||||
repo = "rust-parallel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6SDWYIJDoDKANYZvYM2hdFzXTyqbfRA2uKQDFn+6erg=";
|
||||
hash = "sha256-quLvYnYhu8ZkUT/7v/WjwMLxDlvYcj3hlIYPkv1xogg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uFx0Sli6uwmhHKQoT1aX0S5NwuWLu3M6g5pQYYpAsEI=";
|
||||
cargoHash = "sha256-m2Galjkr7iFO+s0vYaYAeM5Xrvls6vNVReTbLUUo44I=";
|
||||
|
||||
checkInputs = [ bashNonInteractive ];
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sandhole";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EpicEric";
|
||||
repo = "sandhole";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NyRj00+2RjfcwAPD4h34bWy5g+GnWYkkNQ936mKZzw0=";
|
||||
hash = "sha256-nACjMd1GGfopXTqkkJP3zOnFGqB4TeuJCoQWZXSnBiA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rNLtRNVL6JLoUUZTev4Mktha8nAgIgTYl+0k44J3hPg=";
|
||||
cargoHash = "sha256-n3VoLQP6jmYJvo/6GRXaB/u9XfewlOOt/zKD9YbCQzU=";
|
||||
|
||||
# All integration tests require networking.
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
baseName = "scalafmt";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${baseName}-deps-${version}";
|
||||
buildCommand = ''
|
||||
@@ -19,7 +19,7 @@ let
|
||||
cp $(< deps) $out/share/java/
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-oCfwYvyyMZqJh+N6rnzIIWiP9ufWApRUDUOuJ3eXyB4=";
|
||||
outputHash = "sha256-EgkXDCbgn7OmH1e/us6lyNiei/qZMzFn/1Qh4LiraBo=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace configure --replace "libct.so" "libct.dylib"
|
||||
'';
|
||||
|
||||
# 'bool' used as identifier rejected by gcc 15's C23 default.
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1627,7 +1627,6 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> {
|
||||
let distro_id = required_env("DISTRO_ID")?;
|
||||
let pre_switch_check = required_env("PRE_SWITCH_CHECK")?;
|
||||
let install_bootloader = required_env("INSTALL_BOOTLOADER")?;
|
||||
let locale_archive = required_env("LOCALE_ARCHIVE")?;
|
||||
let new_systemd = PathBuf::from(required_env("SYSTEMD")?);
|
||||
let log_level = if std::env::var("STC_DEBUG").is_ok() {
|
||||
LevelFilter::Debug
|
||||
@@ -1642,11 +1641,6 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> {
|
||||
// environment variable from now on
|
||||
std::env::set_var("NIXOS_ACTION", Into::<&'static str>::into(action));
|
||||
|
||||
// Expose the locale archive as an environment variable for systemctl and the activation script
|
||||
if !locale_archive.is_empty() {
|
||||
std::env::set_var("LOCALE_ARCHIVE", locale_archive);
|
||||
}
|
||||
|
||||
let os_release = parse_os_release().context("Failed to parse os-release")?;
|
||||
|
||||
let distro_id_re = Regex::new(format!("^\"?{distro_id}\"?$").as_str())
|
||||
|
||||
@@ -16,10 +16,18 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw=";
|
||||
|
||||
checkFlags = [
|
||||
# flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths
|
||||
"--skip=proxy::middle_relay::middle_relay_atomic_quota_invariant_tests::me_writer_data_write_obeys_flow_cancellation"
|
||||
# flaky: timing-coupling assertion fires on slower hardware
|
||||
"--skip=proxy::masking::masking_timing_budget_coupling_security_tests::adversarial_delayed_interface_lookup_does_not_consume_outcome_floor_budget"
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "telemt";
|
||||
description = "MTProxy for Telegram on Rust + Tokio";
|
||||
homepage = "https://github.com/telemt/telemt";
|
||||
maintainers = with lib.maintainers; [ r4v3n6101 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,13 +36,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ueberzugpp";
|
||||
version = "2.9.8";
|
||||
version = "2.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstkdng";
|
||||
repo = "ueberzugpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU=";
|
||||
hash = "sha256-YrMFSbNQLamqT7asVxDz8JYgjYNdbdbR7axeopgWTMk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vhdl-ls";
|
||||
version = "0.86.0";
|
||||
version = "0.87.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VHDL-LS";
|
||||
repo = "rust_hdl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-H8s4YZPpe7Z3IafY4lt4Gn/jjeULJFSA/6kMb9IrV50=";
|
||||
hash = "sha256-tQdBiUoPRmPBNDutgCTkaUq022blrujT6G562KdQPqE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ULJpmT8DXSr6hqBxn6weWJUmplCboxhSekxaWmu4aHE=";
|
||||
cargoHash = "sha256-m/wYku+RRoZ2zULb/guVswG7SWoWjhp04R0sNI6HXgs=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vhdl_lang/src/config.rs \
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "7.9.3970.64";
|
||||
version = "7.9.3970.67";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
|
||||
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-51Lsbs1Vv8Qy9aBUxPzfadpKia+PHnBjptHY4LSN1Mo=";
|
||||
x86_64-linux = "sha256-WJn7vmIPJ7/e0UG2uoNedji/Vd0QTY2LNJMBNqTF9Po=";
|
||||
aarch64-linux = "sha256-GXG1e5d+wxmrzryDQdGplJlAnxAl6kGWzopgE4qH8Zw=";
|
||||
x86_64-linux = "sha256-fvw2FajFP5Aspwdb+C0XUJLWABrZ7/clD4OX8FLtIKI=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-tools";
|
||||
version = "1.248.0";
|
||||
version = "1.249.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B0G+k5RI7j1J0G4l2lcpA6iTTNUmjQOOwi3zij0Ww+c=";
|
||||
hash = "sha256-8YIFzaJ10ll4ESVsQWf3hRPBNpgBGFvEdDbwbJ7PsI4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-yMp8AWcWfxTXq4eIekuPhgOdMbuoscck+r0O01cC+AA=";
|
||||
cargoHash = "sha256-CuSLE6AwslD0SWQALAY3TTuDCKAbl6w6l5x6CwXaqcM=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayle";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "wayle-rs";
|
||||
repo = "wayle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K4ItGV7kTZrm3uqHeN/hSZjKzkQpSn+nan3509FYUQw=";
|
||||
hash = "sha256-4hnbv31BWu6KbdSHphHnpl80R0ByxS0RxsM5uqtNnCU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-omCcKXYouS9qPdhVINJC2mAjI7uG0M9MH14BN/4Zegs=";
|
||||
cargoHash = "sha256-sXoqNF7hzE97PkRMBnxVFNPa92CgD5gYeMd0RmzPJzY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xfr";
|
||||
version = "0.9.11";
|
||||
version = "0.9.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lance0";
|
||||
repo = "xfr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m41hICpbx8aZprKrjdAdvoDEzCi8gLoLia6TTi/AThY=";
|
||||
hash = "sha256-6+kjpa6zgCXjXK1s3VrOksXFyLAbnqkNOhD50r5zyMA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uUKAjq8jj/NPpi5DHktNGBLWvecSPUwYdMQF/4o7JnM=";
|
||||
cargoHash = "sha256-U/XOlUo/zHsZCPW6lG87BKaM7xSQgineO2rH+JBx6x4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -58,6 +58,16 @@ optionals noSysDirs (
|
||||
]
|
||||
++ (
|
||||
{
|
||||
"16" = [
|
||||
# Do not try looking for binaries and libraries in /lib and /usr/lib
|
||||
./13/no-sys-dirs-riscv.patch
|
||||
# Mangle the nix store hash in __FILE__ to prevent unneeded runtime references
|
||||
#
|
||||
# TODO: Remove these and the `useMacroPrefixMap` conditional
|
||||
# in `cc-wrapper` once <https://gcc.gnu.org/PR111527>
|
||||
# is fixed.
|
||||
./13/mangle-NIX_STORE-in-__FILE__.patch
|
||||
];
|
||||
"15" = [
|
||||
# Do not try looking for binaries and libraries in /lib and /usr/lib
|
||||
./13/no-sys-dirs-riscv.patch
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
let
|
||||
majorMinorToVersionMap = {
|
||||
"16" = "16.1.0";
|
||||
"15" = "15.2.0";
|
||||
"14" = "14.3.0";
|
||||
"13" = "13.4.0";
|
||||
@@ -13,6 +14,7 @@ let
|
||||
{
|
||||
# 3 digits: releases (14.2.0)
|
||||
# 4 digits: snapshots (14.2.1.20250322)
|
||||
"16.1.0" = "sha256-UO+02Uwzl6/zsNYaWr10i03THZ0/Kre+BbFx02pRD3k=";
|
||||
"15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4=";
|
||||
"14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo=";
|
||||
"13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
|
||||
|
||||
@@ -31,6 +31,8 @@ let
|
||||
cp -r ${monorepoSrc}/third-party "$out"
|
||||
''
|
||||
);
|
||||
|
||||
needHdrGen = isFullBuild || lib.versionAtLeast release_version "22";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname version patches;
|
||||
@@ -44,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
ninja
|
||||
]
|
||||
++ (lib.optional isFullBuild python3Packages.pyyaml);
|
||||
++ (lib.optional needHdrGen python3Packages.pyyaml);
|
||||
|
||||
buildInputs = lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders;
|
||||
|
||||
outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");
|
||||
|
||||
postUnpack = lib.optionalString isFullBuild ''
|
||||
postUnpack = lib.optionalString needHdrGen ''
|
||||
chmod +w $sourceRoot/../$pname/utils/hdrgen
|
||||
patchShebangs $sourceRoot/../$pname/utils/hdrgen/main.py
|
||||
chmod +x $sourceRoot/../$pname/utils/hdrgen/main.py
|
||||
|
||||
@@ -174,7 +174,11 @@ stdenv.mkDerivation {
|
||||
# ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of
|
||||
# `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
[ "-fcommon" ]
|
||||
[
|
||||
"-fcommon"
|
||||
# C23 default rejects implicit declarations (e.g. close() without <unistd.h>).
|
||||
"-std=gnu17"
|
||||
]
|
||||
++ (lib.optionals stdenv.cc.isClang [
|
||||
# LLVM 16 turned these into errors (rightly, perhaps.)
|
||||
# Allow this package to continue to build despite this change.
|
||||
|
||||
@@ -2980,6 +2980,22 @@ with haskellLib;
|
||||
stripe-concepts = doJailbreak super.stripe-concepts;
|
||||
stripe-signature = doJailbreak super.stripe-signature;
|
||||
stripe-wreq = doJailbreak super.stripe-wreq;
|
||||
|
||||
# 2026-05-10: Remove again, when hackage bump is recent enough
|
||||
botan-low = overrideCabal {
|
||||
version = "0.2.0.1";
|
||||
sha256 = "sha256-yC+GJDNO58TIc197Mgn/vqpt4fY3YghLhJfmGkQjsxk=";
|
||||
revision = null;
|
||||
editedCabalFile = null;
|
||||
} (warnAfterVersion "0.2.0.1" super.botan-low);
|
||||
|
||||
# 2026-05-10: Remove again, when hackage bump is recent enough
|
||||
botan-bindings = overrideCabal {
|
||||
version = "0.3.0.0";
|
||||
sha256 = "sha256-tsarIc3LcUKPgSWZ+xcGPWGO2f9OF6SWHB6nmX/vJYw=";
|
||||
revision = null;
|
||||
editedCabalFile = null;
|
||||
} (warnAfterVersion "0.3.0.0" super.botan-bindings);
|
||||
}
|
||||
// import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super
|
||||
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioghost";
|
||||
version = "0.4.13";
|
||||
version = "0.4.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TryGhost";
|
||||
repo = "aioghost";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RKM61uDXuvKHrCDCC3JJ/Mv6u275Qd7KtKkr87IRWJU=";
|
||||
hash = "sha256-HZYBBJWP9XscXADtBvovybRh01fhyFGnjHJ5vweo9OA=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "coverage";
|
||||
version = "7.13.5";
|
||||
version = "7.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coveragepy";
|
||||
repo = "coveragepy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XsgOBdehJi2fIZdwE60a32+unYLSMK5MGe1nJOfPBEY=";
|
||||
hash = "sha256-tDq7s+bRt+cxy20Jskjr8sDfg3H+AOTSh3Tt+l5clkg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpi4py";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "mpi4py";
|
||||
owner = "mpi4py";
|
||||
tag = version;
|
||||
hash = "sha256-I7b4x3pxtfbmlbno5OIxo4HutRX3/RjdsoNtBRKgE5w=";
|
||||
hash = "sha256-h9RZr+xLmp+cVvrPkew3AOJLE8okd4A/2oqhsSmVBXU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nice-go";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IceBotYT";
|
||||
repo = "nice-go";
|
||||
tag = version;
|
||||
hash = "sha256-8hm2kB1axv2oqMLSKmquFLe7jsTFO+HYnCz5vL4ve/A=";
|
||||
hash = "sha256-09Tc2fFXUevQNgJmXyeXy1sBg9Cr9OV/15Feh9tlRug=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
protobuf,
|
||||
grpcio,
|
||||
grpcio-tools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -20,7 +22,11 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ protobuf ];
|
||||
dependencies = [
|
||||
protobuf
|
||||
grpcio
|
||||
grpcio-tools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "nominal_api_protos" ];
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezvizapi";
|
||||
version = "1.0.4.8";
|
||||
version = "1.0.4.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RenierM26";
|
||||
repo = "pyEzvizApi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JR+OZ0te2WK7IamZ7FpzbwNc42hjNz2qOW8NlzzOH7Y=";
|
||||
hash = "sha256-hpfsDZzv5rhr8y7PNcprwFoQdVUq0UlN+UtPrkqz4zE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-qube-heatpump";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MattieGit";
|
||||
repo = "python-qube-heatpump";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E3JVk3eYJhesPMu0eFqxPu1HTyLWtKc8rV9z1E5IwJs=";
|
||||
hash = "sha256-+voRl54hzKqtaps0HubOOQKuki4uIPlPPl31e6o6hXs=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywmspro";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mback2k";
|
||||
repo = "pywmspro";
|
||||
tag = version;
|
||||
hash = "sha256-cQ2qDVH7CfCj3he4f01tkwVrgCuE+NxSTeKINh75gxc=";
|
||||
hash = "sha256-vEuJPJrGJffnk7FogcOXEiYNnciAFkzgAeJkjWZWt4M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,19 +15,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-sdk-python";
|
||||
version = "0.26.0";
|
||||
version = "0.26.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rigetti";
|
||||
repo = "qcs-sdk-rust";
|
||||
tag = "lib/v${version}";
|
||||
hash = "sha256-A404lYKGAigzsnqWO4BAphOK/Juj4Fa2EHXQO8N1U9I=";
|
||||
hash = "sha256-ZxfDOcfTMyBvS5IRU2c61TOxwnM8hW4hTTjI4JlbBJk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-NAcCZks5N1KPqeA5v72NAcJqHGexRU99yXQHg21vkPA=";
|
||||
hash = "sha256-Tx3qmBXUZZWNrkQybKNc/gmF/3Jfip+bgF9PSTEXntM=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/lib";
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "temporalio";
|
||||
version = "1.27.0";
|
||||
version = "1.27.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
repo = "sdk-python";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-UjfEBD0gLqZ+u53j1Chhearpljv+Arxw7Ru5slHA8i8=";
|
||||
hash = "sha256-AwWcZJlYysGfNuhM2jgCWoT1MblNt6oof4/uMOsdCMk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vacuum-map-parser-roborock";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PiotrMachowski";
|
||||
repo = "Python-package-${pname}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MqsLvAs4PU/K2yBxEhVJucstZg9QFPYgOTCbgT2Uq/A=";
|
||||
hash = "sha256-v9T9KGKi2vvxZQDjL6CBziPisgQ7sp3HnWZgZ/e8kVY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
nodejs,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -15,79 +16,78 @@
|
||||
# dependencies
|
||||
imageio,
|
||||
msgspec,
|
||||
nodeenv,
|
||||
numpy,
|
||||
opencv-python,
|
||||
plyfile,
|
||||
psutil,
|
||||
requests,
|
||||
rich,
|
||||
scikit-image,
|
||||
scipy,
|
||||
tqdm,
|
||||
trimesh,
|
||||
typing-extensions,
|
||||
websockets,
|
||||
yourdfpy,
|
||||
zstandard,
|
||||
|
||||
# optional-dependencies
|
||||
hypothesis,
|
||||
liblzfse,
|
||||
nodeenv,
|
||||
opencv-python,
|
||||
playwright,
|
||||
pre-commit,
|
||||
pandas,
|
||||
psutil,
|
||||
pyright,
|
||||
pytest,
|
||||
pytest-playwright,
|
||||
pytest-xdist,
|
||||
ruff,
|
||||
gdown,
|
||||
matplotlib,
|
||||
pandas,
|
||||
plotly,
|
||||
# pyliblzfse,
|
||||
plyfile,
|
||||
robot-descriptions,
|
||||
torch,
|
||||
tyro,
|
||||
|
||||
# nativeCheckInputs
|
||||
pytestCheckHook,
|
||||
playwright-driver,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "viser";
|
||||
version = "1.0.20";
|
||||
version = "1.0.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nerfstudio-project";
|
||||
owner = "viser-project";
|
||||
repo = "viser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-usnvEvuBNPrqRXV7jh0qw1ppmZgAe1CUhAwd/M5CvC0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qE9V6KjniKm3vBtf5ger6UHob4go0wTaJnmYtvYqvMc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# prepare yarn offline cache
|
||||
# prepare npm offline cache
|
||||
mkdir -p node_modules
|
||||
cd src/viser/client
|
||||
cp package.json yarn.lock ../../..
|
||||
cp package.json package-lock.json ../../..
|
||||
ln -s ../../../node_modules
|
||||
|
||||
# fix: [vite-plugin-eslint] Failed to load config "react-app" to extend from.
|
||||
substituteInPlace vite.config.mts --replace-fail \
|
||||
"eslint({ failOnError: false, failOnWarning: false })," ""
|
||||
|
||||
cd ../../..
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
npmHooks.npmConfigHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/src/viser/client/yarn.lock";
|
||||
hash = "sha256-4x+zJIqjVoKmEdOUPGpCuMmlRBfF++3oWtbNYAvd2ko=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = finalAttrs.src + "/src/viser/client/";
|
||||
hash = "sha256-fAFN/JCUVSvRDGfq39E3V+dhqp1i6vFG/j8wKmOva4c=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
cd src/viser/client
|
||||
yarn --offline build
|
||||
npm --offline run build
|
||||
cd ../../..
|
||||
'';
|
||||
|
||||
@@ -98,37 +98,39 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
imageio
|
||||
msgspec
|
||||
nodeenv
|
||||
numpy
|
||||
opencv-python
|
||||
plyfile
|
||||
psutil
|
||||
requests
|
||||
rich
|
||||
scikit-image
|
||||
scipy
|
||||
tqdm
|
||||
trimesh
|
||||
typing-extensions
|
||||
websockets
|
||||
yourdfpy
|
||||
zstandard
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
dev = [
|
||||
hypothesis
|
||||
nodeenv
|
||||
opencv-python
|
||||
playwright
|
||||
pre-commit
|
||||
psutil
|
||||
pyright
|
||||
pytest
|
||||
pytest-playwright
|
||||
pytest-xdist
|
||||
ruff
|
||||
];
|
||||
examples = [
|
||||
gdown
|
||||
liblzfse
|
||||
matplotlib
|
||||
opencv-python
|
||||
pandas
|
||||
plotly
|
||||
plyfile
|
||||
# pyliblzfse
|
||||
robot-descriptions
|
||||
torch
|
||||
tyro
|
||||
@@ -137,18 +139,42 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
playwright-driver
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# adding pre-commit here break PYTHONPATH in 3.14
|
||||
checkInputs = lib.filter (p: p.pname != "pre-commit") finalAttrs.passthru.optional-dependencies.dev;
|
||||
|
||||
env = {
|
||||
PLAYWRIGHT_BROWSERS_PATH = playwright-driver.browsers;
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = true;
|
||||
PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
|
||||
};
|
||||
|
||||
disabledTestPaths = [
|
||||
# too many flaky tests
|
||||
"tests/e2e"
|
||||
];
|
||||
disabledTests = [
|
||||
# assert 0 != 0
|
||||
# (only when xdist)
|
||||
"test_server_port_is_freed"
|
||||
|
||||
# counts ffmpeg pids, can be confused when
|
||||
# building multiple times this package in parallel
|
||||
"test_process_termination"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"viser"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nerfstudio-project/viser/releases/tag/${src.tag}";
|
||||
description = "Web-based 3D visualization + Python";
|
||||
homepage = "https://github.com/nerfstudio-project/viser";
|
||||
changelog = "https://github.com/viser-project/viser/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Web-based 3D visualization in Python";
|
||||
homepage = "https://github.com/viser-project/viser";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ nim65s ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "weblate-language-data";
|
||||
version = "2026.7";
|
||||
version = "2026.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WeblateOrg";
|
||||
repo = "language-data";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IKOvVYmB7SA82aMQWqYbwmh7xBg5szR/DvnPS6T0sts=";
|
||||
hash = "sha256-7wNm6bu2L1/eF5D49wSYu1qfVC5Fl5MbaSbXO/az4F4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -187,6 +187,9 @@ let
|
||||
'';
|
||||
|
||||
passthru.dist = finalAttrs.finalPackage + "/libexec/electron";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
};
|
||||
|
||||
darwin = finalAttrs: {
|
||||
|
||||
@@ -12,35 +12,46 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa",
|
||||
"aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97",
|
||||
"armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40",
|
||||
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
|
||||
"x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d",
|
||||
"x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33"
|
||||
"aarch64-darwin": "f7e3ed2cc34dd2eba3f2a95234b576fe8082d35fb133e482102c08105f298572",
|
||||
"aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247",
|
||||
"armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b",
|
||||
"x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1"
|
||||
},
|
||||
"version": "39.8.9"
|
||||
"version": "39.8.10"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7",
|
||||
"aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634",
|
||||
"armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5",
|
||||
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
|
||||
"x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0",
|
||||
"x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8"
|
||||
"aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5",
|
||||
"aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63",
|
||||
"armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681",
|
||||
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
|
||||
"x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04",
|
||||
"x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667"
|
||||
},
|
||||
"version": "40.9.2"
|
||||
"version": "40.10.0"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0",
|
||||
"aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a",
|
||||
"armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c",
|
||||
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
|
||||
"x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737",
|
||||
"x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2"
|
||||
"aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a",
|
||||
"aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a",
|
||||
"armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875",
|
||||
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
|
||||
"x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4",
|
||||
"x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97"
|
||||
},
|
||||
"version": "41.3.0"
|
||||
"version": "41.6.1"
|
||||
},
|
||||
"42": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117",
|
||||
"aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d",
|
||||
"armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a",
|
||||
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
|
||||
"x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f",
|
||||
"x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9"
|
||||
},
|
||||
"version": "42.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,6 +86,9 @@ let
|
||||
install -m777 -D chromedriver $out/bin/chromedriver
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
};
|
||||
|
||||
darwin = {
|
||||
|
||||
@@ -12,35 +12,46 @@
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf",
|
||||
"aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3",
|
||||
"armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6",
|
||||
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
|
||||
"x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69",
|
||||
"x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14"
|
||||
"aarch64-darwin": "c21e261f8047a51c5a2e8d5ad19fc66d9f389c215bd2ada680c3ea39618f3f90",
|
||||
"aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0",
|
||||
"armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b",
|
||||
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
|
||||
"x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c",
|
||||
"x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33"
|
||||
},
|
||||
"version": "39.8.9"
|
||||
"version": "39.8.10"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528",
|
||||
"aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107",
|
||||
"armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4",
|
||||
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
|
||||
"x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a",
|
||||
"x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432"
|
||||
"aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0",
|
||||
"aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc",
|
||||
"armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73",
|
||||
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
|
||||
"x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8",
|
||||
"x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f"
|
||||
},
|
||||
"version": "40.9.2"
|
||||
"version": "40.10.0"
|
||||
},
|
||||
"41": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16",
|
||||
"aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5",
|
||||
"armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee",
|
||||
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
|
||||
"x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9",
|
||||
"x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f"
|
||||
"aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0",
|
||||
"aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885",
|
||||
"armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0",
|
||||
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
|
||||
"x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7",
|
||||
"x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c"
|
||||
},
|
||||
"version": "41.3.0"
|
||||
"version": "41.6.1"
|
||||
},
|
||||
"42": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21",
|
||||
"aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1",
|
||||
"armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b",
|
||||
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
|
||||
"x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb",
|
||||
"x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e"
|
||||
},
|
||||
"version": "42.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
npmHooks,
|
||||
yarn-berry_4,
|
||||
unzip,
|
||||
writers,
|
||||
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
@@ -68,10 +69,20 @@ in
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
missingHashes =
|
||||
if (info.electron_yarn_data ? "missing_hashes") then
|
||||
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
|
||||
else
|
||||
null;
|
||||
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
src = gclientDeps."src/electron".path;
|
||||
patches = [ yarnPatch ];
|
||||
hash = info.electron_yarn_hash;
|
||||
hash = info.electron_yarn_data.hash;
|
||||
missingHashes =
|
||||
if (info.electron_yarn_data ? "missing_hashes") then
|
||||
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
|
||||
else
|
||||
null;
|
||||
};
|
||||
|
||||
dontYarnBerryInstallDeps = true; # we'll run the hook manually
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -113,17 +113,38 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@memory.cache
|
||||
def get_electron_yarn_hash(electron_tag: str) -> str:
|
||||
def get_electron_yarn_data(electron_tag: str) -> dict:
|
||||
print(f"yarn-berry-fetcher prefetch", file=sys.stderr)
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
print(f"Patching yarn.lock for yarn 4.14 support", file=sys.stderr)
|
||||
yarn_lock_file=get_electron_file(electron_tag, "yarn.lock")
|
||||
patched_yarn_lock_file=yarn_lock_file.replace('version: 8', 'version: 9', count=1)
|
||||
with open(tmp_dir + "/yarn.lock", "w") as f:
|
||||
f.write(get_electron_file(electron_tag, "yarn.lock"))
|
||||
return (
|
||||
subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"])
|
||||
f.write(patched_yarn_lock_file)
|
||||
missing_hashes_str = (
|
||||
subprocess.check_output(
|
||||
["yarn-berry-fetcher", "missing-hashes", tmp_dir + "/yarn.lock"]
|
||||
)
|
||||
.decode("utf-8")
|
||||
.strip()
|
||||
)
|
||||
missing_hashes = json.loads(missing_hashes_str)
|
||||
cmd = ["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"]
|
||||
if missing_hashes:
|
||||
with open(tmp_dir + "/missing-hashes.json", "w") as f:
|
||||
f.write(missing_hashes_str)
|
||||
cmd.append(tmp_dir + "/missing-hashes.json")
|
||||
hash = subprocess.check_output(cmd).decode("utf-8").strip()
|
||||
|
||||
data = {
|
||||
"hash": hash,
|
||||
}
|
||||
if missing_hashes:
|
||||
data["missing_hashes"] = missing_hashes
|
||||
|
||||
return data
|
||||
|
||||
|
||||
@memory.cache
|
||||
def get_chromium_npm_hash(chromium_tag: str) -> str:
|
||||
@@ -143,7 +164,12 @@ def get_chromium_npm_hash(chromium_tag: str) -> str:
|
||||
def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]:
|
||||
|
||||
tasks = []
|
||||
a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"])))
|
||||
a = lambda: (
|
||||
(
|
||||
"electron_yarn_data",
|
||||
get_electron_yarn_data(gclient_data["src/electron"]["args"]["tag"]),
|
||||
)
|
||||
)
|
||||
tasks.append(delayed(a)())
|
||||
a = lambda: (
|
||||
(
|
||||
|
||||
@@ -40,5 +40,9 @@ stdenv.mkDerivation {
|
||||
unwrapped = electron-unwrapped;
|
||||
inherit (electron-unwrapped) headers dist;
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
inherit (electron-unwrapped) meta;
|
||||
}
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.31";
|
||||
hash = "sha256-AvsMS5Za+k+b08Nz4UOey9Uzg0Z9hT5lkwMN5cf5ZG8=";
|
||||
version = "6.18.32";
|
||||
hash = "sha256-XgqytdTnL3Jjcs9riMRGgRVfyy76jxdBcC0hSt4rc58=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.0.8";
|
||||
hash = "sha256-bB/qCLw3m+g3Z/JcYl7XNYT313jBbQdcMzvZaK8Fw4Q=";
|
||||
version = "7.0.9";
|
||||
hash = "sha256-QlCbzTqHtVROdIEoqwrAf8mylLh2WHSqFY/eQ3jvrW8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "2.66.01";
|
||||
version = "2.74.01";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://storage.tdarr.io/versions/${finalAttrs.version}/${platform}/${componentName}.zip";
|
||||
|
||||
@@ -5,10 +5,10 @@ callPackage ./common.nix { } {
|
||||
component = "node";
|
||||
|
||||
hashes = {
|
||||
linux_x64 = "sha256-3dd8ouRfThm481rDJDnxxUuSkqNlFR+2aywPzyy7xrw=";
|
||||
linux_arm64 = "sha256-LD/cQECal9dLZY/FQSFztOVzd7MaeHL1rdbMUJ2DPNY=";
|
||||
darwin_x64 = "sha256-icgzoHqZ+P6gXJ8jQTau3O2D6uRvET4MtNoWJI/JnvM=";
|
||||
darwin_arm64 = "sha256-Rw478IpDLLe+Ek3Jt5Duaq1sHL1D3pE0HkVqk+v1ECE=";
|
||||
linux_x64 = "sha256-2dH6mZkQeF6ryzbqNqNt/2brCFBj5yuoSKjh7S3ZRwA=";
|
||||
linux_arm64 = "sha256-mbMBufdR0WTPJaSD3PxUP5delX3AJP2ytLQVBK2RxlY=";
|
||||
darwin_x64 = "sha256-/GCMEmK4eaN/lpOg90HkvNFOBZFrIdQYM3JX1MfEKMU=";
|
||||
darwin_arm64 = "sha256-ikb+Dkhqi7Txzmh51VYG9lf2tmLvbo1K7ebX8oLfNoM=";
|
||||
};
|
||||
|
||||
includeInPath = [ ccextractor ];
|
||||
|
||||
@@ -5,10 +5,10 @@ callPackage ./common.nix { } {
|
||||
component = "server";
|
||||
|
||||
hashes = {
|
||||
linux_x64 = "sha256-YbEFgvOEAY5HGyTZw9vr4SC85zLQHUQKq++Qbsg1+5A=";
|
||||
linux_arm64 = "sha256-PGguxjOGVUPV5CW3iAtoehnxqGkTe9UA6Vu+7bf6DlQ=";
|
||||
darwin_x64 = "sha256-Gya1DmrLM5UCChwocEwdjYxSWECOl5Ew/e8LpmPQB7M=";
|
||||
darwin_arm64 = "sha256-RJYQZ4L49WTwgMj+vZYFd5Kl3gX1DrkR+fF5E7L9fVs=";
|
||||
linux_x64 = "sha256-q69RkTtI8yrEm08JlSxBuE6BaCoQhkEt7v5ONeDLICA=";
|
||||
linux_arm64 = "sha256-4S1Tu23Xd3MqsCKxzGVB+07nlulR2uuQVBMrni/sQUU=";
|
||||
darwin_x64 = "sha256-0+4gHTpLJpP+3mraSOx6tGpwcxlt1cPt6Cnn+xQLOok=";
|
||||
darwin_arm64 = "sha256-VQtzUAYyDjGJpjBAvragIOT7fcV61bIp6ESABTOoFHs=";
|
||||
};
|
||||
|
||||
includeInPath = [ ccextractor ];
|
||||
|
||||
@@ -21,9 +21,14 @@ makeScopeWithSplicing' {
|
||||
|
||||
xmlada = self.callPackage ../development/ada-modules/xmlada { };
|
||||
|
||||
gnatprove = self.callPackage ../development/ada-modules/gnatprove {
|
||||
ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
gnatprove =
|
||||
# They haven't released a version of gnatprove for gnat16 yet
|
||||
if lib.versionOlder gnat.version "16" then
|
||||
self.callPackage ../development/ada-modules/gnatprove {
|
||||
ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14;
|
||||
}
|
||||
else
|
||||
null;
|
||||
|
||||
gnatcoll-core = self.callPackage ../development/ada-modules/gnatcoll/core.nix { };
|
||||
|
||||
|
||||
@@ -3731,6 +3731,7 @@ with pkgs;
|
||||
gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;
|
||||
gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14;
|
||||
gcc15Stdenv = overrideCC gccStdenv buildPackages.gcc15;
|
||||
gcc16Stdenv = overrideCC gccStdenv buildPackages.gcc16;
|
||||
|
||||
# This is not intended for use in nixpkgs but for providing a faster-running
|
||||
# compiler to nixpkgs users by building gcc with reproducibility-breaking
|
||||
@@ -3833,9 +3834,10 @@ with pkgs;
|
||||
gcc13
|
||||
gcc14
|
||||
gcc15
|
||||
gcc16
|
||||
;
|
||||
|
||||
gcc_latest = gcc15;
|
||||
gcc_latest = gcc16;
|
||||
|
||||
libgccjit = gcc.cc.override {
|
||||
name = "libgccjit";
|
||||
@@ -3933,6 +3935,34 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
gnat16 = wrapCC (
|
||||
gcc16.cc.override {
|
||||
name = "gnat";
|
||||
langC = true;
|
||||
langCC = false;
|
||||
langAda = true;
|
||||
profiledCompiler = false;
|
||||
# As per upstream instructions building a cross compiler
|
||||
# should be done with a (native) compiler of the same version.
|
||||
# If we are cross-compiling GNAT, we may as well do the same.
|
||||
gnat-bootstrap =
|
||||
if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
|
||||
buildPackages.gnat-bootstrap14
|
||||
else
|
||||
buildPackages.gnat16;
|
||||
stdenv =
|
||||
if
|
||||
stdenv.hostPlatform == stdenv.targetPlatform
|
||||
&& stdenv.buildPlatform == stdenv.hostPlatform
|
||||
&& stdenv.buildPlatform.isDarwin
|
||||
&& stdenv.buildPlatform.isx86_64
|
||||
then
|
||||
overrideCC stdenv gnat-bootstrap14
|
||||
else
|
||||
stdenv;
|
||||
}
|
||||
);
|
||||
|
||||
gnat-bootstrap = gnat-bootstrap13;
|
||||
gnat-bootstrap13 = wrapCCWith (
|
||||
{
|
||||
@@ -3954,6 +3984,7 @@ with pkgs;
|
||||
gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
|
||||
gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
|
||||
gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });
|
||||
gnat16Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat16; });
|
||||
gnatPackages = gnat13Packages;
|
||||
|
||||
inherit (gnatPackages)
|
||||
@@ -4021,6 +4052,21 @@ with pkgs;
|
||||
}
|
||||
);
|
||||
|
||||
gccgo16 = wrapCC (
|
||||
gcc16.cc.override {
|
||||
name = "gccgo";
|
||||
langCC = true; # required for go.
|
||||
langC = true;
|
||||
langGo = true;
|
||||
langJit = true;
|
||||
profiledCompiler = false;
|
||||
}
|
||||
// {
|
||||
# not supported on darwin: https://github.com/golang/go/issues/463
|
||||
meta.broken = stdenv.hostPlatform.isDarwin;
|
||||
}
|
||||
);
|
||||
|
||||
ghdl-mcode = ghdl.override { backend = "mcode"; };
|
||||
|
||||
ghdl-gcc = ghdl.override { backend = "gcc"; };
|
||||
@@ -5248,6 +5294,7 @@ with pkgs;
|
||||
electron_39-bin
|
||||
electron_40-bin
|
||||
electron_41-bin
|
||||
electron_42-bin
|
||||
;
|
||||
|
||||
inherit (callPackages ../development/tools/electron/chromedriver { })
|
||||
@@ -5255,6 +5302,7 @@ with pkgs;
|
||||
electron-chromedriver_39
|
||||
electron-chromedriver_40
|
||||
electron-chromedriver_41
|
||||
electron-chromedriver_42
|
||||
;
|
||||
|
||||
inherit
|
||||
@@ -5287,12 +5335,17 @@ with pkgs;
|
||||
src = electron-source.electron_41;
|
||||
bin = electron_41-bin;
|
||||
};
|
||||
electron_42 = getElectronPkg {
|
||||
src = electron-source.electron_42;
|
||||
bin = electron_42-bin;
|
||||
};
|
||||
}
|
||||
)
|
||||
electron_38
|
||||
electron_39
|
||||
electron_40
|
||||
electron_41
|
||||
electron_42
|
||||
;
|
||||
electron = electron_41;
|
||||
electron-bin = electron_41-bin;
|
||||
|
||||
Reference in New Issue
Block a user