tezlm/grapevine-fork
1
0
Fork 0
forked from mirror/grapevine
Code Pull requests Activity

remove uses of aliases

Browse source
This commit is contained in:
K900 2024-08-17 11:16:15 -07:00 committed by Charles Hall
parent 3b99032456
commit 6685f8cd14
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -49,7 +49,7 @@
components = defaultProfileComponents ++ components = defaultProfileComponents ++
toolchainFile.toolchain.components; toolchainFile.toolchain.components;
targets = toolchainFile.toolchain.targets; targets = toolchainFile.toolchain.targets;
fenix = inputs.fenix.packages.${pkgs.pkgsBuildHost.system}; fenix = inputs.fenix.packages.${pkgs.stdenv.buildPlatform.system};
in in
fenix.combine (builtins.map fenix.combine (builtins.map
(target: (target:

4
nix/modules/default/default.nix
View file

@ -18,11 +18,11 @@ in
options.services.grapevine = { options.services.grapevine = {
enable = lib.mkEnableOption "grapevine"; enable = lib.mkEnableOption "grapevine";
package = lib.mkPackageOption package = lib.mkPackageOption
inputs.self.packages.${pkgs.system} inputs.self.packages.${pkgs.hostPlatform.system}
"grapevine" "grapevine"
{ {
default = "default"; default = "default";
pkgsText = "inputs.grapevine.packages.\${pkgs.system}"; pkgsText = "inputs.grapevine.packages.\${pkgs.hostPlatform.system}";
}; };
settings = lib.mkOption { settings = lib.mkOption {

6
nix/shell.nix
View file

@ -1,5 +1,6 @@
# Keep sorted # Keep sorted
{ default { buildPlatform
, default
, engage , engage
, inputs , inputs
, jq , jq
@ -7,7 +8,6 @@
, markdownlint-cli , markdownlint-cli
, mdbook , mdbook
, mkShell , mkShell
, system
, toolchain , toolchain
}: }:
@ -25,7 +25,7 @@ mkShell {
# #
# This needs to come before `toolchain` in this list, otherwise # This needs to come before `toolchain` in this list, otherwise
# `$PATH` will have stable rustfmt instead. # `$PATH` will have stable rustfmt instead.
inputs.fenix.packages.${system}.latest.rustfmt inputs.fenix.packages.${buildPlatform.system}.latest.rustfmt
# Keep sorted # Keep sorted
engage engage