emacs updater: trivialBuild -> melpaBuild #329008
Conversation
pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
Outdated
Show resolved
Hide resolved
ofborg
bot
added
10.rebuild-darwin: 0
Well, it is a good thing to be consistent. |
Consistence without cost is good. Consistence at the cost of more noisy git history is a judgement call, I guess. If changes for |
If I remove the commit that changed the repos to emacsmirror, the patch will change less than 20 lines. Since the original repos are still there, I am fine with removing the mirror.
Done :) |
I still only see one commit in this PR. |
|
Since it is an important part for updating MELPA packages, tests must be done before this can be merged. I may not be able to do the test because my network is not very good. |
My network delayed. Apologies for the technical failure.
I am not sure, but if "run the update scripts inside elisp-packages" can be regarded as a test, I believe I can do it. The only problem is that, as far as I know, the scripts fail in my current flake setup. I am doing some tests in my spare notebook, installing NixOS from scratch without flakes. |
|
Could you provide the error and reproducible steps for your error? I do not think a new installable of NixOS is necessary. |
Full log (click to expand)If it is useful, my setup is on Bitbucket: https://bitbucket.org/anderson_torres/etc/src/trunk/ |
|
Looks like you do not have export NIX_PATH=nixpkgs=/path/to/your/nixpkgs
./update-elpaor # flake:nixpkgs means nixpkgs in your flake registry
export NIX_PATH=nixpkgs=flake:nixpkgs
./update-elpa |
Oh, please delete |
|
I find that the built result is the same on my system using # default.nix
let
pkgs = import <nixpkgs> { };
epkgs = pkgs.emacs.pkgs;
# builder = pkgs.emacs.pkgs.trivialBuild;
builder = epkgs.melpaBuild;
in
rec {
promise = builder {
pname = "promise";
version = "1";
src = pkgs.fetchFromGitHub {
owner = "bendlas";
repo = "emacs-promise";
rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022";
sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy";
};
# add missing dependency async
packageRequires = [ epkgs.async ];
postPatch = ''
substituteInPlace promise.el \
--replace-fail "(require 'promise-done)" "(require 'promise-done) (require 'async)"
'';
};
semaphore = builder {
pname = "semaphore";
version = "1";
packageRequires = [ promise ];
src = pkgs.fetchFromGitHub {
owner = "webnf";
repo = "semaphore.el";
rev = "93802cb093073bc6a6ccd797328dafffcef248e0";
sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853";
};
};
}nix build --include nixpkgs-system=/path/to/nixpkgs --file . |
|
Now I am running the scritps; the melpa one is stuck at cmake |
|
Or you do not even need to run anything to test, if the built result of |
|
When I used el-get, I remember that cmake-mode was very slow since it downloaded the whole cmake project just to pick one file... Does it occur in the elisp overlay too? |
ofborg
bot
added
8.has: package (new)
|
Here is a dump of strace when running |
|
I have verified that with this diff, the build results are the same bit-by-bit. --- a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
@@ -3,9 +3,10 @@ let
emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let
- promise = epkgs.trivialBuild {
+ promise = epkgs.melpaBuild {
pname = "promise";
version = "1";
+ packageRequires = [ epkgs.async ];
src = pkgs.fetchFromGitHub {
owner = "bendlas";
repo = "emacs-promise";
@@ -14,7 +15,7 @@ let
};
};
- semaphore = epkgs.trivialBuild {
+ semaphore = epkgs.melpaBuild {
pname = "semaphore";
version = "1";
packageRequires = [ promise ];Weird, I think I have posted this. |
ofborg
bot
added
10.rebuild-darwin: 0
This can cause some problems...
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.