notion: 3-2017050501 -> 3-2019050101 #77855

AndersonTorres · 2020-01-17T03:05:17Z

Motivation for this change

Update package.

Things done

alyssais · 2020-01-17T03:55:17Z

pkgs/applications/window-managers/notion/default.nix

+  meta = with stdenv.lib; {
+    description = "Tiling tabbed window manager, follow-on to the ion window manager";
+    homepage = "https://notionwm.net/";
+    license   = licenses.notion_lgpl; # notion4 will be fully LGPL


This version of notion appears to be using the standard LGPL 2.1. Please change this accordingly and drop the custom one from licenses.nix.

alyssais · 2020-01-17T03:57:38Z

pkgs/applications/window-managers/notion/system-local-nixos.mk

+PRELOAD_MODULES=0
+
+# Purity reasons
+X11_PREFIX="/no-such-path"


Can these all not just be set buildFlags?

alyssais · 2020-01-17T03:58:14Z

pkgs/applications/window-managers/notion/default.nix

-  buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft;
+  preConfigure = ''cp ${./system-local-nixos.mk} system-local.mk'';
+
+  buildFlags = [ "LUA_DIR=${lua}" "PREFIX=\${out}" ];


Set PREFIX in makeFlags since it’s shared between installFlags and buildFlags.

raboof · 2020-01-17T08:45:13Z

Upstream here ;) - thanks for looking into this!

Where did you hear about "3-20200107"? This version is not tagged upstream, and the commit packaged in this PR is the latest master. The next release from master is intended to become "Notion 4", as we have made some larger changes (https://notionwm.net/migration.html). Packaging the latest master under version '3' would be confusing.

This PR is related to #70610 - I guess we should compare these and merge once we release Notion 4?

raboof · 2020-01-17T08:51:42Z

Of course we would much welcome testing of this snapshot - as you can see at https://github.com/raboof/notion/projects/1 we're rather close to releasing Notion 4 (perhaps within the next 3 weeks?).

AndersonTorres · 2020-01-17T11:28:11Z

@raboof , many thanks to look at us at NixOS community! In behalf of all, welcome to our repo :)

Where did you hear about "3-20200107"?

I use a script called nix-prefetch-git (it can be installed via nix-env, as usual). When I run the script, this is the output:

{
  "url": "https://github.com/raboof/notion",
  "rev": "8d719dff20f2186a6e0c4e5cf5486da785857d5b",
  "date": "2020-01-07T19:40:19+01:00",
  "sha256": "1rlbhknjz4fx55lb4g7z746f32p4mxwzns244slggpr5ba51ivfg",
  "fetchSubmodules": false
}

By default it tries the master branch, showing the corresponding date.

I guess we should compare these and merge once we release Notion 4?

My PR is a cleanup. It will make the transition to Notion4 smoother.

raboof · 2020-01-17T12:16:33Z

pkgs/applications/window-managers/notion/default.nix

-    license   = licenses.notion_lgpl;
-    maintainers = with maintainers; [jfb];
-  };
+  version = "2020-01-07";


It seems kind of weird to update this package from a released upstream tag to a timestamped git snapshot of the next (as of yet unreleased) major version introducing significant changes (https://notionwm.net/migration.html).

Thanks for not using the same version format, that does make it less confusing.

I'm not opposed to it, but my impression was that Nix prefers packaging released tags.

Indeed, this package should be named “notion-unstable” and the version should be set to the commit date.

I'm not opposed to it, but my impression was that Nix prefers packaging released tags.

Initially I think "well, maybe the master branch fixed the compilation issues", then I tried it before anything else.

raboof · 2020-01-17T12:17:32Z

pkgs/applications/window-managers/notion/default.nix

+  buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path"
+                 # A bug in the upstream prevents it to compile
+                 # when PRELOAD_MODULES is 1.
+                 "PRELOAD_MODULES=0" ];


I think this can be removed: PRELOAD_MODULES=0 is already the default.

Weirdly, I needed to explicitly set it as "0" or else the mysterious fontconfig DSO bug appeared.

raboof · 2020-01-17T12:22:33Z

pkgs/top-level/all-packages.nix

@@ -20380,7 +20380,7 @@ in
    geoip = geoipWithDatabase;
  };

-  notion = callPackage ../applications/window-managers/notion { };
+  notion = callPackage ../applications/window-managers/notion { lua = lua5_3; };


Was this necessary? Notion should work fine with the current Nix default (5.2), I've been testing with that for months.

Oh, it was a leftover of various tests.

alyssais · 2020-01-17T12:27:24Z

Given that this is a release -> unreleased bump, I think it needs some justification beyond “this is a cleanup”. Is something broken with the current package? What’s stopping us from waiting until there’s a new release in a few weeks?

@tftio as a fellow maintainer of this package, what do you think?

raboof · 2020-01-17T12:31:15Z

many thanks to look at us at NixOS community! In behalf of all, welcome to our repo :)

Thanks! I've switched to NixOS myself a few months back and I'm quite happy with it, so I plan to stick around :). Great to see this interest in having Notion on NixOS up-to-date!

AndersonTorres · 2020-01-17T23:42:35Z

Is something broken with the current package? What’s stopping us from waiting until there’s a new release in a few weeks?

Well, it required a now useless patch, and also the PRELOAD_MODULES issue preventing its compilation.

@alyssais now I am using the tagged upstream. What do you think?

AndersonTorres · 2020-01-20T10:34:57Z

Well, I think it is all OK now.
If no one objects it, I will merge tomorrow.

alyssais · 2020-01-20T14:03:41Z

Initially I think "well, maybe the master branch fixed the compilation issues", then I tried it before anything else.

Ah right, if it didn't compile before then this seems fine.

AndersonTorres · 2020-01-22T10:46:13Z

Done!

notion: 3-2017050501 -> 3-2019050101 (cherry picked from commit 45b4008)

AndersonTorres mentioned this pull request Jan 17, 2020

Error with fontconfig when building with PRELOAD_MODULES raboof/notion#202

Open

ofborg bot added 6.topic: nixos 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Jan 17, 2020

alyssais reviewed Jan 17, 2020

View reviewed changes

AndersonTorres changed the title ~~notion: 3-2017050501 -> 3-20200107~~ notion: 3-2017050501 -> 2020-01-07 Jan 17, 2020

Notion custom license: exclude

bdf32f3

raboof reviewed Jan 17, 2020

View reviewed changes

notion: 3-2017050501 -> 3-2019050101

8739475

AndersonTorres changed the title ~~notion: 3-2017050501 -> 2020-01-07~~ notion: 3-2017050501 -> 3-2019050101 Jan 18, 2020

AndersonTorres added the 8.has: package (update) label Jan 19, 2020

AndersonTorres merged commit 45b4008 into NixOS:master Jan 22, 2020

AndersonTorres deleted the update/notion branch January 22, 2020 10:58

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Jan 22, 2020

Merge pull request NixOS#77855 from AndersonTorres/update/notion

4411690

notion: 3-2017050501 -> 3-2019050101 (cherry picked from commit 45b4008)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

notion: 3-2017050501 -> 3-2019050101 #77855

notion: 3-2017050501 -> 3-2019050101 #77855

AndersonTorres commented Jan 17, 2020 •

edited

alyssais Jan 17, 2020

AndersonTorres Jan 17, 2020

alyssais Jan 17, 2020

AndersonTorres Jan 17, 2020

alyssais Jan 17, 2020

AndersonTorres Jan 17, 2020

raboof commented Jan 17, 2020

raboof commented Jan 17, 2020

AndersonTorres commented Jan 17, 2020 •

edited

raboof Jan 17, 2020

alyssais Jan 17, 2020

AndersonTorres Jan 17, 2020

raboof Jan 17, 2020

AndersonTorres Jan 17, 2020

raboof Jan 17, 2020

AndersonTorres Jan 17, 2020

alyssais commented Jan 17, 2020

raboof commented Jan 17, 2020 •

edited

AndersonTorres commented Jan 17, 2020 •

edited

AndersonTorres commented Jan 20, 2020

alyssais commented Jan 20, 2020 via email

AndersonTorres commented Jan 22, 2020

notion: 3-2017050501 -> 3-2019050101 #77855

notion: 3-2017050501 -> 3-2019050101 #77855

Conversation

AndersonTorres commented Jan 17, 2020 • edited

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raboof commented Jan 17, 2020

raboof commented Jan 17, 2020

AndersonTorres commented Jan 17, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alyssais commented Jan 17, 2020

raboof commented Jan 17, 2020 • edited

AndersonTorres commented Jan 17, 2020 • edited

AndersonTorres commented Jan 20, 2020

alyssais commented Jan 20, 2020 via email

AndersonTorres commented Jan 22, 2020

AndersonTorres commented Jan 17, 2020 •

edited

AndersonTorres commented Jan 17, 2020 •

edited

raboof commented Jan 17, 2020 •

edited

AndersonTorres commented Jan 17, 2020 •

edited