Move kak-lsp and kakoune into flake inputs
This commit is contained in:
parent
2a76dc2039
commit
d0e5f73def
5 changed files with 48 additions and 41 deletions
34
flake.lock
generated
34
flake.lock
generated
|
@ -108,6 +108,38 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kak-lsp": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657090719,
|
||||
"narHash": "sha256-PzI8CzfGSeNJNvHYc9O32/WZ4EJJnMsIpYTYKtVWkw8=",
|
||||
"owner": "kak-lsp",
|
||||
"repo": "kak-lsp",
|
||||
"rev": "b29989a3056914d1b62eb62cd33495ff389679bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kak-lsp",
|
||||
"repo": "kak-lsp",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kakoune": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1656974620,
|
||||
"narHash": "sha256-OQXbxda3GmfdRA19+zlKvEWnEKtIKVRtoijsqtHg4FY=",
|
||||
"owner": "mawww",
|
||||
"repo": "kakoune",
|
||||
"rev": "f3cb2e434004a718d1225cb0d74c694e66a7248b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mawww",
|
||||
"repo": "kakoune",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -338,6 +370,8 @@
|
|||
"deploy-rs": "deploy-rs",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"kak-lsp": "kak-lsp",
|
||||
"kakoune": "kakoune",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
|
|
|
@ -22,6 +22,12 @@
|
|||
youmubot.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-gaming.url = github:fufexan/nix-gaming;
|
||||
|
||||
# --- Sources
|
||||
kakoune.url = github:mawww/kakoune;
|
||||
kakoune.flake = false;
|
||||
kak-lsp.url = github:kak-lsp/kak-lsp;
|
||||
kak-lsp.flake = false;
|
||||
|
||||
# ---
|
||||
# DEPLOYMENT ONLY! secrets
|
||||
secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets";
|
||||
|
|
|
@ -2,19 +2,10 @@
|
|||
|
||||
let
|
||||
kakounePkg =
|
||||
let
|
||||
rev = "5c6238ef113da8c2844ff9bcfa27c87e3473c150";
|
||||
in
|
||||
pkgs.kakoune.override {
|
||||
kakoune = pkgs.kakoune-unwrapped.overrideAttrs (oldAttrs: {
|
||||
version = "r${builtins.substring 0 6 rev}";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
repo = "kakoune";
|
||||
owner = "mawww";
|
||||
rev = rev;
|
||||
sha256 = "sha256-ogjeUcOKvX3Dd7PG2jiyHkAzbzFidXmLIeN5jaifMvc=";
|
||||
# sha256 = lib.fakeSha256;
|
||||
};
|
||||
version = "r${builtins.substring 0 6 pkgs.sources.kakoune.rev}";
|
||||
src = pkgs.sources.kakoune;
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -26,25 +17,14 @@ let
|
|||
}) + "/evince_synctex.py";
|
||||
|
||||
kak-lsp =
|
||||
let
|
||||
rev = "v12.2.1";
|
||||
# version = "r${builtins.substring 0 6 rev}";
|
||||
version = rev;
|
||||
in
|
||||
pkgs.unstable.rustPlatform.buildRustPackage
|
||||
rec {
|
||||
inherit rev version;
|
||||
pname = "kak-lsp";
|
||||
version = "r${builtins.substring 0 6 pkgs.sources.kak-lsp.rev}";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = rev;
|
||||
sha256 = "sha256-lKlHEJnA4GYS9oda/6cZPe8IW3Ud9KhDT3z651X0PrA=";
|
||||
# sha256 = lib.fakeSha256;
|
||||
};
|
||||
src = pkgs.sources.kak-lsp;
|
||||
|
||||
cargoSha256 = "sha256-Z0mITH+A68KCTYAvVMdhwNeIOfuRvn+w5SNMw4ol9Hs=";
|
||||
cargoSha256 = "sha256-QmAkO8iDoOI1AHyCjFVVmXlZWo/lMd01k5/VY1xdTkI=";
|
||||
# cargoSha256 = lib.fakeSha256;
|
||||
|
||||
buildInputs = (with pkgs;
|
||||
|
|
|
@ -11,6 +11,9 @@ let
|
|||
};
|
||||
overlay-imported = final: prev: {
|
||||
rnix-lsp = inputs.rnix-lsp.defaultPackage."${prev.system}";
|
||||
|
||||
# A list of source-style inputs.
|
||||
sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;
|
||||
};
|
||||
|
||||
overlay-versioning = final: prev: {
|
||||
|
@ -92,6 +95,5 @@ in
|
|||
nur.overlay
|
||||
|
||||
# Bug fixes
|
||||
(import ./overlays/bugfixes/delta)
|
||||
] # we assign the overlay created before to the overlays of nixpkgs.
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
final: prev: {
|
||||
delta =
|
||||
if (prev.delta.version == "0.10.0") then
|
||||
# There is a bug where prev.delta on v0.10.0 does NOT have adequate dependencies on Darwin.
|
||||
(prev.delta.overrideAttrs
|
||||
(oldAttrs: {
|
||||
version = "0.10.0-patched";
|
||||
buildInputs = final.lib.optionals final.stdenv.isDarwin (with final; [
|
||||
darwin.apple_sdk.frameworks.DiskArbitration
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
libiconv
|
||||
]);
|
||||
})) else prev.delta;
|
||||
}
|
Loading…
Add table
Reference in a new issue