Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -128,6 +128,8 @@
|
||||
|
||||
- `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.
|
||||
|
||||
- `mozc` and `mozc-ut` no longer contains the IBus front-end, which are now provided by `ibus-engines.mozc` and `ibus-engines.mozc-ut`.
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
|
||||
|
||||
@@ -15504,6 +15504,17 @@
|
||||
githubId = 918448;
|
||||
name = "Anthony Lodi";
|
||||
};
|
||||
logan-barnett = {
|
||||
email = "logustus+nixpkgs@gmail.com";
|
||||
github = "LoganBarnett";
|
||||
githubId = 27005;
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "3F29 5F7D 2427 6467 A9B2 3459 41E4 6FB1 ACEA 3EF0";
|
||||
}
|
||||
];
|
||||
name = "Logan Barnett";
|
||||
};
|
||||
logger = {
|
||||
name = "Ido Samuelson";
|
||||
email = "ido.samuelson@gmail.com";
|
||||
@@ -19132,6 +19143,12 @@
|
||||
github = "nicegamer7";
|
||||
githubId = 8083772;
|
||||
};
|
||||
nick-linux = {
|
||||
email = "nick-stationengineer@proton.me";
|
||||
name = "Nick";
|
||||
github = "nick-linux8";
|
||||
githubId = 264581716;
|
||||
};
|
||||
nickcao = {
|
||||
name = "Nick Cao";
|
||||
email = "nickcao@nichi.co";
|
||||
@@ -26157,12 +26174,6 @@
|
||||
githubId = 127287939;
|
||||
name = "Syed Sumairul Hasan";
|
||||
};
|
||||
syberant = {
|
||||
email = "sybrand@neuralcoding.com";
|
||||
github = "syberant";
|
||||
githubId = 20063502;
|
||||
name = "Sybrand Aarnoutse";
|
||||
};
|
||||
syboxez = {
|
||||
email = "syboxez@gmail.com";
|
||||
matrix = "@syboxez:matrix.org";
|
||||
|
||||
@@ -51,7 +51,7 @@ let
|
||||
++ lib.optional cfg.enableMemoryLocking "-m"
|
||||
++ cfg.extraFlags;
|
||||
|
||||
dispathcerScriptFile = pkgs.callPackage (
|
||||
dispatcherScriptFile = pkgs.callPackage (
|
||||
{
|
||||
runCommand,
|
||||
srcOnly,
|
||||
@@ -258,7 +258,7 @@ in
|
||||
networking.networkmanager.dispatcherScripts = lib.mkIf cfg.dispatcherScript [
|
||||
{
|
||||
type = "basic";
|
||||
source = dispathcerScriptFile;
|
||||
source = dispatcherScriptFile;
|
||||
}
|
||||
];
|
||||
|
||||
@@ -271,7 +271,7 @@ in
|
||||
systemd.tmpfiles.rules = [
|
||||
"d ${stateDir} 0750 chrony chrony - -"
|
||||
"f ${driftFile} 0640 chrony chrony - -"
|
||||
"f ${keyFile} 0640 chrony chrony - -"
|
||||
"f ${keyFile} 0640 root chrony - -"
|
||||
]
|
||||
++ lib.optionals cfg.enableRTCTrimming [
|
||||
"f ${rtcFile} 0640 chrony chrony - -"
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.74";
|
||||
hash = "sha256-WmDHxRVHzS8WmaUg4WG/f7Jy4TQ8oVm5PJXm1V7wOn8=";
|
||||
version = "2.1.76";
|
||||
hash = "sha256-dZOzj9qNsLLgR1FN1cklPfJPhUG52dtmzC3dyXiIqUY=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pandoc";
|
||||
publisher = "chrischinchilla";
|
||||
version = "0.6.2";
|
||||
hash = "sha256-d2nVjVTwvVSQXnhTdqv5gLV44L6FWGbHGZtCplbUQz4=";
|
||||
version = "0.7.1";
|
||||
hash = "sha256-sGZ0o3lyGs1N8v1gYcdsFYYQwNeMChW881EXe6NoBgU=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -1330,8 +1330,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "discloud";
|
||||
name = "discloud";
|
||||
version = "2.28.2";
|
||||
hash = "sha256-zRptDItJuLcHTkKUarpsXlRBa4R84cupKXKtBt5Stmw=";
|
||||
version = "2.28.3";
|
||||
hash = "sha256-4GRwqcuZJ3hAM58tUyOyCNEUq2cAIk17wscqAeJ0gSg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
|
||||
@@ -1955,8 +1955,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "vscode-pull-request-github";
|
||||
version = "0.128.0";
|
||||
hash = "sha256-ujDnHmhMorewvIH+zJXSnUpnMfQNE5XqHA1lnsq22Qk=";
|
||||
version = "0.132.0";
|
||||
hash = "sha256-2+hB2qENwiVawP3mavUAObjWwXlsDrKXa4u9TyXV3AM=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -2885,8 +2885,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "marp-vscode";
|
||||
publisher = "marp-team";
|
||||
version = "3.3.0";
|
||||
hash = "sha256-Z/dhVvmyhyjEM3QUswLA2ExXeFIRzNOUn7Kd6s/C50k=";
|
||||
version = "3.4.0";
|
||||
hash = "sha256-2mH/rs1TVSbw2z8fkcAea8xKmW1hXM4vET99wd1tJHc=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -3828,8 +3828,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ansible";
|
||||
publisher = "redhat";
|
||||
version = "26.1.3";
|
||||
hash = "sha256-iBAlDqi7u/srkgBBLha/JCHZnpccz37BdZ7zVJVfJYY=";
|
||||
version = "26.3.0";
|
||||
hash = "sha256-c6NcQsJe2sjJH/nBhStHYWKNSfJtU3CLHpv+2qPlyqM=";
|
||||
};
|
||||
meta = {
|
||||
description = "Ansible language support";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
version = "0.37.9";
|
||||
hash = "sha256-AGfjenshM1yQ/rHDpCbCU2HDSS4cPGIPxe8MQ7O0/Dc=";
|
||||
version = "0.39.1";
|
||||
hash = "sha256-2uD8HtsiII1gg3VlODSYI8DMBJrslZr/LCaQMAHI85g=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
buildVscodeLanguagePack =
|
||||
{
|
||||
language,
|
||||
version ? "1.108.2026021109",
|
||||
version ? "1.110.2026031109",
|
||||
hash,
|
||||
}:
|
||||
buildVscodeMarketplaceExtension {
|
||||
@@ -41,71 +41,71 @@ in
|
||||
# French
|
||||
vscode-language-pack-fr = buildVscodeLanguagePack {
|
||||
language = "fr";
|
||||
hash = "sha256-wlNUPeU7gblFeQ0G6CE+lzC3xQW8Xy2DM0mpmy1K5dM=";
|
||||
hash = "sha256-Iu9sB9KBpHdbuhYMTglwvZdGTBXBCfAGtDcrP+8zcdA=";
|
||||
};
|
||||
# Italian
|
||||
vscode-language-pack-it = buildVscodeLanguagePack {
|
||||
language = "it";
|
||||
hash = "sha256-Nx+4ByeCnH3BxL41M6XcwlW5qgbUh9ex3Bu6xvy24UI=";
|
||||
hash = "sha256-OUAOWkrLl7YlW4AK2c2WlHU5a7EnFZsE8pDfA3ywswQ=";
|
||||
};
|
||||
# German
|
||||
vscode-language-pack-de = buildVscodeLanguagePack {
|
||||
language = "de";
|
||||
hash = "sha256-9747wTc4cdsEOZmy7JPNGL65vNG+bLEjN4CDMVbOphw=";
|
||||
hash = "sha256-sSUDuOEtkCqEVfahW3yRE57pyPmFJzYpOD81TjWGE98=";
|
||||
};
|
||||
# Spanish
|
||||
vscode-language-pack-es = buildVscodeLanguagePack {
|
||||
language = "es";
|
||||
hash = "sha256-LKoDwonmsB9X50/DLTfh0rED/EvdWPbkP+i/n2pjfL4=";
|
||||
hash = "sha256-O+TbCqM8qnFp3IsdpiQ7OlMWKuNIyZrvDZAKMbYRXb4=";
|
||||
};
|
||||
# Russian
|
||||
vscode-language-pack-ru = buildVscodeLanguagePack {
|
||||
language = "ru";
|
||||
hash = "sha256-CZhmpvW+EQW3E0PdRB7zz1XXQW+9vnzT99n7cagx7DE=";
|
||||
hash = "sha256-qEXRsqI8jfuTCX2zMnDwfHAiszk2abiwzJ+a1dio3ss=";
|
||||
};
|
||||
# Chinese (Simplified)
|
||||
vscode-language-pack-zh-hans = buildVscodeLanguagePack {
|
||||
language = "zh-hans";
|
||||
hash = "sha256-QYgM9PRpHKB4SxAC5C92gkUsNXO9ua5GHqn7Cd9I8tM=";
|
||||
hash = "sha256-w3p2IPadb6gx/oxwgwcMPQsQYJ3vcunWRHjOVhiJOrI=";
|
||||
};
|
||||
# Chinese (Traditional)
|
||||
vscode-language-pack-zh-hant = buildVscodeLanguagePack {
|
||||
language = "zh-hant";
|
||||
hash = "sha256-X476P0tOH4VBgbW74/XnnsBdkAcq2co7rxzXD8O5Xtc=";
|
||||
hash = "sha256-UzYXuzenpvEiS927Ku2p5GHm9JwUxwtFNL8iIM4cPkY=";
|
||||
};
|
||||
# Japanese
|
||||
vscode-language-pack-ja = buildVscodeLanguagePack {
|
||||
language = "ja";
|
||||
hash = "sha256-BoTVsv5KhZd+hZFdpe3RhU+VvpZu5Z2u3X1KPsEBd3U=";
|
||||
hash = "sha256-Eie5fZDKk8vbaZRbJuIwURIUbIjqio22M6261BYe9MI=";
|
||||
};
|
||||
# Korean
|
||||
vscode-language-pack-ko = buildVscodeLanguagePack {
|
||||
language = "ko";
|
||||
hash = "sha256-/RaaiP32Ky9bbifWNDB3rCHu7G8rZS6jvEyJhnR+0A8=";
|
||||
hash = "sha256-AwlHuG/r4anTKXsTag1UULbgKmU6M5Ng4+5Bjo4chVo=";
|
||||
};
|
||||
# Czech
|
||||
vscode-language-pack-cs = buildVscodeLanguagePack {
|
||||
language = "cs";
|
||||
hash = "sha256-hHnrMUVmjXezk5k/q1jrd3Zp6NyetoeYnFQgAyEuX+8=";
|
||||
hash = "sha256-Gpwr6lCxHu4DJ/U5Np8VT6IvBRLsnBNtG1cCV/bMeXw=";
|
||||
};
|
||||
# Portuguese (Brazil)
|
||||
vscode-language-pack-pt-br = buildVscodeLanguagePack {
|
||||
language = "pt-BR";
|
||||
hash = "sha256-JTkPbkwrH4Vxg6V9zTSame8WyjSli/LDVLCv4DY7zGM=";
|
||||
hash = "sha256-fzNMlrlVAP4uas+ITR1CFIq3Pip1d/CGXg5qdgNbxV4=";
|
||||
};
|
||||
# Turkish
|
||||
vscode-language-pack-tr = buildVscodeLanguagePack {
|
||||
language = "tr";
|
||||
hash = "sha256-rvM5SgcJujWztSREZulD4y5wZBm9e9CDseKozqtmNfM=";
|
||||
hash = "sha256-nP5NRddP55KdJgwj5eFDDeSX2SiSHnDaBwPoRHmmoFg=";
|
||||
};
|
||||
# Polish
|
||||
vscode-language-pack-pl = buildVscodeLanguagePack {
|
||||
language = "pl";
|
||||
hash = "sha256-M4XKkz1hgsjxsjqf7pQGYAB0rtJN9eKxM2WhDYGLssk=";
|
||||
hash = "sha256-O4SwzcBMpeKYisxM2VwMFmtqcbyi9Boj0LTJE6PUw3I=";
|
||||
};
|
||||
# Pseudo Language
|
||||
vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
|
||||
language = "qps-ploc";
|
||||
hash = "sha256-/zVq/03CcM7cgZ4/K7k4pYqkbc6bNuBnhMl38DRFulw=";
|
||||
hash = "sha256-zFH9cjyPLC2nmi3vh4siiwtLyJbfXEjbHDQFnkoa5A8=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,19 +15,19 @@
|
||||
let
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
hash = "sha256-14CuWI0le00n55TYhEtz0XI/xG+fXnjrboSHgJ2Tx/s=";
|
||||
hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
hash = "sha256-EKomndqpCJXajwesbolWx9kr/sEpAhZpPtn0S/d1nbM=";
|
||||
hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok=";
|
||||
arch = "darwin-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
hash = "sha256-f8jehKgNMuIyP+yQ7oCLhKvdcmujc6d7UbwXL+khZCg=";
|
||||
hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
hash = "sha256-87tvTop81XTOHuY64dXA+WmfEGdEACNKipqHDe3lNp8=";
|
||||
hash = "sha256-XntiQmvagiSWcfVIp13CDq2RTZ4NhKOzf4QmecZjMIs=";
|
||||
arch = "darwin-arm64";
|
||||
};
|
||||
};
|
||||
@@ -41,7 +41,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = base // {
|
||||
name = "python";
|
||||
publisher = "ms-python";
|
||||
version = "2026.2.0";
|
||||
version = "2026.4.0";
|
||||
};
|
||||
|
||||
buildInputs = [ icu ];
|
||||
|
||||
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "r-syntax";
|
||||
publisher = "REditorSupport";
|
||||
version = "0.1.3";
|
||||
hash = "sha256-grkfkmyERVUkB8kSH+NPd2Mv4WF/h/obw8ebmxPx5zU=";
|
||||
version = "0.1.4";
|
||||
hash = "sha256-7MX01miPbiOfnxXaCMg0yAKHXsBcwRUYuiU9yTzMGIQ=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r-syntax/changelog";
|
||||
|
||||
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-qyhYpEkkXjG48JXSxOodgvh18R/nOOcP2m3m0OpdqvY=";
|
||||
hash = "sha256-fZFWZiPuKtHWmzqJX/Mtb37lKTnU/TRISbS1qewcZzs=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-elhKqa9aLcx+3CTYt1S1BiE+Y5ldLc5ilfnfPoEEd3w=";
|
||||
hash = "sha256-ZePZFmz3S6DCuIPqaL4xaLaWypNxre9xe7tRfk8JdQM=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-r2DmSo1TLyZSFKVsbvYhF1CkNODgjotNFXhA+q69MAw=";
|
||||
hash = "sha256-2gYrpUtzP1XTtkgEypoZLfMwDzBGMriqD935D1r1Onc=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-4qGX4TwT9gtJbZt7JLbnQwGLA13yoqZQsydtfr4Kivw=";
|
||||
hash = "sha256-skvZ2wtYlXAYRscbUti6uBEEyM9ocJ9D/EuTMPQXB0Y=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "visualjj";
|
||||
publisher = "visualjj";
|
||||
version = "0.24.1";
|
||||
version = "0.24.3";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -758,6 +758,10 @@ let
|
||||
${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
|
||||
'';
|
||||
|
||||
# Sadly, Chromium is not even -fstrict-flex-array=1 clean
|
||||
# See https://github.com/NixOS/nixpkgs/issues/499982#issuecomment-4062355720
|
||||
hardeningDisable = [ "strictflexarrays1" ];
|
||||
|
||||
llvmCcAndBintools = symlinkJoin {
|
||||
name = "llvmCcAndBintools";
|
||||
paths = [
|
||||
|
||||
@@ -742,11 +742,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"infobloxopen_infoblox": {
|
||||
"hash": "sha256-uxzWgxetwgzj9L5+yxw2EoMzdx6NbR2kEb4fGw3Wxn0=",
|
||||
"hash": "sha256-XUbvyErN6cbpbEVv5pUm0dIauBrtBZy6XoBHgA0Hy6E=",
|
||||
"homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox",
|
||||
"owner": "infobloxopen",
|
||||
"repo": "terraform-provider-infoblox",
|
||||
"rev": "v2.10.0",
|
||||
"rev": "v2.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1058,11 +1058,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ovh_ovh": {
|
||||
"hash": "sha256-sbNqeprI7ib5IqM+peXtcVBHVL716K3QvK7n460rG4c=",
|
||||
"hash": "sha256-OoyQtdl/42/S7Q392N8ez3qrdTZcjxFbLuLXi1QMgcw=",
|
||||
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
|
||||
"owner": "ovh",
|
||||
"repo": "terraform-provider-ovh",
|
||||
"rev": "v2.11.0",
|
||||
"rev": "v2.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1076,11 +1076,11 @@
|
||||
"vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
|
||||
},
|
||||
"pagerduty_pagerduty": {
|
||||
"hash": "sha256-xuy7bc+YRDsEenMRfaCpV6uBAopjYbrCmOFzdowTqYM=",
|
||||
"hash": "sha256-y4lh5jw9bENgVG181lJOsJx3RaR8m+tQnfvY1ONi8kQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
|
||||
"owner": "PagerDuty",
|
||||
"repo": "terraform-provider-pagerduty",
|
||||
"rev": "v3.31.3",
|
||||
"rev": "v3.31.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1355,13 +1355,13 @@
|
||||
"vendorHash": "sha256-CcbNooB1AjLbyMkTNmAklqNm6o6FVCBEBiEnD/U5yGU="
|
||||
},
|
||||
"terraform-routeros_routeros": {
|
||||
"hash": "sha256-19QR6kugDQoWlW3U1u2PX/7+S+Rb+o58HWsKHHd7pqo=",
|
||||
"hash": "sha256-zi2/DVrUMlnnUV+P0KeIpHTkA73g6IKs/Yrsob4MoVM=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
|
||||
"owner": "terraform-routeros",
|
||||
"repo": "terraform-provider-routeros",
|
||||
"rev": "v1.99.0",
|
||||
"rev": "v1.99.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-0VVL8wF8bAB77erJ4YgHN5Q4gkuRPL30OucJe7Jvj1w="
|
||||
"vendorHash": "sha256-8pva3cc8ur/Ojufevdn64dtTxt/Hi+QL928ZRVTIFC4="
|
||||
},
|
||||
"timohirt_hetznerdns": {
|
||||
"hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.19.6",
|
||||
"version": "1.20.5",
|
||||
"vscodeVersion": "1.107.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "80522c9d60bcc04bb13d40fa136601d184dc83f36bb9065eb29cc456db4c29e1"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "5b87664f454da487b8dee87aaf5e3361d9ba79b947770b798bd0fa874a9827e5"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "fba4265d3646ad002b39774d5e06b36a826bd82e70c11297379258d4a06fe8a8"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "26fc65c4b538470ed1198f3d0ad855d1e4d81a9bfcbc607816b74de35999dbbf"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/darwin-x64/Antigravity.zip",
|
||||
"sha256": "9a96e8aa2e6f6ba8c4e137f44950690853e42f4a0ae0ec79b822113bd42ef30e"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-x64/Antigravity.zip",
|
||||
"sha256": "54fdcf8eac2eab176b04e587a5679d2993701fe4e5788e79f25c7ced2de605ef"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/darwin-arm/Antigravity.zip",
|
||||
"sha256": "0e0c3ade07d2c677eaa02a26b50df994bbeed8905dce583d164eff5ffc575530"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-arm/Antigravity.zip",
|
||||
"sha256": "d3e6e75299062720a3300634305f2030ab8fcb4efb5ce8642305a576554caaca"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
|
||||
let
|
||||
source = {
|
||||
version = "2.32.1";
|
||||
hash = "sha256-OABIRUVOLGt2Xj//u/GbzS9+Jxn4jI38FE1vsuyb5xw=";
|
||||
npmDepsHash = "sha256-kDq4k9iVuWo8+wdm1K/Ufz9vFIQD4ERHTsBXwtp9+Yc=";
|
||||
clientNpmDepsHash = "sha256-1O1f+Mg7f2nzmGQytzQdalDV2C4o5EBkuqtTCKpmiN8=";
|
||||
version = "2.33.0";
|
||||
hash = "sha256-jHwSJm1VB0W3/sIas39wgvcn+K62DyKJqMdO0kbSgeY=";
|
||||
npmDepsHash = "sha256-PvtnkQytGkKS2MYwpwAGd5F2CrsVKJ2lLbS46ta5a5c=";
|
||||
clientNpmDepsHash = "sha256-+ivzzGLWPCnXWJt6Z6jzXkzMjzXWUK4iRfmF+gUSKEo=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.9.9";
|
||||
version = "7.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ennf8V1WorldzFfXUrRKmJomG4yrP19qBg0okEX+NWQ=";
|
||||
hash = "sha256-loq3mZDydyL1dvtBrg/pIta3jKUzpAe9SOr2bw5QwDk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-mqw0Hp14wz2FOg7deXC3iiHu55W+yKwf4+JUK+x9nKA=";
|
||||
vendorHash = "sha256-7xu6MnmbiXOrWe8Lc6drpSEZK6+FcMin4Lg22mvGRFM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.5.7";
|
||||
version = "5.6.0";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-YKGMDX6rMNS6sYTsV/9sLpLvVkFcjEFdxO9hhb7SprU=";
|
||||
aarch64-linux = "sha256-PFVUaXt0spYX4F1WElNmNY6ltzTCDJO2WA9LfB0MNiQ=";
|
||||
x86_64-darwin = "sha256-btcEFZPz//qZ+3msrzjIt1wGYtjSDz2rKSQK5rTp4B8=";
|
||||
aarch64-darwin = "sha256-JTgGXrWADaiqvRbqruOpEHtTVS8pYQpsXYKAblHGlIk=";
|
||||
x86_64-linux = "sha256-dqwB1kCUL3DetfFCsBVh3xq3fNKSOMabJepDV7DpLGA=";
|
||||
aarch64-linux = "sha256-dv321Lszm+xJiXK4Hfi0ij7TvkuJx8o8mepWjGnGBD8=";
|
||||
x86_64-darwin = "sha256-AQb+HcLP+7e+SuqKWxHH+O2O6/Daf14CuTQj90T2yoo=";
|
||||
aarch64-darwin = "sha256-tJ2N3KtdC4VNXe0lKSb9cD3YF61GRc5/kpSZw9TNkb4=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -160,6 +160,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
knownVulnerabilities = [ "Electron version 32 is EOL" ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -96,6 +96,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/blueman-project/blueman";
|
||||
description = "GTK-based Bluetooth Manager";
|
||||
mainProgram = "blueman-manager";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
changelog = "https://github.com/blueman-project/blueman/releases/tag/${version}";
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From dfbbc505817bd0c3e01af5865196629c2a2a2b5e Mon Sep 17 00:00:00 2001
|
||||
From: Marie Ramlow <me@nycode.dev>
|
||||
Date: Wed, 10 Sep 2025 20:12:39 +0200
|
||||
Subject: [PATCH] Check if libatomic is needed
|
||||
|
||||
---
|
||||
c++/src/kj/CMakeLists.txt | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
|
||||
index 7114ddb80e..8ce355b8b0 100644
|
||||
--- a/c++/src/kj/CMakeLists.txt
|
||||
+++ b/c++/src/kj/CMakeLists.txt
|
||||
@@ -84,6 +84,21 @@ target_compile_features(kj PUBLIC cxx_std_20)
|
||||
if(UNIX AND NOT ANDROID)
|
||||
target_link_libraries(kj PUBLIC pthread)
|
||||
endif()
|
||||
+
|
||||
+include(CheckCXXSourceCompiles)
|
||||
+check_cxx_source_compiles("#include <atomic>
|
||||
+int main() {
|
||||
+ std::atomic<uint8_t> w1;
|
||||
+ std::atomic<uint16_t> w2;
|
||||
+ std::atomic<uint32_t> w4;
|
||||
+ std::atomic<uint64_t> w8;
|
||||
+ return ++w1 + ++w2 + ++w4 + ++w8;
|
||||
+}" CAPNP_BUILDS_WITHOUT_LIBATOMIC)
|
||||
+
|
||||
+if(NOT CAPNP_BUILDS_WITHOUT_LIBATOMIC)
|
||||
+ target_link_libraries(kj PUBLIC atomic)
|
||||
+endif()
|
||||
+
|
||||
#make sure the lite flag propagates to all users (internal + external) of this library
|
||||
target_compile_definitions(kj PUBLIC ${CAPNP_LITE_FLAG})
|
||||
#make sure external consumers don't need to manually set the include dirs
|
||||
@@ -33,21 +33,19 @@ in
|
||||
# See: https://gerrit.lix.systems/c/lix/+/1874
|
||||
clangStdenv.mkDerivation rec {
|
||||
pname = "capnproto";
|
||||
version = "1.2.0";
|
||||
version = "1.4.0";
|
||||
|
||||
# release tarballs are missing some ekam rules
|
||||
src = fetchFromGitHub {
|
||||
owner = "capnproto";
|
||||
repo = "capnproto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aDcn4bLZGq8915/NPPQsN5Jv8FRWd8cAspkG3078psc=";
|
||||
hash = "sha256-CuhKOJwU+QG25lRR8F7ina+DV45ZlLzg/UJ2swf2tZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/capnproto/capnproto/pull/2377
|
||||
./fix-libucontext.patch
|
||||
# https://github.com/capnproto/capnproto/pull/2410
|
||||
./fix-libatomic.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.74",
|
||||
"buildDate": "2026-03-11T23:35:46Z",
|
||||
"version": "2.1.76",
|
||||
"buildDate": "2026-03-14T00:18:17Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "48a07e2887cd4879219d319e48ac5cc6e2098238c7c0abe01c57a35430941cb7",
|
||||
"size": 190412928
|
||||
"checksum": "ffe922f4f4ac542f4edbeeabbce2a7492308d034c66a2427caec5c31c39b71c8",
|
||||
"size": 190891760
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "31fa7ebd424719406cb123f95781c5e795f7a9899611ff1a9213092458d346eb",
|
||||
"size": 196493184
|
||||
"checksum": "2a13d9a3ca0fe330fd786341897af2e5250066bbbb1fdcb6cfdffa50cf0f90fe",
|
||||
"size": 196972016
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "bfa883897a26433c5132a641b32d1fce00e1eff04a61bf52cd9ab85aeac2ea95",
|
||||
"size": 232315636
|
||||
"checksum": "40f753c07f070df34ca83e400f746a8279a3fd343967a453d9fbfab2f3ca7acd",
|
||||
"size": 232783142
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "e5613610deee76cd32bc9b8e9e364da074fcd880705f837a4c9ee1ec38f9b73b",
|
||||
"size": 235079569
|
||||
"checksum": "801a085676c3d54392c42e8e43c44947df7c52132356575f7d9267c4f22d6992",
|
||||
"size": 235555347
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "72f4bc8e016357111229e9a026b4ff322dd5fa5b2782f59368bd788f78e9af75",
|
||||
"size": 222834724
|
||||
"checksum": "18fb9e236149bd475d9c5b9ec033f5c93d2dec0dca1f7b34cec96fd42379497c",
|
||||
"size": 223318614
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "08fbc3f3f6d95a5817bff74ef02145196e2d0e5947bd6cc52fd3ea8a8b47a51c",
|
||||
"size": 225677057
|
||||
"checksum": "f17ad0fe5448799cdaa7ae5fd77132e0003942195da91546a4f5e7b2f7bf2f05",
|
||||
"size": 226152835
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "f84f832c0661157b38262595f3228353079d8d44c3f24cefe2d67b6d56fd9042",
|
||||
"size": 238872736
|
||||
"checksum": "bb40de8e810d985698e14eec9935036621bf37c495a609f5b70db7aa9f927b83",
|
||||
"size": 240100000
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "ee6523a7a53256c0000853f032e185cbe3f9e611c2e9fa0c4285c6c6a9869da4",
|
||||
"size": 233458848
|
||||
"checksum": "1dac83677e68a48368f945e693a5dd039baff21115871223c622df362c0cd61b",
|
||||
"size": 236293792
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.74",
|
||||
"version": "2.1.76",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.74",
|
||||
"version": "2.1.76",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.74";
|
||||
version = "2.1.76";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-74xAW5sc3l5SH7UUFsUVpK6A6gTPn4fGg+c51MsXXhE=";
|
||||
hash = "sha256-kjzPTG32f35eN6S85gGLUCmsNwH70Sq5rruEs/0hioM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-FQEQQK8UIvPw8WMYGW+X7TPAWi+SVJEhUV0MqO2gQz0=";
|
||||
npmDepsHash = "sha256-sk1RdPMgZD+Ejd6JdKWcK24AdfasnwWATQkwAx5MjmY=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -108,12 +108,12 @@ in
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "313";
|
||||
version = "314";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-rOjWxb6nWvfMWr2+9AyoCoOSg2jo3ZeoF8R6A8VvBj8=";
|
||||
hash = "sha256-zMxmqXyiLMK17I4uv+OYonNhcyWElNYlCFIpkrfWLNs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dness";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickbabcock";
|
||||
repo = "dness";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Vty4ec6aoUh3p2b9vLkNeS5R4pJWzjwYrC5DtVVyhT8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WhSeNukPjgM7Cy8LWi/s1YGa5/UxsFU1NGL7vIUlU58=";
|
||||
|
||||
doCheck = false; # Many tests require network access
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Dynamic DNS updating tool supporting a variety of providers";
|
||||
homepage = "https://github.com/nickbabcock/dness";
|
||||
maintainers = with lib.maintainers; [ logan-barnett ];
|
||||
mainProgram = "dness";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dtop";
|
||||
version = "0.6.13";
|
||||
version = "0.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amir20";
|
||||
repo = "dtop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZnL0qUvQH/Ji8BYOzfvs2Ln+lccWTheOGha3XrAkZ0M=";
|
||||
hash = "sha256-nWSV91cvfWSTzseTFEVlVKHOa4ZsDDFt9r6L3yLjWZ8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OiZOydaPbXuiu9FIilkgCvIkwnK4Fr5D8Ybxf4vOFes=";
|
||||
cargoHash = "sha256-xJ4d+Nul8B9mE6Rlf5kg0nLuZWTmpbPnjpE0hUAME6U=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -5,3 +5,5 @@ source "https://rubygems.org"
|
||||
gem "facter"
|
||||
|
||||
gem "base64", "~> 0.2.0"
|
||||
gem "benchmark", "~> 0.5.0"
|
||||
gem "logger", "~> 1.7.0"
|
||||
|
||||
@@ -2,10 +2,12 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
base64 (0.2.0)
|
||||
benchmark (0.5.0)
|
||||
facter (4.10.0)
|
||||
hocon (~> 1.3)
|
||||
thor (>= 1.0.1, < 1.3)
|
||||
hocon (1.4.0)
|
||||
logger (1.7.0)
|
||||
thor (1.2.2)
|
||||
|
||||
PLATFORMS
|
||||
@@ -13,7 +15,9 @@ PLATFORMS
|
||||
|
||||
DEPENDENCIES
|
||||
base64 (~> 0.2.0)
|
||||
benchmark (~> 0.5.0)
|
||||
facter
|
||||
logger (~> 1.7.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.7.2
|
||||
|
||||
@@ -9,6 +9,16 @@
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
benchmark = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
facter = {
|
||||
dependencies = [
|
||||
"hocon"
|
||||
@@ -33,6 +43,16 @@
|
||||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
logger = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
};
|
||||
thor = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
|
||||
+9
-42
@@ -1,5 +1,4 @@
|
||||
{
|
||||
extraLibs ? [ ],
|
||||
firefoxRuntime ? firefox-unwrapped,
|
||||
|
||||
lib,
|
||||
@@ -8,27 +7,15 @@
|
||||
makeWrapper,
|
||||
rustPlatform,
|
||||
|
||||
cups,
|
||||
ffmpeg,
|
||||
firefox-unwrapped,
|
||||
libcanberra-gtk3,
|
||||
libglvnd,
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
libva,
|
||||
libgbm,
|
||||
nixosTests,
|
||||
openssl,
|
||||
pciutils,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
udev,
|
||||
libxscrnsaver,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firefoxpwa";
|
||||
pname = "firefoxpwa-unwrapped";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -62,27 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
completions = "target/${stdenv.targetPlatform.config}/release/completions";
|
||||
|
||||
gtk_modules = map (x: x + x.gtkModule) [ libcanberra-gtk3 ];
|
||||
libs =
|
||||
let
|
||||
libs = [
|
||||
cups
|
||||
ffmpeg
|
||||
libglvnd
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libva
|
||||
libgbm
|
||||
pciutils
|
||||
pipewire
|
||||
udev
|
||||
libxscrnsaver
|
||||
]
|
||||
++ gtk_modules
|
||||
++ extraLibs;
|
||||
in
|
||||
lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs;
|
||||
|
||||
postInstall = ''
|
||||
# Runtime
|
||||
mkdir -p $out/share/firefoxpwa
|
||||
@@ -113,17 +79,18 @@ rustPlatform.buildRustPackage rec {
|
||||
install -Dm644 packages/appstream/si.filips.FirefoxPWA.svg $out/share/icons/hicolor/scalable/apps/si.filips.FirefoxPWA.svg
|
||||
|
||||
wrapProgram $out/bin/firefoxpwa \
|
||||
--prefix FFPWA_SYSDATA : "$out/share/firefoxpwa" \
|
||||
--prefix LD_LIBRARY_PATH : "$libs" \
|
||||
--suffix-each GTK_PATH : "$gtk_modules"
|
||||
--prefix FFPWA_SYSDATA : "$out/share/firefoxpwa"
|
||||
|
||||
wrapProgram $out/bin/firefoxpwa-connector \
|
||||
--prefix FFPWA_SYSDATA : "$out/share/firefoxpwa" \
|
||||
--prefix LD_LIBRARY_PATH : "$libs" \
|
||||
--suffix-each GTK_PATH : "$gtk_modules"
|
||||
--prefix FFPWA_SYSDATA : "$out/share/firefoxpwa"
|
||||
'';
|
||||
|
||||
passthru.tests.firefoxpwa = nixosTests.firefoxpwa;
|
||||
passthru = {
|
||||
tests.firefoxpwa = nixosTests.firefoxpwa;
|
||||
binaryName = "firefoxpwa";
|
||||
applicationName = "firefoxpwa";
|
||||
inherit (firefoxRuntime) gtk3;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tool to install, manage and use Progressive Web Apps (PWAs) in Mozilla Firefox (native component)";
|
||||
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mit # or
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ syberant ];
|
||||
maintainers = [ ];
|
||||
# NB: `ein` is also provided by this package, but `nix run
|
||||
# nixpkgs#gitoxide` doesn't work at all without this set.
|
||||
mainProgram = "gix";
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2026-03-04";
|
||||
version = "0-unstable-2026-03-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "5a75730e6f21ee624cbf86f4915c6e7489c74acc";
|
||||
hash = "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=";
|
||||
rev = "ef12a9a2b0f77c8fa3dda1e7e494fca668909056";
|
||||
hash = "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
From 731d5be8e39bdf28266057ef06705a1a5fd45750 Mon Sep 17 00:00:00 2001
|
||||
From: wxt <3264117476@qq.com>
|
||||
Date: Tue, 22 Oct 2024 11:46:12 +0800
|
||||
Subject: [PATCH] fix build
|
||||
|
||||
---
|
||||
go.mod | 11 +++++++++--
|
||||
go.sum | 35 ++++++++---------------------------
|
||||
2 files changed, 17 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/go.mod b/go.mod
|
||||
index b65ec67..84cc7ca 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,5 +1,12 @@
|
||||
module github.com/gordonklaus/ineffassign
|
||||
|
||||
-go 1.14
|
||||
+go 1.22.0
|
||||
|
||||
-require golang.org/x/tools v0.1.5
|
||||
+toolchain go1.23.2
|
||||
+
|
||||
+require golang.org/x/tools v0.26.0
|
||||
+
|
||||
+require (
|
||||
+ golang.org/x/mod v0.21.0 // indirect
|
||||
+ golang.org/x/sync v0.8.0 // indirect
|
||||
+)
|
||||
diff --git a/go.sum b/go.sum
|
||||
index 6483b19..486c8d4 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -1,27 +1,8 @@
|
||||
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
|
||||
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
|
||||
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
|
||||
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
|
||||
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
|
||||
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
|
||||
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
|
||||
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
|
||||
--
|
||||
2.46.1
|
||||
|
||||
@@ -7,20 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ineffassign";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gordonklaus";
|
||||
repo = "ineffassign";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU=";
|
||||
hash = "sha256-3bn13aQCz7Zn7DUmOTawFYI/xHUqabXrrVOYlOC5J/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-fix-build.patch # run go get -u. Old dependency can't run correctly on go 1.23
|
||||
];
|
||||
|
||||
vendorHash = "sha256-WpX5I9PK7xuln6BkIEW2qIF1K/BgaEu/gkJsz+ThVk0=";
|
||||
vendorHash = "sha256-h6r13xxPRTlSdTwi88ITra7SizU1z4pXWsmqlG2frU8=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
libGL,
|
||||
@@ -13,6 +14,8 @@
|
||||
libglvnd,
|
||||
vulkan-loader,
|
||||
autoPatchelfHook,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -32,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
installShellFiles
|
||||
pkgconf
|
||||
];
|
||||
|
||||
@@ -53,8 +57,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postInstall = ''
|
||||
install -D etc/jay.portal $out/share/xdg-desktop-portal/portals/jay.portal
|
||||
install -D etc/jay-portals.conf $out/share/xdg-desktop-portal/jay-portals.conf
|
||||
install -D etc/jay.desktop $out/share/wayland-sessions/jay.desktop
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd jay \
|
||||
--bash <("$out/bin/jay" generate-completion bash) \
|
||||
--zsh <("$out/bin/jay" generate-completion zsh) \
|
||||
--fish <("$out/bin/jay" generate-completion fish)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
providedSessions = [ "jay" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Wayland compositor written in Rust";
|
||||
homepage = "https://github.com/mahkoh/jay";
|
||||
|
||||
@@ -2,13 +2,13 @@ diff --git a/apps/web/.next/standalone/node_modules/next/dist/server/image-optim
|
||||
index cba8876..c3d7c43 100644
|
||||
--- a/apps/web/.next/standalone/node_modules/next/dist/server/image-optimizer.js
|
||||
+++ b/apps/web/.next/standalone/node_modules/next/dist/server/image-optimizer.js
|
||||
@@ -409,7 +409,8 @@ class ImageOptimizerCache {
|
||||
@@ -495,7 +495,8 @@ class ImageOptimizerCache {
|
||||
]);
|
||||
}
|
||||
constructor({ distDir, nextConfig }){
|
||||
- this.cacheDir = (0, _path.join)(distDir, "cache", "images");
|
||||
+ const cacheDir = process.env["NEXT_CACHE_DIR"] || (0, _path.join)(distDir, "cache");
|
||||
+ this.cacheDir = (0, _path.join)(cacheDir, "images");
|
||||
- this.cacheDir = (0, _path.join)(distDir, 'cache', 'images');
|
||||
+ const cacheDir = process.env['NEXT_CACHE_DIR'] || (0, _path.join)(distDir, 'cache');
|
||||
+ this.cacheDir = (0, _path.join)(cacheDir, 'images');
|
||||
this.nextConfig = nextConfig;
|
||||
}
|
||||
async get(cacheKey) {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mage";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magefile";
|
||||
repo = "mage";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-SJtwUS/m4hsBq035VdU8skJxvHokCdMQ3aKjPkXsN28=";
|
||||
sha256 = "sha256-W9VySQFZx1fzYYHZInmNpWsITVhGASzR6lNyETiaLao=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip";
|
||||
hash = "sha256-bCBQebOrkyvlzHL70RzNwVt0zJpex4pMNgDc7FQuUAU=";
|
||||
hash = "sha256-xG6v78sFOjuHjdYu/GKhdFNLpeYf48S3Bjp09ZIxs+M=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-FOcNUcJh9FbQ+s2uxlKEqsNfqFqS0NbwHGecIUQruDY=";
|
||||
hash = "sha256-a27lLrGNjaWMeWboA0AtZ5bC0a/aGuyErNv98J8HBRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "mailspring";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
meta = {
|
||||
description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors";
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mlt";
|
||||
version = "7.34.1";
|
||||
version = "7.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zdfjl4ZrdmX445hYx2CoKj1NuXQslQpTC5m96zPrZes=";
|
||||
hash = "sha256-3WZirFMrU8T8UClkUQRBjqBqycpI7pAjcVzeGpYMwhY=";
|
||||
# The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
|
||||
# Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
|
||||
# submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
|
||||
@@ -162,7 +162,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lgpl21Plus
|
||||
gpl2Plus
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
nick-linux
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,8 +8,10 @@
|
||||
mozcdic-ut-place-names,
|
||||
mozcdic-ut-skk-jisyo,
|
||||
mozcdic-ut-sudachidict,
|
||||
withIbus ? false,
|
||||
}:
|
||||
mozc.override {
|
||||
inherit withIbus;
|
||||
dictionaries = [
|
||||
mozcdic-ut-alt-cannadic
|
||||
mozcdic-ut-edict2
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
protobuf_27,
|
||||
bazel_7,
|
||||
ibus,
|
||||
withIbus ? false,
|
||||
unzip,
|
||||
xdg-utils,
|
||||
jp-zip-codes,
|
||||
@@ -36,9 +37,9 @@ buildBazelPackage rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ibus
|
||||
qt6.qtbase
|
||||
];
|
||||
]
|
||||
++ lib.optional withIbus ibus;
|
||||
|
||||
dontAddBazelOpts = true;
|
||||
removeRulesCC = false;
|
||||
@@ -65,7 +66,18 @@ buildBazelPackage rec {
|
||||
"opt"
|
||||
];
|
||||
|
||||
bazelTargets = [ "package" ];
|
||||
bazelTargets = [
|
||||
"unix/icons"
|
||||
"gui/tool:mozc_tool"
|
||||
"server:mozc_server"
|
||||
"unix/emacs:mozc_emacs_helper"
|
||||
"unix/emacs:mozc.el"
|
||||
"renderer/qt:mozc_renderer"
|
||||
]
|
||||
++ lib.optionals withIbus [
|
||||
"unix/ibus:gen_mozc_xml"
|
||||
"unix/ibus:ibus_mozc"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# replace protobuf with our own
|
||||
@@ -89,8 +101,25 @@ buildBazelPackage rec {
|
||||
buildAttrs.installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
unzip bazel-bin/unix/mozc.zip -x "tmp/*" -d /
|
||||
|
||||
install -Dm555 "bazel-bin/server/mozc_server" "$out/lib/mozc/mozc_server"
|
||||
install -Dm555 "bazel-bin/renderer/qt/mozc_renderer" "$out/lib/mozc/mozc_renderer"
|
||||
install -Dm555 "bazel-bin/gui/tool/mozc_tool" "$out/lib/mozc/mozc_tool"
|
||||
install -Dm555 "bazel-bin/unix/emacs/mozc_emacs_helper" "$out/bin/mozc_emacs_helper"
|
||||
install -Dm444 "unix/emacs/mozc.el" "$out/share/emacs/site-lisp/emacs-mozc/mozc.el"
|
||||
install -d "$out/share/icons/mozc/"
|
||||
unzip bazel-bin/unix/icons.zip -d "$out/share/icons/mozc/"
|
||||
''
|
||||
+ (lib.optionalString withIbus ''
|
||||
install -Dm555 "bazel-bin/unix/ibus/ibus_mozc" "$out/lib/ibus-mozc/ibus-engine-mozc"
|
||||
install -Dm555 "bazel-bin/unix/ibus/mozc.xml" "$out/share/ibus/components/mozc.xml"
|
||||
install -d "$out/share/ibus-mozc/"
|
||||
for icon in $out/share/icons/mozc/*.png
|
||||
do
|
||||
cp $icon $out/share/ibus-mozc/
|
||||
done
|
||||
mv $out/share/ibus-mozc/{mozc,product_icon}.png
|
||||
'')
|
||||
+ ''
|
||||
# create a desktop file for gnome-control-center
|
||||
# copied from ubuntu
|
||||
mkdir -p $out/share/applications
|
||||
@@ -102,7 +131,7 @@ buildBazelPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
isIbusEngine = true;
|
||||
isIbusEngine = withIbus;
|
||||
description = "Japanese input method from Google";
|
||||
mainProgram = "mozc_emacs_helper";
|
||||
homepage = "https://github.com/google/mozc";
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index ceff715b..143659fb 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -31,30 +31,6 @@ endif()
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
add_definitions(-D_XOPEN_SOURCE_EXTENDED)
|
||||
|
||||
- # ncurses
|
||||
- execute_process(COMMAND sh "-c"
|
||||
- "command -v brew &> /dev/null && brew --prefix ncurses 2> /dev/null | tr -d '\n'"
|
||||
- OUTPUT_VARIABLE NCURSES_ROOT_DIR)
|
||||
- if (EXISTS "${NCURSES_ROOT_DIR}")
|
||||
- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (detected).")
|
||||
- else()
|
||||
- set(NCURSES_ROOT_DIR /opt/local)
|
||||
- message(STATUS "Ncurses cmake prefix '${NCURSES_ROOT_DIR}' (default).")
|
||||
- endif()
|
||||
- list(APPEND CMAKE_PREFIX_PATH ${NCURSES_ROOT_DIR})
|
||||
-
|
||||
- # openssl
|
||||
- execute_process(COMMAND sh "-c"
|
||||
- "command -v brew &> /dev/null && brew --prefix openssl 2> /dev/null | tr -d '\n'"
|
||||
- OUTPUT_VARIABLE OPENSSL_ROOT_DIR)
|
||||
- if (EXISTS "${OPENSSL_ROOT_DIR}")
|
||||
- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (detected).")
|
||||
- else()
|
||||
- set(OPENSSL_ROOT_DIR /opt/local)
|
||||
- message(STATUS "OpenSSL cmake prefix '${OPENSSL_ROOT_DIR}' (default).")
|
||||
- endif()
|
||||
- list(APPEND CMAKE_PREFIX_PATH ${OPENSSL_ROOT_DIR})
|
||||
-
|
||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
|
||||
add_compile_definitions(_XOPEN_SOURCE_EXTENDED)
|
||||
if (DEFINED ENV{PREFIX} AND "$ENV{PREFIX}" MATCHES "^/data/data/com\\.termux/files/usr$")
|
||||
@@ -0,0 +1,48 @@
|
||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index a1928ee3..26157e56 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -126,10 +126,6 @@ message(STATUS "Static Go: ${HAS_STATICGOLIB}")
|
||||
|
||||
# Check Golang version for whatsmeow minimum requirement
|
||||
set(GO_VERSION_MIN 1.23)
|
||||
-execute_process(COMMAND bash "-c" "go version 2> /dev/null | cut -c14- | cut -d' ' -f1 | tr -d '\n'" OUTPUT_VARIABLE GO_VERSION)
|
||||
-if((HAS_WHATSAPP OR HAS_SIGNAL) AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))
|
||||
- message(FATAL_ERROR "Go version ${GO_VERSION} (need >= ${GO_VERSION_MIN} to build WhatsApp or Signal).")
|
||||
-endif()
|
||||
|
||||
# Check Little/Big Endian for tdlib requirement
|
||||
test_big_endian(IS_BIG_ENDIAN)
|
||||
diff --git i/lib/tgchat/ext/td/CMakeLists.txt w/lib/tgchat/ext/td/CMakeLists.txt
|
||||
index 795f1f4b..7e41549c 100644
|
||||
--- i/lib/tgchat/ext/td/CMakeLists.txt
|
||||
+++ w/lib/tgchat/ext/td/CMakeLists.txt
|
||||
@@ -140,7 +140,6 @@ if (CLANG OR GCC)
|
||||
endif()
|
||||
|
||||
include(GetGitRevisionDescription)
|
||||
-get_git_head_revision(TD_GIT_REFSPEC TD_GIT_COMMIT_HASH)
|
||||
message(STATUS "Git state: ${TD_GIT_COMMIT_HASH}")
|
||||
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/td/telegram/GitCommitHash.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/td/telegram/GitCommitHash.cpp" @ONLY)
|
||||
diff --git i/lib/wmchat/CMakeLists.txt w/lib/wmchat/CMakeLists.txt
|
||||
index 84a42ef9..556df050 100644
|
||||
--- i/lib/wmchat/CMakeLists.txt
|
||||
+++ w/lib/wmchat/CMakeLists.txt
|
||||
@@ -20,8 +20,8 @@ install(TARGETS wmchat DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
target_common_config(wmchat)
|
||||
|
||||
# Dependency libraries
|
||||
-add_subdirectory(go)
|
||||
-add_dependencies(wmchat ref-cgowm)
|
||||
+set(GO_LIBRARIES @libcgowm@/libcgowm.a)
|
||||
+target_include_directories(wmchat PRIVATE @libcgowm@)
|
||||
|
||||
# Platform specifics
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
@@ -44,4 +44,4 @@ set_target_properties(wmchat PROPERTIES COMPILE_FLAGS
|
||||
|
||||
# Linking
|
||||
message(STATUS "Go libraries: ${GO_LIBRARIES}")
|
||||
-target_link_libraries(wmchat PUBLIC ref-cgowm ncutil ${GO_LIBRARIES})
|
||||
+target_link_libraries(wmchat PUBLIC @libcgowm@/libcgowm.a ncutil ${GO_LIBRARIES})
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
file, # for libmagic
|
||||
ncurses,
|
||||
openssl,
|
||||
@@ -16,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.21";
|
||||
version = "5.13.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d99kris";
|
||||
repo = "nchat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WofBqdUX88USnCA4iyDVMDXyx4Bxz/ZV0FqDUeAOe4Q=";
|
||||
hash = "sha256-VSya6s3/+vII/M76tHmeJEZh7/gv9L5tYdILuthdO5s=";
|
||||
};
|
||||
|
||||
libcgowm = buildGoModule {
|
||||
@@ -30,7 +31,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/lib/wmchat/go";
|
||||
vendorHash = "sha256-4jn2CDWqg0GqZ7QTTaZh+9GDUH7L6WllfTONkxnfKEU=";
|
||||
vendorHash = "sha256-lfy7uHH3rLYx6kzIy72ftEiO1CkJkEr7rRXHhuFU/ac=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -45,34 +46,17 @@ let
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "nchat";
|
||||
inherit version src;
|
||||
|
||||
nl = "\n";
|
||||
postPatch = ''
|
||||
substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \
|
||||
--replace "get_git_head_revision" "#get_git_head_revision"
|
||||
substituteInPlace lib/tgchat/CMakeLists.txt \
|
||||
--replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR"
|
||||
|
||||
# specific mangling to handle whatsapp go module:
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "if(HAS_WHATSAPP AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))" \
|
||||
"if(FALSE AND (NOT GO_VERSION VERSION_GREATER_EQUAL GO_VERSION_MIN))"
|
||||
|
||||
substituteInPlace lib/wmchat/CMakeLists.txt \
|
||||
--replace-fail "add_subdirectory(go)" \
|
||||
"set(GO_LIBRARIES ${libcgowm}/libcgowm.a)${nl}target_include_directories(wmchat PRIVATE ${libcgowm})"
|
||||
|
||||
substituteInPlace lib/wmchat/CMakeLists.txt \
|
||||
--replace-fail "target_link_libraries(wmchat PUBLIC ref-cgowm ncutil \''${GO_LIBRARIES})" \
|
||||
"target_link_libraries(wmchat PUBLIC ${libcgowm}/libcgowm.a ncutil \''${GO_LIBRARIES})"
|
||||
|
||||
substituteInPlace lib/wmchat/CMakeLists.txt \
|
||||
--replace-fail "add_dependencies(wmchat ref-cgowm)" "#add_dependencies(wmchat ref-cgowm)"
|
||||
'';
|
||||
patches = [
|
||||
(replaceVars ./go-libs-build.patch {
|
||||
inherit libcgowm;
|
||||
})
|
||||
# Don't use brew
|
||||
./fix-darwin.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
python3Packages.buildPythonPackage {
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "nixoscope";
|
||||
version = "0-unstable-2026-03-05";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giomf";
|
||||
repo = "nixoscope";
|
||||
rev = "71de2ff0b4c9376db759a05ad58ace87d2b52ccb";
|
||||
hash = "sha256-5yNGtEWlSAfJcy4X8C3dHQ+4Xaawi6aX20C82bfZxG4=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9w5+KgC1daxGZ0BEVX75bKExpdnzik5pFnOPGHLDtiQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -23,6 +26,18 @@ python3Packages.buildPythonPackage {
|
||||
graphviz
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
unittestFlags = [
|
||||
"-s"
|
||||
"tests"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Visualize dependencies between NixOS modules";
|
||||
homepage = "https://github.com/giomf/NixoScope";
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "protoc-gen-go-grpc";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
modRoot = "cmd/protoc-gen-go-grpc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc-go";
|
||||
rev = "cmd/protoc-gen-go-grpc/v${finalAttrs.version}";
|
||||
hash = "sha256-Ay8X7NoS81ubMtFMrvQINhGAFV/Yh75AXh7/Y9lCJDo=";
|
||||
hash = "sha256-s6GZ9K0Wy18YF1RBL0RGDCbtCfAV2bskq6DNXwyorgg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s26T7pht7YU1LJIM3edtuPb+KVezqG3m+8CxM+l1ty4=";
|
||||
vendorHash = "sha256-+D3prb03c/Vgm+p3CxCZw14UMCvrDc1Cllzn1znZAE0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -27,6 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = {
|
||||
description = "Go language implementation of gRPC. HTTP/2 based RPC";
|
||||
|
||||
Executable
+68
@@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ ps.httpx ])" nix-update
|
||||
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
import httpx
|
||||
|
||||
|
||||
URL = "https://api.github.com/repos/grpc/grpc-go/git/matching-refs/tags/cmd/protoc-gen-go-grpc/v"
|
||||
TAG_RE = re.compile(r"^refs/tags/(cmd/protoc-gen-go-grpc/v(\d+)\.(\d+)\.(\d+))$")
|
||||
|
||||
|
||||
def get_latest_tag() -> str:
|
||||
headers = {
|
||||
"Accept": "application/vnd.github+json",
|
||||
}
|
||||
token = os.getenv("GITHUB_TOKEN")
|
||||
if token:
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
|
||||
with httpx.Client(timeout=30.0, follow_redirects=True) as client:
|
||||
response = client.get(URL, headers=headers)
|
||||
response.raise_for_status()
|
||||
refs = response.json()
|
||||
|
||||
if not isinstance(refs, list):
|
||||
raise RuntimeError("Unexpected response from GitHub API")
|
||||
|
||||
best_tag = None
|
||||
best_version = None
|
||||
for ref in refs:
|
||||
if not isinstance(ref, dict):
|
||||
continue
|
||||
ref_name = ref.get("ref", "")
|
||||
match = TAG_RE.fullmatch(ref_name)
|
||||
if match is None:
|
||||
continue
|
||||
version = tuple(int(part) for part in match.groups()[1:])
|
||||
if best_version is None or version > best_version:
|
||||
best_version = version
|
||||
best_tag = match.group(1)
|
||||
|
||||
if best_tag is None:
|
||||
raise RuntimeError("No matching protoc-gen-go-grpc tags found")
|
||||
|
||||
return best_tag
|
||||
|
||||
|
||||
def main() -> int:
|
||||
latest_tag = get_latest_tag()
|
||||
version = latest_tag.removeprefix("cmd/protoc-gen-go-grpc/v")
|
||||
|
||||
subprocess.run(
|
||||
[
|
||||
"nix-update",
|
||||
"protoc-gen-go-grpc",
|
||||
"--version",
|
||||
version,
|
||||
],
|
||||
check=True,
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qiec104";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MicroKoder";
|
||||
repo = "QIEC104";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/kIAWxeJATKSEqXfRA3/6+TbHVeaIWZqsMYumvj2OuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt5.qmake
|
||||
qt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "qiec104";
|
||||
desktopName = "Q104";
|
||||
comment = finalAttrs.meta.description;
|
||||
exec = finalAttrs.meta.mainProgram;
|
||||
icon = "Q104";
|
||||
terminal = false;
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
install -Dm755 Q104 -t $out/bin
|
||||
install -Dm644 icons/Q104.png -t $out/share/icons/hicolor/128x128/apps
|
||||
''}
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv Q104.app $out/Applications
|
||||
ln -s $out/Applications/Q104.app/Contents/MacOS/Q104 $out/bin/Q104
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Small IEC104 client";
|
||||
homepage = "https://github.com/MicroKoder/QIEC104";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "Q104";
|
||||
};
|
||||
})
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Roaring Penguin Point-to-Point over Ethernet tool";
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://github.com/dfskoll/rp-pppoe";
|
||||
homepage = "https://dianne.skoll.ca/projects/rp-pppoe/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ DictXiong ];
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "secretspec";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2rg6A0TitVf5Q9+DdtDNt0YaUyVSCzAuAJX87RTCbpU=";
|
||||
hash = "sha256-xlri/PeTUVcubwUUi2mF6eaBIzwANKiNtTOrzm2X//g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uOx1vXrQUmjtBM3fg56wBhrOZCYbrex8gHAvhXTkDzw=";
|
||||
cargoHash = "sha256-1l5qeFq7F37LbQZZPAmw3PyUg8jcF5SxhFAtrR81Gj4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus ];
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shotcut";
|
||||
version = "25.10.31";
|
||||
version = "26.2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "shotcut";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EUcYUhOZeTMCazl6TH3t1aP0cRhPXC4WKQlAiUkVoyw=";
|
||||
hash = "sha256-dOkk2LGFtuCvec8NGoSIjAXQsCZcnx2fB3h6KWFeHj4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
woffs
|
||||
peti
|
||||
nick-linux
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "shotcut";
|
||||
|
||||
@@ -3,30 +3,37 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spirit";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "block";
|
||||
repo = "spirit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lgDEYIc6NgDkqoYdwluaZ9VCockE3gbyP8O7LfoTrl0=";
|
||||
hash = "sha256-smTrNUhDNMBA7ozmFB9lm7egbSb/3TdIhasINqUHXzQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WSMziaE6ldYa915fAAecXGmJkFhh8Sk/IHjfBqXf9FI=";
|
||||
vendorHash = "sha256-dC+qryYDiYPuMlgkHsXYOsqHxl1O5QtGUFbNnkRE3eU=";
|
||||
|
||||
subPackages = [ "cmd/spirit" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
"-X=main.commit=${finalAttrs.src.rev}"
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sqruff";
|
||||
version = "0.34.1";
|
||||
version = "0.35.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quarylabs";
|
||||
repo = "sqruff";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yk4ejrIs8/8RVvXS2V2ZTBn6zawVO502Xeeb8rjU6e4=";
|
||||
hash = "sha256-Ksd/nt5zUyfRXDeBU8N56UvIriG2biE2tGlIF2Wy1iI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4jB1chciQaR/RYhRTfwWOOUIZgePezl8lAngpfoSuJc=";
|
||||
cargoHash = "sha256-bIU1a7GcmzjGl8Plik0MOLFe5ToReuowLzVwRAen1h4=";
|
||||
|
||||
# Disable the `python` feature which doesn't work on Nix yet
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tempo";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-XhtG3+0Xy7Bi3RuY5MNcHB7Hp6lXjzksdGu7eztXmnU=";
|
||||
hash = "sha256-gnUXvEC0Uu/x4ywHl7ziTUyzExo5AQ9C+rZbW68IDlI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 300f6e39cfc1723f0c703a3050cf0c2fd943baee Mon Sep 17 00:00:00 2001
|
||||
From: Michael Daniels <mdaniels5757@gmail.com>
|
||||
Date: Sun, 15 Mar 2026 10:14:06 -0400
|
||||
Subject: [PATCH] fix cross-compilation with capnproto
|
||||
|
||||
See https://github.com/capnproto/capnproto/issues/1802
|
||||
---
|
||||
tiledb/CMakeLists.txt | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/tiledb/CMakeLists.txt b/tiledb/CMakeLists.txt
|
||||
index 8bf8559ed..1b5adb80c 100644
|
||||
--- a/tiledb/CMakeLists.txt
|
||||
+++ b/tiledb/CMakeLists.txt
|
||||
@@ -617,6 +617,11 @@ target_include_directories(TILEDB_CORE_OBJECTS
|
||||
# Serialization
|
||||
if(TILEDB_SERIALIZATION)
|
||||
find_package(CapnProto REQUIRED)
|
||||
+ find_program(CAPNP_EXECUTABLE_HOST capnp REQUIRED)
|
||||
+ set_target_properties(CapnProto::capnp_tool PROPERTIES
|
||||
+ IMPORTED_LOCATION ${CAPNP_EXECUTABLE_HOST}
|
||||
+ )
|
||||
+
|
||||
target_link_libraries(TILEDB_CORE_OBJECTS_ILIB
|
||||
INTERFACE
|
||||
CapnProto::capnp
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-wzeWLwwsZXtrKsmlglZG7YvIki/ba7IwsDBq+40ltcg=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-cross-compilation-with-capnproto.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tiledb/sm/misc/test/unit_parse_argument.cc \
|
||||
--replace-fail '"catch.hpp"' '<catch2/catch_all.hpp>'
|
||||
@@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";
|
||||
|
||||
nativeBuildInputs = [
|
||||
capnproto
|
||||
clang-tools
|
||||
cmake
|
||||
python3
|
||||
@@ -92,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zstd
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cmake --build . --target update-serialization
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wakatime-cli";
|
||||
version = "1.139.1";
|
||||
version = "1.139.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "wakatime-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yqEoFXVP64WcGCCAtMd1bYStCnsd9T8chQWgjaVkwkk=";
|
||||
hash = "sha256-kFZEg71tV5Afe6wzhatNwH3lE1Lr+CnH0AHy+e/DSMA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1BtTtR8wPVzzOEGv3te3hOeKakZX7cS+HYvoCLnuZ/c=";
|
||||
|
||||
@@ -2,18 +2,21 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "httpagentparser";
|
||||
version = "1.9.5";
|
||||
format = "setuptools";
|
||||
version = "1.9.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-U879nWWZD2/lnAN4ytjqG53493DS6L2dh2LtrgM76Ao=";
|
||||
hash = "sha256-I7yvCTJbF692NCg8pk2iP0hcXYO5SB/22IQTp8W8bek=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# PyPi version does not include test directory
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "normality";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pudo";
|
||||
repo = "normality";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-X8ssSURC3NiQ1uf2qv1PgCBIYQnmoYVKPn5YPdJG71o=";
|
||||
hash = "sha256-A3uaGAa3SQSNM73h/OlwvMc5FKbZvdsE6S07C/sEbSc=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proton-vpn-local-agent";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
pyproject = false;
|
||||
withDistOutput = false;
|
||||
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "ProtonVPN";
|
||||
repo = "local-agent-rs";
|
||||
rev = version;
|
||||
hash = "sha256-rk3wi6q0UDuwh5yhLBqdLYsJxVqhlI+Yc7HZsiAU1Y8=";
|
||||
hash = "sha256-QELvjPJhS8nsQqNucwhMjbwDVg2YiESuhSB1XCN0o90=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-jjSkPgGp3Yvypnlrt9pV1F/K3o2doNteQs1rwr5fhnM=";
|
||||
hash = "sha256-28WEWWI29EYADq/z7C01LxaeBJw8oWiF24iLpduJZ5w=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python-proton-vpn-local-agent";
|
||||
|
||||
@@ -3,36 +3,51 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
unittestCheckHook,
|
||||
poetry-core,
|
||||
setuptools,
|
||||
netaddr,
|
||||
pytestCheckHook,
|
||||
sphinxHook,
|
||||
sphinx-rtd-theme,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyrad";
|
||||
version = "2.4-unstable-2025-12-02";
|
||||
version = "2.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyradius";
|
||||
repo = "pyrad";
|
||||
rev = "56649fc522faeb4bc105ac6d0f95b080e97c89aa";
|
||||
hash = "sha256-F+6ejSvIJDcLLb1o3m6r1es/PObB8H6eeSkAETJaftc=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-94BjJRzCSJu/bVuYYKFlJkBcOVcQjmbDJ8QG+JwVpxY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ netaddr ];
|
||||
|
||||
# Upstream doesn't exclude docs, example, and pyrad.tests from package
|
||||
# discovery, causing them to be installed into site-packages.
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'repository =' 'Repository ='
|
||||
--replace-fail 'exclude = ["tests*"]' 'exclude = ["docs*", "example*", "pyrad.tests*"]'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
nativeBuildInputs = [
|
||||
sphinxHook
|
||||
sphinx-rtd-theme
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pyrad" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Python RADIUS Implementation";
|
||||
@@ -40,4 +55,4 @@ buildPythonPackage {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,37 +23,17 @@
|
||||
cupy,
|
||||
# cli
|
||||
typer,
|
||||
# test
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-cov,
|
||||
pytest-accept ? null, # TODO: Package
|
||||
# optional
|
||||
rich,
|
||||
mypy,
|
||||
numpydoc,
|
||||
universal-pathlib,
|
||||
|
||||
# test
|
||||
hypothesis,
|
||||
pytest-xdist,
|
||||
numpydoc,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
tomlkit,
|
||||
uv,
|
||||
# remote_tests
|
||||
botocore,
|
||||
s3fs,
|
||||
moto,
|
||||
requests,
|
||||
# optional
|
||||
universal-pathlib,
|
||||
# docs
|
||||
mkdocs-material,
|
||||
mkdocs,
|
||||
mkdocstrings,
|
||||
mkdocstrings-python,
|
||||
mike,
|
||||
mkdocs-redirects,
|
||||
markdown-exec ? null, # TODO: Package
|
||||
griffe-inherited-docstrings ? null, # TODO: Package,
|
||||
ruff,
|
||||
towncrier,
|
||||
astroid,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -94,67 +74,22 @@ buildPythonPackage (finalAttrs: {
|
||||
cli = [
|
||||
typer
|
||||
];
|
||||
# Development extras
|
||||
test = [
|
||||
#pytest
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytest-accept
|
||||
rich
|
||||
mypy
|
||||
numpydoc
|
||||
hypothesis
|
||||
# From some reason the existence of pytest-xdist makes the tests fail
|
||||
# depending on $NIX_BUILD_CORES
|
||||
#pytest-xdist
|
||||
packaging
|
||||
tomlkit
|
||||
uv
|
||||
];
|
||||
remote_tests = [
|
||||
botocore
|
||||
s3fs
|
||||
moto
|
||||
requests
|
||||
]
|
||||
++ moto.optional-dependencies.server
|
||||
++ moto.optional-dependencies.s3;
|
||||
optional = [
|
||||
rich
|
||||
universal-pathlib
|
||||
];
|
||||
docs = [
|
||||
# Doc building
|
||||
mkdocs-material
|
||||
mkdocs
|
||||
mkdocstrings
|
||||
mkdocstrings-python
|
||||
mike
|
||||
mkdocs-redirects
|
||||
markdown-exec
|
||||
griffe-inherited-docstrings
|
||||
ruff
|
||||
towncrier # Changelog generation
|
||||
# Optional dependencies to run examples
|
||||
rich
|
||||
s3fs
|
||||
astroid
|
||||
#pytest
|
||||
]
|
||||
++ mkdocs-material.optional-dependencies.imaging
|
||||
++ lib.optionals (markdown-exec != null) markdown-exec.optional-dependencies.ansi
|
||||
++ numcodecs.optional-dependencies.msgpack;
|
||||
};
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
numpydoc
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
tomlkit
|
||||
uv
|
||||
]
|
||||
++ finalAttrs.finalPackage.passthru.optional-dependencies.cli
|
||||
# Not adding `passthru.optional-dependencies.remote{,_tests}` since the
|
||||
# existence of these Python modules triggers tests that fail in the sandbox
|
||||
# due to failed network requests.
|
||||
++ finalAttrs.finalPackage.passthru.optional-dependencies.test;
|
||||
++ finalAttrs.finalPackage.passthru.optional-dependencies.cli;
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires uv and then fails at setting up python envs
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "BottlecapDave";
|
||||
domain = "octopus_energy";
|
||||
version = "18.1.0";
|
||||
version = "18.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "HomeAssistant-OctopusEnergy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V8y/td0873X+rXxu9kQGQq0D3Vs+TuPk4KTqd3oagtE=";
|
||||
hash = "sha256-wqhll0K5WKZDGWftaYLVd6uDS4w8mKU4yO4a4FLqseA=";
|
||||
};
|
||||
|
||||
dependencies = [ pydantic ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "AN3Orik";
|
||||
domain = "systemair";
|
||||
version = "1.0.22";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "systemair";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GzIIjaRFeZAo065Dn0fpU4Ou5+8wIVQ7ImLmukjTxOQ=";
|
||||
hash = "sha256-8cYoqTf8EKlvnSA8C3LHVQGwWrCacHzKGYaUlxyCXgk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2061,7 +2061,8 @@ with pkgs;
|
||||
|
||||
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
|
||||
|
||||
inherit mozc mozc-ut;
|
||||
mozc = mozc.override { withIbus = true; };
|
||||
mozc-ut = mozc-ut.override { withIbus = true; };
|
||||
|
||||
openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard {
|
||||
withIbusSupport = true;
|
||||
@@ -9543,6 +9544,8 @@ with pkgs;
|
||||
pname = "firefox-bin";
|
||||
};
|
||||
|
||||
firefoxpwa = wrapFirefox firefoxpwa-unwrapped { };
|
||||
|
||||
librewolf = wrapFirefox librewolf-unwrapped {
|
||||
inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;
|
||||
libName = "librewolf";
|
||||
|
||||
Reference in New Issue
Block a user