andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes nix standard derivation. (#1042)

Browse Source 
* Adds a formatter for nix. Use `nix fmt`.

* Fixes nix standard derivation.

The standard derivation has been broken for quite some time now, but I
didn't use it, so I didn't care to fix it. Today I cared. It now builds
and is updated for the new packaging system.
This commit is contained in:
Álan Crístoffer 2023-03-11 02:27:50 +01:00 committed by GitHub
parent 3c26892c7e
commit f234b91a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
default.nix
View File

@ -4,19 +4,38 @@
let let
zig-overlay = pkgs.fetchFromGitHub { zig-overlay = pkgs.fetchFromGitHub {
owner = "arqv"; owner = "mitchellh";
repo = "zig-overlay"; repo = "zig-overlay";
rev = "5b9504b8bff072553051d6e130727f7f5c0715c3"; rev = "62ca03d2ff30fb2920c5a1d8a2b6c87d1b68867b";
sha256 = "NDm5qT6/qr789IhI2dsQxrR5/Mr7cXVj17x/+tl3pDE="; sha256 = "1xriHeSpoL4qN5xqPiQc9S9R7Qvcl3RxHwJ5FYPjLn0=";
}; };
gitignoreSrc = pkgs.fetchFromGitHub { gitignoreSrc = pkgs.fetchFromGitHub {
owner = "hercules-ci"; owner = "hercules-ci";
repo = "gitignore"; repo = "gitignore.nix";
rev = "c4662e662462e7bf3c2a968483478a665d00e717"; rev = "a20de23b925fd8264fd7fad6454652e142fd7f73";
sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx"; sha256 = "8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=";
}; };
inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource;
zig = (import zig-overlay { inherit pkgs system; }).master.latest; zig = (import zig-overlay { inherit pkgs system; }).master;
zon = builtins.fromJSON (
builtins.concatStringsSep "" [
"{"
(builtins.replaceStrings [ "}, " ] [ "}" ]
(builtins.replaceStrings [ " ." " =" "\n" ", }" ] [ "\"" "\" :" "" "}" ]
(builtins.replaceStrings [ ".{" ] [ "{" ]
(builtins.concatStringsSep " "
(builtins.filter builtins.isString
(builtins.split "[ \n]+"
(builtins.elemAt
(builtins.match ".*dependencies = .[{](.*)[}].*" (builtins.readFile ./build.zig.zon))
0)))))))
]
);
cp-phase = builtins.concatStringsSep ";" (builtins.attrValues (builtins.mapAttrs (k: v: "cp -r ${builtins.fetchTarball v.url} .cache/p/${v.hash}") zon));
in in
pkgs.stdenvNoCC.mkDerivation { pkgs.stdenvNoCC.mkDerivation {
name = "zls"; name = "zls";
@ -27,7 +46,8 @@ pkgs.stdenvNoCC.mkDerivation {
dontInstall = true; dontInstall = true;
buildPhase = '' buildPhase = ''
mkdir -p $out mkdir -p $out
zig build install -Dcpu=baseline -Drelease-safe=true -Ddata_version=master --prefix $out mkdir -p .cache/{p,z,tmp}
${cp-phase}
zig build install --cache-dir $(pwd)/zig-cache --global-cache-dir $(pwd)/.cache -Dcpu=baseline -Doptimize=ReleaseSafe -Ddata_version=master --prefix $out
''; '';
XDG_CACHE_HOME = ".cache";
} }

1
flake.nix
View File

@ -48,6 +48,7 @@
cp-phase = builtins.concatStringsSep ";" (builtins.attrValues (builtins.mapAttrs (k: v: "cp -r ${inputs.${k}} .cache/p/${v.hash}") zon)); cp-phase = builtins.concatStringsSep ";" (builtins.attrValues (builtins.mapAttrs (k: v: "cp -r ${inputs.${k}} .cache/p/${v.hash}") zon));
in in
rec { rec {
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
packages.default = packages.zls; packages.default = packages.zls;
packages.zls = pkgs.stdenvNoCC.mkDerivation { packages.zls = pkgs.stdenvNoCC.mkDerivation {
name = "zls"; name = "zls";