magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 17:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Emacs, fix libgcc

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-05-09 23:34:54 +02:00
parent e6f087566f
commit 6cb51650a9
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
nix/flake.lock
View file

@ -23,11 +23,11 @@
"emacs": {
"flake": false,
"locked": {
"lastModified": 1617874231,
"narHash": "sha256-7ZtKxYEJjXD2zi2t7JPP+TmAO10ZfzvG9XemkFy2uqk=",
"lastModified": 1620345767,
"narHash": "sha256-NQkswO6MuyrRrsHMnxLnd7Kz3H9TOjflUA2IcY9kuqg=",
"owner": "flatwhatson",
"repo": "emacs",
"rev": "1000227d38b4f139f1e393e6bfb613829fcc92d0",
"rev": "5eb27833c498584797822838f00b87e52bad1c22",
"type": "github"
},
"original": {
@ -39,11 +39,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1618111206,
"narHash": "sha256-JUNV8PKu77CytEUfQgAMml+gECO6CY6ymVuKu7TYkGM=",
"lastModified": 1620356930,
"narHash": "sha256-eQa82tat0z3JPOMNiU/YQIHwHi1+TmZFRsWTUB1Y7bk=",
"ref": "master",
"rev": "75a4d7273b19ac442d246e2d5e109c9dfed58b35",
"revCount": 4944,
"rev": "8e56d29d2b766d9fd44afc38a9447413cec76d5d",
"revCount": 5099,
"type": "git",
"url": "https://github.com/nix-community/emacs-overlay"
},
@ -61,11 +61,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1618108836,
"narHash": "sha256-js278m158racqw8/XFXgOl7SdDKyjyk+cz1UfDwefTw=",
"lastModified": 1620355333,
"narHash": "sha256-NpmVOlMZ7Zwj5coEWJXLaWmYILS4TkP1/YlFkqVb9So=",
"owner": "nix-community",
"repo": "fenix",
"rev": "9769134e7437dcb748f4f53863fc532554053c3e",
"rev": "40f7719c20117670a5bf39b1a30737bb3b918bb7",
"type": "github"
},
"original": {
@ -102,11 +102,11 @@
]
},
"locked": {
"lastModified": 1618068541,
"narHash": "sha256-enxg0QB53Zis0VJWfJsrX7zCjurpi7lW78EKXbJdzpQ=",
"lastModified": 1620316130,
"narHash": "sha256-sU0VS5oJS1FsHsZsLELAXc7G2eIelVuucRw+q5B1x9k=",
"owner": "nmattia",
"repo": "naersk",
"rev": "b3b099d669fc8b18d361c249091c9fe95d57ebbb",
"rev": "a3f40fe42cc6d267ff7518fa3199e99ff1444ac4",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
]
},
"locked": {
"lastModified": 1617920106,
"narHash": "sha256-Q42x56jAQZdoa2XhyBXZsOPP0vKs6T5O61O+WDAu7I0=",
"lastModified": 1619975252,
"narHash": "sha256-Amx08/6MpMPLkqAukuIDjjxXdoAaZ/ruD88b3oC+Zbw=",
"ref": "master",
"rev": "6236d9e963a18a795ddceb45c8ec6ed5447e33fa",
"revCount": 32,
"rev": "f3929584d72e2b741e243d4439a2874011b6d994",
"revCount": 61,
"type": "git",
"url": "https://gitea.redalder.org/Magic_RB/NixNG"
},
@ -137,11 +137,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1618064689,
"narHash": "sha256-MGnHpM3bSd5JClA+1ad+jvcfNr0HrYoGmqCc2s7thkM=",
"lastModified": 1620332858,
"narHash": "sha256-ZoOfRdndJhX4QQumeUOYXynTuI8GzkSs9bh451Vezak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad7604ddbd9b299701fb5e15bc39cff80deffce2",
"rev": "22612485a469d71df09b9434842767b1f4f2c063",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1618130870,
"narHash": "sha256-HWkpHcOzcOYUZ1nQwjhsObyr4DKqvk2mg31SEe+eSfc=",
"lastModified": 1620399339,
"narHash": "sha256-oz9OEgPy7gabPgd6wrfBHMFGNs3Zixc2C3kFi0zRM9Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd5b07f01ea09697138e0b3890ad4d9d2d500628",
"rev": "cbfd088d28e2b4b1d44a126823ae55c6a463e3dd",
"type": "github"
},
"original": {
@ -169,11 +169,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1618072958,
"narHash": "sha256-QDKj58ECixtb4EJMWV5D5Lb2xdCgab1Opi4zjQWbDOg=",
"lastModified": 1620340338,
"narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a73020b2a150322c9832b50baeb0296ba3b13dd7",
"rev": "63586475587d7e0e078291ad4b49b6f6a6885100",
"type": "github"
},
"original": {
@ -201,11 +201,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1618098146,
"narHash": "sha256-49+aO33jyW/3ZU8f0NoocHjnXVOF+0hP+3g7xsdCL4A=",
"lastModified": 1620249252,
"narHash": "sha256-GntyddVJmwOTYWEexXhjrHzMem2QO0Zx94o3T2ALMGU=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "5b40342d2d5bc19445e6abccef6931bdd3a03c3b",
"rev": "c3596371d841ebb949dc8b99acc3bc902e4d808a",
"type": "github"
},
"original": {
@ -218,11 +218,11 @@
"sss-cli": {
"flake": false,
"locked": {
"lastModified": 1618053324,
"narHash": "sha256-EinFl5dcHn9lkuKlSeh46YUkDkGRJVzF88lu3pYsG9Y=",
"lastModified": 1618318903,
"narHash": "sha256-1Pad52W+gtGDREzCXOdABn9CrKv13YOOu+Du/ohB/EY=",
"owner": "dsprenkels",
"repo": "sss-cli",
"rev": "60446bfc0c3c9fab7ecca2fd0302d6ef29feed1a",
"rev": "df0dc744210b0851a0431a0951ea36f1e5ff0e91",
"type": "github"
},
"original": {

7
nix/overlays/emacs/emacs-bundle.nix
View file

@ -10,6 +10,8 @@
, vtermModule
, emacsPackages ? []
, libgccjit
}:
let
emacsBase = callPackage ./emacs-base.nix rec {
@ -30,6 +32,9 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
ln -s ${emacsBase}/bin/emacsclient $out/bin/emacsclient
makeWrapper ${emacsBase}/bin/emacs $out/bin/emacs --prefix PATH : ${lib.makeBinPath emacsPackages} --prefix EMACSLOADPATH : ${vterm}/lib:
makeWrapper ${emacsBase}/bin/emacs $out/bin/emacs \
--prefix PATH : ${lib.makeBinPath emacsPackages} \
--prefix EMACSLOADPATH : ${vterm}/lib: \
--prefix LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:${lib.getLib libgccjit + /lib/gcc/x86_64-unknown-linux-gnu/9.3.0}
'';
}