Merge branch 'develop'

This commit is contained in:
László Vaskó
2021-06-03 19:41:35 +02:00
2 changed files with 16 additions and 16 deletions

View File

@ -29,7 +29,7 @@
(message "[nix-doom-emacs] Skipping generating autoloads..."))) (message "[nix-doom-emacs] Skipping generating autoloads...")))
(advice-add 'doom--print (advice-add 'doom--print
:override (lambda (output) :override (lambda (output)
(message output))) (princ (format "%s\n" output) 'external-debugging-output)))
(advice-add 'kill-emacs (advice-add 'kill-emacs
:override #'nix-straight-inhibit-kill-emacs) :override #'nix-straight-inhibit-kill-emacs)
(apply orig-fn r) (apply orig-fn r)

30
flake.lock generated
View File

@ -3,11 +3,11 @@
"doom-emacs": { "doom-emacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1620845520, "lastModified": 1621522888,
"narHash": "sha256-XTyH1e+mBVmKM/AWMTuByzQCwj3nTCboutbBeCDjRSY=", "narHash": "sha256-kKUD/V5Rlhy3kGdrGHOExmEFVUCJWX3jpKNWHUe9SwQ=",
"owner": "hlissner", "owner": "hlissner",
"repo": "doom-emacs", "repo": "doom-emacs",
"rev": "6d2c6b44fa915ed5db8ebcae91e9355a9ef7b663", "rev": "ef7113d6c4b169795cee292601a3b20c5a0f643c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1620927136, "lastModified": 1621537222,
"narHash": "sha256-PUFbVKstIqwqzT7pYispDdg7gbyPEUmzYiTrCAzmROo=", "narHash": "sha256-F2xVnaPZuMWvPJnhaSEEskY6GY1NFNuL2JXZqKRQ9FU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "842a4d83a9f5366abfe4c246b6100afdaf91dda0", "rev": "b14b8b133d98c923071ec2e20eff3c76bd80d173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1620928277, "lastModified": 1621471095,
"narHash": "sha256-O/1xZ3KmjPbR3X8hy0mlHUU0S27UTvLolcjoxnmIRyg=", "narHash": "sha256-Ses8dUMzdkx/BVn2VznrTtv+DvagdJ2X2aQg/h/O/co=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eac120c3d228289f218c2db971849c39202e7f4", "rev": "80fcac0b311031657783b721c935d2d9348dffee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
"org-mode": { "org-mode": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1620910829, "lastModified": 1621519036,
"narHash": "sha256-+Qq1KInYH2tcWo+eiuf+x6wafqe3NzU6OF/JrM8LoUM=", "narHash": "sha256-RPj6cg0lY18czUEg8Cix4LefX62pCYlZplvx19/llHY=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "cb8e50ed152b37fcfd8754f9e6c5c7f0992ccacb", "rev": "846801e82c8647ccf41723578c6e849c54a0c015",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1615207564, "lastModified": 1621530765,
"narHash": "sha256-JaTjBAucXIsImkD4D1V8rg+HrgpojH2lsoq+jenjGj8=", "narHash": "sha256-LfrMXHcN5CgKxgjp9Y4zdxvus+Qh6+2S2RvoqXTdIRM=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "cf8e64bd8504737912b39e4153390cffbf443ed7", "rev": "48024a1137730c1308478518ed7235431c32a5c6",
"type": "github" "type": "github"
}, },
"original": { "original": {