Skip to content
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

Merged
merged 2 commits into from Jun 29, 2018
Merged

Skribilo: New Package(s) #42122

merged 2 commits into from Jun 29, 2018

Conversation

AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Jun 17, 2018

Motivation for this change

Two additions:

  • Guile-reader: init at 0.6.2
  • Skribilo: init at 0.9.4
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

configureFlags="$configureFlags --with-guilemoduledir=$out/share/guile/site"
'';

doCheck = false;
Copy link
Member

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.

Copy link
Member Author

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
Copy link
Contributor

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?

Copy link
Member Author

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.

Copy link
Contributor

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

Copy link
Member Author

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.

Copy link
Contributor

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.

Copy link
Member Author

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?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just quote the URL.

Copy link
Member Author

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.

Copy link
Contributor

@jtojnar jtojnar Jun 19, 2018

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:

# 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";
})

Copy link
Member Author

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 {
Copy link
Contributor

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

(fetchurl {
url = "${mirror}/patches/holdingnuts-qpixmapcache-workaround.patch";
sha256 = "15cf9j9mdm85f0h7w5f5852ic7xpim0243yywkd2qrfp37mi93pd";
})

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok!

@AndersonTorres
Copy link
Member Author

@jtojnar , is something else needed?

Copy link
Contributor

@jtojnar jtojnar left a 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"
Copy link
Contributor

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/";
Copy link
Contributor

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
Copy link
Contributor

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 {
Copy link
Contributor

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):

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
Copy link
Contributor

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scheme muscle memory :)

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

copying path '/nix/store/bhrb7bvmq3ww2cdck3j77v6bmxk7va8a-texlive-combined-small-2017' from 'https://cache.nixos.org'...
building '/nix/store/k5g1qkxc3djnmaakqzhchlb8299mqyhz-skribilo-0.9.4.tar.gz.drv'...

trying http://download.savannah.nongnu.org/releases/skribilo/skribilo-0.9.4.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 1551k  100 1551k    0     0  3108k      0 --:--:-- --:--:-- --:--:-- 3108k
cannot build derivation '/nix/store/b23y8zpxwf10g3qc9hpdcavdcn1hlkdi-skribilo-0.9.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/b23y8zpxwf10g3qc9hpdcavdcn1hlkdi-skribilo-0.9.4.drv', '/nix/store/hmr5d9l8az068jqz1pchn8pbdpw6cpbv-guile-reader-0.6.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
building of '/nix/store/dg2pvfrix309y9a0g7s3c6b73bbr7cfn-rustc-1.26.2.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/ah31wymnqi4ay1hii5qzjixv3dsgxbxg-cargo-1.26.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/f2z65102789iiwnj4m491dz836ap3sn0-librsvg-2.42.4.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/izvnbsbffp20cq9qs2swn8pq74m04nmb-imagemagick-6.9.9-34.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/kagfy9ydk4zxya1qwi5s09vd4xrklabs-skribilo-0.9.4.drv': 2 dependencies couldn't be built
error: build of '/nix/store/kagfy9ydk4zxya1qwi5s09vd4xrklabs-skribilo-0.9.4.drv', '/nix/store/vqb2fmwzlg1c4kdkr65mw6fg9xl0hjv4-guile-reader-0.6.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

copying path '/nix/store/q60z4jiysk2sykxii90f137vkv83cyzy-texlive-core-big.bin-2017-luatex' from 'https://cache.nixos.org'...
copying path '/nix/store/347yidkxlyd8zzdggswm90rj00jnics3-texlive-core-big.bin-2017-metafont' from 'https://cache.nixos.org'...
copying path '/nix/store/wq9msz0nzd392b332jgx9r1m5v4i2k3b-texlive-core-big.bin-2017-metapost' from 'https://cache.nixos.org'...
copying path '/nix/store/rbdppyb9hix1zpkayx0j3piphkz3n0ls-texlive-core-big.bin-2017-xetex' from 'https://cache.nixos.org'...
copying path '/nix/store/bhrb7bvmq3ww2cdck3j77v6bmxk7va8a-texlive-combined-small-2017' from 'https://cache.nixos.org'...
100  654k  100  654k    0     0   411k      0  0:00:01  0:00:01 --:--:--  699k
cannot build derivation '/nix/store/vr8pvyd6y6bfdj9cyx1ccxm31ihglfz1-guile-reader-0.6.2.drv': 1 dependencies couldn't be built
100 1551k  100 1551k    0     0   577k      0  0:00:02  0:00:02 --:--:--  503k
cannot build derivation '/nix/store/7js409r11j3cm7ys24g7lnz9d41gan6a-skribilo-0.9.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/7js409r11j3cm7ys24g7lnz9d41gan6a-skribilo-0.9.4.drv', '/nix/store/vr8pvyd6y6bfdj9cyx1ccxm31ihglfz1-guile-reader-0.6.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
building of '/nix/store/dg2pvfrix309y9a0g7s3c6b73bbr7cfn-rustc-1.26.2.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/ah31wymnqi4ay1hii5qzjixv3dsgxbxg-cargo-1.26.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/f2z65102789iiwnj4m491dz836ap3sn0-librsvg-2.42.4.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/izvnbsbffp20cq9qs2swn8pq74m04nmb-imagemagick-6.9.9-34.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/9i9n5bangdv79h06l7p3dqa7n15k89i3-skribilo-0.9.4.drv': 2 dependencies couldn't be built
error: build of '/nix/store/9i9n5bangdv79h06l7p3dqa7n15k89i3-skribilo-0.9.4.drv', '/nix/store/y6d11m2y8qdx6rwybhrshkc6kdc1lqs8-guile-reader-0.6.2.drv' failed

@AndersonTorres AndersonTorres self-assigned this Jun 27, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

100  654k  100  654k    0     0   629k      0  0:00:01  0:00:01 --:--:-- 1106k
copying path '/nix/store/zlkz33z1aja95rizaqqmhwbbyjq5hzl1-texlive-core-big.bin-2017-luatex' from 'https://cache.nixos.org'...
copying path '/nix/store/52dv8vx8c6k33nfa9i1cds2z6xkxx3b0-texlive-core-big.bin-2017-metafont' from 'https://cache.nixos.org'...
copying path '/nix/store/gbwqy8jxnhfnfk5l2mbhm478c8wn2i6a-texlive-core-big.bin-2017-metapost' from 'https://cache.nixos.org'...
copying path '/nix/store/qz3n4pxyb05klz2lkl0bj2w9p91vv66m-texlive-core-big.bin-2017-xetex' from 'https://cache.nixos.org'...
cannot build derivation '/nix/store/404vj7vpvi43ymqs74qg283mqb6n3h0k-guile-reader-0.6.2.drv': 1 dependencies couldn't be built
100 1551k  100 1551k    0     0   871k      0  0:00:01  0:00:01 --:--:-- 1813k
copying path '/nix/store/lzbsypp5sy2dp3z8xig8a3n2d2javacc-texlive-combined-small-2017' from 'https://cache.nixos.org'...
cannot build derivation '/nix/store/g37r1iyysq16ajq7fpiis534dlsh5n98-skribilo-0.9.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/404vj7vpvi43ymqs74qg283mqb6n3h0k-guile-reader-0.6.2.drv', '/nix/store/g37r1iyysq16ajq7fpiis534dlsh5n98-skribilo-0.9.4.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)


trying https://aur.archlinux.org/cgit/aur.git/tree/register.patch?h=guile-reader-git&id=52beb87d4f6ff4c59e6b301ac1fbd574e0d9eaf2
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  6079    0  6079    0     0  33585      0 --:--:-- --:--:-- --:--:-- 33401
fixed-output derivation produced path '/nix/store/v9982hbscqj2pj1m0prank3wkfldpfaf-0001-fix-prototypes.patch' with sha256 hash '0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73' instead of the expected hash '0wmxjf0a2h0fg4znzfvnkagqd5wm2aa9fym6vykxwk2c88xl76w7'
cannot build derivation '/nix/store/g57q72y2fmc0m51r97z7nqwp9hdaqwhz-guile-reader-0.6.2.drv': 1 dependencies couldn't be built
copying path '/nix/store/4m2ff4yd1svn03fv519l2q7gljygalsv-imagemagick-6.9.9-34-dev' from 'https://cache.nixos.org'...
cannot build derivation '/nix/store/gx82n9lsd508dcv2naamjnlwag81vk8j-skribilo-0.9.4.drv': 1 dependencies couldn't be built
error: build of '/nix/store/g57q72y2fmc0m51r97z7nqwp9hdaqwhz-guile-reader-0.6.2.drv', '/nix/store/gx82n9lsd508dcv2naamjnlwag81vk8j-skribilo-0.9.4.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: guile-reader, skribilo

Partial log (click to expand)

cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
cannot find section .dynstr
/nix/store/apnh399cgwg72j151k458j8rb9mwjczn-guile-reader-0.6.2
/nix/store/fw84rl0krq774x06ikym2lvxj3ywqhfc-skribilo-0.9.4

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Jun 27, 2018

ping @jtojnar @pSub

EDIT: many thanks for the help!

@matthewbauer matthewbauer merged commit 68f945d into NixOS:master Jun 29, 2018
@AndersonTorres AndersonTorres deleted the upload/skribilo branch July 2, 2018 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants