emacs: use standard nixpkgs build

Now that native comp is stable I don't need the overlay, which triggered
a full emacs build almost everytime I bumped it.
This commit is contained in:
Antoine Martin 2022-05-15 20:05:07 +02:00
parent a4d3e6b6f8
commit f54d1ce5b2
4 changed files with 7 additions and 83 deletions

View file

@ -46,7 +46,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
name: name:
- emacsPgtkNativeComp
- grafanaDashboards/nginx - grafanaDashboards/nginx
- grafanaDashboards/node-exporter - grafanaDashboards/node-exporter
- kaleidoscope-udev-rules - kaleidoscope-udev-rules

View file

@ -18,42 +18,7 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1652613188,
"narHash": "sha256-vHp4U0y0w0ntf4LF8zk0FTbTkwiiJtbs78eSYQVSABw=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "972925e3f1b6724eaf6a896f1ae9390d205fcaae",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1652557277,
"narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1648297722, "lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
@ -139,20 +104,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1652574577,
"narHash": "sha256-MoSWPtue4Wi9+kRDxUbLWEBCL8Bswaa8kVMh2JYpSJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "118ec238bfb788a34f1d53c4d95931fadfa70367",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1652467128, "lastModified": 1652467128,
"narHash": "sha256-1wuQ7QgPQ3tugYcoVMJ3pUzl4wVdBzKZr9qtJAgA4VI=", "narHash": "sha256-1wuQ7QgPQ3tugYcoVMJ3pUzl4wVdBzKZr9qtJAgA4VI=",
@ -171,11 +122,10 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable-small": "nixpkgs-unstable-small" "nixpkgs-unstable-small": "nixpkgs-unstable-small"
} }
} }

View file

@ -21,13 +21,6 @@
repo = "agenix"; repo = "agenix";
}; };
emacs-overlay = {
type = "github";
owner = "nix-community";
repo = "emacs-overlay";
ref = "master";
};
home-manager = { home-manager = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
@ -117,8 +110,6 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay
# uncomment this to build everything from scratch, fun but takes a # uncomment this to build everything from scratch, fun but takes a
# while # while
# #
@ -140,12 +131,6 @@
inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-pc-ssd
{
nixpkgs.overlays = [
inputs.emacs-overlay.overlay
];
}
] ]
++ sharedModules; ++ sharedModules;
}; };
@ -153,19 +138,9 @@
} }
// inputs.flake-utils.lib.eachDefaultSystem (system: { // inputs.flake-utils.lib.eachDefaultSystem (system: {
packages = packages =
( inputs.flake-utils.lib.flattenTree
inputs.flake-utils.lib.flattenTree (import ./pkgs {
(import ./pkgs {pkgs = import nixpkgs {inherit system;};}) pkgs = import nixpkgs {inherit system;};
) });
// {
emacsPgtkNativeComp =
(
import nixpkgs {
inherit system;
overlays = [inputs.emacs-overlay.overlay];
}
)
.emacsPgtkNativeComp;
};
}); });
} }

View file

@ -42,7 +42,7 @@ in {
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = pkgs.emacsPgtkNativeComp; package = pkgs.emacsNativeComp;
extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools]; extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools];
}; };
}; };