New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Skribilo: New Package(s) #42122
Skribilo: New Package(s) #42122
Conversation
configureFlags="$configureFlags --with-guilemoduledir=$out/share/guile/site" | ||
''; | ||
|
||
doCheck = false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please comment why the tests fail.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the new release of Lightning, they are working fine. I will update the code accordingly.
@@ -0,0 +1,26 @@ | |||
diff --git a/src/reader.c b/src/reader.c |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where does this patch come from?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found it on the AUR scripts here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you fetchurl
it from there instead: https://aur.archlinux.org/cgit/aur.git/tree/register.patch?h=guile-reader-git&id=52beb87d4f6ff4c59e6b301ac1fbd574e0d9eaf2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tried but the script fails with the '&id=...' part of the url. Anyway I have changed it accordingly.
P.S.: is it needed to download the patch? I particularly prefer the patch locally, in order to edit it if necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the id is necessary for immutable file (it is a commit hash).
Patches other than ones specific to Nix have no business being in Nixpkgs. Fixes should always go to upstream and patch obtained from there. Temporarily, we can use patches from other downstreams but the patch needs to be sent upstream eventually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How can I 'escape' the & sign in the URL?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just quote the URL.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using single quotes, 'like this'? It just complains.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, double quotes like regular string.
Edit: Actually, it should not be needed:
nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix
Lines 15 to 20 in 9424664
# Do not build vendored zssh and vte | |
(fetchurl { | |
name = "remove-vendor.patch"; | |
url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; | |
sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; | |
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now I think it's OK. I have tried the double quotes but it failed; now with the "name = " parameter it works.
|
||
|
||
patches = [ | ||
fetchurl { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You will need to wrap it in parentheses: see
nixpkgs/pkgs/games/holdingnuts/default.nix
Lines 19 to 22 in 56904d7
(fetchurl { | |
url = "${mirror}/patches/holdingnuts-qpixmapcache-workaround.patch"; | |
sha256 = "15cf9j9mdm85f0h7w5f5852ic7xpim0243yywkd2qrfp37mi93pd"; | |
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok!
@jtojnar , is something else needed? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just minor style nits
GUILE_SITE="${guile-lib}/share/guile/site"; | ||
|
||
preConfigure = '' | ||
configureFlags="$configureFlags --with-guilemoduledir=$out/share/guile/site" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it is make package, you can just use
configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" |
“token readers” of a standard Scheme readers. For example, it | ||
is used to implement Skribilo’s R5RS-derived document syntax. | ||
''; | ||
homepage = "https://www.gnu.org/software/guile-ncurses/"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to quote the URL
platforms = platforms.unix; | ||
}; | ||
} | ||
# TODO: Better Emacs and TeX integration |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe move this to the top, I almost missed this.
}; | ||
|
||
patches = [( | ||
fetchurl { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This formatting might be a little more regular (2 space indentation and parentheses):
nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
Lines 54 to 59 in 19ef534
patches = [ | |
(fetchpatch { | |
name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; | |
url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; | |
sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; | |
}) |
, guile, guile-reader, guile-lib | ||
, ploticus, imagemagick | ||
, ghostscript, transfig | ||
, enableEmacs? false, emacs? null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think we ever use the question mark (default value separator) without a space from both sides.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Scheme muscle memory :)
Failure on x86_64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: guile-reader, skribilo Partial log (click to expand)
|
Motivation for this change
Two additions:
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)