Merge staging-next into staging
This commit is contained in:
@@ -1610,12 +1610,12 @@ final: prev: {
|
||||
|
||||
base16-nvim = buildVimPlugin {
|
||||
pname = "base16-nvim";
|
||||
version = "0-unstable-2026-06-21";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RRethy";
|
||||
repo = "base16-nvim";
|
||||
rev = "21233d5fd574439ae1e2f5e4bfbc574214f4ab3d";
|
||||
hash = "sha256-Dizi44p6XYaQlXEL5qnfJFX44nXKIAkZAZvQ5QH11eA=";
|
||||
rev = "012273e4bbf3e143224a272ad2efd10b69a000ba";
|
||||
hash = "sha256-8npfL3fYQ05dHWGm46bdRS3tMOyooXhyxM0gpI0Ompw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/RRethy/base16-nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -1638,12 +1638,12 @@ final: prev: {
|
||||
|
||||
base46 = buildVimPlugin {
|
||||
pname = "base46";
|
||||
version = "0-unstable-2026-07-09";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "base46";
|
||||
rev = "a972909f1d7ba798b93b56631bc2cd5e96ea40da";
|
||||
hash = "sha256-7WqUWfziecAeGtbKBU6/FESY/pf56bEGKhvnxcm/gNI=";
|
||||
rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b";
|
||||
hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/base46/";
|
||||
meta.license = unfree;
|
||||
@@ -3568,12 +3568,12 @@ final: prev: {
|
||||
|
||||
codecompanion-nvim = buildVimPlugin {
|
||||
pname = "codecompanion.nvim";
|
||||
version = "19.18.0";
|
||||
version = "19.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "codecompanion.nvim";
|
||||
tag = "v19.18.0";
|
||||
hash = "sha256-4O0UuJuuv4gmyxiZlLMG/sKlt84SW2ZooeOlFlK6/7I=";
|
||||
tag = "v19.19.0";
|
||||
hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE=";
|
||||
};
|
||||
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-09";
|
||||
version = "0-unstable-2026-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "47a2b8157b05433268564672bd2e9667bb287c9d";
|
||||
hash = "sha256-affL0j96Hp+Ffry2KF69dR2hQfLSY2kRYoexvd38r5A=";
|
||||
rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5";
|
||||
hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
@@ -5433,12 +5433,12 @@ final: prev: {
|
||||
|
||||
easy-dotnet-nvim = buildVimPlugin {
|
||||
pname = "easy-dotnet.nvim";
|
||||
version = "0-unstable-2026-07-03";
|
||||
version = "0-unstable-2026-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GustavEikaas";
|
||||
repo = "easy-dotnet.nvim";
|
||||
rev = "24a927e168789103137156e980e2635956e90b3c";
|
||||
hash = "sha256-uo3/DBMPv67UOQJscAW6aoc7c5IDJdQta7f8/1kI9dQ=";
|
||||
rev = "26b939e2e013ddfc137a8e6149cda1f0b62303ca";
|
||||
hash = "sha256-M6uNfKiHviaJyItvvAdEplB+pdqF4N5DOwxG2oPYwpg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -5995,12 +5995,12 @@ final: prev: {
|
||||
|
||||
flash-nvim = buildVimPlugin {
|
||||
pname = "flash.nvim";
|
||||
version = "2.1.0-unstable-2025-10-28";
|
||||
version = "2.1.0-unstable-2026-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "flash.nvim";
|
||||
rev = "fcea7ff883235d9024dc41e638f164a450c14ca2";
|
||||
hash = "sha256-pHh0tJd/ynfjriu8xjnKunKVDHkoXii6ZbikdkIwovY=";
|
||||
rev = "b6346946d10d07998efee029fb0f7a593806d0cd";
|
||||
hash = "sha256-1v2+iq4/TnJq37iiGedIKFf6PxlTHQac8RXECZ2HYdM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/flash.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -6737,11 +6737,11 @@ final: prev: {
|
||||
|
||||
gitportal-nvim = buildVimPlugin {
|
||||
pname = "gitportal.nvim";
|
||||
version = "0-unstable-2026-06-26";
|
||||
version = "0-unstable-2026-07-10";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/trevorhauter/gitportal.nvim/";
|
||||
rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb";
|
||||
hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk=";
|
||||
rev = "d2efb8d1bf141c77cfa1b5311995912bc36671d0";
|
||||
hash = "sha256-ofRP84DSgrXyNXXZjM82n1AhsfleDU6k7r4+R9sof40=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -8752,12 +8752,12 @@ final: prev: {
|
||||
|
||||
lexima-vim = buildVimPlugin {
|
||||
pname = "lexima.vim";
|
||||
version = "2.1.0-unstable-2025-05-15";
|
||||
version = "2.1.0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cohama";
|
||||
repo = "lexima.vim";
|
||||
rev = "ab621e4756465c9d354fce88cff2bd1aa7887065";
|
||||
hash = "sha256-NtHCfuL2Tq1a4Xevx+xAbnzsKqnPAbU/l7JvK7p0evU=";
|
||||
rev = "9f6942c5e1f0f6fe63bdcdac515f34c484b970f5";
|
||||
hash = "sha256-hU/MmP5Ykb52vCJvlMtQipKe4LGC7d+lH//r8ysDELE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cohama/lexima.vim/";
|
||||
meta.license = unfree;
|
||||
@@ -11034,12 +11034,12 @@ final: prev: {
|
||||
|
||||
neoconf-nvim = buildVimPlugin {
|
||||
pname = "neoconf.nvim";
|
||||
version = "1.4.0-unstable-2026-07-09";
|
||||
version = "1.4.0-unstable-2026-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neoconf.nvim";
|
||||
rev = "f6c1c4832932d336feb77befa30074cd1a998f3d";
|
||||
hash = "sha256-1IPVcaU+I2MRz+ATZ9nQafzccEHn9UfmaLkfR1YB2e0=";
|
||||
rev = "e3a0a2bfcc5e7dc26f11e102e26ff6c1f43582fb";
|
||||
hash = "sha256-fflB8jO6lwvLctuKDAdobWvksHEfNNrHsx6pEJdmwEQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neoconf.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -11681,12 +11681,12 @@ final: prev: {
|
||||
|
||||
neotest-vitest = buildVimPlugin {
|
||||
pname = "neotest-vitest";
|
||||
version = "0.2.0-unstable-2026-06-29";
|
||||
version = "0.2.0-unstable-2026-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marilari88";
|
||||
repo = "neotest-vitest";
|
||||
rev = "ab5a73d6ec9d33e807d6c67ce5169c4ca4a5d7f3";
|
||||
hash = "sha256-daeDCN58hMAesXEBhc4gbN2ISGQ0orIUNhL2ApB3E+s=";
|
||||
rev = "c3c69715da4b158069fd4262083e7219a5c14cfb";
|
||||
hash = "sha256-BPERc4+iWEu1UWDXv+MaSUXJR4KNFFAqrPXxyJCSe9I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/marilari88/neotest-vitest/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -12254,12 +12254,12 @@ final: prev: {
|
||||
|
||||
nvchad-ui = buildVimPlugin {
|
||||
pname = "nvchad-ui";
|
||||
version = "0-unstable-2026-07-09";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "ui";
|
||||
rev = "5cfd3c8f2c3e6603d52d8f6c0b715743bbb5270d";
|
||||
hash = "sha256-TgBx2alqrazm2JSu4afsZ0tnKWHqpclpBly/0SxYpxs=";
|
||||
rev = "28019401865beffcedc744bb1506d0201b88f2f9";
|
||||
hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/ui/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
@@ -12436,12 +12436,12 @@ final: prev: {
|
||||
|
||||
nvim-colorizer-lua = buildVimPlugin {
|
||||
pname = "nvim-colorizer.lua";
|
||||
version = "0-unstable-2026-05-30";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catgoose";
|
||||
repo = "nvim-colorizer.lua";
|
||||
rev = "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde";
|
||||
hash = "sha256-qVFQGJMGr0htwZqarhMdh7yG6SSH/rv8yqmp1CsoT3I=";
|
||||
rev = "149fbd9f5e25511b0a8bad3ccecd43d1bc584f86";
|
||||
hash = "sha256-jRqUMQuJVxMfQpLZ0A7hlwIXPqcip990Ay5X140uh0Y=";
|
||||
};
|
||||
meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
|
||||
meta.license = unfree;
|
||||
@@ -14194,12 +14194,12 @@ final: prev: {
|
||||
|
||||
octo-nvim = buildVimPlugin {
|
||||
pname = "octo.nvim";
|
||||
version = "0-unstable-2026-06-29";
|
||||
version = "0-unstable-2026-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwntester";
|
||||
repo = "octo.nvim";
|
||||
rev = "b9a73e167f851a98d8f29d62658d3640bb8a7314";
|
||||
hash = "sha256-v6vM3ajWF3yI2QA1pSqzo2zsbQohX1kmaI81b1Aqusc=";
|
||||
rev = "8476766529b7c0ee9b7da12b6dbce1b716bb62cd";
|
||||
hash = "sha256-Ahxcp7UCoISeLOhZAkX966lyHk8jiSwWy9SAlUnzJo4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -15737,12 +15737,12 @@ final: prev: {
|
||||
|
||||
roslyn-nvim = buildVimPlugin {
|
||||
pname = "roslyn.nvim";
|
||||
version = "0-unstable-2026-07-08";
|
||||
version = "0-unstable-2026-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "seblyng";
|
||||
repo = "roslyn.nvim";
|
||||
rev = "05ffc134f0b70ce2715c761745f1f78321fcfa9b";
|
||||
hash = "sha256-LLD9Vm3E1Vmp8P5dF1TAzHvRyGxmjpYSOvGksmhtEHc=";
|
||||
rev = "b4954e97e145bd8129b3bbe99809759f6ced2235";
|
||||
hash = "sha256-AuJNxfvNYnqPvihxBn1vADdvwoDNInVbOLS0Pq5q9v8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -16227,12 +16227,12 @@ final: prev: {
|
||||
|
||||
smart-splits-nvim = buildVimPlugin {
|
||||
pname = "smart-splits.nvim";
|
||||
version = "2.1.0-unstable-2026-07-04";
|
||||
version = "2.1.0-unstable-2026-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "smart-splits.nvim";
|
||||
rev = "ebf4d8bbc16570817c0f5275468466b9d00b8d7d";
|
||||
hash = "sha256-mqmD7cZ2B+VuIyW/yv+N8nJquRX31tXw1tz1qvSMmus=";
|
||||
rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad";
|
||||
hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -16506,12 +16506,12 @@ final: prev: {
|
||||
|
||||
spellwarn-nvim = buildVimPlugin {
|
||||
pname = "spellwarn.nvim";
|
||||
version = "0-unstable-2026-03-05";
|
||||
version = "0-unstable-2026-07-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ravibrock";
|
||||
repo = "spellwarn.nvim";
|
||||
rev = "c98cfca978791cae3edaced7056bd340debee8fe";
|
||||
hash = "sha256-rLsiBIifNC8zwUNsAJ8AeTlDS9IS/y3XEKfF5FZ2hZI=";
|
||||
rev = "3e818a7da69bfb342e2d84fdef9cb9f639d047d3";
|
||||
hash = "sha256-WHXJaSTB91B0S3YizCJLBriGQDvYQKVK3I8WT97YQEc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ravibrock/spellwarn.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -18826,12 +18826,12 @@ final: prev: {
|
||||
|
||||
vifm-vim = buildVimPlugin {
|
||||
pname = "vifm.vim";
|
||||
version = "0.14-unstable-2026-06-07";
|
||||
version = "0.14-unstable-2026-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vifm";
|
||||
repo = "vifm.vim";
|
||||
rev = "6bffbab9c448f2814217ea2f7f982ad73b8fa718";
|
||||
hash = "sha256-/8lN8y20+g9pWzBrXgVArgZQq0CfXyLGRVDpweDmguE=";
|
||||
rev = "9102ad4198c4f3adeef4b039c042866eb9345cdd";
|
||||
hash = "sha256-BLI7TEtSfXG1Md8lBnejJ3vUuXh3LJyZH6PJGHMoCuI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vifm/vifm.vim/";
|
||||
meta.license = unfree;
|
||||
@@ -20814,12 +20814,12 @@ final: prev: {
|
||||
|
||||
vim-flog = buildVimPlugin {
|
||||
pname = "vim-flog";
|
||||
version = "3.0.0-unstable-2025-03-19";
|
||||
version = "3.0.0-unstable-2026-07-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbong";
|
||||
repo = "vim-flog";
|
||||
rev = "665b16ac8915f746bc43c9572b4581a5e9047216";
|
||||
hash = "sha256-x8fUmcuBLEQwZD+m7gEanpPppukRa6NoalNehY/2JuM=";
|
||||
rev = "c8a573b5a829d0a3ed1b72c87dd62d832b665e87";
|
||||
hash = "sha256-BKnp7LKONUT/BRu7kS8Yvmj7xcFgrTWxHtz2wyAhtYg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rbong/vim-flog/";
|
||||
meta.license = unfree;
|
||||
@@ -21543,12 +21543,12 @@ final: prev: {
|
||||
|
||||
vim-illuminate = buildVimPlugin {
|
||||
pname = "vim-illuminate";
|
||||
version = "0-unstable-2026-07-03";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RRethy";
|
||||
repo = "vim-illuminate";
|
||||
rev = "8629e6b2dfa8c66677b9d489eb02480cbcfa9599";
|
||||
hash = "sha256-lvcm3OA1jYmwhyD9yLYT829s70jGBgEPEgfenlGSJnY=";
|
||||
rev = "91313e598ca62e110bc71535c49069b66b9883c9";
|
||||
hash = "sha256-3HM1aqFasEWXHaLQbJnax6Spw71TVd23BjsmH8jdTtQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -21894,12 +21894,12 @@ final: prev: {
|
||||
|
||||
vim-just = buildVimPlugin {
|
||||
pname = "vim-just";
|
||||
version = "0-unstable-2026-06-12";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoahTheDuke";
|
||||
repo = "vim-just";
|
||||
rev = "49f318424ed17fb8d49122daa39820fd6a2880f5";
|
||||
hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U=";
|
||||
rev = "b3301b091c730061a6da1f9fab670eece6af187c";
|
||||
hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug=";
|
||||
};
|
||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -22202,12 +22202,12 @@ final: prev: {
|
||||
|
||||
vim-lsp-settings = buildVimPlugin {
|
||||
pname = "vim-lsp-settings";
|
||||
version = "0.0.1-unstable-2026-06-11";
|
||||
version = "0.0.1-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "vim-lsp-settings";
|
||||
rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200";
|
||||
hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs=";
|
||||
rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f";
|
||||
hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -25799,12 +25799,12 @@ final: prev: {
|
||||
|
||||
y9nika-nvim = buildVimPlugin {
|
||||
pname = "y9nika.nvim";
|
||||
version = "0-unstable-2026-05-26";
|
||||
version = "0-unstable-2026-07-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "y9san9";
|
||||
repo = "y9nika.nvim";
|
||||
rev = "0fc35319498d8e4509601546f4efb423026e53a1";
|
||||
hash = "sha256-0S2+9L1gW6Rbh1lUP+EGJ0AGIUnNAiTlrGAEJrbm7rc=";
|
||||
rev = "18827266802e8e105c724c72a84c2c59beb5d90f";
|
||||
hash = "sha256-CzEqiuag+4RKOCjM4P2qp3ux9LMcRpQNA8t9r8RzXRc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -26053,11 +26053,11 @@ final: prev: {
|
||||
|
||||
zig-vim = buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2026-07-08";
|
||||
version = "0-unstable-2026-07-12";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/ziglang/zig.vim/";
|
||||
rev = "71f3454efc5cf781aba507f709b921993d096731";
|
||||
hash = "sha256-oiZv49qsZIHfB+OtxCYwC+CzpI1cJnEdyhDMZS3DGO8=";
|
||||
rev = "1ba233de1f93ae7cf5c0903541e6ad422207b089";
|
||||
hash = "sha256-rbzX8wJKczk/dKpjPnNouf/LhpFmN9/zRNzEc0QhHm0=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/ziglang/zig.vim/";
|
||||
meta.license = unfree;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "acme";
|
||||
version = "unstable-2021-11-05";
|
||||
version = "0.97-unstable-2021-11-05";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
|
||||
|
||||
@@ -1,22 +1,11 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
babashka-unwrapped,
|
||||
callPackage,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
rlwrap,
|
||||
clojureToolsBabashka ? callPackage ./clojure-tools.nix { },
|
||||
jdkBabashka ? clojureToolsBabashka.jdk,
|
||||
|
||||
# rlwrap is a small utility to allow the editing of keyboard input, see
|
||||
# https://book.babashka.org/#_repl
|
||||
#
|
||||
# NOTE In some cases, rlwrap prints some extra empty lines. That behavior can
|
||||
# break some babashka scripts. For this reason, it is disabled by default. See:
|
||||
# https://github.com/NixOS/nixpkgs/issues/246839
|
||||
# https://github.com/NixOS/nixpkgs/pull/248207
|
||||
withRlwrap ? false,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "babashka";
|
||||
@@ -30,28 +19,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
unwrapped-bin = "${babashka-unwrapped}/bin/bb";
|
||||
in
|
||||
''
|
||||
mkdir -p $out/clojure_tools
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
|
||||
installPhase = ''
|
||||
mkdir -p $out/clojure_tools
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
|
||||
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
|
||||
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
''
|
||||
+ lib.optionalString withRlwrap ''
|
||||
substituteInPlace $out/bin/bb \
|
||||
--replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"'
|
||||
'';
|
||||
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
${babashka-unwrapped.installCheckPhase}
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ud1zdA38k5RW6qlmPQGnkYUIHOhiHNYWmlXbEzJsIUk=";
|
||||
hash = "sha256-Lll/ywDkHv0xvLk8iiBEySek7A3dBmfO4V/q2xaNtBQ=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "chirpstack-rest-api";
|
||||
version = "4.18.0";
|
||||
version = "4.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-rest-api";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-d8DoU5iqBtWLu8I0xzM8+ny16iylAbjRku7EC1m0o50=";
|
||||
hash = "sha256-DOQ6S0o9kWYdIoR/SWW29hhsVJ9gKE3cRHrunhXHXJg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b0m3a0U/XgRFR1lvfOUB1yQFZZ9j558WBiymnysjuGg=";
|
||||
vendorHash = "sha256-5TEXM7sigSN6NpWUC3bv4rXhuArz1j8+R8P/arXa5rg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cloudquery";
|
||||
version = "6.36.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudquery";
|
||||
repo = "cloudquery";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D0gciTH5OwYXBPabOmn6bMHyWZwS6y5uAQIdNS+WugE=";
|
||||
};
|
||||
|
||||
modRoot = "cli";
|
||||
|
||||
vendorHash = "sha256-gY/FQ71Nwk9i7QXgMmOVlJe9lEW9ViPZ3Eh1NusIizE=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/cloudquery/cloudquery/cli/v${lib.versions.major finalAttrs.version}/cmd.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/cloudquery
|
||||
|
||||
installShellCompletion --cmd cloudquery \
|
||||
--bash <($out/bin/cloudquery completion bash) \
|
||||
--fish <($out/bin/cloudquery completion fish) \
|
||||
--zsh <($out/bin/cloudquery completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Data pipelines for cloud config and security data";
|
||||
homepage = "https://github.com/cloudquery/cloudquery";
|
||||
changelog = "https://github.com/cloudquery/cloudquery/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ jlesquembre ];
|
||||
mainProgram = "cloudquery";
|
||||
};
|
||||
})
|
||||
@@ -68,13 +68,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "collectl";
|
||||
version = "4.3.20.2";
|
||||
version = "4.3.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkcz";
|
||||
repo = "collectl";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I=";
|
||||
hash = "sha256-hokovb6uqPiMFlDS0g2F/J1rHTkyNBegcgOC3g3ykEs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -17,6 +18,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k=";
|
||||
};
|
||||
|
||||
# Fix Python 3.14 test failures. Remove with the next release.
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "drop-codecs-open.patch";
|
||||
url = "https://github.com/cpplint/cpplint/commit/89bff410afed72e58d23ae084de4103986ea8630.patch?full_index=1";
|
||||
hash = "sha256-Jdeewj3GM7GMoRF7+Qz/9n1hc8PYPcXLgtSGwSUpT1E=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "use-universal-newlines.patch";
|
||||
url = "https://github.com/cpplint/cpplint/commit/d15a8715a6e848f784fda700758c4ac2d252fd31.patch?full_index=1";
|
||||
hash = "sha256-Oo2doknEGnuxDJA0y17n1DCaKwadtMW/14a5wnIgfkw=";
|
||||
})
|
||||
];
|
||||
|
||||
# We use pytest-cov-stub instead
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dtop";
|
||||
version = "0.7.7";
|
||||
version = "0.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amir20";
|
||||
repo = "dtop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kYSOJCQfoYXhdZ3cyRv/+Ifov4VzOv0gqvjueVMmnuQ=";
|
||||
hash = "sha256-1OHtMV2GmZQIx2pVujOXoQOkc6hJdJZjca4kk4HyESM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fspIjgctyhQwyDygrSrtJBb/EYxY8o00/UJy/z89yso=";
|
||||
cargoHash = "sha256-OHjgG5qHBz0Q74uWLkN9Ok0NiVeT71qpEjzFdMFWlfs=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "element-desktop";
|
||||
version = "1.12.22";
|
||||
version = "1.12.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g=";
|
||||
hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8=";
|
||||
hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "element-web";
|
||||
version = "1.12.22";
|
||||
version = "1.12.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g=";
|
||||
hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8=";
|
||||
hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "flexget";
|
||||
version = "3.19.26";
|
||||
version = "3.19.28";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QWVCCV8R1gBw647slTtOYX7IQZNC2EmQQiloQNlgcUQ=";
|
||||
hash = "sha256-NEBE39rqYegFO7f1fd0rTIZzkamuQM+5d3dD/zYHCoU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
binaryen
|
||||
extism-js
|
||||
nodejs
|
||||
pkg-config
|
||||
pnpmConfigHook
|
||||
@@ -174,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
|
||||
rm node_modules/.pnpm/node_modules/exiftool-vendored.pl
|
||||
|
||||
pnpm --filter immich... build
|
||||
pnpm --filter immich... --filter immich-web... --filter @immich/plugin-core... build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -196,9 +198,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
-o -name '*.target.mk' \
|
||||
\) -exec rm -r {} +
|
||||
|
||||
mkdir -p "$packageOut/build/plugins"
|
||||
ln -s '${finalAttrs.plugin-core}' "$packageOut/build/plugins/immich-plugin-core"
|
||||
ln -s '${finalAttrs.web}' "$packageOut/build/www"
|
||||
mkdir -p "$packageOut/build/plugins/immich-plugin-core"
|
||||
cp -r packages/plugin-core/{dist,manifest.json} "$packageOut/build/plugins/immich-plugin-core/"
|
||||
cp -r web/build "$packageOut/build/www"
|
||||
ln -s '${geodata}' "$packageOut/build/geodata"
|
||||
|
||||
echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"
|
||||
@@ -222,65 +224,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
plugin-core = stdenv.mkDerivation {
|
||||
pname = "immich-plugin-core";
|
||||
inherit (finalAttrs) version src pnpmDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
binaryen
|
||||
extism-js
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm --filter @immich/plugin-core... build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd packages/plugin-core
|
||||
mkdir $out
|
||||
cp -r dist manifest.json $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
web = stdenv.mkDerivation {
|
||||
pname = "immich-web";
|
||||
inherit (finalAttrs) version src pnpmDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm --filter immich-web... build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd web
|
||||
cp -r build $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) immich immich-vectorchord-reindex;
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lasuite-docs-collaboration-server";
|
||||
version = "5.3.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
|
||||
hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/frontend";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
|
||||
hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
|
||||
hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lasuite-docs-frontend";
|
||||
version = "5.3.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
|
||||
hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/frontend";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
|
||||
hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU=";
|
||||
hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
yarnConfigHook,
|
||||
}:
|
||||
let
|
||||
version = "5.3.0";
|
||||
version = "5.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "docs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA=";
|
||||
hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20=";
|
||||
};
|
||||
|
||||
mail-templates = stdenv.mkDerivation {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/src/mail/yarn.lock";
|
||||
hash = "sha256-MYzADDcXHGieGkygmlbZQbYcS68NdKWyHYGgoSaqDO8=";
|
||||
hash = "sha256-miA1ysqNSaBZSb2B2uqTx1rea9R5/AgRfuCPr5X0bx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
|
||||
hash = "sha256-yUKJp6yUTxpvkaA+YuQC3r1t4LBvuYMv1xesLewbK/U=";
|
||||
hash = "sha256-W0Sp8G7Lt9UMND8+ZLD8oxrNCgGpQph23AvQpynYWYI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "suitenumerique";
|
||||
repo = "drive";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JoOHbwZR4salfLB9Gg7kfRMDcDA/Srn8qwUqLAZtsz8=";
|
||||
hash = "sha256-y9lvGYTIxpuTA0mFDl616JxX+RF5+5Ea8k/NWlLjrZk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libprojectm";
|
||||
version = "4.1.6";
|
||||
version = "4.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectM-visualizer";
|
||||
repo = "projectm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IUVll+nRvIAOxrb16gWb9OpKzMRRuj28j/v+LvaLY5Y=";
|
||||
hash = "sha256-g7a5Ce7dEfOBGn6wMgdwujkWSi+vLeayWHClvH5W1wY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
runCommand,
|
||||
lua-language-server,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -128,7 +130,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
tests.smoke = runCommand "lua-language-server-smoke-test" { } ''
|
||||
export XDG_CACHE_HOME=$(mktemp -d)
|
||||
|
||||
INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}'
|
||||
CONTENT_LENGTH=''${#INIT_REQUEST}
|
||||
|
||||
RESPONSE=$(
|
||||
{
|
||||
printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST"
|
||||
sleep 1
|
||||
} | timeout 3 ${lib.getExe lua-language-server} --stdio 2>&1 | head -c 1000
|
||||
) || true
|
||||
|
||||
echo "$RESPONSE" | grep -q '"capabilities"'
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Language server that offers Lua language support";
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lxmf-rs";
|
||||
version = "0.5.1";
|
||||
version = "0.9.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeTAKTeam";
|
||||
repo = "LXMF-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ztJHjapogSF1qzyCBsi6mu3ByLdVTBt8y2OVEFyohKk=";
|
||||
hash = "sha256-RKe19Tv4IP837fJX5V0T3TeauwaBXuD176lD8W8BRpo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-g80lnqJ8VxGg0zHqHsQCvJO9AgXFE0ABysSr+XjXBAk=";
|
||||
cargoHash = "sha256-BqiemIfYuqB+8qDvEXpRPtW2dW4ApcNsj3augivIMdc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchYarnDeps,
|
||||
fixup-yarn-lock,
|
||||
node-gyp-build,
|
||||
nodejs-slim,
|
||||
nodejs-slim_22,
|
||||
matrix-sdk-crypto-nodejs,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
fixup-yarn-lock
|
||||
nodejs-slim
|
||||
nodejs-slim_22
|
||||
yarn
|
||||
node-gyp-build
|
||||
];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "matterjs-server";
|
||||
version = "1.1.7";
|
||||
version = "1.2.5";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "matter-js";
|
||||
repo = "matterjs-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8b4bLDVHTFcOHj3h/VuIxwdHJBleibZe9gUQvUD+aPA=";
|
||||
hash = "sha256-IXYq4Ppz61+8PeGUgmBcENkL3o6JFrJaIwFjr77uOhg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wkxYJtHwwpP87PDuE2HWA/2GDEUWfcSN2sEvjWz27a8=";
|
||||
npmDepsHash = "sha256-HrBtwT61RnHSuUCGH9I6vcigzpZdwp6HS5dc0v3EVnQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -117,8 +117,12 @@ symlinkJoin {
|
||||
passthru.tests.mpv-scripts-should-not-collide = buildEnv {
|
||||
name = "mpv-scripts-env";
|
||||
paths = lib.pipe mpvScripts [
|
||||
# filters "throw" aliases
|
||||
(lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success))
|
||||
# filters "override" "overrideDerivation" "recurseForDerivations"
|
||||
(lib.filterAttrs (key: script: lib.isDerivation script))
|
||||
# filters mpv scripts that opt out of this check
|
||||
(lib.filterAttrs (key: script: !(script.passthru.dontCollideCheck or false)))
|
||||
# replaces unfree and meta.broken scripts with decent placeholders
|
||||
(lib.mapAttrsToList (
|
||||
key: script:
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
installFonts,
|
||||
makeFontsConf,
|
||||
mpvScripts,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildLua (finalAttrs: {
|
||||
@@ -30,6 +31,9 @@ buildLua (finalAttrs: {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
# FIXME?: collides with mpvScripts.modernx
|
||||
passthru.dontCollideCheck = lib.hasAttr "modernx" mpvScripts;
|
||||
|
||||
meta = {
|
||||
description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC";
|
||||
changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildLua,
|
||||
fetchFromGitHub,
|
||||
mpvScripts,
|
||||
}:
|
||||
buildLua (finalAttrs: {
|
||||
pname = "mpv-osc-tethys";
|
||||
@@ -11,6 +12,9 @@ buildLua (finalAttrs: {
|
||||
extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ];
|
||||
extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ];
|
||||
|
||||
# FIXME?: collides with mpvScripts.thumbnail, this one yields since it is unfree
|
||||
passthru.dontCollideCheck = lib.hasAttr "thumbnail" mpvScripts;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zren";
|
||||
repo = "mpv-osc-tethys";
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.16";
|
||||
version = "15.0.18";
|
||||
|
||||
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-mlQUAdGcOUbqReROqhs4fwSUmTZqQAEhwsg6ulM2hx4=";
|
||||
hash = "sha256-hvLft1HDj/5NgAfQb1igYdhJN5H/jZ2+7s/JKKLf4Gs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -41,8 +41,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
dbus-python
|
||||
keyring
|
||||
lxml
|
||||
packaging
|
||||
psutil
|
||||
pyqt6
|
||||
pyqt6-webengine
|
||||
pysocks
|
||||
python-dateutil
|
||||
requests
|
||||
|
||||
@@ -152,13 +152,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.31.2";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/ySx6vfOGPo5twwKiNtkuROaTV7SvCeHX2fQiilmTkA=";
|
||||
hash = "sha256-NyZ3H1gsC692IcmdTXjIA9jDtTobUEfJladGW72aNGw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openfga-cli";
|
||||
version = "0.7.17";
|
||||
version = "0.7.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfga";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cx1lKyEeXpQS3NePd5JSylAU7qqfGidx9gGQh/WPeCY=";
|
||||
hash = "sha256-/DhvUvcvopYGAdLCAqsLxTs09q0sqOd1BglxaM4as/0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-f/gJr7cBO2G7USqujuBPmlbcCDrLw495RLG0pncQ97I=";
|
||||
vendorHash = "sha256-sIBD7Diqx16X7OHNpVCgD1XVByu8TGwFlIR6FIITTlc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "otf2";
|
||||
version = "3.1.1";
|
||||
version = "3.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4=";
|
||||
hash = "sha256-grOoilUMuMPOyP1F7Kgs3Lr5RSCZd0gkcbS15DDWSo0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ouch";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ouch-org";
|
||||
repo = "ouch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA=";
|
||||
hash = "sha256-fxBalMi5xdLNBnd5VIdAYDIjbSBrOPrmpKlKW1DmbxQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4=";
|
||||
cargoHash = "sha256-kYef8Xsi1gO0V2yXHiTkPi2rFjECw3jjhADSMhhu5zg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pop";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "pop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MG6mkWT+cjtE646P4K7I+jW9VxFSrI8wJ2D8Kwtia7k=";
|
||||
hash = "sha256-2114PK3xcIykC4QTTzj54S4EjHVbcxpy8D7C735xdew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZF/nINEqAgcsYwkzCepHX/vqODrzcEKoL3LvQmjRphU=";
|
||||
vendorHash = "sha256-v3rozaY/kp/M4K397c+qtktIPyJJ+RIvPtPvd9qVpwU=";
|
||||
|
||||
env.GOWORK = "off";
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radsecproxy";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radsecproxy";
|
||||
repo = "radsecproxy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-E7nU6NgCmwRzX5j1Zyx/LTztjLqYJKv+3VU6UE0HhZA=";
|
||||
hash = "sha256-QSRK7uljYn2kqGypfkZBWhVPGk/x1y6WT9FT5pqwWS0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -199,10 +199,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
) masShortcutSources}
|
||||
|
||||
nixLog "linking MASShortcut dylib"
|
||||
# `-fuse-ld=lld`: fix for ld64 hardening issue
|
||||
# TODO: Clean up on `staging`
|
||||
clang -dynamiclib "''${masObjFiles[@]}" \
|
||||
-framework AppKit -framework Carbon -framework Foundation \
|
||||
-install_name "@rpath/MASShortcut.framework/MASShortcut" \
|
||||
# TODO: Clean up on `staging`
|
||||
-fuse-ld=lld \
|
||||
-o "$buildDir/libMASShortcut.dylib"
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rura";
|
||||
version = "1.7.0";
|
||||
version = "1.9.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlipinski";
|
||||
repo = "rura";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rz8Hmxse1THGH3inGP3K+7JY3Lh9qaGUdESSHkai82c=";
|
||||
hash = "sha256-+XfJc9FH9El36AL7s7wMy9TNILKvtYflRDZjeW9J3fg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ytbo8fVf6oAHGQvicU3TFGQxoYh36CISuRaMwd1Ysf4=";
|
||||
cargoHash = "sha256-HBcKuQjRqVBItgIVUyNQiqfZxNVtyQgwr+5mTrlV3eM=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -109,6 +109,27 @@ stdenv.mkDerivation rec {
|
||||
url = "https://raw.githubusercontent.com/void-linux/void-packages/f8951eacbdc6538af3330d17d5587a0c208ab349/srcpkgs/sagemath/patches/40679-Update_to_maxima_5.49.patch";
|
||||
hash = "sha256-n6YSVNomLM7f5kRAGzhijag8QnlXxKJz9RHFLVtZpdk=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/42384, landed in 10.10.beta4
|
||||
(fetchpatch2 {
|
||||
name = "matplotlib-3.11-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/3d3a04bbfb66dc1141afadbfaefa01dff8749761.patch?full_index=1";
|
||||
hash = "sha256-LlEblRKlPPmvSU26LmT6DTxFElvhA9SBkrU3xeIFZu4=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/42437, landed in 10.10.beta5
|
||||
(fetchpatch2 {
|
||||
name = "numpy-2.5-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/3e709448881442c133047f2993db39d855c70bd8.patch?full_index=1";
|
||||
hash = "sha256-8vxIYG6yhCBML9vioJhAjBgTeCCGmdfk7qAtEEQnK/g=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/42465, landed in 10.10.beta5
|
||||
(fetchpatch2 {
|
||||
name = "scipy-1.18-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/926f32aab22f81ddb9fda874a20fee84c7bfacc3.patch?full_index=1";
|
||||
hash = "sha256-EMn/fr5WlRQtFj5GHo02kczasmKaiqFfRSVZo2uvOPI=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal-cli";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HlG/zBfyd120ENERqdpfPuHPwu84bWijzoE4tEOsOeE=";
|
||||
hash = "sha256-Z5Ba4oVQR6g/HyaBd/0iLIWq6Ht2SJAdylTVaErRFL0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GI+rLSCwBRcZytbJsxqCL1+3p5/UbCvTxUHn2ele3+c=";
|
||||
vendorHash = "sha256-9lO9uhy1n85QYyoh27cKhdlcuL4GT98aCNWwe8tOwoQ=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg_7 ]
|
||||
);
|
||||
|
||||
version = "15.0.17";
|
||||
version = "15.0.18";
|
||||
|
||||
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-WJFDd+DVj4oKHjv7py3yVrttrrCHFcHJbyvLNOwCjhs=";
|
||||
hash = "sha256-4e7G8M/iKU65ECMVhxGjaJwHfwVZ49RD7ro6YJT43v0=";
|
||||
};
|
||||
|
||||
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-pKmAKDWutSp7ptJ66PMiS59aV+pRs3Oz9pV64kRuebI=";
|
||||
hash = "sha256-lLShsQQ2thSSp4PRK9Fhza6e01Myj2mUP4qqCeyilXo=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (
|
||||
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-9pINtZToPqAA5VRTO8lRIBzNxO9481WvMkE2kk/iyUM=";
|
||||
hash = "sha256-fryLXUVzyDT1jOuS5sIf9kpCJ40oHaxFRJFKMrn7EGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -54,18 +54,18 @@ rustPlatform.buildRustPackage (
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "wealthfolio-server";
|
||||
version = "3.5.3";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wealthfolio";
|
||||
repo = "wealthfolio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9dE0IQtDUcveZk2eWu9+UDpAYPgk/LbY+jsTNH3N9hg=";
|
||||
hash = "sha256-2Chwr7OifQ5PgRAnxDEeAxyYaxVQqS32mezqzUBKKyU=";
|
||||
};
|
||||
|
||||
cargoRoot = ".";
|
||||
buildAndTestSubdir = "apps/server";
|
||||
cargoHash = "sha256-P93AAivBXWBLik8M/DNUWyKXVsq7ttvX3DpiXwaDL2I=";
|
||||
cargoHash = "sha256-pfUrfIZmuibjFYzcuh57WU/pTlXFZNWYgurNYn+Wvus=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -28,12 +28,12 @@ let
|
||||
};
|
||||
};
|
||||
x86_64-darwin = rec {
|
||||
version = "3.40.5442";
|
||||
version = "3.42.5489";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wireapp";
|
||||
repo = "wire-desktop";
|
||||
tag = "macos/${version}";
|
||||
hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
|
||||
hash = "sha256-v80sdksor6V0OVXlBTeMf9Jz8lhQy+UdyTxxupuafeo=";
|
||||
};
|
||||
};
|
||||
aarch64-linux = x86_64-linux;
|
||||
|
||||
@@ -13,13 +13,13 @@ index 50dd4cb..ffc20c4 100755
|
||||
--- a/lomiri-session.in
|
||||
+++ b/lomiri-session.in
|
||||
@@ -55,6 +55,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1
|
||||
dbus-update-activation-environment --systemd QT_IM_MODULE=maliit
|
||||
dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit
|
||||
dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland
|
||||
dbus-update-activation-environment --systemd QT_IM_MODULE="${QT_IM_MODULE}"
|
||||
dbus-update-activation-environment --systemd GTK_IM_MODULE="${DEFAULT_GTK_IM_MODULE:-maliit}"
|
||||
dbus-update-activation-environment --systemd QT_QPA_PLATFORM="${QT_QPA_PLATFORM}"
|
||||
+dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME=
|
||||
dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland
|
||||
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||
dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1
|
||||
dbus-update-activation-environment --systemd SDL_VIDEODRIVER="${DEFAULT_SDL_VIDEODRIVER:-wayland}"
|
||||
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION="${DEFAULT_QT_WAYLAND_DISABLE_WINDOWDECORATION:-1}"
|
||||
dbus-update-activation-environment --systemd QT_ACCESSIBILITY="${DEFAULT_QT_ACCESSIBILITY:-1}"
|
||||
--
|
||||
2.44.1
|
||||
|
||||
|
||||
@@ -8,23 +8,26 @@
|
||||
cmake,
|
||||
dbus,
|
||||
deviceinfo,
|
||||
glib,
|
||||
inotify-tools,
|
||||
lomiri,
|
||||
lomiri-schemas,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
systemd,
|
||||
wrapGAppsHook4,
|
||||
xdg-user-dirs,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-session";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-session";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
|
||||
hash = "sha256-zEH1VNBgOs9xP18toBc2VqMloDM6uL+tSIIEKZTHY0c=";
|
||||
};
|
||||
|
||||
patches = [ ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ];
|
||||
@@ -41,10 +44,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
--replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session'
|
||||
'';
|
||||
|
||||
# Checks for run-time tools at configure-time
|
||||
strictDeps = false;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
glib # hook for wrapper arguments
|
||||
makeWrapper
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -53,9 +63,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
dbus
|
||||
inotify-tools
|
||||
lomiri
|
||||
lomiri-schemas # for hook to pick up schemas
|
||||
systemd
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
# Requires lomiri-system-compositor -> not ported to Mir 2.x yet
|
||||
(lib.cmakeBool "ENABLE_TOUCH_SESSION" false)
|
||||
@@ -63,14 +76,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
patchShebangs $out/bin/lomiri-session
|
||||
wrapProgram $out/bin/lomiri-session \
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
deviceinfo
|
||||
deviceinfo # device-info
|
||||
glib # gsettings
|
||||
inotify-tools
|
||||
lomiri
|
||||
systemd # systemd-detect-virt
|
||||
]
|
||||
}
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapGApp $out/bin/lomiri-session
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -79,7 +102,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# not packaged/working yet
|
||||
# "lomiri-touch"
|
||||
];
|
||||
tests.lomiri = nixosTests.lomiri;
|
||||
tests = nixosTests.lomiri;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
|
||||
@@ -25,11 +25,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.27rc1";
|
||||
version = "1.27rc2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-M49R9VfG2xI1o+64mgk2r29ODUEWKR7zuOQRhrxlUzQ=";
|
||||
hash = "sha256-hg/XowsoXuFqKuDsXURBy0fEiHKgowy2DK40iUf0iiU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "monarchmoneycommunity";
|
||||
version = "1.3.2";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bradleyseanf";
|
||||
repo = "monarchmoneycommunity";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WWwxCL5LNIMqt+K2AmFuCQtx/i7MtyCsTxagz1GMw+g=";
|
||||
hash = "sha256-3dOBFXzWJzLQ3Lr1lqwYxJ7s4uiUZatwEdZx3lRnhGs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyexploitdb";
|
||||
version = "0.3.34";
|
||||
version = "0.3.35";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-vKp4tExq2QOdlsq4poJQfd4jqDdV/3BvnGw5eX2SFP8=";
|
||||
hash = "sha256-/yt39/XaLzqxlviFRzk+JR4TM8PHZYLYpNP0i9N4tvI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-html5lib";
|
||||
version = "1.1.11.20251117";
|
||||
version = "1.1.11.20260518";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_html5lib";
|
||||
inherit version;
|
||||
hash = "sha256-Gmo6xTlKoSv1R/rl1e/5Hc7sRrbQfENn2bOaN/QvIBo=";
|
||||
hash = "sha256-TzPAh8sRGdZcTIDspDI8K1Afnq+K+WFri3Mu1Njq6Po=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/electron/patches/config.json b/electron/patches/config.json
|
||||
index f5dbe8600f..9e1e5e0704 100644
|
||||
--- a/electron/patches/config.json
|
||||
+++ b/electron/patches/config.json
|
||||
@@ -15,5 +15,5 @@
|
||||
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
||||
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
- { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
|
||||
+ { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
|
||||
{ "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
|
||||
{ "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
|
||||
]
|
||||
@@ -61,7 +61,7 @@ let
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
# https://www.electronjs.org/docs/latest/tutorial/electron-timelines
|
||||
knownVulnerabilities = lib.optional (lib.versionOlder version "40.0.0") "Electron version ${version} is EOL";
|
||||
knownVulnerabilities = lib.optional (lib.versionOlder version "41.0.0") "Electron version ${version} is EOL";
|
||||
};
|
||||
|
||||
fetcher =
|
||||
|
||||
@@ -106,12 +106,6 @@ in
|
||||
|
||||
src = null;
|
||||
|
||||
patches =
|
||||
base.patches
|
||||
++ lib.optionals (lib.versions.major info.version == "40") [
|
||||
./40-angle-patchdir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p third_party/jdk/current/bin
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -38,6 +38,7 @@
|
||||
libxkbcommon,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
llvmPackages,
|
||||
makeWrapper,
|
||||
mbedtls,
|
||||
miniupnpc,
|
||||
@@ -398,6 +399,8 @@ let
|
||||
"-I${lib.getDev harfbuzz-icu}/include/harfbuzz"
|
||||
"-I${lib.getDev recastnavigation}/include/recastnavigation"
|
||||
];
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString (editor && withMono) ''
|
||||
@@ -643,6 +646,8 @@ let
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
[
|
||||
darwin.sigtool
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
llvmPackages.lld
|
||||
]
|
||||
++ lib.optionals (!editor) [
|
||||
strip-nondeterminism
|
||||
|
||||
@@ -4854,10 +4854,7 @@ with pkgs;
|
||||
in
|
||||
{
|
||||
electron_39 = electron_39-bin;
|
||||
electron_40 = getElectronPkg {
|
||||
src = electron-source.electron_40;
|
||||
bin = electron_40-bin;
|
||||
};
|
||||
electron_40 = electron_40-bin;
|
||||
electron_41 = getElectronPkg {
|
||||
src = electron-source.electron_41;
|
||||
bin = electron_41-bin;
|
||||
|
||||
Reference in New Issue
Block a user