Remove flake parts and update lock file

This commit is contained in:
Oliver Davies 2024-03-29 01:22:59 +00:00
parent d49a398b35
commit b71e7d35d7
2 changed files with 18 additions and 53 deletions

View file

@ -1,29 +1,12 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1710806803,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github"
},
"original": {
@ -49,27 +32,8 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"nixpkgs-2305": "nixpkgs-2305"
}

View file

@ -4,23 +4,24 @@
nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05";
};
outputs = inputs@{ self, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
flake = { lib = import ./lib { inherit inputs; }; };
outputs = { nixpkgs, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
systems = [ "x86_64-linux" ];
lib = import ./lib { inherit inputs; };
perSystem = { pkgs, self', system, ... }:
let
default = self.lib.mkVimPlugin { inherit system; };
neovim = self.lib.mkNeovim { inherit system; };
in {
devShells.default =
pkgs.mkShell { nativeBuildInputs = [ pkgs.just pkgs.nixfmt ]; };
inherit (lib) mkNeovim mkVimPlugin;
inherit (pkgs) mkShell;
packages = { inherit default neovim; };
default = mkVimPlugin { inherit system; };
neovim = mkNeovim { inherit system; };
in {
devShells.${system}.default =
mkShell { buildInputs = with pkgs; [ just ]; };
formatter = pkgs.nixfmt;
};
formatter.${system} = pkgs.nixfmt;
packages.${system} = { inherit default neovim; };
};
}