Merge staging-next into staging
This commit is contained in:
@@ -505,6 +505,18 @@
|
||||
githubId = 1517066;
|
||||
name = "Aiken Cairncross";
|
||||
};
|
||||
acaloiaro = {
|
||||
email = "code@adriano.fyi";
|
||||
githubId = 3331648;
|
||||
github = "acaloiaro";
|
||||
matrix = "@adriano@beeper.com";
|
||||
name = "Adriano Caloiaro";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "DCBD 2175 8A30 9C1F 41D7 A0FC 890F FDB1 1860 FE1C";
|
||||
}
|
||||
];
|
||||
};
|
||||
a-camarillo = {
|
||||
name = "Anthony Camarillo";
|
||||
email = "anthony.camarillo.96@gmail.com";
|
||||
@@ -10950,6 +10962,11 @@
|
||||
githubId = 691552;
|
||||
name = "Jamie McClymont";
|
||||
};
|
||||
jjtt = {
|
||||
github = "jjtt";
|
||||
githubId = 3908945;
|
||||
name = "Juho Törmä";
|
||||
};
|
||||
jk = {
|
||||
email = "hello+nixpkgs@j-k.io";
|
||||
matrix = "@j-k:matrix.org";
|
||||
|
||||
@@ -4535,19 +4535,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
fidget-nvim = buildNeovimPlugin {
|
||||
pname = "fidget.nvim";
|
||||
version = "2025-01-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "j-hui";
|
||||
repo = "fidget.nvim";
|
||||
rev = "a0abbf18084b77d28bc70e24752e4f4fd54aea17";
|
||||
sha256 = "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53";
|
||||
};
|
||||
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
file-line = buildVimPlugin {
|
||||
pname = "file-line";
|
||||
version = "2016-10-21";
|
||||
@@ -5109,19 +5096,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gitsigns-nvim = buildNeovimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2025-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d";
|
||||
sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gitv = buildVimPlugin {
|
||||
pname = "gitv";
|
||||
version = "2019-08-22";
|
||||
@@ -5904,19 +5878,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
image-nvim = buildNeovimPlugin {
|
||||
pname = "image.nvim";
|
||||
version = "2025-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "3rd";
|
||||
repo = "image.nvim";
|
||||
rev = "6ffafab2e98b5bda46bf227055aa84b90add8cdc";
|
||||
sha256 = "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz";
|
||||
};
|
||||
meta.homepage = "https://github.com/3rd/image.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
img-clip-nvim = buildVimPlugin {
|
||||
pname = "img-clip.nvim";
|
||||
version = "2025-01-24";
|
||||
@@ -7116,20 +7077,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
luasnip = buildNeovimPlugin {
|
||||
pname = "luasnip";
|
||||
version = "2025-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "c9b9a22904c97d0eb69ccb9bab76037838326817";
|
||||
sha256 = "1m9a2vka968yklknp8fcmg5lz7w0lb7rwn13b0ppy89ixy0mjxj5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
luasnip-latex-snippets-nvim = buildVimPlugin {
|
||||
pname = "luasnip-latex-snippets.nvim";
|
||||
version = "2024-11-25";
|
||||
@@ -7156,19 +7103,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
lush-nvim = buildNeovimPlugin {
|
||||
pname = "lush.nvim";
|
||||
version = "2024-08-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rktjmp";
|
||||
repo = "lush.nvim";
|
||||
rev = "45a79ec4acb5af783a6a29673a999ce37f00497e";
|
||||
sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr";
|
||||
};
|
||||
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
lushtags = buildVimPlugin {
|
||||
pname = "lushtags";
|
||||
version = "2017-04-19";
|
||||
@@ -8769,19 +8703,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
neotest = buildNeovimPlugin {
|
||||
pname = "neotest";
|
||||
version = "2025-01-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neotest";
|
||||
repo = "neotest";
|
||||
rev = "d66cf4e05a116957f0d3a7755a24291c7d1e1f72";
|
||||
sha256 = "09bxarrrfnqvyv22ls6lm0y03ngcp6r372b8hy4rld902psdb11q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neotest/neotest/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
neotest-bash = buildVimPlugin {
|
||||
pname = "neotest-bash";
|
||||
version = "2024-05-06";
|
||||
@@ -9513,19 +9434,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nui-nvim = buildNeovimPlugin {
|
||||
pname = "nui.nvim";
|
||||
version = "2024-12-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MunifTanjim";
|
||||
repo = "nui.nvim";
|
||||
rev = "53e907ffe5eedebdca1cd503b00aa8692068ca46";
|
||||
sha256 = "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9";
|
||||
};
|
||||
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
null-ls-nvim = buildVimPlugin {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2023-08-12";
|
||||
@@ -9695,19 +9603,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-cmp = buildNeovimPlugin {
|
||||
pname = "nvim-cmp";
|
||||
version = "2025-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "12509903a5723a876abd65953109f926f4634c30";
|
||||
sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-code-action-menu = buildVimPlugin {
|
||||
pname = "nvim-code-action-menu";
|
||||
version = "2023-12-11";
|
||||
@@ -10436,19 +10331,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-nio = buildNeovimPlugin {
|
||||
pname = "nvim-nio";
|
||||
version = "2025-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neotest";
|
||||
repo = "nvim-nio";
|
||||
rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662";
|
||||
sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neotest/nvim-nio/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-nonicons = buildVimPlugin {
|
||||
pname = "nvim-nonicons";
|
||||
version = "2023-02-04";
|
||||
@@ -11386,19 +11268,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
orgmode = buildNeovimPlugin {
|
||||
pname = "orgmode";
|
||||
version = "2025-01-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-orgmode";
|
||||
repo = "orgmode";
|
||||
rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd";
|
||||
sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
other-nvim = buildVimPlugin {
|
||||
pname = "other.nvim";
|
||||
version = "2024-11-30";
|
||||
@@ -11543,19 +11412,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
papis-nvim = buildNeovimPlugin {
|
||||
pname = "papis.nvim";
|
||||
version = "2025-01-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jghauser";
|
||||
repo = "papis.nvim";
|
||||
rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5";
|
||||
sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx";
|
||||
};
|
||||
meta.homepage = "https://github.com/jghauser/papis.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
parpar-nvim = buildVimPlugin {
|
||||
pname = "parpar.nvim";
|
||||
version = "2023-09-12";
|
||||
@@ -11712,19 +11568,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
plenary-nvim = buildNeovimPlugin {
|
||||
pname = "plenary.nvim";
|
||||
version = "2025-01-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66";
|
||||
sha256 = "1h73y4ahj8rf6qiyjkm3jw9158fbkiix4kzig78jknvq8vgdgk6p";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
poimandres-nvim = buildVimPlugin {
|
||||
pname = "poimandres.nvim";
|
||||
version = "2024-10-19";
|
||||
@@ -12326,20 +12169,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
rest-nvim = buildNeovimPlugin {
|
||||
pname = "rest.nvim";
|
||||
version = "2025-01-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rest-nvim";
|
||||
repo = "rest.nvim";
|
||||
rev = "62606c3599bd304227457d6e20580965939b191e";
|
||||
sha256 = "0rbp8fq0ya2rx9njxs9ynrrw4pv50rpkd1lfvvw2p1c06xr63a75";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
restore-view-vim = buildVimPlugin {
|
||||
pname = "restore-view-vim";
|
||||
version = "2014-11-21";
|
||||
@@ -13815,19 +13644,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-manix = buildNeovimPlugin {
|
||||
pname = "telescope-manix";
|
||||
version = "2025-01-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "telescope-manix";
|
||||
rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c";
|
||||
sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-media-files-nvim = buildVimPlugin {
|
||||
pname = "telescope-media-files.nvim";
|
||||
version = "2023-02-19";
|
||||
@@ -13841,19 +13657,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2025-01-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "415af52339215926d705cccc08145f3782c4d132";
|
||||
sha256 = "1hzyqax197i36a6z1rm25grwbl0r7k3qwhybjils20lshanjqbz7";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
telescope-project-nvim = buildVimPlugin {
|
||||
pname = "telescope-project.nvim";
|
||||
version = "2024-12-01";
|
||||
|
||||
@@ -1222,7 +1222,7 @@ in
|
||||
|
||||
fzf-lua = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.fzf-lua;
|
||||
propagatedBuildInputs = [ fzf ];
|
||||
runtimeDeps = [ fzf ];
|
||||
};
|
||||
|
||||
fzf-vim = super.fzf-vim.overrideAttrs {
|
||||
@@ -1630,10 +1630,6 @@ in
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.lsp-progress-nvim;
|
||||
};
|
||||
|
||||
lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
|
||||
|
||||
lspecho-nvim = super.lspecho-nvim.overrideAttrs {
|
||||
@@ -1671,18 +1667,6 @@ in
|
||||
checkInputs = [ self.luasnip ];
|
||||
};
|
||||
|
||||
lz-n = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.lz-n;
|
||||
};
|
||||
|
||||
lze = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.lze;
|
||||
};
|
||||
|
||||
lzn-auto-require = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.lzn-auto-require;
|
||||
};
|
||||
|
||||
magma-nvim = super.magma-nvim.overrideAttrs {
|
||||
passthru.python3Dependencies =
|
||||
ps: with ps; [
|
||||
@@ -1729,7 +1713,7 @@ in
|
||||
};
|
||||
|
||||
markid = super.markid.overrideAttrs {
|
||||
dependencies = with super; [ nvim-treesitter ];
|
||||
dependencies = [ self.nvim-treesitter ];
|
||||
};
|
||||
|
||||
mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs {
|
||||
@@ -1773,10 +1757,6 @@ in
|
||||
meta.maintainers = with lib.maintainers; [ vcunat ];
|
||||
};
|
||||
|
||||
middleclass = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.middleclass;
|
||||
};
|
||||
|
||||
mind-nvim = super.mind-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
@@ -1920,12 +1900,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
neorg = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.neorg;
|
||||
|
||||
doInstallCheck = true;
|
||||
};
|
||||
|
||||
neorg-telescope = super.neorg-telescope.overrideAttrs {
|
||||
buildInputs = [ luaPackages.lua-utils-nvim ];
|
||||
dependencies = with self; [
|
||||
@@ -2747,14 +2721,9 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
# TODO: runtimedeps
|
||||
plenary-nvim = super.plenary-nvim.overrideAttrs {
|
||||
postPatch = ''
|
||||
sed -Ei lua/plenary/curl.lua \
|
||||
-e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
plenary-nvim = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.plenary-nvim;
|
||||
runtimeDeps = [ curl ];
|
||||
};
|
||||
|
||||
poimandres-nvim = super.poimandres-nvim.overrideAttrs {
|
||||
@@ -2862,18 +2831,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
rocks-nvim = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.rocks-nvim;
|
||||
};
|
||||
|
||||
rocks-config-nvim = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.rocks-config-nvim;
|
||||
};
|
||||
|
||||
rtp-nvim = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.rtp-nvim;
|
||||
};
|
||||
|
||||
rustaceanvim = neovimUtils.buildNeovimPlugin {
|
||||
checkInputs = [
|
||||
# Optional integration
|
||||
@@ -3022,7 +2979,7 @@ in
|
||||
};
|
||||
|
||||
startup-nvim = super.startup-nvim.overrideAttrs {
|
||||
dependencies = with super; [ plenary-nvim ];
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
statix = buildVimPlugin rec {
|
||||
@@ -4066,3 +4023,38 @@ in
|
||||
in
|
||||
lib.genAttrs nodePackageNames nodePackage2VimPackage
|
||||
)
|
||||
// (
|
||||
let
|
||||
luarocksPackageNames = [
|
||||
"fidget-nvim"
|
||||
"gitsigns-nvim"
|
||||
"image-nvim"
|
||||
"lsp-progress-nvim"
|
||||
"luasnip"
|
||||
"lush-nvim"
|
||||
"lz-n"
|
||||
"lze"
|
||||
"lzn-auto-require"
|
||||
"middleclass"
|
||||
"neorg"
|
||||
"neotest"
|
||||
"nui-nvim"
|
||||
"nvim-cmp"
|
||||
"nvim-nio"
|
||||
"orgmode"
|
||||
"papis-nvim"
|
||||
"rest-nvim"
|
||||
"rocks-config-nvim"
|
||||
"rocks-nvim"
|
||||
"rtp-nvim"
|
||||
"telescope-manix"
|
||||
"telescope-nvim"
|
||||
];
|
||||
toVimPackage =
|
||||
name:
|
||||
neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.${name};
|
||||
};
|
||||
in
|
||||
lib.genAttrs luarocksPackageNames toVimPackage
|
||||
)
|
||||
|
||||
@@ -103,6 +103,8 @@ class VimEditor(pluginupdate.Editor):
|
||||
def plugin2nix(
|
||||
self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
|
||||
) -> str:
|
||||
if isNeovim:
|
||||
raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
|
||||
repo = pdesc.repo
|
||||
|
||||
content = f" {plugin.normalized_name} = "
|
||||
|
||||
@@ -346,7 +346,6 @@ https://github.com/lilydjwg/fcitx.vim/,fcitx5,
|
||||
https://github.com/freddiehaddad/feline.nvim/,,
|
||||
https://github.com/bakpakin/fennel.vim/,,
|
||||
https://github.com/wincent/ferret/,,
|
||||
https://github.com/j-hui/fidget.nvim/,,
|
||||
https://github.com/bogado/file-line/,,
|
||||
https://github.com/lewis6991/fileline.nvim/,,
|
||||
https://github.com/glacambre/firenvim/,HEAD,
|
||||
@@ -390,7 +389,6 @@ https://github.com/ThePrimeagen/git-worktree.nvim/,,
|
||||
https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
|
||||
https://github.com/vim-scripts/gitignore.vim/,,
|
||||
https://github.com/ruifm/gitlinker.nvim/,,
|
||||
https://github.com/lewis6991/gitsigns.nvim/,,
|
||||
https://github.com/gregsexton/gitv/,,
|
||||
https://github.com/DNLHC/glance.nvim/,HEAD,
|
||||
https://github.com/gleam-lang/gleam.vim/,,
|
||||
@@ -451,7 +449,6 @@ https://github.com/cocopon/iceberg.vim/,,
|
||||
https://github.com/idris-hackers/idris-vim/,,
|
||||
https://github.com/idris-community/idris2-nvim/,,
|
||||
https://github.com/edwinb/idris2-vim/,,
|
||||
https://github.com/3rd/image.nvim/,HEAD,
|
||||
https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
|
||||
https://github.com/lewis6991/impatient.nvim/,,
|
||||
https://github.com/backdround/improved-search.nvim/,HEAD,
|
||||
@@ -544,10 +541,8 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
|
||||
https://github.com/nvim-java/lua-async/,HEAD,
|
||||
https://github.com/arkav/lualine-lsp-progress/,,
|
||||
https://github.com/nvim-lualine/lualine.nvim/,,
|
||||
https://github.com/l3mon4d3/luasnip/,,
|
||||
https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD,
|
||||
https://github.com/alvarosevilla95/luatab.nvim/,,
|
||||
https://github.com/rktjmp/lush.nvim/,,
|
||||
https://github.com/mkasa/lushtags/,,
|
||||
https://github.com/Bilal2453/luvit-meta/,HEAD,
|
||||
https://github.com/dccsillag/magma-nvim/,HEAD,
|
||||
@@ -671,7 +666,6 @@ https://github.com/karb94/neoscroll.nvim/,,
|
||||
https://github.com/Shougo/neosnippet-snippets/,,
|
||||
https://github.com/Shougo/neosnippet.vim/,,
|
||||
https://github.com/kassio/neoterm/,,
|
||||
https://github.com/nvim-neotest/neotest/,HEAD,
|
||||
https://github.com/rcasia/neotest-bash/,HEAD,
|
||||
https://github.com/sidlatau/neotest-dart/,HEAD,
|
||||
https://github.com/MarkEmmons/neotest-deno/,HEAD,
|
||||
@@ -728,7 +722,6 @@ https://github.com/shaunsingh/nord.nvim/,,
|
||||
https://github.com/andersevenrud/nordic.nvim/,,
|
||||
https://github.com/vigoux/notifier.nvim/,HEAD,
|
||||
https://github.com/jlesquembre/nterm.nvim/,,
|
||||
https://github.com/MunifTanjim/nui.nvim/,main,
|
||||
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
|
||||
https://github.com/nacro90/numb.nvim/,,
|
||||
https://github.com/nvchad/nvchad/,HEAD,
|
||||
@@ -797,7 +790,6 @@ https://github.com/gpanders/nvim-moonwalk/,,
|
||||
https://github.com/SmiteshP/nvim-navbuddy/,,
|
||||
https://github.com/smiteshp/nvim-navic/,HEAD,
|
||||
https://github.com/AckslD/nvim-neoclip.lua/,,
|
||||
https://github.com/nvim-neotest/nvim-nio/,HEAD,
|
||||
https://github.com/ya2s/nvim-nonicons/,,
|
||||
https://github.com/rcarriga/nvim-notify/,,
|
||||
https://github.com/LhKipp/nvim-nu/,HEAD,
|
||||
@@ -870,7 +862,6 @@ https://github.com/tyru/open-browser-github.vim/,,
|
||||
https://github.com/tyru/open-browser.vim/,,
|
||||
https://github.com/Almo7aya/openingh.nvim/,,
|
||||
https://github.com/salkin-mada/openscad.nvim/,HEAD,
|
||||
https://github.com/nvim-orgmode/orgmode/,,
|
||||
https://github.com/rgroli/other.nvim/,HEAD,
|
||||
https://github.com/jmbuhr/otter.nvim/,,
|
||||
https://github.com/hedyhli/outline.nvim/,HEAD,
|
||||
@@ -882,7 +873,6 @@ https://github.com/drewtempelmeyer/palenight.vim/,,
|
||||
https://github.com/JoosepAlviste/palenightfall.nvim/,,
|
||||
https://github.com/roobert/palette.nvim/,HEAD,
|
||||
https://github.com/NLKNguyen/papercolor-theme/,,
|
||||
https://github.com/jghauser/papis.nvim/,HEAD,
|
||||
https://github.com/dundalek/parpar.nvim/,,
|
||||
https://github.com/tmsvg/pear-tree/,,
|
||||
https://github.com/steelsojka/pears.nvim/,,
|
||||
@@ -895,7 +885,6 @@ https://github.com/motus/pig.vim/,,
|
||||
https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
|
||||
https://github.com/aklt/plantuml-syntax/,,
|
||||
https://github.com/nvim-treesitter/playground/,,
|
||||
https://github.com/nvim-lua/plenary.nvim/,,
|
||||
https://github.com/olivercederborg/poimandres.nvim/,HEAD,
|
||||
https://github.com/epwalsh/pomo.nvim/,HEAD,
|
||||
https://github.com/dleonard0/pony-vim-syntax/,,
|
||||
@@ -942,7 +931,6 @@ https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
|
||||
https://github.com/gabrielpoca/replacer.nvim/,HEAD,
|
||||
https://github.com/9seconds/repolink.nvim/,HEAD,
|
||||
https://github.com/stevearc/resession.nvim/,HEAD,
|
||||
https://github.com/rest-nvim/rest.nvim/,,
|
||||
https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
|
||||
https://github.com/gu-fan/riv.vim/,,
|
||||
https://github.com/kevinhwang91/rnvimr/,,
|
||||
@@ -1069,7 +1057,6 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
||||
https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD,
|
||||
https://github.com/jvgrootveld/telescope-zoxide/,,
|
||||
https://github.com/nvim-telescope/telescope.nvim/,,
|
||||
https://github.com/luc-tielen/telescope_hoogle/,HEAD,
|
||||
https://github.com/joerdav/templ.vim/,HEAD,
|
||||
https://github.com/axelvc/template-string.nvim/,HEAD,
|
||||
|
||||
@@ -2117,8 +2117,9 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.251.0"; # compatible with vscode ^1.96
|
||||
hash = "sha256-nv6lTPTPcggwMgO8a4KAF0W7gpou1399f/axnH0sS4s=";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
|
||||
version = "1.266.1363"; # compatible with vscode ^1.96
|
||||
hash = "sha256-paT/fZMIjSh7Bp4bBg4ZT/c1wVc0ecQLJxulSQZjRdg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -2135,8 +2136,8 @@ let
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json
|
||||
version = "0.24.2024121201"; # compatible with vscode ^1.96
|
||||
hash = "sha256-v3wdodDzYalz927KqqpL4IqEqLRmx1CLWdGBvZgNmpE=";
|
||||
version = "0.24.2025020602"; # latest compatible with vscode ^1.97
|
||||
hash = "sha256-smeBJ+yEIdbBs1eiKlPFCpYrb/nAkpnGlT9pTNnCnBI=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
|
||||
@@ -3506,6 +3507,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
ms-python.mypy-type-checker = callPackage ./ms-python.mypy-type-checker { };
|
||||
|
||||
ms-python.python = callPackage ./ms-python.python { };
|
||||
|
||||
ms-python.debugpy = buildVscodeMarketplaceExtension {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
mypy,
|
||||
jq,
|
||||
moreutils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mypy-type-checker";
|
||||
publisher = "ms-python";
|
||||
version = "2025.1.10381011";
|
||||
hash = "sha256-boKUxLOAgQJP13zX/NMhg1MtcrPVQJt5gLbxI7gVSu4=";
|
||||
};
|
||||
|
||||
buildInputs = [ mypy ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
jq '.contributes.configuration.properties."mypy-type-checker.path".default = "${lib.getExe mypy}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/microsoft/vscode-mypy/releases";
|
||||
description = "VSCode extension for type checking support for Python files using Mypy";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.mypy-type-checker";
|
||||
homepage = "https://github.com/microsoft/vscode-mypy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
iosevka,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
symlinkJoin,
|
||||
}:
|
||||
|
||||
let
|
||||
sets = [
|
||||
"sans-mono"
|
||||
"sans"
|
||||
"serif-mono"
|
||||
"serif"
|
||||
];
|
||||
pname = "aporetic";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "protesilaos";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5m4iT77FFsJf6N1FIsCtk5Z0IEOVUGCceXiT2n5dZUg=";
|
||||
};
|
||||
privateBuildPlan = src.outPath + "/private-build-plans.toml";
|
||||
makeIosevkaFont =
|
||||
set:
|
||||
let
|
||||
superBuildNpmPackage = buildNpmPackage;
|
||||
in
|
||||
(iosevka.override {
|
||||
inherit set privateBuildPlan;
|
||||
buildNpmPackage =
|
||||
args:
|
||||
superBuildNpmPackage (
|
||||
args
|
||||
// {
|
||||
pname = "aporetic-${set}";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v32.5.0";
|
||||
hash = "sha256-MzsAkq5l4TP19UJNPW/8hvIqsJd94pADrrv8wLG6NMQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8=";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = ''
|
||||
Customised build of the Iosevka typeface, with a consistent rounded style and overrides for almost all individual glyphs in both roman (upright) and italic (slanted) variants.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
platforms = iosevka.meta.platforms;
|
||||
maintainers = [ maintainers.DamienCassou ];
|
||||
};
|
||||
}
|
||||
);
|
||||
});
|
||||
in
|
||||
symlinkJoin {
|
||||
inherit pname version;
|
||||
paths = (builtins.map makeIosevkaFont sets);
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
pkgs,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfv";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cfv-project";
|
||||
repo = "cfv";
|
||||
tag = "v${version}";
|
||||
sha256 = "1wxf30gsijsdvhv5scgkq0bqi8qi4dgs9dwppdrca5wxgy7a8sn5";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
cd test
|
||||
ulimit -n 4096
|
||||
python3 test.py
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pkgs.cksfv
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Utility to verify and create a wide range of checksums";
|
||||
homepage = "https://github.com/cfv-project/cfv";
|
||||
changelog = "https://github.com/cfv-project/cfv/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ jjtt ];
|
||||
mainProgram = "cfv";
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@ let
|
||||
python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec {
|
||||
version = "5.7.8";
|
||||
src = oldAttrs.src.override {
|
||||
rev = "refs/tags/v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo=";
|
||||
};
|
||||
})
|
||||
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "owasp-dep-scan";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI=";
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
nix-update-script,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "di-tui";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acaloiaro";
|
||||
repo = "di-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "A simple terminal UI player for di.fm";
|
||||
homepage = "https://github.com/acaloiaro/di-tui";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.acaloiaro ];
|
||||
mainProgram = "di-tui";
|
||||
};
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
alsa-lib,
|
||||
copyDesktopItems,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
makeDesktopItem,
|
||||
pkg-config,
|
||||
}:
|
||||
@@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
gtk3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
exec = "free42bin";
|
||||
type = "Application";
|
||||
comment = "A software clone of HP-42S Calculator";
|
||||
icon = "free42";
|
||||
categories = [
|
||||
"Utility"
|
||||
"Calculator"
|
||||
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
exec = "free42dec";
|
||||
type = "Application";
|
||||
comment = "A software clone of HP-42S Calculator";
|
||||
icon = "free42";
|
||||
categories = [
|
||||
"Utility"
|
||||
"Calculator"
|
||||
@@ -87,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -m644 gtk/README $out/share/doc/free42/README-GTK
|
||||
install -m644 README $out/share/doc/free42/README
|
||||
|
||||
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
|
||||
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
|
||||
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps/free42.xpm
|
||||
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps/free42.xpm
|
||||
install -m644 skins/* $out/share/free42/skins
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "inv-sig-helper";
|
||||
version = "0-unstable-2025-01-31";
|
||||
version = "0-unstable-2025-02-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iv-org";
|
||||
repo = "inv_sig_helper";
|
||||
rev = "40835906774cc7cdefa76b2648216afd063ad0e2";
|
||||
hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI=";
|
||||
rev = "ac006283c0b6821c856d6293c2ce49b61fa8c46a";
|
||||
hash = "sha256-cQXWo+idyfFeJ2nnT8HKgjCd0Htc4pOE6aODsl3sf/8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-4SuddTLbENm9D+v/DB86hJ7LNchbcwm5on3aAtUiVcc=";
|
||||
cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.raitobezarius ];
|
||||
mainProgram = "keepalived";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lua-language-server";
|
||||
version = "3.13.5";
|
||||
version = "3.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luals";
|
||||
repo = "lua-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU=";
|
||||
hash = "sha256-LaetDI9kNPRY4+m3gSsh6vbysRjUKHl+zunuyedjZGY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mopac";
|
||||
version = "23.0.3";
|
||||
version = "23.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openmopac";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y9/b+ro9CgDo0ld9q+3xaCFE9J5ssZp6W9ct6WQgD/o=";
|
||||
hash = "sha256-E7iiAAV+QPYAuTNh0qYOvB2GS/UXQ8YjPYy+Ms7aN3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
buildNpmPackage,
|
||||
fetchNpmDeps,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
@@ -32,12 +34,23 @@ buildNpmPackage rec {
|
||||
ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin/neovim-node-host
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
mainProgram = "neovim-node-host";
|
||||
description = "Nvim msgpack API client and remote plugin provider";
|
||||
homepage = "https://github.com/neovim/node-client";
|
||||
changelog = "https://github.com/neovim/node-client/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fidgetingbits ];
|
||||
mainProgram = "neovim-node-host";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtscrcpy";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src =
|
||||
(fetchFromGitHub {
|
||||
owner = "barry-ran";
|
||||
repo = "QtScrcpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uAWVPmULT2aK+XVZ8eAjCbP8TgDlBDTEvKs25yZktCI=";
|
||||
hash = "sha256-wnzJHSx+HcbtcXDDksog4SAXEf1spcuXQ6+vdysPYQY=";
|
||||
fetchSubmodules = true;
|
||||
}).overrideAttrs
|
||||
(_: {
|
||||
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \
|
||||
--replace-fail 'serverVersion = "2.1.1"' 'serverVersion = "${scrcpy.version}"'
|
||||
--replace-fail 'serverVersion = "3.1"' 'serverVersion = "${scrcpy.version}"'
|
||||
substituteInPlace QtScrcpy/util/config.cpp \
|
||||
--replace-fail 'COMMON_SERVER_VERSION_DEF "2.1.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
|
||||
--replace-fail 'COMMON_SERVER_VERSION_DEF "3.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
|
||||
substituteInPlace QtScrcpy/audio/audiooutput.cpp \
|
||||
--replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh"
|
||||
substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/icons.c b/src/icons.c
|
||||
index eee00a4..ae476de 100644
|
||||
--- a/src/icons.c
|
||||
+++ b/src/icons.c
|
||||
@@ -48,7 +48,7 @@ void request_icons_for_file ( FBFile *fbfile, int icon_size, FileBrowserIconData
|
||||
}
|
||||
}
|
||||
|
||||
- unsigned long num_icon_names;
|
||||
+ gsize num_icon_names;
|
||||
char** icon_names_raw = g_array_steal ( icon_names, &num_icon_names );
|
||||
|
||||
/* Create icon fetcher requests. */
|
||||
@@ -0,0 +1,27 @@
|
||||
diff --git a/src/filebrowser.c b/src/filebrowser.c
|
||||
index a5a19af..59f0140 100644
|
||||
--- a/src/filebrowser.c
|
||||
+++ b/src/filebrowser.c
|
||||
@@ -256,21 +256,21 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec
|
||||
FBCmd *fbcmd = &pd->cmds[selected_line];
|
||||
char* name = fbcmd->name != NULL ? fbcmd->name : fbcmd->cmd;
|
||||
return rofi_force_utf8 ( name, strlen ( name ) );
|
||||
} else {
|
||||
int index = pd->open_custom ? pd->open_custom_index : selected_line;
|
||||
FBFile *fbfile = &fd->files[index];
|
||||
return rofi_force_utf8 ( fbfile->name, strlen ( fbfile->name ) );
|
||||
}
|
||||
}
|
||||
|
||||
-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height )
|
||||
+static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height )
|
||||
{
|
||||
FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw );
|
||||
FileBrowserFileData *fd = &pd->file_data;
|
||||
FileBrowserIconData *id = &pd->icon_data;
|
||||
|
||||
if ( ! id->show_icons ) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ( pd->open_custom && pd->show_cmds ) {
|
||||
@@ -0,0 +1,83 @@
|
||||
diff --git a/src/cmds.c b/src/cmds.c
|
||||
index b2f61d7..16554d8 100644
|
||||
--- a/src/cmds.c
|
||||
+++ b/src/cmds.c
|
||||
@@ -108,21 +108,21 @@ void search_path_for_cmds ( FileBrowserModePrivateData *pd )
|
||||
fbcmd->cmd = cmdstr;
|
||||
fbcmd->name = NULL;
|
||||
fbcmd->icon_name = NULL;
|
||||
|
||||
num_cmds++;
|
||||
}
|
||||
|
||||
g_hash_table_steal_all ( table );
|
||||
g_hash_table_destroy ( table );
|
||||
|
||||
- g_qsort_with_data ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL );
|
||||
+ g_sort_array ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL );
|
||||
|
||||
add_cmds(cmds, num_cmds, pd);
|
||||
|
||||
g_free ( cmds );
|
||||
}
|
||||
|
||||
void destroy_cmds ( FileBrowserModePrivateData *pd )
|
||||
{
|
||||
for ( int i = 0; i < pd->num_cmds; i++ ) {
|
||||
g_free( pd->cmds[i].cmd );
|
||||
diff --git a/src/files.c b/src/files.c
|
||||
index 29a5f9c..6a15b2e 100644
|
||||
--- a/src/files.c
|
||||
+++ b/src/files.c
|
||||
@@ -135,46 +135,46 @@ void load_files ( FileBrowserFileData *fd )
|
||||
FBFile *sort_files = fd->files;
|
||||
int num_sort_files = fd->num_files;
|
||||
if ( ! fd->hide_parent ) {
|
||||
sort_files++;
|
||||
num_sort_files--;
|
||||
}
|
||||
|
||||
/* Sort all but the parent dir. */
|
||||
if ( fd->sort_by_type ) {
|
||||
if ( fd->sort_by_depth ) {
|
||||
- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL );
|
||||
+ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL );
|
||||
} else {
|
||||
- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL );
|
||||
+ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL );
|
||||
}
|
||||
} else {
|
||||
if ( fd->sort_by_depth ) {
|
||||
- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL );
|
||||
+ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL );
|
||||
} else {
|
||||
- g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL );
|
||||
+ g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void change_dir ( char *path, FileBrowserFileData *pd )
|
||||
{
|
||||
char* new_dir = get_canonical_abs_path ( path, pd->current_dir );
|
||||
g_free ( pd->current_dir );
|
||||
pd->current_dir = new_dir;
|
||||
g_chdir ( new_dir );
|
||||
}
|
||||
|
||||
static bool match_glob_patterns ( const char *basename, FileBrowserFileData *fd )
|
||||
{
|
||||
int len = strlen ( basename );
|
||||
for ( int i = 0; i < fd->num_exclude_patterns; i++ ) {
|
||||
- if ( g_pattern_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
|
||||
+ if ( g_pattern_spec_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static int add_file ( const char *fpath, G_GNUC_UNUSED const struct stat *sb, int typeflag, struct FTW *ftwbuf )
|
||||
{
|
||||
FileBrowserFileData *fd = global_fd;
|
||||
|
||||
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix_incompatible_pointer_type.patch
|
||||
./fix_build_on_i686.patch
|
||||
./fix_recent_glib_deprecation_warning.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace ./CMakeLists.txt \
|
||||
--replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \
|
||||
@@ -43,6 +49,9 @@ stdenv.mkDerivation rec {
|
||||
description = "Use rofi to quickly open files";
|
||||
homepage = "https://github.com/marvinkreis/rofi-file-browser-extended";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
maintainers = with maintainers; [
|
||||
bew
|
||||
jluttine
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
tag = version;
|
||||
hash = "sha256-srsSDMvZ7lDDfDuINB0nXR2u+X+bzMqOZL9tvl9GI/s=";
|
||||
hash = "sha256-PQSGB8723y0+cptoLHpXzXfSQFicf5tasbTEf0efA8c=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
@@ -62,6 +62,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"test__linter__skip_dbt_model_disabled"
|
||||
"test_rules__test_helper_has_variable_introspection"
|
||||
"test__rules__std_file_dbt"
|
||||
# Assertion failure
|
||||
"test_html_with_external_css"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sqlfluff" ];
|
||||
|
||||
@@ -1,24 +1,36 @@
|
||||
{
|
||||
rustPlatform,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "turn-rs";
|
||||
version = "3.2.0";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mycrl";
|
||||
repo = "turn-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8=";
|
||||
hash = "sha256-kNE6FbHAFVWH04uTJBCRkrB0yzIjuXX3rxi2h5WmKWo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo=";
|
||||
cargoHash = "sha256-VHfWVEYla7iHOATC4Rv7k560O2VUqAe4ZMo/hLiSOi4=";
|
||||
|
||||
# By default, no features are enabled
|
||||
# https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1
|
||||
cargoBuildFlags = [ "--all-features" ];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/turn-server";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vacuum-go";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo=";
|
||||
hash = "sha256-x3AYHFQFS8PGv5bi+zg4rut7gVgQi9PS3+0YGJ47YMQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU=";
|
||||
vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
||||
@@ -49,11 +49,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.24rc2";
|
||||
version = "1.24rc3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0=";
|
||||
hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
{ callPackage }:
|
||||
callPackage ./binary.nix {
|
||||
version = "1.22.11";
|
||||
version = "1.22.12";
|
||||
hashes = {
|
||||
# Use `print-hashes.sh ${version}` to generate the list below
|
||||
darwin-amd64 = "c6d130066d509ccca1164d84514905b1e8dc5f5f4c25c24113f1b65ad87cd020";
|
||||
darwin-arm64 = "3980b1d2be042a164989f2fd24f0bb306a2397d581a29c7426885578b369db5d";
|
||||
freebsd-386 = "ab10063b2620de387b74bc2eeadc2642a960b1c97c3fc8193447977954262241";
|
||||
freebsd-amd64 = "7910de647cab36eea010da64c07c31484a2c94e0447a0d81f339415de0def2a4";
|
||||
freebsd-arm64 = "9b5043744bd56d36d66ed193776952dd5ebdef31302d6b209e9e87f3b3936e85";
|
||||
freebsd-armv6l = "31cebf4d5280db96dc742fb71301eae5ca4ada5b48b76fb339a03bf857288eeb";
|
||||
freebsd-riscv64 = "b8196ed8ee94eb4c3bbbd4147af9362ffc6b77511dabaf9beb60ac072cf00ead";
|
||||
linux-386 = "b40ee463437e8c8f2d6c9685a0e166eaecb36615afa362eaa58459d3369f3baf";
|
||||
linux-amd64 = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991";
|
||||
linux-arm64 = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031";
|
||||
linux-armv6l = "ac3ba3e0433d96b041f683e9bbb791ca39e159b3d4bb948de4ab3a2c1af1b257";
|
||||
linux-loong64 = "83ced97550e9afc82a48d98534a2457c9662a9071a35439558a70167c8cd513b";
|
||||
linux-mips = "e8c507c5516328e61e7af442f4901f3481859679284eff20198b4180f98fdfd9";
|
||||
linux-mips64 = "22ad73f1762a3129b96f398f4c65fe8a63f5e5657d4bc7f14e153728777ab323";
|
||||
linux-mips64le = "d4ad600a7c6b3c113984b1c301afec67a696a598b0f0ed2841a52c3b9051cd2d";
|
||||
linux-mipsle = "5ebd447b07f33b57e264c80a8229e5c7e09bbc3203efdd72568e7e3267538479";
|
||||
linux-ppc64 = "d3b8cda5a35d9ae670096d88cb8763424d1ac1c720521564eef8dc0dd68c2bc2";
|
||||
linux-ppc64le = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12";
|
||||
linux-riscv64 = "150fd528397622764285f807d3343c36d052ed8cfc390a95e6336738c53f68f4";
|
||||
linux-s390x = "1a235afe650dee989fb37fef6aa520f35e4cd557c31453f3e82b553da3a90669";
|
||||
darwin-amd64 = "e7bbe07e96f0bd3df04225090fe1e7852ed33af37c43a23e16edbbb3b90a5b7c";
|
||||
darwin-arm64 = "416c35218edb9d20990b5d8fc87be655d8b39926f15524ea35c66ee70273050d";
|
||||
freebsd-386 = "85b00f8646e84be6ce51c753d22b68a5f4d5bbfc6a82c8ca9e7489c0c5a619d8";
|
||||
freebsd-amd64 = "a8c77e76859db3e6f3322cbe11deea5faf779e374f45df7554d2cb484ffa492a";
|
||||
freebsd-arm64 = "f56d3b2d26acd9e720f8be503d92bb7bb5d921462ff7c92463d0fa550507ed93";
|
||||
freebsd-armv6l = "dac691ce62ac6b9c78f45a0058d7656abedbe5665b3d49910cbd6ba12e20c2fb";
|
||||
freebsd-riscv64 = "d147c0c8faaffed65240f3b4fe5e44e573928827b9292fb873c9712d567fa986";
|
||||
linux-386 = "40d4c297bc2e964e9c96fe79bb323dce79b77b8b103fc7cc52e0a87c7849890f";
|
||||
linux-amd64 = "4fa4f869b0f7fc6bb1eb2660e74657fbf04cdd290b5aef905585c86051b34d43";
|
||||
linux-arm64 = "fd017e647ec28525e86ae8203236e0653242722a7436929b1f775744e26278e7";
|
||||
linux-armv6l = "bcd678461bb74cda217fb5aa3cc914b2021be6d828f0c6fb4e3a36c3d7312acb";
|
||||
linux-loong64 = "ef1644676782354369210ed6cd839ff872de886c38f287d29ac69377928edec1";
|
||||
linux-mips = "993c685dad0a59f9f15f76a2eb9146f741ef36d808f38985bc6748b38000746d";
|
||||
linux-mips64 = "d8aa3dea17e0175d6a57dfdf9b3b29a911ebe8c5ddbefd808eab61a842c00229";
|
||||
linux-mips64le = "2d473895f9c1dc8c86d51eb13f8ca49b7eea46010759fd71efed3eecacf5335b";
|
||||
linux-mipsle = "d4ba5f6215643a1d64dc159869663f71dd339598e99678e97e1c5300bb46d46d";
|
||||
linux-ppc64 = "ab0b6dc2aa1096f256224398d4a34eac5257289146cdc2f3a62b9fc17709a3c5";
|
||||
linux-ppc64le = "9573d30003b0796717a99d9e2e96c48fddd4fc0f29d840f212c503b03d7de112";
|
||||
linux-riscv64 = "f03a084aabc812fdc15b29acd5e1ee18e13b3c80be22aec43990119afcaf4947";
|
||||
linux-s390x = "e1b20935cc790fdc4c48c0e3e6dd11be57ac09e4eb302ba2cdf146276468b346";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
From 5eaae2daff7722ee01eee239e131ee1f62643abe Mon Sep 17 00:00:00 2001
|
||||
From: Peter Waller <peter.waller@arm.com>
|
||||
Date: Wed, 5 Feb 2025 19:46:15 +0000
|
||||
Subject: [PATCH] [compiler-rt][AArch64] Enable libc-free builtins Linux build
|
||||
|
||||
Without this change, libc++abi.so.1.0 fails to link with:
|
||||
|
||||
```
|
||||
error: undefined sybol: __aarch64_sme_accessible
|
||||
```
|
||||
|
||||
This symbol is provided by baremetal libc's such as newlib.
|
||||
|
||||
In order to compile a libc with compiler-rt, it is necessary first to
|
||||
build a compiler-rt with no dependency on libc to acquire the builtins.
|
||||
The intended linux test requires getauxval which is provided by libc.
|
||||
|
||||
To that end, there are examples in the wild of building a compiler-rt
|
||||
without libc by specifying -DCOMPILER_RT_BAREMETAL_BUILD=ON.
|
||||
On Linux, this gives a builtins build with (almost) no libc dependencies.
|
||||
|
||||
See for example:
|
||||
|
||||
https://github.com/NixOS/nixpkgs/blob/d7fe3bcaca37e79d8b3cbde4dd69edeafbd35313/pkgs/development/compilers/llvm/common/compiler-rt/default.nix#L116-L118
|
||||
|
||||
```
|
||||
] ++ lib.optionals (!haveLibc || bareMetal) [
|
||||
"-DCMAKE_C_COMPILER_WORKS=ON"
|
||||
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
|
||||
```
|
||||
|
||||
The above specifies that a !haveLibc build sets
|
||||
`-DCOMPILER_RT_BAREMETAL_BUILD`, which is done for example in a `pkgsLLVM` build.
|
||||
|
||||
AIUI, acquiring such a builtins build of compiler-rt is necessary to build a
|
||||
pure LLVM toolchain, since builtins are required to build libc (and
|
||||
libcxx is required to build a full compiler-rt).
|
||||
|
||||
The effect of falling back to unimplemented is that this early-stage
|
||||
builtins build is incapable of doing function multiversioning tests and
|
||||
falls back to behaving as-if the feature is unavailable.
|
||||
|
||||
This behaviour changed in
|
||||
https://github.com/llvm/llvm-project/pull/119414, which introduced a
|
||||
subtle change in semantics in the removal of
|
||||
compiler-rt/lib/builtins/aarch64/sme-abi-init.c (definition of getauxval
|
||||
macro, which was bracketed by `#if defined(__linux__)`) vs the new
|
||||
definition which does not test for linux.
|
||||
|
||||
The proposed change is reinstating things as they were before #119414.
|
||||
---
|
||||
compiler-rt/lib/builtins/cpu_model/aarch64.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/builtins/cpu_model/aarch64.c b/lib/builtins/cpu_model/aarch64.c
|
||||
index 4082fd62ea11a25..50438bcc7ddd885 100644
|
||||
--- a/lib/builtins/cpu_model/aarch64.c
|
||||
+++ b/lib/builtins/cpu_model/aarch64.c
|
||||
@@ -80,7 +80,7 @@ struct {
|
||||
#include "aarch64/fmv/getauxval.inc"
|
||||
#elif defined(_WIN32)
|
||||
#include "aarch64/fmv/windows.inc"
|
||||
-#elif defined(ENABLE_BAREMETAL_AARCH64_FMV)
|
||||
+#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) && !defined(__linux__)
|
||||
#include "aarch64/fmv/baremetal.inc"
|
||||
#else
|
||||
#include "aarch64/fmv/unimplemented.inc"
|
||||
|
||||
@@ -1085,12 +1085,7 @@ let
|
||||
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
|
||||
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
|
||||
relative = "compiler-rt";
|
||||
})
|
||||
# Fixes baremetal
|
||||
# PR: https://github.com/llvm/llvm-project/pull/125922
|
||||
++ lib.optional (lib.versionAtLeast metadata.release_version "20") (
|
||||
metadata.getVersionFile "compiler-rt/libc-free.patch"
|
||||
);
|
||||
});
|
||||
in
|
||||
(
|
||||
{
|
||||
|
||||
@@ -2565,14 +2565,14 @@ buildLuarocksPackage {
|
||||
lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lze";
|
||||
version = "0.7.5-1";
|
||||
version = "0.7.9-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lze-0.7.5-1.rockspec";
|
||||
sha256 = "1j5f2hs6pvlgpp9r42qlp6b1cbm4sagv373bf40xjgshzxhjf48j";
|
||||
url = "mirror://luarocks/lze-0.7.9-1.rockspec";
|
||||
sha256 = "010xp1142d7rl29hbbzl8dyf8cy77dzy266kmxa16099zm245kfd";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.7.5.zip";
|
||||
sha256 = "1f1vmv2j3g1f54071yzgxk3np5zxsm9hmckimfs348x873bbr967";
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.7.9.zip";
|
||||
sha256 = "02klg4hl9q9wx3rdx0d92qiiyjw8agvanbicxdcsdavl9kaci8fl";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blackjax";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackjax-devs";
|
||||
repo = "blackjax";
|
||||
tag = version;
|
||||
hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM=";
|
||||
hash = "sha256-2GTjKjLIWFaluTjdWdUF9Iim973y81xv715xspghRZI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -75,6 +75,11 @@ buildPythonPackage rec {
|
||||
"test_diffcp_sdp_example"
|
||||
"test_huber"
|
||||
"test_partial_problem"
|
||||
|
||||
# cvxpy.error.SolverError: Solver 'CVXOPT' failed. Try another solver, or solve with verbose=True for more information.
|
||||
"test_oprelcone_1_m1_k3_complex"
|
||||
"test_oprelcone_1_m3_k1_complex"
|
||||
"test_oprelcone_2"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cvxpy" ];
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "diff-cover";
|
||||
version = "9.2.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
@@ -31,9 +31,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
chardet
|
||||
jinja2
|
||||
jinja2-pluralize
|
||||
@@ -56,6 +56,9 @@ buildPythonPackage rec {
|
||||
"file_does_not_exist"
|
||||
# Comparing console output doesn't work reliable
|
||||
"console"
|
||||
# Assertion failure
|
||||
"test_html_with_external_css"
|
||||
"test_style_defs"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "diff_cover" ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niaclass";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "firefly-cpp";
|
||||
repo = "NiaClass";
|
||||
tag = version;
|
||||
hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I=";
|
||||
hash = "sha256-cowB+nBb5vH2ntLrcctqICYcf3I4m8rw3g4vO3/rokw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Framework for solving classification tasks using Nature-inspired algorithms";
|
||||
homepage = "https://github.com/firefly-cpp/NiaClass";
|
||||
changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${version}";
|
||||
changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ firefly-cpp ];
|
||||
};
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orbax-checkpoint";
|
||||
version = "0.11.2";
|
||||
version = "0.11.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "orbax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-68mqz+4FJQr/mKR53L5CSenRB0SjV3dbBdtBylFW1y8=";
|
||||
hash = "sha256-zKQcqDW0dOQIGNllrK6bPdTr8mkKU6eevdfvMGssd9w=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/checkpoint";
|
||||
|
||||
@@ -21,6 +21,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace-fail "pulsectl >=23.5.0,<=24.11.0" "pulsectl >=23.5.0"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ pulsectl ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
setuptools,
|
||||
hatchling,
|
||||
h5py,
|
||||
numpy,
|
||||
scipy,
|
||||
@@ -12,17 +12,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymatreader";
|
||||
version = "0.0.31";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "obob";
|
||||
repo = "pymatreader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pYObmvqA49sHjpZcwXkN828R/N5CSpmr0OyyxzDiodQ=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cDEGEvBSj3gmjA+8aXULwuBVk09BLQbA91CNAxgtiLA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'source = "regex_commit"' "" \
|
||||
--replace-fail '"hatch-regex-commit"' ""
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h5py
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gvm";
|
||||
version = "25.1.1";
|
||||
version = "26.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = "python-gvm";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y=";
|
||||
hash = "sha256-KJiyOaoRjiMlYi50iPtJXGlQ3KYS2gYA+Q5NRSn/ATI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cairocffi,
|
||||
dbus-next,
|
||||
dbus-fast,
|
||||
glib,
|
||||
iwlib,
|
||||
libcst,
|
||||
@@ -69,7 +69,7 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = extraPackages ++ [
|
||||
(cairocffi.override { withXcffib = true; })
|
||||
dbus-next
|
||||
dbus-fast
|
||||
iwlib
|
||||
libcst
|
||||
mpd2
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pytest-rerunfailures,
|
||||
writableTmpDirAsHomeHook,
|
||||
python,
|
||||
|
||||
# optional-dependencies
|
||||
@@ -38,11 +39,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-5j47Wqt9i6vC3uwRzQ9+8pk+ENl5w6PvnP+830RLCls=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
postPatch =
|
||||
# build-time constriant, used to ensure forward and backward compat
|
||||
substituteInPlace pyproject.toml setup.cfg \
|
||||
--replace-fail "numpy>=2.0.0" "numpy"
|
||||
'';
|
||||
''
|
||||
substituteInPlace pyproject.toml setup.cfg \
|
||||
--replace-fail "numpy>=2.0.0" "numpy"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython_0
|
||||
@@ -59,6 +61,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-rerunfailures
|
||||
writableTmpDirAsHomeHook
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
# QuTiP tries to access the home directory to create an rc file for us.
|
||||
@@ -66,7 +69,6 @@ buildPythonPackage rec {
|
||||
# This is due to the Cython-compiled modules not being in the correct location
|
||||
# of the source tree.
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
export OMP_NUM_THREADS=$NIX_BUILD_CORES
|
||||
mkdir -p test && cd test
|
||||
'';
|
||||
@@ -80,11 +82,6 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "qutip" ];
|
||||
|
||||
pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fatal Python error: Aborted
|
||||
"--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]"
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
graphics = [ matplotlib ];
|
||||
ipython = [ ipython ];
|
||||
@@ -104,6 +101,10 @@ buildPythonPackage rec {
|
||||
# Tests fail at ~80%
|
||||
# ../tests/test_animation.py::test_result_state Fatal Python error: Aborted
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
|
||||
# Several tests fail with a segfault
|
||||
# ../tests/test_random.py::test_rand_super_bcsz[int-CSR-choi-None-rep(1)] Fatal Python error: Aborted
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
platformdirs,
|
||||
pydantic,
|
||||
python-dateutil,
|
||||
pyyaml,
|
||||
rich,
|
||||
tabulate,
|
||||
typer,
|
||||
@@ -38,6 +39,7 @@ buildPythonPackage rec {
|
||||
platformdirs
|
||||
pydantic
|
||||
python-dateutil
|
||||
pyyaml
|
||||
rich
|
||||
tabulate
|
||||
typer
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools-scm,
|
||||
|
||||
# Propagated build inputs
|
||||
portalocker,
|
||||
regex,
|
||||
@@ -16,25 +19,22 @@
|
||||
}:
|
||||
let
|
||||
pname = "sacrebleu";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjpost";
|
||||
repo = pname;
|
||||
repo = "sacrebleu";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc=";
|
||||
hash = "sha256-nLZotWQLrN9hB1fBuDJkvGr4SMvQz8Ucl8ybpNhf9Ic=";
|
||||
};
|
||||
|
||||
# postPatch = ''
|
||||
# substituteInPlace setup.py \
|
||||
# --replace "portalocker==" "portalocker>="
|
||||
# '';
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
portalocker
|
||||
regex
|
||||
tabulate
|
||||
@@ -43,7 +43,7 @@ buildPythonPackage {
|
||||
lxml
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require network access
|
||||
@@ -57,12 +57,12 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "sacrebleu" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores";
|
||||
mainProgram = "sacrebleu";
|
||||
homepage = "https://github.com/mjpost/sacrebleu";
|
||||
changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
changelog = "https://github.com/mjpost/sacrebleu/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
generic: {
|
||||
v70 = generic {
|
||||
version = "7.0.7";
|
||||
hash = "sha256-GZv0OAXCkiVl1yhhFuH1fv/qormFwa/IK/urHmp1RIM=";
|
||||
version = "7.0.8";
|
||||
hash = "sha256-VYfyJ/ASjQgG5VyWWB9iNNanG+3v2pCZFkwLXyWmdYI=";
|
||||
vendorHash = null;
|
||||
};
|
||||
v64 = generic {
|
||||
|
||||
@@ -12402,8 +12402,8 @@ with pkgs;
|
||||
};
|
||||
|
||||
udev =
|
||||
if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero
|
||||
else systemdLibs;
|
||||
if lib.meta.availableOn stdenv.hostPlatform systemdLibs then systemdLibs
|
||||
else libudev-zero;
|
||||
|
||||
sysvtools = sysvinit.override {
|
||||
withoutInitTools = true;
|
||||
|
||||
Reference in New Issue
Block a user