From 8edb8bcac34b53ad674470cc06f2ea2d9ad72be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= Date: Sun, 5 Mar 2023 20:38:27 +0100 Subject: [PATCH] Fixes nix build. (#1032) * fix nix build * fix nix build --- flake.lock | 58 ++++++++++++++++++++++-------------------------------- flake.nix | 52 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 58 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 95cf268..39313be 100644 --- a/flake.lock +++ b/flake.lock @@ -3,17 +3,13 @@ "diffz": { "flake": false, "locked": { - "lastModified": 1676881125, - "narHash": "sha256-iCXoJp+89GhdFO9roE208mhqURTuMX8zKiEEpvMH2do=", - "owner": "ziglibs", - "repo": "diffz", - "rev": "efc91679b000a2d7f86fb40930f0a95a0d349bff", - "type": "github" + "narHash": "sha256-9bdX4R/VDdjAn8TDH4T3a783mvbpjdWq2KSNtM9RcnY=", + "type": "tarball", + "url": "https://github.com/ziglibs/diffz/archive/b966296b4489eb082b0831ec9a37d6f5e1906040.tar.gz" }, "original": { - "owner": "ziglibs", - "repo": "diffz", - "type": "github" + "type": "tarball", + "url": "https://github.com/ziglibs/diffz/archive/b966296b4489eb082b0831ec9a37d6f5e1906040.tar.gz" } }, "flake-compat": { @@ -82,29 +78,25 @@ "type": "github" } }, - "known-folders": { + "known_folders": { "flake": false, "locked": { - "lastModified": 1675710004, - "narHash": "sha256-eIAKOrapiqofwj4okOH9iRxBwl09VnAgS+nbfmD5q9U=", - "owner": "ziglibs", - "repo": "known-folders", - "rev": "53fe3b676f32e59d46f4fd201d7ab200e5f6cb98", - "type": "github" + "narHash": "sha256-hgzm6HrtusbhmWEq6moKYGf5sWc52UwyHTjAIjr6EEQ=", + "type": "tarball", + "url": "https://github.com/ziglibs/known-folders/archive/d13ba6137084e55f873f6afb67447fe8906cc951.tar.gz" }, "original": { - "owner": "ziglibs", - "repo": "known-folders", - "type": "github" + "type": "tarball", + "url": "https://github.com/ziglibs/known-folders/archive/d13ba6137084e55f873f6afb67447fe8906cc951.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1676991263, - "narHash": "sha256-MXTZ2WdiYJ4LmWUo9Yc3DzrWr+V3NSxNE0t2ynoqYZ0=", + "lastModified": 1677852945, + "narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7475ce8950b761d80a13f3f81d2c23fce60c1dd", + "rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb", "type": "github" }, "original": { @@ -119,7 +111,7 @@ "diffz": "diffz", "flake-utils": "flake-utils", "gitignore": "gitignore", - "known-folders": "known-folders", + "known_folders": "known_folders", "nixpkgs": "nixpkgs", "tres": "tres", "zig-overlay": "zig-overlay" @@ -128,17 +120,13 @@ "tres": { "flake": false, "locked": { - "lastModified": 1677011084, - "narHash": "sha256-hUPEz/agefsEAylFgfTA9csickOfqLbzguPIfwLI5WU=", - "owner": "ziglibs", - "repo": "tres", - "rev": "d8b0c24a945da02fffdae731edd1903c6889e73c", - "type": "github" + "narHash": "sha256-WFI/nXcxy05kfrl4kLjP0LfwO9xCqjxKg7ZPEKiB6NY=", + "type": "tarball", + "url": "https://github.com/ziglibs/tres/archive/707a09313b42e05d6ae22d1590499eece5f968ce.tar.gz" }, "original": { - "owner": "ziglibs", - "repo": "tres", - "type": "github" + "type": "tarball", + "url": "https://github.com/ziglibs/tres/archive/707a09313b42e05d6ae22d1590499eece5f968ce.tar.gz" } }, "zig-overlay": { @@ -150,11 +138,11 @@ ] }, "locked": { - "lastModified": 1676999840, - "narHash": "sha256-hOctK9Skbpdy1plgZlWzj6EoVQJFwpG1JRrr0F+9l34=", + "lastModified": 1678018077, + "narHash": "sha256-Gwzyc99gdpi7m7i6pRQhtAjWcvJRvJT65s2E9CTjCg0=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1b0d9c8d127616d40abb11f663924293b8e6dbfd", + "rev": "09cda6f73587dd4d5dfa8ab8490a94eff5651001", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 554b50a..cd5f48f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,27 +1,29 @@ { - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs = + { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - zig-overlay.url = "github:mitchellh/zig-overlay"; - zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; + zig-overlay.url = "github:mitchellh/zig-overlay"; + zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; - gitignore.url = "github:hercules-ci/gitignore.nix"; - gitignore.inputs.nixpkgs.follows = "nixpkgs"; + gitignore.url = "github:hercules-ci/gitignore.nix"; + gitignore.inputs.nixpkgs.follows = "nixpkgs"; - flake-utils.url = "github:numtide/flake-utils"; + flake-utils.url = "github:numtide/flake-utils"; - known-folders.url = "github:ziglibs/known-folders"; - known-folders.flake = false; + known_folders.url = "https://github.com/ziglibs/known-folders/archive/d13ba6137084e55f873f6afb67447fe8906cc951.tar.gz"; + known_folders.flake = false; - diffz.url = "github:ziglibs/diffz"; - diffz.flake = false; + tres.url = "https://github.com/ziglibs/tres/archive/707a09313b42e05d6ae22d1590499eece5f968ce.tar.gz"; + tres.flake = false; - tres.url = "github:ziglibs/tres"; - tres.flake = false; - }; + diffz.url = "https://github.com/ziglibs/diffz/archive/b966296b4489eb082b0831ec9a37d6f5e1906040.tar.gz"; + diffz.flake = false; + }; - outputs = { self, nixpkgs, zig-overlay, gitignore, flake-utils, known-folders, tres, diffz }: + outputs = inputs: let + inherit (inputs) nixpkgs zig-overlay gitignore flake-utils; systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; inherit (gitignore.lib) gitignoreSource; in @@ -29,6 +31,21 @@ let pkgs = nixpkgs.legacyPackages.${system}; zig = zig-overlay.packages.${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 ${inputs.${k}} .cache/p/${v.hash}") zon)); in rec { packages.default = packages.zls; @@ -41,9 +58,10 @@ dontInstall = true; buildPhase = '' mkdir -p $out - zig build install -Dcpu=baseline -Doptimize=ReleaseSafe -Ddata_version=master -Dtres=${tres}/tres.zig -Dknown-folders=${known-folders}/known-folders.zig -Ddiffz=${diffz}/DiffMatchPatch.zig --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"; }; } );