Merge master into staging-next
This commit is contained in:
@@ -1274,6 +1274,9 @@
|
||||
"fetchgit": [
|
||||
"index.html#fetchgit"
|
||||
],
|
||||
"ex-fetchgit-sparseCheckout": [
|
||||
"index.html#ex-fetchgit-sparseCheckout"
|
||||
],
|
||||
"fetchfossil": [
|
||||
"index.html#fetchfossil"
|
||||
],
|
||||
|
||||
@@ -5798,6 +5798,12 @@
|
||||
githubId = 6806011;
|
||||
name = "Robert Schütz";
|
||||
};
|
||||
dotmobo = {
|
||||
email = "morgan.bohn@gmail.com";
|
||||
github = "dotmobo";
|
||||
githubId = 1997638;
|
||||
name = ".mobo";
|
||||
};
|
||||
dottedmag = {
|
||||
email = "dottedmag@dottedmag.net";
|
||||
github = "dottedmag";
|
||||
@@ -8341,6 +8347,14 @@
|
||||
githubId = 7385287;
|
||||
name = "Lana Black";
|
||||
};
|
||||
grgi = {
|
||||
name = "Gregor Giesen";
|
||||
email = "gregor@giesen.net";
|
||||
matrix = "@gregor:giesen.net";
|
||||
github = "grgi";
|
||||
githubId = 6435815;
|
||||
keys = [ { fingerprint = "0F92 602B 1860 4476 77F4 8A67 C303 16AA C10F 3EA7"; } ];
|
||||
};
|
||||
gridaphobe = {
|
||||
email = "eric@seidel.io";
|
||||
github = "gridaphobe";
|
||||
|
||||
@@ -142,18 +142,10 @@ in
|
||||
CapabilityBoundingSet = "";
|
||||
DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [
|
||||
# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
|
||||
# CUDA not working? Check DeviceAllow and PrivateDevices first!
|
||||
"/dev/nvidia0"
|
||||
"/dev/nvidia1"
|
||||
"/dev/nvidia2"
|
||||
"/dev/nvidia3"
|
||||
"/dev/nvidia4"
|
||||
"/dev/nvidia-caps/nvidia-cap1"
|
||||
"/dev/nvidia-caps/nvidia-cap2"
|
||||
"/dev/nvidiactl"
|
||||
"/dev/nvidia-modeset"
|
||||
"/dev/nvidia-uvm"
|
||||
"/dev/nvidia-uvm-tools"
|
||||
"char-nvidia-uvm"
|
||||
"char-nvidia-frontend"
|
||||
"char-nvidia-caps"
|
||||
"char-nvidiactl"
|
||||
] else "";
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
|
||||
@@ -3928,6 +3928,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
pollywoggames.pico8-ls = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "pico8-ls";
|
||||
publisher = "PollywogGames";
|
||||
version = "0.5.5";
|
||||
hash = "sha256-MTIBCZcqJ+Dq1ECTkj24QIrg4MqT/xWcyYkp6vJRlnM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog";
|
||||
description = "VSCode extension for full language support for the PICO-8 dialect of Lua";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=PollywogGames.pico8-ls";
|
||||
homepage = "https://github.com/japhib/pico8-ls";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotmobo ];
|
||||
};
|
||||
};
|
||||
|
||||
prisma.prisma = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
|
||||
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter";
|
||||
publisher = "ms-toolsai";
|
||||
version = "2024.9.1";
|
||||
hash = "sha256-7ZNTIymw0LiM5TmDOxrwcyJGhxjdYuvaC4+Tb+YSASs=";
|
||||
version = "2024.10.0";
|
||||
hash = "sha256-4b3aE1RgqxEKHMEMlhIjRk4WR3DZRWmqMfGGFQi43J0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2024.10.0";
|
||||
version = "2024.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xCLLWe15+YmU3SyWkclzHBojHi32nUJGe4xY3NZC05M=";
|
||||
hash = "sha256-gIUxicBaOBeUoVb3R9L/oFSe9v1AwGQHzCv6AyDIc1w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -90,11 +90,11 @@
|
||||
"vendorHash": "sha256-detefSJ3hVIk2xXsAB16XiQkaOAiBkGTnaIku7veFQU="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-5drMyf+jymrKb6cxB2eCnvVE9hPo9aDGaloZVlOeRlI=",
|
||||
"hash": "sha256-1Dvqvv/hWZtavEJgBQrvaAgAF3yxruPo26jPVNk2BBE=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.7.1",
|
||||
"rev": "v1.7.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Qjaw43kMlTL2eceQwlZpgaA42YDuxq59F/m2qLqvl8s="
|
||||
},
|
||||
@@ -967,11 +967,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-SdolwqXtS4SwR8LaSkZKPnuXgaRoCJKJXvaCFdsmvEw=",
|
||||
"hash": "sha256-GabcX9KyUzwXke7h8hDYeDkA69D8S2IxwIK7LQynBlU=",
|
||||
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
|
||||
"owner": "ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v0.51.0",
|
||||
"rev": "v1.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
|
||||
homepage = "https://github.com/jesec/rtorrent";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ winter AndersonTorres ];
|
||||
maintainers = with maintainers; [ winter ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "rtorrent";
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/jesec/libtorrent";
|
||||
description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ winter AndersonTorres ];
|
||||
maintainers = with maintainers; [ winter ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,23 +3,23 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "8.0.5";
|
||||
version = "8.0.6";
|
||||
src = {
|
||||
rev = "1413b8bfab256aa09ae3f23027b9ffe278161ca6";
|
||||
sha256 = "1g0w3g1gq6p72gg0jikdrh5mczcv5y16jmqi79bkp6nfl8gbx4l5";
|
||||
rev = "16c59e4e71dab2a0ed2f9e61f990b69657b4bfe2";
|
||||
sha256 = "1vc9igk8id2c34shilg7lh361psvwiqxpsn2yq7cwnwgaq7v1swq";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "8.0.5";
|
||||
version = "8.0.6";
|
||||
libSources = {
|
||||
symbols.rev = "3bd95a02b135941ba00e5e4671e7c3ebc7672db4";
|
||||
symbols.sha256 = "12v8g48fgbalp0xrlgn3vm3ld79ymmwccv5aib6jz2qycdjxmznf";
|
||||
templates.rev = "4644b7570ba73dfe03a06a674c98d3fe2a7fe1e4";
|
||||
symbols.rev = "5fab56fc44319fed1d159cd7fa48e4468b0a5dad";
|
||||
symbols.sha256 = "1ahzx14bmjgpvifsl2xm8c76zagkj2spc9cpb8ms4jlda92lp078";
|
||||
templates.rev = "2343281a4df1ffbd4e0c6fcb9856f81adbbc201e";
|
||||
templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
|
||||
footprints.rev = "4d2be8bf917b9c31f0510fa953532b88ef8b8be8";
|
||||
footprints.sha256 = "0ixfiraahi09gvszzxsdz21mdr9wsxyby5qp3n57pzid42gs35a1";
|
||||
packages3d.rev = "2f3ea516116cc553c9d488424fbb196f4e65ef29";
|
||||
packages3d.sha256 = "03yicqv36zx0wrb0njpkk45l4ysvv3dlsjlpi4j8j75gla060mai";
|
||||
footprints.rev = "2e76906e448f352228a8f6bc06f77ae959a57975";
|
||||
footprints.sha256 = "1fv0liwbl2blwd2xy9whwinkczi98ah83rwi4v6bvm9d9318vbig";
|
||||
packages3d.rev = "005244f418b0d014e2907ca42df5ab85a1e29466";
|
||||
packages3d.sha256 = "1i6ypl7lw7hnifl943z3lwv4sy00mfwgqi001bj9qh547kf9rxd4";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,28 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, curl
|
||||
, obs-studio
|
||||
, qtbase
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
curl,
|
||||
obs-studio,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vertical-canvas";
|
||||
version = "1.4.9";
|
||||
version = "1.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aitum";
|
||||
repo = "obs-vertical-canvas";
|
||||
rev = version;
|
||||
sha256 = "sha256-DFSwcN7XadHa1SGEHUdtRqPJMtS23y4dU4e/F8QmUUo=";
|
||||
sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ curl obs-studio qtbase ];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
obs-studio
|
||||
qtbase
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_OUT_OF_TREE=On"
|
||||
''-DCMAKE_CXX_FLAGS="-Wno-error=deprecated-declarations"''
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -32,11 +39,14 @@ stdenv.mkDerivation rec {
|
||||
rm -rf $out/obs-plugins
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Plugin for OBS Studio to add vertical canvas";
|
||||
homepage = "https://github.com/Aitum/obs-vertical-canvas";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
bash,
|
||||
procps,
|
||||
iproute2,
|
||||
iptables,
|
||||
openresolv,
|
||||
amneziawg-go,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amneziawg-tools";
|
||||
version = "1.0.20241018";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-tools";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-y6xkOLT9KVD6ACCH60Myk2iA1S8/+tGXEQbOYnu+dPI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ bash ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"PREFIX=/"
|
||||
"WITH_BASHCOMPLETION=yes"
|
||||
"WITH_SYSTEMDUNITS=yes"
|
||||
"WITH_WGQUICK=yes"
|
||||
];
|
||||
|
||||
postFixup =
|
||||
''
|
||||
substituteInPlace $out/lib/systemd/system/awg-quick@.service \
|
||||
--replace-fail /usr/bin $out/bin
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
for f in $out/bin/*; do
|
||||
# Which firewall and resolvconf implementations to use should be determined by the
|
||||
# environment, we provide the "default" ones as fallback.
|
||||
wrapProgram $f \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
procps
|
||||
iproute2
|
||||
]
|
||||
} \
|
||||
--suffix PATH : ${
|
||||
lib.makeBinPath [
|
||||
iptables
|
||||
openresolv
|
||||
]
|
||||
}
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f \
|
||||
--prefix PATH : ${lib.makeBinPath [ amneziawg-go ]}
|
||||
done
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Tools for configuring AmneziaWG";
|
||||
homepage = "https://amnezia.org";
|
||||
changelog = "https://github.com/amnezia-vpn/amneziawg-tools/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ averyanalex ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "awg";
|
||||
};
|
||||
})
|
||||
@@ -40,8 +40,8 @@ buildBazelPackage rec {
|
||||
fetchAttrs = {
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-K+uGH3ox49taSPZ1aLYPrOLNRO3aLQeOSdrkmTC444U=";
|
||||
x86_64-linux = "sha256-yNwD3n7exyG5LbhR2GuKIvoul6UQnyk3+8pLpnDzjFw=";
|
||||
aarch64-linux = "sha256-E4VHjDa0qkHmKUNpTBfJi7dhMLcd1z5he+p31/XvUl8=";
|
||||
x86_64-linux = "sha256-M7xhAIhTcVLCUkmy4giGxbr7DgHrXbg0e8D/bL6yZWU=";
|
||||
}
|
||||
.${system} or (throw "No hash for system: ${system}");
|
||||
};
|
||||
|
||||
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog";
|
||||
license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest"
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2024-06-18";
|
||||
version = "2024-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2saj/QfiYCxthGHauaSvRv9VVptlKbXoRTMYs3FWZsc=";
|
||||
hash = "sha256-70HDn87acG0me+zbXk6AoGmakY6VLuawq1ubgGcRZVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@ let
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dooit";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dooit-org";
|
||||
repo = "dooit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DPmCADFduGc5n+6q9zl0f4x9C6RmzLvBeYh2j0ZSpH0=";
|
||||
hash = "sha256-o9Spe6OejCsN+pWaEVED1DlHMayOZuZv7bi/HmiogKg=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "2.60.6";
|
||||
version = "2.60.10";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -11,11 +11,11 @@ buildGoModule {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-208gJTLaVEikH92ZDEULPtfnKJyZhZCRCDfCxewABK4=";
|
||||
hash = "sha256-14s3Dfo1sqQlNZSdjByUCAsYzbv6xjPcCsBxEmoY3pU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TUK7obI1wOXroI1NE1GfIP+NMW909+z92Wpy9B/soY0=";
|
||||
vendorHash = "sha256-I4rdz8dswA9/w4S9BNS43VTD9iDsH+cNK2haWowhBO4=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
||||
@@ -16,20 +16,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.131.5";
|
||||
version = "0.131.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
rev = version;
|
||||
hash = "sha256-CRqxxbPkcjswntMgGkIrPFEbnjI90sfTmG6D1eCo45w=";
|
||||
hash = "sha256-r9GaihxC9ZQtTzKqfJ3LLDMzDEXeud7vTFEMOf0whFU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x0EWFsR/O2Ztg39DL+yZx2ZDzJHADo2aPAeg/i+5KqM=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-4PBlN2pbr7dzZNQzh/P0kBlsg6ut2XPwsfFB132hWO0=";
|
||||
hash = "sha256-4pQYv5UKoz3Gu5OS0zoYrjrFYD796MDb7ofWbTv3HlU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exercism";
|
||||
version = "3.5.1";
|
||||
version = "3.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exercism";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AqGSwHQdY/m6aJYbjJdt+IYr5n1Jf7LW4paCOxjptjA=";
|
||||
hash = "sha256-7euitdo/rdeopnP7hHHxQ5lPh8wJVDaTneckeR5BEGo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs=";
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
index 5f92058c18..b00104497b 100644
|
||||
--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
+++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
|
||||
@@ -56,27 +56,34 @@ namespace
|
||||
*
|
||||
* Based on
|
||||
* https://stackoverflow.com/questions/18896933/qt-qfont-selection-of-a-monospace-font-doesnt-work
|
||||
+ * Local fix to based on comment in
|
||||
+ * https://github.com/FreeCAD/FreeCAD/issues/10514#issuecomment-1849176386
|
||||
*/
|
||||
+bool hasFixedPitch(const QFont& font)
|
||||
+{
|
||||
+ return QFontInfo(font).fixedPitch();
|
||||
+}
|
||||
+
|
||||
QFont getMonospaceFont()
|
||||
{
|
||||
- QFont font(QString::fromLatin1("monospace"));
|
||||
- if (font.fixedPitch()) {
|
||||
- return font;
|
||||
- }
|
||||
- font.setStyleHint(QFont::Monospace);
|
||||
- if (font.fixedPitch()) {
|
||||
- return font;
|
||||
+ if (QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); hasFixedPitch(font)) {
|
||||
+ return font; // should typically work.
|
||||
}
|
||||
- font.setStyleHint(QFont::TypeWriter);
|
||||
- if (font.fixedPitch()) {
|
||||
+
|
||||
+ QFont font; // default QApplication font
|
||||
+ font.setStyleHint(QFont::Courier); // may not work
|
||||
+ if (hasFixedPitch(font)) {
|
||||
return font;
|
||||
}
|
||||
- font.setFamily(QString::fromLatin1("courier"));
|
||||
- if (font.fixedPitch()) {
|
||||
- return font;
|
||||
+ for (const char* family : {"Monospace", "Courier"}) {
|
||||
+ font.setFamily(QString::fromLatin1(family));
|
||||
+ if (hasFixedPitch(font)) {
|
||||
+ return font;
|
||||
+ }
|
||||
}
|
||||
- return font; // We failed, but return whatever we have anyway
|
||||
+ return font;
|
||||
}
|
||||
+
|
||||
} // namespace
|
||||
|
||||
/* TRANSLATOR Gui::Dialog::DlgSettingsEditor */
|
||||
@@ -302,7 +309,7 @@ void DlgSettingsEditor::loadSettings()
|
||||
ui->fontSize->setValue(10);
|
||||
ui->fontSize->setValue(hGrp->GetInt("FontSize", ui->fontSize->value()));
|
||||
|
||||
- QByteArray defaultMonospaceFont = getMonospaceFont().family().toLatin1();
|
||||
+ QByteArray defaultMonospaceFont = QFontInfo(getMonospaceFont()).family().toLatin1();
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
QStringList familyNames = QFontDatabase().families(QFontDatabase::Any);
|
||||
@@ -63,13 +63,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "1.0rc2";
|
||||
version = "1.0rc4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-kPmfx/C1fCYwBqh6ZOKZAVNVR9m3VryPmBKu3ksDD5E=";
|
||||
hash = "sha256-b7aeVQkgdsDRdnVIr+5ZNuWAm6GLH7sepa8kFp2Zm2U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -131,7 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
|
||||
./0002-FreeCad-OndselSolver-pkgconfig.patch
|
||||
./0003-freecad-font-issue-10514.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, testers
|
||||
, nix-update-script
|
||||
, go-task
|
||||
}:
|
||||
|
||||
@@ -46,10 +47,14 @@ buildGoModule rec {
|
||||
--replace-fail '#compdef task' '#compdef task go-task'
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = go-task;
|
||||
passthru = {
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = go-task;
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -44,7 +44,7 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/CyberShadow/hax11";
|
||||
description = "Hackbrary to Hook and Augment X11 protocol calls";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres cybershadow ];
|
||||
maintainers = with lib.maintainers; [ cybershadow ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janusgraph";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip";
|
||||
sha256 = "sha256-X/ZHvmCJzo0X/sUpbm1CkQcnNi3NMNAaVXep6cpoIAA=";
|
||||
sha256 = "sha256-gEtiY/FXNCtpVlohcTTuZ1V/EHr/trqYQKYUKy9wN4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
at-spi2-atk,
|
||||
}:
|
||||
let
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
rev = version;
|
||||
hash = "sha256-irX+BmvJ/WI92RQmaSoBQuUqAEiy3bEstZmKMKHTvPY=";
|
||||
hash = "sha256-pLrpDTGA4qdTqxkNWmChknMklE/0Chd3NhysaUqpUfs=";
|
||||
};
|
||||
in
|
||||
flutter.buildFlutterApplication {
|
||||
|
||||
@@ -210,11 +210,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "canvas_danmaku",
|
||||
"sha256": "e5eebd19588cae528123fa14c0ad080fdc96881c3018f944f910024988ddb67e",
|
||||
"sha256": "539beee7dab73b0d01980194885730de11527ec0f96d9c4fa26ae4eac6699b7f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.2"
|
||||
"version": "0.2.3"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
@@ -569,15 +569,25 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.23"
|
||||
},
|
||||
"flutter_rating_bar": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_rating_bar",
|
||||
"sha256": "d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.1"
|
||||
},
|
||||
"flutter_smart_dialog": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_smart_dialog",
|
||||
"sha256": "7932ab58440379094c6a568efc329d322c6dd740e5a553080f2d56a71ed53752",
|
||||
"sha256": "d7b915461fdc9bb8111d23a709b4ce910dbc4b9bef0fbd941655f74bf7de09a6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.9.8+3"
|
||||
"version": "4.9.8+5"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@@ -589,11 +599,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_volume_controller",
|
||||
"sha256": "fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f",
|
||||
"sha256": "15f2c25bc4632ac5e8d42a208fe07c3224a4ee66b155d1ac86945b3db2bb58d9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
"version": "1.3.3"
|
||||
},
|
||||
"flutter_web_plugins": {
|
||||
"dependency": "transitive",
|
||||
@@ -615,11 +625,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "fvp",
|
||||
"sha256": "439ff92c52349cb6c345f680dcbe7f7a40fcd524073030a1e93aec64f959d864",
|
||||
"sha256": "3dd245cac5dfba36311cbf5834d8f275ba1f3e49a5cdcb4a98e01cb41e9a21d8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.27.0"
|
||||
"version": "0.28.0"
|
||||
},
|
||||
"glob": {
|
||||
"dependency": "transitive",
|
||||
@@ -1275,11 +1285,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shared_preferences",
|
||||
"sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
|
||||
"sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.2"
|
||||
"version": "2.3.3"
|
||||
},
|
||||
"shared_preferences_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -1611,11 +1621,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_linux",
|
||||
"sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
|
||||
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.0"
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"url_launcher_macos": {
|
||||
"dependency": "transitive",
|
||||
@@ -1821,11 +1831,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "webview_flutter_android",
|
||||
"sha256": "dec83a8da0a2dcd8a25418534cc59348dbc2855fa1dd0cc929c62b6029fde392",
|
||||
"sha256": "86c2d01c37c4578ee46560109cf2e18fb271f0d080a796f09188d0952352e057",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.1"
|
||||
"version": "4.0.2"
|
||||
},
|
||||
"webview_flutter_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1841,11 +1851,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "webview_flutter_wkwebview",
|
||||
"sha256": "f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8",
|
||||
"sha256": "3be297aa4ca78205abdd284cf55f168c35246c75b3079990ad8ba9d257681a30",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.16.1"
|
||||
"version": "3.16.2"
|
||||
},
|
||||
"webview_windows": {
|
||||
"dependency": "direct main",
|
||||
@@ -1941,6 +1951,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.5.0 <4.0.0",
|
||||
"flutter": ">=3.24.4"
|
||||
"flutter": ">=3.24.5"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "knxd";
|
||||
version = "0.14.63";
|
||||
version = "0.14.66";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knxd";
|
||||
repo = "knxd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Ka4ATC20PS/yqHj+dbcIXxeqFYHDMKu6DvJWGd4rUMI=";
|
||||
hash = "sha256-3Npf+SlCWOMBd9CBLPysGtYe2Zk7I7T4t1bQHZTq3rI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -99,7 +99,7 @@ let
|
||||
let
|
||||
hash =
|
||||
{
|
||||
"linuxarm64" = "sha256-iu8y2r1rd78fV2argulHoZJG+hPMPDKJ9ysnUyIgo5k=";
|
||||
"linuxarm64" = "sha256-2mOh3GWdx0qxsLRKVYXOJnVY0eqz6B3z9/B9A9Xfs/A=";
|
||||
"linux64" = "sha256-FFkFMMkTSseLZIDzESFl8+h7wRhv5QGi1Uy5MViYpX8=";
|
||||
}
|
||||
.${platform};
|
||||
|
||||
@@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3Packages.sphinx
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; };
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd mpc --bash $out/share/doc/mpc/contrib/mpc-completion.bash
|
||||
'';
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "namaka";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "namaka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CLGEW11Fo1v4vj0XSqiyW1EbhRZFO7dkgM43eKwItrk=";
|
||||
hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-exftXTO/NbTfd7gNPpZ886jXH1XveqX+Cl/gXpZlS4c=";
|
||||
cargoHash = "sha256-Wo87OjHVKS2w0LeBvYEoV9eoKm8giqV/P9/mh6DueJ0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -1,28 +1,35 @@
|
||||
{ lib, fetchFromGitHub
|
||||
, python3Packages, wrapGAppsHook3, gobject-introspection
|
||||
, gtk-layer-shell, pango, gdk-pixbuf, atk
|
||||
# Extra packages called by various internal nwg-panel modules
|
||||
, hyprland # hyprctl
|
||||
, sway # swaylock, swaymsg
|
||||
, systemd # systemctl
|
||||
, wlr-randr # wlr-randr
|
||||
, nwg-menu # nwg-menu
|
||||
, brightnessctl # brightnessctl
|
||||
, pamixer # pamixer
|
||||
, pulseaudio # pactl
|
||||
, libdbusmenu-gtk3 # tray
|
||||
, playerctl
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
wrapGAppsHook3,
|
||||
gobject-introspection,
|
||||
gtk-layer-shell,
|
||||
pango,
|
||||
gdk-pixbuf,
|
||||
atk,
|
||||
# Extra packages called by various internal nwg-panel modules
|
||||
hyprland, # hyprctl
|
||||
sway, # swaylock, swaymsg
|
||||
systemd, # systemctl
|
||||
wlr-randr, # wlr-randr
|
||||
nwg-menu, # nwg-menu
|
||||
brightnessctl, # brightnessctl
|
||||
pamixer, # pamixer
|
||||
pulseaudio, # pactl
|
||||
libdbusmenu-gtk3, # tray
|
||||
playerctl,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.9.48";
|
||||
version = "0.9.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/PMUkD2kr8aqmohStntlTOc5XgfR+A3LaeYsk04GvOM=";
|
||||
hash = "sha256-/WJpxFmQ6ED/PWW9/qIp5VheBgAukLIwRSdOxfPoyKM=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
@@ -32,10 +39,28 @@ python3Packages.buildPythonApplication rec {
|
||||
strictDeps = false;
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ];
|
||||
nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
|
||||
propagatedBuildInputs = (with python3Packages;
|
||||
[ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ])
|
||||
buildInputs = [
|
||||
atk
|
||||
gdk-pixbuf
|
||||
gtk-layer-shell
|
||||
pango
|
||||
playerctl
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
(with python3Packages; [
|
||||
i3ipc
|
||||
netifaces
|
||||
psutil
|
||||
pybluez
|
||||
pygobject3
|
||||
requests
|
||||
dasbus
|
||||
setuptools
|
||||
])
|
||||
# Run-time GTK dependency required by the Tray module
|
||||
++ [ libdbusmenu-gtk3 ];
|
||||
|
||||
@@ -49,17 +74,28 @@ python3Packages.buildPythonApplication rec {
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix XDG_DATA_DIRS : "$out/share"
|
||||
--prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}"
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
brightnessctl
|
||||
hyprland
|
||||
nwg-menu
|
||||
pamixer
|
||||
pulseaudio
|
||||
sway
|
||||
systemd
|
||||
wlr-randr
|
||||
]
|
||||
}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/nwg-piotr/nwg-panel";
|
||||
changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/v${version}";
|
||||
description = "GTK3-based panel for Sway window manager";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ludovicopiero ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ludovicopiero ];
|
||||
mainProgram = "nwg-panel";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onedrive";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = "onedrive";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-neJi5lIx45GsuwZPzzwwEm1bfrL2DFSysVkxa4fCBww";
|
||||
hash = "sha256-Lek1tW0alQQvlOHpz//M/y4iJY3PWRkcmXGLwjCLozk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
Generated
+832
-788
File diff suppressed because it is too large
Load Diff
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pot";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pot-app";
|
||||
repo = "pot-desktop";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y0/N5xunEXOG+FuZE23xsSwFd6PL1XClV5UIckTYNPs=";
|
||||
hash = "sha256-PUXZT1kiInM/CXUoRko/5qlrRurGpQ4ym5YMTgFwuxE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src-tauri";
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-AmMV8Nrn+zH/9bDkFX3Mx5xIQjkoXR8SzkdJRXkxTbA=";
|
||||
hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ=";
|
||||
};
|
||||
|
||||
pnpmRoot = "..";
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
# All other crates in the same workspace reuse this hash.
|
||||
"tauri-plugin-autostart-0.0.0" = "sha256-fgJvoe3rKom2DdXXgd5rx7kzaWL/uvvye8jfL2SNhrM=";
|
||||
"tauri-plugin-autostart-0.0.0" = "sha256-rWk9Qz1XmByqPRIgR+f12743uYvnEGTHno9RrxmT8JE=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -101,12 +101,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
chmod +w ..
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Cross-platform translation software";
|
||||
mainProgram = "pot";
|
||||
homepage = "https://pot.pylogmon.com";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
homepage = "https://pot-app.com";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ linsui ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "privatebin";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrivateBin";
|
||||
repo = "PrivateBin";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-RFP6rhzfBzTmqs4eJXv7LqdniWoeBJpQQ6fLdoGd5Fk=";
|
||||
hash = "sha256-LdTteUED/pq4Z4IOBttLPm3K9gx1xVqP24QQ48uvuyI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlite-vec";
|
||||
version = "0.1.3";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asg017";
|
||||
repo = "sqlite-vec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aMU4Spom1b0M5FQA0SconMuuBtEdOL8WNnUxzvAZ0VQ=";
|
||||
hash = "sha256-Zg1ADAN7XjlK2Oa+vN1i0Dkapu1DMEgDde3FxFTTdmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
+133
-128
@@ -1,26 +1,27 @@
|
||||
{
|
||||
"name": "svelte-language-server",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "svelte-language-server",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.5",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@jridgewell/trace-mapping": "^0.3.25",
|
||||
"@vscode/emmet-helper": "2.8.4",
|
||||
"chokidar": "^3.4.1",
|
||||
"chokidar": "^4.0.1",
|
||||
"estree-walker": "^2.0.1",
|
||||
"fdir": "^6.2.0",
|
||||
"globrex": "^0.1.2",
|
||||
"lodash": "^4.17.21",
|
||||
"prettier": "~3.3.3",
|
||||
"prettier-plugin-svelte": "^3.2.6",
|
||||
"prettier-plugin-svelte": "^3.2.8",
|
||||
"svelte": "^4.2.19",
|
||||
"svelte2tsx": "~0.7.0",
|
||||
"typescript": "^5.5.2",
|
||||
"typescript-auto-import-cache": "^0.3.3",
|
||||
"svelte2tsx": "~0.7.23",
|
||||
"typescript": "^5.6.3",
|
||||
"typescript-auto-import-cache": "^0.3.5",
|
||||
"vscode-css-languageservice": "~6.3.0",
|
||||
"vscode-html-languageservice": "~5.3.0",
|
||||
"vscode-languageserver": "9.0.1",
|
||||
@@ -33,6 +34,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/estree": "^0.0.42",
|
||||
"@types/globrex": "^0.1.4",
|
||||
"@types/lodash": "^4.14.116",
|
||||
"@types/mocha": "^9.1.0",
|
||||
"@types/node": "^18.0.0",
|
||||
@@ -226,12 +228,20 @@
|
||||
"version": "0.0.42",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz",
|
||||
"integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/globrex": {
|
||||
"version": "0.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/globrex/-/globrex-0.1.4.tgz",
|
||||
"integrity": "sha512-qm82zaOxfn8Us/GGjNrQQ1XfCBUDV86DxQgIQq/p1zGHlt0xnbUiabNjN9rZUhMNvvIE2gg8iTW+GMfw0TnnLg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/lodash": {
|
||||
"version": "4.17.7",
|
||||
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
|
||||
"integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==",
|
||||
"version": "4.17.13",
|
||||
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
|
||||
"integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -243,9 +253,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "18.19.50",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz",
|
||||
"integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==",
|
||||
"version": "18.19.64",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz",
|
||||
"integrity": "sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -293,9 +303,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/acorn": {
|
||||
"version": "8.12.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
|
||||
"integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
|
||||
"version": "8.14.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
|
||||
"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"acorn": "bin/acorn"
|
||||
@@ -305,9 +315,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/acorn-walk": {
|
||||
"version": "8.3.3",
|
||||
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
|
||||
"integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
|
||||
"version": "8.3.4",
|
||||
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
|
||||
"integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -357,6 +367,7 @@
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
|
||||
"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"normalize-path": "^3.0.0",
|
||||
@@ -366,18 +377,6 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/anymatch/node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/arg": {
|
||||
"version": "4.1.3",
|
||||
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
|
||||
@@ -393,12 +392,12 @@
|
||||
"license": "Python-2.0"
|
||||
},
|
||||
"node_modules/aria-query": {
|
||||
"version": "5.3.0",
|
||||
"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
|
||||
"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
|
||||
"version": "5.3.2",
|
||||
"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
|
||||
"integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"dequal": "^2.0.3"
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/axobject-query": {
|
||||
@@ -421,6 +420,7 @@
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
|
||||
"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
@@ -444,6 +444,7 @@
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
|
||||
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"fill-range": "^7.1.1"
|
||||
@@ -503,27 +504,18 @@
|
||||
}
|
||||
},
|
||||
"node_modules/chokidar": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
|
||||
"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
|
||||
"integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"anymatch": "~3.1.2",
|
||||
"braces": "~3.0.2",
|
||||
"glob-parent": "~5.1.2",
|
||||
"is-binary-path": "~2.1.0",
|
||||
"is-glob": "~4.0.1",
|
||||
"normalize-path": "~3.0.0",
|
||||
"readdirp": "~3.6.0"
|
||||
"readdirp": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 8.10.0"
|
||||
"node": ">= 14.16.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "~2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/cliui": {
|
||||
@@ -552,9 +544,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/code-red/node_modules/@types/estree": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
|
||||
"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/code-red/node_modules/estree-walker": {
|
||||
@@ -620,9 +612,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.3",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
||||
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
|
||||
"version": "7.0.5",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
|
||||
"integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -691,15 +683,6 @@
|
||||
"integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/dequal": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
|
||||
"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/diff": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
|
||||
@@ -711,9 +694,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/emmet": {
|
||||
"version": "2.4.7",
|
||||
"resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz",
|
||||
"integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==",
|
||||
"version": "2.4.11",
|
||||
"resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.11.tgz",
|
||||
"integrity": "sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==",
|
||||
"license": "MIT",
|
||||
"workspaces": [
|
||||
"./packages/scanner",
|
||||
@@ -763,9 +746,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fdir": {
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.3.0.tgz",
|
||||
"integrity": "sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==",
|
||||
"version": "6.4.2",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz",
|
||||
"integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"picomatch": "^3 || ^4"
|
||||
@@ -780,6 +763,7 @@
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
|
||||
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
@@ -826,6 +810,7 @@
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@@ -872,6 +857,7 @@
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"is-glob": "^4.0.1"
|
||||
@@ -893,6 +879,12 @@
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/globrex": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
|
||||
"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/growl": {
|
||||
"version": "1.10.5",
|
||||
"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
|
||||
@@ -946,6 +938,7 @@
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
|
||||
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"binary-extensions": "^2.0.0"
|
||||
@@ -958,6 +951,7 @@
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
@@ -977,6 +971,7 @@
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"is-extglob": "^2.1.1"
|
||||
@@ -989,6 +984,7 @@
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.12.0"
|
||||
@@ -1005,14 +1001,20 @@
|
||||
}
|
||||
},
|
||||
"node_modules/is-reference": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz",
|
||||
"integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==",
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
|
||||
"integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/estree": "*"
|
||||
"@types/estree": "^1.0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/is-reference/node_modules/@types/estree": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
|
||||
"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/is-unicode-supported": {
|
||||
"version": "0.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
|
||||
@@ -1121,9 +1123,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/magic-string": {
|
||||
"version": "0.30.11",
|
||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
|
||||
"integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
|
||||
"version": "0.30.12",
|
||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
|
||||
"integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@jridgewell/sourcemap-codec": "^1.5.0"
|
||||
@@ -1227,6 +1229,19 @@
|
||||
"fsevents": "~2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/mocha/node_modules/readdirp": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
|
||||
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"picomatch": "^2.2.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
@@ -1295,6 +1310,7 @@
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
|
||||
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
@@ -1383,9 +1399,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/path-to-regexp": {
|
||||
"version": "6.2.2",
|
||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
|
||||
"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
|
||||
"integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -1401,9 +1417,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/periscopic/node_modules/@types/estree": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
|
||||
"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/periscopic/node_modules/estree-walker": {
|
||||
@@ -1416,14 +1432,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
|
||||
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
"node": ">=8.6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
@@ -1445,9 +1460,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/prettier-plugin-svelte": {
|
||||
"version": "3.2.6",
|
||||
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.6.tgz",
|
||||
"integrity": "sha512-Y1XWLw7vXUQQZmgv1JAEiLcErqUniAF2wO7QJsw8BVMvpLET2dI5WpEIEJx1r11iHVdSMzQxivyfrH9On9t2IQ==",
|
||||
"version": "3.2.8",
|
||||
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.8.tgz",
|
||||
"integrity": "sha512-PAHmmU5cGZdnhW4mWhmvxuG2PVbbHIxUuPOdUKvfE+d4Qt2d29iU5VWrPdsaW5YqVEE0nqhlvN4eoKmVMpIF3Q==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"prettier": "^3.0.0",
|
||||
@@ -1465,27 +1480,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/readdirp": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
|
||||
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"picomatch": "^2.2.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/readdirp/node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
|
||||
"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
"node": ">= 14.16.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
"type": "individual",
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
}
|
||||
},
|
||||
"node_modules/require-directory": {
|
||||
@@ -1598,9 +1602,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/source-map-js": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
|
||||
"integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
||||
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
|
||||
"license": "BSD-3-Clause",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
@@ -1689,9 +1693,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/svelte/node_modules/@types/estree": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
|
||||
"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/svelte/node_modules/estree-walker": {
|
||||
@@ -1704,9 +1708,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/svelte2tsx": {
|
||||
"version": "0.7.18",
|
||||
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.18.tgz",
|
||||
"integrity": "sha512-PCOhH7uQaV472ZvNAcnkvShjFRMMkKUc/eNJImQMH9T4CyHeQpdatedFrEjaMCsweFb/oo3a6bv4qtdfaCPw8g==",
|
||||
"version": "0.7.24",
|
||||
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.24.tgz",
|
||||
"integrity": "sha512-KbKD+5aqTYdRPfAroA72xc3kEz3Dj0Vq7X3IjHLWbwfco7pwioEx4x/V9lOpKmkHlYh9YNPkqXWlbrH7Cc580A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"dedent-js": "^1.0.1",
|
||||
@@ -1721,6 +1725,7 @@
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"is-number": "^7.0.0"
|
||||
@@ -1784,9 +1789,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/tslib": {
|
||||
"version": "2.7.0",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
||||
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
|
||||
"version": "2.8.1",
|
||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
|
||||
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
|
||||
"license": "0BSD"
|
||||
},
|
||||
"node_modules/type-detect": {
|
||||
@@ -1800,9 +1805,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"version": "5.5.4",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
|
||||
"integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
|
||||
"version": "5.6.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
|
||||
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"tsc": "bin/tsc",
|
||||
@@ -1813,9 +1818,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/typescript-auto-import-cache": {
|
||||
"version": "0.3.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz",
|
||||
"integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==",
|
||||
"version": "0.3.5",
|
||||
"resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.5.tgz",
|
||||
"integrity": "sha512-fAIveQKsoYj55CozUiBoj4b/7WpN0i4o74wiGY5JVUEoD0XiqDk1tJqTEjgzL2/AizKQrXxyRosSebyDzBZKjw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^7.3.8"
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchurl
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
version = "0.17.0";
|
||||
in buildNpmPackage {
|
||||
version = "0.17.5";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "svelte-language-server";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
|
||||
hash = "sha256-3JcpdpvxkOAIMAMsZx5UF1Sp+O6zC3jwYJGRdoZNbQg=";
|
||||
hash = "sha256-HcJYSwTiHoKjQmw+iE8/g51cZYIQIznmY8MBrttJrbA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-poUbH9U/zN9LiuCCI1FCz+MnoYt8De64pMLSbtmoN30=";
|
||||
npmDepsHash = "sha256-V1Nsc/+9+Eo5qmxDsXu54pfsdXP04IXpFERhoojooGA=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
@@ -21,6 +23,8 @@ in buildNpmPackage {
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -40,8 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
and Windows.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
};
|
||||
})
|
||||
# TODO [ AndersonTorres ]: tests
|
||||
|
||||
+7596
File diff suppressed because it is too large
Load Diff
@@ -18,16 +18,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "turbo-unwrapped";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turbo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MDvwitzZVPVjdIVEAV1aKMAVeLSTMM2owH5RSfVg+rU=";
|
||||
hash = "sha256-R3fr52v5DAfl+Isk2AspDabQIx00IoIoFKbkTSSgvXA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XBI/eiOyKk80ZDFLD2HCTFYRWvC7qtzQY/zFCmKdKSM=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"update-informer-1.1.0" = "sha256-pvt4f7tfefWin+DMql/zarN/q9gijpERF7l0CxcvX2s=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -1,31 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenvNoCC,
|
||||
apple-sdk_14,
|
||||
buildGoModule,
|
||||
darwin,
|
||||
darwinMinVersionHook,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
vfkit,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
buildGoModule rec {
|
||||
pname = "vfkit";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crc-org/vfkit/releases/download/v${finalAttrs.version}/vfkit";
|
||||
hash = "sha256-at+KsvsKO359d4VUvcSuio2ej5hM6//U4Mj/jqXwhEc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crc-org";
|
||||
repo = "vfkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9iPr9VhN60B6kBikdEIFAs5mMH+VcmnjGhLuIa3A2JU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
vendorHash = "sha256-6O1T9aOCymYXGAIR/DQBWfjc2sCyU/nZu9b1bIuXEps=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
subPackages = [ "cmd/vfkit" ];
|
||||
|
||||
install -Dm755 $src $out/bin/vfkit
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/crc-org/vfkit/pkg/cmdline.gitVersion=${src.rev}"
|
||||
];
|
||||
|
||||
runHook postInstall
|
||||
nativeBuildInputs = [
|
||||
darwin.sigtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_14
|
||||
(darwinMinVersionHook "11")
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
codesign --entitlements vf.entitlements -f -s - $out/bin/vfkit
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
version = testers.testVersion { package = vfkit; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -34,9 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sarcasticadmin ];
|
||||
platforms = lib.platforms.darwin;
|
||||
# Source build will be possible after darwin SDK 12.0 bump
|
||||
# https://github.com/NixOS/nixpkgs/pull/229210
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
mainProgram = "vfkit";
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "2.10.9";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qnSuUn4Kk252kgqWUlnMl3+0MX2k+3sVvTpxgeBnVeE=";
|
||||
hash = "sha256-EVFNUOvczsgU0t2hOfl4e5bFH4ByxmRsIk2idI+uquQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MSxqRU9TUYDoUoYubXPrxABwLL5gou52ia0dX7lzQ5Q=";
|
||||
vendorHash = "sha256-eJT3ROX/cAslWMNUdlFU6eQE8o2GlAFKrBaT//Pde1o=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "zircolite";
|
||||
version = "2.20.0";
|
||||
version = "2.30.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wagga40";
|
||||
repo = "Zircolite";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-a7xwF0amsh2SycOjtZpk3dylcBGG9uYd7vmbnz/f9Ug=";
|
||||
hash = "sha256-9stQa0EMNA/qEN+bU7qBOdcwUR1vMGk70Br6wxRK8cs=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -58,4 +58,4 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (publicArgs // template // concatAttrLists [ template args ])
|
||||
# TODO [ AndersonTorres ]: verify if it allows using hash attribute as an option to sha256
|
||||
|
||||
|
||||
@@ -1,80 +1,98 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, coreutils
|
||||
, libxml2
|
||||
, lto ? true
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, pcre2
|
||||
, pony-corral
|
||||
, python3
|
||||
, substituteAll
|
||||
, which
|
||||
, z3
|
||||
, cctools
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
coreutils,
|
||||
libxml2,
|
||||
lto ? true,
|
||||
makeWrapper,
|
||||
openssl,
|
||||
pcre2,
|
||||
pony-corral,
|
||||
python3,
|
||||
# Not really used for anything real, just at build time.
|
||||
git,
|
||||
substituteAll,
|
||||
which,
|
||||
z3,
|
||||
cctools,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "ponyc";
|
||||
version = "0.54.0";
|
||||
version = "0.58.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-qFPubqGfK0WCun6QA1OveyDJj7Wf6SQpky7pEb7qsf4=";
|
||||
hash = "sha256-cCZo/lOvSvF19SGQ9BU2J3EBKHF9PgRBhuUVBkggF9I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
ponygbenchmark = fetchFromGitHub {
|
||||
benchmarkRev = "1.7.1";
|
||||
benchmark = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "v1.8.0";
|
||||
hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0=";
|
||||
rev = "v${benchmarkRev}";
|
||||
hash = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper which python3 ]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ];
|
||||
buildInputs = [ libxml2 z3 ];
|
||||
googletestRev = "1.12.1";
|
||||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
rev = "release-${googletestRev}";
|
||||
hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM=";
|
||||
};
|
||||
|
||||
# Sandbox disallows network access, so disabling problematic networking tests
|
||||
patches = [
|
||||
./disable-tests.patch
|
||||
(substituteAll {
|
||||
src = ./make-safe-for-sandbox.patch;
|
||||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
# GoogleTest follows Abseil Live at Head philosophy, use latest commit from main branch as often as possible.
|
||||
rev = "1a727c27aa36c602b24bf170a301aec8686b88e8"; # unstable-2023-03-07
|
||||
hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww=";
|
||||
};
|
||||
})
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(substituteAll {
|
||||
src = ./fix-darwin-build.patch;
|
||||
libSystem = darwin.Libsystem;
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
which
|
||||
python3
|
||||
git
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ];
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
z3
|
||||
];
|
||||
|
||||
patches =
|
||||
[
|
||||
# Sandbox disallows network access, so disabling problematic networking tests
|
||||
./disable-networking-tests.patch
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(substituteAll {
|
||||
src = ./fix-darwin-build.patch;
|
||||
libSystem = darwin.Libsystem;
|
||||
})
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p source/build/build_libs/gbenchmark-prefix/src
|
||||
cp -r "$ponygbenchmark"/ source/build/build_libs/gbenchmark-prefix/src/benchmark
|
||||
chmod -R u+w source/build/build_libs/gbenchmark-prefix/src/benchmark
|
||||
mkdir -p $NIX_BUILD_TOP/deps
|
||||
tar -C "$benchmark" -cf $NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar .
|
||||
tar -C "$googletest" -cf $NIX_BUILD_TOP/deps/googletest-$googletestRev.tar .
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace packages/process/_test.pony \
|
||||
--replace '"/bin/' '"${coreutils}/bin/' \
|
||||
--replace '=/bin' "${coreutils}/bin"
|
||||
--replace-fail '"/bin/' '"${coreutils}/bin/' \
|
||||
--replace-fail '=/bin' "${coreutils}/bin"
|
||||
substituteInPlace src/libponyc/pkg/package.c \
|
||||
--replace "/usr/local/lib" "" \
|
||||
--replace "/opt/local/lib" ""
|
||||
--replace-fail "/usr/local/lib" "" \
|
||||
--replace-fail "/opt/local/lib" ""
|
||||
|
||||
# Replace downloads with local copies.
|
||||
substituteInPlace lib/CMakeLists.txt \
|
||||
--replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \
|
||||
--replace-fail "https://github.com/google/googletest/archive/release-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
@@ -87,20 +105,33 @@ stdenv.mkDerivation (rec {
|
||||
"prefix=${placeholder "out"}"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no");
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=redundant-move"
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
];
|
||||
|
||||
# make: *** [Makefile:222: test-full-programs-release] Killed: 9
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
installPhase = ''
|
||||
make config=release prefix=$out ${
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no "))
|
||||
} install
|
||||
makeArgs=(config=release prefix=$out)
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
makeArgs+=(bits=64)
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isDarwin && !lto) ''
|
||||
makeArgs+=(lto=no)
|
||||
'' + ''
|
||||
make "''${makeArgs[@]}" install
|
||||
wrapProgram $out/bin/ponyc \
|
||||
--prefix PATH ":" "${stdenv.cc}/bin" \
|
||||
--set-default CC "$CC" \
|
||||
--prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}"
|
||||
'';
|
||||
--prefix PATH ":" "${stdenv.cc}/bin" \
|
||||
--set-default CC "$CC" \
|
||||
--prefix PONYPATH : "${
|
||||
lib.makeLibraryPath [
|
||||
pcre2
|
||||
openssl
|
||||
(placeholder "out")
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
# Stripping breaks linking for ponyc
|
||||
dontStrip = true;
|
||||
@@ -111,7 +142,17 @@ stdenv.mkDerivation (rec {
|
||||
description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
|
||||
homepage = "https://www.ponylang.org";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ kamilchm patternspandemic redvers ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [
|
||||
kamilchm
|
||||
patternspandemic
|
||||
redvers
|
||||
numinit
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,21 +1,17 @@
|
||||
diff --git a/src/libponyc/codegen/genexe.c b/src/libponyc/codegen/genexe.c
|
||||
index 42a68251..b37958ab 100644
|
||||
index 9ae3ff16..fdfe2bc5 100644
|
||||
--- a/src/libponyc/codegen/genexe.c
|
||||
+++ b/src/libponyc/codegen/genexe.c
|
||||
@@ -296,13 +296,13 @@ static bool link_exe(compile_t* c, ast_t* program,
|
||||
@@ -296,10 +296,10 @@ static bool link_exe(compile_t* c, ast_t* program,
|
||||
char* ld_cmd = (char*)ponyint_pool_alloc_size(ld_len);
|
||||
|
||||
snprintf(ld_cmd, ld_len,
|
||||
#if defined(PLATFORM_IS_ARM)
|
||||
- "%s -execute -arch %.*s "
|
||||
+ "%s -execute "
|
||||
#else
|
||||
- "%s -execute -no_pie -arch %.*s "
|
||||
+ "%s -execute -no_pie "
|
||||
#endif
|
||||
"-o %s %s %s %s "
|
||||
- "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lSystem %s",
|
||||
- "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'",
|
||||
- linker, (int)arch_len, c->opt->triple, file_exe, file_o,
|
||||
+ "-L@libSystem@/lib -lSystem %s",
|
||||
+ "-L@libSystem@/lib -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'",
|
||||
+ linker, file_exe, file_o,
|
||||
lib_args, ponyrt, sanitizer_arg
|
||||
);
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
From e26ae067644ea780f050fb900bd850027bb86456 Mon Sep 17 00:00:00 2001
|
||||
From: superherointj <5861043+superherointj@users.noreply.github.com>
|
||||
Date: Tue, 7 Mar 2023 14:59:31 -0300
|
||||
Subject: [PATCH] make-safe-for-sandbox.patch
|
||||
|
||||
---
|
||||
lib/CMakeLists.txt | 80 ++--------------------------------------------
|
||||
1 file changed, 2 insertions(+), 78 deletions(-)
|
||||
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index 129e26e6..d25bdf9d 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -32,14 +32,14 @@ endif()
|
||||
|
||||
set(PONYC_GBENCHMARK_URL https://github.com/google/benchmark/archive/v1.7.1.tar.gz)
|
||||
ExternalProject_Add(gbenchmark
|
||||
- URL ${PONYC_GBENCHMARK_URL}
|
||||
+ SOURCE_DIR gbenchmark-prefix/src/benchmark
|
||||
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_WERROR=OFF -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} --no-warn-unused-cli
|
||||
)
|
||||
|
||||
set(PONYC_GOOGLETEST_URL https://github.com/google/googletest/archive/release-1.12.1.tar.gz)
|
||||
|
||||
ExternalProject_Add(googletest
|
||||
- URL ${PONYC_GOOGLETEST_URL}
|
||||
+ URL @googletest@
|
||||
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} -Dgtest_force_shared_crt=ON --no-warn-unused-cli
|
||||
)
|
||||
|
||||
@@ -52,82 +52,6 @@ install(TARGETS blake2
|
||||
COMPONENT library
|
||||
)
|
||||
|
||||
-find_package(Git)
|
||||
-
|
||||
-set(LLVM_DESIRED_HASH "1f9140064dfbfb0bbda8e51306ea51080b2f7aac")
|
||||
-set(PATCHES_DESIRED_HASH "3e16c097794cb669a8f6a0bd7600b440205ac5c29a6135750c2e83263eb16a95")
|
||||
-
|
||||
-if(GIT_FOUND)
|
||||
- if(EXISTS "${PROJECT_SOURCE_DIR}/../.git")
|
||||
- # Update submodules as needed
|
||||
- option(GIT_SUBMODULE "Check submodules during build" ON)
|
||||
- if(GIT_SUBMODULE)
|
||||
- message(STATUS "Updating submodules...")
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --depth 1
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- RESULT_VARIABLE git_submod_result)
|
||||
- #message("git_submod_result ${git_submod_result}")
|
||||
- if(NOT git_submod_result EQUAL "0")
|
||||
- message(FATAL_ERROR "git submodule update --init --recursive --depth 1 failed with ${git_submod_result}, please checkout submodules")
|
||||
- endif()
|
||||
-
|
||||
- # we check to make sure the submodule hash matches
|
||||
- # the reason the submodule hash is in this file is to be able to use this file as a key for caching the libs in CI
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} submodule status
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- OUTPUT_VARIABLE git_submod_output)
|
||||
- #message("git_submod_output ${git_submod_output}")
|
||||
- string(FIND "${git_submod_output}" "${LLVM_DESIRED_HASH}" LLVM_SUBMOD_POS)
|
||||
- if(LLVM_SUBMOD_POS EQUAL "-1")
|
||||
- message(FATAL_ERROR "Expecting the lib/llvm/src submodule to be at hash '${LLVM_DESIRED_HASH}'; found '${git_submod_output}'; update the LLVM_DESIRED_HASH variable in lib/CMakeLists.txt if you've updated the submodule.")
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
-
|
||||
- # Apply patches
|
||||
- message("Applying patches...")
|
||||
- file(GLOB PONY_LLVM_PATCHES "${PROJECT_SOURCE_DIR}/llvm/patches/*.diff")
|
||||
-
|
||||
- # check to see if the patch hashes match
|
||||
- message("Checking patches ${PONY_LLVM_PATCHES}")
|
||||
- set(PATCHES_ACTUAL_HASH "needed_if_no_patches")
|
||||
- foreach (PATCH ${PONY_LLVM_PATCHES})
|
||||
- file(STRINGS ${PATCH} patch_file NEWLINE_CONSUME)
|
||||
- string(REPLACE "\n" " " patch_file ${patch_file})
|
||||
- string(SHA256 patch_file_hash ${patch_file})
|
||||
- # message("${PATCH}: '${patch_file_hash}'")
|
||||
- string(CONCAT PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH} ${patch_file_hash})
|
||||
- # message("concat is '${PATCHES_ACTUAL_HASH}'")
|
||||
- endforeach()
|
||||
- string(SHA256 PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH})
|
||||
- # message("Desired hash ${PATCHES_DESIRED_HASH}")
|
||||
- # message("Actual hash ${PATCHES_ACTUAL_HASH}")
|
||||
- if(NOT PATCHES_ACTUAL_HASH MATCHES "${PATCHES_DESIRED_HASH}")
|
||||
- message(FATAL_ERROR "Patch hash actual '${PATCHES_ACTUAL_HASH}' does not match desired '${PATCHES_DESIRED_HASH}'")
|
||||
- endif()
|
||||
-
|
||||
- foreach (PATCH ${PONY_LLVM_PATCHES})
|
||||
- message(" Checking ${PATCH}")
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} apply --check -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH}
|
||||
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src"
|
||||
- ERROR_VARIABLE _err_out
|
||||
- RESULT_VARIABLE git_apply_check_result)
|
||||
- if(git_apply_check_result EQUAL "0")
|
||||
- message(" Applying ${PATCH}")
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} apply -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH}
|
||||
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src"
|
||||
- RESULT_VARIABLE git_apply_result)
|
||||
- if(NOT git_apply_result EQUAL "0")
|
||||
- message(FATAL_ERROR "Unable to apply ${PATCH}")
|
||||
- endif()
|
||||
- else()
|
||||
- message(" Already applied ${PATCH}")
|
||||
- endif()
|
||||
- endforeach()
|
||||
-else()
|
||||
- message(FATAL_ERROR "Git not found!")
|
||||
-endif()
|
||||
-
|
||||
message("Building targets: ${LLVM_TARGETS_TO_BUILD}")
|
||||
|
||||
set(LLVM_ENABLE_BINDINGS OFF CACHE BOOL "ponyc specific override of LLVM cache entry")
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -1,26 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, ponyc
|
||||
, nix-update-script
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ponyc,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corral";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "corral";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+pHg5BFHlScC1suad0/3RqKAnxoEVZNUNj1EDLvbsfA=";
|
||||
hash = "sha256-cbiw7OaU6HyAp/dHV5FVI7B7mam0GUb95EkR/Grwu0k=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ ponyc ];
|
||||
|
||||
installFlags = [ "prefix=${placeholder "out"}" "install" ];
|
||||
installFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
"install"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -29,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.ponylang.io";
|
||||
changelog = "https://github.com/ponylang/corral/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ redvers ];
|
||||
maintainers = with maintainers; [ redvers numinit ];
|
||||
inherit (ponyc.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioruckus";
|
||||
version = "0.41";
|
||||
version = "0.42";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "ms264556";
|
||||
repo = "aioruckus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-acu0EWP/k0qyylPtM8IBxhJhhQhXpbG2NheYpD8RTG8=";
|
||||
hash = "sha256-UfyB3qGEDOQ39YA1AueCBXeoJhGH+XDCLZSFA+kpT2k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -50,6 +50,8 @@ buildPythonPackage rec {
|
||||
"test_current_active_clients"
|
||||
"test_mesh_info"
|
||||
"test_system_info"
|
||||
# Network access to Ruckus Cloud API
|
||||
"test_r1_connect_no_webserver_error"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostreammagic";
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "noahhusby";
|
||||
repo = "aiostreammagic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TleCQjx1s8S1YTxh/d1T3oozQAwzPTCurzjLjDCebik=";
|
||||
hash = "sha256-1/9cpdKRr7O4Ji34OSkbBudSedTAt50oGZBc88XNI18=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "websockets" ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TKKwtJMo8D9aPd4tVlEy34rXTLonNSYS7Nn+JQXh13A=";
|
||||
hash = "sha256-/fV2FX2CMt3jjpnJ4XjhfWVa1yWmWna7eYO/6npPxig=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "daqp";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darnstrom";
|
||||
repo = "daqp";
|
||||
rev = "5a15a3d16731d3d50f867218c1b281567db556fd";
|
||||
hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9sPYyd8J78HKDxbwkogu8tW38rgYIctEWqrriqJKy0M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/interfaces/daqp-python";
|
||||
|
||||
@@ -39,6 +39,10 @@ buildPythonPackage rec {
|
||||
tabulate
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"docling_core"
|
||||
];
|
||||
|
||||
@@ -48,6 +48,7 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"lxml"
|
||||
"mean_average_precision"
|
||||
"pillow"
|
||||
"torchvision"
|
||||
];
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "go2rtc-client";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "python-go2rtc-client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oVPZtPRlm3CmTBfxXm66BOOZVQ39DsR+WmkoAdHp4eQ=";
|
||||
hash = "sha256-EVdkSipRAvI4sKOBjLlKnHpi3soMWap/T0O9W4zveco=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "6.1.4";
|
||||
version = "6.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ=";
|
||||
hash = "sha256-fIypWohefKS4X/obiPHNF4QPuGBzitcvf7fXBpUZotY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "knx-frontend";
|
||||
version = "2024.9.10.221729";
|
||||
version = "2024.11.16.205004";
|
||||
pyproject = true;
|
||||
|
||||
# TODO: source build, uses yarn.lock
|
||||
src = fetchPypi {
|
||||
pname = "knx_frontend";
|
||||
inherit version;
|
||||
hash = "sha256-Imv4DcQCdT5iHIsDtxzLRwTWQqRgR4ASx/kdkmIbK6o=";
|
||||
hash = "sha256-CsKtCTLsBpW3IMTdT8YBsnWLBt/huZGejyyBmusT6zc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -258,8 +258,8 @@ rec {
|
||||
"sha256-YGz59Mf6cNqNAJmdI0YQF9dzzUY6Mwi7fgzsDwMWv3w=";
|
||||
|
||||
mypy-boto3-cloudwatch =
|
||||
buildMypyBoto3Package "cloudwatch" "1.35.0"
|
||||
"sha256-DXAn45lDLDoA5T7yDRRYwz7HI0l2SYxB6TZAsXZS2oY=";
|
||||
buildMypyBoto3Package "cloudwatch" "1.35.63"
|
||||
"sha256-sJ3dI0JUFD+V+hnsRh+4w45cz8VXjG+ZUbTPkdu/QOE=";
|
||||
|
||||
mypy-boto3-codeartifact =
|
||||
buildMypyBoto3Package "codeartifact" "1.35.31"
|
||||
@@ -382,8 +382,8 @@ rec {
|
||||
"sha256-JlarWblBOzB64JV7866QjxIWqQH17qH4Lcig2g7WsAw=";
|
||||
|
||||
mypy-boto3-datasync =
|
||||
buildMypyBoto3Package "datasync" "1.35.52"
|
||||
"sha256-KPDVvfCr9qffzjjyxhI49YIDVzNraiarljFaJLfsbeI=";
|
||||
buildMypyBoto3Package "datasync" "1.35.63"
|
||||
"sha256-DUK85nhHoFfnHW/2dKN1Dk/ElzC0TzjWsiG6lbnrYaA=";
|
||||
|
||||
mypy-boto3-dax =
|
||||
buildMypyBoto3Package "dax" "1.35.0"
|
||||
@@ -446,8 +446,8 @@ rec {
|
||||
"sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.35.60"
|
||||
"sha256-vIA0qQ4Y8ScBw8e69DC51qrxPEDDZ7y2OTLGBX1hnRo=";
|
||||
buildMypyBoto3Package "ec2" "1.35.63"
|
||||
"sha256-+vtNsMh4Wz5g362h8wopTQrgeEwO81o62h5awZYrDRI=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
|
||||
@@ -634,8 +634,8 @@ rec {
|
||||
"sha256-499CCePEtUnJhk3GJJ/BWhpYY5smN91yp3WuSnYBXJo=";
|
||||
|
||||
mypy-boto3-iot =
|
||||
buildMypyBoto3Package "iot" "1.35.33"
|
||||
"sha256-4+EVog8UUrl70ixcAviqrLUJVMqmXjyX80fzAn80hso=";
|
||||
buildMypyBoto3Package "iot" "1.35.63"
|
||||
"sha256-Fj0ZKzDHx4t2qmroAbHfg1zXQ17CjKXiozROSLsoC4Y=";
|
||||
|
||||
mypy-boto3-iot-data =
|
||||
buildMypyBoto3Package "iot-data" "1.35.34"
|
||||
@@ -994,8 +994,8 @@ rec {
|
||||
"sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8=";
|
||||
|
||||
mypy-boto3-outposts =
|
||||
buildMypyBoto3Package "outposts" "1.35.58"
|
||||
"sha256-L1Kge8GPBYFN7HkTimCTvBOEf1ge1s7FWa4nMM6gypU=";
|
||||
buildMypyBoto3Package "outposts" "1.35.63"
|
||||
"sha256-0hsu95WJJ0vIsfHyQIdV1cCSz6czd3yjgBWTv9cTee4=";
|
||||
|
||||
mypy-boto3-panorama =
|
||||
buildMypyBoto3Package "panorama" "1.35.0"
|
||||
@@ -1042,8 +1042,8 @@ rec {
|
||||
"sha256-AYfD/JY1//vPw1obZAmwqW3NYwSpqg1zjQqTpIk80Rw=";
|
||||
|
||||
mypy-boto3-pinpoint-sms-voice-v2 =
|
||||
buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.57"
|
||||
"sha256-pjvecs9LfkOQXiobtZ/OQVMKXGl/ATMy7ZiRjNJFclQ=";
|
||||
buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.35.63"
|
||||
"sha256-5JtwFqTutitSEnHyXpb/m3O/GxZg3uO4Y0DESGF5g/E=";
|
||||
|
||||
mypy-boto3-pipes =
|
||||
buildMypyBoto3Package "pipes" "1.35.43"
|
||||
@@ -1154,8 +1154,8 @@ rec {
|
||||
"sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g=";
|
||||
|
||||
mypy-boto3-route53resolver =
|
||||
buildMypyBoto3Package "route53resolver" "1.35.38"
|
||||
"sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y=";
|
||||
buildMypyBoto3Package "route53resolver" "1.35.63"
|
||||
"sha256-zKEDuWjd3Uh7QEFfz/1NUW8JAwhapDBAiXzAuPLXb/c=";
|
||||
|
||||
mypy-boto3-rum =
|
||||
buildMypyBoto3Package "rum" "1.35.0"
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
apple-sdk_11,
|
||||
buildPythonPackage,
|
||||
darwinMinVersionHook,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
@@ -46,6 +48,14 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [ eigen ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
|
||||
(darwinMinVersionHook "10.13")
|
||||
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@@ -3,28 +3,32 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
packaging,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "newversion";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vemel";
|
||||
repo = "newversion";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-v9hfk2/hBkWtOobQdaYXNOZTTcEqnMV6JYqtjjoidOs=";
|
||||
hash = "sha256-R26yZQnQN/+e8XD3YKl+3bJKGnZaVzOVoTlGHOyratg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ packaging ];
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -32,10 +36,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "PEP 440 version manager";
|
||||
mainProgram = "newversion";
|
||||
homepage = "https://github.com/vemel/newversion";
|
||||
changelog = "https://github.com/vemel/newversion/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "newversion";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.15.16";
|
||||
version = "4.16.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NwGGNN6LC3gvE8zoVL5meNWMbqZjJ+6PcU2ebJTfJmU=";
|
||||
hash = "sha256-4dWtSj6OwD4c18yDKtlqXyPc37JQhbsAuj9OmcIHe0I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.8.0";
|
||||
version = "6.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+r8HyIEFcWB6WHwKbos8IGRAmekRsPDJWbtQ5mVpHrE=";
|
||||
hash = "sha256-iu5Aft3DM/Q59zHIhHAheiEkacNFyIBzlcJ/4kb1+to=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,33 +12,28 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-examples";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pytest-examples";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R0gSWQEGMkJhkeXImyris2wzqjJ0hC3zO0voEdhWLoY=";
|
||||
hash = "sha256-MAiTNz2Ygk+JOiiT5DGhJ15xITbS+4Gk23YCKJm7OKE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# ruff binary is used directly, the ruff Python package is not needed
|
||||
substituteInPlace pytest_examples/lint.py \
|
||||
--replace-fail "'ruff'" "'${lib.getExe ruff}'"
|
||||
'';
|
||||
|
||||
pythonRemoveDeps = [ "ruff" ];
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
dependencies = [ black ];
|
||||
dependencies = [
|
||||
black
|
||||
ruff
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-linkplay";
|
||||
version = "0.0.17";
|
||||
version = "0.0.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Velleman";
|
||||
repo = "python-linkplay";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TJ5QWt5bCDy9L4EShf1rW1TDIrF0LfeThEv9PiCPEp8=";
|
||||
hash = "sha256-UIWubFLHtf43co/aYXh3rxkjLJ77E+Sgkx25UFC5vcg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,23 +10,26 @@
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-smarttub";
|
||||
version = "0.0.38";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdz";
|
||||
repo = pname;
|
||||
repo = "python-smarttub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ErGBOO5aes4Avmt2M6rkZPmjwsCMZdNnLhMDYhlULzU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
inflection
|
||||
pyjwt
|
||||
@@ -39,14 +42,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyjwt~=2.1.0" "pyjwt>=2.1.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "smarttub" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/mdz/python-smarttub/releases/tag/v${version}";
|
||||
description = "Python API for SmartTub enabled hot tubs";
|
||||
homepage = "https://github.com/mdz/python-smarttub";
|
||||
license = with licenses; [ mit ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.30.4";
|
||||
version = "0.30.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kk5i477xLzKePNs1B4lUjKxS4HlA5FCw7pImnESh9Y8=";
|
||||
hash = "sha256-lUxID4D9wxKvDF3epEznTof9lHYKFniTDYv7/gvW7Z4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CRKCqIi4WxO5t0PdyGV3fJlcK99j1PKVSBoisw4zuZ0=";
|
||||
hash = "sha256-cY5EEIab+6JzDI3QpsFbPPdf3mJ+Pax1pkZKNewVkTI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.13.3";
|
||||
version = "0.13.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s=";
|
||||
hash = "sha256-WzhLHFOL0DY6DfDxRZlhcXXfiHWAg1jzXHtXBmmbAbQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
torch,
|
||||
apple-sdk_13,
|
||||
buildPythonPackage,
|
||||
darwinMinVersionHook,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
@@ -44,11 +47,20 @@ buildPythonPackage {
|
||||
which
|
||||
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
torch.cxxdev
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
torch.cxxdev
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# This should match the SDK used by `torch` above
|
||||
apple-sdk_13
|
||||
|
||||
# error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'?
|
||||
# https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/
|
||||
(darwinMinVersionHook "12.0")
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha";
|
||||
version = "0.0.37";
|
||||
version = "0.0.39";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PY4TJIG5NtJdQuQYmoZG3NgcH3WfCkpkcoJTbJ5jdr0=";
|
||||
hash = "sha256-75R2Ah5L5wjIwGrUeifujiuAo4GhpXbu8EbqAPImjQU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.71.0";
|
||||
version = "0.72.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ctlbCtUiwLFlxja9F6Fz7m9FP/lJLS+7/+gWlMTo+1s=";
|
||||
hash = "sha256-q8YyAFBhY60ZK8tHSJnTU6gbDP3ifT1MAAbpYf3EIJA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1286,6 +1286,10 @@ let
|
||||
preConfigure = ''
|
||||
export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
|
||||
export JAVA_HOME=${pkgs.jdk}
|
||||
substituteInPlace R/zzz.R.in \
|
||||
--replace-fail ".onLoad <- function(libname, pkgname) {" \
|
||||
".onLoad <- function(libname, pkgname) {
|
||||
Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.jdk}\"))"
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@@ -44,10 +44,11 @@
|
||||
# Allow to independently override the jdks used to build and run respectively
|
||||
buildJdk,
|
||||
runJdk,
|
||||
# Toggle for hacks for running bazel under buildBazelPackage:
|
||||
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
|
||||
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
|
||||
enableNixHacks ? false,
|
||||
version ? "7.4.0",
|
||||
version ? "7.4.1",
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -55,7 +56,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
hash = "sha256-GY1wu3O5O7K2MMJv6wjE+DLnUgwjkHdmcqhT1o9G9Cg=";
|
||||
hash = "sha256-gzhmGLxIn02jYmbvJiDsZKUmxobPBwQTMsr/fJU6+vU=";
|
||||
};
|
||||
|
||||
defaultShellUtils =
|
||||
@@ -112,23 +113,23 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
|
||||
hash = "sha256-0glQLNAU0aT7+3Hzv0+IzgvJlfs7y8wflEwFssIvnkk=";
|
||||
hash = "sha256-CYL1paAtzTbfl7TfsqwJry/dkoTO/yZdHrX0NSA1+Ig=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
|
||||
hash = "sha256-736PrTFckHyChRh0Uv8zNtCppQYhfZWECl9+44cs6Qo=";
|
||||
hash = "sha256-6DzTEx218/Qq38eMWvXOX/t9VJDyPczz6Edh4eHdOfg=";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
|
||||
hash = "sha256-FX7ZKKG7uoteEvx0fBqpsoB3Gj0aJNaC2IXgJ2ffgz4=";
|
||||
hash = "sha256-Ut00wXzJezqlvf49RcTjk4Im8j3Qv7R77t1iWpU/HwU=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
# stdenv.hostPlatform.system == "aarch64-darwin"
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
|
||||
hash = "sha256-+EP+HssT4aISUZwLKkSuuXjGQm9lheNJDr7WZw1v0pU=";
|
||||
hash = "sha256-ArEXuX0JIa5NT04R0n4sCTA4HfQW43NDXV0EGcaibyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = defaultShellUtils;
|
||||
@@ -392,7 +393,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
]
|
||||
# See enableNixHacks argument above.
|
||||
++ lib.optional enableNixHacks ./nix-hacks.patch;
|
||||
++ lib.optional enableNixHacks ./nix-build-bazel-package-hacks.patch;
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
||||
+21
-30
@@ -1,10 +1,18 @@
|
||||
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||
index 4d8c46f8d5..ed311226f0 100644
|
||||
index 53e6494656..22261cd268 100644
|
||||
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||
@@ -178,18 +178,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
||||
}
|
||||
@@ -55,6 +55,7 @@ import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
|
||||
import com.google.devtools.build.skyframe.SkyKey;
|
||||
import com.google.devtools.build.skyframe.SkyValue;
|
||||
import java.io.IOException;
|
||||
+import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.TreeMap;
|
||||
@@ -193,16 +194,11 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
||||
}
|
||||
|
||||
if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
|
||||
- // Make sure marker file is up-to-date; correctly describes the current repository state
|
||||
- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env);
|
||||
@@ -12,35 +20,18 @@ index 4d8c46f8d5..ed311226f0 100644
|
||||
- return null;
|
||||
- }
|
||||
- if (markerHash != null) { // repo exist & up-to-date
|
||||
- return RepositoryDirectoryValue.builder()
|
||||
- .setPath(repoRoot)
|
||||
+ {
|
||||
+ // Nix hack: Always consider cached dirs as up-to-date
|
||||
return RepositoryDirectoryValue.builder()
|
||||
.setPath(repoRoot)
|
||||
- .setDigest(markerHash)
|
||||
- .setExcludeFromVendoring(shouldExcludeRepoFromVendoring(handler, rule))
|
||||
- .build();
|
||||
- }
|
||||
+ // Nix hack: Always consider cached dirs as up-to-date
|
||||
+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build();
|
||||
- .setExcludeFromVendoring(excludeRepoFromVendoring)
|
||||
+ .setDigest(digestWriter.writeMarkerFile(Collections.emptyMap()))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
/* At this point: This is a force fetch, a local repository, OR The repository cache is old or
|
||||
@@ -610,11 +600,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
||||
builder.append(escape(key)).append(" ").append(escape(value)).append("\n");
|
||||
}
|
||||
String content = builder.toString();
|
||||
- try {
|
||||
- FileSystemUtils.writeContent(markerPath, UTF_8, content);
|
||||
- } catch (IOException e) {
|
||||
- throw new RepositoryFunctionException(e, Transience.TRANSIENT);
|
||||
- }
|
||||
+ // Nix hack: Do not write these pesky marker files
|
||||
+ //try {
|
||||
+ // FileSystemUtils.writeContent(markerPath, UTF_8, content);
|
||||
+ //} catch (IOException e) {
|
||||
+ // throw new RepositoryFunctionException(e, Transience.TRANSIENT);
|
||||
+ //}
|
||||
return new Fingerprint().addString(content).digestAndReset();
|
||||
}
|
||||
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
|
||||
index 649647c5f2..64d05b530c 100644
|
||||
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
let
|
||||
common = rec {
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
rev = version;
|
||||
hash = "sha256-dFPjQcY3jtHIsdR0X1s0qbHtBFroRhHoy/NldEFxlZ0=";
|
||||
hash = "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.11.1";
|
||||
version = "2024.11.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@@ -439,7 +439,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2024.11.1";
|
||||
hassVersion = "2024.11.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@@ -457,13 +457,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-t8f0em5EaWPLZlr+fi/Kn3AE0dFEAyy0FpwdjJOYBCI=";
|
||||
hash = "sha256-cP9Q700JLnThAPDfeJ8mx+PSI6I62hjA49TpAMHN2Wk=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-e9RF1oer4FyDEYof7qLTFUkmSxDh71qi+ResNXO6G5o=";
|
||||
hash = "sha256-qBKcY8PybEJeExTjxs9bgiM6YWjyoSLE1dzgrD1Hdtc=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.11.1";
|
||||
version = "2024.11.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6Av1LSzmgjJonXlRFMrzdvGDm6latErBxCmgYlCDZ28=";
|
||||
hash = "sha256-P9fhFl91IJyRCacJ5lDJu036hgzcNMCF7LO4Brv4P6c=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -68,6 +68,11 @@ let
|
||||
};
|
||||
|
||||
extraPytestFlagsArray = {
|
||||
conversation = [
|
||||
# Expected: Sorry, I am not aware of any device called missing entity on ground floor
|
||||
# Actually: Sorry, I am not aware of any area called ground floor
|
||||
"--deselect tests/components/conversation/test_default_agent.py::test_error_no_device_on_floor"
|
||||
];
|
||||
dnsip = [
|
||||
# Tries to resolve DNS entries
|
||||
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
|
||||
|
||||
@@ -72,6 +72,8 @@ in {
|
||||
|
||||
pg_net = super.callPackage ./pg_net.nix { };
|
||||
|
||||
pg-semver = super.callPackage ./pg-semver.nix { };
|
||||
|
||||
pgtap = super.callPackage ./pgtap.nix { };
|
||||
|
||||
smlar = super.callPackage ./smlar.nix { };
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
postgresql,
|
||||
postgresqlTestExtension,
|
||||
testers,
|
||||
buildPostgresqlExtension,
|
||||
}:
|
||||
|
||||
buildPostgresqlExtension (finalAttrs: {
|
||||
pname = "pg-semver";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theory";
|
||||
repo = "pg-semver";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-9f+QuGupjTUK3cQk7DFDrL7MOIwDE9SAUyVZ9RfrdDM=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
extension = postgresqlTestExtension {
|
||||
inherit (finalAttrs) finalPackage;
|
||||
sql = "CREATE EXTENSION semver;";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Semantic version data type for PostgreSQL";
|
||||
homepage = "https://github.com/theory/pg-semver";
|
||||
changelog = "https://github.com/theory/pg-semver/blob/main/Changes";
|
||||
maintainers = with lib.maintainers; [ grgi ];
|
||||
inherit (postgresql.meta) platforms;
|
||||
license = lib.licenses.postgresql;
|
||||
};
|
||||
})
|
||||
@@ -46,7 +46,7 @@ buildPythonApplication rec {
|
||||
beautifying your logfiles or output of commands.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ azahi lovek323 AndersonTorres peterhoeg ];
|
||||
maintainers = with maintainers; [ azahi lovek323 peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "grc";
|
||||
};
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.31.1";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tSMzLnqPwbMU/3k0JnubtWJ6GtaCtewBmBzUWrDocDY=";
|
||||
hash = "sha256-Mo3hhm/SVusz7bTszsxc5gDOXVotvVFzA6Q9RD780Jo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XzJ+FzGlJpnRjDt0IDbe1i7zCEDgy0L9hE/Ltqo+SoE=";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
let
|
||||
pname = "iaito";
|
||||
version = "5.9.4";
|
||||
version = "5.9.6";
|
||||
|
||||
main_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o+DeHifhixWwFX6V/sDXou46rrz5qeQ1Ky8UaAVyDPM=";
|
||||
hash = "sha256-rkL7qH1BLXw3eXdCoVuan2C6k05pE5LOIOTbIEtfUbE=";
|
||||
name = repo;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user