diff options
| author | Adrian Kummerlaender | 2021-04-29 09:36:21 +0200 |
|---|---|---|
| committer | Adrian Kummerlaender | 2021-04-29 09:36:21 +0200 |
| commit | 1dd12169d19664145d168a5c07a1ad2407134a37 (patch) | |
| tree | cdb8ee744d932928979083ccdc38b48294394579 | |
| parent | a28a6b05423e5b41ddd3ac037deaf74e1f25803b (diff) | |
| download | nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar.gz nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar.bz2 nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar.lz nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar.xz nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.tar.zst nixos_home-1dd12169d19664145d168a5c07a1ad2407134a37.zip | |
Update, switch to emacs master
| -rw-r--r-- | gui/emacs.nix | 2 | ||||
| -rw-r--r-- | nix/sources.json | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gui/emacs.nix b/gui/emacs.nix index 52c6345..d9c3612 100644 --- a/gui/emacs.nix +++ b/gui/emacs.nix @@ -55,7 +55,7 @@ in { alwaysEnsure = false; # remove builtin org as in https://github.com/chrisbarrett/.emacs.d/blob/6efd82c8e328e677dbef84331ed54763b89667a3/default.nix # this is a workaround until I find a better way to force usage of a non-builtin up-to-date org version - package = pkgs-unstable.emacsGcc; + package = pkgs-unstable.emacsGit.override { nativeComp = true; }; extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [ pdf-tools mu4e-alert diff --git a/nix/sources.json b/nix/sources.json index af3041b..4d946e4 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c535405529335cb4e1622a327553a273ac4b6c6d", - "sha256": "1jf5cawrq2qvgacvz5bv11nmz6i8343jplbai4izhb8pnlx5b8p6", + "rev": "819de997d9e8e8be6ee85e3d7e9fbacce35433a1", + "sha256": "12pvknn8nx0dr96hwbpzqc2wdihbiwsrhi5nhwsziqw5pmjj4ndz", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/c535405529335cb4e1622a327553a273ac4b6c6d.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/819de997d9e8e8be6ee85e3d7e9fbacce35433a1.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "home-manager": { @@ -54,10 +54,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2a189a8618fc1ba61593016fe5699b38971b89f", - "sha256": "02krxvrijs4nwbc58z57bp5yx0kym0jziv911shbbdzmf5nmgx01", + "rev": "17b101e29dfff7ae02cdd00e8cde243d2a56472d", + "sha256": "142lbns0qxl9c6gz035c07v9gpsfd29absqvpd539iz898bdlc48", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/b2a189a8618fc1ba61593016fe5699b38971b89f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/17b101e29dfff7ae02cdd00e8cde243d2a56472d.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-unstable": { @@ -66,10 +66,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0efbe21f9ae1e17d1aca922708f1bdef605039d", - "sha256": "0d3xyihm9f7x43vbrs1hi2fxchqi7b5jrwvvc7swhjvva1cyax1n", + "rev": "267761cf44498f9e1aa81dbdb92d77d5873dd9f6", + "sha256": "08k5nm9535wmc62hb2hjys6kfvd84g9765kdcslni1bb1qn98f7h", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/f0efbe21f9ae1e17d1aca922708f1bdef605039d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/267761cf44498f9e1aa81dbdb92d77d5873dd9f6.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } |