chore(flake): update flake.lock (#87)

* 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:

cachix/install-nix-action#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 <[email protected]>

.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:

.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:

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 ]);
   });
 }