Skip to content

Commit 21f4585

Browse files
committed
nix: update emacs-webrender(emacsng) source
1 parent a84134b commit 21f4585

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.github/workflows/checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: cachix/cachix-action@v10
2525
with:
26-
name: emacsng
26+
name: emacs-webrender
2727
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
2828

2929
- name: Run Emacsng Exec

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
#rust nightly date
109109
emacsng-sources = prev.callPackages ./nix/_sources/generated.nix {};
110110
emacsng-source = emacsng-sources.emacsng.src;
111-
locked-date = prev.lib.removePrefix "nightly-" (prev.lib.removeSuffix "\n" (builtins.readFile ./rust-toolchain));
111+
locked-date = "2022-10-24";
112112
in {
113113
emacsng = with prev; let
114114
withWebrender = true;
@@ -164,7 +164,7 @@
164164
makeFlags =
165165
(old.makeFlags or [])
166166
++ [
167-
# "CARGO_FLAGS=--offline" #nightly channel
167+
"CARGO_FLAGS=--offline" #nightly channel
168168
];
169169

170170
#custom configure Flags Setting

nix/_sources/generated.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"pinned": false,
88
"src": {
99
"deepClone": false,
10-
"fetchSubmodules": true,
10+
"fetchSubmodules": false,
1111
"leaveDotGit": false,
1212
"name": null,
1313
"owner": "declantsien",
1414
"repo": "emacs-ng",
15-
"rev": "c18470efe98a3ec33ff18561377548527140cb27",
16-
"sha256": "sha256-QTxD6c+nu9ajsiJOqsH3YJXQ9r/ryrTB28uWskKuLJ4=",
15+
"rev": "37b4343a2ebc9c30ae96f84d10fc5f3ad9265da4",
16+
"sha256": "sha256-VKA7Wq6AMZ8SoaoKxPB0fWGZ30L9nupjzmRz6/uv4ig=",
1717
"type": "github"
1818
},
19-
"version": "c18470efe98a3ec33ff18561377548527140cb27"
19+
"version": "37b4343a2ebc9c30ae96f84d10fc5f3ad9265da4"
2020
}
2121
}

nix/_sources/generated.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
{
44
emacsng = {
55
pname = "emacsng";
6-
version = "c18470efe98a3ec33ff18561377548527140cb27";
6+
version = "37b4343a2ebc9c30ae96f84d10fc5f3ad9265da4";
77
src = fetchFromGitHub ({
88
owner = "declantsien";
99
repo = "emacs-ng";
10-
rev = "c18470efe98a3ec33ff18561377548527140cb27";
11-
fetchSubmodules = true;
12-
sha256 = "sha256-QTxD6c+nu9ajsiJOqsH3YJXQ9r/ryrTB28uWskKuLJ4=";
10+
rev = "37b4343a2ebc9c30ae96f84d10fc5f3ad9265da4";
11+
fetchSubmodules = false;
12+
sha256 = "sha256-VKA7Wq6AMZ8SoaoKxPB0fWGZ30L9nupjzmRz6/uv4ig=";
1313
});
1414
};
1515
}

nix/rust.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
...
66
}: let
77
cfg = config.language.rust;
8-
date = lib.removePrefix "nightly-" (lib.removeSuffix "\n" (builtins.readFile ../rust-toolchain));
8+
date = "2022-10-24";
99
in
1010
with pkgs;
1111
with lib; {

0 commit comments

Comments
 (0)