Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -206,6 +206,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
|
||||
|
||||
- `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated.
|
||||
|
||||
- `mysql80` has been removed. Please update to `mysql84` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.
|
||||
|
||||
- `services.prometheus.exporters.rspamd` has been removed. It relied on the Rspamd /stat endpoint via the JSON exporter. You can use the Rspamd [/metrics](https://docs.rspamd.com/developers/protocol#controller-http-endpoints) endpoint directly instead.
|
||||
|
||||
- The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
cfg = config.services.mysql;
|
||||
|
||||
isMariaDB = lib.getName cfg.package == lib.getName pkgs.mariadb;
|
||||
isOracle = lib.getName cfg.package == lib.getName pkgs.mysql80;
|
||||
isOracle = lib.getName cfg.package == lib.getName pkgs.mysql84;
|
||||
# Oracle MySQL has supported "notify" service type since 8.0
|
||||
hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0");
|
||||
|
||||
|
||||
@@ -8,8 +8,7 @@
|
||||
let
|
||||
cfg = config.services.autobrr;
|
||||
configFormat = pkgs.formats.toml { };
|
||||
configTemplate = configFormat.generate "autobrr.toml" cfg.settings;
|
||||
templaterCmd = ''${lib.getExe pkgs.dasel} put -f '${configTemplate}' -v "$(${config.systemd.package}/bin/systemd-creds cat sessionSecret)" -o %S/autobrr/config.toml "sessionSecret"'';
|
||||
configFile = configFormat.generate "autobrr.toml" cfg.settings;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -28,13 +27,31 @@ in
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule { freeformType = configFormat.type; };
|
||||
default = {
|
||||
host = "127.0.0.1";
|
||||
port = 7474;
|
||||
checkForUpdates = true;
|
||||
type = lib.types.submodule {
|
||||
freeformType = configFormat.type;
|
||||
options = {
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "The host address autobrr listens on.";
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 7474;
|
||||
description = "The port autobrr listens on.";
|
||||
};
|
||||
|
||||
checkForUpdates = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Whether autobrr needs to check for updates.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
example = {
|
||||
port = 7654;
|
||||
logLevel = "DEBUG";
|
||||
};
|
||||
description = ''
|
||||
@@ -61,26 +78,40 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.autobrr = {
|
||||
description = "Autobrr";
|
||||
after = [
|
||||
"syslog.target"
|
||||
"network-online.target"
|
||||
];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
systemd = {
|
||||
tmpfiles.settings = {
|
||||
"10-autobrr" = {
|
||||
# DynamicUser uses /var/lib/private/
|
||||
"/var/lib/private/autobrr/config.toml"."L+" = {
|
||||
argument = "${configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
LoadCredential = "sessionSecret:${cfg.secretFile}";
|
||||
StateDirectory = "autobrr";
|
||||
ExecStartPre = "${lib.getExe pkgs.bash} -c '${templaterCmd}'";
|
||||
ExecStart = "${lib.getExe cfg.package} --config %S/autobrr";
|
||||
Restart = "on-failure";
|
||||
services.autobrr = {
|
||||
description = "Autobrr";
|
||||
after = [
|
||||
"syslog.target"
|
||||
"network-online.target"
|
||||
];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ configFile ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
LoadCredential = "sessionSecret:${cfg.secretFile}";
|
||||
Environment = [ "AUTOBRR__SESSION_SECRET_FILE=%d/sessionSecret" ];
|
||||
StateDirectory = "autobrr";
|
||||
ExecStart = "${lib.getExe cfg.package} --config %S/autobrr";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.port ]; };
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ av-gal ];
|
||||
}
|
||||
|
||||
@@ -802,7 +802,7 @@ in
|
||||
services.mysql.enable = mkDefault createLocalMySQL;
|
||||
services.mysql.package =
|
||||
let
|
||||
dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql80;
|
||||
dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql84;
|
||||
in
|
||||
mkIf createLocalMySQL (mkDefault dbPkg);
|
||||
};
|
||||
|
||||
+32
-8
@@ -6,18 +6,42 @@
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
# We create this secret in the Nix store (making it readable by everyone).
|
||||
# DO NOT DO THIS OUTSIDE OF TESTS!!
|
||||
testSecretFile = pkgs.writeText "session_secret" "not-secret";
|
||||
in
|
||||
{
|
||||
services.autobrr = {
|
||||
enable = true;
|
||||
# We create this secret in the Nix store (making it readable by everyone).
|
||||
# DO NOT DO THIS OUTSIDE OF TESTS!!
|
||||
secretFile = pkgs.writeText "session_secret" "not-secret";
|
||||
secretFile = testSecretFile;
|
||||
};
|
||||
|
||||
# Use port other than default to test if settings options work.
|
||||
specialisation.settingsPort.configuration = {
|
||||
services.autobrr = {
|
||||
enable = true;
|
||||
secretFile = testSecretFile;
|
||||
settings.port = 7777;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("autobrr.service")
|
||||
machine.wait_for_open_port(7474)
|
||||
machine.succeed("curl --fail http://localhost:7474/")
|
||||
'';
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
settingsPort = "${nodes.machine.system.build.toplevel}/specialisation/settingsPort";
|
||||
in
|
||||
# python
|
||||
''
|
||||
def test_webui(port):
|
||||
machine.wait_for_unit("autobrr.service")
|
||||
machine.wait_for_open_port(port)
|
||||
machine.wait_until_succeeds(f"curl --fail http://localhost:{port}")
|
||||
|
||||
test_webui(7474)
|
||||
|
||||
machine.succeed("${settingsPort}/bin/switch-to-configuration test")
|
||||
test_webui(7777)
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import ../../../pkgs/servers/sql/mariadb pkgs
|
||||
);
|
||||
mysqlPackages = {
|
||||
inherit (pkgs) mysql80;
|
||||
inherit (pkgs) mysql84;
|
||||
};
|
||||
perconaPackages = {
|
||||
inherit (pkgs) percona-server_8_0 percona-server_8_4;
|
||||
|
||||
@@ -23266,19 +23266,6 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
windsurf-nvim = buildVimPlugin {
|
||||
pname = "windsurf.nvim";
|
||||
version = "0-unstable-2025-04-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "windsurf.nvim";
|
||||
rev = "821b570b526dbb05b57aa4ded578b709a704a38a";
|
||||
hash = "sha256-TWezce2+XrkzaiW/V3VgfX3FMdS8qFE8/FfPEK/Ii84=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/windsurf.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
windsurf-vim = buildVimPlugin {
|
||||
pname = "windsurf.vim";
|
||||
version = "1.20.8-unstable-2026-01-22";
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
{
|
||||
lib,
|
||||
codeium,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
jq,
|
||||
stdenv,
|
||||
vimPlugins,
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
# Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
|
||||
codeiumVersion = "1.20.9";
|
||||
codeiumHashes = {
|
||||
x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
|
||||
aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
|
||||
x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
|
||||
aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
|
||||
};
|
||||
|
||||
codeium' = codeium.overrideAttrs rec {
|
||||
version = codeiumVersion;
|
||||
|
||||
src =
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
platform =
|
||||
{
|
||||
x86_64-linux = "linux_x64";
|
||||
aarch64-linux = "linux_arm";
|
||||
x86_64-darwin = "macos_x64";
|
||||
aarch64-darwin = "macos_arm";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
hash = codeiumHashes.${system} or throwSystem;
|
||||
in
|
||||
fetchurl {
|
||||
name = "codeium-${version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz";
|
||||
inherit hash;
|
||||
};
|
||||
};
|
||||
in
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "windsurf.nvim";
|
||||
version = "0-unstable-2025-04-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "windsurf.nvim";
|
||||
rev = "821b570b526dbb05b57aa4ded578b709a704a38a";
|
||||
hash = "sha256-TWezce2+XrkzaiW/V3VgfX3FMdS8qFE8/FfPEK/Ii84=";
|
||||
};
|
||||
|
||||
dependencies = [ vimPlugins.plenary-nvim ];
|
||||
buildPhase = ''
|
||||
cat << EOF > lua/codeium/installation_defaults.lua
|
||||
return {
|
||||
tools = {
|
||||
language_server = "${codeium'}/bin/codeium_language_server"
|
||||
};
|
||||
};
|
||||
EOF
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
jq
|
||||
codeium'
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
|
||||
actual_codeium_version=$(codeium_language_server --version)
|
||||
|
||||
expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
|
||||
actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
|
||||
|
||||
if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
|
||||
echo "
|
||||
The version of codeium patched in vimPlugins.codeium-nvim is incorrect.
|
||||
Expected stamp: $expected_codeium_stamp
|
||||
Actual stamp: $actual_codeium_stamp
|
||||
|
||||
Expected codeium version: $expected_codeium_version
|
||||
Actual codeium version: $actual_codeium_version
|
||||
|
||||
Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to:
|
||||
https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
|
||||
"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Native neovim extension for Codeium";
|
||||
homepage = "https://github.com/Exafunction/windsurf.nvim";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.attrNames codeiumHashes;
|
||||
};
|
||||
}
|
||||
@@ -194,7 +194,9 @@ assertNoAdditions {
|
||||
|
||||
aider-nvim = super.aider-nvim.overrideAttrs {
|
||||
patches = [
|
||||
(replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; })
|
||||
(replaceVars ./patches/aider-nvim/bin.patch {
|
||||
aider = lib.getExe aider-chat;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
@@ -231,15 +233,15 @@ assertNoAdditions {
|
||||
checkInputs = [ self.toggleterm-nvim ];
|
||||
};
|
||||
|
||||
autosave-nvim = super.autosave-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
auto-session = super.auto-session.overrideAttrs {
|
||||
# Optional integration
|
||||
checkInputs = [ self.telescope-nvim ];
|
||||
};
|
||||
|
||||
autosave-nvim = super.autosave-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
aw-watcher-vim = super.aw-watcher-vim.overrideAttrs {
|
||||
patches = [
|
||||
(replaceVars ./patches/aw-watcher-vim/program_paths.patch {
|
||||
@@ -314,6 +316,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
blink-cmp-env = super.blink-cmp-env.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-cmp-git = super.blink-cmp-git.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
@@ -334,14 +340,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
meta = old.meta // {
|
||||
@@ -350,11 +348,15 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
blink-cmp-env = super.blink-cmp-env.overrideAttrs {
|
||||
blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs {
|
||||
blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
blink-nerdfont-nvim = super.blink-nerdfont-nvim.overrideAttrs {
|
||||
dependencies = [ self.blink-cmp ];
|
||||
};
|
||||
|
||||
@@ -453,6 +455,12 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
fzf-lua
|
||||
];
|
||||
};
|
||||
|
||||
claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
claudecode-nvim
|
||||
@@ -466,12 +474,6 @@ assertNoAdditions {
|
||||
'';
|
||||
};
|
||||
|
||||
claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
fzf-lua
|
||||
];
|
||||
};
|
||||
|
||||
clighter8 = super.clighter8.overrideAttrs {
|
||||
preFixup = ''
|
||||
sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \
|
||||
@@ -584,11 +586,6 @@ assertNoAdditions {
|
||||
checkInputs = [ self.nvim-cmp ];
|
||||
};
|
||||
|
||||
cmp_luasnip = super.cmp_luasnip.overrideAttrs {
|
||||
checkInputs = [ self.nvim-cmp ];
|
||||
dependencies = [ self.luasnip ];
|
||||
};
|
||||
|
||||
cmp-neosnippet = super.cmp-neosnippet.overrideAttrs {
|
||||
checkInputs = [ self.nvim-cmp ];
|
||||
dependencies = [ self.neosnippet-vim ];
|
||||
@@ -683,6 +680,11 @@ assertNoAdditions {
|
||||
dependencies = [ zsh ];
|
||||
};
|
||||
|
||||
cmp_luasnip = super.cmp_luasnip.overrideAttrs {
|
||||
checkInputs = [ self.nvim-cmp ];
|
||||
dependencies = [ self.luasnip ];
|
||||
};
|
||||
|
||||
cobalt2-nvim = super.cobalt2-nvim.overrideAttrs {
|
||||
dependencies = with self; [ colorbuddy-nvim ];
|
||||
# Few broken themes
|
||||
@@ -697,6 +699,15 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
# transitive dependency for codecompanion-nvim
|
||||
plenary-nvim
|
||||
|
||||
codecompanion-nvim
|
||||
];
|
||||
};
|
||||
|
||||
codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional completion
|
||||
@@ -721,103 +732,11 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
# transitive dependency for codecompanion-nvim
|
||||
plenary-nvim
|
||||
|
||||
codecompanion-nvim
|
||||
];
|
||||
};
|
||||
|
||||
codesettings-nvim = super.codesettings-nvim.overrideAttrs {
|
||||
# This module is a build CLI and should not be `require`d directly!
|
||||
nvimSkipModules = [ "codesettings.build.cli" ];
|
||||
};
|
||||
|
||||
windsurf-nvim =
|
||||
let
|
||||
# Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
|
||||
codeiumVersion = "1.20.9";
|
||||
codeiumHashes = {
|
||||
x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM=";
|
||||
aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4=";
|
||||
x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE=";
|
||||
aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48=";
|
||||
};
|
||||
|
||||
codeium' = codeium.overrideAttrs rec {
|
||||
version = codeiumVersion;
|
||||
|
||||
src =
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
platform =
|
||||
{
|
||||
x86_64-linux = "linux_x64";
|
||||
aarch64-linux = "linux_arm";
|
||||
x86_64-darwin = "macos_x64";
|
||||
aarch64-darwin = "macos_arm";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
hash = codeiumHashes.${system} or throwSystem;
|
||||
in
|
||||
fetchurl {
|
||||
name = "codeium-${version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz";
|
||||
inherit hash;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
super.windsurf-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
buildPhase = ''
|
||||
cat << EOF > lua/codeium/installation_defaults.lua
|
||||
return {
|
||||
tools = {
|
||||
language_server = "${codeium'}/bin/codeium_language_server"
|
||||
};
|
||||
};
|
||||
EOF
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
jq
|
||||
codeium'
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
|
||||
actual_codeium_version=$(codeium_language_server --version)
|
||||
|
||||
expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
|
||||
actual_codeium_stamp=$(codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
|
||||
|
||||
if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
|
||||
echo "
|
||||
The version of codeium patched in vimPlugins.codeium-nvim is incorrect.
|
||||
Expected stamp: $expected_codeium_stamp
|
||||
Actual stamp: $actual_codeium_stamp
|
||||
|
||||
Expected codeium version: $expected_codeium_version
|
||||
Actual codeium version: $actual_codeium_version
|
||||
|
||||
Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to:
|
||||
https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
|
||||
"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
};
|
||||
|
||||
codewindow-nvim = super.codewindow-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-treesitter-legacy ];
|
||||
};
|
||||
@@ -887,19 +806,6 @@ assertNoAdditions {
|
||||
nvimSkipModules = [ "context.highlight" ];
|
||||
};
|
||||
|
||||
CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional integrations
|
||||
fzf-lua
|
||||
telescope-nvim
|
||||
snacks-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
copilot-lua
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
copilot-cmp = super.copilot-cmp.overrideAttrs {
|
||||
dependencies = [ self.copilot-lua ];
|
||||
};
|
||||
@@ -924,6 +830,19 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional integrations
|
||||
fzf-lua
|
||||
telescope-nvim
|
||||
snacks-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
copilot-lua
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
coq_nvim = super.coq_nvim.overrideAttrs {
|
||||
passthru.python3Dependencies =
|
||||
ps: with ps; [
|
||||
@@ -1047,6 +966,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.ddc-vim ];
|
||||
};
|
||||
|
||||
ddc-ui-native = super.ddc-ui-native.overrideAttrs {
|
||||
dependencies = [ self.ddc-vim ];
|
||||
};
|
||||
|
||||
ddc-ui-pum = super.ddc-ui-pum.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
ddc-vim
|
||||
@@ -1054,10 +977,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
ddc-ui-native = super.ddc-ui-native.overrideAttrs {
|
||||
dependencies = [ self.ddc-vim ];
|
||||
};
|
||||
|
||||
ddc-vim = super.ddc-vim.overrideAttrs {
|
||||
dependencies = [ self.denops-vim ];
|
||||
};
|
||||
@@ -1374,16 +1293,12 @@ assertNoAdditions {
|
||||
runtimeDeps = [ curl ];
|
||||
};
|
||||
|
||||
ghcid = super.ghcid.overrideAttrs {
|
||||
configurePhase = "cd plugins/nvim";
|
||||
};
|
||||
|
||||
gh-nvim = super.gh-nvim.overrideAttrs {
|
||||
dependencies = [ self.litee-nvim ];
|
||||
};
|
||||
|
||||
gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
ghcid = super.ghcid.overrideAttrs {
|
||||
configurePhase = "cd plugins/nvim";
|
||||
};
|
||||
|
||||
git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
|
||||
@@ -1402,6 +1317,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
go-nvim = super.go-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-treesitter
|
||||
@@ -1681,6 +1600,23 @@ assertNoAdditions {
|
||||
}
|
||||
);
|
||||
|
||||
lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
|
||||
lazy-nvim = super.lazy-nvim.overrideAttrs {
|
||||
patches = [ ./patches/lazy-nvim/no-helptags.patch ];
|
||||
nvimSkipModules = [
|
||||
# Requires headless config option
|
||||
"lazy.manage.task.init"
|
||||
"lazy.manage.checker"
|
||||
"lazy.manage.init"
|
||||
"lazy.manage.runner"
|
||||
"lazy.view.commands"
|
||||
"lazy.build"
|
||||
];
|
||||
};
|
||||
|
||||
lazydocker-nvim = super.lazydocker-nvim.overrideAttrs {
|
||||
runtimeDeps = [
|
||||
lazydocker
|
||||
@@ -1724,23 +1660,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
|
||||
lazy-nvim = super.lazy-nvim.overrideAttrs {
|
||||
patches = [ ./patches/lazy-nvim/no-helptags.patch ];
|
||||
nvimSkipModules = [
|
||||
# Requires headless config option
|
||||
"lazy.manage.task.init"
|
||||
"lazy.manage.checker"
|
||||
"lazy.manage.init"
|
||||
"lazy.manage.runner"
|
||||
"lazy.view.commands"
|
||||
"lazy.build"
|
||||
];
|
||||
};
|
||||
|
||||
LeaderF = super.LeaderF.overrideAttrs {
|
||||
nativeBuildInputs = [ python3.pkgs.setuptools ];
|
||||
buildInputs = [ python3 ];
|
||||
@@ -1902,6 +1821,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
@@ -1917,10 +1840,6 @@ assertNoAdditions {
|
||||
nvimRequireCheck = "lspsaga";
|
||||
};
|
||||
|
||||
lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
ltex_extra-nvim = super.ltex_extra-nvim.overrideAttrs {
|
||||
# Other modules require setup call first
|
||||
nvimRequireCheck = "ltex_extra";
|
||||
@@ -2027,13 +1946,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
mason-nvim
|
||||
nvim-dap
|
||||
];
|
||||
};
|
||||
|
||||
mason-nvim = super.mason-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
# lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
|
||||
@@ -2043,6 +1955,13 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
mason-nvim
|
||||
nvim-dap
|
||||
];
|
||||
};
|
||||
|
||||
mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs {
|
||||
dependencies = [ self.mason-nvim ];
|
||||
};
|
||||
@@ -2165,6 +2084,17 @@ assertNoAdditions {
|
||||
dependencies = [ self.ultisnips ];
|
||||
};
|
||||
|
||||
neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
|
||||
checkInputs = [ git ];
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
nui-nvim
|
||||
];
|
||||
nvimSkipModule = [
|
||||
"neo-tree.types.fixes.compat-0.10"
|
||||
];
|
||||
};
|
||||
|
||||
neoconf-nvim = super.neoconf-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
|
||||
@@ -2334,7 +2264,7 @@ assertNoAdditions {
|
||||
nvimSkipModules = "neotest-jest-assertions";
|
||||
};
|
||||
|
||||
neotest-mocha = super.neotest-mocha.overrideAttrs {
|
||||
neotest-minitest = super.neotest-minitest.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
neotest
|
||||
nvim-nio
|
||||
@@ -2342,7 +2272,7 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
neotest-minitest = super.neotest-minitest.overrideAttrs {
|
||||
neotest-mocha = super.neotest-mocha.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
neotest
|
||||
nvim-nio
|
||||
@@ -2446,14 +2376,16 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
|
||||
checkInputs = [ git ];
|
||||
neovim-tips = super.neovim-tips.overrideAttrs {
|
||||
dependencies = [
|
||||
self.nui-nvim
|
||||
];
|
||||
};
|
||||
|
||||
neovim-trunk = super.neovim-trunk.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
nui-nvim
|
||||
];
|
||||
nvimSkipModule = [
|
||||
"neo-tree.types.fixes.compat-0.10"
|
||||
telescope-nvim
|
||||
];
|
||||
};
|
||||
|
||||
@@ -2468,19 +2400,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
neovim-trunk = super.neovim-trunk.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
};
|
||||
|
||||
neovim-tips = super.neovim-tips.overrideAttrs {
|
||||
dependencies = [
|
||||
self.nui-nvim
|
||||
];
|
||||
};
|
||||
|
||||
nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
@@ -2584,10 +2503,6 @@ assertNoAdditions {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
@@ -2621,6 +2536,10 @@ assertNoAdditions {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs {
|
||||
dependencies = [ self.nvim-dap ];
|
||||
};
|
||||
|
||||
nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
|
||||
dependencies = [ self.nvim-treesitter-legacy ];
|
||||
};
|
||||
@@ -2687,6 +2606,13 @@ assertNoAdditions {
|
||||
dependencies = [ self.nvim-java-core ];
|
||||
};
|
||||
|
||||
nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
nvim-lspconfig
|
||||
];
|
||||
};
|
||||
|
||||
nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs {
|
||||
nvimSkipModule = [
|
||||
# Option not set immediately
|
||||
@@ -2696,13 +2622,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
nvim-lspconfig
|
||||
];
|
||||
};
|
||||
|
||||
nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
@@ -2728,6 +2647,7 @@ assertNoAdditions {
|
||||
nvim-navic
|
||||
];
|
||||
};
|
||||
|
||||
nvim-navic = super.nvim-navic.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
@@ -2861,16 +2781,16 @@ assertNoAdditions {
|
||||
callPackage ./nvim-treesitter/overrides.nix { } self super
|
||||
);
|
||||
|
||||
# TODO: raise warning at 26.04; drop at 26.11
|
||||
nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs (
|
||||
callPackage ./nvim-treesitter-legacy/overrides.nix { } self super
|
||||
);
|
||||
|
||||
nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs {
|
||||
# Meant for CI installing parsers
|
||||
nvimSkipModules = [ "install_parsers" ];
|
||||
};
|
||||
|
||||
# TODO: raise warning at 26.04; drop at 26.11
|
||||
nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs (
|
||||
callPackage ./nvim-treesitter-legacy/overrides.nix { } self super
|
||||
);
|
||||
|
||||
nvim-treesitter-pairs = super.nvim-treesitter-pairs.overrideAttrs {
|
||||
dependencies = [ self.nvim-treesitter-legacy ];
|
||||
};
|
||||
@@ -3002,6 +2922,14 @@ assertNoAdditions {
|
||||
nvimSkipModules = "omni-lightline";
|
||||
};
|
||||
|
||||
one-nvim = super.one-nvim.overrideAttrs (old: {
|
||||
# E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
|
||||
# https://github.com/Th3Whit3Wolf/one-nvim/issues/23
|
||||
meta = old.meta // {
|
||||
broken = true;
|
||||
};
|
||||
});
|
||||
|
||||
onedark-nvim = super.onedark-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
# Requires global config value
|
||||
@@ -3016,14 +2944,6 @@ assertNoAdditions {
|
||||
configurePhase = "cd vim";
|
||||
};
|
||||
|
||||
one-nvim = super.one-nvim.overrideAttrs (old: {
|
||||
# E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
|
||||
# https://github.com/Th3Whit3Wolf/one-nvim/issues/23
|
||||
meta = old.meta // {
|
||||
broken = true;
|
||||
};
|
||||
});
|
||||
|
||||
opencode-nvim = super.opencode-nvim.overrideAttrs {
|
||||
runtimeDeps = [
|
||||
curl
|
||||
@@ -3055,10 +2975,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
org-roam-nvim = super.org-roam-nvim.overrideAttrs {
|
||||
dependencies = [ self.orgmode ];
|
||||
};
|
||||
|
||||
org-notebook-nvim = super.org-notebook-nvim.overrideAttrs {
|
||||
dependencies = [
|
||||
self.orgmode
|
||||
@@ -3070,6 +2986,10 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
org-roam-nvim = super.org-roam-nvim.overrideAttrs {
|
||||
dependencies = [ self.orgmode ];
|
||||
};
|
||||
|
||||
otter-nvim = super.otter-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
nvimSkipModules = [
|
||||
@@ -3300,6 +3220,10 @@ assertNoAdditions {
|
||||
|
||||
});
|
||||
|
||||
rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
|
||||
rustaceanvim = super.rustaceanvim.overrideAttrs {
|
||||
checkInputs = [
|
||||
# Optional integration
|
||||
@@ -3307,10 +3231,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
|
||||
rzls-nvim = super.rzls-nvim.overrideAttrs {
|
||||
dependencies = [ self.roslyn-nvim ];
|
||||
};
|
||||
@@ -3334,10 +3254,6 @@ assertNoAdditions {
|
||||
scretch-nvim = super.scretch-nvim.overrideAttrs {
|
||||
};
|
||||
|
||||
searchbox-nvim = super.searchbox-nvim.overrideAttrs {
|
||||
dependencies = [ self.nui-nvim ];
|
||||
};
|
||||
|
||||
search-and-replace-nvim = super.search-and-replace-nvim.overrideAttrs {
|
||||
runtimeDeps = [
|
||||
fd
|
||||
@@ -3345,6 +3261,10 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
searchbox-nvim = super.searchbox-nvim.overrideAttrs {
|
||||
dependencies = [ self.nui-nvim ];
|
||||
};
|
||||
|
||||
sidekick-nvim = super.sidekick-nvim.overrideAttrs {
|
||||
runtimeDeps = [
|
||||
copilot-language-server
|
||||
@@ -3547,6 +3467,7 @@ assertNoAdditions {
|
||||
maintainers = with lib.maintainers; [ fredeb ];
|
||||
};
|
||||
});
|
||||
|
||||
telekasten-nvim = super.telekasten-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
@@ -3883,64 +3804,6 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
vimacs = super.vimacs.overrideAttrs (old: {
|
||||
buildPhase = ''
|
||||
substituteInPlace bin/vim \
|
||||
--replace-fail '/usr/bin/vim' 'vim' \
|
||||
--replace-fail '/usr/bin/gvim' 'gvim'
|
||||
# remove unnecessary duplicated bin wrapper script
|
||||
rm -r plugin/vimacs
|
||||
'';
|
||||
meta = old.meta // {
|
||||
description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
|
||||
homepage = "http://algorithm.com.au/code/vimacs";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ millerjason ];
|
||||
};
|
||||
});
|
||||
|
||||
vimade = super.vimade.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional providers
|
||||
hlchunk-nvim
|
||||
mini-nvim
|
||||
snacks-nvim
|
||||
];
|
||||
};
|
||||
|
||||
vimsence = super.vimsence.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
description = "Discord rich presence for Vim";
|
||||
homepage = "https://github.com/hugolgst/vimsence";
|
||||
maintainers = with lib.maintainers; [ hugolgst ];
|
||||
};
|
||||
});
|
||||
|
||||
vimtex = super.vimtex.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional integrations
|
||||
fzf-lua
|
||||
snacks-nvim
|
||||
];
|
||||
};
|
||||
|
||||
vimproc-vim = super.vimproc-vim.overrideAttrs {
|
||||
buildInputs = [ which ];
|
||||
|
||||
# TODO: revisit
|
||||
buildPhase = ''
|
||||
substituteInPlace autoload/vimproc.vim \
|
||||
--replace-fail vimproc_mac.so vimproc_unix.so \
|
||||
--replace-fail vimproc_linux64.so vimproc_unix.so \
|
||||
--replace-fail vimproc_linux32.so vimproc_unix.so
|
||||
make -f make_unix.mak
|
||||
'';
|
||||
};
|
||||
|
||||
vimshell-vim = super.vimshell-vim.overrideAttrs {
|
||||
dependencies = [ self.vimproc-vim ];
|
||||
};
|
||||
|
||||
vim-addon-actions = super.vim-addon-actions.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
vim-addon-mw-utils
|
||||
@@ -4082,6 +3945,10 @@ assertNoAdditions {
|
||||
dependencies = with self; [ fzf-vim ];
|
||||
};
|
||||
|
||||
vim-gist = super.vim-gist.overrideAttrs {
|
||||
dependencies = [ self.webapi-vim ];
|
||||
};
|
||||
|
||||
# change the go_bin_path to point to a path in the nix store. See the code in
|
||||
# fatih/vim-go here
|
||||
# https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
|
||||
@@ -4114,10 +3981,6 @@ assertNoAdditions {
|
||||
'';
|
||||
};
|
||||
|
||||
vim-gist = super.vim-gist.overrideAttrs {
|
||||
dependencies = [ self.webapi-vim ];
|
||||
};
|
||||
|
||||
vim-grammarous = super.vim-grammarous.overrideAttrs {
|
||||
# use `:GrammarousCheck` to initialize checking
|
||||
# In neovim, you also want to use set
|
||||
@@ -4276,6 +4139,64 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
vimacs = super.vimacs.overrideAttrs (old: {
|
||||
buildPhase = ''
|
||||
substituteInPlace bin/vim \
|
||||
--replace-fail '/usr/bin/vim' 'vim' \
|
||||
--replace-fail '/usr/bin/gvim' 'gvim'
|
||||
# remove unnecessary duplicated bin wrapper script
|
||||
rm -r plugin/vimacs
|
||||
'';
|
||||
meta = old.meta // {
|
||||
description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
|
||||
homepage = "http://algorithm.com.au/code/vimacs";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ millerjason ];
|
||||
};
|
||||
});
|
||||
|
||||
vimade = super.vimade.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional providers
|
||||
hlchunk-nvim
|
||||
mini-nvim
|
||||
snacks-nvim
|
||||
];
|
||||
};
|
||||
|
||||
vimproc-vim = super.vimproc-vim.overrideAttrs {
|
||||
buildInputs = [ which ];
|
||||
|
||||
# TODO: revisit
|
||||
buildPhase = ''
|
||||
substituteInPlace autoload/vimproc.vim \
|
||||
--replace-fail vimproc_mac.so vimproc_unix.so \
|
||||
--replace-fail vimproc_linux64.so vimproc_unix.so \
|
||||
--replace-fail vimproc_linux32.so vimproc_unix.so
|
||||
make -f make_unix.mak
|
||||
'';
|
||||
};
|
||||
|
||||
vimsence = super.vimsence.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
description = "Discord rich presence for Vim";
|
||||
homepage = "https://github.com/hugolgst/vimsence";
|
||||
maintainers = with lib.maintainers; [ hugolgst ];
|
||||
};
|
||||
});
|
||||
|
||||
vimshell-vim = super.vimshell-vim.overrideAttrs {
|
||||
dependencies = [ self.vimproc-vim ];
|
||||
};
|
||||
|
||||
vimtex = super.vimtex.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional integrations
|
||||
fzf-lua
|
||||
snacks-nvim
|
||||
];
|
||||
};
|
||||
|
||||
virt-column-nvim = super.virt-column-nvim.overrideAttrs {
|
||||
# Meta file
|
||||
nvimSkipModules = "virt-column.config.types";
|
||||
|
||||
@@ -1787,7 +1787,6 @@ https://github.com/SUSTech-data/wildfire.nvim/,HEAD,
|
||||
https://github.com/gcmt/wildfire.vim/,,
|
||||
https://github.com/fgheng/winbar.nvim/,main,
|
||||
https://github.com/anuvyklack/windows.nvim/,,
|
||||
https://github.com/Exafunction/windsurf.nvim/,HEAD,
|
||||
https://github.com/Exafunction/windsurf.vim/,HEAD,
|
||||
https://github.com/sindrets/winshift.nvim/,,
|
||||
https://github.com/wannesm/wmgraphviz.vim/,,
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "actool";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viraptor";
|
||||
repo = "actool";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4g4Uex6eE5ULKi9JGaOIlyTAzwuK0cPKdYMxTnvKN3U=";
|
||||
hash = "sha256-WtiunUS0E6t7X+5lZqm4vZJ7C4dvFGiUKfjvHwNNtR0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
nodejs,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
@@ -86,11 +87,14 @@ buildGoModule (finalAttrs: {
|
||||
versionCheckProgram = "${placeholder "out"}/bin/autobrrctl";
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"autobrr-web"
|
||||
];
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"autobrr-web"
|
||||
];
|
||||
};
|
||||
tests.testService = nixosTests.autobrr;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "1.0.0";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZmtofGQYC32pz9WWTvENTU1qSVOXDu+CneyX/YelvZU=";
|
||||
hash = "sha256-oEDpfpOkA0J9fSF+haEvhmZGSZIRCaN2qHa2pHUujBs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dlMC+nUStrrjYlwxG+NVoqFOuTMcdaUL5a20dN3G5HQ=";
|
||||
cargoHash = "sha256-YpFeu5re+kYjjv6Id9kvus3oGmz3qExD8ofLFObAZdI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eSGznx64xN/2/TPkLTx57Ar56FogYSzUkINBduhMn/8=";
|
||||
hash = "sha256-8UiHsBggmiJCs9sWGQoq0W2FNToAKFakGdAKvFl4ceo=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-ztpKe7kgQAgfCBiIBlzPDa5muOI+9kESwrzBLqwz3V0=";
|
||||
npmDepsHash = "sha256-lLywxLYmfO7EIYewPwISV5izAcOpy1350oJGwdsV6L8=";
|
||||
|
||||
dontPatchElf = stdenv.isDarwin;
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-enhance";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-enhance";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IHtI8wnPLMkqxdBFXqkt6inYMOIqKjdTKdZbTxIhPzo=";
|
||||
hash = "sha256-g6nhEcBt72sol/49FVlYSo9HKtWHfj+zKw7FZ0ZjKXI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rgql0vsHAzWeubw4EYBu/yPmm2QeADsIeACWsbcWtSk=";
|
||||
vendorHash = "sha256-us25CXQC3cd3BTa+wOYArbBiMtwkgpfeCQoD3S7+3rU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
cmake,
|
||||
pkg-config,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
juce,
|
||||
libx11,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
libxext,
|
||||
libxcursor,
|
||||
freetype,
|
||||
fontconfig,
|
||||
alsa-lib,
|
||||
|
||||
buildVST3 ? true,
|
||||
buildLV2 ? true,
|
||||
buildCLAP ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
juce-clap-extensions = fetchFromGitHub {
|
||||
owner = "free-audio";
|
||||
repo = "clap-juce-extensions";
|
||||
rev = "02f91b7988298f7f1f05c706da16e1d9da852a87";
|
||||
hash = "sha256-cPi+prl+jLq/KvjZ5M2MxxZVLSKCiJB9SQHK8psW2OU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
chowdsp_utils = fetchFromGitHub {
|
||||
owner = "Chowdhury-DSP";
|
||||
repo = "chowdsp_utils";
|
||||
rev = "ffc70ba399f9afaeefb996eb14e55a1d487270b8"; # LIB_CHOWDSP_UTILS_TAG from CMakeLists.txt
|
||||
hash = "sha256-rKjrhb+w/lW9k3Dg5jWM2eJRa0fPDF8SNVrCTFrRMoM=";
|
||||
};
|
||||
|
||||
# src/dsp/guitarml-byod/CMakeLists.txt
|
||||
rtneural = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "RTNeural";
|
||||
rev = "04cb333bc4b174760958a77c7ce076eae38fe8e4"; # LIB_RTNEURAL_TAG
|
||||
hash = "sha256-kTHYEpoXPYNKEs7rHeSwBHVQnOQKhKnST+UWa++uCsc=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
postFetch = ''
|
||||
# note: if rtneural is updated, this won't be needed anymore
|
||||
substituteInPlace $out/CMakeLists.txt \
|
||||
--replace-fail "include(cmake/CPM.cmake)" "# No tests" \
|
||||
|
||||
# Required for CMake 4
|
||||
substituteInPlace $out/CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"cmake_minimum_required(VERSION 3.5)" \
|
||||
"cmake_minimum_required(VERSION 4.0)"
|
||||
'';
|
||||
};
|
||||
|
||||
# src/dsp/guitarml-byod/CMakeLists.txt
|
||||
math_approx = fetchFromGitHub {
|
||||
owner = "Chowdhury-DSP";
|
||||
repo = "math_approx";
|
||||
rev = "0c68d4d17242d707ba07fa7f1901692b7ed72d58"; # LIB_CHOWDSP_MATH_APPROX_TAG
|
||||
hash = "sha256-t6UrsZGRJjJVp+aGkwBa++Skj9xkdQuZKAxRrTkfM0E=";
|
||||
};
|
||||
|
||||
# src/dsp/guitarml-byod/CMakeLists.txt
|
||||
ea_variant = fetchFromGitHub {
|
||||
owner = "eyalamirmusic";
|
||||
repo = "Variant";
|
||||
rev = "3fce49cfca50ba3b05026d41ffc4911a8e653378"; # LIB_VARIANT_TAG
|
||||
hash = "sha256-2zzam7rKY6zoT2jFqDtr4pwOCAWTu0GTxUqVGxVHbQQ=";
|
||||
};
|
||||
|
||||
formats = lib.concatStringsSep " " [
|
||||
(lib.optionalString buildVST3 "VST3")
|
||||
(lib.optionalString buildLV2 "LV2")
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jc303";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "midilab";
|
||||
repo = "jc303";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5OA7ir8loT0Lx05guwuZNCW9J9I3TA5+A9JZ9E7oWXA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# `BUILD_CLAP` cmake flag
|
||||
(fetchpatch {
|
||||
url = "https://github.com/midilab/jc303/commit/837d3fc5cf4e993375403a45d7e23df1b4e3cf7f.diff";
|
||||
hash = "sha256-WvLIcSHrLiXj1VEV+IxS05YSWEq7oz57qIbNsqRySaY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "set(PLUGIN_FORMATS AU VST3 LV2)" "set(PLUGIN_FORMATS ${formats})" \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxrandr
|
||||
libxext
|
||||
libxcursor
|
||||
libxinerama
|
||||
freetype
|
||||
fontconfig
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# CMakeLists.txt
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JUCE" "${juce.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JUCE-CLAP-EXTENSIONS" "${juce-clap-extensions}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CHOWDSP_UTILS" "${chowdsp_utils}")
|
||||
|
||||
# src/dsp/guitarml-byod/CMakeLists.txt
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RTNEURAL" "${rtneural}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MATH_APPROX" "${math_approx}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EA_VARIANT" "${ea_variant}")
|
||||
|
||||
(lib.cmakeBool "BUILD_CLAP" buildCLAP)
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
pushd JC303_artefacts/Release
|
||||
${lib.optionalString buildVST3 ''
|
||||
mkdir -p $out/lib/vst3
|
||||
cp -r VST3/JC303.vst3 $out/lib/vst3
|
||||
''}
|
||||
|
||||
${lib.optionalString buildCLAP ''
|
||||
mkdir -p $out/lib/clap
|
||||
cp -r CLAP/JC303.clap $out/lib/clap
|
||||
''}
|
||||
|
||||
${lib.optionalString buildLV2 ''
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r LV2/JC303.lv2 $out/lib/lv2
|
||||
''}
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Roland TB-303 clone plugin";
|
||||
homepage = "https://github.com/midilab/jc303";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.mrtnvgr ];
|
||||
};
|
||||
})
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "libation";
|
||||
version = "13.3.2";
|
||||
version = "13.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rmcrackan";
|
||||
repo = "Libation";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IwKpM6BBHTbfdH4Sf3nYR0HDIxU8S5Pz0XxYdVRJcn4=";
|
||||
hash = "sha256-nWmTk3oMuTcSvEzN/+2BnRWEqwLecRy2mS6uPNUP9UI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/Source";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
# for passthru.tests
|
||||
libfido2,
|
||||
mysql80,
|
||||
mysql84,
|
||||
openssh,
|
||||
systemd,
|
||||
}:
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeCheckInputs = [ cmocka ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit libfido2 mysql80;
|
||||
inherit libfido2 mysql84;
|
||||
openssh = (openssh.override { withFIDO = true; });
|
||||
systemd = (
|
||||
systemd.override {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
boost,
|
||||
openssl,
|
||||
mysql80,
|
||||
mysql84,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
mysql80
|
||||
mysql84
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
openssl
|
||||
mysql80
|
||||
mysql84
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2026-03-16";
|
||||
version = "0-unstable-2026-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "875bc1da241f4d174e6443c754e7dd4926f76f8c";
|
||||
hash = "sha256-N/JZ8qTJtg/RlWnQXJ9SJruz7zr5yHJdWL+XnxxMM84=";
|
||||
rev = "f1b85fef8c82ae05bf24a2bda8eb2730b3b7023e";
|
||||
hash = "sha256-wAsU07lEjr9rFfW1WrnzflEriGwr/vzKpE9OM2zsPJA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mihomo";
|
||||
version = "1.19.22";
|
||||
version = "1.19.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "mihomo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HRFtKx9g7AsBPl3HlOf+2giDc6a7e4YmQZlg4hElfdI=";
|
||||
hash = "sha256-0KaTf/FXlLBxbq6ViNkD4uSIKJ7pNxEBMFIYL983hAY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K5lC6bvetwaXvufa+FU+noXWXBem/IZ1pkl2eLo7vTc=";
|
||||
vendorHash = "sha256-4xu/ZcoFCpO226tVfhVwkXaTEIyblFjKezX/haHjyNE=";
|
||||
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
python3Packages,
|
||||
|
||||
cairo,
|
||||
mysql80,
|
||||
mysql84,
|
||||
libiodbc,
|
||||
proj,
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
mysql = mysql80;
|
||||
mysql = mysql84;
|
||||
gdal' = gdal.override { libmysqlclient = mysql; };
|
||||
antlr = antlr4_13;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/src/modules/meson.build b/src/modules/meson.build
|
||||
index 5d2dc9984..35f5773aa 100644
|
||||
index 59f46ae13..3fa3d9f89 100644
|
||||
--- a/src/modules/meson.build
|
||||
+++ b/src/modules/meson.build
|
||||
@@ -169,6 +169,7 @@ if build_module_jack_tunnel
|
||||
@@ -110,6 +110,7 @@ if build_module_jack_tunnel
|
||||
install_dir : modules_install_dir,
|
||||
install_rpath: modules_install_dir,
|
||||
dependencies : [mathlib, dl_lib, pipewire_dep],
|
||||
@@ -11,16 +11,16 @@ index 5d2dc9984..35f5773aa 100644
|
||||
build_module_jackdbus_detect = dbus_dep.found()
|
||||
if build_module_jackdbus_detect
|
||||
diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h
|
||||
index 42580f798..e7aadd3cc 100644
|
||||
index 472adb253..cffca1dde 100644
|
||||
--- a/src/modules/module-jack-tunnel/weakjack.h
|
||||
+++ b/src/modules/module-jack-tunnel/weakjack.h
|
||||
@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
|
||||
@@ -167,8 +167,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
|
||||
|
||||
search_dirs = getenv("LIBJACK_PATH");
|
||||
if (!search_dirs)
|
||||
- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
|
||||
- "/usr/lib64/:/usr/lib/:" LIBDIR;
|
||||
+ search_dirs = NIXPKGS_LIBJACK_PATH;
|
||||
search_dirs = getenv("LIBJACK_PATH");
|
||||
if (!search_dirs)
|
||||
- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
|
||||
- "/usr/lib64/:/usr/lib/:" LIBDIR;
|
||||
+ search_dirs = NIXPKGS_LIBJACK_PATH;
|
||||
|
||||
res = -ENAMETOOLONG;
|
||||
|
||||
while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {
|
||||
int pathlen;
|
||||
|
||||
@@ -89,7 +89,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pipewire";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PG1S70wnyGz9H3TP3gJ2/O+3XnaAyyB4XRM2NFnCWwY=";
|
||||
hash = "sha256-zD0PYtZsiU+tZUpVBKofjGVQyO/68eIZP7DqBQHUGJk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "proton-vpn";
|
||||
version = "4.15.1";
|
||||
version = "4.15.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-gtk-app";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mWQW/KR2zQxSMkcu5k79H3TNATmFB6J2vgFhgXNpM2s=";
|
||||
hash = "sha256-spxlYITDo2TZp4Qv47/HmiIaGU07THZXLG5cFIFZrow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "qui";
|
||||
version = "1.15.0";
|
||||
version = "1.16.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "qui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TdZNccViu+YArjziohnAHJ5js97iMD8qA5iGUPBbwDU=";
|
||||
hash = "sha256-yqk5qOSXXL710VjwLlIdnHcp6TGqiN1G7r+g2jLrcdk=";
|
||||
};
|
||||
|
||||
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
|
||||
@@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-9ZPtkxRWzYm9SIYj/ncaKXo/xkyAamdcdFwvfbseb20=";
|
||||
hash = "sha256-CgkIKLlckf5fhvZuBrTr+fI7CDyvuXQoqfyC2jQ3dnk=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: {
|
||||
'';
|
||||
});
|
||||
|
||||
vendorHash = "sha256-eex2smQRfArp1+aWNh+yBV4AtHNSEEPRsyZVkDDOt5w=";
|
||||
vendorHash = "sha256-FJWJgvX5SDp70kPaZAnTWzcKKrLOjkAVf6OFTBmyLos=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.qui-web}/* web/dist
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nixosTests,
|
||||
testers,
|
||||
sqlite3-to-mysql,
|
||||
mysql80,
|
||||
mysql84,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
tabulate
|
||||
unidecode
|
||||
packaging
|
||||
mysql80
|
||||
mysql84
|
||||
python-dateutil
|
||||
sqlglot
|
||||
];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trufflehog";
|
||||
version = "3.94.2";
|
||||
version = "3.94.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/uJR17eYTj61V/csMj/zEGiI42gWaLZEGh+oM7kaY80=";
|
||||
hash = "sha256-dNQjBBHtu0MFlAr/FluHAxR75q621HqHttpT2tBZKsg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BzZflc9NbqmvZ+RmGvkcknotvn10V/XrgfW8mG8GgiA=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wl-tray-bridge";
|
||||
version = "0.1.0-unstable-2026-02-16";
|
||||
version = "0-unstable-2026-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mahkoh";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
dnspython,
|
||||
fetchFromGitHub,
|
||||
protobuf,
|
||||
mysql80,
|
||||
mysql84,
|
||||
openssl,
|
||||
pkgs,
|
||||
}:
|
||||
@@ -15,11 +15,11 @@ buildPythonPackage rec {
|
||||
format = "setuptools";
|
||||
|
||||
setupPyBuildFlags = [
|
||||
"--with-mysql-capi=${mysql80}"
|
||||
"--with-mysql-capi=${mysql84}"
|
||||
"--with-openssl-include-dir=${openssl.dev}/include"
|
||||
"--with-openssl-lib-dir=${lib.getLib openssl}/lib"
|
||||
"-L"
|
||||
"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib"
|
||||
"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql84}/lib"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -40,14 +40,18 @@ buildPythonPackage rec {
|
||||
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ mysql80 ];
|
||||
nativeBuildInputs = [ mysql84 ];
|
||||
|
||||
buildInputs = [
|
||||
mysql84
|
||||
openssl
|
||||
pkgs.zlib
|
||||
pkgs.zstd
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dnspython
|
||||
protobuf
|
||||
mysql80
|
||||
openssl
|
||||
pkgs.zstd
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mysql" ];
|
||||
|
||||
@@ -1781,6 +1781,18 @@
|
||||
};
|
||||
};
|
||||
|
||||
ocamllex = {
|
||||
version = "0.25.0";
|
||||
url = "github:314eter/tree-sitter-ocamllex";
|
||||
hash = "sha256-mqp/qHr1zWMJinlMJ0HNAKuFUQ4NqQiLzKx0DoN4wGI=";
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
leungbk
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
odin = {
|
||||
version = "1.3.0-unstable-2025-01-12";
|
||||
url = "github:tree-sitter-grammars/tree-sitter-odin";
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
bison,
|
||||
cmake,
|
||||
pkg-config,
|
||||
boost,
|
||||
icu,
|
||||
libedit,
|
||||
libevent,
|
||||
lz4,
|
||||
ncurses,
|
||||
openssl,
|
||||
protobuf,
|
||||
re2,
|
||||
readline,
|
||||
zlib,
|
||||
zstd,
|
||||
libfido2,
|
||||
numactl,
|
||||
cctools,
|
||||
developer_cmds,
|
||||
libtirpc,
|
||||
rpcsvc-proto,
|
||||
curl,
|
||||
DarwinTools,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mysql";
|
||||
version = "8.0.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-tDXyLmWMj8k7gWmPo0uaVjJaMEs/Pf+H8n+2dMkKu8s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
pkg-config
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
|
||||
|
||||
patches = [
|
||||
./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
|
||||
];
|
||||
|
||||
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool
|
||||
substituteInPlace cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool
|
||||
substituteInPlace cmake/package_name.cmake --replace-fail "COMMAND sw_vers" "COMMAND ${DarwinTools}/bin/sw_vers"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
(curl.override { inherit openssl; })
|
||||
icu
|
||||
libedit
|
||||
libevent
|
||||
lz4
|
||||
ncurses
|
||||
openssl
|
||||
protobuf
|
||||
re2
|
||||
readline
|
||||
zlib
|
||||
zstd
|
||||
libfido2
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
numactl
|
||||
libtirpc
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
developer_cmds
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"static"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
|
||||
"-DWITH_ROUTER=OFF" # It may be packaged separately.
|
||||
"-DWITH_SYSTEM_LIBS=ON"
|
||||
"-DWITH_UNIT_TESTS=OFF"
|
||||
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DINSTALL_INFODIR=share/mysql/docs"
|
||||
"-DINSTALL_MANDIR=share/man"
|
||||
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
|
||||
"-DINSTALL_INCLUDEDIR=include/mysql"
|
||||
"-DINSTALL_DOCREADMEDIR=share/mysql"
|
||||
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLTESTDIR="
|
||||
"-DINSTALL_DOCDIR=share/mysql/docs"
|
||||
"-DINSTALL_SHAREDIR=share/mysql"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "lib/*.a" $static
|
||||
so=${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
client = finalAttrs.finalPackage;
|
||||
connector-c = finalAttrs.finalPackage;
|
||||
server = finalAttrs.finalPackage;
|
||||
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
|
||||
tests = nixosTests.mysql.mysql80;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.mysql.com/";
|
||||
description = "World's most popular open source database";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1,24 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 727d66011f9..acae1aada57 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
-# For aarch64 some sub-architectures support LSE atomics and some don't. Thus,
|
||||
-# compiling for the common denominator (-march=armv8-a) means LSE is not used.
|
||||
-# The -moutline-atomics switch enables run-time detection of LSE support.
|
||||
-# There are compilers (gcc 9.3.1 for example) which support this switch, but
|
||||
-# do not enable it by default, even though it seems to help. So, we force it.
|
||||
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||
- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS)
|
||||
- IF(HAVE_OUTLINE_ATOMICS)
|
||||
- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics")
|
||||
- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics")
|
||||
- ENDIF()
|
||||
-ENDIF()
|
||||
-
|
||||
IF(LINUX)
|
||||
OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF)
|
||||
SET(LINK_RANDOMIZE_SEED "mysql"
|
||||
@@ -1401,6 +1401,7 @@ mapAliases {
|
||||
mutter46 = throw "'mutter46' has been removed, no longer used by Pantheon"; # Added 2026-01-24
|
||||
muzika = throw "muzika was discontinued upstream in november 2024"; # Added 2025-12-15;
|
||||
mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
|
||||
mysql80 = throw "'mysql80' reached end of life on 2026-04-30 and has been removed."; # Added 2026-04-08
|
||||
mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
|
||||
n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
|
||||
nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -8328,13 +8328,6 @@ with pkgs;
|
||||
boost = boost179.override { enableShared = false; };
|
||||
};
|
||||
|
||||
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
|
||||
inherit (darwin) developer_cmds DarwinTools;
|
||||
boost = boost177; # Configure checks for specific version.
|
||||
icu = icu69;
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };
|
||||
jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { };
|
||||
|
||||
|
||||
@@ -9818,7 +9818,7 @@ with self;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgs.mysql80 # for mysql_config
|
||||
pkgs.mysql84 # for mysql_config
|
||||
];
|
||||
buildInputs = [
|
||||
DevelChecklib
|
||||
@@ -9828,6 +9828,7 @@ with self;
|
||||
pkgs.libmysqlconnectorcpp
|
||||
pkgs.libxcrypt
|
||||
pkgs.openssl
|
||||
pkgs.zlib
|
||||
pkgs.zstd
|
||||
];
|
||||
propagatedBuildInputs = [ DBI ];
|
||||
|
||||
Reference in New Issue
Block a user