From db15cebc27e75280c47dfdf0bc30df4ea794aeca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:44:04 -0400 Subject: [PATCH] chore(flake): update flake.lock (#87) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/025912529dd0b31dead95519e944ea05f1ad56f2' (2023-04-10) → 'github:lnl7/nix-darwin/7c16d31383a90e0e72ace0c35d2d66a18f90fb4f' (2023-06-09) • Updated input 'fenix': 'github:nix-community/fenix/94e14fb51056a020a7d8cf44518cca09ba270363' (2023-04-15) → 'github:nix-community/fenix/6fbeedcd2fc1fba77152e13fd7492824d77a4060' (2023-06-13) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/b218009f46dd012abcd2d9c2656c3dc498075368' (2023-04-14) → 'github:rust-lang/rust-analyzer/1f1fe81f0db301124b3026bd2940294526cdd852' (2023-06-12) • Updated input 'home-manager': 'github:nix-community/home-manager/40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad' (2023-04-15) → 'github:nix-community/home-manager/e4aa9fd83b5c2d43b3c9c9de979a8675fcb8e563' (2023-06-13) • Updated input 'neovim-flake': 'github:neovim/neovim/54dab9ed9e200f7c5bcac4a8f4901770fa15fa4f?dir=contrib' (2023-04-16) → 'github:neovim/neovim/bc67bbe4469b777a958f5ad515dec777777e9f2d?dir=contrib' (2023-06-13) • Updated input 'neovim-flake/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) • Added input 'neovim-flake/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/abe7316dd51a313ce528972b104f4f04f56eefc4' (2023-04-14) → 'github:nixos/nixpkgs/75a5ebf473cd60148ba9aec0d219f72e5cf52519' (2023-06-11) • Updated input 'nur': 'github:nix-community/nur/acc7c1778eb3e81523da0e4ba334110809eaf0ac' (2023-04-16) → 'github:nix-community/nur/b6cfdb6488f02ea5bcecf4bea2cbed8f134c5481' (2023-06-13) • Updated input 'nushell-src': 'github:nushell/nushell/6b3236715b56450fdfdebed0927d96b72730d3d2' (2023-04-16) → 'github:nushell/nushell/2b181bf69c563c628d21a2957ab1b8057988dd44' (2023-06-13) * fix(nix): add lpeg as a neovim dependency * fix(ci): move to macos-13 image There currently is an issue with cachix/install-nix-action see: https://github.com/cachix/install-nix-action/issues/183 This issue is not present on macos-13 moving to that iamge. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: EdenEast --- .github/workflows/build.yml | 2 +- .github/workflows/pr.yml | 2 +- flake.lock | 72 ++++++++++++++++++++------------- nix/overlays/neovim/default.nix | 38 ++++++++++++++--- 4 files changed, 79 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7978ba90..5c74c38b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: target: sloth - os: ubuntu-20.04 target: eden - - os: macos-latest + - os: macos-13 target: theman runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 963aa2a7..813d5a49 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,7 @@ jobs: target: sloth - os: ubuntu-20.04 target: eden - - os: macos-latest + - os: macos-13 target: theman steps: diff --git a/flake.lock b/flake.lock index 67fd236a..6518ba9d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1681154394, - "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", + "lastModified": 1686307493, + "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", + "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1681567221, - "narHash": "sha256-npJIhn0cn0D1P6pkkHJOYCvM04SoVhBrcVXUrxD+zIU=", + "lastModified": 1686637310, + "narHash": "sha256-sGfKyioVsxQppDM0eDO62wtFiz+bZOD0cBMMIEjqn4I=", "owner": "nix-community", "repo": "fenix", - "rev": "94e14fb51056a020a7d8cf44518cca09ba270363", + "rev": "6fbeedcd2fc1fba77152e13fd7492824d77a4060", "type": "github" }, "original": { @@ -59,12 +59,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -80,11 +83,11 @@ ] }, "locked": { - "lastModified": 1681586243, - "narHash": "sha256-vdP79IZuDZVNSl4RN1LgEuab1Tkbv4gCxiE8VLdRf7U=", + "lastModified": 1686666715, + "narHash": "sha256-lBYoA/AI22znVdwuRd1yFwixeAT9m0oudP4TVdhJiC0=", "owner": "nix-community", "repo": "home-manager", - "rev": "40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad", + "rev": "e4aa9fd83b5c2d43b3c9c9de979a8675fcb8e563", "type": "github" }, "original": { @@ -102,11 +105,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1681612931, - "narHash": "sha256-EPAchvYTJTyhyfCPD2MvzJZrrmvcYX2fFYgaDazdHA4=", + "lastModified": 1686669455, + "narHash": "sha256-yu7NZhZEn4tx5cy9/WmsN3SOtx9thinEi5cif4GLjCs=", "owner": "neovim", "repo": "neovim", - "rev": "54dab9ed9e200f7c5bcac4a8f4901770fa15fa4f", + "rev": "bc67bbe4469b777a958f5ad515dec777777e9f2d", "type": "github" }, "original": { @@ -118,11 +121,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { @@ -134,11 +137,11 @@ }, "nur": { "locked": { - "lastModified": 1681618215, - "narHash": "sha256-5tEzso6ZGw+bM4r1acy6js8ZbE1bryUpqFz2KEbYRm0=", + "lastModified": 1686685543, + "narHash": "sha256-84fmoTO7yBn2GYG7vWM/wCV7yS3Z0PYdnWj1cOvvwLI=", "owner": "nix-community", "repo": "nur", - "rev": "acc7c1778eb3e81523da0e4ba334110809eaf0ac", + "rev": "b6cfdb6488f02ea5bcecf4bea2cbed8f134c5481", "type": "github" }, "original": { @@ -150,11 +153,11 @@ "nushell-src": { "flake": false, "locked": { - "lastModified": 1681609192, - "narHash": "sha256-35at6cin4m1xdyiqtZikV/Gcpoaj4RjXH+7Z/T2Cla4=", + "lastModified": 1686681180, + "narHash": "sha256-2ZInsCeK2bp86343Oz499971tC4W6I8tggsoleMRf1M=", "owner": "nushell", "repo": "nushell", - "rev": "6b3236715b56450fdfdebed0927d96b72730d3d2", + "rev": "2b181bf69c563c628d21a2957ab1b8057988dd44", "type": "github" }, "original": { @@ -178,11 +181,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1681478629, - "narHash": "sha256-z8RTNp3kAVYYtY/mKdS5Elrohmt8tjWyigBzeYbNuV4=", + "lastModified": 1686586902, + "narHash": "sha256-+zfBFBmUxWutKbhdntI9uvF4D5Rh7BhcByM2l+ReyTw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b218009f46dd012abcd2d9c2656c3dc498075368", + "rev": "1f1fe81f0db301124b3026bd2940294526cdd852", "type": "github" }, "original": { @@ -191,6 +194,21 @@ "repo": "rust-analyzer", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/nix/overlays/neovim/default.nix b/nix/overlays/neovim/default.nix index 5884e5ab..2df0a303 100644 --- a/nix/overlays/neovim/default.nix +++ b/nix/overlays/neovim/default.nix @@ -1,5 +1,5 @@ { inputs, ... }: -_final: prev: +final: prev: # NixOS/nixpkgs#208103 introduced a patch that makes builds reproduceable. # This patch applies to the current 0.8.2 but does not apply to nightly. @@ -11,22 +11,48 @@ let in patch != "neovim-build-make-generated-source-files-reproducible.patch" ) v; + + # This is only required as lpeg was added as a library dependency in pr: https://github.com/neovim/neovim/pull/23216 + # This can be removed when 0.10 is released and nixpkgs is updated. + 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 { - neovim-unwrapped = inputs.neovim-flake.packages.${prev.system}.neovim.overrideAttrs (old: { - patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; - NIX_SHORT_REV = inputs.neovim-flake.shortRev; - }); + # neovim-unwrapped = inputs.neovim-flake.packages.${prev.system}.neovim.overrideAttrs (old: { + # patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; + # NIX_SHORT_REV = inputs.neovim-flake.shortRev; + # }); neovim-nightly = inputs.neovim-flake.packages.${prev.system}.neovim.overrideAttrs (old: { - patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; + # patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; + patches = old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; NIX_SHORT_REV = inputs.neovim-flake.shortRev; + nativeBuildInputs = old.nativeBuildInputs ++ (prev.lib.optionals prev.stdenv.isDarwin [ liblpeg ]); }); neovim-debug = inputs.neovim-flake.packages.${prev.system}.neovim-debug.overrideAttrs (old: { patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; NIX_SHORT_REV = inputs.neovim-flake.shortRev; + nativeBuildInputs = old.nativeBuildInputs ++ (prev.lib.optionals prev.stdenv.isDarwin [ liblpeg ]); }); neovim-developer = inputs.neovim-flake.packages.${prev.system}.neovim-developer.overrideAttrs (old: { patches = patchFilter old.patches ++ [ ./0001-Add-nix-short-rev-to-pre-release-version-info.patch ]; NIX_SHORT_REV = inputs.neovim-flake.shortRev; + nativeBuildInputs = old.nativeBuildInputs ++ (prev.lib.optionals prev.stdenv.isDarwin [ liblpeg ]); }); }