coolneng
/
panacea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Emacs 28 instead of the PGTK fork

This commit is contained in:
coolneng 2022-04-25 06:35:04 +02:00
parent 2965bdb38d
commit 2943e19eac
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
6 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration.nix
View File

@ -138,7 +138,6 @@ in {
./modules/printing.nix ./modules/printing.nix
./modules/periodic.nix ./modules/periodic.nix
./modules/power.nix ./modules/power.nix
./overlays/emacs.nix
./overlays/nix-direnv.nix ./overlays/nix-direnv.nix
./overlays/openconnect-sso.nix ./overlays/openconnect-sso.nix
./overlays/cyrus-sasl-oauth2.nix ./overlays/cyrus-sasl-oauth2.nix

28
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646845404, "lastModified": 1648942457,
"narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=", "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "764c975e74bce2f89a5106b68ec48e2b586f893c", "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,28 +36,13 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"locked": {
"lastModified": 1648549503,
"narHash": "sha256-FOJbdKuHAxV9TTCbKY2LRKO0SgFaMPJI5h6QfpM6YP4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "ca681435ecff48905feb643cfa99b1112943289c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1648390671, "lastModified": 1650701402,
"narHash": "sha256-u69opCeHUx3CsdIerD0wVSR+DjfDQjnztObqfk9Trqc=", "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510", "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,7 +71,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2", "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
"emacs-overlay": "emacs-overlay",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"openconnect-sso": "openconnect-sso" "openconnect-sso": "openconnect-sso"
} }

1
flake.nix
View File

@ -13,7 +13,6 @@
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay";
openconnect-sso = { openconnect-sso = {
url = "github:vlaci/openconnect-sso"; url = "github:vlaci/openconnect-sso";
flake = false; flake = false;

2
modules/periodic.nix
View File

@ -3,7 +3,7 @@
with pkgs; with pkgs;
let let
emacs-vterm = ((emacsPackagesFor emacsPgtkGcc).emacsWithPackages emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
(epkgs: [ epkgs.vterm ])); (epkgs: [ epkgs.vterm ]));
isync-oauth2 = isync.overrideAttrs isync-oauth2 = isync.overrideAttrs
(div: rec { buildInputs = [ openssl patched-cyrus-sasl-oauth2 zlib ]; }); (div: rec { buildInputs = [ openssl patched-cyrus-sasl-oauth2 zlib ]; });

2
modules/software.nix
View File

@ -3,7 +3,7 @@
with pkgs; with pkgs;
let let
emacs-vterm = ((emacsPackagesFor emacsPgtkGcc).emacsWithPackages emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
(epkgs: [ epkgs.vterm ])); (epkgs: [ epkgs.vterm ]));
patched-webtorrent-cli = nodePackages.webtorrent-cli.override { patched-webtorrent-cli = nodePackages.webtorrent-cli.override {
buildInputs = [ pkgs.nodePackages.node-gyp-build ]; buildInputs = [ pkgs.nodePackages.node-gyp-build ];

3
overlays/emacs.nix
View File

@ -1,3 +0,0 @@
{ config, lib, pkgs, inputs, ... }: {
nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
}