From 66c7121c87e950deb97d229d3098939f81974f1d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 21 May 2021 10:51:31 +0200 Subject: [PATCH 1/3] flake.lock: Update Flake input changes: * Updated 'nixpkgs-unstable': 'github:NixOS/nixpkgs/83d907fd760d9ee4f49b4b7e4b1c6682f137b573' -> 'github:NixOS/nixpkgs/673aea9f84c955c94b105797fdc56007017af4db' --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c213009..a464bd1 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1621073999, - "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=", + "lastModified": 1621288494, + "narHash": "sha256-3lQCSw8/J076UwoQhtSVymOibLuojlqF9BAMP6X+/48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573", + "rev": "673aea9f84c955c94b105797fdc56007017af4db", "type": "github" }, "original": { From f04f492f7713483dffb7478fbd494e791e2b95d8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 21 May 2021 11:01:02 +0200 Subject: [PATCH 2/3] emacs: revert back to emacsPgtkGcc --- home/emacs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/emacs.nix b/home/emacs.nix index 3ce995b..34d4dab 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -23,9 +23,7 @@ programs.emacs = { enable = true; - # FIXME: revert when pgtk branch merged master - # package = pkgs.emacsPgtkGcc; - package = pkgs.emacsGcc; + package = pkgs.emacsPgtkGcc; }; }; } From 43cdecbc359647cb77426d43789e1f4ca1c9c61c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 21 May 2021 11:02:46 +0200 Subject: [PATCH 3/3] flake.lock: Update Flake input changes: * Updated 'emacs-overlay': 'github:nix-community/emacs-overlay/a8663485e83d0975f9ef0288194838078dab90cd' -> 'github:nix-community/emacs-overlay/cb4febf24b04ef44abe7aaa692e71b965083294d' --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a464bd1..54a6932 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1621245326, - "narHash": "sha256-tGsrUnp3Zl8rvDq/JXOSK9IPkT0ZRqaXTZddix/V16Q=", + "lastModified": 1621565684, + "narHash": "sha256-EDssKjLt2dDXatuZaLPw8qi8FwWAiOmbPMEoi782UhU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a8663485e83d0975f9ef0288194838078dab90cd", + "rev": "cb4febf24b04ef44abe7aaa692e71b965083294d", "type": "github" }, "original": {