awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-07 12:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Review suggestion fixes

Browse Source
This commit is contained in:
Thiago Kenji Okada
2022-09-09 23:18:05 +01:00
parent 814450634e
commit 3e63d48514
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
checks.nix
View File

@ -2,6 +2,7 @@
{ self, nixpkgs, emacs-overlay, ... }@inputs: { self, nixpkgs, emacs-overlay, ... }@inputs:
let let
inherit (self.outputs.packages.${system}) doom-emacs-example;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
# we are not using emacs-overlay's flake.nix here, # we are not using emacs-overlay's flake.nix here,
@ -32,8 +33,8 @@ in
}; };
}; };
}).activationPackage; }).activationPackage;
init-example-el = self.outputs.packages.${system}.doom-emacs; init-example-el = doom-emacs-example;
init-example-el-emacsGit = self.outputs.packages.${system}.doom-emacs.override { init-example-el-emacsGit = doom-emacs-example.override {
emacsPackages = with pkgs; emacsPackagesFor emacsGit; emacsPackages = with pkgs; emacsPackagesFor emacsGit;
}; };
} }

20
flake.nix
View File

@ -87,15 +87,15 @@
flake-compat.flake = false; flake-compat.flake = false;
}; };
outputs = { self, nixpkgs, flake-utils, emacs-overlay, ... }@inputs: outputs = { self, nixpkgs, flake-utils, ... }@inputs:
let inherit (flake-utils.lib) eachDefaultSystem eachSystem; let inherit (flake-utils.lib) eachDefaultSystem mkApp;
in eachDefaultSystem (system: in eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system; }; let pkgs = import nixpkgs { inherit system; };
in { in {
apps = { apps = {
default = self.outputs.apps.${system}.doom-emacs; default = self.outputs.apps.${system}.doom-emacs-example;
doom-emacs = flake-utils.lib.mkApp { doom-emacs-example = mkApp {
drv = self.outputs.packages.${system}.doom-emacs; drv = self.outputs.packages.${system}.doom-emacs-example;
exePath = "/bin/emacs"; exePath = "/bin/emacs";
}; };
}; };
@ -105,14 +105,16 @@
[ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ]; [ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ];
}; };
# TODO: remove this after NixOS 23.05 is released
package = { ... }@args: package = { ... }@args:
pkgs.lib.warn "Deprecated, please use `packages.${system}.default` instead!" pkgs.lib.warn ''
Deprecated, will be removed after NixOS 23.05 release.
Please use `packages.${system}.default` instead!
''
(pkgs.callPackage self args); (pkgs.callPackage self args);
packages = { packages = {
default = self.outputs.packages.${system}.doom-emacs; default = self.outputs.packages.${system}.doom-emacs-example;
doom-emacs = pkgs.callPackage self { doom-emacs-example = pkgs.callPackage self {
doomPrivateDir = ./test/doom.d; doomPrivateDir = ./test/doom.d;
}; };
}; };