Skip to content

Commit d2c0a3b

Browse files
committed
Include the version-suffixed Emacs name in the lock derivation
To clarify the version of Emacs used to generate a lock directory. This is important in order to provide the default for package development which should be the minimum supported version.
1 parent 4f2d5bc commit d2c0a3b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

pkgs/emacs/default.nix

+2
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ in
224224
# and write lock files to it
225225
generateLockDir =
226226
(generateLockFiles {
227+
emacsName = emacsPackage.name;
227228
packageInputs =
228229
excludeLocalPackages (enumerateConcretePackageSet "update" explicitPackages);
229230
flakeNix = true;
@@ -238,6 +239,7 @@ in
238239
lock =
239240
(generateLockFiles
240241
{
242+
emacsName = emacsPackage.name;
241243
packageInputs =
242244
excludeLocalPackages (enumerateConcretePackageSet "lock" explicitPackages);
243245
flakeNix = true;

pkgs/emacs/lock/default.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Current version
1111
flakeLockFile ? null,
1212
}: {
13+
emacsName,
1314
packageInputs,
1415
flakeNix ? false,
1516
archiveLock ? false,
@@ -85,7 +86,7 @@ in {
8586

8687
writerScript = {postCommandOnGeneratingLockDir}:
8788
writeShellApplication {
88-
name = "emacs-twist-write-lock";
89+
name = "twist-write-lock-${emacsName}";
8990
text =
9091
builtins.replaceStrings [
9192
"@lockSrcDir@"

0 commit comments

Comments
 (0)