fix: nix check errors
This commit is contained in:
19
flake.nix
19
flake.nix
@@ -75,14 +75,12 @@
|
|||||||
printobstacle = pkgs.callPackage ./package/printobstacle.nix {};
|
printobstacle = pkgs.callPackage ./package/printobstacle.nix {};
|
||||||
printprogress = pkgs.callPackage ./package/printprogress.nix {};
|
printprogress = pkgs.callPackage ./package/printprogress.nix {};
|
||||||
colorize = pkgs.callPackage ./package/colorize.nix {};
|
colorize = pkgs.callPackage ./package/colorize.nix {};
|
||||||
github.gh-tl = pkgs.callPackage ./package/github/gh-tl.nix {};
|
github-gh-tl = pkgs.callPackage ./package/github/gh-tl.nix {};
|
||||||
supabase-with-env-collection = pkgs.callPackage ./package/supabase-with-env-collection.nix {};
|
supabase-with-env-collection = pkgs.callPackage ./package/supabase-with-env-collection.nix {};
|
||||||
migration-name = pkgs.callPackage ./package/migration-name.nix {};
|
migration-name = pkgs.callPackage ./package/migration-name.nix {};
|
||||||
prettify-log = pkgs.callPackage ./package/prettify-log/default.nix rust.commonArgs;
|
prettify-log = pkgs.callPackage ./package/prettify-log/default.nix rust.commonArgs;
|
||||||
pg = {
|
pg-from = pkgs.callPackage ./package/postgres/pg-from/default.nix rust.commonArgs;
|
||||||
pg-from = pkgs.callPackage ./package/postgres/pg-from/default.nix rust.commonArgs;
|
pg-migration = pkgs.callPackage ./package/postgres/pg-migration/default.nix rust.commonArgs;
|
||||||
pg-migration = pkgs.callPackage ./package/postgres/pg-migration/default.nix rust.commonArgs;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.${system} = let
|
devShells.${system} = let
|
||||||
@@ -124,8 +122,9 @@
|
|||||||
buildInputs = [pkgs.stack];
|
buildInputs = [pkgs.stack];
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
})
|
||||||
nixosModules.${system} = {
|
// {
|
||||||
|
nixosModules = {
|
||||||
"preset.default" = {
|
"preset.default" = {
|
||||||
pkgs,
|
pkgs,
|
||||||
modulesPath,
|
modulesPath,
|
||||||
@@ -182,12 +181,12 @@
|
|||||||
jq
|
jq
|
||||||
htop-vim
|
htop-vim
|
||||||
])
|
])
|
||||||
++ (with self.packages.${system}; [
|
++ (with self.packages.${pkgs.system}; [
|
||||||
prettify-log
|
prettify-log
|
||||||
nvim-pager
|
nvim-pager
|
||||||
]);
|
]);
|
||||||
variables = {
|
variables = {
|
||||||
PAGER = with self.packages.${system}; "${nvim-pager}/bin/pager";
|
PAGER = with self.packages.${pkgs.system}; "${nvim-pager}/bin/pager";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -208,8 +207,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
})
|
|
||||||
// {
|
|
||||||
overlays.default = final: prev: (
|
overlays.default = final: prev: (
|
||||||
let
|
let
|
||||||
version = "1.6.1";
|
version = "1.6.1";
|
||||||
|
|||||||
Reference in New Issue
Block a user