wezterm: initial package #104704

steveej · 2020-11-23T20:16:12Z

Motivation for this change

Things done

SuperSandro2000 · 2020-11-23T20:32:45Z

Please change your commit message that it fits the contributing guide https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

pkgs/applications/terminal-emulators/wezterm/default.nix

SuperSandro2000 · 2020-11-23T20:35:33Z

pkgs/applications/terminal-emulators/wezterm/default.nix

+    owner = "wez";
+    repo = pname;
+    rev = "${version}";
+    fetchSubmodules = true;


I would prefer it if we would use the system libraries instead of the vendored ones.

Assuming that your goal is to remove this line entirely I think this isn't easily possible. The submodule paths are referenced unconditionally, e.g. here:

https://github.com/wez/wezterm/blob/5fbb6a44002c170dcd20bbc0b0fd38f6fbf6b206/wezterm-font/Cargo.toml#L15

pkgs/applications/terminal-emulators/wezterm/default.nix

SuperSandro2000 · 2020-11-23T20:36:48Z

pkgs/applications/terminal-emulators/wezterm/default.nix

+    # license = licenses.angle;
+    maintainers = with maintainers; [ ];


Suggested change

# license = licenses.angle;

maintainers = with maintainers; [ ];

license = licenses.angle;

maintainers = with maintainers; [ steveeJ ];

Please add the license to nixpkgs and yourself as a maintainer.

the license is MIT. There are some compiled in fonts that are OFL. Binary distributions on Windows and macOS include code (libEGL) under the ANGLE license.

Does this mean we need multiple licenses here, or is MIT fine?

I would just add all three licenses but I am not 100% sure.

wez · 2020-11-23T21:17:23Z

pkgs/applications/terminal-emulators/wezterm/default.nix

+  buildInputs = runtimeDeps;
+
+  installPhase = ''
+    for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do


I don't know how/if all these translate to nixos, but if you look at the rpm spec generation here:

https://github.com/wez/wezterm/blob/master/ci/deploy.sh#L84-L106

there are a couple of additional artifacts to deploy for linux:

The .desktop file and icon

The /etc/profile.d shell integration scripts

Thanks @wez. I added the install instructions although I'm not sure how to verify any of them. Maybe someone else jumps in or we can fix it up subsequently.

wez · 2020-11-23T21:22:48Z

pkgs/applications/terminal-emulators/wezterm/default.nix

+    # license = licenses.angle;
+    maintainers = with maintainers; [ ];


the license is MIT. There are some compiled in fonts that are OFL. Binary distributions on Windows and macOS include code (libEGL) under the ANGLE license.

pkgs/applications/terminal-emulators/wezterm/default.nix

SuperSandro2000 · 2020-11-23T21:25:38Z

hash mismatch in fixed-output derivation '/nix/store/6l6ngbzzmn0pb2zili1bd0ras6hjwc17-wezterm-3bd8d8c84591f4d015ff9a47ddb478e55c231fda-vendor.tar.gz':
  wanted: sha256:0ri79aiipy93dabiwp1jgsy1pgwrdr38n6wrp5j568m7cqbdrmwn
  got:    sha256:1s1pr7dygizhgsblwrizij10dx2hg8jl32gf8ygdq2x69bvzldmk
cannot build derivation '/nix/store/ly065byvlja9r88c91y1xqcq69kz8y9c-wezterm-3bd8d8c84591f4d015ff9a47ddb478e55c231fda.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/zs36n38l4n0spzr4mm7s5an60103m8lq-env.drv': 1 dependencies couldn't be built

pkgs/applications/terminal-emulators/wezterm/default.nix

bew · 2020-11-25T16:15:11Z

Hello, @steveej can you please not use force push when changing your PR?
It makes it quite hard to see what changed between 2 update of the PR.

By making multiple commits it allows us, reader of the PR to see what changes you did on each update.
The final commit will probably be squashed anyway to be a single commit at the end in master.

steveej · 2020-11-25T16:30:53Z

@bew I'm quite surprised about that request. I typically use git commit --fixup ..; If those commits are good enough for you I'll try to think of not squashing until right before merge.

SuperSandro2000 · 2020-11-26T02:05:55Z

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

1 package built:

wezterm

teto · 2020-11-26T20:18:01Z

@steveej I apprecaite when commits stack on top of eachother because then we only have to inspect the more recent commits. we can squash from github ui at the end. Tested locally and it worked fine.

steveej · 2020-12-15T12:24:50Z

@teto

we can squash from github ui at the end

Ah, I totally wanted to squash as I wasn't very comfortable not cleaning up the git history in the first place; but now you just merged! Also, I was preparing some changes locally still today that I hadn't pushed. Well, I'll create another PR to add them.

teto · 2020-12-15T12:39:19Z

sorry my fault. I had planned to squash them as my previous comment mentioned but clicked a bit too fast. It was only one fixup! commit so not taht bad.

SuperSandro2000 reviewed Nov 23, 2020

View reviewed changes

wez reviewed Nov 23, 2020

View reviewed changes

ofborg bot added 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 23, 2020

sikmir reviewed Nov 24, 2020

View reviewed changes

pkgs/applications/terminal-emulators/wezterm/default.nix Outdated Show resolved Hide resolved

steveej force-pushed the pr/wezterm-init branch 3 times, most recently from 9ea9fd2 to b0261d4 Compare November 25, 2020 13:34

ofborg bot added the 11.by: package-maintainer label Nov 25, 2020

steveej force-pushed the pr/wezterm-init branch from 2814e35 to a2b48e5 Compare November 25, 2020 14:57

wezterm: initial package

39f1563

steveej force-pushed the pr/wezterm-init branch from a2b48e5 to 39f1563 Compare November 25, 2020 14:58

fixup! wezterm: initial package

9957c0e

teto merged commit b75e7f4 into NixOS:master Dec 15, 2020

steveej deleted the pr/wezterm-init branch December 15, 2020 12:53

steveej mentioned this pull request Dec 15, 2020

wezterm: add licenses, install extra files, and update to a revision of 20210314 #106976

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wezterm: initial package #104704

wezterm: initial package #104704

steveej commented Nov 23, 2020

SuperSandro2000 commented Nov 23, 2020

SuperSandro2000 Nov 23, 2020

steveej Nov 25, 2020

SuperSandro2000 Nov 23, 2020

wez Nov 23, 2020

steveej Nov 25, 2020

SuperSandro2000 Nov 26, 2020 •

edited

wez Nov 23, 2020

steveej Dec 15, 2020

wez Nov 23, 2020

SuperSandro2000 commented Nov 23, 2020

bew commented Nov 25, 2020

steveej commented Nov 25, 2020 •

edited

SuperSandro2000 commented Nov 26, 2020

teto commented Nov 26, 2020

steveej commented Dec 15, 2020

teto commented Dec 15, 2020

		# license = licenses.angle;
		maintainers = with maintainers; [ ];

wezterm: initial package #104704

wezterm: initial package #104704

Conversation

steveej commented Nov 23, 2020

Motivation for this change

Things done

SuperSandro2000 commented Nov 23, 2020

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

SuperSandro2000 Nov 26, 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

SuperSandro2000 commented Nov 23, 2020

bew commented Nov 25, 2020

steveej commented Nov 25, 2020 • edited

SuperSandro2000 commented Nov 26, 2020

teto commented Nov 26, 2020

steveej commented Dec 15, 2020

teto commented Dec 15, 2020

SuperSandro2000 Nov 26, 2020 •

edited

steveej commented Nov 25, 2020 •

edited