zettlr: 1.7.5 -> 1.8.7 #106074

sternenseemann · 2020-12-06T15:10:14Z

Motivation for this change

Things done

sternenseemann · 2020-12-06T15:11:26Z

tfmoraes · 2020-12-06T18:51:23Z

Hi @sternenseemann, I tested here and it's working correctly.

❯ nix-shell -p nixpkgs-review --run "nixpkgs-review pr 106074"                  
these 11 paths will be fetched (3.20 MiB download, 15.78 MiB unpacked):
  /nix/store/2j41iacjcpdy47wyynpbiwkl8xprry9d-nix-2.3.8-man
  /nix/store/4fqaq99gnqmc4vr9rjbyslq4gn9ckl3k-nixpkgs-review-2.4.2
  /nix/store/8bgqvkqs7jm1k1z12sa0ndrbdh859x2f-nix-2.3.8
  /nix/store/fwr8jsgnrpvplvd1nb4bfwnyslvg9pkn-aws-checksums-0.1.7
  /nix/store/i8q3x671kxp40wy3dgvl3li0j13sw00y-aws-c-event-stream-0.1.1
  /nix/store/phjj29ppcccwxlr1fv8pwfkxyn0hah4x-busybox-1.31.1-x86_64-unknown-linux-musl
  /nix/store/q0wr6hrhf09bdb09jll95mzzd64awv0l-aws-sdk-cpp-1.7.90
  /nix/store/vqykf0xcrdpsbmm8f49kkpbbqfn6j2k1-editline-1.17.0
  /nix/store/wzd4hqwb653673acavgrvpzqigl7cjzi-boehm-gc-8.0.4
  /nix/store/xwwgs95misy6q6xbfjzjrvpzml5ik9xd-libsodium-1.0.18
  /nix/store/yi6wrn7j7m60q21hrgf5ac2wlm5nx6l1-aws-c-common-0.3.11
copying path '/nix/store/phjj29ppcccwxlr1fv8pwfkxyn0hah4x-busybox-1.31.1-x86_64-unknown-linux-musl' from 'https://cache.nixos.org'...
copying path '/nix/store/2j41iacjcpdy47wyynpbiwkl8xprry9d-nix-2.3.8-man' from 'https://cache.nixos.org'...
copying path '/nix/store/wzd4hqwb653673acavgrvpzqigl7cjzi-boehm-gc-8.0.4' from 'https://cache.nixos.org'...
copying path '/nix/store/vqykf0xcrdpsbmm8f49kkpbbqfn6j2k1-editline-1.17.0' from 'https://cache.nixos.org'...
copying path '/nix/store/yi6wrn7j7m60q21hrgf5ac2wlm5nx6l1-aws-c-common-0.3.11' from 'https://cache.nixos.org'...
copying path '/nix/store/fwr8jsgnrpvplvd1nb4bfwnyslvg9pkn-aws-checksums-0.1.7' from 'https://cache.nixos.org'...
copying path '/nix/store/xwwgs95misy6q6xbfjzjrvpzml5ik9xd-libsodium-1.0.18' from 'https://cache.nixos.org'...
copying path '/nix/store/i8q3x671kxp40wy3dgvl3li0j13sw00y-aws-c-event-stream-0.1.1' from 'https://cache.nixos.org'...
copying path '/nix/store/q0wr6hrhf09bdb09jll95mzzd64awv0l-aws-sdk-cpp-1.7.90' from 'https://cache.nixos.org'...
copying path '/nix/store/8bgqvkqs7jm1k1z12sa0ndrbdh859x2f-nix-2.3.8' from 'https://cache.nixos.org'...
copying path '/nix/store/4fqaq99gnqmc4vr9rjbyslq4gn9ckl3k-nixpkgs-review-2.4.2' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/106074/head:refs/nixpkgs-review/1
remote: Enumerating objects: 4527, done.
remote: Counting objects: 100% (4527/4527), done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 8977 (delta 4511), reused 4512 (delta 4504), pack-reused 4450
Receiving objects: 100% (8977/8977), 4.65 MiB | 8.36 MiB/s, done.
Resolving deltas: 100% (6785/6785), completed with 1148 local objects.
From https://github.com/NixOS/nixpkgs
   b863ef1e5f3..82294a1f2b1  master                -> refs/nixpkgs-review/0
 + d97be39275c...94faa9875fa refs/pull/106074/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/thiago/.cache/nixpkgs-review/pr-106074/nixpkgs 82294a1f2b1bd817163510f0353498499d5026b1
Preparing worktree (detached HEAD 82294a1f2b1)
HEAD is now at 82294a1f2b1 neatvnc: 0.3.2 -> 0.4.0
$ git merge --no-commit 94faa9875fad147f3226c7881b271bde42154f38
Automatic merge went well; stopped before committing as requested
warning: unknown setting 'experimental-features'
warning: unknown setting 'preallocate-contents'
warning: unknown setting 'experimental-features'
warning: unknown setting 'preallocate-contents'
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/pr-106074/build.nix
warning: unknown setting 'experimental-features'
warning: unknown setting 'preallocate-contents'
[12 built, 417 copied (1663.9 MiB), 350.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/106074
1 package built:
zettlr

warning: unknown setting 'experimental-features'
warning: unknown setting 'preallocate-contents'
$ nix-shell /home/thiago/.cache/nixpkgs-review/pr-106074/shell.nix
warning: unknown setting 'experimental-features'
warning: unknown setting 'preallocate-contents'
these paths will be fetched (0.42 MiB download, 2.39 MiB unpacked):
  /nix/store/63fv8bz35y6nkyif07mym7646n6qk4ns-bash-interactive-4.4-p23-dev
  /nix/store/82lxhlys1kvkvk9xlf8qd3ri6lwa43d3-bash-interactive-4.4-p23-info
  /nix/store/ab516d4hzp1z7nq8wqq3igzgagmnrc8j-bash-interactive-4.4-p23-doc
copying path '/nix/store/82lxhlys1kvkvk9xlf8qd3ri6lwa43d3-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/ab516d4hzp1z7nq8wqq3igzgagmnrc8j-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/63fv8bz35y6nkyif07mym7646n6qk4ns-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

tfmoraes · 2020-12-06T20:25:59Z

@sternenseemann, I think it's a good idea to add pandoc and latex as dependencies since Zettlr uses them to export to pdf, html, odf, doc, etc. I did a little adaptation to your derivation but it's not adding pandoc neither latex into the AppImage FHS. Maybe it's necessary more adaptions:

{ appimageTools
, lib
, fetchurl
, gtk3
, gsettings-desktop-schemas
, withPandoc ? true
, pandoc
, haskellPackages
, withLatex ? true
, texlive
}:
let
  pname = "zettlr";
  version = "1.8.1";
  name = "${pname}-${version}";
  src = fetchurl {
    url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
    sha256 = "0r4w6jbhgs0z7shl44lr31j9n0x6j8nlj20shlmchwkf83wksffx";
  };
  appimageContents = appimageTools.extractType2 {
    inherit name src;
  };
in
appimageTools.wrapType2 rec {
  inherit name src;

  profile = ''
    export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
  '';

  multiPkgs = null; # no 32bit needed
  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p)
    ++ lib.optional withPandoc [
    p.hello
    p.pandoc
    p.haskellPackages.pandoc-citeproc
  ]
    ++ lib.optional withLatex [
    p.texlive.combined.scheme-medium
  ];

  extraInstallCommands = ''
    mv $out/bin/{${name},${pname}}
    install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
    install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
    substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
  '';

  meta = with lib; {
    description = "A markdown editor for writing academic texts and taking notes";
    homepage = "https://www.zettlr.com";
    platforms = [ "x86_64-linux" ];
    license = licenses.gpl3;
    maintainers = with maintainers; [ tfmoraes ];
  };
}

tfmoraes · 2020-12-06T21:22:36Z

Doing this it works, but latex and pandoc are not optional anymore:

  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p)
    ++ [
    p.pandoc
    p.haskellPackages.pandoc-citeproc
    p.texlive.combined.scheme-medium
  ];

sternenseemann · 2020-12-06T22:13:28Z

I think making this optional isn't really necessary, since exporting is a pretty vital function, isn't it? I'd do the texlive differently though, so it's easier to override in case someone wants to use their system texlive rather than scheme-medium. What do you think?

I think the best solution is to do something like this in all-packages.nix:

   zettlr = callPackage ../applications/misc/zettlr {
    texlive = texlive.combined.scheme-medium;
   };

tfmoraes · 2020-12-06T22:22:16Z

I think you are correct.

sternenseemann · 2020-12-07T09:53:21Z

LaTeX based export is still broken (PDF). Will have to investigate further.

tfmoraes · 2020-12-07T15:30:02Z

If it's the same problem I have here it's because Zettlr is not finding Times new roman font. I changed to Liberation Serif and it not worked too.

sternenseemann · 2020-12-17T01:19:29Z

Seems like adding the needed font to extraPackages is necessary… I've force pushed a solution, but I don't really like it and there is probably a better way to do this, but I don't really know anything about appimage and appimage tools in nixpkgs…

tfmoraes · 2020-12-17T18:00:51Z

I tested here and it's working. It's not a bad solution, your solution allows to override the fonts. I think it would be better if AppImage exported all system fonts to the FHS, but I think it's not possible to do that today. My review is positive, congratulations.

tfmoraes · 2020-12-21T17:52:34Z

/marvin opt-in
/status needs_reviewer

thiagokokada · 2020-12-29T19:53:36Z

@sternenseemann Can you solve the merge conflict?

tfmoraes · 2020-12-29T20:48:30Z

Everything is working:

nix-shell -p nixpkgs-review --run "nixpkgs-review pr 106074"                                                                          
this path will be fetched (0.04 MiB download, 0.15 MiB unpacked):
  /nix/store/hma4whbv7bq92xysiz8lafpvcw9xfr96-nixpkgs-review-2.5.0
copying path '/nix/store/hma4whbv7bq92xysiz8lafpvcw9xfr96-nixpkgs-review-2.5.0' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/106074/head:refs/nixpkgs-review/1
remote: Enumerating objects: 2162, done.
remote: Counting objects: 100% (2162/2162), done.
remote: Total 3873 (delta 2162), reused 2162 (delta 2162), pack-reused 1711
Receiving objects: 100% (3873/3873), 2.60 MiB | 2.31 MiB/s, done.
Resolving deltas: 100% (2813/2813), completed with 825 local objects.
From https://github.com/NixOS/nixpkgs
   ae46445e624..e71df047a0e  master                -> refs/nixpkgs-review/0
 + d27486656c3...4e95613bcc8 refs/pull/106074/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/thiago/.cache/nixpkgs-review/pr-106074-1/nixpkgs e71df047a0e0244a6b84bba506d0284fd093deb5
Preparing worktree (detached HEAD e71df047a0e)
HEAD is now at e71df047a0e Merge pull request #107896 from mmahut/terraform-provider-vercel
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-106074-1/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 4e95613bcc801419e2c73c67174831751553fe1a
Updating e71df047a0e..4e95613bcc8
Fast-forward
 pkgs/applications/misc/zettlr/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix           |  5 ++++-
 2 files changed, 13 insertions(+), 7 deletions(-)
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-106074-1/nixpkgs -qaP --xml --out-path --show-trace --meta
1 package updated:
zettlr (1.7.5 → 1.8.1)

$ nix --experimental-features nix-command build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/pr-106074-1/build.nix

Link to currently reviewing PR:
https://github.com/NixOS/nixpkgs/pull/106074

1 package built:
zettlr

thiagokokada · 2020-12-29T20:54:21Z

Result of nixpkgs-review pr 106074 1

1 package built:

zettlr

thiagokokada · 2020-12-29T20:54:42Z

There is a version 1.8.4 available, but we could merge this first and update it in another PR.

nixos-discourse · 2020-12-30T12:20:51Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/312

pkgs/applications/misc/zettlr/default.nix

SuperSandro2000 · 2020-12-30T18:33:23Z

Result of nixpkgs-review pr 106074 run on x86_64-linux 1

1 package built:

zettlr

Some files in the appimage changed from 'zettlr' to 'Zettlr', keeping them as lowercase in package output for consistency. Add texlive and pandoc{,-citeproc} for PDF export.

sternenseemann · 2021-02-16T12:10:20Z

Finally had some motivation to look at this again. I've updated to 1.8.7 which has come out in the meantime and investigated the fonts issue again. Seems like this was possibly a Zettlr bug since buildFHSUserEnvBubbleWrap does bind /etc/fonts in the output image, so globally installed fonts should work as expected.

Anyways, with 1.8.7 PDF export works again without adding a list of fonts to the image!

tfmoraes · 2021-02-16T17:21:02Z

Cool @sternenseemann! I tested here and it's working, exporting to PDF and ODT. Thanks!

nixos-discourse · 2021-02-17T14:41:30Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/349

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Dec 6, 2020

sternenseemann force-pushed the zettlr-1.8.1 branch from 94faa98 to 697947c Compare December 7, 2020 09:51

sternenseemann force-pushed the zettlr-1.8.1 branch from 697947c to d1b5960 Compare December 17, 2020 01:18

sternenseemann force-pushed the zettlr-1.8.1 branch from d1b5960 to 4e95613 Compare December 29, 2020 20:35

ofborg bot requested a review from tfmoraes December 29, 2020 20:44

tfmoraes approved these changes Dec 29, 2020

View reviewed changes

thiagokokada approved these changes Dec 29, 2020

View reviewed changes

SuperSandro2000 reviewed Dec 30, 2020

View reviewed changes

pkgs/applications/misc/zettlr/default.nix Outdated Show resolved Hide resolved

zettlr: 1.7.5 -> 1.8.7

5db97c0

Some files in the appimage changed from 'zettlr' to 'Zettlr', keeping them as lowercase in package output for consistency. Add texlive and pandoc{,-citeproc} for PDF export.

sternenseemann force-pushed the zettlr-1.8.1 branch from 4e95613 to 5db97c0 Compare February 16, 2021 12:06

sternenseemann changed the title ~~zettlr: 1.7.5 -> 1.8.1~~ zettlr: 1.7.5 -> 1.8.7 Feb 16, 2021

sternenseemann requested review from thiagokokada, tfmoraes and SuperSandro2000 and removed request for thiagokokada February 16, 2021 12:10

tfmoraes approved these changes Feb 16, 2021

View reviewed changes

SuperSandro2000 merged commit f5e69e0 into NixOS:master Feb 18, 2021

sternenseemann deleted the zettlr-1.8.1 branch February 18, 2021 11:40

sternenseemann restored the zettlr-1.8.1 branch July 24, 2021 13:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zettlr: 1.7.5 -> 1.8.7 #106074

zettlr: 1.7.5 -> 1.8.7 #106074

sternenseemann commented Dec 6, 2020

sternenseemann commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

sternenseemann commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

sternenseemann commented Dec 7, 2020

tfmoraes commented Dec 7, 2020

sternenseemann commented Dec 17, 2020

tfmoraes commented Dec 17, 2020

tfmoraes commented Dec 21, 2020

thiagokokada commented Dec 29, 2020

tfmoraes commented Dec 29, 2020

thiagokokada commented Dec 29, 2020

thiagokokada commented Dec 29, 2020

nixos-discourse commented Dec 30, 2020

SuperSandro2000 commented Dec 30, 2020

sternenseemann commented Feb 16, 2021

tfmoraes commented Feb 16, 2021

nixos-discourse commented Feb 17, 2021

zettlr: 1.7.5 -> 1.8.7 #106074

zettlr: 1.7.5 -> 1.8.7 #106074

Conversation

sternenseemann commented Dec 6, 2020

Motivation for this change

Things done

sternenseemann commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

sternenseemann commented Dec 6, 2020

tfmoraes commented Dec 6, 2020

sternenseemann commented Dec 7, 2020

tfmoraes commented Dec 7, 2020

sternenseemann commented Dec 17, 2020

tfmoraes commented Dec 17, 2020

tfmoraes commented Dec 21, 2020

thiagokokada commented Dec 29, 2020

tfmoraes commented Dec 29, 2020

thiagokokada commented Dec 29, 2020

thiagokokada commented Dec 29, 2020

nixos-discourse commented Dec 30, 2020

SuperSandro2000 commented Dec 30, 2020

sternenseemann commented Feb 16, 2021

tfmoraes commented Feb 16, 2021

nixos-discourse commented Feb 17, 2021