Merge branch 'master' into fix-nix-integration-patch

This commit is contained in:
László Vaskó
2021-05-20 22:32:51 +02:00
committed by GitHub

18
flake.lock generated
View File

@@ -36,11 +36,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1620846214, "lastModified": 1620927136,
"narHash": "sha256-UUXiIh+WvxKlAoH2pwD1N53AIKMRh5xG+fu6Sze+55w=", "narHash": "sha256-PUFbVKstIqwqzT7pYispDdg7gbyPEUmzYiTrCAzmROo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "056fa116d903c28e9a6989be1b40132fdb6bf0fe", "rev": "842a4d83a9f5366abfe4c246b6100afdaf91dda0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,11 +163,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1620838695, "lastModified": 1620928277,
"narHash": "sha256-Eb3xr6aWt3lF8BgmZCgVJXy/ArmudeJXONGSqaSLfP0=", "narHash": "sha256-O/1xZ3KmjPbR3X8hy0mlHUU0S27UTvLolcjoxnmIRyg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "acd49fab8ece11a89ef8ee49903e1cd7bb50f4b7", "rev": "3eac120c3d228289f218c2db971849c39202e7f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -211,11 +211,11 @@
"org-mode": { "org-mode": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1620793993, "lastModified": 1620910829,
"narHash": "sha256-fS8lp/0wqGimBepRocexCJggGAb+GW+33lPghMG8SiE=", "narHash": "sha256-+Qq1KInYH2tcWo+eiuf+x6wafqe3NzU6OF/JrM8LoUM=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "27621a5b03beb3d164b815eb7268d160de1c6d2e", "rev": "cb8e50ed152b37fcfd8754f9e6c5c7f0992ccacb",
"type": "github" "type": "github"
}, },
"original": { "original": {