Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-07-21 18:29:41 +00:00
committed by GitHub
109 changed files with 4897 additions and 1656 deletions
+5
View File
@@ -149,6 +149,11 @@ Note: this is not possible anymore for Neovim.
## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
:::{.note}
Before adding a Neovim Lua plugin, check if a release is available on [luarocks](https://luarocks.org/).
If it is, add it as a [LuaRocks based plugin](#neovim-luarocks-based-plugins).
:::
Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/update.py) to update the tree sitter grammars for `nvim-treesitter`.
+6
View File
@@ -5238,6 +5238,12 @@
githubId = 1448923;
name = "Christian Kauhaus";
};
ckgxrg = {
email = "ckgxrg@ckgxrg.io";
github = "ckgxrg-salt";
githubId = 165614491;
name = "ckgxrg";
};
cko = {
email = "christine.koppelt@gmail.com";
github = "cko";
+13 -13
View File
@@ -6,13 +6,13 @@ basexx,,,,,,
bcrypt,,,,,,ulysseszhan
binaryheap,,,,,,vcunat
bit32,,,,,5.1,lblasc
busted,,,,,,
busted,,,,,,alerque
busted-htest,,,,,,mrcjkb
canola.nvim,,,,,,saadndm
cassowary,,,,,,alerque
cldr,,,,,,alerque
commons.nvim,,,,,5.1,mrcjkb
compat53,,,,,,vcunat
compat53,,,,,,vcunat alerque
coop.nvim,,,,,,
cosmo,,,,,,
coxpcall,,,,1.17.0-1,,
@@ -38,7 +38,7 @@ inspect,,,,,,
jsregexp,,,,0.0.7-2,,
kulala.nvim,,,,,,
ldbus,,,https://luarocks.org/dev,,,
ldoc,,,,,,
ldoc,,,,,,alerque
lgi,,,,,,
linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,,
ljsyscall,,,,,5.1,lblasc
@@ -62,7 +62,7 @@ lua-cjson,,,,,,
lua-cmsgpack,,,,,,
lua-curl,,,,,,
lua-ffi-zlib,,,,,,
lua-iconv,,,,7.0.0,,
lua-iconv,,,,7.0.0,,alerque
lua-lsp,,,,,,
lua-messagepack,,,,,,
lua-protobuf,,,,,,lockejan
@@ -78,10 +78,10 @@ lua-toml,,,,,,
lua-utils.nvim,,,,,,mrcjkb
lua-yajl,,,,,,pstn
lua-zlib,,,,,,koral
lua_cliargs,,,,,,
lua_cliargs,,,,,,alerque
luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,,
luacheck,,,,,,
luacov,,,,,,
luacheck,,,,,,alerque
luacov,,,,,,alerque
luacov-reporter-lcov,,,,,,ulysseszhan
luadbi,,,,,,
luadbi-mysql,,,,,,
@@ -91,7 +91,7 @@ luaepnf,,,,,,
luaevent,,,,,,
luaexpat,,,,,,arobyn flosse
luaffi,,,https://luarocks.org/dev,,,
luafilesystem,,,,,,flosse
luafilesystem,,,,,,flosse alerque
lualdap,,,,,,aanderse
lualine.nvim,,,https://luarocks.org/dev,,,
lualogging,,,,,,
@@ -104,12 +104,12 @@ luarocks-build-rust-mlua,,,,,,mrcjkb
luarocks-build-tree-sitter-cli,,,,,,
luarocks-build-treesitter-parser,,,,,,mrcjkb
luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
luasec,,,,,,flosse
luasec,,,,,,flosse alerque
luasnip,,,,,,
luasocket,,,,,,
luasocket,,,,,,alerque
luasql-sqlite3,,,,,,
luassert,,,,,,
luasystem,,,,,,
luassert,,,,,,alerque
luasystem,,,,,,alerque
luatext,,,,,,
luaunbound,,,,,,
luaunit,,,,,,lockejan
@@ -159,7 +159,7 @@ rocks-git.nvim,,,,,5.1,mrcjkb
rocks.nvim,,,,,5.1,mrcjkb
rtp.nvim,,,,,5.1,mrcjkb
rustaceanvim,,,,,5.1,mrcjkb
say,,,,,,
say,,,,,,alerque
serpent,,,,,,lockejan
sofa,,,,,,f4z3r
sqlite,,,,,,
1 name rockspec ref server version luaversion maintainers
6 bcrypt ulysseszhan
7 binaryheap vcunat
8 bit32 5.1 lblasc
9 busted alerque
10 busted-htest mrcjkb
11 canola.nvim saadndm
12 cassowary alerque
13 cldr alerque
14 commons.nvim 5.1 mrcjkb
15 compat53 vcunat vcunat alerque
16 coop.nvim
17 cosmo
18 coxpcall 1.17.0-1
38 jsregexp 0.0.7-2
39 kulala.nvim
40 ldbus https://luarocks.org/dev
41 ldoc alerque
42 lgi
43 linenoise https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec
44 ljsyscall 5.1 lblasc
62 lua-cmsgpack
63 lua-curl
64 lua-ffi-zlib
65 lua-iconv 7.0.0 alerque
66 lua-lsp
67 lua-messagepack
68 lua-protobuf lockejan
78 lua-utils.nvim mrcjkb
79 lua-yajl pstn
80 lua-zlib koral
81 lua_cliargs alerque
82 luabitop https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec
83 luacheck alerque
84 luacov alerque
85 luacov-reporter-lcov ulysseszhan
86 luadbi
87 luadbi-mysql
91 luaevent
92 luaexpat arobyn flosse
93 luaffi https://luarocks.org/dev
94 luafilesystem flosse flosse alerque
95 lualdap aanderse
96 lualine.nvim https://luarocks.org/dev
97 lualogging
104 luarocks-build-tree-sitter-cli
105 luarocks-build-treesitter-parser mrcjkb
106 luarocks-build-treesitter-parser-cpp mrcjkb
107 luasec flosse flosse alerque
108 luasnip
109 luasocket alerque
110 luasql-sqlite3
111 luassert alerque
112 luasystem alerque
113 luatext
114 luaunbound
115 luaunit lockejan
159 rocks.nvim 5.1 mrcjkb
160 rtp.nvim 5.1 mrcjkb
161 rustaceanvim 5.1 mrcjkb
162 say alerque
163 serpent lockejan
164 sofa f4z3r
165 sqlite
@@ -421,7 +421,7 @@ in
{
name = "unix";
control = "sufficient";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
@@ -567,7 +567,7 @@ in
{
name = "unix";
control = "sufficient";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
@@ -575,7 +575,7 @@ in
{
name = "unix";
control = "requisite";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
settings.nullok = true;
}
];
@@ -201,7 +201,7 @@ in
# Setup session
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
{
name = "systemd";
@@ -442,7 +442,7 @@ in
{
name = "unix";
control = "sufficient";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
@@ -42,6 +42,15 @@ in
'';
};
useLlamaCppCacheDir = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to use {file}`/var/cache/llama-cpp` as {env}`LLAMA_CACHE` instead
of {file}`/var/cache/llama-swap` to share models and other cache with {option}`services.llama-cpp`.
'';
};
tls = {
enable = lib.mkEnableOption "TLS encryption";
@@ -113,6 +122,10 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
LLAMA_CACHE = lib.mkDefault "/var/cache/${config.systemd.services.llama-swap.serviceConfig.CacheDirectory}";
};
serviceConfig = {
Type = "exec";
ExecStart = "${lib.getExe cfg.package} ${
@@ -130,6 +143,12 @@ in
Restart = "on-failure";
RestartSec = 3;
CacheDirectory =
if cfg.useLlamaCppCacheDir then
config.systemd.services.llama-cpp.serviceConfig.CacheDirectory
else
"llama-swap";
# for GPU acceleration
PrivateDevices = false;
+2 -2
View File
@@ -214,7 +214,7 @@ in
{
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
session = utils.pam.autoOrderRules [
@@ -230,7 +230,7 @@ in
{
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
{
name = "systemd";
+3 -3
View File
@@ -113,7 +113,7 @@ in
{
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
settings.nullok = true;
}
];
@@ -121,14 +121,14 @@ in
{
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
session = utils.pam.autoOrderRules [
{
name = "unix";
control = "required";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
{
name = "env";
@@ -362,7 +362,7 @@ in
{
name = "unix";
control = "sufficient";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
@@ -446,7 +446,7 @@ in
{
name = "unix";
control = "sufficient";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
}
];
@@ -454,7 +454,7 @@ in
{
name = "unix";
control = "requisite";
modulePath = "${config.security.pam.package}/lib/security/pam_unix.so";
modulePath = config.security.pam.pam_unixModulePath;
settings.nullok = true;
}
];
+40 -3
View File
@@ -13,6 +13,7 @@
makeDesktopItem,
makeWrapper,
p7zip,
gnutar,
writeShellScript,
}:
let
@@ -46,9 +47,17 @@ let
pname = "pianoteq-${name}";
unpackPhase = ''
${p7zip}/bin/7z x $src
'';
unpackPhase =
if lib.hasSuffix ".7z" src then
''
${p7zip}/bin/7z x $src
''
else if lib.hasSuffix ".tar.xz" src then
''
${gnutar}/bin/tar -xf $src
''
else
throw "unexpected file format";
nativeBuildInputs = [
autoPatchelfHook
@@ -243,6 +252,7 @@ let
version6 = "6.7.3";
version7 = "7.5.4";
version8 = "8.4.0";
version9 = "9.1.2";
mkStandard =
version: hash:
@@ -292,8 +302,35 @@ let
inherit hash;
};
};
mkTrial9 =
hash:
mkPianoteq {
name = "trial";
version = version9;
mainProgram = "Pianoteq 9";
startupWMClass = "Pianoteq Trial";
src = fetchPianoteqTrial {
name = "pianoteq_trial_v${versionForFile version9}.tar.xz";
inherit hash;
};
};
mkStage9 =
hash:
mkPianoteq {
name = "stage";
version = version9;
mainProgram = "Pianoteq 9 STAGE";
startupWMClass = "Pianoteq STAGE";
src = fetchPianoteqWithLogin {
name = "pianoteq_setup_v${versionForFile version9}.tar.xz";
inherit hash;
};
};
in
{
trial_9 = mkTrial9 "sha256-1ofPL6F12Gv+k2rZBadOa5Iyukuji6vdww87ufdKjM8=";
stage_9 = mkStage9 "sha256-Jvm/AhBwgj5INW8U48rJjgDB7j/Z1VnYKczvtrpl/AY=";
standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc=";
stage_8 = mkStage version8 "";
standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw=";
@@ -446,12 +446,12 @@ final: prev: {
SchemaStore-nvim = buildVimPlugin {
pname = "SchemaStore.nvim";
version = "0-unstable-2026-07-07";
version = "0-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "e954496f8ef22904e8a84f5078f4a110fdc7a0d3";
hash = "sha256-b8HOclkr3FoCNUDJ6f0ULsfyiQB38+9PNxl0CibVL60=";
rev = "e520902f405da5f5ad392d32babad5b5dd5ffa44";
hash = "sha256-zNXm/0W+Hv562zt6NxHnFuO2nBxjX5dlxS7pRB+KXQY=";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -1050,12 +1050,12 @@ final: prev: {
artio-nvim = buildVimPlugin {
pname = "artio.nvim";
version = "0-unstable-2026-06-23";
version = "0-unstable-2026-07-17";
src = fetchFromGitHub {
owner = "comfysage";
repo = "artio.nvim";
rev = "52a074e6a15780df350c03b5c7ab47f706fe6da8";
hash = "sha256-8hbFtJXpkH1L2ZI6Rv9HTQcseog77yf78Wc/9WsvzPA=";
rev = "19d71f8d9c721872e97aa0e5f094041c96f3feca";
hash = "sha256-X1QXSoowhgs+uhO1T9OtaSXhAryzLCzGfHNgCFiO3is=";
};
meta.homepage = "https://github.com/comfysage/artio.nvim/";
meta.license = getLicenseFromSpdxId "EUPL-1.2";
@@ -1414,12 +1414,12 @@ final: prev: {
autoclose-nvim = buildVimPlugin {
pname = "autoclose.nvim";
version = "0-unstable-2026-03-22";
version = "0-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "m4xshen";
repo = "autoclose.nvim";
rev = "bafd0368716216fa6a7bb2a43ecd889b44efdb46";
hash = "sha256-DOKKyaDmfUPRTcXJvqD+0zAr63+93H0auax6Dse0Igo=";
rev = "27063904b2238ce7867e430885b6abcfb08357ea";
hash = "sha256-BjNP8Facn3Cy/EHYioUB9mXb19sBzBeSCY1xTpPOWG8=";
};
meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -1638,12 +1638,12 @@ final: prev: {
base46 = buildVimPlugin {
pname = "base46";
version = "0-unstable-2026-07-11";
version = "0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "nvchad";
repo = "base46";
rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b";
hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk=";
rev = "8d059b82367160cd530253afbbcd20dc4b34129f";
hash = "sha256-wW6UidkM6avqQVhPEgRtDXgxHsMdD+IM01A5ABebYT4=";
};
meta.homepage = "https://github.com/nvchad/base46/";
meta.license = unfree;
@@ -1946,12 +1946,12 @@ final: prev: {
blink-cmp-tmux = buildVimPlugin {
pname = "blink-cmp-tmux";
version = "0-unstable-2026-02-11";
version = "0-unstable-2026-07-16";
src = fetchFromGitHub {
owner = "mgalliou";
repo = "blink-cmp-tmux";
rev = "1ef35d8e388475ab8eaeecfc12e196c78bd5de04";
hash = "sha256-enoPsYF8llGShf+sx6rLYYnLLzrd+jdCdZ4gy9A2lKU=";
rev = "112ddbf2e09d9cb4736de70dd01eb9654cf01d70";
hash = "sha256-7Wj7bIg7vAOz0OygISORRphsEV6RcsR6m/S2tRyzEpU=";
};
meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -2254,12 +2254,12 @@ final: prev: {
bullets-vim = buildVimPlugin {
pname = "bullets.vim";
version = "2.0.0-unstable-2026-06-03";
version = "2.0.0-unstable-2026-07-16";
src = fetchFromGitHub {
owner = "bullets-vim";
repo = "bullets.vim";
rev = "3f667eeca58bd4ba411b41edefef51e7fed1a2b1";
hash = "sha256-fq3ATtCeXeq3CR97KbEu8mOEF8CtpEt7z8z3OO5IQQY=";
rev = "81570b98ca44b4100b3ddcf8d9ca74b9a9b0c884";
hash = "sha256-yTxXXnVyk/vbr+tWD9RquJvk2ksa8Okuhg3NnyeBp3o=";
};
meta.homepage = "https://github.com/bullets-vim/bullets.vim/";
meta.license = unfree;
@@ -3568,12 +3568,12 @@ final: prev: {
codecompanion-nvim = buildVimPlugin {
pname = "codecompanion.nvim";
version = "19.19.0";
version = "19.20.0";
src = fetchFromGitHub {
owner = "olimorris";
repo = "codecompanion.nvim";
tag = "v19.19.0";
hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE=";
tag = "v19.20.0";
hash = "sha256-vDKbjW9izNruCLiPRQEs+yoOrA+YkuyvmdovFTY4nfw=";
};
meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -4185,12 +4185,12 @@ final: prev: {
coq_nvim = buildVimPlugin {
pname = "coq_nvim";
version = "0-unstable-2026-07-12";
version = "0-unstable-2026-07-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5";
hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA=";
rev = "83580b587f6fc50568ec61ae79e18762fcf35c17";
hash = "sha256-OKlZh1FKIk4DhyAtc0rSnEOZoa75NQKRtdFYDjkTZPE=";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4605,12 +4605,12 @@ final: prev: {
ddc-source-lsp = buildVimPlugin {
pname = "ddc-source-lsp";
version = "1.2.0-unstable-2026-06-12";
version = "1.2.0-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "ddc-source-lsp";
rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c";
hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k=";
rev = "2f476ae123bea5b3583f9d4ca141f63981e70b06";
hash = "sha256-2rMdU1FUP4HJP2o2MtL93po/FmloMzZ/sqeQWHPP55g=";
};
meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
meta.license = unfree;
@@ -7171,12 +7171,12 @@ final: prev: {
hardtime-nvim = buildVimPlugin {
pname = "hardtime.nvim";
version = "1.2.0-unstable-2025-09-13";
version = "1.2.0-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "m4xshen";
repo = "hardtime.nvim";
rev = "b4e431934af1fe224a3a801f632c008278cb7628";
hash = "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=";
rev = "244753782b945def87472d8f4e9e6a9d4ec18689";
hash = "sha256-Zers7vdGRGy8n520G9uMuHwMAP3STHqU5d5a2Ln9rDQ=";
};
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -8375,12 +8375,12 @@ final: prev: {
kitty-scrollback-nvim = buildVimPlugin {
pname = "kitty-scrollback.nvim";
version = "9.2.0";
version = "9.2.1";
src = fetchFromGitHub {
owner = "mikesmithgh";
repo = "kitty-scrollback.nvim";
tag = "v9.2.0";
hash = "sha256-M/sd8lUv7leapzI3uD0VNkMAwaFhPmXsktFnHMPJz0U=";
tag = "v9.2.1";
hash = "sha256-8IkvoJ8nTlP5WCqMpJqUhBsz7OYB/Mlp1lH5TJRpvOE=";
};
meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11034,12 +11034,12 @@ final: prev: {
neoconf-nvim = buildVimPlugin {
pname = "neoconf.nvim";
version = "1.4.0-unstable-2026-07-16";
version = "1.4.0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "50bdc4130d9e30d28d0b209544d49ee472f6bf12";
hash = "sha256-hsYouOS+ImmA6HnwqFRq3RMBTsn87oHrnijMqvargU4=";
rev = "1246df7a5d1811d84212f11edb43550cd8380ebd";
hash = "sha256-hlQf+xJ+/9OTqp5VtPsNE7QW6uVjWeUkqQ8r1u6MWkI=";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -11118,12 +11118,12 @@ final: prev: {
neogit = buildVimPlugin {
pname = "neogit";
version = "3.0.0-unstable-2026-07-15";
version = "3.0.0-unstable-2026-07-16";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
rev = "95295edaa26e8e8db5a9bc4119256e602311c6bc";
hash = "sha256-hAswp9Ba5xfFfBS+NKjLOoSky+SRrLfd8fdFC46Dq2s=";
rev = "f8674ec894315c02449b61c9de9a116c5aafeb90";
hash = "sha256-ETu9zy2In3M8/3fqYUfTRt0mKiocm3paJFjgQ82Yj3I=";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -12268,12 +12268,12 @@ final: prev: {
nvchad-ui = buildVimPlugin {
pname = "nvchad-ui";
version = "0-unstable-2026-07-11";
version = "0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "nvchad";
repo = "ui";
rev = "28019401865beffcedc744bb1506d0201b88f2f9";
hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0=";
rev = "222c8cc1ad66076c05b7c9d0695781ebe3799d88";
hash = "sha256-SKSRwXi0KdJtWkmak1LLwXIUukwIhMxKHy9HIMnu0DQ=";
};
meta.homepage = "https://github.com/nvchad/ui/";
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -13746,12 +13746,12 @@ final: prev: {
nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter";
version = "0.10.0-unstable-2026-04-03";
version = "0.10.0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "4916d6592ede8c07973490d9322f187e07dfefac";
hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=";
rev = "7248feaca45e4d944591497964bc19afa89ad1c6";
hash = "sha256-FQj0+qeaW9rLy3dUbGbUG4UYtnry7UBA1n9SM2qXLdk=";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13858,12 +13858,12 @@ final: prev: {
nvim-treesitter-textobjects = buildVimPlugin {
pname = "nvim-treesitter-textobjects";
version = "0-unstable-2026-04-07";
version = "0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "851e865342e5a4cb1ae23d31caf6e991e1c99f1e";
hash = "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0=";
rev = "898ee307df58f854d11cd7edd06472574d48014e";
hash = "sha256-naZ+p5RrC+uUyFRaksmozDfNgJRifff+9TDWx79DCPk=";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -14170,8 +14170,8 @@ final: prev: {
src = fetchFromGitHub {
owner = "tarides";
repo = "ocaml.nvim";
rev = "e12ded73f461d392cc2cad579a39733ebe34de61";
hash = "sha256-3NiRM02g7BU+MzCybSfsyZdODcPA+RbuNU9QOmmoCxo=";
rev = "d74934117fb7a513e64601ad1d1b53a34b00b01f";
hash = "sha256-zJJZP8jxa7e9Fn0N8JFzfP3d2TElkASFt8ptaWCOYpM=";
};
meta.homepage = "https://github.com/tarides/ocaml.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -15148,12 +15148,12 @@ final: prev: {
project-nvim = buildVimPlugin {
pname = "project.nvim";
version = "5.1.1-1";
version = "5.2.0-1";
src = fetchFromGitHub {
owner = "DrKJeff16";
repo = "project.nvim";
tag = "v5.1.1-1";
hash = "sha256-NmkKA9AH1uOgHSQT9S8RIFQrkrhkDvpKIfDqHGfzoFI=";
tag = "v5.2.0-1";
hash = "sha256-p/p7VxmuNusgUXtPpiCGa+BSgDDS/yKvtAV93cKmIEg=";
};
meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -16255,12 +16255,12 @@ final: prev: {
smart-splits-nvim = buildVimPlugin {
pname = "smart-splits.nvim";
version = "2.1.0-unstable-2026-07-10";
version = "2.1.0-unstable-2026-07-18";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "smart-splits.nvim";
rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad";
hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI=";
rev = "de39b4d75695e2377401c7d05f896657637d244b";
hash = "sha256-Xqnre4RfIID/m8hXUpcMrsLssjfp/cbSpG24cory2BI=";
};
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -16269,12 +16269,12 @@ final: prev: {
smartcolumn-nvim = buildVimPlugin {
pname = "smartcolumn.nvim";
version = "1.1.1-unstable-2025-07-21";
version = "1.1.1-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "m4xshen";
repo = "smartcolumn.nvim";
rev = "b9cdbdf42f7ac5a659204cd5926017c7ff724a19";
hash = "sha256-QAb0O/ZwTVogRyTK8+Y4ORaN6nVaeYepKgfSCF/fIPU=";
rev = "5351ae24e992a397d2abac48b7774dc8ef0acf40";
hash = "sha256-+ICVS16n0CFWbTqBzGkvxQohyYiAvr6gIxZqura3PUw=";
};
meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -21136,12 +21136,12 @@ final: prev: {
vim-go = buildVimPlugin {
pname = "vim-go";
version = "1.29-unstable-2026-07-08";
version = "1.29-unstable-2026-07-18";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "551d423ba27915d96721c8709702edd23bc2bb48";
hash = "sha256-ps2QQ6xyQpvfCZ+tTUTzBt3kxu7+VtDcvLnH2HS8pRY=";
rev = "d69962d20a2a60e4bdc92a2281e5f0aaaa109635";
hash = "sha256-tXA45Hhnr9Vv4p6MyNAxj2SOC+P8eGkIEVE8PDnyFx4=";
};
meta.homepage = "https://github.com/fatih/vim-go/";
meta.license = unfree;
@@ -21922,12 +21922,12 @@ final: prev: {
vim-just = buildVimPlugin {
pname = "vim-just";
version = "0-unstable-2026-07-11";
version = "0-unstable-2026-07-19";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "b3301b091c730061a6da1f9fab670eece6af187c";
hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug=";
rev = "d9aa6784fe3a870e78ba82b5d176c0c5745e23f7";
hash = "sha256-/QrVhax5PTidfSi6WAxJNX4mbBhUGFZLlG3WsqoT2Ro=";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -22230,12 +22230,12 @@ final: prev: {
vim-lsp-settings = buildVimPlugin {
pname = "vim-lsp-settings";
version = "0.0.1-unstable-2026-07-11";
version = "0.0.1-unstable-2026-07-16";
src = fetchFromGitHub {
owner = "mattn";
repo = "vim-lsp-settings";
rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f";
hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8=";
rev = "22d06c9e4b620d5c2f055aec590dec6d383e5316";
hash = "sha256-LiWvL9QpZFPUH+Uek19ce6/e8B6uATmje/emUvyLWJk=";
};
meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -25267,12 +25267,12 @@ final: prev: {
vimtex = buildVimPlugin {
pname = "vimtex";
version = "2.17-unstable-2026-07-05";
version = "2.17-unstable-2026-07-18";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "a5949d2800c1866c878956d49c51fc8d003c6b99";
hash = "sha256-P7zDZBNy2WivNbwCURpS3zTNd5nXenYu2PZEbyWnbCY=";
rev = "6368e31fdaf766ff908a2c06e9ee14fc66dec409";
hash = "sha256-/0DoAJ3Iv8eJlRqNodumYqllY+4c3zv+oY1EpbvC8ak=";
};
meta.homepage = "https://github.com/lervag/vimtex/";
meta.license = getLicenseFromSpdxId "MIT";
@@ -26025,12 +26025,12 @@ final: prev: {
zen-nvim = buildVimPlugin {
pname = "zen.nvim";
version = "0-unstable-2026-04-17";
version = "0-unstable-2026-07-18";
src = fetchFromGitHub {
owner = "sand4rt";
repo = "zen.nvim";
rev = "8d77a06063d74393ace9a984f32c4c158dcef6ba";
hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA=";
rev = "cc7306e9ea479b19e8ef4c5fba35b4efd4b66692";
hash = "sha256-ZFuhNDVmUU7A02w/rzDn8uze7ivHVu2GI3+6PyIxAgE=";
};
meta.homepage = "https://github.com/sand4rt/zen.nvim/";
meta.license = getLicenseFromSpdxId "MIT";
File diff suppressed because it is too large Load Diff
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-JYg1P0t3YadTxmqeRSky8X9emLnP2cO3BYO9R7PgQfM=";
hash = "sha256-vx8fRGGW9fJYKC1Q1627NrjxqqO/zRkH83aLyc4Rxn0=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-miK4K8THmT+ebjcAl/3Cp9vtVWfMlpIWWIqyAm5+YeQ=";
hash = "sha256-ZWwau/aSMsamcVBrtuSWI2HiKeZHfMqBLj9WQO8IA20=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-ao9yGH9xIBmNrp/sHpwpxKZnR8LjXl1Cegfgw7Nq+2M=";
hash = "sha256-a4yKVABQ0nVzlqS071ae5DYEqv8jgjSwLjxkEAroZvE=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.215";
version = "2.1.216";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+10 -3
View File
@@ -181,7 +181,6 @@ stdenv.mkDerivation (
buildFHSEnv customizedArgs;
in
{
inherit
pname
version
@@ -199,8 +198,16 @@ stdenv.mkDerivation (
updateScript
vscodeVersion
;
fhs = fhs { };
fhsWithPackages = f: fhs { additionalPkgs = f; };
fhs = (fhs { }).overrideAttrs (old: {
strictDeps = true;
__structuredAttrs = true;
});
fhsWithPackages =
f:
(fhs { additionalPkgs = f; }).overrideAttrs (old: {
strictDeps = true;
__structuredAttrs = true;
});
}
// lib.optionalAttrs (vscodeServer != null) {
inherit rev vscodeServer;
@@ -1,7 +1,7 @@
{
lib,
buildGoModule,
buildGo125Module,
buildGo126Module,
fetchFromGitHub,
nixosTests,
installShellFiles,
@@ -82,6 +82,19 @@ rec {
nomad = nomad_1_11;
nomad_2_0 = generic {
buildGoModule = buildGo126Module;
version = "2.0.0";
hash = "sha256-5rCAcOXWQ6g2iK1d5wy/a/DZQC2xwwdpI1SscDX98C8=";
vendorHash = "sha256-3/H7QgVOHtaUs6BOF7ATVgrA0cfNBbm940Axrvq2bKU=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
'';
__structuredAttrs = true;
};
nomad_1_11 = generic {
buildGoModule = buildGo125Module;
version = "1.11.3";
+4 -2
View File
@@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "account-utils";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "thkukuk";
repo = "account-utils";
tag = "v${finalAttrs.version}";
hash = "sha256-9l+y7FLb0IZXXp4RstlhNR6yA7b4b831obFuiVtO9+k=";
hash = "sha256-F0jM7qEpUjDjf0FTMfTNbD3WDoBShE0SyhDKzgI2K0k=";
};
__structuredAttrs = true;
@@ -54,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "c_args" "-ffat-lto-objects")
];
doCheck = true;
passthru.tests = {
inherit (nixosTests) login-nosuid;
};
+2 -2
View File
@@ -9,12 +9,12 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "afew";
version = "4.0.1";
version = "4.0.2";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-LPKSD4aMAREtf5Y4A9oa6Sh5lv/uuLpamcP35SBgA/M=";
hash = "sha256-gsfqyoVD6CXXd14MiyA5nq0e7wE6yymW9Ssmxpu6+E4=";
};
build-system = [
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "anda";
version = "0.7.3";
version = "0.7.8";
src = fetchFromGitHub {
owner = "FyraLabs";
repo = "anda";
tag = finalAttrs.version;
hash = "sha256-2I+4n/RWC8hqztjiKjqJadaajTaiwFrqGDL7166Gvso=";
hash = "sha256-/1N3ivvnlSBK9qYOAiH96tE/k+S3+EBfsycN2QV8o70=";
};
cargoHash = "sha256-v0HnWbLq8zwJZr0uNVj/1c5fg6b//X1szm6eel/8Ls8=";
cargoHash = "sha256-keS3z1Kyx6TKObAneQ/+qCp/1ueYQOdepdnAPiJs9qI=";
__structuredAttrs = true;
@@ -0,0 +1,18 @@
{
"version": "2.1.1",
"vscodeVersion": "1.107.0",
"sources": {
"x86_64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-x64/Antigravity%20IDE.tar.gz",
"sha256": "5b2cebf7d33a68d003fd8f1fa988d1600905ace22504a085e5384214290878bd"
},
"aarch64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-arm/Antigravity%20IDE.tar.gz",
"sha256": "c6b6fef97cfc078ae7f92d02f9483a12437b6602c7d322a7d445668c2f0c16a6"
},
"aarch64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/darwin-arm/Antigravity%20IDE.zip",
"sha256": "3491f5bc9faad111e5be6d9126bf5d566a0c591bd159a61ef0dcdd30c58672aa"
}
}
}
@@ -14,22 +14,22 @@ let
information = (lib.importJSON ./information.json);
source =
information.sources."${hostPlatform.system}"
or (throw "antigravity: unsupported system ${hostPlatform.system}");
or (throw "antigravity-ide: unsupported system ${hostPlatform.system}");
in
buildVscode {
inherit commandLineArgs useVSCodeRipgrep;
inherit (information) version vscodeVersion;
pname = "antigravity";
pname = "antigravity-ide";
executableName = "antigravity";
longName = "Antigravity";
shortName = "Antigravity";
libraryName = "antigravity";
iconName = "antigravity";
executableName = "antigravity-ide";
longName = "Antigravity IDE";
shortName = "Antigravity IDE";
libraryName = "antigravity-ide";
iconName = "antigravity-ide";
src = fetchurl { inherit (source) url sha256; };
sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity";
sourceRoot = if hostPlatform.isDarwin then "Antigravity IDE.app" else "Antigravity IDE";
tests = { };
updateScript = ./update.js;
@@ -44,7 +44,7 @@ buildVscode {
extraBuildCommands = (args.extraBuildCommands or "") + ''
mkdir -p "$out/opt/google/chrome"
'';
runScript = writeShellScript "antigravity-wrapper" ''
runScript = writeShellScript "antigravity-ide-wrapper" ''
for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
if target=$(command -v "$candidate"); then
${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
@@ -56,10 +56,10 @@ buildVscode {
};
meta = {
mainProgram = "antigravity";
mainProgram = "antigravity-ide";
description = "Agentic development platform, evolving the IDE into the agent-first era";
homepage = "https://antigravity.google";
downloadPage = "https://antigravity.google/download";
homepage = "https://antigravity.google/product/antigravity-ide";
downloadPage = "https://antigravity.google/download#antigravity-ide";
changelog = "https://antigravity.google/changelog";
license = lib.licenses.unfree;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
@@ -71,6 +71,7 @@ buildVscode {
maintainers = with lib.maintainers; [
xiaoxiangmoe
Zaczero
schembriaiden
];
};
}
@@ -20,14 +20,15 @@ let version = "";
let vscodeVersion = "";
async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) {
/** @type {UpdateInfo} */
const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json();
const latestInfo = await (await fetch(`https://antigravity-ide-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json();
const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily.
assert(newVersion !== "", `Could not parse Antigravity IDE version from ${latestInfo.url}`);
assert(version === '' || version === newVersion, `Version mismatch: ${version}(linux-x64) != ${newVersion}(${targetSystem})`);
version = newVersion;
assert(vscodeVersion === '' || vscodeVersion === latestInfo.productVersion, `VSCode version mismatch: ${vscodeVersion}(linux-x64) != ${latestInfo.productVersion}(${targetSystem})`);
vscodeVersion = latestInfo.productVersion;
return {
url: latestInfo.url,
url: latestInfo.url.replaceAll(" ", "%20"),
sha256: latestInfo.sha256hash,
};
}
@@ -40,4 +41,4 @@ const sources = {
/** @type {Information} */
const information = { version, vscodeVersion, sources };
fs.writeFileSync(path.join(import.meta.dirname, "./information.json"), JSON.stringify(information, null, 2) + "\n", "utf-8");
console.log(`[update] Updating Antigravity complete, version: ${version}, vscodeVersion: ${vscodeVersion}`);
console.log(`[update] Updating Antigravity IDE complete, version: ${version}, vscodeVersion: ${vscodeVersion}`);
@@ -1,18 +0,0 @@
{
"version": "1.23.2",
"vscodeVersion": "1.107.0",
"sources": {
"x86_64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz",
"sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725"
},
"aarch64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz",
"sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1"
},
"aarch64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip",
"sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8"
}
}
}
+24 -8
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
runCommand,
fetchurl,
appimageTools,
@@ -12,10 +13,22 @@
let
pname = "beeper";
version = "4.2.985";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM=";
inherit (stdenv.hostPlatform) system;
sources = {
x86_64-linux = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM=";
};
aarch64-linux = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-arm64.AppImage";
hash = "sha256-rY302fiRG2c6dwZ+a8e43DjDUklfR0j78XTixhPkvwY=";
};
};
src = sources.${system} or (throw "beeper is not supported on ${system}");
# Beeper 4.2.985+ ships AppImages without the type-2 magic bytes
# (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires.
linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } ''
@@ -23,6 +36,7 @@ let
chmod +w $out
printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none
'';
appimageContents = appimageTools.extract {
inherit pname version;
src = linuxSrc;
@@ -67,6 +81,7 @@ appimageTools.wrapAppImage {
'';
passthru = {
inherit sources;
updateScript = lib.getExe (writeShellApplication {
name = "update-beeper";
runtimeInputs = [
@@ -77,12 +92,11 @@ appimageTools.wrapAppImage {
set -o errexit
latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)"
version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
update-source-version beeper "$version"
for platform in ${lib.escapeShellArgs (lib.attrNames sources)}; do
update-source-version beeper "$version" --ignore-same-version --source-key="passthru.sources.$platform"
done
'';
});
# needed for nix-update
inherit src;
};
meta = {
@@ -99,6 +113,8 @@ appimageTools.wrapAppImage {
zh4ngx
aspauldingcode
];
platforms = [ "x86_64-linux" ];
platforms = lib.attrNames sources;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "beeper";
};
}
+3 -3
View File
@@ -16,16 +16,16 @@ let
in
buildGoModule (finalAttrs: {
pname = "centrifugo";
version = "6.6.2";
version = "6.9.1";
src = fetchFromGitHub {
owner = "centrifugal";
repo = "centrifugo";
rev = "v${finalAttrs.version}";
hash = "sha256-V67riIkwBKz4YvCo6PJS3jrVl3Q6DE9ewEzzHPi7YFE=";
hash = "sha256-j5ezw4LOwNK61fk71XFfUtqyXwUyX5QwHPvbH4sOtjE=";
};
vendorHash = "sha256-K/90YrXkwiDt9Zm6h5nVo34WjtQQKBCNigJguwAdW5E=";
vendorHash = "sha256-hmAZ5fo9Hko2w+xwessHGTXlifHDGGAHmtehP1CVdkE=";
ldflags = [
"-s"
+38
View File
@@ -0,0 +1,38 @@
{
lib,
php,
fetchFromGitHub,
}:
php.buildComposerProject2 (finalAttrs: {
pname = "civicrm-core";
version = "6.15.3";
__structuredAttrs = true;
strictDeps = true;
dontUnpack = false;
src = fetchFromGitHub {
owner = "civicrm";
repo = "civicrm-core";
tag = finalAttrs.version;
hash = "sha256-BKiV2dZSFo5asnTwtnNsJrZKjFd9Ar3a3kaIlpuGDp8=";
};
vendorHash = "sha256-z4DyAupfGNxhEuGShZQA8bl6041od0Kx0/BAoz9uc5I=";
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -R . $out/
cp $out/bin/setup.conf.txt $out/bin/setup.conf
runHook postInstall
'';
meta = {
homepage = "https://civicrm.org/";
changelog = "https://download.civicrm.org/release/${finalAttrs.version}";
description = "Standalone version of CiviCRM, a CRM software for non-profit organizations";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sorooris ];
mainProgram = "civicrm";
};
})
+4 -4
View File
@@ -13,17 +13,17 @@
let
pname = "clash-verge-rev";
# Please keep service version in sync
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-rev";
tag = "v${version}";
hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y=";
hash = "sha256-5Txjuzq91D+FfBHaXenES4eprIdIKHUFMOKtrHSdbw4=";
};
pnpm-hash = "sha256-Z0ToQUPyttebDOjpdisAtjIKM026x9ZtIVPOeq4163A=";
vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA=";
pnpm-hash = "sha256-AS07hD3QqPJDLLUvNgArtXpH54ek14PmEjevP1WxTHs=";
vendor-hash = "sha256-GPqgzOLFPAb8SNgE3vI5Ypx+zJvk+5TgkttRVktxttU=";
service = callPackage ./service.nix {
inherit
@@ -1,26 +1,65 @@
diff --git a/src/core/server.rs b/src/core/server.rs
index 45570ea..d459b3e 100644
index 0098b20..db189e2 100644
--- a/src/core/server.rs
+++ b/src/core/server.rs
@@ -123,7 +123,7 @@ async fn make_ipc_dir() -> Result<()> {
// on macOS or the primary group on Linux) to manage the socket's lifecycle. This prevents
// permission denied errors when the GUI process, running with non-root privileges,
// attempts to recreate the socket during service initialization or sidecar fallbacks.
- fs::set_permissions(dir_path, Permissions::from_mode(0o2770)).await?;
+ fs::set_permissions(dir_path, Permissions::from_mode(0o770)).await?;
@@ -73,7 +73,7 @@ pub async fn run_ipc_server() -> Result<JoinHandle<Result<()>>> {
tokio::time::sleep(std::time::Duration::from_millis(25)).await;
}
if socket_ready {
- fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o777)).await?;
+ fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o660)).await?;
} else {
warn!(
"IPC socket {:?} did not appear before permission update timeout",
@@ -298,19 +298,9 @@ fn ensure_ipc_dir(dir: &std::path::Path) -> std::io::Result<()> {
return Err(std::io::Error::last_os_error());
}
#[cfg(windows)]
{
- let gid = resolve_ipc_dir_gid();
- // 以 root 运行(生产/launchd)时强制属主为 root:若攻击者预置 `/tmp/verge` 为其拥有的
- // 真实目录,必须夺回属主,否则其以 owner 身份保留对目录(及内部 socket)的管理权。
- // 非 root(测试/开发)既无权设 root 属主也无攻击面,跳过 chown,仅设权限位。
- // chown/chmod 失败即 fatal;`&&`/`||` 短路使 `last_os_error()` 为失败 syscall 的 errno。
- let chown_ok =
- unsafe { platform_lib::geteuid() } != 0 || unsafe { platform_lib::fchown(fd, 0, gid) } == 0;
- let ok = chown_ok && unsafe { platform_lib::fchmod(fd, 0o2770 as platform_lib::mode_t) } == 0;
- let result = if ok {
- Ok(())
- } else {
- Err(std::io::Error::last_os_error())
- };
+ // The NixOS module's RuntimeDirectory owns the directory access policy.
+ // Opening it with O_NOFOLLOW above still validates that it is not a symlink.
+ let result: std::io::Result<()> = Ok(());
unsafe {
platform_lib::close(fd);
}
@@ -414,14 +404,9 @@ pub fn spawn_socket_dir_watchdog() {
continue;
}
- // 目录已存在:组属可能过期(开机落 staff、之后控制台用户主组不同),或被替换为
- // symlink/文件。用 lstat(no-follow)判断,必要时经 ensure_ipc_dir 安全收敛
- // (issue #7333 开机竞态尾部 + /tmp symlink 防护)。一致则跳过,避免抖动。
- use std::os::unix::fs::MetadataExt;
- let needs_fix = match std::fs::symlink_metadata(dir) {
- Ok(meta) if meta.file_type().is_dir() => meta.gid() != resolve_ipc_dir_gid(),
- _ => true,
- };
+ // RuntimeDirectory owns group and mode; only reject a replaced path.
+ let needs_fix =
+ !matches!(std::fs::symlink_metadata(dir), Ok(meta) if meta.file_type().is_dir());
if needs_fix && let Err(e) = ensure_ipc_dir(dir) {
warn!("Failed to re-apply ownership on {:?}: {}", dir, e);
}
diff --git a/src/lib.rs b/src/lib.rs
index a21f89b..81175fc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@ pub use core::{run_ipc_server, stop_ipc_server};
pub use client::*;
@@ -24,6 +24,6 @@ pub use client::*;
#[cfg(all(unix, not(feature = "test")))]
-pub static IPC_PATH: &str = "/tmp/verge/clash-verge-service.sock";
+pub static IPC_PATH: &str = "/run/clash-verge-rev/service.sock";
#[cfg(all(windows, not(feature = "test")))]
pub static IPC_PATH: &str = r"\\.\pipe\clash-verge-service";
+7 -9
View File
@@ -7,25 +7,23 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "clash-verge-service-ipc";
version = "2.3.0";
version = "2.3.3";
src = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-service-ipc";
# upstream uses branch
rev = "21e661fa141e5ad3c705ee4cdb86efff8df6f769";
hash = "sha256-XavlZWxuZKCTyIYpuXRvXpXCdakWhbLhOMmOrGBgDRo=";
tag = "v${finalAttrs.version}";
hash = "sha256-/kr0C+4bhal7DqKudtZvhPYUyn6xbxQw57g6ieJV64w=";
};
patches = [
# 1. Don't SetGID because the path is managed by systemd in NixOS, and we
# use different IPC path for sidecar mode. We can keep RestrictSUIDSGID
# in systemd serviceConfig.
# 2. Set IPC socket path
# Let the NixOS module's RuntimeDirectory/Group own socket access policy.
# Upstream defaults target installer-managed /tmp paths and broad fallback
# permissions, which do not fit the hardened systemd service.
./patch-service-directory.patch
];
cargoHash = "sha256-WhH2o5wN5vYW8jZl+hWbnk1xqHu61ibAr4+/CI3YKHg=";
cargoHash = "sha256-2/lFfhP2414iiH+zG2TvNy6uaCzDldoo7sIfhKrQaFg=";
buildFeatures = [
"standalone"
@@ -13,7 +13,7 @@
moreutils,
nodejs,
pkg-config,
pnpm_10,
pnpm_11,
fetchPnpmDeps,
pnpmConfigHook,
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
version
src
;
pnpm = pnpm_10;
pnpm = pnpm_11;
fetcherVersion = 4;
hash = pnpm-hash;
};
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
nodejs
pkg-config
pnpmConfigHook
pnpm_10
pnpm_11
];
buildInputs = [
+21 -20
View File
@@ -1,47 +1,47 @@
{
"version": "2.1.215",
"commit": "316ce99628e89900bf0b1328fed3b8fec0c0c92d",
"buildDate": "2026-07-19T00:11:19Z",
"version": "2.1.216",
"commit": "7fead72f57c595d5a353a2e477bd2608d27ddcc6",
"buildDate": "2026-07-20T18:40:59Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "90608b5c5ab504e96e77365cea6203d046e291d59b2bb42cf28dcb2ccdf9dd58",
"size": 247124336
"checksum": "d01b49210d72ecbe277a2665d104bacccddf2d22185be99446d2929e0edfc48d",
"size": 249225584
},
"darwin-x64": {
"binary": "claude",
"checksum": "1ef5f5e56ede9f7765a9bef654ece6045dba58f48b7f5b699765375953d52b6b",
"size": 256540048
"checksum": "e17cdc51437bd7a80ce0244d25045f568d67b212eea4ff81b83ee90f8666e42f",
"size": 258670096
},
"linux-arm64": {
"binary": "claude",
"checksum": "2b43a3d5b0787217e5d7381fad42c7314292546fe9db9eb8b9b379de90509b30",
"size": 262060960
"checksum": "9e3a6aecc5164f607e1183aea2092c7d7705d146e504a6207df291776996a8ea",
"size": 264158112
},
"linux-x64": {
"binary": "claude",
"checksum": "c1efffaaf370aa187cb6a09dd93d4e511c646899b0078476f83791b664bde7fe",
"size": 265239536
"checksum": "74deca45220b8080ec75ab099bd5a5980e41a2b5879846a008fb115d436de085",
"size": 267353072
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "95f1bb89dd94ae099c7b5e53832f99624fdf82da8e0f11d81e1632b26e61973e",
"size": 255309160
"checksum": "70b5dcf81bd13212ab26ec9427fa87527cd44ceb3a2a21ac04308d0f1a418a52",
"size": 257406312
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "3a14b862d102d0b6b88650a00b8489b1dfec7f84b367f8192ee62c8bdaeb9220",
"size": 259863120
"checksum": "54ac63736128b3aa9a73e2d9ba1f35177eb69d7b97d975f63a36d33fe0666652",
"size": 261976656
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "f14452d1e199273795f2920c00fd7a7f818178ddf1f3efb4d005a7e3d4ec4eff",
"size": 256247968
"checksum": "902215367918866f3c36564e115bd5636d60178acf28181713d449275b833540",
"size": 258288288
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "0e976441467cb09e35b52c83e661ce8e148c5a8766e0899a4255d95c4b8110f6",
"size": 250623648
"checksum": "850ba4969ca49964b418863648131f65f76107be36d6719ff0aaaf3dfc9a422e",
"size": 252663968
}
},
"sdkCompat": {
@@ -66,7 +66,8 @@
"0.3.205",
"0.3.207",
"0.3.208",
"0.3.209"
"0.3.209",
"0.3.215"
],
"harnessSchema": 1
}
@@ -0,0 +1,111 @@
--- a/scripts/codegen.dart
+++ b/scripts/codegen.dart
@@ -2,38 +2,7 @@
import 'dart:io';
-Future<ProcessResult> getDependencies() async {
- var process = Process.runSync(
- "flutter",
- [
- "pub",
- "get",
- ],
- runInShell: true,
- );
-
- print(process.stdout);
- print(process.stderr);
- return process;
-}
-
-Future<ProcessResult> intlUtilsGenerate() async {
- var process = await Process.run(
- "flutter",
- [
- "pub",
- "run",
- "intl_utils:generate",
- ],
- runInShell: true,
- );
-
- print(process.stdout);
- print(process.stderr);
- return process;
-}
-
-Future<List<File>> generateFileLists() async {
+void main() async {
var dir = Directory("lib/generated/l10n");
if (!dir.existsSync()) {
dir.create(recursive: true);
@@ -82,68 +51,4 @@
await arbFile.create(recursive: true);
arbFile.writeAsStringSync(fileList);
-
- return [sourcesFile, arbFile];
-}
-
-Future<ProcessResult> generateFromArb(List<File> files) async {
- var process = await Process.run(
- "flutter",
- [
- "pub",
- "run",
- "intl_translation:generate_from_arb",
- "--sources-list-file",
- files[0].absolute.path,
- "--translations-list-file",
- files[1].absolute.path,
- "--output-dir=lib/generated/l10n"
- ],
- runInShell: true,
- );
-
- print(process.stdout);
- print(process.stderr);
- return process;
-}
-
-Future<ProcessResult> buildRunner() async {
- var process = await Process.run(
- "flutter",
- [
- "pub",
- "run",
- "build_runner",
- "build",
- "--delete-conflicting-outputs",
- ],
- runInShell: true,
- );
-
- print(process.stdout);
- print(process.stderr);
- return process;
-}
-
-void main() async {
- var result = await getDependencies();
- if (result.exitCode != 0) {
- exit(result.exitCode);
- }
-
- result = await intlUtilsGenerate();
- if (result.exitCode != 0) {
- exit(result.exitCode);
- }
-
- var files = await generateFileLists();
- result = await generateFromArb(files);
- if (result.exitCode != 0) {
- exit(result.exitCode);
- }
-
- result = await buildRunner();
- if (result.exitCode != 0) {
- exit(result.exitCode);
- }
}
+164
View File
@@ -0,0 +1,164 @@
{
lib,
flutter341,
stdenv,
fetchFromGitHub,
fetchzip,
webkitgtk_4_1,
mimalloc,
keybinder3,
mpv-unwrapped,
libdovi,
libdvdcss,
libunwind,
libgbm,
libdrm,
}:
let
libwebrtcRpath = lib.makeLibraryPath [
libgbm
libdrm
];
libwebrtc = fetchzip {
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.2.0/libwebrtc.zip";
hash = "sha256-i4LRG44f//SDIOl072yZavkYoTZdiydPZndeOm6/fBM=";
};
in
flutter341.buildFlutterApplication (finalAttrs: {
pname = "commet-chat";
version = "0.4.2+hotfix.2";
src = fetchFromGitHub {
owner = "commetchat";
repo = "commet";
tag = "v${finalAttrs.version}";
hash = "sha256-Pf+JeVuTPxpufcx/whn8RVcYp1e69CJBFzyZaQ8I5RQ=";
fetchSubmodules = true;
leaveDotGit = true;
# For the git hash property in about page
postFetch = ''
cd $out
git rev-parse HEAD | head -c 7 > $out/GIT_HASH
find $out -name .git -print0 | xargs -0 rm -rf
'';
};
strictDeps = true;
sourceRoot = "${finalAttrs.src.name}/commet";
pubspecLockFilePath = "../pubspec.lock";
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
calendar_view = "sha256-tGAMK89VsgqfKQy+t8x5zl6dbQEf5h4HxSUR8crB1oM=";
desktop_webview_window = "sha256-EOh5QoOuAxiYn0IcdxY7taN2Twu8GshY9zAoGCztPnA=";
dynamic_color = "sha256-4zSTiXplkBjtPtzssj3VaHTVo9YlYKNTMLgBIM5MMe4=";
flutter_highlighter = "sha256-Y84Besir3gu1RnQt9YoE0GyIJLLZ6H0Kki/Wf6z6QMg=";
flutter_html = "sha256-576KYoYB4sZeavcAS8V5rjDG9hezYlN2Q4zlyvBOouw=";
flutter_local_notifications = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw=";
flutter_local_notifications_linux = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw=";
markdown = "sha256-2rEMNJM9Vy7LrFLt30/Z3pyqERTYJei9D3mgOAAvVPg=";
matrix = "sha256-PB7xjulxmV2jE0WGVG116T50BrT3G5LsdLreR1cJTPI=";
matrix_dart_sdk_drift_db = "sha256-2sSN2TcPAPVdEm3NXpZyWlPvArNn2CWnPph5Vz48KQ8=";
receive_intent = "sha256-wGIOZRH4O3a44I8zG5Q1hCwn4SMuTWB7i9wtGSLZWeQ=";
signal_sticker_api = "sha256-VdEE3Bt8gpfUpxxYSz5319YEL49Eh+loO+ZipI1DoyA=";
starfield = "sha256-ebVRyVkyLfHCC6EBmx5evXL1U71S3tgCMo1yLWlIcw4=";
launcher_entry = "sha256-T/zQRvY6jOKroMrhVwBtsoSm2xCFjOd5jsJC0PA4cpc=";
};
buildInputs = [
webkitgtk_4_1
mimalloc
keybinder3
mpv-unwrapped
libdovi
libdvdcss
libunwind
]
++ mpv-unwrapped.buildInputs;
env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
env.COMMET_PROD = 1;
targetFlutterPlatform = "linux";
customSourceBuilders = {
flutter_webrtc =
{ version, src, ... }:
stdenv.mkDerivation {
pname = "flutter_webrtc";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace third_party/CMakeLists.txt \
--replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc}
ln -s ${libwebrtc} third_party/libwebrtc
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
};
# The original codegen.dart hardcodes flutter calls inside, so the patch basically rewrites the codegen script forcing nix.
patches = [
./fix-hardcoded-flutter-cmd.patch
];
flutterBuildFlags = [
"--dart-define=BUILD_MODE=release"
"--dart-define=PLATFORM=linux"
"--dart-define=VERSION_TAG=v${finalAttrs.version}"
"--dart-define=BUILD_DETAIL=${stdenv.hostPlatform.system}"
];
preBuild = ''
export flutterBuildFlags="$flutterBuildFlags --dart-define=GIT_HASH=$(cat ../GIT_HASH)"
packageRun intl_utils -e generate
dart run --packages=.dart_tool/package_config.json scripts/codegen.dart
packageRun intl_translation -e generate_from_arb \
--sources-list-file /build/source/commet/lib/generated/l10n/sources_list_file.txt \
--translations-list-file /build/source/commet/lib/generated/l10n/arb_list_file.txt \
--output-dir=lib/generated/l10n
packageRun build_runner build --delete-conflicting-outputs
'';
extraWrapProgramArgs = "--suffix LD_LIBRARY_PATH : $out/app/commet-chat/lib";
postInstall = ''
mkdir -p $out/share/applications
install -Dm644 \
linux/debian/usr/share/applications/chat.commet.commetapp.desktop \
$out/share/applications/
substituteInPlace $out/share/applications/chat.commet.commetapp.desktop \
--replace-fail "/usr/lib/chat.commet.commetapp/commet" "commet"
mkdir -p $out/share/icons
cp -r linux/debian/usr/share/icons/hicolor $out/share/icons/hicolor
patchelf --add-rpath ${libwebrtcRpath} $out/app/commet-chat/lib/libwebrtc.so
'';
__structuredAttrs = true;
meta = {
homepage = "https://commet.chat";
description = "Client for Matrix focused on providing a feature rich experience while maintaining a simple interface";
platforms = lib.platforms.linux;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ ckgxrg ];
mainProgram = "commet";
};
})
File diff suppressed because it is too large Load Diff
+35
View File
@@ -0,0 +1,35 @@
{
lib,
php,
fetchFromGitHub,
}:
php.buildComposerProject2 (finalAttrs: {
pname = "cv";
version = "0.3.71";
__structuredAttrs = true;
strictDeps = true;
dontUnpack = false;
src = fetchFromGitHub {
owner = "civicrm";
repo = "cv";
rev = "v${finalAttrs.version}";
hash = "sha256-1InNm8ayshrACLUJ4MXb6DTnD9vxRVtwnK9oFAxMMho=";
};
vendorHash = "sha256-7+roKbgbSx00CrHDOwp7yxcSTdq9YDNgTLIdjLT05oM=";
installPhase = ''
runHook preInstall
cp -ra $src $out
runHook postInstall
'';
meta = {
homepage = "https://civicrm.org/";
changelog = "https://github.com/civicrm/cv/releases/tag/v${finalAttrs.version}";
description = "CiviCRM CLI Utility";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sorooris ];
};
})
+27 -757
View File
@@ -16,84 +16,59 @@
},
{
"pname": "CycloneDX.Core",
"version": "11.0.0",
"hash": "sha256-i1H/+oH4yljhvXg0PnM87F9qu2RtvPco7adZ2uxzOpY="
"version": "12.1.1",
"hash": "sha256-iqWYbdfxr1wphhEAtj0ucYCs2+7tzC0HaxCosS+X1nk="
},
{
"pname": "CycloneDX.Spdx",
"version": "11.0.0",
"hash": "sha256-JOY+PjDApeXdJlCXhcr91lUiC6DOQEcjoYuQbBaaiog="
"version": "12.1.1",
"hash": "sha256-BtFGUSrSVPaq0iPXqsOhgiq7Dpw5hnt9EfPqvA5oVwk="
},
{
"pname": "CycloneDX.Spdx.Interop",
"version": "11.0.0",
"hash": "sha256-N682Lern6x18EJlRuJDR+T7/n5+2DWXp4Kz1MNuGqEM="
"version": "12.1.1",
"hash": "sha256-m8RhgvjPcLSlBzVUQbm1s1+gZ8/RKVwxX8y6h9W12t8="
},
{
"pname": "CycloneDX.Utils",
"version": "11.0.0",
"hash": "sha256-3rBD3lAzQiv0TghEbfxCVUQoWNOX8tzFew7V0s4NRpE="
"version": "12.1.1",
"hash": "sha256-TmpfTkh0INlWIH7/HH6S9JgEyFNRvpzzYVuUhNFLVtA="
},
{
"pname": "JetBrains.Annotations",
"version": "2021.2.0",
"hash": "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08="
"pname": "Humanizer.Core",
"version": "3.0.1",
"hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww="
},
{
"pname": "Json.More.Net",
"version": "1.9.0",
"hash": "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk="
"version": "3.0.0",
"hash": "sha256-zlJb9Wi9ErFqN8FYphzog9paPxI3DBVnoTL0c12Bfks="
},
{
"pname": "JsonPointer.Net",
"version": "3.0.3",
"hash": "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY="
"version": "7.0.0",
"hash": "sha256-/1GemlLhmYnz/HDQTpEEaGxaofoFkFUMNNPInKhAvM4="
},
{
"pname": "JsonSchema.Net",
"version": "5.3.1",
"hash": "sha256-Cs1sh2mPN/pRO5m+5rnrBRoNhdxNoi6p0e9RmeJNQx4="
"version": "9.1.1",
"hash": "sha256-NiVzn+SF3oe/ucKetzKC527ec5I9rq2BdBg0J0fbZPo="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.3.2",
"hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg="
},
{
"pname": "Microsoft.CSharp",
"version": "4.0.1",
"hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
},
{
"pname": "Microsoft.NET.Test.Sdk",
"version": "17.3.2",
"hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.0.1",
"hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.0.1",
"hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.3.2",
@@ -104,11 +79,6 @@
"version": "17.3.2",
"hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.3.0",
"hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
},
{
"pname": "NETStandard.Library",
"version": "1.6.1",
@@ -116,13 +86,8 @@
},
{
"pname": "Newtonsoft.Json",
"version": "12.0.3",
"hash": "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50="
},
{
"pname": "Newtonsoft.Json",
"version": "9.0.1",
"hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "NuGet.Frameworks",
@@ -131,218 +96,13 @@
},
{
"pname": "protobuf-net",
"version": "3.2.45",
"hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="
"version": "3.2.56",
"hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.45",
"hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Diagnostics.Tools",
"version": "4.3.0",
"hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
},
{
"pname": "runtime.any.System.Diagnostics.Tracing",
"version": "4.3.0",
"hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
"hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
},
{
"pname": "runtime.any.System.Globalization.Calendars",
"version": "4.3.0",
"hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
},
{
"pname": "runtime.any.System.IO",
"version": "4.3.0",
"hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
},
{
"pname": "runtime.any.System.Reflection",
"version": "4.3.0",
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
},
{
"pname": "runtime.any.System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
},
{
"pname": "runtime.any.System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
},
{
"pname": "runtime.any.System.Text.Encoding.Extensions",
"version": "4.3.0",
"hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
},
{
"pname": "runtime.any.System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
},
{
"pname": "runtime.any.System.Threading.Timer",
"version": "4.3.0",
"hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
"hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.3.0",
"hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.unix.Microsoft.Win32.Primitives",
"version": "4.3.0",
"hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
},
{
"pname": "runtime.unix.System.Console",
"version": "4.3.0",
"hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
},
{
"pname": "runtime.unix.System.IO.FileSystem",
"version": "4.3.0",
"hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
},
{
"pname": "runtime.unix.System.Net.Primitives",
"version": "4.3.0",
"hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
},
{
"pname": "runtime.unix.System.Net.Sockets",
"version": "4.3.0",
"hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
},
{
"pname": "runtime.unix.System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
"version": "3.2.56",
"hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc="
},
{
"pname": "Snapshooter",
@@ -354,36 +114,6 @@
"version": "0.7.1",
"hash": "sha256-fWVTjDrYHOQj2a1F0gynlKgGPhmjj3RWkvI4Za0xG/w="
},
{
"pname": "System.AppContext",
"version": "4.3.0",
"hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
},
{
"pname": "System.Buffers",
"version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
{
"pname": "System.Collections",
"version": "4.0.11",
"hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
},
{
"pname": "System.Collections",
"version": "4.3.0",
"hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
},
{
"pname": "System.Collections.Concurrent",
"version": "4.3.0",
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
},
{
"pname": "System.Collections.Immutable",
"version": "7.0.0",
"hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
},
{
"pname": "System.CommandLine",
"version": "2.0.0-beta4.22272.1",
@@ -394,485 +124,25 @@
"version": "2.0.0-beta4.22272.1",
"hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4="
},
{
"pname": "System.Console",
"version": "4.3.0",
"hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.0.11",
"hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.3.0",
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.0.1",
"hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
"hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
},
{
"pname": "System.Diagnostics.Tracing",
"version": "4.3.0",
"hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
},
{
"pname": "System.Dynamic.Runtime",
"version": "4.0.11",
"hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
},
{
"pname": "System.Formats.Asn1",
"version": "6.0.0",
"hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
},
{
"pname": "System.Globalization",
"version": "4.0.11",
"hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
"hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
},
{
"pname": "System.Globalization.Calendars",
"version": "4.3.0",
"hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.3.0",
"hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
},
{
"pname": "System.IO",
"version": "4.1.0",
"hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
},
{
"pname": "System.IO",
"version": "4.3.0",
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
},
{
"pname": "System.IO.Abstractions",
"version": "13.2.47",
"hash": "sha256-pOzzQDwdHzoTSqycKTTmCh2kR3X6YDFUiszMlDob7mg="
},
{
"pname": "System.IO.Compression",
"version": "4.3.0",
"hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
},
{
"pname": "System.IO.Compression.ZipFile",
"version": "4.3.0",
"hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
},
{
"pname": "System.IO.FileSystem",
"version": "4.0.1",
"hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
},
{
"pname": "System.IO.FileSystem",
"version": "4.3.0",
"hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
},
{
"pname": "System.IO.FileSystem.AccessControl",
"version": "5.0.0",
"hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.0.1",
"hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
"hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
},
{
"pname": "System.Linq",
"version": "4.1.0",
"hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
},
{
"pname": "System.Linq",
"version": "4.3.0",
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Linq.Expressions",
"version": "4.1.0",
"hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
},
{
"pname": "System.Linq.Expressions",
"version": "4.3.0",
"hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
},
{
"pname": "System.Net.Http",
"version": "4.3.0",
"hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
},
{
"pname": "System.Net.NameResolution",
"version": "4.3.0",
"hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
},
{
"pname": "System.Net.Primitives",
"version": "4.3.0",
"hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
},
{
"pname": "System.Net.Sockets",
"version": "4.3.0",
"hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
},
{
"pname": "System.ObjectModel",
"version": "4.0.12",
"hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
"hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Reflection",
"version": "4.1.0",
"hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Emit",
"version": "4.0.1",
"hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
},
{
"pname": "System.Reflection.Emit",
"version": "4.3.0",
"hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.0.1",
"hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.3.0",
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.0.1",
"hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.3.0",
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.0.1",
"hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.6.0",
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.0.1",
"hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.1.0",
"hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.3.0",
"hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.0.1",
"hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.1.0",
"hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.1.0",
"hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.0.1",
"hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.1.0",
"hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.3.0",
"hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.3.0",
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Runtime.Serialization.Primitives",
"version": "4.1.1",
"hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
},
{
"pname": "System.Security.AccessControl",
"version": "6.0.0",
"hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
},
{
"pname": "System.Security.Claims",
"version": "4.3.0",
"hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.3.0",
"hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.3.0",
"hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.3.0",
"hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
},
{
"pname": "System.Security.Cryptography.Encoding",
"version": "4.3.0",
"hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
},
{
"pname": "System.Security.Cryptography.Pkcs",
"version": "6.0.1",
"hash": "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM="
},
{
"pname": "System.Security.Cryptography.Primitives",
"version": "4.3.0",
"hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
},
{
"pname": "System.Security.Cryptography.X509Certificates",
"version": "4.3.0",
"hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
"version": "10.0.6",
"hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA="
},
{
"pname": "System.Security.Cryptography.Xml",
"version": "6.0.1",
"hash": "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU="
},
{
"pname": "System.Security.Principal",
"version": "4.3.0",
"hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.3.0",
"hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Text.Encoding",
"version": "4.0.11",
"hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.0.11",
"hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.Json",
"version": "8.0.5",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.1.0",
"hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
"hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
},
{
"pname": "System.Threading",
"version": "4.0.11",
"hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
},
{
"pname": "System.Threading",
"version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Tasks",
"version": "4.0.11",
"hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.0.0",
"hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.3.0",
"hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
},
{
"pname": "System.Threading.ThreadPool",
"version": "4.3.0",
"hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
},
{
"pname": "System.Threading.Timer",
"version": "4.3.0",
"hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.0.11",
"hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.3.0",
"hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
},
{
"pname": "System.Xml.XDocument",
"version": "4.0.11",
"hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
},
{
"pname": "System.Xml.XDocument",
"version": "4.3.0",
"hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
"version": "10.0.6",
"hash": "sha256-QwcfiHtrRNK5j2vPudws4S0g7I8XYHFstKAI1bOlIFM="
},
{
"pname": "xunit",
+3 -3
View File
@@ -7,16 +7,16 @@
buildDotnetModule rec {
pname = "cyclonedx-cli";
version = "0.30.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-cli";
tag = "v${version}";
hash = "sha256-a9jUJqj/h2u2SrIQkQV8aFSzys+RVEI2yNlHTJpll+M=";
hash = "sha256-XP6Zz9JITIw6xUefOkLLjoHUDsnhsOKdtY5S5xbkejU=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
nugetDeps = ./deps.json;
preFixup = ''
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dump_syms";
version = "2.3.7";
version = "2.3.8";
src = fetchFromGitHub {
owner = "mozilla";
repo = "dump_syms";
rev = "v${finalAttrs.version}";
hash = "sha256-fCplZFp+yONBd2HDDlX/6XcmnQFbsnVmiS5b8fqGOAE=";
hash = "sha256-b+uZC+ss1utfQQOO+P9Nb1KomNcyxwSUcNAzaPh2Bik=";
};
cargoHash = "sha256-guJgkcldcKvi3XWolAqyB5bFzlSMNQQMzri6axGJpLo=";
cargoHash = "sha256-1M5IqcyDrQGhOALTyqSu6ZxZS8YBkxm+K++nOQhOEKI=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "16.0.0";
hash = "sha256-BZawFbrtcxftX4/Yk32aoVRQ6Kg+k1FhN9IoH6dxvVY=";
version = "16.0.1";
hash = "sha256-fMAOmYh21nMyd9b8e6cXlh7ArJtIys3N6sbTJNV1oyw=";
npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g=";
vendorHash = "sha256-cb6f7ZX3pG95EEZotGXn6+YUJN59SFNVHFTejFJ6y28=";
vendorHash = "sha256-elbuQxUtbuDTJV686ZqiFgxWlIYrWDZ4fUet2QY/sJ8=";
lts = false;
nixUpdateExtraArgs = [
"--override-filename"
+2 -2
View File
@@ -82,13 +82,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "frr";
version = "10.6.1";
version = "10.7.0";
src = fetchFromGitHub {
owner = "FRRouting";
repo = "frr";
rev = "frr-${finalAttrs.version}";
hash = "sha256-sSvw9tfVNUyQjEOELoUAIQkEvXg765MsWvVKM0gsYUc=";
hash = "sha256-A98uyOiFH/DvJPMmUvXQ1bG//OCdvuclpHD6xe5BqFU=";
};
# Without the std explicitly set, we may run into abseil-cpp
+3 -3
View File
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
version = "0.37.0";
version = "0.37.1";
pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
tag = "v${finalAttrs.version}";
sha256 = "sha256-fXaOGdwpBbukphNvu9sONTXPAW+zMLv3roJ6j0iLdHQ=";
sha256 = "sha256-LnfJmiV4SJpFBXDAJmwbHKv6RvO40e7/3Lm6Jc6YA40=";
};
cargoHash = "sha256-AZsNtdUbtly1AN4dbBHRdlJCHkfcYjjKw5EzVqHMeYs=";
cargoHash = "sha256-zNwlQ2CsDHQnFog59jKFAxVaNK0/8hUts6NRkFVKCGk=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "git-statuses";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "bircni";
repo = "git-statuses";
tag = finalAttrs.version;
hash = "sha256-p200nv8H/tuO48ZBsTQvM0JBGN4Yu58kXLhYl8AJxfc=";
hash = "sha256-hZ0/lC7Xjv+CDi2uucRa009nTCrKIrBFj3BbZsciJ2o=";
};
cargoHash = "sha256-MJekW/AzVe1dCr5La4+FKBeyGFAjN0fCBUiGnMoAtdI=";
cargoHash = "sha256-RMRATVe6NILxNiNVkcdv5x5BYVL5UUphtrrGRWN18KU=";
# Needed to get openssl-sys to use pkg-config.
env.OPENSSL_NO_VENDOR = 1;
+5 -5
View File
@@ -29,12 +29,12 @@
}:
let
version = "0-unstable-2026-07-09";
rev = "97f8113fe43d41b15ca3a56c300c48b7c8fda5c4";
version = "0-unstable-2026-07-18";
rev = "117da97dd5d6b1e02d7322682669508a4edfde3d";
srcHash = "sha256-EPZzS3sxHYLi2qaRKvJbjUfS0LWaIWwJW/z4op+/uZM=";
shaderHash = "sha256-iwtT43vnhgZZhtvWdTLDL5xZVStkOUb2D832/wjqsUE=";
cargoHash = "sha256-uwLZFB3+jefE3WihUc3ta8L5G1vdmDdhEDVkDOwAveE=";
srcHash = "sha256-FSyu4aBl4gkn+jCMj9qjzNHl29F+Kxk95++H7pQou2Q=";
shaderHash = "sha256-V34/qlVsRcDH8FLpTMlaNeNxQhJI415Fv+xnhhLsi1Q=";
cargoHash = "sha256-lDf6GWGcqQ1JiETJSJ8A7dbgrZ4OEuifH/wIZZ+c/fY=";
npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks=";
brandingRev = "0d004aa61e6b48d316e8e5db6d59ccc4788f192d";
+3 -3
View File
@@ -5,15 +5,15 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hongdown";
version = "0.3.4";
version = "0.5.1";
src = fetchFromGitHub {
owner = "dahlia";
repo = "hongdown";
tag = finalAttrs.version;
hash = "sha256-Bj0ECrYRnXSjgyblocnVjdYipuzbX2+G3KRWZvdR9Rk=";
hash = "sha256-JnfYBPWnZgZ7149yVsabP3n2+GnxR6ZvK0S+4w6x/c4=";
};
cargoHash = "sha256-q84orbkrcKbO5FeI9dk0E92EtE9eQ8n/yGjXzh9MIgg=";
cargoHash = "sha256-Vn5dEaDnZ2FQ6ZlDKbbQ5lUvjyhIuhT2/xEaZ8KWmRA=";
meta = {
description = "Markdown formatter that enforces Hong Minhee's Markdown style conventions";
mainProgram = "hongdown";
+2 -2
View File
@@ -10,14 +10,14 @@
testers,
}:
let
version = "1.36.0";
version = "1.37.0";
websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38";
src = fetchFromGitHub {
owner = "inngest";
repo = "inngest";
tag = "v${version}";
hash = "sha256-KyH9Bj3n7RwARDcb3l5nerYGIIk2mgXPZWLhyNMm+f0=";
hash = "sha256-m9VFmplaMFD3+Z0qioehsuKeJaS6fUSb++liUabDEuM=";
};
website = fetchFromGitHub {
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "jq-lsp";
version = "0.1.17";
version = "0.1.18";
src = fetchFromGitHub {
owner = "wader";
repo = "jq-lsp";
tag = "v${finalAttrs.version}";
hash = "sha256-gHBEAKPjCX25bI/+wyhcqHja5hb4d+GXMD3pVFeqrCc=";
hash = "sha256-C32LxOfqCp6rhHKl1JNKq+KSw+TCN7QF6WDMfwfX4zo=";
};
vendorHash = "sha256-pGXFuyYJPNcMEd0vPrmbdY/CeOF0AXwrNJEfrBBe4I0=";
+9
View File
@@ -2,6 +2,7 @@
lib,
python3Packages,
fetchPypi,
fetchpatch,
}:
python3Packages.buildPythonPackage rec {
@@ -14,6 +15,14 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw=";
};
patches = [
# remove use of pkg_resources (drop on next release)
(fetchpatch {
url = "https://github.com/lesscpy/lesscpy/commit/bd8949579713c9d4ff9e15799a26fcecdf73530e.patch";
hash = "sha256-U1VDqZqHYaUmND5qCkARyU/eDv2QRhGcCDzuN4+XTbo=";
})
];
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
@@ -0,0 +1,5 @@
{ llama-swap }:
llama-swap.override {
withUI = false;
}
+16 -7
View File
@@ -12,6 +12,8 @@
nixosTests,
nix-update-script,
withUI ? true,
}:
let
@@ -19,7 +21,7 @@ let
in
buildGoModule (finalAttrs: {
pname = "llama-swap";
version = "224";
version = "240";
outputs = [
"out"
@@ -30,7 +32,7 @@ buildGoModule (finalAttrs: {
owner = "mostlygeek";
repo = "llama-swap";
tag = "v${finalAttrs.version}";
hash = "sha256-IblAaM9FBdI2Y9rg36SWpclQ0jV6Y93RC+N+cXWEO94=";
hash = "sha256-cvxF4J9Qvi522dBGjaNZvwwY/bV3wXSE0oGFATjzD4U=";
# 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;
@@ -43,7 +45,10 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-b+RreafBMCWT/jbWTlXaiDRzA4DRe76WaCEbrfRxV/4=";
vendorHash = "sha256-jQRnFGqQvk6my7ejnesv1pylCmEXLs9GKbQJEZdsaYg=";
# Upstream only embeds the UI when this build tag is set.
tags = lib.optionals withUI [ "embed_ui" ];
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
@@ -62,7 +67,7 @@ buildGoModule (finalAttrs: {
postPatch = ''
substituteInPlace internal/process/process_command_forking_test.go \
--replace "#!/bin/bash" "#!${lib.getExe bash}"
--replace-fail "#!/bin/bash" "#!${lib.getExe bash}"
'';
preBuild = ''
@@ -70,8 +75,10 @@ buildGoModule (finalAttrs: {
ldflags+=" -X main.commit=$(cat COMMIT)"
ldflags+=" -X main.date=$(cat SOURCE_DATE_EPOCH)"
# copy for go:embed in internal/server/ui_embed.go
cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/
${lib.optionalString withUI ''
# copy for go:embed in internal/server/ui_embed.go
cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/
''}
'';
excludedPackages = [
@@ -88,7 +95,7 @@ buildGoModule (finalAttrs: {
checkFlags =
let
skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [
skippedTests = lib.optionals stdenv.hostPlatform.isDarwin [
# Fail only on *-darwin intermittently
# https://github.com/mostlygeek/llama-swap/issues/320
"TestProcess_AutomaticallyStartsUpstream"
@@ -138,6 +145,8 @@ buildGoModule (finalAttrs: {
];
};
__structuredAttrs = true;
meta = {
homepage = "https://github.com/mostlygeek/llama-swap";
changelog = "https://github.com/mostlygeek/llama-swap/releases/tag/${finalAttrs.src.tag}";
+1 -1
View File
@@ -7,7 +7,7 @@
buildNpmPackage (finalAttrs: {
pname = "${llama-swap.pname}-ui";
inherit (llama-swap) version src;
npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ=";
npmDepsHash = "sha256-cAdFKDhmyaYCoKqSYEuAhu29rBxs7i8uTmU2SHwTLnY=";
postPatch = ''
substituteInPlace vite.config.ts \
+28 -6
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildNpmPackage,
callPackage,
fetchFromGitHub,
@@ -29,6 +30,7 @@ let
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
./remove-rpm-deb-and-macos-package-generation.patch
];
electron = electron_41;
@@ -94,8 +96,7 @@ buildNpmPackage (finalAttrs: {
substituteInPlace app/build/build.js \
--replace-fail "runWriteCommitHashIntoPackage," "" \
--replace-fail "runUpdateSandboxHelperPermissions," "" \
--replace-fail "runCopySymlinkedPackages," "" \
--replace-fail "process.argv.includes('--skip-installers')" "true"
--replace-fail "runCopySymlinkedPackages," ""
# Use npm env vars to make node-gyp compile against the electron ABI
export npm_config_target="${electron.version}"
@@ -124,17 +125,38 @@ buildNpmPackage (finalAttrs: {
installPhase = ''
runHook preInstall
mkdir -p $out/share/mailspring $out/bin
mkdir -p $out/bin
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
ASAR_PATH=$(find app/dist -name "app.asar" -print -quit)
cp -R "$(dirname "$ASAR_PATH")" $out/share/mailspring/resources
mkdir -p $out/share/mailspring
cp -r app/dist/*/resources $out/share/mailspring
install -Dm444 app/dist/Mailspring.desktop $out/share/applications/Mailspring.desktop
install -Dm444 app/dist/mailspring.appdata.xml $out/share/metainfo/mailspring.appdata.xml
for size in 16 32 64 128 256 512; do
install -Dm444 app/build/resources/linux/icons/$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/mailspring.png
done
makeWrapper ${lib.getExe electron} "$out/bin/mailspring" \
--add-flags "$out/share/mailspring/resources/app.asar" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ html-tidy ]}" \
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
--add-flags ${lib.escapeShellArg commandLineArgs}
--add-flags ${lib.escapeShellArg commandLineArgs} \
--inherit-argv0
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r app/dist/*/Mailspring.app $out/Applications
makeWrapper "$out/Applications/Mailspring.app/Contents/MacOS/Mailspring" "$out/bin/mailspring" \
--add-flags ${lib.escapeShellArg commandLineArgs}
''
+ ''
runHook postInstall
'';
@@ -0,0 +1,54 @@
From 420f1f58734dbc7305f46b4d8089b461b79321b0 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Mon, 6 Jul 2026 22:40:30 +0100
Subject: [PATCH] remove rpm, deb and macos package generation
---
app/build/build.js | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/app/build/build.js b/app/build/build.js
index 6d90aa5b2..ffec9cf8b 100644
--- a/app/build/build.js
+++ b/app/build/build.js
@@ -373,12 +373,6 @@ async function createMacZip() {
}
const arch = process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch;
const cwd = path.join(outputDir, `Mailspring-darwin-${arch}`);
- await spawn({
- cmd: 'zip',
- args: ['-9', '-y', '-r', '-9', '-X', zipPath, 'Mailspring.app'],
- opts: { cwd },
- });
- console.log(`>> Created ${zipPath}`);
}
function writeFromTemplate(filePath, data) {
@@ -422,11 +416,6 @@ async function createDebInstaller() {
writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), data);
const icon = path.join(appDir, 'build', 'resources', 'linux', 'icons', '512.png');
- await spawn({
- cmd: path.join(appDir, 'script', 'mkdeb'),
- args: [packageJSON.version, linuxArch, icon, linuxAssetsDir, contentsDir, outputDir],
- });
- console.log(`Created ${outputDir}/mailspring-${packageJSON.version}-${linuxArch}.deb`);
}
async function createRpmInstaller() {
@@ -452,12 +441,6 @@ async function createRpmInstaller() {
writeFromTemplate(path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in'), templateData);
writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), templateData);
writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), templateData);
-
- await spawn({
- cmd: path.join(appDir, 'script', 'mkrpm'),
- args: [outputDir, contentsDir, linuxAssetsDir],
- });
- console.log(`Created rpm package in ${rpmDir}`);
}
async function main() {
--
2.54.0
+2 -2
View File
@@ -97,7 +97,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg_7 ]
);
version = "15.0.18";
version = "15.0.19";
sources = {
x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-hvLft1HDj/5NgAfQb1igYdhJN5H/jZ2+7s/JKKLf4Gs=";
hash = "sha256-9Vbv7A8JarYtT0Ll1bveQmwif7/IViq6geMxMqeF+S4=";
};
};
@@ -50,17 +50,22 @@ stdenv.mkDerivation (finalAttrs: {
qtWrapperArgs = [
# MuseScore JACK backend loads libjack at runtime.
"--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${
lib.makeLibraryPath [ libjack2 ]
}"
"--prefix"
"${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH"
":"
(lib.makeLibraryPath [ libjack2 ])
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib"
"--set"
"ALSA_PLUGIN_DIR"
"${alsa-plugins}/lib/alsa-lib"
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# There are some issues with using the wayland backend, see:
# https://musescore.org/en/node/321936
"--set-default QT_QPA_PLATFORM xcb"
"--set-default"
"QT_QPA_PLATFORM"
"xcb"
];
preFixup = ''
+122
View File
@@ -0,0 +1,122 @@
{
lib,
stdenv,
fetchFromGitHub,
maven,
makeWrapper,
copyDesktopItems,
makeDesktopItem,
jre,
libxkbcommon,
libx11,
libxcb,
libxinerama,
libxt,
libxtst,
nix-update-script,
}:
let
linuxNativeLibraries = [
libxkbcommon
libx11
libxcb
libxinerama
libxt
libxtst
];
in
maven.buildMavenPackage (finalAttrs: {
pname = "ninjabrain-bot";
version = "1.5.2";
src = fetchFromGitHub {
owner = "Ninjabrain1";
repo = "Ninjabrain-Bot";
tag = finalAttrs.version;
hash = "sha256-uOUPho4UCZxeTtCU4XHJsTR6HuXAnKXd3jk/tSRd4Yc=";
};
strictDeps = true;
__structuredAttrs = true;
# CI=true skips upstream display-dependent tests; the rest of the suite still runs.
env.CI = "true";
mvnFetchExtraArgs = {
env.CI = "true";
};
mvnParameters = "assembly:single";
mvnHash = "sha256-EZqijVMLPsZJUZA6pLL1Z5HqSeXSFo82XYRIazVweYw=";
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
installPhase = ''
runHook preInstall
install -Dm444 target/ninjabrainbot-${finalAttrs.version}-jar-with-dependencies.jar $out/share/java/ninjabrain-bot.jar
install -Dm644 src/main/resources/icon.png $out/share/icons/hicolor/640x640/apps/ninjabrain-bot.png
# Swing text rendering varies outside full desktop environments.
makeWrapperArgs=(
--add-flags "-Dawt.useSystemAAFontSettings=on"
--add-flags "-Dswing.aatext=true"
--add-flags "-jar $out/share/java/ninjabrain-bot.jar"
)
${lib.optionalString stdenv.hostPlatform.isLinux ''
makeWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath linuxNativeLibraries}
)
''}
makeWrapper ${lib.getExe jre} $out/bin/ninjabrain-bot "''${makeWrapperArgs[@]}"
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "ninjabrain-bot";
desktopName = "Ninjabrain Bot";
comment = "Stronghold calculator for Minecraft speedrunning";
type = "Application";
exec = "ninjabrain-bot";
icon = "ninjabrain-bot";
categories = [
"Game"
"Utility"
];
keywords = [
"minecraft"
"speedrun"
"stronghold"
"mcsr"
];
})
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Stronghold calculator for Minecraft speedrunning";
homepage = "https://github.com/Ninjabrain1/Ninjabrain-Bot";
changelog = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
nyxar77
Misaka13514
];
mainProgram = "ninjabrain-bot";
# Match platforms with bundled JNativeHook libraries and JRE support
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
})
+2 -2
View File
@@ -21,7 +21,7 @@
ocamlPackages.buildDunePackage (finalAttrs: {
pname = "nixtamal";
version = "1.9.1";
version = "1.9.2";
release_year = 2026;
minimalOCamlVersion = "5.3";
@@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
url = "https://darcs.toastal.in.th/nixtamal/stable/";
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
rev = finalAttrs.version;
hash = "sha256-Fadyi8BbGnQe/r84ZHXtuOEs+aZVwuQ/eTVlqLVN/KE=";
hash = "sha256-Df5I5zibVGNLJtJi2j4pWD+x5yu2rO9KSWyVhcus/HU=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "oh-my-posh";
version = "29.28.0";
version = "29.34.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = "oh-my-posh";
tag = "v${finalAttrs.version}";
hash = "sha256-8V1Wu3wqakwSVNb/WPlxRy9KL33frb8nqWeorHuIuzI=";
hash = "sha256-phT2Bupc340jq9nm36UC2eNUYyu6L/K4f38qnKgsqKI=";
};
vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ=";
+47
View File
@@ -0,0 +1,47 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
libiconv,
stdenv,
dbBackend ? "sqlite",
libmysqlclient,
libpq,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oidcwarden";
version = "2026.4.2-1";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Timshel";
repo = "OIDCWarden";
tag = "v${finalAttrs.version}";
hash = "sha256-tHacn9RtoByWpqnWX2/gWwODDSeXJa4mk4MfxHiiJ8A=";
};
cargoHash = "sha256-eGsYNaLYRCrTRaoyfhxnoeA2ytYeyGGvHnAbpEIayzs=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
++ lib.optional (dbBackend == "mysql") libmysqlclient
++ lib.optional (dbBackend == "postgresql") libpq;
buildFeatures = dbBackend;
meta = {
description = "Unofficial Bitwarden-compatible server with OpenID Connect support";
homepage = "https://github.com/Timshel/OIDCWarden";
changelog = "https://github.com/Timshel/OIDCWarden/releases/tag/v${finalAttrs.src.tag}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ DerGrumpf ];
mainProgram = "oidcwarden";
};
})
+2 -2
View File
@@ -11,13 +11,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation (finalAttrs: {
pname = "onednn";
version = "3.11.2";
version = "3.12.2";
src = fetchFromGitHub {
owner = "uxlfoundation";
repo = "oneDNN";
rev = "v${finalAttrs.version}";
hash = "sha256-xJTllrKs6mPNM85ZqyHTHWKpVOtOghmg4ZRFAvQZ4WU=";
hash = "sha256-LrxXRe2La5SZudikqMeGggklLrY2S0okrBX6QXGD+Tc=";
};
outputs = [
+3 -3
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "openfx";
version = "1.4";
version = "1.5.1";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "openfx";
rev = "OFX_Release_1_4_TAG";
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
rev = "OFX_Release_1.5.1";
hash = "sha256-qiY5klmGDiU9cqjfNdFsCcNqSBwV0dVZB2ZIsElRBD4=";
};
outputs = [
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pugixml";
version = "1.15";
version = "1.16";
src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
tag = "v${finalAttrs.version}";
hash = "sha256-t/57lg32KgKPc7qRGQtO/GOwHRqoj78lllSaE/A8Z9Q=";
hash = "sha256-gdfVktqG4Adcq1QvLyvx7EFV336gnNWXL+X/NOFJ0gs=";
};
outputs = [ "out" ] ++ lib.optionals shared [ "dev" ];
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sabiql";
version = "1.14.0";
version = "1.15.1";
src = fetchFromGitHub {
owner = "riii111";
repo = "sabiql";
rev = "v${finalAttrs.version}";
hash = "sha256-Fm9AINbCoazT2OHPJUO7YHpLt1KpQ8jDfXAkX3Karl0=";
hash = "sha256-vxkuYBakLzfZJyOPFD92kYB0QapfaLfwvw/La6kVQXY=";
};
cargoHash = "sha256-915W5zpavggfPN7artvgxkErWsx9eZ6953RX/eLQagg=";
cargoHash = "sha256-UN/3VFGZdjZjBGqCxgdiWUCuDS3p+3z/WqQ9CCwwQAA=";
# Upstream use latest rust version need to patch use nixpkgs version
postPatch = ''
+4 -4
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "sif";
version = "0-unstable-2026-07-03";
version = "0-unstable-2026-07-12";
src = fetchFromGitHub {
owner = "vmfunc";
repo = "sif";
rev = "7ea1cd28d5b535b8ea7826de9100e12907bc2fd0";
hash = "sha256-1gyfWJVuuEdW87DBZ++NX/pSoA12l+Ju3n5TVDzfnoo=";
rev = "d13622dc1c6f401f2cb23b40fbe36af7fb812a10";
hash = "sha256-VHBo65gs/Aij40xrzyhJz4puIXHI/ON6qcS7v+Nggu4=";
};
vendorHash = "sha256-ftnEHvnjdJpViEXS3nLK8nRmJRBLzjzqMZKPVvlzRDk=";
vendorHash = "sha256-IMavLk0Sz6Lelj9jkS+fBruSinXiVzX+OWfbqfuwt14=";
subPackages = [ "cmd/sif" ];
-43
View File
@@ -1,43 +0,0 @@
{
lib,
stdenv,
fetchurl,
fuse,
samba,
pkg-config,
glib,
autoconf,
attr,
libsecret,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "smbnetfs";
version = "0.6.3";
src = fetchurl {
url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${finalAttrs.version}/smbnetfs-${finalAttrs.version}.tar.bz2";
sha256 = "sha256-6sN7l2n76cP0uvPrZMYaa1mtTyqgXf3culoaxK301WA=";
};
nativeBuildInputs = [
pkg-config
autoconf
];
buildInputs = [
fuse
samba
glib
attr
libsecret
];
meta = {
description = "FUSE FS for mounting Samba shares";
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Only;
downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs";
homepage = "https://sourceforge.net/projects/smbnetfs/";
mainProgram = "smbnetfs";
};
})
+2
View File
@@ -74,6 +74,8 @@ perlPackages.buildPerlPackage rec {
makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ];
__darwinAllowLocalNetworking = true;
checkInputs =
(with perlPackages; [
TextDiff # t/strip2.t
+4 -1
View File
@@ -96,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
description = "LV2, VST3 & CLAP synthesizer plug-in (previously released as Vember Audio Surge)";
homepage = "https://surge-synthesizer.github.io";
license = lib.licenses.gpl3;
platforms = [ "x86_64-linux" ];
platforms = [
"aarch64-linux"
"x86_64-linux"
];
maintainers = with lib.maintainers; [
magnetophon
mrtnvgr
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "syft";
version = "1.46.0";
version = "1.48.0";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
tag = "v${finalAttrs.version}";
hash = "sha256-gjVfsJQoE//u0i6lVQCEF2dSUvoepIOaqqCazOUgSwI=";
hash = "sha256-ilpWgVfEAN1v+ue2xIplvlctZpuASVZaqcWGI8ZMWUY=";
# 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;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-t4L+Q82ohwBEXVh1Yy7OOrNhinnAXzOHO7mmFJQUZYM=";
vendorHash = "sha256-CM0afxHJTbDzAlskaT2cPBL/0IQGSv1+S7k8t40tDIc=";
nativeBuildInputs = [ installShellFiles ];
+4 -4
View File
@@ -7,11 +7,11 @@
}:
buildTeleport {
version = "17.7.25";
hash = "sha256-IrelrkTvOBcTkO7cHf572MU5KkOQq3we53dgFsDCSRo=";
vendorHash = "sha256-ERwCdWdp230wkqsRUCnd1hbO4PqXo+gDPsoGbxQqt04=";
version = "17.7.26";
hash = "sha256-JwPW+w2ZS4jGWxf0GZgf3UMUrxKcIthnvZT8nImtE2c=";
vendorHash = "sha256-YX0HC+cU3YpAdToALJa/FeCc8ANEq7E+zExzX42lk9c=";
cargoHash = "sha256-BE/TBZoOaB3Th14E+t3qJ+0Uww56TtRA1sRQ+usFo+Y=";
pnpmHash = "sha256-TARwHswSWbKk2eoyynuaOm7pvt2CwbjtklqnM+9/YXM=";
pnpmHash = "sha256-oVQF+Ba7zLCr86pPzFydVOBzA3GSzvtIfoggtiO2oFQ=";
wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
inherit buildGoModule withRdpClient extPatches;
+5 -5
View File
@@ -7,11 +7,11 @@
}:
buildTeleport {
version = "18.9.2";
hash = "sha256-w6qCH57L2rwClbSpZeG01eekzj3JRNijwSdfl+wx8v8=";
vendorHash = "sha256-LJmpFHvFsBsneq1Cl3vvqxBGB94gSjaikNDZtQfwNjM=";
pnpmHash = "sha256-8tKVv5SPJlS89EsHhF8qpThkh4n47qRBbHDCgX17Cdg=";
cargoHash = "sha256-+B5fGIzCpiYmqVcM4iy+PTIdtvuvtufQiXMHNzHTDlQ=";
version = "18.10.0";
hash = "sha256-df2VEtMTsnB72WIQj7iButC3b/U7tpv2e6dQEZm5zVA=";
vendorHash = "sha256-5uTZuWOSgL4319iUg8QuIqY4rACr4xBUHzdLXyG6Xo0=";
pnpmHash = "sha256-Fvp2ROOcr7g0yqjQheiLTaBEMysmyLLyzir6pYh09SQ=";
cargoHash = "sha256-cjks+Gv4CdlqWaJFFeyFsIuc3KsE7A/1MEDQB36pTkk=";
wasm-bindgen-cli = wasm-bindgen-cli_0_2_122;
buildGoModule = buildGo125Module;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "tfupdate";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "minamijoyo";
repo = "tfupdate";
rev = "v${finalAttrs.version}";
sha256 = "sha256-1okamMftP12ggQWxTgkjD4iAuxLlQ0YSwiUq8U39D7Y=";
sha256 = "sha256-bvMm+BFdJQ4DTDJwg9eRwAUp1QdJWzCZL1+wOBCJGX4=";
};
vendorHash = "sha256-5dz76K1/sBmms1iL7dFHXg2jJwsRmDlgstiHKExBAyU=";
+3 -3
View File
@@ -102,7 +102,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg_7 ]
);
version = "15.0.18";
version = "15.0.19";
sources = {
x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-4e7G8M/iKU65ECMVhxGjaJwHfwVZ49RD7ro6YJT43v0=";
hash = "sha256-LrSrQx9JIcpjsSO2+fRFoHP797ZfGI9FpXfVdusr4s8=";
};
i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-lLShsQQ2thSSp4PRK9Fhza6e01Myj2mUP4qqCeyilXo=";
hash = "sha256-N+TjpJrHg8cB6vwCqrTWnz4/dwzu2/r55kNmkLemWvU=";
};
};
+9 -4
View File
@@ -14,13 +14,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.146.0";
version = "1.148.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-EWRVbUeugyLsExP3NyPVLd7v2kwbRg5OjFg2WAY1FuM=";
hash = "sha256-ehkiL+HqrUc5w4WsmasobscMQgQanEZexpNDjZQ7mo4=";
};
vendorHash = null;
@@ -60,7 +60,6 @@ buildGoModule (finalAttrs: {
# Increase timeouts in tests to prevent failure on heavily loaded builders
substituteInPlace lib/storage/storage_test.go \
--replace-fail "time.After(10 " "time.After(120 " \
--replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \
--replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)"
'';
@@ -79,7 +78,13 @@ buildGoModule (finalAttrs: {
passthru = {
tests = lib.recurseIntoAttrs nixosTests.victoriametrics;
updateScript = nix-update-script { };
updateScript = nix-update-script {
extraArgs = [
# avoid pmm and -cluster releases
"--version-regex"
"v([0-9\\.]+)"
];
};
};
meta = {
+4 -4
View File
@@ -14,12 +14,12 @@
}:
let
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "go-vikunja";
repo = "vikunja";
rev = "v${version}";
hash = "sha256-bdHiSFaN0vNQMhy6GPlpoFeYrk2CLvO7E30d8J/9GC0=";
hash = "sha256-0yAFrq+qzLZLXPblWY2lkoJ2idzENR3YqdFNiDqep6U=";
};
frontend = stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ let
;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-cDGeIrCxZtcomu3YxikutjXpVe3EeUZ/L3+3y9yx67s=";
hash = "sha256-MnkwuEaBEY81LXInDao2Fi+FvKFyvsVS/QeXdS4FhPQ=";
};
nativeBuildInputs = [
@@ -102,7 +102,7 @@ buildGoModule {
mage
];
vendorHash = "sha256-4UMnfbwL2JFnw9KZDO5sq6XCSBUD5ejeqp6vaTbYWJc=";
vendorHash = "sha256-4JOwr6QCWglxXbRkcko2nsAxEhVbHDO1S2vI91NFM/8=";
inherit frontend;
+3 -3
View File
@@ -20,9 +20,9 @@ let
cargoHash = "sha256-EhuGBZchVyB9G5eRt/8QKN6grcP5AjFJMyGFdkfvT7g=";
};
main = {
version = "46.0.1";
hash = "sha256-rPIO+wQSu5KWT/v3Wbjs29p5Aoqpnpb+TwSTT5CRb6U=";
cargoHash = "sha256-cJD5iq342giBP+YdTem0/nOsMhI7DKRL4iiai5xayv8=";
version = "47.0.1";
hash = "sha256-/4ZOL5s4L3NyoTYTkMYXmRXT9Suy81E+dGuInyMlOdM=";
cargoHash = "sha256-ETPn0tZZDkQSqjg0QavR9yCbqjMPEbvwZb8GIl2VgGQ=";
};
};
source = sources.${variant};
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "wavelog";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "wavelog";
repo = "wavelog";
tag = finalAttrs.version;
hash = "sha256-RWARyBoRNHK9jd0T5u/QbL9w5TTzVeCcD4Elg/uWQNg=";
hash = "sha256-8DjRJ9QJ2M4lfw6coveXR/aayNeLY9fICVP2uBixcBc=";
};
installPhase = ''
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "webdav";
version = "5.13.0";
version = "5.14.0";
src = fetchFromGitHub {
owner = "hacdias";
repo = "webdav";
tag = "v${finalAttrs.version}";
hash = "sha256-BzdXc5CvQ/PUUjtVptBZC6UJsyn4MvqsdJuAEDomT6M=";
hash = "sha256-WoXXLJ2r8YtS91iGJ5XE2wn/TJjkA6kj29INGlplJSA=";
};
vendorHash = "sha256-qk97AB2UEEnVNM1Z7FBdAAWjto9xPjnCXCaO8R0dOh8=";
vendorHash = "sha256-BiEofFnuAcuXQv16RN/lx9+SDUzss++jAmf2ifLJg34=";
__darwinAllowLocalNetworking = true;
+2 -2
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zapret2";
version = "1.0.2";
version = "1.0.3";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "bol-van";
repo = "zapret2";
tag = "v${finalAttrs.version}";
hash = "sha256-pcAIvB/MfFJZFl5kPZjRZZOXgamfQm8hD4UGYC3jbro=";
hash = "sha256-yX/xdTq8Vk6ToQ17Zbl+2yU7+WIX5y6ksWxHfBd8ky0=";
leaveDotGit = true;
postFetch = ''
cd "$out"
+3 -3
View File
@@ -7,15 +7,15 @@
buildNpmPackage rec {
pname = "zwave-js-ui";
version = "11.21.1";
version = "11.22.0";
src = fetchFromGitHub {
owner = "zwave-js";
repo = "zwave-js-ui";
tag = "v${version}";
hash = "sha256-TBSc1dMOjZhJFffVm0SHbwDzDQFhXVjpeQ6qkYV14ew=";
hash = "sha256-r0ODtq+EiOpHWTm3vTW2FI5Xp8yqXK1Ekfh3hP6ns2Q=";
};
npmDepsHash = "sha256-AS4/eOZG2nXErCacXR4FerUkqpt4BNwUjohuLMsauks=";
npmDepsHash = "sha256-yzWx39qU/RH5XdY89nz/vZcq9exyAmVQnB5FU4pke48=";
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
@@ -20,6 +20,7 @@ mkCoqDerivation {
release."1.4.0".hash = "sha256-8TtNPEbp3uLAH+MjOKiTZHOjPb3vVYlabuqsdWxbg80=";
release."1.4.1".hash = "sha256-0UASpo9CdpvidRv33BDWrevo+NSOhxLQFPCJAWPXf+s=";
release."1.4.2".hash = "sha256-d5J8j8gi6siwCLevM6y8Hf2rTB/HEfh72LLk0Qlzr0c=";
release."1.4.3".hash = "sha256-9GWz7YsgPKoDkUok6nfHHT2GGLaB2oojYizKlt8BZAg=";
inherit version;
defaultVersion =
@@ -36,8 +37,9 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp.version ]
[
(case (isGe "8.20") (isGe "2.4") "1.4.2")
(case (isGe "8.16") (isGe "2.0") "1.4.1")
(case (isGe "8.20") (isGe "2.5") "1.4.3")
(case (isGe "8.20") (range "2.4" "2.5") "1.4.2")
(case (isGe "8.16") (range "2.0" "2.4") "1.4.1")
(case (isGe "8.16") "2.0.0" "1.3.0")
(case (isGe "8.11") (range "1.12" "1.19") "1.2.5")
(case (isGe "8.11") (range "1.11" "1.14") "1.2.4")
@@ -18,6 +18,7 @@ mkCoqDerivation {
release."1.17".hash = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE=";
release."2.2".hash = "sha256-y8LlQg9d9rfPFjzS9Xu3BW/H3tPiOC+Eb/zwXJGW9d4=";
release."2.3".hash = "sha256-inWJok0F3SZpVfoyMfpRXHVHn4z2aY8JjCKKhdVTnoc=";
release."2.4".hash = "sha256-7hq2K9KMkWug2zyvB2mcy1pnpTJKg8l8vtBtUt6NcXo=";
releaseRev = (v: "v${v}");
inherit version;
@@ -35,6 +36,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp.version ]
[
(case (range "8.16" "9.2") (range "2.0" "2.6") "2.4")
(case (range "8.16" "9.1") (range "2.0" "2.5") "2.3")
(case (range "8.16" "9.0") (range "2.0" "2.3") "2.2")
(case (range "8.10" "8.18") (range "1.12.0" "1.18.0") "1.17")
@@ -31,6 +31,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-ssreflect.version ]
[
(case (range "8.16" "9.2") (range "2.0.0" "2.6.0") "1.0.5")
(case (range "8.16" "9.1") (range "2.0.0" "2.5.0") "1.0.4")
(case (range "8.16" "9.1") (range "2.0.0" "2.4.0") "1.0.3")
(case (range "8.16" "9.0") (range "2.0.0" "2.3.0") "1.0.2")
@@ -38,6 +39,7 @@ mkCoqDerivation {
(case (range "8.10" "8.16") (range "1.12.0" "1.17.0") "1.0.0")
]
null;
release."1.0.5".hash = "sha256-Ti9gwd9rV+a0MJCAOjrpuZH+F9JI1l6dNAQYmIdGreU=";
release."1.0.4".hash = "sha256-fvE53jJe7/kQUI+lhO6lKdWfsFfRjOk2YGOcHUoJ6BU=";
release."1.0.3".hash = "sha256-5lpOCDyH6NFzGLvnXHHAnR7Qv5oXsUyC8TLBFrIiBag=";
release."1.0.2".hash = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss=";
@@ -33,8 +33,8 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-algebra.version ]
[
(case (range "8.18" "9.1") (isGe "2.3.0") "1.6.0+2.3+8.18")
(case (range "8.16" "9.1") (isGe "2.0.0") "1.5.0+2.0+8.16")
(case (range "8.18" "9.1") (range "2.3.0" "2.5.0") "1.6.0+2.3+8.18")
(case (range "8.16" "9.1") (range "2.0.0" "2.5.0") "1.5.0+2.0+8.16")
(case (range "8.13" "8.20") (range "1.12" "1.19.0") "1.3.0+1.12+8.13")
(case (range "8.13" "8.16") (range "1.12" "1.17.0") "1.1.0+1.12+8.13")
]
@@ -10,6 +10,7 @@ mkCoqDerivation {
pname = "odd-order";
owner = "math-comp";
release."2.4.0".hash = "sha256-8U3xFKe/gBSapwNRix3i2+jbyTja5xXGnQwtiTiF+9w=";
release."2.3.0".hash = "sha256-53FG8I9O+tsIlmaa9qy6VYyJNwWfGmhavKhbZ0VqAGc=";
release."2.2.0".hash = "sha256-z0C7+wtY8NpoT8wYqHiy8mB2HPYAeJndzDmf7Bb0mg8=";
release."2.1.0".hash = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q=";
@@ -33,6 +34,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-character.version ]
[
(case (range "9.1" "9.2") (range "2.5" "2.6") "2.4.0")
(case (range "9.0" "9.1") (range "2.5" "2.5") "2.3.0")
(case (range "8.16" "9.1") (range "2.2.0" "2.4.0") "2.2.0")
(case (range "8.16" "9.0") (range "2.1.0" "2.3.0") "2.1.0")
@@ -30,7 +30,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-boot.version ]
[
(case (lib.versions.range "8.20" "9.1") (lib.versions.isGe "2.4") "2.2.0")
(case (lib.versions.range "8.20" "9.1") (lib.versions.range "2.4" "2.5") "2.2.0")
]
null;
@@ -13,9 +13,12 @@
lld,
nasm,
cmake,
libGL,
gstreamer,
gst-plugins-base,
gst-plugins-good,
gst-plugins-bad,
gst-plugins-ugly,
gtk4,
cairo,
csound,
@@ -24,7 +27,11 @@
libwebp,
openssl,
pango,
gst-plugins-good,
jq,
writeTextFile,
validatePkgConfig,
testers,
nix-update-script,
# specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform)
plugins ? null,
@@ -36,33 +43,33 @@
}:
let
# populated from meson_options.txt (manually for now, but that might change in the future)
# checked against upstream meson_options.txt in postConfigure
# ordered according plugin list in README.md for readability
# validate plugin is excluded here and in the verification script below
validPlugins = {
# audio
audiofx = [ ];
claxon = [ ];
csound = [ csound ];
lewton = [ ];
spotify = [ ];
# generic
file = [ ];
gopbuffer = [ ];
inter = [ ];
originalbuffer = [ ];
streamgrouper = [ ];
sodium = [ libsodium ];
threadshare = [ ];
# mux
flavors = [ ];
fmp4 = [ ];
mp4 = [ ];
# net
aws = [ openssl ];
deepgram = [ ];
hlsmultivariantsink = [ ];
hlssink3 = [ ];
icecast = [ ];
mpegtslive = [ ];
ndi = [ ];
onvif = [ pango ];
quinn = [ ];
raptorq = [ ];
reqwest = [ openssl ];
rtp = [ ];
rtsp = [ ];
webrtc = [
gst-plugins-bad
openssl
@@ -72,18 +79,17 @@ let
openssl
];
# text
textahead = [ ];
json = [ ];
regex = [ ];
textwrap = [ ];
# utils
fallbackswitch = [ gtk4 ];
livesync = [ gtk4 ];
togglerecord = [ gtk4 ];
tracers = [ ];
uriplaylistbin = [ ];
# audio
audiofx = [ ];
audioparsers = [ ];
claxon = [ ];
csound = [ csound ];
demucs = [ ];
elevenlabs = [ ];
lewton = [ ];
speechmatics = [ ];
spotify = [ ];
whisper = [ ];
# video
cdg = [ ];
@@ -95,8 +101,34 @@ let
hsv = [ ];
png = [ ];
rav1e = [ ];
skia = [ ];
videofx = [ cairo ];
# would require libvvdec
vvdec = [ ];
webp = [ libwebp ];
# mux
flavors = [ ];
isobmff = [ ];
# text
textaccumulate = [ ];
textahead = [ ];
json = [ ];
regex = [ ];
textwrap = [ ];
# utils
fallbackswitch = [ gtk4 ];
livesync = [ gtk4 ];
togglerecord = [ gtk4 ];
tracers = [ ];
uriplaylistbin = [ ];
debugseimetainserter = [ ];
# analytics
analytics = [ gst-plugins-bad ];
burn = [ ];
};
selectedPlugins =
@@ -105,8 +137,16 @@ let
else
lib.subtractLists (
[
"csound" # tests have weird failure on x86, does not currently work on arm or darwin
"livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357
# tests have weird failure on x86, does not currently work on arm or darwin
# csound rust package currently incompatible with csound >= 7.x
"csound"
# test failures
"isobmff"
"webrtc"
"vvdec" # libvvdec not currently packaged
"skia" # skia-bindings requires configuration to link against system libraries
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
"raptorq" # pointer alignment failure in tests on aarch64
@@ -126,7 +166,43 @@ let
]
) (lib.attrNames validPlugins);
rsPrefixedPlugins = [
"analytics"
"audiofx"
"audioparsers"
"closedcaption"
"file"
"inter"
"onvif"
"png"
"rtp"
"rtsp"
"tracers"
"videofx"
"webp"
"webrtc"
];
pkgConfigName =
name:
if name == "flavors" then
"gstrsflv"
else
(if lib.elem name rsPrefixedPlugins then "gstrs${name}" else "gst${name}");
pkgConfigNames = map pkgConfigName selectedPlugins;
invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins;
validPluginFile = writeTextFile {
name = "known-plugin-names.txt";
text = lib.concatLines (lib.attrNames validPlugins);
};
# aws-lc-rs has no pregenerated bindings for exotic platforms
# https://aws.github.io/aws-lc-rs/platform_support.html
# whisper requires bindgen
requiresBindgen =
!(stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) || lib.elem "whisper" selectedPlugins;
in
assert lib.assertMsg (invalidPlugins == [ ])
"Invalid gst-plugins-rs plugin${
@@ -135,7 +211,7 @@ assert lib.assertMsg (invalidPlugins == [ ])
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-rs";
version = "0.14.4";
version = "0.15.3";
outputs = [
"out"
@@ -147,15 +223,32 @@ stdenv.mkDerivation (finalAttrs: {
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = finalAttrs.version;
hash = "sha256-MZyYHMq6gFJkVxlrmeXUjOmRYsQBHj0848cnF+7mtbU=";
hash = "sha256-DO5Dk9xjqWTI4ORzlHYPc/O/tyHfSyh7+YCzES5ZiHs=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "gst-plugins-rs-${finalAttrs.version}";
hash = "sha256-T+fdu+Oe07Uf1YoRGYl2DMb1QgdSZVLwcOqH4bBNGXU=";
hash = "sha256-EHikshVeaBzyx9+GBIkOPii63T12BobWdW6nTBLzwU8=";
};
postConfigure = ''
meson introspect . --buildoptions | \
${lib.getExe jq} -r 'map(select(.description | test("Build .+ plugin")) | .name | select(. != "validate")) | sort | .[]' \
> valid-plugin-names.txt
echo "checking for consistency between validPlugins and meson_options.txt"
diff -u ${validPluginFile} valid-plugin-names.txt
'';
patches = [
./doctest-fixes.patch
];
postPatch = ''
patchShebangs cargo_wrapper.py dependencies.py
'';
__structuredAttrs = true;
strictDeps = true;
nativeBuildInputs = [
@@ -169,10 +262,9 @@ stdenv.mkDerivation (finalAttrs: {
cargo
cargo-c
nasm
validatePkgConfig
]
# aws-lc-rs has no pregenerated bindings for exotic platforms
# https://aws.github.io/aws-lc-rs/platform_support.html
++ lib.optionals (!(stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) [
++ lib.optionals requiresBindgen [
cmake
rustPlatform.bindgenHook
]
@@ -188,6 +280,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gstreamer
gst-plugins-base
libGL
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_gstreamer
@@ -197,6 +290,7 @@ stdenv.mkDerivation (finalAttrs: {
checkInputs = [
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
];
mesonFlags = (map (plugin: lib.mesonEnable plugin true) selectedPlugins) ++ [
@@ -211,24 +305,25 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
# csound lib dir must be manually specified for it to build
preConfigure = ''
export CARGO_BUILD_JOBS=$NIX_BUILD_CORES
patchShebangs dependencies.py
''
+ lib.optionalString (lib.elem "csound" selectedPlugins) ''
preConfigure = lib.optionalString (lib.elem "csound" selectedPlugins) ''
export CSOUND_LIB_DIR=${lib.getLib csound}/lib
'';
mesonCheckFlags = [ "--verbose" ];
# required for icecast tests
__darwinAllowLocalNetworking =
finalAttrs.finalPackage.doCheck && lib.elem "icecast" selectedPlugins;
preCheck = ''
# Fontconfig error: No writable cache directories
export XDG_CACHE_HOME=$(mktemp -d)
export XDG_CACHE_HOME="$(mktemp -d)"
export GST_PLUGIN_PATH="$(realpath "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType")"
export GST_PLUGIN_SCANNER="${lib.getLib gstreamer}/libexec/gstreamer-1.0/gst-plugin-scanner"
'';
postInstall = ''
install -Dm444 -t ''${!outputDev}/lib/pkgconfig gst*.pc
install -Dm444 -t ''${!outputDev}/lib/pkgconfig plugins/gst*.pc
'';
doInstallCheck =
@@ -240,6 +335,10 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
versionCheck = true;
};
updateScript = nix-update-script {
# use numbered releases rather than gstreamer-* releases
# this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772
@@ -262,5 +361,6 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ tmarkus ];
pkgConfigModules = pkgConfigNames;
};
})
@@ -0,0 +1,98 @@
diff --git a/audio/elevenlabs/src/synthesizer/imp.rs b/audio/elevenlabs/src/synthesizer/imp.rs
index c31cb4f4d..a55b4fbb6 100644
--- a/audio/elevenlabs/src/synthesizer/imp.rs
+++ b/audio/elevenlabs/src/synthesizer/imp.rs
@@ -21,7 +21,7 @@
//!
//! Example usage with srt file as input:
//!
-//! ```
+//! ```sh
//! gst-launch-1.0 filesrc location=/home/meh/Documents/chaplin-fr-shifted.srt ! \
//! subparse ! clocksync ! queue ! \
//! elevenlabssynthesizer voice-id=kENkNtk0xyzG09WW40xE overflow=shift api-key=XXX ! autoaudiosink
diff --git a/audio/whisper/src/transcriber/imp.rs b/audio/whisper/src/transcriber/imp.rs
index 28e5446ce..939a66138 100644
--- a/audio/whisper/src/transcriber/imp.rs
+++ b/audio/whisper/src/transcriber/imp.rs
@@ -34,21 +34,21 @@
* The element re-exports the features exposed by the whisper-rs crate to select backends, this is
* an example for building the element with CUDA support enabled:
*
- * ```
+ * ```sh
* cargo build --features=cuda
* ```
*
* You can download models using the [whisper.cpp download script], this is an example for
* downloading the large-v3 model:
*
- * ```
+ * ```sh
* ./download-ggml-model.sh large-v3
* ```
*
* Equipped with this, this is an example for running live inference with the element introducing a
* 6 seconds latency:
*
- * ```
+ * ```sh
* gst-launch-1.0 filesrc location=/home/meh/Music/chaplin.wav ! \
* wavparse ! audioconvert ! audioresample ! clocksync ! \
* queue max-size-time=5000000000 max-size-buffers=0 max-size-bytes=0 ! \
diff --git a/utils/debugseimetainserter/src/debugseimetainserter/mod.rs b/utils/debugseimetainserter/src/debugseimetainserter/mod.rs
index a1d8d83ed..e090c6afd 100644
--- a/utils/debugseimetainserter/src/debugseimetainserter/mod.rs
+++ b/utils/debugseimetainserter/src/debugseimetainserter/mod.rs
@@ -12,7 +12,7 @@
* Adds GstVideoSEIUserDataUnregisteredMeta to video buffers for testing SEI insertion.
*
* ## Example launch line
- * ```
+ * ```sh
* gst-launch-1.0 videotestsrc ! x264enc ! h264parse ! \
* debugseimetainserter uuid=12345678-1234-1234-1234-123456789abc data="test payload" ! \
* h264seiinserter ! filesink location=output.h264
diff --git a/utils/tracers/src/pipeline_snapshot/imp.rs b/utils/tracers/src/pipeline_snapshot/imp.rs
index 6e4d5c54e..cccfbdc82 100644
--- a/utils/tracers/src/pipeline_snapshot/imp.rs
+++ b/utils/tracers/src/pipeline_snapshot/imp.rs
@@ -33,23 +33,23 @@
* - `dot-prefix` (string, default: "pipeline-snapshot-"): when dumping pipelines to a `dot` file each file is named `$prefix$pipeline_name.dot`.
* - `dot-ts` (boolean, default: "true"): if the current timestamp should be added as a prefix to each pipeline `dot` file.
* - `cleanup-mode` (enum, default: "none"): Determines how .dot files are cleaned up:
- * - "initial": Removes all existing .dot files from the target folder when the tracer starts
- * - "automatic": Performs cleanup before each snapshot. If folder-mode is enabled, cleans up .dot files within folders.
- * If folder-mode is None, cleans up .dot files directly in the target directory
- * - "none": Never removes any .dot files
+ * - "initial": Removes all existing .dot files from the target folder when the tracer starts
+ * - "automatic": Performs cleanup before each snapshot. If folder-mode is enabled, cleans up .dot files within folders.
+ * if folder-mode is None, cleans up .dot files directly in the target directory
+ * - "none": Never removes any .dot files
* - `folder-mode` (enum, default: "none"): Controls how .dot files are organized in folders:
- * - "none": All .dot files are stored directly in the target directory without subfolder organization
- * - "numbered": Creates a new numbered folder (starting from 0) for each snapshot operation
- * - "timed": Creates a new folder named with the current timestamp for each snapshot operation
+ * - "none": All .dot files are stored directly in the target directory without subfolder organization
+ * - "numbered": Creates a new numbered folder (starting from 0) for each snapshot operation
+ * - "timed": Creates a new folder named with the current timestamp for each snapshot operation
* - `dots-viewer-websocket-url`: A websocket URL to connect to a dots-viewer server instance,
- * allowing the user to snapshot running pipelines from the web
-* page. To trigger a snapshot, the user should send a json message
-* with the following format:
-* ```json
-* {
-* "type": "Snapshot"
-* }
-* ```
+ * allowing the user to snapshot running pipelines from the web
+ * page. To trigger a snapshot, the user should send a json message
+ * with the following format:
+ * ```json
+ * {
+ * "type": "Snapshot"
+ * }
+ * ```
*
* Examples:
*
@@ -1,10 +0,0 @@
{ callPackage, fetchurl }:
callPackage ./generic.nix rec {
version = "0.9.77";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
hash = "sha256-nnAjoVESAGDSgGpupME8qZM+zk6s/FyUZNIO3dt2sKA=";
};
}
@@ -375,6 +375,7 @@ final: prev: {
meta = {
homepage = "https://github.com/barrettruth/canola.nvim";
maintainers = with lib.maintainers; [ saadndm ];
license = lib.licenses.mit;
description = "a refined oil.nvim";
};
@@ -0,0 +1,30 @@
{
lib,
fetchurl,
buildDunePackage,
grenier,
pprint,
}:
buildDunePackage (finalAttrs: {
pname = "cmon";
version = "0.2";
src = fetchurl {
url = "https://github.com/let-def/cmon/releases/download/v${finalAttrs.version}/cmon-${finalAttrs.version}.tbz";
hash = "sha256-lJi5NV27YqyDgUx1i4vBj/buzyzdWJSrSceGGs82grg=";
};
propagatedBuildInputs = [
grenier
pprint
];
doCheck = true;
meta = {
description = "A library for printing OCaml values with sharing";
license = lib.licenses.mit;
homepage = "https://github.com/let-def/cmon";
};
})
@@ -0,0 +1,22 @@
{
lib,
fetchurl,
buildDunePackage,
}:
buildDunePackage (finalAttrs: {
pname = "grenier";
version = "0.16";
src = fetchurl {
url = "https://github.com/let-def/grenier/releases/download/v${finalAttrs.version}/grenier-${finalAttrs.version}.tbz";
hash = "sha256-j9Iqv59FicIGAIZU+p7rsc9KWHN+uzQTjGcJUg82t18=";
};
doCheck = true;
meta = {
description = "A collection of various algorithms in OCaml";
license = lib.licenses.isc;
homepage = "https://github.com/let-def/grenier";
};
})
@@ -0,0 +1,37 @@
{
lib,
fetchurl,
buildDunePackage,
menhir,
cmon,
menhirLib,
menhirSdk,
}:
buildDunePackage (finalAttrs: {
pname = "lrgrep";
version = "0.9";
minimalOCamlVersion = "4.14";
src = fetchurl {
url = "https://github.com/let-def/lrgrep/releases/download/v${finalAttrs.version}/lrgrep-${finalAttrs.version}.tbz";
hash = "sha256-5T3hLkxcvmvKAGQ1kyZrT5+i4/ahOBle7/ekMp9cHHU=";
};
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [
cmon
menhirLib
menhirSdk
];
doCheck = true;
meta = {
license = lib.licenses.isc;
description = "Detailed error messages for Menhir-generated parsers";
homepage = "https://github.com/let-def/lrgrep";
};
})
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "aiortc";
version = "1.14.0";
version = "1.15.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aiortc";
repo = "aiortc";
tag = version;
hash = "sha256-ZgxSaiKkJrA5XvUT1zq8kwqB8mOvn46vLWXHyJSsHbM=";
hash = "sha256-XuqitZv0VJmbcvLZK3tLsN0TLfjujL35mbcyBche5SQ=";
};
build-system = [
@@ -1,35 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
future,
}:
buildPythonPackage rec {
pname = "blockchain";
version = "1.4.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1qpbmz6dk5gx1996dswpipwhj6sp5j0dlfap012l46zqnvmkxanv";
};
postPatch = ''
substituteInPlace setup.py --replace "enum-compat" ""
'';
propagatedBuildInputs = [ future ];
# tests are interacting with the API and not mocking the calls
doCheck = false;
pythonImportsCheck = [ "blockchain" ];
meta = {
description = "Python client Blockchain Bitcoin Developer API";
homepage = "https://github.com/blockchain/api-v1-client-python";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
@@ -23,6 +23,12 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ];
# Upstream pins pandas<3 (still true as of the v0.1.0 tag), but the
# package works fine against pandas 3.x; relax the constraint rather
# than staying behind on pandas.
# https://github.com/thombashi/df-diskcache/blob/v0.1.0/requirements/requirements.txt
pythonRelaxDeps = [ "pandas" ];
propagatedBuildInputs = [
pandas
simplesqlite
@@ -3,24 +3,38 @@
buildPythonPackage,
fetchPypi,
sexpdata,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "epc";
version = "0.0.5";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "a14d2ea74817955a20eb00812e3a4630a132897eb4d976420240f1152c0d7d25";
inherit (finalAttrs) pname version;
hash = "sha256-oU0up0gXlVog6wCBLjpGMKEyiX602XZCAkDxFSwNfSU=";
};
propagatedBuildInputs = [ sexpdata ];
doCheck = false;
build-system = [ setuptools ];
dependencies = [ sexpdata ];
pythonImportsCheck = [ "epc" ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# imports nose
"epc/tests/test_py2py.py"
];
__darwinAllowLocalNetworking = true;
meta = {
description = "EPC (RPC stack for Emacs Lisp) implementation in Python";
homepage = "https://github.com/tkf/python-epc";
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Only;
};
}
})
+12 -21
View File
@@ -74,22 +74,17 @@ buildPythonPackage (finalAttrs: {
env = {
PYPI_RELEASE = 1;
CMAKE_ARGS = toString (
[
# NOTE The `metal` command-line utility used to build the Metal kernels is not open-source.
# To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape
# hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper`
# or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016).
(lib.cmakeBool "MLX_BUILD_METAL" false)
(lib.cmakeBool "USE_SYSTEM_FMT" true)
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_NANOBIND" "${nanobind.src}")
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann")
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
(lib.cmakeBool "MLX_ENABLE_X64_MAC" true)
]
);
CMAKE_ARGS = toString [
# NOTE The `metal` command-line utility used to build the Metal kernels is not open-source.
# To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape
# hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper`
# or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016).
(lib.cmakeBool "MLX_BUILD_METAL" false)
(lib.cmakeBool "USE_SYSTEM_FMT" true)
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_NANOBIND" "${nanobind.src}")
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann")
];
};
build-system = [
@@ -118,11 +113,7 @@ buildPythonPackage (finalAttrs: {
"python/tests/"
];
disabledTests = [
# brittle memory leak test, see: https://github.com/ml-explore/mlx/pull/3088
"test_siblings_without_eval"
]
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
# Segmentation fault
"test_lapack"
"test_multivariate_normal"
@@ -23,14 +23,14 @@
buildPythonPackage (finalAttrs: {
pname = "onnx-asr";
version = "0.11.0";
version = "0.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "istupakov";
repo = "onnx-asr";
tag = "v${finalAttrs.version}";
hash = "sha256-gi5U56ZPSo0bJ0Fmi8nebvIXENZWwX4lofk5vKV8gag=";
hash = "sha256-PUlGF8ICXWwSpeWufduJL7wLsIcI+bmoHrj9ZHrgX3U=";
};
build-system = [
@@ -18,14 +18,14 @@ let
in
buildPythonPackage (finalAttrs: {
pname = "wasmtime";
version = "46.0.1";
version = "47.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasmtime-py";
tag = finalAttrs.version;
hash = "sha256-PWMrmr9PPi98lQe5+KaY4bPLOYyJ5qYugMJwVwwnuwA=";
hash = "sha256-EtozWiHv354jDu0pHAI2vnx1c53Ldq4WBhTSFPZICSs=";
};
postPatch = ''
@@ -31,7 +31,7 @@ let
lib.switch
[ rocq-core.rocq-version mathcomp.version ]
[
(case (range "9.0" "9.1") (range "2.4.0" "2.5.0") "1.16.0")
(case (range "9.0" "9.2") (range "2.4.0" "2.6.0") "1.16.0")
]
null;
@@ -25,7 +25,7 @@ mkRocqDerivation {
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "1.0.4")
(case (range "9.0" "9.2") "1.0.4")
] null;
propagatedBuildInputs = [ mathcomp-boot ];

Some files were not shown because too many files have changed in this diff Show More