Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -23,11 +23,11 @@
|
||||
# Pinned Nixpkgs archive
|
||||
#
|
||||
# Use `curl -I https://channels.nixos.org/nixos-26.05` to get the
|
||||
# latest commit of the stable channel and `nix-prefetch-url --unpack`
|
||||
# to compute its sha256 hash.
|
||||
# latest commit of the stable channel and `nix --extra-experimental-features nix-command store prefetch-file --unpack`
|
||||
# to compute its hash.
|
||||
nixpkgs = builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/c217913993d6.tar.gz";
|
||||
sha256 = "026mprs324330pfazlgbw987qmsa8ligglarvqbcxzig2kgw0lqg";
|
||||
hash = "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=";
|
||||
};
|
||||
in
|
||||
import "${nixpkgs}/nixos" {
|
||||
|
||||
@@ -1314,6 +1314,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
auto-dark-mode-nvim = buildVimPlugin {
|
||||
pname = "auto-dark-mode.nvim";
|
||||
version = "0-unstable-2026-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-person";
|
||||
repo = "auto-dark-mode.nvim";
|
||||
rev = "54058b4fe414bd64bd2904a6f8a63f1f14e3d8df";
|
||||
hash = "sha256-xTgRyct3L6Gcz/vdYSc+h2IUgi/+Lh1Q4mxJwHISeis=";
|
||||
};
|
||||
meta.homepage = "https://github.com/f-person/auto-dark-mode.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
auto-fix-return-nvim = buildVimPlugin {
|
||||
pname = "auto-fix-return.nvim";
|
||||
version = "0.4.0";
|
||||
@@ -3902,6 +3916,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
conflict-nvim = buildVimPlugin {
|
||||
pname = "conflict.nvim";
|
||||
version = "0-unstable-2026-04-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "niekdomi";
|
||||
repo = "conflict.nvim";
|
||||
rev = "fdc879c34c528aab90e1b90c5d408d141f31fef8";
|
||||
hash = "sha256-hXww2PNTU5LX5egngKwMxOjvQl5CMgzBbDesRswPD2g=";
|
||||
};
|
||||
meta.homepage = "https://github.com/niekdomi/conflict.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
conform-nvim = buildVimPlugin {
|
||||
pname = "conform.nvim";
|
||||
version = "9.1.0-unstable-2026-05-15";
|
||||
@@ -12337,6 +12365,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-dap-disasm = buildVimPlugin {
|
||||
pname = "nvim-dap-disasm";
|
||||
version = "0-unstable-2026-02-25";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/Jorenar/nvim-dap-disasm";
|
||||
rev = "1119f3f2b22e411adcd123cdcf6d0425b61a31a7";
|
||||
hash = "sha256-lq0tbMksVXccf6GGD7OxWAuoD9w8tlt30dpJSMtN4g8=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/Jorenar/nvim-dap-disasm";
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-dap-docker = buildVimPlugin {
|
||||
pname = "nvim-dap-docker";
|
||||
version = "0.2.0";
|
||||
|
||||
@@ -3044,6 +3044,13 @@ assertNoAdditions {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
nvim-dap-disasm = super.nvim-dap-disasm.overrideAttrs (old: {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
});
|
||||
|
||||
nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
@@ -92,6 +92,7 @@ https://github.com/skywind3000/asynctasks.vim/,,
|
||||
https://github.com/vmchale/ats-vim/,,
|
||||
https://github.com/augmentcode/augment.vim/,prerelease,
|
||||
https://github.com/ray-x/aurora/,,
|
||||
https://github.com/f-person/auto-dark-mode.nvim/,,
|
||||
https://github.com/Jay-Madden/auto-fix-return.nvim/,,
|
||||
https://github.com/hotwatermorning/auto-git-diff/,,
|
||||
https://github.com/asiryk/auto-hlsearch.nvim/,,
|
||||
@@ -277,6 +278,7 @@ https://github.com/nvim-lua/completion-nvim/,,
|
||||
https://github.com/aca/completion-tabnine/,,
|
||||
https://github.com/chikatoike/concealedyank.vim/,,
|
||||
https://github.com/rhysd/conflict-marker.vim/,,
|
||||
https://github.com/niekdomi/conflict.nvim/,,
|
||||
https://github.com/stevearc/conform.nvim/,,
|
||||
https://github.com/Olical/conjure/,,
|
||||
https://github.com/niklasdewally/conjure.nvim/,,
|
||||
@@ -879,6 +881,7 @@ https://github.com/andythigpen/nvim-coverage/,,
|
||||
https://github.com/ya2s/nvim-cursorline/,,
|
||||
https://codeberg.org/mfussenegger/nvim-dap/,,
|
||||
https://github.com/jedrzejboczar/nvim-dap-cortex-debug/,,
|
||||
https://codeberg.org/Jorenar/nvim-dap-disasm,,
|
||||
https://github.com/docker/nvim-dap-docker/,,
|
||||
https://github.com/leoluz/nvim-dap-go/,,
|
||||
https://github.com/julianolf/nvim-dap-lldb/,,
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
self = REAndroidLibrary {
|
||||
pname = "arsclib";
|
||||
# 1.3.8 is not new enough for APKEditor because of API changes
|
||||
version = "1.3.8-unstable-2026-03-21";
|
||||
version = "1.3.8-unstable-2026-05-16";
|
||||
projectName = "ARSCLib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -18,8 +18,8 @@ let
|
||||
# This is the latest commit at the time of packaging.
|
||||
# It can be changed to a stable release ("V${version}")
|
||||
# if it is compatible with APKEditor.
|
||||
rev = "f6c2dc2f6db9063445e84f7ede316d4f1f029351";
|
||||
hash = "sha256-IZ2Us7tcuE+L4bfA4JAcF6Idz1Y2S2IfqW4NSbsxr5o=";
|
||||
rev = "a28c6fb2a77de392f2758c4dfe1a4d7d1aa86c5a";
|
||||
hash = "sha256-0SwowTDkgF9Rdenx/nlSPuGf3kvk7ucxtr7D6r9fU/c=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
|
||||
@@ -55,7 +55,7 @@ let
|
||||
apkeditor =
|
||||
let
|
||||
pname = "apkeditor";
|
||||
version = "1.4.8";
|
||||
version = "1.4.9";
|
||||
projectName = "APKEditor";
|
||||
in
|
||||
REAndroidLibrary {
|
||||
@@ -71,7 +71,7 @@ let
|
||||
owner = "REAndroid";
|
||||
repo = "APKEditor";
|
||||
tag = "V${version}";
|
||||
hash = "sha256-1XNefeEPs8SEBw+hY2CzZ+rPojNcAbg1AqvzhVcNyy4=";
|
||||
hash = "sha256-NVUv09mMAJDJA/jCIB/EtjQbry0Ej43a7KGR1+5cknY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "butane";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "butane";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RNK6G9/mNUTeRA0oWZoOdOUmc1F85Q3xmXUhtpgPymc=";
|
||||
hash = "sha256-Cej00ugyOtjPys0E67z0oapwABdQxRuN4lOGu1qrtf8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-generate";
|
||||
version = "0.23.8";
|
||||
version = "0.23.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-generate";
|
||||
repo = "cargo-generate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Me3hgG6Z+JSsCjLVxbFDY3/6dUi4KtV6ArugFPgnda0=";
|
||||
hash = "sha256-myakseKwLEjQa9GgcxdWZJWdjMFXh7Wi64CwrN2ZwSU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QhXHPnlU77ikaeTQLxBFYIc4j+tEZb0un3kVJanq7ZI=";
|
||||
cargoHash = "sha256-IAUgpk3HD9znLORCQKNw+AO6NG9GEVWMU/cez3B+CKc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.133";
|
||||
version = "0.9.136";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
tag = "cargo-nextest-${finalAttrs.version}";
|
||||
hash = "sha256-D8n7wvO9/MCSmvTkT6rht5+Zx9mOA/g8pajAVDVKGg8=";
|
||||
hash = "sha256-SXpRSmCduZqF9HHvAd3NkgUtokZpxxu3f6IZEnLwA0g=";
|
||||
};
|
||||
|
||||
# FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
|
||||
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
./no-dtrace-macos.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-oftwiuKIGaxr44RnkMUAu/uSs47Sh5DqqDKZWRXhAN4=";
|
||||
cargoHash = "sha256-RWg1NcqlajN3GTOuMQ3WWWx5pa59YBZO3yKEm58qSu8=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-agent-acp";
|
||||
version = "0.33.1";
|
||||
version = "0.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agentclientprotocol";
|
||||
repo = "claude-agent-acp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FwcIJf/tfH6prDFKtOo7X1mTocibf4Ne6JHOS9ITG8U=";
|
||||
hash = "sha256-mtdmzKuZF1eEt8FKm+VYp9h9igfRzQPQ2HCbq+IRVDw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-y795LyNjSJjTpIqtA5bC/AgeFLghM0yU5xQRD3m+Ajs=";
|
||||
npmDepsHash = "sha256-3lX2fAjVYWeFl9FAsSou30WOJ8st9lUdyt54hC4jN1E=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "complgen";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JlHePqZv50mvA5EAfkW11T+fcJaFw2OHFarOMqgs/wA=";
|
||||
hash = "sha256-0oC/jpCKM2Y1yag+qIUu+b3sCIPmHs/GUBSPHi7KaVI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XvjA8SvzgK1FDjCg6tBcfVKMurHejQBGdNeYhedQGK8=";
|
||||
cargoHash = "sha256-skdtXxNUuC7xLtZSol3b1prdN1YT62uvwo+F7rtFVVQ=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "copacetic";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-copacetic";
|
||||
repo = "copacetic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LuJn6DGINUMI7KVSCMMVBZyvNYWEk+DOQJqfciJ0n8E=";
|
||||
hash = "sha256-pD6AdJ9GfTPVgI/e4zRW4oJjOzpEk9uY4kdEm5yLDrw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RKqaIwGDZj91lfbEJHcnG8RhIrixtR0VtieCfZD/rns=";
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpuid";
|
||||
version = "20260220";
|
||||
version = "20260503";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://etallen.com/cpuid/cpuid-${finalAttrs.version}.src.tar.gz";
|
||||
sha256 = "sha256-52IP11rlkRcfEQxJuZo5EokzoMqtAjto1KOEub4Lj/s=";
|
||||
sha256 = "sha256-juEPtI1KogxISnXWhSiDcQKG7Sl1wxS9ptCwODkIy/4=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
expect,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fcp";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svetlitski";
|
||||
repo = "fcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-YupsJRtju9JyGGzSTk+tyEGh4ifpJllXVifsFoZ4Rwc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PsYmzHwFpgAJ3AClt5buSuAtlXxvKQyz3XeZBtTXsLs=";
|
||||
|
||||
nativeBuildInputs = [ expect ];
|
||||
|
||||
# character_device fails with "File name too long" on darwin
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tests/*.exp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Significantly faster alternative to the classic Unix cp(1) command";
|
||||
homepage = "https://github.com/svetlitski/fcp";
|
||||
changelog = "https://github.com/svetlitski/fcp/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [
|
||||
lib.maintainers.georgyo
|
||||
lib.maintainers.flokli
|
||||
];
|
||||
mainProgram = "fcp";
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.37.6";
|
||||
version = "1.37.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ffmpeg_normalize";
|
||||
hash = "sha256-zsfWqdGyEI8OT4/L0wTxkmdqcI6NEfr5SAc7+O7FYu4=";
|
||||
hash = "sha256-8V9C5auAvrmvq5aeaRjCy9y2/c7wm4/7Yb73dBgvj5s=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ uv-build ];
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
--- a/src/firejail/fs_overlayfs.c
|
||||
+++ b/src/firejail/fs_overlayfs.c
|
||||
@@ -327,6 +327,16 @@
|
||||
errExit("mounting /dev");
|
||||
fs_logger("whitelist /dev");
|
||||
|
||||
+ // mount-bind /nix
|
||||
+ if (arg_debug)
|
||||
+ printf("Mounting /nix\n");
|
||||
+ char *nix;
|
||||
+ if (asprintf(&nix, "%s/nix", oroot) == -1)
|
||||
+ errExit("asprintf");
|
||||
+ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0)
|
||||
+ errExit("mounting /nix");
|
||||
+ fs_logger("whitelist /nix");
|
||||
+
|
||||
// mount-bind run directory
|
||||
if (arg_debug)
|
||||
printf("Mounting /run\n");
|
||||
@@ -384,6 +394,7 @@
|
||||
free(odiff);
|
||||
free(owork);
|
||||
free(dev);
|
||||
+ free(nix);
|
||||
free(run);
|
||||
free(tmp);
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "firejail";
|
||||
version = "0.9.76";
|
||||
version = "0.9.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netblue30";
|
||||
repo = "firejail";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-0zb5olSuXOHeRj4dqeevubedjqOuDnUEBQaD/vOj2CM=";
|
||||
sha256 = "sha256-rw1hNX8QFy5UFDx4vaYiiWV+hy7ji6XY6eEPvieGQoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,10 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Adds the /nix directory when using an overlay.
|
||||
# Required to run any programs under this mode.
|
||||
./mount-nix-dir-on-overlay.patch
|
||||
|
||||
# By default fbuilder hardcodes the firejail binary to the install path.
|
||||
# On NixOS the firejail binary is a setuid wrapper available in $PATH.
|
||||
./fbuilder-call-firejail-on-path.patch
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "12.14.0",
|
||||
"version": "12.14.2",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.0/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "741303a83ba272b035ba850f24dcb21e7300ec1a79f03d93523f794187a5a615"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "46ecf1316465a17d65fd654aeb2fe20cc1c63253fd6dad974f3972b20c1fc5ad"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.0/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "0fc3b7f192c9ae1def3a160c68a2dee42c8a0277c1b48deede0bd1f2dc69e317"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "177f5d8d6c7dcde70db2b96cf5244daa1eb9bd4861504be275983c6cb8ee2e40"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.0/floorp-macOS-universal.dmg",
|
||||
"sha256": "494d1a9dcbedd3430290ccb672a174acdafeb056860071fb26ecc9bf45137e3a"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-macOS-universal.dmg",
|
||||
"sha256": "55c86ab248eebbba3a500e0f76554bbf387c333fdd7c9c48845a3dae53db9b17"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.0/floorp-macOS-universal.dmg",
|
||||
"sha256": "494d1a9dcbedd3430290ccb672a174acdafeb056860071fb26ecc9bf45137e3a"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-macOS-universal.dmg",
|
||||
"sha256": "55c86ab248eebbba3a500e0f76554bbf387c333fdd7c9c48845a3dae53db9b17"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,9 +14,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk";
|
||||
hash = "sha256-sy2uhOpH2237jbriT7IPzHG5WOotfvue/2bI5cDbgbM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure \
|
||||
--replace-fail "/usr/local/ssl/include" "${openssl.dev}/include" \
|
||||
--replace-fail "/usr/local/ssl/lib" "${lib.getLib openssl}/lib"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
@@ -24,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace configure \
|
||||
--replace "/usr/local/ssl/include" "${openssl.dev}/include" \
|
||||
--replace "/usr/local/ssl/lib" "${lib.getLib openssl}/lib"
|
||||
'';
|
||||
# gcc 15 errors on incompatible-pointer-types (ggz_tls_openssl.c OPENSSL_sk_* casts) and implicit-function-declaration (configure C99 VLA probe).
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tls"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-dash";
|
||||
version = "4.24.0";
|
||||
version = "4.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UewMOaXYervy5NGO2l9MgJuzRfYIHw12VKyFjJcjelc=";
|
||||
hash = "sha256-eNmOSYsmB+G0VgVn1ITo/mUyYSeXz43goG/VjYqmiQI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fXgj2q0HAGu9Jfdy7NJ6iE5hEKmt50HAEg/9Wds56g0=";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "git-machete";
|
||||
version = "3.40.0";
|
||||
version = "3.40.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = "git-machete";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RR+DNCqopTzGVy2bwr6qer4l9TVrBtOMtjGS9vfziAs=";
|
||||
hash = "sha256-bKrLEXzGdvRKKwyEMsQFYgnKm2qIXj1HThCYmHjDNEM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "gitea-mcp-server";
|
||||
version = "1.1.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "gitea-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-weJcl9Vp7mhPiaui7VGETs5t4trUDTegDoUR8gRTGIs=";
|
||||
hash = "sha256-vufclzgshz9/+7B4tO2xtz7pEfBX+xhKOngC7N6se6U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-35zVDzivvO3tSi1RYvXJoLvrlvnp3JCzwC5FqDEj91M=";
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "google-alloydb-auth-proxy";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "alloydb-auth-proxy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QIM5KkDBU24tLRAXH+vxzauT0QCX7BALe+/MXWfNcwE=";
|
||||
hash = "sha256-hY9mIcl5IJ34/nqiHe/Q2J2lJsDGvkhltCdSHltagSk=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-BFou5CoJYdVBylVVn5aRV0D4jv9967/GwrLTfDpqU1E=";
|
||||
vendorHash = "sha256-JRKRJJLP+8g075o++g/A/YyceKjVM9QHOkmszVutbEM=";
|
||||
|
||||
checkFlags = [
|
||||
"-short"
|
||||
|
||||
@@ -80,6 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
babbaj
|
||||
js6pak
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -95,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
babbaj
|
||||
js6pak
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,29 +8,30 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "just-lsp";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terror";
|
||||
repo = "just-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ew8/ugjSkCus5Fd/SpXfWKspvdOR6FC/Q2gBzWO3OOw=";
|
||||
hash = "sha256-Ly+9JXZNCQ3uFt2r6Cte88Hzr6VxpKFHYx29SdngfuE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YejdnLECFCmuYfmj6rYnKKsMD5HkHsYnS8gs4f3iCcw=";
|
||||
cargoHash = "sha256-nsTC4ks81F0E8OqOaRXYlzi/RTg+ywpiCsTwKFGwCt0=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Language server for just";
|
||||
homepage = "https://github.com/terror/just-lsp";
|
||||
changelog = "https://github.com/terror/just-lsp/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.cc0;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "just-lsp";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyworktree";
|
||||
version = "1.45.1";
|
||||
version = "1.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "lazyworktree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Bgw4B7r+pwh0lEDDowS1n8ZmUs2ClxRZQjQbE880nS0=";
|
||||
hash = "sha256-1XDFvfvMNJhrLvDmXgQGXqlfY5n1pZLz9LO3sGVyk3k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bMgMe9Crv5MKVhOMtqUG+peaSW0kQewT4qmdk0a7W6o=";
|
||||
vendorHash = "sha256-el3fHFqOzt+Yjgo+tB6/sdBu1qzkWBSB9rHh+h9QbJY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "llama-swap";
|
||||
version = "211";
|
||||
version = "216";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "mostlygeek";
|
||||
repo = "llama-swap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pX2Wrat0ETgRJgxNvZeZIVMLzPRMUJ3jxBd4rTc1dd0=";
|
||||
hash = "sha256-PHSY4z2h406xL+EcIYyrzr4s28txO7SCsWm8hrXf+2U=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JHBqAQ4OtfQSEfOYCWUh1ovcINAYPJSBFu1A64h0t04=";
|
||||
vendorHash = "sha256-QysQ7YdwJcLTziwL25j73n3tQVvzVQIFxN4GkTU8JZg=";
|
||||
|
||||
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "${llama-swap.pname}-ui";
|
||||
inherit (llama-swap) version src;
|
||||
npmDepsHash = "sha256-JoVpW5+Er6K81wcVZwDJ2cEEB7awUg+TGrzzmWvbaU4=";
|
||||
npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vite.config.ts \
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "llmfit";
|
||||
version = "0.9.23";
|
||||
version = "0.9.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexsJones";
|
||||
repo = "llmfit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KtmXNlKPz4W2hfLa1iTPUVrocEjXWfTcoMwcznV4ZEk=";
|
||||
hash = "sha256-ijm2RkOF+B1E7dARxI3MsZz3l6OTQOUqBC+2mzZ7ruI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fx9/LVZrbwfGL03Xv53q4FaC6obKadZWesj4SfMvG78=";
|
||||
cargoHash = "sha256-BdnsqqqnvnXQl6Q1L0tVHQyn7BatQVYfYF8mLRqZfqQ=";
|
||||
|
||||
meta = {
|
||||
description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU";
|
||||
|
||||
@@ -155,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace Macaulay2/packages/DeterminantalRepresentations.m2 \
|
||||
--replace-fail "eps = 1e-15" "eps = 1e-14"
|
||||
''
|
||||
# TODO remove in v1.26.06 (see https://github.com/Macaulay2/M2/pull/4334)
|
||||
# ForeignFunctions.m2 uses `brew --prefix` to discover potential library paths,
|
||||
# which fails when Homebrew is not installed.
|
||||
# We patch it to return an empty path instead, which should be harmless
|
||||
@@ -172,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configureFlags = [
|
||||
"--disable-download"
|
||||
"--enable-shared"
|
||||
"--with-issue=nixos"
|
||||
"--with-issue=Nix"
|
||||
"--with-boost-libdir=${boost}/lib"
|
||||
"--with-system-libs"
|
||||
"CPPFLAGS=-I${lib.getDev cddlib}/include/cddlib"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mcp-grafana";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "mcp-grafana";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J0u1hh7Q8PDrFXadV1s3YmYyGiD9FAs6Kl891D+K4P0=";
|
||||
hash = "sha256-YV+loz2C8CSonfqv5RgvTHAmC5zXGSZikeMf/QBCG7k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dTCOD6/+o3ZHI2qAb97ZJaMyAg0dqIisrHhUkgXzw7w=";
|
||||
vendorHash = "sha256-gTTvEJ2TUpQ526K70gYBIMrlqTjTbze+zbh+Jf6/s+Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchzip,
|
||||
libarchive,
|
||||
pkg-config,
|
||||
jq,
|
||||
platformio-core,
|
||||
writableTmpDirAsHomeHook,
|
||||
bluez,
|
||||
@@ -29,11 +30,11 @@
|
||||
assert builtins.isBool enableDefaultConfig;
|
||||
|
||||
let
|
||||
version = "2.7.18.fb3bf78";
|
||||
version = "2.7.23.b246bcd";
|
||||
|
||||
platformio-deps-native = fetchzip {
|
||||
url = "https://github.com/meshtastic/firmware/releases/download/v${version}/platformio-deps-native-tft-${version}.zip";
|
||||
hash = "sha256-rud8F+aYVljNw2rpApIkjuN8ob/ZxvcXNJ+oAVSeMpE=";
|
||||
hash = "sha256-Jr8/KnzNedGvMfMEjrqBv5HwKZS0jZpHFfp/saQEnng=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "meshtastic";
|
||||
repo = "firmware";
|
||||
hash = "sha256-RI1U0xZDy22C+YO5gKbxo5YWDzVeRWJ8u6tTyDdwqGU=";
|
||||
hash = "sha256-oNV6ZP5aSAFBcn9Y+yEzVTtMKg40eXcvDw5LlyZAft4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}))
|
||||
writableTmpDirAsHomeHook
|
||||
makeBinaryWrapper
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -82,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -ar ${platformio-deps-native}/. platformio-deps-native
|
||||
chmod +w -R platformio-deps-native
|
||||
rm -f platformio-deps-native/core/appstate.json
|
||||
jq "map_values($(date +%s))" platformio-deps-native/core/.cache/downloads/usage.db > usage_new.db
|
||||
mv usage_new.db platformio-deps-native/core/.cache/downloads/usage.db
|
||||
|
||||
export PLATFORMIO_CORE_DIR=platformio-deps-native/core
|
||||
export PLATFORMIO_LIBDEPS_DIR=platformio-deps-native/libdeps
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.38.0";
|
||||
version = "2.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9YtAqfSIpntpXpCNBUE7VwEoy6SNrusPTnH62HeghXY=";
|
||||
hash = "sha256-YaBrFY8zOH3iAcs+JNISchDwAY9ts7UwPXX1QoMWSxU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw=";
|
||||
|
||||
@@ -93,7 +93,7 @@ buildGoModule (finalAttrs: {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/netbirdio/netbird/version.version=${finalAttrs.version}"
|
||||
"-X github.com/netbirdio/netbird/version.version=v${finalAttrs.version}"
|
||||
"-X main.builtBy=nix"
|
||||
];
|
||||
|
||||
|
||||
@@ -6,12 +6,14 @@
|
||||
|
||||
# runtime dependencies
|
||||
nix-prefetch-git,
|
||||
nix-prefetch-docker,
|
||||
git, # for git ls-remote
|
||||
}:
|
||||
|
||||
let
|
||||
runtimePath = lib.makeBinPath [
|
||||
nix-prefetch-git
|
||||
nix-prefetch-docker
|
||||
git
|
||||
];
|
||||
in
|
||||
|
||||
@@ -18,7 +18,7 @@ buildGoModule (
|
||||
ui = buildNpmPackage {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "ntfy-sh-ui";
|
||||
npmDepsHash = "sha256-sIlEGN6zpbwQdW5HBI6F42nV6k7xapzsNfFujhohyYk=";
|
||||
npmDepsHash = "sha256-Zrukg48eo3+GfeOU690vVrbMUc6sVjIAdB5LpRtOn1M=";
|
||||
|
||||
prePatch = ''
|
||||
cd web/
|
||||
@@ -38,16 +38,16 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "ntfy-sh";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TcxXlAAihVbvdeTHMU4Z2f1ySiNIjX5Gogcq8JlWUa0=";
|
||||
hash = "sha256-mNQERjVzkwrbFbgiUwZijJMoWQ30UMTgagOPFyLoISo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d96NzjYDG7EyriTYgHHvxC7LRXawud0cgj1Rqr1DXus=";
|
||||
vendorHash = "sha256-1rFx7HCrF3JiNUCOdlvsUKDn8ugT1Ltl0JsnaP0eisE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pnpm = pnpm_9;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-6quh9A2PWI5zd+y6yyyDCgGjWQCav4NIhQpDJeU/Ul8=";
|
||||
hash = "sha256-E0bP15T2Ekj992Y1xFXL/4rko34AY+I5Lbn+blJhXYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "opencloud";
|
||||
version = "6.2.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "opencloud";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gWz6L0/lBJvhQ/6+j3g2ENPRyQYZ2jGz+i+nUZa+5zQ=";
|
||||
hash = "sha256-5bGsJcmrF01E0zXKxwRQpTZl/OinfW7da3nf3/T74hg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencloud-web";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5UYdw/j4mie4g7j+8mxAAv612vhkB6WxC6jzexsvctc=";
|
||||
hash = "sha256-kkNdP3IpWnfOv5GEhQqKJwnnRXCHyxMcI2RA6vK7NrA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Amo08Q01XLkPK4U0ynMWKYCfaKIghNRyPFZOV1GhMVs=";
|
||||
hash = "sha256-Md6KcP5BV9Pskqg+o9D3RD0WconqyiizAvXNMZ9htfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
openocd,
|
||||
autoreconfHook,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
openocd.overrideAttrs (old: {
|
||||
pname = "openocd-adi";
|
||||
version = "0.12.0-1.3.1-1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "analogdevicesinc";
|
||||
repo = "openocd";
|
||||
tag = "0.12.0-1.3.1-1";
|
||||
hash = "sha256-e25mAxUmbF/hZC+aWRMt9HdwKY0FClNrZXwP3888Z9A=";
|
||||
# openocd disables the vendored libraries that use submodules and replaces them with nix versions.
|
||||
# this works out as one of the submodule sources seems to be flakey.
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
autoreconfHook
|
||||
];
|
||||
meta = openocd.meta // {
|
||||
description = "ADI fork of OpenOCD";
|
||||
homepage = "https://github.com/analogdevicesinc/openocd";
|
||||
maintainers = with lib.maintainers; [
|
||||
aiyion
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -82,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s "$rules" "$out/etc/udev/rules.d/"
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
|
||||
mainProgram = "openocd";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openorbitaloptimizer";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "susilehtola";
|
||||
repo = "openorbitaloptimizer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-naZwe56c1wsng4L/Q1waPiACeEiEAMhvzr5XMwC1uoY=";
|
||||
hash = "sha256-bX+pJXZsAdPuWjJi/BynvQt8JnWQAd8NcXTWSH7bi40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rundeck";
|
||||
version = "5.20.0-20260402";
|
||||
version = "5.20.1-20260518";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
|
||||
hash = "sha256-XE/v1CTQ/pFhBLfpo/066Co1l10nwYvuAvZU2ux7Pc0=";
|
||||
hash = "sha256-aicAKbJ5d729Mu1XMBsNK+M2h1o/V/a36aj1XdLOQXM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.13.0",
|
||||
"version": "1.14.0",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "05sqnabjflqf7d8qay9zfa17zr4cibjvnzdd2xgh329gax3hv41j"
|
||||
"sha256": "0ig53wp2a3la8rd0adcb5jc5sn37fkv4lzzblsj7c1j4cn2ax3sv"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "0ahc0q650q4jq21b2y59ml53943d5ky3967kb9iglli9y7cv7ih3"
|
||||
"sha256": "1vn5hf6n7jwjhm90rxqm5ybhhb61b067dm9m8kl5x30i4q17zkfc"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "0qlrag15yqppi6s857dhbrnmp7bxwpf1w1czfbvq2iz0djbh5w54"
|
||||
"sha256": "08kixp12rszilnbmqkgwhgv69spzab090dimfhpqdv3y8gi636rl"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "12sbskk7f2pivclwpqaz1p618hrnj2mi0wyf3lccv7w8yk3898xi"
|
||||
"sha256": "19xa3dh77f0s945fi464blq0mpw06vmv5ic2hszrrg7cjiw58mbs"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spruce";
|
||||
version = "1.35.3";
|
||||
version = "1.35.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geofffranks";
|
||||
repo = "spruce";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lMKMq3zOgyYKmaHPLsdhY56HRtPlBlNcaZUPZeCuDI4=";
|
||||
hash = "sha256-Ulto2lYkCs/dGFDqnqU8RLxNhFY9vwl0b6E0HFeuX0I=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sticky";
|
||||
version = "1.30";
|
||||
version = "1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "sticky";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8Y6PoQQHS8h1AT+4DMbExd9y7ScDMig0M9BJQjq09Uc=";
|
||||
hash = "sha256-OPn3SNHeHQ3rw71R3oqV3DHxRPq4Ta+qxwkYeegVxbU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stylua";
|
||||
version = "2.4.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnymorganz";
|
||||
repo = "stylua";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-g8lMn/ylcHQL/RhOm3utX53c4/XtCtgw8WIzqLb2vZk=";
|
||||
sha256 = "sha256-C0X7IdYqs/hhSX96XWVyk7rfQNd9DjYxYgHL34cI+3g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IF+MQ4XnBTjYRtGDOIgx8wMfRp+UkIGsNfPiiDIzf3U=";
|
||||
cargoHash = "sha256-m31oocBkx4i2KxM0YC1omVWtypFi7iEoDVlXgT93iSI=";
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
|
||||
postPatch = ''
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sumo";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse-sumo";
|
||||
repo = "sumo";
|
||||
tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-HMuUQeme/cmJFR71bxsgr1tqtewl3vmsclGhc6ygiyk=";
|
||||
hash = "sha256-fi/36vgnxRezqkEEPRNxz/PBjg2hvwI9XpaN6IT7298=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff --git a/tests/module.ua b/tests/module.ua
|
||||
index 92e463a6..ff3f0489 100644
|
||||
--- a/tests/module.ua
|
||||
+++ b/tests/module.ua
|
||||
@@ -89,6 +89,3 @@ B ← A
|
||||
D‼ ← ^0^1
|
||||
└─╴
|
||||
⍤⤙≍ 6 M!D‼++ 1 2 3
|
||||
-
|
||||
-~ "gh: uiua-lang/example-module subfolder" ~ Lang
|
||||
-⍤⤙≍ "Uiua" Lang
|
||||
@@ -35,7 +35,7 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uiua";
|
||||
inherit (versionInfo) version cargoHash;
|
||||
inherit (versionInfo) version cargoHash patches;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
|
||||
@@ -4,4 +4,5 @@ rec {
|
||||
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
|
||||
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
|
||||
updateScript = ./update-stable.sh;
|
||||
patches = [ ];
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
rec {
|
||||
version = "0.18.1";
|
||||
version = "0.19.0-dev.4";
|
||||
tag = version;
|
||||
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
|
||||
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
|
||||
hash = "sha256-Df/d6dCYXRG8uWVTpLR3I8llS1ujT3QFnx5TCZSxf+0=";
|
||||
cargoHash = "sha256-cXD780n7qI8baDYyOdJvFBvXV2qCTiutgLc19+ewHnk=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
patches = [ ./0001-no-network-test.patch ];
|
||||
}
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vacuum-tube";
|
||||
version = "1.6.4";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shy1132";
|
||||
repo = "VacuumTube";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YTgVJ+vX5SLXtPee1Fp/Jr84o5wjbP+P4/Bly3GZxpc=";
|
||||
hash = "sha256-aYGsTABymPRpKl//4BfoyQPyQnQ9SB+rbkmfJOh9TpQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9Eu6GO8mhn5/1EPPInv4ImWrIkQxVjLjJ/IZ8nHkWII=";
|
||||
npmDepsHash = "sha256-Cor0mlNcLOAceNv18V8stdDrJlUtB43qfblJfFI3kso=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
env = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wakatime-cli";
|
||||
version = "2.11.3";
|
||||
version = "2.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "wakatime-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nl9OoKDXcSNyI9UxdqsMSRF9Etz1p1jC6TmgY+0rKfg=";
|
||||
hash = "sha256-C5d0E4+NSZsy+GiolLEGBjRJBHlc/XKNCNZNFz46qVQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OfnXj6X2JIN/lLCvB8LLYeqNj1aW3GuA1hCiw+219QQ=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "xapp-symbolic-icons";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xapp-project";
|
||||
repo = "xapp-symbolic-icons";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BcatNzhtPZW9EDPZ9FPU+fPDC8l1CVAjcBYJJUNCRZo=";
|
||||
hash = "sha256-cqY0Ck0bOshfpT8VZ7feAiQvrNyPljusRIxLBR4OL5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "zapzap";
|
||||
version = "6.4.1";
|
||||
version = "6.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafatosta";
|
||||
repo = "zapzap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GYt7MDj4JCdapZUEXIFGGpt7JpsjW2ZC+lhwyK2yj4c=";
|
||||
hash = "sha256-3wDOqEODaOIGs9ktwbHZ0vrM7rz+oWTDnuAb5coetGY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "genai-prices";
|
||||
version = "0.0.60";
|
||||
version = "0.0.61";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "genai-prices";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-txcaBPxIUssTlnDNhe2f9Jlr5LaZT1zIcJslMK3Bayk=";
|
||||
hash = "sha256-3w3V6uIeRBTpc2rtkVRVsLlWGzHHksklv3YyCw6/VEI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/python";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geometric";
|
||||
version = "1.1";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leeping";
|
||||
repo = "geomeTRIC";
|
||||
tag = version;
|
||||
hash = "sha256-hxNzyuupktUWDzZXXJNsVoC6m/kyE1fbfY5K6LiO+x0=";
|
||||
hash = "sha256-LY5eNKocJL/Ty8tLup6q2o5RkGfIp6P6Hmju4wF3cDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gmpy2,
|
||||
@@ -46,6 +47,16 @@ buildPythonPackage (finalAttrs: {
|
||||
pexpect
|
||||
];
|
||||
|
||||
# Ugly hack to preserve the hash on non-`x86_64-darwin` platforms
|
||||
${if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then "disabledTests" else null} =
|
||||
[
|
||||
# Expected:
|
||||
# -0.5440211108893698
|
||||
# Got:
|
||||
# -0.5440211108893699
|
||||
"contexts.rst"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://mpmath.org/";
|
||||
description = "Pure-Python library for multiprecision floating arithmetic";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygame-sdl2";
|
||||
version = "8.5.2.26010301";
|
||||
version = "8.5.3.26051504";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -53,9 +53,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Yq5dYaX+/hLvmPpHI8rhCcSlabQBPAyUrIQRgnoi17c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/python-lsp/python-lsp-server/pull/709
|
||||
./jedi-compat.patch
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"autopep8"
|
||||
"flake8"
|
||||
"jedi"
|
||||
"mccabe"
|
||||
"pycodestyle"
|
||||
"pydocstyle"
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 07bb69fe0c3168f9951914547dcb89309fea1b20 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Mon, 4 May 2026 12:09:22 +0200
|
||||
Subject: [PATCH] Fix test_snippets_completion to not depend on typeshed
|
||||
overload ordering
|
||||
|
||||
jedi 0.20.0 bundles a newer typeshed that adds a no-arg overload for
|
||||
defaultdict.__init__ as the first overload, causing format_snippet to
|
||||
hit the zero-params branch and produce "defaultdict()" instead of
|
||||
"defaultdict($0)". Replace defaultdict with a locally-defined function
|
||||
to make the test stable across typeshed updates.
|
||||
---
|
||||
test/plugins/test_completion.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
|
||||
index ae5021f5..bbaeabe0 100644
|
||||
--- a/test/plugins/test_completion.py
|
||||
+++ b/test/plugins/test_completion.py
|
||||
@@ -322,7 +322,7 @@ def test_matplotlib_completions(config, workspace) -> None:
|
||||
|
||||
|
||||
def test_snippets_completion(config, workspace) -> None:
|
||||
- doc_snippets = "from collections import defaultdict \na=defaultdict"
|
||||
+ doc_snippets = "from collections import defaultdict \ndef foo(a): pass\nfoo"
|
||||
com_position = {"line": 0, "character": 35}
|
||||
doc = Document(DOC_URI, workspace, doc_snippets)
|
||||
config.capabilities["textDocument"] = {
|
||||
@@ -332,9 +332,9 @@ def test_snippets_completion(config, workspace) -> None:
|
||||
completions = pylsp_jedi_completions(config, doc, com_position)
|
||||
assert completions[0]["insertText"] == "defaultdict"
|
||||
|
||||
- com_position = {"line": 1, "character": len(doc_snippets)}
|
||||
+ com_position = {"line": 2, "character": 3}
|
||||
completions = pylsp_jedi_completions(config, doc, com_position)
|
||||
- assert completions[0]["insertText"] == "defaultdict($0)"
|
||||
+ assert completions[0]["insertText"] == "foo($0)"
|
||||
assert completions[0]["insertTextFormat"] == lsp.InsertTextFormat.Snippet
|
||||
|
||||
|
||||
@@ -77,6 +77,7 @@ buildPythonPackage rec {
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"ipython"
|
||||
"jedi"
|
||||
"python-lsp-server"
|
||||
];
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "torch-cluster";
|
||||
version = "2.6.3-unstable-2026-03-26";
|
||||
version = "1.6.3-unstable-2026-03-26";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
version = "4.6.2-stable";
|
||||
hash = "sha256-alAW8i7wRcOsHvq3flYXgW7DPiIlAXxM1zFL87Kri6Y=";
|
||||
version = "4.6.3-stable";
|
||||
hash = "sha256-BNivdlGk1jTOR68U0Mhs53xp7jhvR90xKaoIBT7ixaE=";
|
||||
default = {
|
||||
exportTemplatesHash = "sha256-lCNm3E4n52hqmdpNPPsbiujT65RE9tghfu8WJFtZnvI=";
|
||||
exportTemplatesHash = "sha256-P74sDi3snVN6ueyXvPjakdzyM1f8UfZwkt0GjYOSkKg=";
|
||||
};
|
||||
mono = {
|
||||
exportTemplatesHash = "sha256-Ts9y+vdvluAQ0Wbdu+Pw+459+WMygmZqOpr9TuPgDn0=";
|
||||
exportTemplatesHash = "sha256-ZDb0dO4IX7CpTT0pa5ghc2vdZjtukbIij993Bm8dFAA=";
|
||||
nugetDeps = ./deps.json;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ rec {
|
||||
url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run";
|
||||
sha256_64bit = "sha256-MshdmbD2QMlQH2GzndrSCP0CiNAVxPvF/QQ1wHeD+nc=";
|
||||
persistencedSha256 = "sha256-cQ+qz4aSYeonKviufdQOHo0quun8yPBTSgOvRkdN6og=";
|
||||
fabricmanagerSha256 = "sha256-L/HKInyd0Eqz7F5BhWfcABi83rr7mBxyIBtvRvApeVA=";
|
||||
fabricmanagerSha256 = "sha256-wAmOTyGR6oxoYk5znEdOgRv0nYuAxO7Gl/wUDlx8Y88=";
|
||||
openSha256 = "sha256-HlGJyfcmXWqKJw1NRjp35clLucQtCIWAxjJvicgI4zM=";
|
||||
useSettings = false;
|
||||
usePersistenced = true;
|
||||
|
||||
@@ -712,7 +712,6 @@ mapAliases {
|
||||
fcitx5-skk-qt = throw "'fcitx5-skk-qt' has been renamed to/replaced by 'qt6Packages.fcitx5-skk-qt'"; # Converted to throw 2025-10-27
|
||||
fcitx5-unikey = throw "'fcitx5-unikey' has been renamed to/replaced by 'qt6Packages.fcitx5-unikey'"; # Converted to throw 2025-10-27
|
||||
fcitx5-with-addons = throw "'fcitx5-with-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-with-addons'"; # Converted to throw 2025-10-27
|
||||
fcp = throw "'fcp' has been removed as it has been unmaintained upstream since August 2022"; # Added 2026-02-07
|
||||
fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
|
||||
fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
|
||||
fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
|
||||
|
||||
Reference in New Issue
Block a user