fix(limonka): remove neovim shenanigans
Now integrated into upstream
This commit is contained in:
parent
6e713090c3
commit
9a1baffbb5
2 changed files with 16 additions and 65 deletions
24
flake.lock
24
flake.lock
|
@ -590,11 +590,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716711219,
|
||||
"narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=",
|
||||
"lastModified": 1716736760,
|
||||
"narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a",
|
||||
"rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -697,11 +697,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716672993,
|
||||
"narHash": "sha256-KISj1WGeeEb6d2rYFRGYHYiDvNJN1JtRKU2+jE32LMQ=",
|
||||
"lastModified": 1716743413,
|
||||
"narHash": "sha256-PV+1udsX6y+HVXV7kH8jMN86Aef94JK87uBJuUpRd3M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "0f91f34a626baade98dfa091cc7a023266644d91",
|
||||
"rev": "bd7497d3a7eadddebd9f547e4aab7ea204c892a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1081,11 +1081,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1716716715,
|
||||
"narHash": "sha256-gez/eXcgIxbZCUq6+cLoXXJSzH5hDRLsRnK9Nr9uzdI=",
|
||||
"lastModified": 1716744271,
|
||||
"narHash": "sha256-kWcgbBgV76MMbK47dBZuBnqqnPc7JaJEzVSO9BhcIVo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "ccb21d26b4f6f574561c3d7139960228f7051bd2",
|
||||
"rev": "01b0df69a81b17640c3d5358af74ecbd98a8b575",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1464,11 +1464,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716683167,
|
||||
"narHash": "sha256-Z6qUH7I9mijejV1gC8CY/LNm+2CcUcfgfQ6I8RF/PRg=",
|
||||
"lastModified": 1716725305,
|
||||
"narHash": "sha256-LIz08gALt2wlutGXAEhNroEoIuPV5ePQB8LI4WzXcy8=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "620b5782b0ea694a6e03f3d263da2d5828bce9df",
|
||||
"rev": "93b02a697561ecd438cfa5779727b5a1c300cb4c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -12,58 +12,6 @@
|
|||
overlays = builtins.attrValues outputs.overlays ++ [
|
||||
inputs.neovim-nightly-overlay.overlays.default
|
||||
inputs.zig-overlay.overlays.default
|
||||
(final: prev: {
|
||||
neovim-unwrapped =
|
||||
let
|
||||
liblpeg = final.stdenv.mkDerivation {
|
||||
pname = "liblpeg";
|
||||
|
||||
inherit (final.luajitPackages.lpeg)
|
||||
version meta src;
|
||||
|
||||
buildInputs = [
|
||||
final.luajit
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
sed -i makefile -e "s/CC = gcc/CC = clang/"
|
||||
sed -i makefile -e "s/-bundle/-dynamiclib/"
|
||||
|
||||
make macosx
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
mv lpeg.so $out/lib/lpeg.dylib
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
final.fixDarwinDylibNames
|
||||
];
|
||||
};
|
||||
in
|
||||
prev.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||
# version = self.shortRev or "dirty";
|
||||
version = oldAttrs.version or "dirty";
|
||||
patches =
|
||||
builtins.filter
|
||||
(patch:
|
||||
(
|
||||
if builtins.typeOf patch == "set"
|
||||
then baseNameOf patch.name
|
||||
else baseNameOf
|
||||
)
|
||||
!= "use-the-correct-replacement-args-for-gsub-directive.patch")
|
||||
(oldAttrs.patches or [ ]);
|
||||
preConfigure = ''
|
||||
sed -i cmake.config/versiondef.h.in -e 's/@NVIM_VERSION_PRERELEASE@/-dev-${version}/'
|
||||
'';
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
|
||||
liblpeg
|
||||
final.libiconv
|
||||
];
|
||||
});
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -94,6 +42,8 @@
|
|||
neovim
|
||||
fennel
|
||||
fennel-language-server
|
||||
git
|
||||
gh
|
||||
|
||||
# Dhall
|
||||
dhall
|
||||
|
@ -105,7 +55,8 @@
|
|||
|
||||
# Nix
|
||||
nil
|
||||
nixd
|
||||
# nixd
|
||||
nurl
|
||||
|
||||
# Mail
|
||||
# himalaya
|
||||
|
|
Loading…
Reference in a new issue