servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(lsp): Fixes pylyzer build with a rust 1.75 overlay

Browse Source
This commit is contained in:
uttarayan21
2024-03-23 00:00:13 +05:30
parent 926bf9edc1
commit c3c1e56ed3
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
overlays.nix
View File

@@ -8,7 +8,6 @@
''; '';
}; };
}; };
misc-applications = final: prev: { misc-applications = final: prev: {
goread = final.pkgs.buildGoModule { goread = final.pkgs.buildGoModule {
pname = "goread"; pname = "goread";
@@ -53,7 +52,6 @@
cp $src/subcommands/cover/davis-cover $out/bin cp $src/subcommands/cover/davis-cover $out/bin
''; '';
}; };
picat = let picat = let
# https://github.com/SimonPersson/picat # https://github.com/SimonPersson/picat
picat-src = final.pkgs.fetchFromGitHub { picat-src = final.pkgs.fetchFromGitHub {
@@ -71,12 +69,11 @@
src = picat-src; src = picat-src;
cargoLock = {lockFile = "${picat-src}/Cargo.lock";}; cargoLock = {lockFile = "${picat-src}/Cargo.lock";};
}; };
pylyzer = prev.pylyzer.override { pylyzer = prev.pylyzer.override {
rustPlatform = final.makeRustPlatform { rustPlatform = final.makeRustPlatform {
rustc = final.pkgs.rust-bin.stable."1.75.0".default; rustc = final.pkgs.rust-bin.stable."1.75.0".default;
cargo = final.pkgs.cargo; cargo = final.pkgs.cargo;
}; };
}; };
psst = psst =
if final.pkgs.stdenv.isLinux if final.pkgs.stdenv.isLinux
@@ -114,7 +111,6 @@
}; };
}; };
}; };
anyrun-overlay = final: prev: { anyrun-overlay = final: prev: {
anyrun = anyrun =
inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs
@@ -184,7 +180,6 @@
catppuccinThemes = final: prev: { catppuccinThemes = final: prev: {
catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;}; catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
}; };
nix-index-db = final: prev: { nix-index-db = final: prev: {
nix-index-database = final.runCommandLocal "nix-index-database" {} '' nix-index-database = final.runCommandLocal "nix-index-database" {} ''
mkdir -p $out mkdir -p $out
@@ -193,13 +188,11 @@
} $out/files } $out/files
''; '';
}; };
# nixneovim = nixneovim.applyPatches { # nixneovim = nixneovim.applyPatches {
# name = "nixneovim-patched"; # name = "nixneovim-patched";
# src = inputs.nixneovim; # src = inputs.nixneovim;
# patches = [ ./patches/nixneovim.patch ]; # patches = [ ./patches/nixneovim.patch ];
# }; # };
tree-sitter-grammars = final: prev: { tree-sitter-grammars = final: prev: {
tree-sitter-grammars = tree-sitter-grammars =
prev.tree-sitter-grammars prev.tree-sitter-grammars
@@ -216,7 +209,6 @@
}; };
}; };
}; };
rest-nvim-overlay = final: prev: let rest-nvim-overlay = final: prev: let
rest-nvim-src = final.pkgs.fetchFromGitHub { rest-nvim-src = final.pkgs.fetchFromGitHub {
owner = "rest-nvim"; owner = "rest-nvim";
@@ -256,14 +248,12 @@
python-final: python-prev: { python-final: python-prev: {
catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec { catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec {
version = "1.3.2"; version = "1.3.2";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "python"; repo = "python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik="; hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik=";
}; };
# can be removed next version # can be removed next version
disabledTestPaths = [ disabledTestPaths = [
"tests/test_flavour.py" # would download a json to check correctness of flavours "tests/test_flavour.py" # would download a json to check correctness of flavours
@@ -285,7 +275,10 @@ in [
inputs.neovim-nightly-overlay.overlay inputs.neovim-nightly-overlay.overlay
inputs.nur.overlay inputs.nur.overlay
catppuccin catppuccin
(import (builtins.fetchTarball { url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"; sha256 = "sha256:1k1d7bkx6kdqcvawsm2mm2rd8a0apfkx5y6m1lzr8lxv3bimp4ry";})) (import (builtins.fetchTarball {
url = "https://github.com/oxalica/rust-overlay/archive/master.tar.gz";
sha256 = "sha256:1k1d7bkx6kdqcvawsm2mm2rd8a0apfkx5y6m1lzr8lxv3bimp4ry";
}))
# rest-nvim-overlay # rest-nvim-overlay
# inputs.rustaceanvim.overlays.default # inputs.rustaceanvim.overlays.default
# inputs.nixneovim.overlays.default # inputs.nixneovim.overlays.default