From c60bca351c91c39c607b5ebc3927aad191c29bc5 Mon Sep 17 00:00:00 2001 From: Riccardo Mazzarini Date: Tue, 19 Nov 2024 18:47:41 +0800 Subject: [PATCH] Update flake inputs --- flake.lock | 42 ++++++++++++++++++++--------------------- flake.nix | 55 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index cf94fa6..b2611ee 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1716827514, - "narHash": "sha256-5qS9Jn3FaEFMGGhS/1mLOUifMFDLPcLczjcdaN7xgyE=", + "lastModified": 1732002290, + "narHash": "sha256-v17KxlCf0O7hoD9AjiF94T2nuZuh7ZREyI6Ww/Tr4R0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7849e018a09688cd71bde887113954b3ce08739c", + "rev": "2a9b9e821c7f91eb6ae540925a453f9ebacd0513", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1716642936, - "narHash": "sha256-l53vGzYIy6tI1rYBlbxW502sDgpmZ4i/uTdWWtPKPtM=", + "lastModified": 1731949793, + "narHash": "sha256-ZXZInL8J38JaVpglSPa78ptn1zlqbaRHDtpa73CqpfI=", "owner": "neovim", "repo": "neovim", - "rev": "52389e724366ebb2fb58f08c657f580900dd09ee", + "rev": "989a37a594649528f28432388c0e7e28e8be2753", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9939496..766e309 100644 --- a/flake.nix +++ b/flake.nix @@ -14,34 +14,41 @@ }; }; - outputs = inputs: with inputs; - flake-utils.lib.eachDefaultSystem (system: + outputs = + inputs: + with inputs; + flake-utils.lib.eachDefaultSystem ( + system: let inherit (nixpkgs.lib) lists; - mkPkgs = isNightly: (import nixpkgs { - inherit system; - overlays = lists.optionals isNightly [ - neovim-nightly-overlay.overlay - ]; - }); - - mkShell = { nightly }: ( - let - pkgs = mkPkgs nightly; - inherit (pkgs) lib stdenv; - in - pkgs.mkShell { - buildInputs = lists.optionals stdenv.isDarwin [ pkgs.libiconv ]; - - packages = with pkgs; [ - gcc - luajit - neovim - pkg-config + mkPkgs = + isNightly: + (import nixpkgs { + inherit system; + overlays = lists.optionals isNightly [ + neovim-nightly-overlay.overlays.default ]; - } - ); + }); + + mkShell = + { nightly }: + ( + let + pkgs = mkPkgs nightly; + inherit (pkgs) lib stdenv; + in + pkgs.mkShell { + buildInputs = lists.optionals stdenv.isDarwin [ pkgs.libiconv ]; + + packages = with pkgs; [ + gcc + luajit + neovim + pkg-config + ]; + } + ); in { devShells = {