From 9692e2e81987410ed51af3b7733d1f1bbabc31bd Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Thu, 7 Mar 2024 21:05:18 +0100 Subject: [PATCH 1/6] nixos/java: No bashisms in `environment.shellInit` script Running dash (the lightweight Debian Almquist shell) results in ``` source: not found ``` For this line which ends up in `/etc/profile`. Let's use `.` instead, according to [the Ubuntu wiki](https://wiki.ubuntu.com/DashAsBinSh#source) and [`checkbashisms`](https://sourceforge.net/projects/checkbaskisms/): ``` possible bashism in /etc/profile line [...] (should be '.', not 'source'): test -e /nix/store/[...]/nix-support/setup-hook && source /nix/store/[...]/nix-support/setup-hook ``` --- nixos/modules/programs/java.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix index 251192183ebf..28bc849f8670 100644 --- a/nixos/modules/programs/java.nix +++ b/nixos/modules/programs/java.nix @@ -66,7 +66,7 @@ in environment.systemPackages = [ cfg.package ]; environment.shellInit = '' - test -e ${cfg.package}/nix-support/setup-hook && source ${cfg.package}/nix-support/setup-hook + test -e ${cfg.package}/nix-support/setup-hook && . ${cfg.package}/nix-support/setup-hook ''; }; From f122659b692d379e9b1c70f6e67f1b4b8b811fb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 11:53:02 +0000 Subject: [PATCH 2/6] python312Packages.databricks-sdk: 0.35.0 -> 0.38.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 57bf4844601c..22126c0643a0 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.35.0"; + version = "0.38.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; rev = "refs/tags/v${version}"; - hash = "sha256-CEv/+3E7KWV9LXzFPvDQIL1v8iFgbsS3/cTS/4obWas="; + hash = "sha256-g00NRo0FSHujN2mCLZCc1hKGsBFiN7ztEneUMziuQpk="; }; build-system = [ From 4594b436018a0ee6de47058af3366a1a760521b0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Nov 2024 22:28:38 +0300 Subject: [PATCH 3/6] kdePackages.kirigami-addons: 1.5.0 -> 1.6.0 --- pkgs/kde/misc/kirigami-addons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 4d5bc9363264..3fef226a1f57 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-+d/RkQIrYz6jNI+Ecw1xWKFZ3+SWaNugqem9Z4rETlQ="; + hash = "sha256-N22ub8WsrH0JBc6f7zIRvgcFxuLfUruA394eqiD+G/o="; }; extraBuildInputs = [ qtdeclarative ]; From 107d49c466073efd791e08a2d8806ade72cb09d2 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Sun, 1 Dec 2024 01:11:46 +0100 Subject: [PATCH 4/6] vimPlugins.csvview-nvim: init at 2024-11-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 385f1050b1bc..4ae249acd093 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2898,6 +2898,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; + csvview-nvim = buildVimPlugin { + pname = "csvview.nvim"; + version = "2024-11-18"; + src = fetchFromGitHub { + owner = "hat0uma"; + repo = "csvview.nvim"; + rev = "63b6585fc22bba2060e6dd4600bd2dd0b77dd446"; + sha256 = "0615vjdiwij5j6qxa5hfvylq9swp0z6lm5xc38yk6yxhjrkcdvyg"; + }; + meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; + }; + ctrlp-cmatcher = buildVimPlugin { pname = "ctrlp-cmatcher"; version = "2015-10-15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3fe82d7b813f..067ea4fd2847 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -240,6 +240,7 @@ https://github.com/saecki/crates.nvim/,, https://github.com/godlygeek/csapprox/,, https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD, https://github.com/chrisbra/csv.vim/,, +https://github.com/hat0uma/csvview.nvim/,HEAD, https://github.com/JazzCore/ctrlp-cmatcher/,, https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, From 37f4ddc209b05dfeeb444078051871a876da488e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Nov 2024 18:19:17 -0600 Subject: [PATCH 5/6] vimPlugins.dotnet-nvim: init at 2024-10-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 385f1050b1bc..c6db2f0f595c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3572,6 +3572,18 @@ final: prev: meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/"; }; + dotnet-nvim = buildVimPlugin { + pname = "dotnet.nvim"; + version = "2024-10-21"; + src = fetchFromGitHub { + owner = "MoaidHathot"; + repo = "dotnet.nvim"; + rev = "f5c52f9f52a3d8ca8dff6916c2228fb41a075274"; + sha256 = "1ysqh2aj3iy2q0cl7i642c03jb7cakqhgbqslcfd7dfvibidd2a2"; + }; + meta.homepage = "https://github.com/MoaidHathot/dotnet.nvim/"; + }; + dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; version = "2024-11-11"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a8d88b9d20ad..4aeffd2fa9ec 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -884,6 +884,13 @@ in ''; }); + dotnet-nvim = super.dotnet-nvim.overrideAttrs { + dependencies = with self; [ + telescope-nvim + plenary-nvim + ]; + }; + efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3fe82d7b813f..4f1d28508f35 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -296,6 +296,7 @@ https://github.com/direnv/direnv.vim/,, https://github.com/chipsenkbeil/distant.nvim/,HEAD, https://github.com/doki-theme/doki-theme-vim/,, https://github.com/NTBBloodbath/doom-one.nvim/,, +https://github.com/MoaidHathot/dotnet.nvim/,HEAD, https://github.com/dracula/vim/,,dracula-vim https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, From d4ce10e4738a977a4c23f98f5716218fed86d0c8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Nov 2024 18:37:27 -0600 Subject: [PATCH 6/6] vimPlugins.nvim-dap-lldb: init at 2024-06-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4ae249acd093..030824e0d656 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8778,6 +8778,18 @@ final: prev: meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; + nvim-dap-lldb = buildVimPlugin { + pname = "nvim-dap-lldb"; + version = "2024-06-09"; + src = fetchFromGitHub { + owner = "julianolf"; + repo = "nvim-dap-lldb"; + rev = "81273514fdb5107b79090364b57a3ff5570bea21"; + sha256 = "18ds6kkrip0m2zanmzfqcr31qnw1whara1mvsnmx30z6iwgdp92w"; + }; + meta.homepage = "https://github.com/julianolf/nvim-dap-lldb/"; + }; + nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; version = "2024-10-24"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a8d88b9d20ad..96aeafd338df 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1853,6 +1853,10 @@ in dependencies = [ self.nvim-fzf ]; }; + nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-dap-python = super.nvim-dap-python.overrideAttrs { dependencies = [ self.nvim-dap ]; nvimRequireCheck = "dap-python"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 067ea4fd2847..6dc762d834c3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -729,6 +729,7 @@ https://github.com/andythigpen/nvim-coverage/,HEAD, https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/leoluz/nvim-dap-go/,HEAD, +https://github.com/julianolf/nvim-dap-lldb/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, https://github.com/rinx/nvim-dap-rego/,HEAD, https://github.com/jonboh/nvim-dap-rr/,HEAD,