gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use inputs' in mkPackages

Browse source 
extract nixfmt from lint

re-add nixfmt to systemPackages
This commit is contained in:
Gerg-L 2023-12-10 18:37:46 -05:00
parent 0dda10f74b
commit a114216334
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/gerg-desktop/main.nix
View file

@ -68,7 +68,7 @@
qmk qmk
; ;
inherit (nvim-flake.packages) neovim; inherit (nvim-flake.packages) neovim;
inherit (self.packages) lint; inherit (self.packages) lint nixfmt;
}; };
etc = { etc = {
"jdks/17".source = "${pkgs.openjdk17}/bin"; "jdks/17".source = "${pkgs.openjdk17}/bin";

2
lib/default.nix
View file

@ -130,7 +130,7 @@ rec {
callPackage = lib.callPackageWith ( callPackage = lib.callPackageWith (
pkgs pkgs
// { // {
inherit inputs; inputs = constructInputs' pkgs.stdenv.hostPlatform.system inputs;
# maybe add self? # maybe add self?
# inherit self; # inherit self;
# npins sources if i need them # npins sources if i need them

7
packages/lint/package.nix
View file

@ -1,6 +1,5 @@
{ {
inputs, inputs,
nixfmt,
writeShellApplication, writeShellApplication,
deadnix, deadnix,
statix, statix,
@ -10,11 +9,7 @@
writeShellApplication { writeShellApplication {
name = "lint"; name = "lint";
runtimeInputs = [ runtimeInputs = [
(nixfmt.overrideAttrs { inputs.self.packages.nixfmt
version = "0.6.0-${inputs.nixfmt.shortRev}";
src = inputs.nixfmt;
})
deadnix deadnix
statix statix
fd fd

6
packages/nixfmt/package.nix Normal file
View file

@ -0,0 +1,6 @@
{inputs, nixfmt}:
(nixfmt.overrideAttrs {
version = "0.6.0-${inputs.nixfmt.shortRev}";
src = inputs.nixfmt;
})