Merge staging-next into staging
This commit is contained in:
@@ -21728,6 +21728,12 @@
|
||||
githubId = 521306;
|
||||
name = "Rob Glossop";
|
||||
};
|
||||
robinheghan = {
|
||||
email = "git@heghan.org";
|
||||
github = "robinheghan";
|
||||
githubId = 854889;
|
||||
name = "Robin Heggelund Hansen";
|
||||
};
|
||||
robinkrahl = {
|
||||
email = "nix@ireas.org";
|
||||
github = "robinkrahl";
|
||||
|
||||
@@ -270,7 +270,7 @@ in
|
||||
"scp ${sshOpts} /etc/nebula/${name}.pub root@192.168.1.1:/root/${name}.pub",
|
||||
)
|
||||
lighthouse.succeed(
|
||||
'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt'
|
||||
'nebula-cert sign -duration $((365*24*60))m -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt'
|
||||
)
|
||||
${name}.succeed(
|
||||
"scp ${sshOpts} root@192.168.1.1:/root/${name}.crt /etc/nebula/${name}.crt",
|
||||
@@ -307,8 +307,8 @@ in
|
||||
${setUpPrivateKey "lighthouse"}
|
||||
lighthouse.succeed(
|
||||
"mkdir -p /etc/nebula",
|
||||
'nebula-cert ca -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key',
|
||||
'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key',
|
||||
'nebula-cert ca -duration $((10*365*24*60))m -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key',
|
||||
'nebula-cert sign -duration $((365*24*60))m -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key',
|
||||
'chown -R nebula-smoke:nebula-smoke /etc/nebula'
|
||||
)
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtgreet";
|
||||
version = "2.0.3.95";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marcusbritanicus";
|
||||
|
||||
@@ -1242,8 +1242,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "dart-code";
|
||||
publisher = "dart-code";
|
||||
version = "3.114.2";
|
||||
hash = "sha256-J/CrFUCgaGzZAeyS09Gz0m1nffNgfqCuRI6UoqdlmjM=";
|
||||
version = "3.116.0";
|
||||
hash = "sha256-YhcQXncHzpNS7CupRQMPjFLb5ZKwXmCxR3UfHlhlgYE=";
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
@@ -1253,8 +1253,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "flutter";
|
||||
publisher = "dart-code";
|
||||
version = "3.114.0";
|
||||
hash = "sha256-xKvLpcAu3LDmXLImYcbtk3EqglVS0CHF3MzO21M8SpY=";
|
||||
version = "3.116.0";
|
||||
hash = "sha256-5T/C9o6fRLnWM7MF8ATYJMEdJgLA4ZdA4Lgjtjxh2ZE=";
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
@@ -3650,6 +3650,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
ndonfris.fish-lsp = callPackage ./ndonfris.fish-lsp { };
|
||||
|
||||
nefrob.vscode-just-syntax = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-just-syntax";
|
||||
@@ -3856,8 +3858,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "6.12.0";
|
||||
hash = "sha256-X2Z+a270exSSVnfUkiGBO6C/Y4ndbzwQstJoUN/pa7c=";
|
||||
version = "6.13.0";
|
||||
hash = "sha256-qx+2lKRx/4fS2xz9lBIQsTD5tcjTzow7WmYsHYyrfOw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
@@ -4159,8 +4161,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "sas-lsp";
|
||||
publisher = "SAS";
|
||||
version = "1.15.0";
|
||||
hash = "sha256-BprmYUQhjXoqk21NxsmlrU8XiFuyWZa//JyIUoEa1Tc=";
|
||||
version = "1.16.0";
|
||||
hash = "sha256-+nB+J5exzxso6LM41HDH6SEjAUtDPZXhdZLdydYvFBk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";
|
||||
@@ -4188,8 +4190,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "metals";
|
||||
publisher = "scalameta";
|
||||
version = "1.52.0";
|
||||
hash = "sha256-oF/NNP8PfzwQRYxV1rNgcWX6hlZasxppxa0AphQDSVg=";
|
||||
version = "1.53.0";
|
||||
hash = "sha256-5/YnHyhC83pDEaEN4H/QHIjw/oiAGPWZphzAzhMBPkk=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2025.6.2";
|
||||
hash = "sha256-XHy5k/1X+TH7iQDJBSk1xSofkizd3XQttoiaPG1DNZw=";
|
||||
version = "2025.7.1";
|
||||
hash = "sha256-0lPbu5amiqk/O0XIFxJpTBKQEbU8mamnjBGsaalTyh8=";
|
||||
};
|
||||
|
||||
buildInputs = [ pyright ];
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "ndonfris";
|
||||
name = "fish-lsp";
|
||||
version = "0.1.10";
|
||||
hash = "sha256-aMuvBc2QVlRXpoBvWQaxC5SdwWzsauvVk1zMbK1p6oQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "LSP implementation for the fish shell language";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ndonfris.fish-lsp";
|
||||
homepage = "https://github.com/ndonfris/fish-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tuynia ];
|
||||
};
|
||||
}
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "RooVeterinaryInc";
|
||||
name = "roo-cline";
|
||||
version = "3.23.16";
|
||||
hash = "sha256-dFYdxnS9s6BxXzvhDqNHTXq29EA7DpvGX7Xe2p77+Vw=";
|
||||
version = "3.25.4";
|
||||
hash = "sha256-uyI/VdBpkCxzlm1Ei2v/UjsenhyanDuVXLXk3Pkiw1s=";
|
||||
};
|
||||
|
||||
passthru.updateScript = vscode-extension-update-script { };
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.20.1";
|
||||
hash = "sha256-2IX6EdzNpJapgVSwQ9hyby7CdURI5uaQJpGh4pcEuaQ=";
|
||||
version = "3.20.5";
|
||||
hash = "sha256-sxByZXSNuxVrW4WWKvNCmR2SZ6tR5CDxGXdLyHoegwc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -43,20 +43,27 @@ let
|
||||
armv7l-linux = "sha256-VSsn4d9ztFgGXVZeCeTSHDD5n3aTBbHF/xx2JvTGOeQ=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.102.3";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "488a1f239235055e34e673291fb8d8c810886f81";
|
||||
in
|
||||
callPackage ./generic.nix {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
shortName = "Code" + lib.optionalString isInsiders " - Insiders";
|
||||
inherit commandLineArgs useVSCodeRipgrep sourceExecutableName;
|
||||
inherit
|
||||
version
|
||||
rev
|
||||
commandLineArgs
|
||||
useVSCodeRipgrep
|
||||
sourceExecutableName
|
||||
;
|
||||
|
||||
src = fetchurl {
|
||||
name = "VSCode_${version}_${plat}.${archive_fmt}";
|
||||
@@ -92,17 +99,13 @@ callPackage ./generic.nix rec {
|
||||
hasVsceSign = true;
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
Open source source code editor developed by Microsoft for Windows,
|
||||
Linux and macOS
|
||||
'';
|
||||
description = "Code editor developed by Microsoft";
|
||||
mainProgram = "code";
|
||||
longDescription = ''
|
||||
Open source source code editor developed by Microsoft for Windows,
|
||||
Linux and macOS. It includes support for debugging, embedded Git
|
||||
control, syntax highlighting, intelligent code completion, snippets,
|
||||
and code refactoring. It is also customizable, so users can change the
|
||||
editor's theme, keyboard shortcuts, and preferences
|
||||
Code editor developed by Microsoft. It includes support for debugging,
|
||||
embedded Git control, syntax highlighting, intelligent code completion,
|
||||
snippets, and code refactoring. It is also customizable, so users can
|
||||
change the editor's theme, keyboard shortcuts, and preferences
|
||||
'';
|
||||
homepage = "https://code.visualstudio.com/";
|
||||
downloadPage = "https://code.visualstudio.com/Updates";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pineapple-pictures";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BLumia";
|
||||
repo = "pineapple-pictures";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-jdybJx/70m9c4/HC1Iz2xm3sf51Fl0jA0lhLvo+KwWw=";
|
||||
hash = "sha256-bJOBqxJ5pl1O0QEFQtkPn55y4g5I7Zwb3S0PTJ1SoFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clock-rs";
|
||||
version = "0.1.215";
|
||||
version = "0.1.216";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Oughie";
|
||||
repo = "clock-rs";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-uDEvJqaaBNRxohYqHE6qfqUF07ynRvGwJKWbYfgPEvg=";
|
||||
sha256 = "sha256-sSofMZThR025O2J4PnOMWVEuBt/+oZ01yDAQAijca0A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zry6mkOUdEgC95Y3U3RCXPJUsmaSoRPlHvUThI92GQU=";
|
||||
cargoHash = "sha256-7gpD7aAma9Ye7sxqm1wGekcovXxdd11XOMf7fKWZrcA=";
|
||||
|
||||
meta = {
|
||||
description = "Modern, digital clock that effortlessly runs in your terminal";
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
clock-rs is a terminal-based clock written in Rust, designed to be a new alternative to tty-clock.
|
||||
It supports all major platforms and offers several improvements, which include:
|
||||
|
||||
- The use of a single configuration file to manage its settings, with the ability to overwrite them through the command line,
|
||||
- The use of a single configuration file to manage its settings, with the ability to override them through the command line,
|
||||
- Many additional features such as a timer and a stopwatch,
|
||||
- And greater flexibility as well as better user experience!
|
||||
'';
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "clorinde";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcyonnouveau";
|
||||
repo = "clorinde";
|
||||
tag = "clorinde-v${finalAttrs.version}";
|
||||
hash = "sha256-AYoSs3rDZ5j8Xt6E4X7RmgccM3bng3rgWzVLFjhmfR0=";
|
||||
hash = "sha256-Bxa30QkBFJaa/Xd4BL5OOcMLLHI6p81kX10zrUQkX5w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hxOVocfQvBlaYh227SVLYncfVZ80bDxIvoMtthaqQqc=";
|
||||
cargoHash = "sha256-EL2/IgIdP+JZAdDXHwaBqBqjBIJOQeNL48hgTn9UWXw=";
|
||||
|
||||
cargoBuildFlags = [ "--package=clorinde" ];
|
||||
|
||||
|
||||
@@ -1,39 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
python3,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.4.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-rRe0JFEO5ixxrZYDL8kxXDOH0n7lqabkXNNaSlNnQDg=";
|
||||
hash = "sha256-t7FgR84alnJGhN/dsFtUySFfOpGoBlRfP+D/Q6JPz5M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-QIZ3V4NUo1VxJN3cwdQf3S0zwePnwdKKfch0jlIJacU=";
|
||||
cargoHash = "sha256-SNl6UXzvtVR+ep7CIoCcpvET8Hs7ew1fmHqOXbzN7kU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
python3 # Required because of codex-rs/login/src/login_with_chatgpt.py
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ gitMinimal ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
env = {
|
||||
CODEX_SANDBOX = "seatbelt"; # Disables sandbox tests which want to access /usr/bin/touch
|
||||
CODEX_SANDBOX_NETWORK_DISABLED = 1; # Skips tests that require networking
|
||||
};
|
||||
checkFlags = [
|
||||
"--skip=keeps_previous_response_id_between_tasks" # Requires network access
|
||||
"--skip=retries_on_early_close" # Requires network access
|
||||
"--skip=shell::tests::test_run_with_profile_escaping_and_execution" # Wants to access /bin/zsh
|
||||
"--skip=includes_base_instructions_override_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
|
||||
"--skip=includes_user_instructions_message_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied'
|
||||
"--skip=originator_config_override_is_used" # Fails with 'stream ended unexpectedly: InternalAgentDied'
|
||||
"--skip=test_conversation_create_and_send_message_ok" # Version 0.0.0 hardcoded
|
||||
"--skip=test_send_message_session_not_found" # Version 0.0.0 hardcoded
|
||||
"--skip=test_send_message_success" # Version 0.0.0 hardcoded
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString installShellCompletions ''
|
||||
installShellCompletion --cmd codex \
|
||||
--bash <($out/bin/codex completion bash) \
|
||||
--fish <($out/bin/codex completion fish) \
|
||||
--zsh <($out/bin/codex completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coin";
|
||||
version = "4.0.4";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "coin";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zk9tlGMbNhfHKv+Z5VFWr1g3wNuPFzof+7vsLAlOBC4=";
|
||||
hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dua";
|
||||
version = "2.30.1";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "dua-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TJiy9ki2k9sgruMFPF3xElOJaco6G8Jx/g43WYwF22U=";
|
||||
hash = "sha256-GwNA3rKZ754B6/wGfE3YYv7/w3pt+0T/leYOfdiXzTs=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LOtZyH6eO8IgHrZfyBInEeXI9CxkjLrMfMWuTUMF+FU=";
|
||||
cargoHash = "sha256-T4wvvrTeXsHCoIpvHmAMWcsxtxx5o7Nvky/TkwVyfAA=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip interactive tests
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.106";
|
||||
"version" = "1.11.108";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-uQUd84MtwMTGhhw83pQk9jI79pNKBVTWJLz8dyT/SE4=";
|
||||
"desktopYarnHash" = "sha256-WZYRPU3ZswAtUAZDJnlELLU1JImO3uFaYHQl+kJOeqk=";
|
||||
"desktopSrcHash" = "sha256-7qG2QyOgq2ATyXsr5jLxngxXvVaw52GYOD1LiUCGNNo=";
|
||||
"desktopYarnHash" = "sha256-QLsKY0tDeY5dp6VLiPZhawa54SI2/A0W6UE0NoJ5dng=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
yarn,
|
||||
nodejs,
|
||||
jq,
|
||||
electron_36,
|
||||
electron_37,
|
||||
element-web,
|
||||
sqlcipher,
|
||||
callPackage,
|
||||
@@ -22,7 +22,7 @@ let
|
||||
pinData = import ./element-desktop-pin.nix;
|
||||
inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
|
||||
executableName = "element-desktop";
|
||||
electron = electron_36;
|
||||
electron = electron_37;
|
||||
keytar = callPackage ./keytar {
|
||||
inherit electron;
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.106";
|
||||
"version" = "1.11.108";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-1l7A+cpXAsTmNbRZgFevPh7Tr/uMHDJkOCNHoc5lGX8=";
|
||||
"webYarnHash" = "sha256-N+aVIKLqTc9lwATYtoIHl7KGiREtWJdMa8bxEv60LQo=";
|
||||
"webSrcHash" = "sha256-2QNRygyyXMvHHSfd9CCusOQ5v/udOwrOdmnrSsatylI=";
|
||||
"webYarnHash" = "sha256-JkXbGRanW+rRgQCVv8sCTzogHR5NKgesw/l166U1h9k=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.206.0";
|
||||
version = "0.207.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-ZDcfQQrybx11SenbTvTA2iY96NEkzJPMRzSOOlUP3So=";
|
||||
hash = "sha256-gaTY+9MB3nPRD2bOnWYS+vALRR9eHkFNCrEEMspE5ck=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jiksFU0ce7RiDy7xqVZiKancEiWSMEHDazPc6+l6DNQ=";
|
||||
vendorHash = "sha256-cn7zqhBJblDPl7H8BJtWZ2+ckTKVlqBIwwuXNGwrXdk=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
||||
+19
-35
@@ -2,7 +2,6 @@
|
||||
# Update via ./update.sh
|
||||
{
|
||||
mkDerivation,
|
||||
ansi-terminal,
|
||||
ansi-wl-pprint,
|
||||
base,
|
||||
base64-bytestring,
|
||||
@@ -12,7 +11,6 @@
|
||||
directory,
|
||||
edit-distance,
|
||||
fetchgit,
|
||||
filelock,
|
||||
filepath,
|
||||
ghc-prim,
|
||||
haskeline,
|
||||
@@ -21,28 +19,26 @@
|
||||
indexed-traversable,
|
||||
lib,
|
||||
mtl,
|
||||
prettyprint-avh4,
|
||||
prettyprinter,
|
||||
process,
|
||||
raw-strings-qq,
|
||||
scientific,
|
||||
text,
|
||||
time,
|
||||
utf8-string,
|
||||
vector,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gren";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/gren-lang/compiler.git";
|
||||
sha256 = "1mksfma6c1dn091ab4x794hs71v44bx294wbn80qfc5kgrrl5lf4";
|
||||
rev = "ee19481f5715b78cad8be09e29e56dcb82d65f4f";
|
||||
sha256 = "0h7mm3y62l3j190sd25db4bifp65xmyc4rc16jhyphp6yzyjcpcl";
|
||||
rev = "b54f0343c8015c777e4fbb74e843181e6f3cb214";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
ansi-terminal
|
||||
libraryHaskellDepends = [
|
||||
ansi-wl-pprint
|
||||
base
|
||||
base64-bytestring
|
||||
@@ -51,51 +47,39 @@ mkDerivation {
|
||||
containers
|
||||
directory
|
||||
edit-distance
|
||||
filelock
|
||||
filepath
|
||||
ghc-prim
|
||||
haskeline
|
||||
indexed-traversable
|
||||
mtl
|
||||
prettyprint-avh4
|
||||
process
|
||||
prettyprinter
|
||||
raw-strings-qq
|
||||
scientific
|
||||
text
|
||||
time
|
||||
utf8-string
|
||||
vector
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
filepath
|
||||
haskeline
|
||||
mtl
|
||||
process
|
||||
utf8-string
|
||||
];
|
||||
testHaskellDepends = [
|
||||
ansi-terminal
|
||||
ansi-wl-pprint
|
||||
base
|
||||
base64-bytestring
|
||||
binary
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
edit-distance
|
||||
filelock
|
||||
filepath
|
||||
ghc-prim
|
||||
haskeline
|
||||
hspec
|
||||
indexed-traversable
|
||||
mtl
|
||||
prettyprint-avh4
|
||||
process
|
||||
raw-strings-qq
|
||||
scientific
|
||||
text
|
||||
time
|
||||
utf8-string
|
||||
vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
doHaddock = false;
|
||||
jailbreak = true;
|
||||
homepage = "https://gren-lang.org";
|
||||
description = "`gren` command line interface";
|
||||
description = "The `gren` command line interface";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "gren";
|
||||
}
|
||||
@@ -1,21 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
haskell,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
git,
|
||||
haskellPackages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (haskell.lib.compose) overrideCabal;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gren";
|
||||
version = "0.6.1";
|
||||
|
||||
raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope (
|
||||
final: prev: {
|
||||
ansi-wl-pprint = final.ansi-wl-pprint_0_6_9;
|
||||
}
|
||||
);
|
||||
|
||||
overrides = {
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
passthru.updateScript = ./update.sh;
|
||||
src = fetchFromGitHub {
|
||||
owner = "gren-lang";
|
||||
repo = "compiler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lF0m/ffmwuuhNIFlwnztxVwXF1mtiKZBCnJQYfyo9UA=";
|
||||
};
|
||||
in
|
||||
overrideCabal overrides raw-pkg
|
||||
|
||||
buildInputs = [
|
||||
nodejs
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# install the precompiled frontend into the proper location
|
||||
install -Dm755 bin/compiler $out/bin/gren
|
||||
|
||||
wrapProgram $out/bin/gren \
|
||||
--set-default GREN_BIN ${lib.getExe finalAttrs.passthru.backend} \
|
||||
--suffix PATH : ${lib.makeBinPath [ git ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/gren";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
backend = haskellPackages.callPackage ./generated-backend-package.nix { };
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Compiler for the Gren programming language";
|
||||
homepage = "https://gren-lang.org";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "gren";
|
||||
maintainers = with lib.maintainers; [
|
||||
robinheghan
|
||||
tomasajt
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,22 +1,24 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p cabal2nix curl jq
|
||||
#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# This is the directory of this update.sh script.
|
||||
script_dir="$(dirname "${BASH_SOURCE[0]}")"
|
||||
derivation_file="${script_dir}/generated-package.nix"
|
||||
|
||||
backend_derivation_file="${script_dir}/generated-backend-package.nix"
|
||||
|
||||
latest_version="$(curl --silent 'https://api.github.com/repos/gren-lang/compiler/releases/latest' | jq --raw-output '.tag_name')"
|
||||
|
||||
echo "Updating gren to version ${latest_version}."
|
||||
echo "Running cabal2nix and outputting to ${derivation_file}..."
|
||||
echo "Updating gren backend to version ${latest_version}."
|
||||
echo "Running cabal2nix and outputting to ${backend_derivation_file}..."
|
||||
|
||||
cat > "${derivation_file}" << EOF
|
||||
cat > "${backend_derivation_file}" << EOF
|
||||
# This file has been autogenerated with cabal2nix.
|
||||
# Update via ./update.sh
|
||||
EOF
|
||||
|
||||
cabal2nix 'https://github.com/gren-lang/compiler.git' --revision "${latest_version}" --jailbreak >> "${derivation_file}"
|
||||
nixfmt "${derivation_file}"
|
||||
cabal2nix 'https://github.com/gren-lang/compiler.git' --revision "${latest_version}" --jailbreak >> "${backend_derivation_file}"
|
||||
nixfmt "${backend_derivation_file}"
|
||||
|
||||
echo 'Finished.'
|
||||
echo 'Finished backend generation.'
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hypseus-singe";
|
||||
version = "2.11.5";
|
||||
version = "2.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DirtBagXon";
|
||||
repo = "hypseus-singe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K/U/cx1y8mbC81qYNHz+AqT/hsc108NCHo0MoDhQqvs=";
|
||||
hash = "sha256-fSqlpzA2NUY1Sk+OTj9SmeRfQ+nqY9iAa3vTwr4OV9Q=";
|
||||
};
|
||||
|
||||
patches = [ ./use-shared-mpeg2.patch ];
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "kando";
|
||||
version = "1.8.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kando-menu";
|
||||
repo = "kando";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4toYogcxvNS+J/OphXM1HtH61FZRmnLsgxOJtJgkVdM=";
|
||||
hash = "sha256-pgHhMzObj8Fh6pw1wjJXjghjKzKiM64lXS4Xlwh3omY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lyCIuvyoVhcrNDDg0P3lSY8ru81momG1EKKT5u4yW8Y=";
|
||||
npmDepsHash = "sha256-vytwJdVnkm1AlDoM86xh5Vx5lsaDRcNdwjhP43A6KF8=";
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 6adb040..f442496 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -56,8 +56,10 @@ sourceCompatibility = 1.8
|
||||
javadoc.options.memberLevel = JavadocMemberLevel.PRIVATE
|
||||
group = 'dev.roanh.kps'
|
||||
ext.artifact = 'keyspersecond'
|
||||
-shadowJar.archiveName = 'KeysPerSecond-v' + version + '.jar'
|
||||
-application.mainClassName = 'dev.roanh.kps.Main'
|
||||
+shadowJar.archiveBaseName = 'KeysPerSecond'
|
||||
+shadowJar.archiveVersion = 'v' + version
|
||||
+shadowJar.archiveClassifier = ''
|
||||
+application.mainClass = 'dev.roanh.kps.Main'
|
||||
|
||||
test{
|
||||
useJUnitPlatform()
|
||||
@@ -129,7 +131,7 @@ shadowJar{
|
||||
|
||||
launch4j{
|
||||
jarTask = project.tasks.shadowJar
|
||||
- mainClassName = application.mainClassName
|
||||
+ mainClassName = application.mainClass
|
||||
icon = "${projectDir}/kps.ico"
|
||||
jreMinVersion = project.sourceCompatibility
|
||||
bundledJrePath = "%JAVA_HOME%"
|
||||
--
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gradle_7,
|
||||
gradle_8,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
gradle = gradle_7;
|
||||
gradle = gradle_8;
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
# used by the Java2D OpenGL backend
|
||||
@@ -42,6 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-DGpXbCInq+RS56Ae5Y6xzyWqwXAm26c0vOYrFqDvl+8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# deprecated shadowJar.archiveName, application.mainClassName
|
||||
# patches already in `master` branch, but no new release yet
|
||||
# and would be spread along multiple cherry-picks
|
||||
./gradleShadowJar.patch
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/KeysPerSecond";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2025-07-13";
|
||||
version = "0-unstable-2025-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "82d91f7daf81a41ece49644d2a26b2a40228be61";
|
||||
hash = "sha256-zRtn+Fc1sw3Uja5vJ5/1IRPr/xG5O0wIKflHr96tu3I=";
|
||||
rev = "8fce5bb3cccc532f2a57aff46716cdfc55799e75";
|
||||
hash = "sha256-x8Lrq+ECZZzJq9MYHNsJjNPx4Frj/ZzSdN/IM2Tg72g=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
dbus-glib,
|
||||
gtk3,
|
||||
glib,
|
||||
rclone,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -37,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = "ludusavi";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0=";
|
||||
};
|
||||
|
||||
@@ -108,6 +109,7 @@ rustPlatform.buildRustPackage rec {
|
||||
patchelf --set-rpath "${libPath}" "$out/bin/ludusavi"
|
||||
wrapProgram $out/bin/ludusavi --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
rclone
|
||||
zenity
|
||||
libsForQt5.kdialog
|
||||
]
|
||||
|
||||
@@ -178,11 +178,11 @@ in
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "138.0.3351.109";
|
||||
version = "138.0.3351.121";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-RXHfoj9T9MGvEt7hNKLF7cprNwZEvpFZH6VM7KOd2uM=";
|
||||
hash = "sha256-1Oi6Q2/2Pk0BG937Ij0zI7tgBSnwhPwGx34b+HlpXTU=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -12,22 +12,26 @@
|
||||
vte-gtk4,
|
||||
gsettings-desktop-schemas,
|
||||
gtksourceview5,
|
||||
webkitgtk_6_0,
|
||||
lsb-release,
|
||||
bash,
|
||||
ffmpeg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
version = "1.0.0";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "newelle";
|
||||
version = "0.9.8";
|
||||
inherit version;
|
||||
pyproject = false; # uses meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qwersyk";
|
||||
repo = "Newelle";
|
||||
tag = version;
|
||||
hash = "sha256-VyUng/ZX8+wInRX705IWdBgTbX439R60h62ONdpZ0+8=";
|
||||
hash = "sha256-9Tjp1RZMEdJWLjcy2AjOy3Rw7Q1ulFeZU4y+rMXSmFA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -49,6 +53,7 @@ python3Packages.buildPythonApplication rec {
|
||||
vte-gtk4
|
||||
gsettings-desktop-schemas
|
||||
gtksourceview5
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
||||
@@ -8,13 +8,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nnd";
|
||||
version = "0.19";
|
||||
version = "0.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "al13n321";
|
||||
repo = "nnd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DjJDNsyOrDLaMruGLP3arfrCs/7hW24wfjvPncndY+Q=";
|
||||
hash = "sha256-qs+xpsNC9An4sMoF07tPxLW35qvC0BVsK+EYsIgxAa0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Iwipxy0xKDyFLMmdB2FQve6DULX+46Pi9rOaK0bDTB0=";
|
||||
|
||||
@@ -34,16 +34,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rapidraw";
|
||||
version = "1.2.12";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CyberTimon";
|
||||
repo = "RapidRAW";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KF7HXkR6Iuwxh/S3M3BojzAau/tVE+3Lycp4SYI1GG4=";
|
||||
hash = "sha256-j9Mpg3o90/PdKlSpJEePcnXZoO2BfnGtJEielM/5/uQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3YeAK7FaBs70DqAoQQlCoqakgPUehE83+bedCwFGFVk=";
|
||||
cargoHash = "sha256-emwlK16NgeTYyQevWD4baHUxMP5xWJsKpQp/q5krAhQ=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
@@ -109,13 +109,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# needs to be declared twice annoyingly
|
||||
ORT_STRATEGY = "system";
|
||||
|
||||
postInstall = ''
|
||||
# Patch the .desktop file to set the Categories field
|
||||
sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop"
|
||||
|
||||
# Ensure the resources directory exists before linking
|
||||
mkdir -p $out/lib/RapidRAW/resources
|
||||
|
||||
# link the .so file
|
||||
ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so
|
||||
|
||||
# remove the .dylib file
|
||||
rm -rf $out/lib/RapidRAW/resources/libonnxruntime.dylib
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapGApp $out/bin/rapidraw \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \
|
||||
--set ORT_STRATEGY "system" \
|
||||
--set ORT_DYLIB_PATH "${onnxruntime}/lib/libonnxruntime.so"
|
||||
|
||||
rm -rf $out/lib/RapidRAW/resources
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rendercv";
|
||||
version = "2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rendercv";
|
||||
repo = "rendercv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bIEuzMGV/l8Cunc4W04ESFYTKhNH+ffkA6eXGbyu3A0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
jinja2
|
||||
phonenumbers
|
||||
email-validator
|
||||
pydantic
|
||||
pycountry
|
||||
pydantic-extra-types
|
||||
ruamel-yaml
|
||||
# full
|
||||
typer
|
||||
markdown
|
||||
watchdog
|
||||
typst
|
||||
rendercv-fonts
|
||||
packaging
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"phonenumbers"
|
||||
"pydantic-extra-types"
|
||||
"pydantic"
|
||||
"ruamel-yaml"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rendercv" ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pypdf
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_are_all_the_theme_files_the_same"
|
||||
# It needs internet to download resources
|
||||
"test_render_a_pdf_from_typst"
|
||||
"test_render_pngs_from_typst"
|
||||
"test_render_command_overriding_input_file_settings"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# It fails due to missing internet resources
|
||||
"tests/test_cli.py"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Typst-based CV/resume generator";
|
||||
homepage = "https://rendercv.com";
|
||||
changelog = "https://docs.rendercv.com/changelog/#22-january-25-2025";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
mainProgram = "rendercv";
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "7.3.3";
|
||||
version = "7.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oSXie1yEHO7CREjC1uo6i9yu5QTix7fxbniuGaTJOH8=";
|
||||
hash = "sha256-vIsM/i1RrtCqcnrMSyipgrtsdO32nqSbnYGdmjTyrN8=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
||||
@@ -4,26 +4,26 @@
|
||||
fetchurl,
|
||||
asar,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "todoist-electron";
|
||||
version = "9.8.0";
|
||||
version = "9.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://electron-dl.todoist.com/linux/Todoist-linux-${version}-x86_64-latest.AppImage";
|
||||
hash = "sha256-ZuoeeQ7SusRhr5BXBYEWCZ9pjdcWClKoR0mnom1XkPg=";
|
||||
url = "https://electron-dl.todoist.net/linux/Todoist-linux-${version}-x86_64-latest.AppImage";
|
||||
hash = "sha256-2X//beSpQ1rCqU4Wn5ELoxgfi2knFAJ2w1rn41TNP6g=";
|
||||
};
|
||||
|
||||
appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
|
||||
buildCommand = ''
|
||||
${oA.buildCommand}
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
|
||||
# Get rid of the autoupdater
|
||||
${asar}/bin/asar extract $out/resources/app.asar app
|
||||
# Get rid of the autoupdater
|
||||
postExtract = ''
|
||||
${lib.getExe asar} extract $out/resources/app.asar app
|
||||
sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js
|
||||
${asar}/bin/asar pack app $out/resources/app.asar
|
||||
${lib.getExe asar} pack app $out/resources/app.asar
|
||||
'';
|
||||
});
|
||||
|
||||
};
|
||||
in
|
||||
appimageTools.wrapAppImage {
|
||||
inherit pname version;
|
||||
@@ -31,23 +31,24 @@ appimageTools.wrapAppImage {
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.hidapi ];
|
||||
|
||||
# Add desktop convencience stuff
|
||||
extraInstallCommands = ''
|
||||
# Add desktop convencience stuff
|
||||
install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps
|
||||
install -D --mode 0644 ${appimageContents}/todoist.desktop -t $out/share/applications
|
||||
install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/pixmaps
|
||||
substituteInPlace $out/share/applications/todoist.desktop \
|
||||
--replace 'Exec=AppRun' "Exec=$out/bin/${pname} --"
|
||||
--replace-fail "Exec=AppRun" "Exec=todoist-electron --" \
|
||||
--replace-fail "Exec=todoist" "Exec=todoist-electron --"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://todoist.com";
|
||||
description = "Official Todoist electron app";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
meta = {
|
||||
description = "To-Do List App & Task Manager";
|
||||
homepage = "https://www.todoist.com";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "todoist-electron";
|
||||
maintainers = with lib.maintainers; [
|
||||
kylesferrazza
|
||||
pokon548
|
||||
];
|
||||
mainProgram = "todoist-electron";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Merrit";
|
||||
repo = "vscode-runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lhrUPlTBKMiWL3+zhjFBoUvjfjbM9t55Z4Anhj3sPuk=";
|
||||
hash = "sha256-ZzAQeSUFbHp2Bwiwsq8kgQqqNlr6hfXuz7PNAOSiBhU=";
|
||||
};
|
||||
in
|
||||
buildDartApplication {
|
||||
|
||||
@@ -4,31 +4,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
|
||||
"sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "80.0.0"
|
||||
"version": "82.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
|
||||
"sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.3.0"
|
||||
"version": "7.4.5"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "args",
|
||||
"sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
|
||||
"sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.6.0"
|
||||
"version": "2.7.0"
|
||||
},
|
||||
"async": {
|
||||
"dependency": "transitive",
|
||||
@@ -50,6 +50,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"cli_config": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "cli_config",
|
||||
"sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -74,11 +84,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "coverage",
|
||||
"sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
|
||||
"sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.11.1"
|
||||
"version": "1.13.1"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "transitive",
|
||||
@@ -234,11 +244,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
|
||||
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.16.0"
|
||||
"version": "1.17.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -264,11 +274,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "package_config",
|
||||
"sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
|
||||
"sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"path": {
|
||||
"dependency": "transitive",
|
||||
@@ -304,11 +314,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pub_semver",
|
||||
"sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
|
||||
"sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.5"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
@@ -384,11 +394,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "sqlite3",
|
||||
"sha256": "32b632dda27d664f85520093ed6f735ae5c49b5b75345afb8b19411bc59bb53d",
|
||||
"sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.7.4"
|
||||
"version": "2.7.5"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
@@ -434,31 +444,31 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
|
||||
"sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.25.15"
|
||||
"version": "1.26.2"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
|
||||
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.4"
|
||||
"version": "0.7.6"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
|
||||
"sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.8"
|
||||
"version": "0.6.11"
|
||||
},
|
||||
"typed_data": {
|
||||
"dependency": "transitive",
|
||||
@@ -504,21 +514,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web_socket",
|
||||
"sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
|
||||
"sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.6"
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"web_socket_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web_socket_channel",
|
||||
"sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
|
||||
"sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
"version": "3.0.3"
|
||||
},
|
||||
"webkit_inspection_protocol": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -2,29 +2,35 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wttrbar";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjesus";
|
||||
repo = "wttrbar";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gJJnmJ1dpKVCRZtzL1R86s607hOCHTpsFDPsQKOnvvA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WMRDUAefYjXY03EqTZf3VNJuypxu07RTyDmdlB6a0kk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Simple but detailed weather indicator for Waybar using wttr.in";
|
||||
homepage = "https://github.com/bjesus/wttrbar";
|
||||
changelog = "https://github.com/bjesus/wttrbar/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
mainProgram = "wttrbar";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/platformio/builder/main.py
|
||||
+++ b/platformio/builder/main.py
|
||||
@@ -46,6 +46,8 @@ clivars.AddVariables(
|
||||
("PROGRAM_ARGS",),
|
||||
)
|
||||
|
||||
+os.environ["PATH"] = os.pathsep.join([os.path.dirname(get_pythonexe_path()), os.environ.get("PATH")])
|
||||
+
|
||||
DEFAULT_ENV_OPTIONS = dict(
|
||||
tools=[
|
||||
"ar",
|
||||
@@ -32,7 +32,7 @@ buildPythonApplication rec {
|
||||
|
||||
patches = [
|
||||
(replaceVars ./interpreter.patch {
|
||||
interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter;
|
||||
interpreter = (python3Packages.python.withPackages (_: dependencies)).interpreter;
|
||||
})
|
||||
(replaceVars ./use-local-spdx-license-list.patch {
|
||||
spdx_license_list_data = spdx-license-list-data.json;
|
||||
@@ -45,6 +45,7 @@ buildPythonApplication rec {
|
||||
hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0=";
|
||||
revert = true;
|
||||
})
|
||||
./builder-prioritize-python-env-in-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -57,13 +58,14 @@ buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
setuptools
|
||||
udevCheckHook
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiofiles
|
||||
ajsonrpc
|
||||
bottle
|
||||
@@ -71,10 +73,13 @@ buildPythonApplication rec {
|
||||
click-completion
|
||||
colorama
|
||||
git
|
||||
intelhex
|
||||
lockfile
|
||||
marshmallow
|
||||
pip
|
||||
pyelftools
|
||||
pyserial
|
||||
pyyaml
|
||||
requests
|
||||
semantic-version
|
||||
setuptools
|
||||
@@ -82,6 +87,7 @@ buildPythonApplication rec {
|
||||
starlette
|
||||
tabulate
|
||||
uvicorn
|
||||
wheel
|
||||
wsproto
|
||||
zeroconf
|
||||
]
|
||||
|
||||
@@ -160,11 +160,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# though, so we need to replace the absolute path with a local one during build.
|
||||
# We are using a symlink that we will delete before installation.
|
||||
mkdir -p $out/lib
|
||||
ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
|
||||
ln -s $PWD/tests/scanner/libregress-1.0${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
|
||||
rm $out/lib/libregress-1.0${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-compute";
|
||||
version = "34.1.0";
|
||||
version = "35.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "azure_mgmt_compute";
|
||||
inherit version;
|
||||
hash = "sha256-zZ010cwbjLC9JBrVXJG3fRTgSuc8YyraEUATX5whf+E=";
|
||||
hash = "sha256-QxlpERNVB9HOdvCJxOV9OyJYheUSfQI74s4cWX/UQzY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-monitor-query";
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "azure_monitor_query";
|
||||
inherit version;
|
||||
hash = "sha256-cYJOK1d9Jd8NO+u7sFTAahrj68uRgxqbrAuzRNCt32g=";
|
||||
hash = "sha256-ewXy/KxPtn/J93p9TF2YoPMJn7c7V8aewbCAdzmUZxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-core";
|
||||
version = "2.38.1";
|
||||
version = "2.44.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docling-project";
|
||||
repo = "docling-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zfpinXjZrGp5SF5IXLSP/A9Kb1WzqXXtIhhk/G3nY4k=";
|
||||
hash = "sha256-vZTQE8UACMdMPPvNM2FVu+Sq9uJByt443N3ScNXsjGc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
accelerate,
|
||||
docling-core,
|
||||
huggingface-hub,
|
||||
jsonlines,
|
||||
@@ -29,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-ibm-models";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docling-project";
|
||||
repo = "docling-ibm-models";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Yogg71CXQTdF5OUbdbma1rQxtLudTLjyOIFe2LS9CpI=";
|
||||
hash = "sha256-UmgxEPEm6fNf4FbZ7CIcSEIaJg4sReI0pnkWwPdrJvQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -44,6 +45,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
accelerate
|
||||
docling-core
|
||||
huggingface-hub
|
||||
jsonlines
|
||||
|
||||
@@ -33,6 +33,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1vl5Ij25NXAwhoXLJ35lcr5r479jrdKd9DxWhYbCApw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes test_parse unit tests
|
||||
# export_to_textlines in docling-core >= 2.38.2 includes text direction
|
||||
# by default, which is not included in upstream's groundtruth data.
|
||||
# TODO: remove when docling-core version gets bumped in upstream's uv.lock
|
||||
./test_parse.patch
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
diff --git a/tests/test_parse.py b/tests/test_parse.py
|
||||
index 84e17ae..e1eb6ae 100644
|
||||
--- a/tests/test_parse.py
|
||||
+++ b/tests/test_parse.py
|
||||
@@ -242,6 +242,7 @@ def test_reference_documents_from_filenames():
|
||||
cell_unit=unit,
|
||||
add_fontkey=True,
|
||||
add_fontname=False,
|
||||
+ add_text_direction=False,
|
||||
)
|
||||
_fname = fname + f".{unit}.txt"
|
||||
with open(_fname, "w") as fw:
|
||||
@@ -254,6 +255,7 @@ def test_reference_documents_from_filenames():
|
||||
cell_unit=unit,
|
||||
add_fontkey=True,
|
||||
add_fontname=False,
|
||||
+ add_text_direction=False,
|
||||
)
|
||||
|
||||
_fname = fname + f".{unit}.txt"
|
||||
@@ -52,14 +52,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling";
|
||||
version = "2.38.1";
|
||||
version = "2.42.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docling-project";
|
||||
repo = "docling";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ITRpWO7PEtfg5kM9LF3koZgzuPtLxoGFhorMlXlwSdI=";
|
||||
hash = "sha256-9HUomW55Yg5N7u3Wb4imzRUYECeGkb3lkHPLEGzuAnA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "granian";
|
||||
version = "2.3.4";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emmett-framework";
|
||||
repo = "granian";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PoNHpxumBdVllfpbVMYDV8KnDqIDP+XQcrkvs6tdNKg=";
|
||||
hash = "sha256-Ce0e31pjQEHHNz0Q13jshPBqxZdgAomGT3dpYm+ruQE=";
|
||||
};
|
||||
|
||||
# Granian forces a custom allocator for all the things it runs,
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-0tEYewojStfXRrcI8LVR1T7c5EETkYXVfClsHCUNPrM=";
|
||||
hash = "sha256-QdoGxNMhBltzzAQIQt+Y5M4WRBtbdwm907jHlh1IxeQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 4e6676f..1657d61 100644
|
||||
index cbf1cdb..e819e14 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -40,7 +40,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] }
|
||||
@@ -41,7 +41,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] }
|
||||
hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] }
|
||||
itertools = "0.14"
|
||||
log = "0.4"
|
||||
@@ -10,38 +10,35 @@ index 4e6676f..1657d61 100644
|
||||
mime_guess = "=2.0"
|
||||
pem = "=3.0"
|
||||
percent-encoding = "=2.3"
|
||||
@@ -56,15 +55,9 @@ tokio-stream = "0.1"
|
||||
tokio-tungstenite = "=0.26"
|
||||
tokio-util = { version = "0.7", features = ["codec", "rt"] }
|
||||
|
||||
-[target.'cfg(not(any(target_env = "musl", target_os = "freebsd", target_os = "openbsd", target_os = "windows")))'.dependencies]
|
||||
-tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"] }
|
||||
-
|
||||
@@ -52,7 +51,6 @@ pyo3-log = "=0.12"
|
||||
rustls-pemfile = "2.2"
|
||||
socket2 = { version = "=0.6", features = ["all"] }
|
||||
sysinfo = "=0.36"
|
||||
-tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true }
|
||||
tls-listener = { version = "=0.11", features = ["rustls-ring"] }
|
||||
tokio = { version = "1.45", features = ["full"] }
|
||||
tokio-stream = "0.1"
|
||||
@@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] }
|
||||
[build-dependencies]
|
||||
pyo3-build-config = "=0.25"
|
||||
|
||||
-[features]
|
||||
-jemalloc = ["dep:tikv-jemallocator"]
|
||||
-mimalloc = ["dep:mimalloc"]
|
||||
-
|
||||
[profile.release]
|
||||
codegen-units = 1
|
||||
debug = false
|
||||
diff --git a/src/lib.rs b/src/lib.rs
|
||||
index 9172842..6c41005 100644
|
||||
index a17a7e5..8ea1a4d 100644
|
||||
--- a/src/lib.rs
|
||||
+++ b/src/lib.rs
|
||||
@@ -1,17 +1,3 @@
|
||||
-#[cfg(not(any(
|
||||
- target_env = "musl",
|
||||
- target_os = "freebsd",
|
||||
- target_os = "openbsd",
|
||||
- target_os = "windows",
|
||||
- feature = "mimalloc"
|
||||
-)))]
|
||||
@@ -1,11 +1,3 @@
|
||||
-#[cfg(all(feature = "jemalloc", not(feature = "mimalloc")))]
|
||||
-#[global_allocator]
|
||||
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
|
||||
-
|
||||
-#[cfg(feature = "mimalloc")]
|
||||
-#[cfg(all(feature = "mimalloc", not(feature = "jemalloc")))]
|
||||
-#[global_allocator]
|
||||
-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
|
||||
-
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "posthog";
|
||||
version = "6.3.1";
|
||||
version = "6.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kUIgZJdX+IdMEkIK0DoKYOiv9GSaI+RhOeg9+zK4yvc=";
|
||||
hash = "sha256-401cw0V8FEEpiYISUdXrGBGmVkfIJd4+3fCrCwfS9cE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
hatchling,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rendercv-fonts";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rendercv";
|
||||
repo = "rendercv-fonts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fQ9iNN3hRCrhut+1F6q3dJEWoKUQyPol0/SyTPUPK1c=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
# pythonRelaxDeps seems not taking effect for the build-system dependencies
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'hatchling==1.26.3' 'hatchling' \
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rendercv_fonts" ];
|
||||
|
||||
meta = {
|
||||
description = "Python package with some fonts for the rendercv package";
|
||||
homepage = "https://github.com/rendercv/rendercv-fonts";
|
||||
changelog = "https://github.com/rendercv/rendercv-fonts/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
};
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whenever";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -29,12 +29,12 @@ buildPythonPackage rec {
|
||||
owner = "ariebovenberg";
|
||||
repo = "whenever";
|
||||
tag = version;
|
||||
hash = "sha256-SQtYoxvAoCdUDVi/jXSiSUMo+7Aa5GUX0dip9486Urg=";
|
||||
hash = "sha256-i9zUf0oRcG4993Q0kkfndfcEe+mLYFcqrIlg7idKDGY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-qIIi1yKHaVz7NegOunzzdoQbeAavbdXPM4MBupLebDs=";
|
||||
hash = "sha256-j4sxIcJa406HCDkTJCSU8H+yo2Jth1p8+CaNWlUaIUs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -16,8 +16,8 @@ let
|
||||
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.13.1";
|
||||
hash = "sha256-D57UjYCJlq4AeDX7XEZBz5owDe8u3cnpV9m75HaMXyg=";
|
||||
version = "10.14.0";
|
||||
hash = "sha256-KXU05l1YQkUFOcHoAiyIMateH+LrdGZHh6gVUZVC1iA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.12.40";
|
||||
hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
|
||||
version = "6.12.41";
|
||||
hash = "sha256-REi1cQBAYsfBLCkyhLQfbsREPMzvJHFbCUg1p8oNamA=";
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.15.8";
|
||||
hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU=";
|
||||
version = "6.15.9";
|
||||
hash = "sha256-43SaSDdOfz+aG2T2C9UFbbXYi/7YxbQfTYrKjeEMP+E=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update git
|
||||
#!nix-shell -i bash -p nix-update git jq
|
||||
# shellcheck shell=bash
|
||||
|
||||
ROOT=$(git rev-parse --show-toplevel)
|
||||
|
||||
@@ -15515,6 +15515,8 @@ self: super: with self; {
|
||||
|
||||
rencode = callPackage ../development/python-modules/rencode { };
|
||||
|
||||
rendercv-fonts = callPackage ../development/python-modules/rendercv-fonts { };
|
||||
|
||||
reno = callPackage ../development/python-modules/reno { };
|
||||
|
||||
renson-endura-delta = callPackage ../development/python-modules/renson-endura-delta { };
|
||||
|
||||
Reference in New Issue
Block a user