ttyd: 1.6.1 -> 1.6.3, generate blob from source #110978

iblech · 2021-01-28T02:34:54Z

Motivation for this change

The first commit in this pull request is a very ordinary version bump (1.6.1 to 1.6.3).

In the second, we fix a long-time issue with our ttyd package: The file src/html.h in the ttyd repository is generated from other source files in the html/ subdirectory. Previously, we just used the pre-built file. With this pull request, we are generating it on our own.

I believe this to be in the Nix spirit, please correct me if I'm wrong. It also has the practical benefit that overriding this package is now easier -- before, any changes to the html/ subdirectory wouldn't have any effect.

In order to avoid checking in a 300+ KiB yarn.nix file into nixpkgs (automatically generated from yarn.lock), this pull requests generates it on the fly. Please indicate whether this is weird, if so I'll just check in the generated yarn.nix as a static file.

The current maintainer @thoughtpolice shouldn't have to bear the work of maintaining my addition. Hence I'm adding myself as maintainer. :-)

Things done

nixos-discourse · 2021-02-03T09:12:58Z

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/457

SuperSandro2000 · 2021-02-04T10:45:59Z

Please check ofborg status before posting on discourse. I usually just skip red ofborgs entirely.

iblech · 2021-02-04T11:50:53Z

The status is only red because I'm not a trusted user, hence ofborg refuses to evaluate the expression. The expression is slightly unusual because it calls yarn2nix at evaluation time. :-) This aspect is what I solicited feedback about.

The alternative would be to skip this dynamical generation and just check in a static 300 KiB automatically-generated .nix file. Would also be totally fine with me, just wanted to know which route I should pursue.

Mic92 · 2021-02-04T19:40:43Z

pkgs/servers/ttyd/default.nix

+    let
+      yarnNixFile = runCommand "yarn.nix" {}
+        "${yarn2nix}/bin/yarn2nix --lockfile ${src}/html/yarn.lock --no-patch --builtin-fetchgit > $out";
+      yarnNix = callPackage yarnNixFile {};


This does import from derivation, which we don't allow in nixpkgs.

Hence the evaluation error.

pkgs/servers/ttyd/default.nix

+    let
+      yarnNixFile = runCommand "yarn.nix" {}
+        "${yarn2nix}/bin/yarn2nix --lockfile ${src}/html/yarn.lock --no-patch --builtin-fetchgit > $out";
+      yarnNix = callPackage yarnNixFile {};


iblech · 2021-02-04T20:20:55Z

Thank you @Mic92 and @SuperSandro2000 for your comments! Accordingly, I removed the dynamic generation and checked in a static yarn.nix file.

Mic92

This is 300KB for a single package? I am against having this in nixpkgs. The problem is that this is also increases nixpkgs evaluation time massively.

Mic92 · 2021-02-04T21:42:09Z

To be honest I rather have pre-compiled html than reviewing 10000 lines generate nix files.

SuperSandro2000 · 2021-02-04T21:38:05Z

pkgs/servers/ttyd/update.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p yarn2nix curl


Suggested change

#!nix-shell -i bash -p yarn2nix curl

#!nix-shell -i bash -p curl gnugrep yarn2nix

Mic92 · 2021-02-04T21:46:16Z

Sorry. For not reading the PR message before putting my comment below. I was asked to have a look at the evaluation error, so I did not pay attention to that.

stale · 2021-08-04T22:42:57Z

I marked this as stale due to inactivity. → More info

SuperSandro2000 · 2021-08-05T09:37:32Z

pkgs/servers/ttyd/default.nix

 with builtins;



Suggested change

with builtins;

stale · 2022-04-19T08:16:01Z

I marked this as stale due to inactivity. → More info

Mindavi · 2022-04-24T20:59:43Z

Heh, I also bumped ttyd a while ago, so the bump could be dropped after a rebase: #123135. Didn't see this PR at the time. I also don't really like the large files in nixpkgs, so a 👎 from me on this. I think this would be better suited to be carried as an overlay if you want to do such things, rather than being checked in to nixpkgs.

ttyd: 1.6.1 -> 1.6.3

fcbb660

iblech requested a review from thoughtpolice January 28, 2021 23:46

iblech force-pushed the patch-ttyd2 branch from eb3c74a to 0e181ec Compare January 31, 2021 03:13

Mic92 reviewed Feb 4, 2021

View reviewed changes

SuperSandro2000 reviewed Feb 4, 2021

View reviewed changes

pkgs/servers/ttyd/default.nix Outdated

let

yarnNixFile = runCommand "yarn.nix" {}

"${yarn2nix}/bin/yarn2nix --lockfile ${src}/html/yarn.lock --no-patch --builtin-fetchgit > $out";

yarnNix = callPackage yarnNixFile {};

This comment was marked as duplicate.

Sign in to view

SuperSandro2000 changed the title ~~ttyd: bump to 1.6.3 and generate blob from source~~ ttyd: 1.6.1 -> 1.6.3, generate blob from source Feb 4, 2021

ttyd: compile frontend instead of using prebuilt binary

9a71251

iblech force-pushed the patch-ttyd2 branch from 0e181ec to 9a71251 Compare February 4, 2021 20:18

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Feb 4, 2021

Mic92 requested changes Feb 4, 2021

View reviewed changes

SuperSandro2000 reviewed Feb 4, 2021

View reviewed changes

stale bot added the 2.status: stale label Aug 4, 2021

SuperSandro2000 added the 2.status: merge conflict label Aug 5, 2021

stale bot removed the 2.status: stale label Aug 5, 2021

SuperSandro2000 reviewed Aug 5, 2021

View reviewed changes

pkgs/servers/ttyd/default.nix

Comment on lines 8 to 9

with builtins;

Copy link

Member

SuperSandro2000 Aug 5, 2021

Choose a reason for hiding this comment

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

Suggested change

with builtins;

stale bot added the 2.status: stale label Apr 19, 2022

stale bot removed the 2.status: stale label Apr 24, 2022

SuperSandro2000 closed this Apr 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ttyd: 1.6.1 -> 1.6.3, generate blob from source #110978

ttyd: 1.6.1 -> 1.6.3, generate blob from source #110978

iblech commented Jan 28, 2021

nixos-discourse commented Feb 3, 2021

SuperSandro2000 commented Feb 4, 2021

iblech commented Feb 4, 2021

Mic92 Feb 4, 2021

Mic92 Feb 4, 2021

This comment was marked as duplicate.

iblech commented Feb 4, 2021

Mic92 left a comment •

edited

Loading

Mic92 commented Feb 4, 2021

SuperSandro2000 Feb 4, 2021

Mic92 commented Feb 4, 2021

stale bot commented Aug 4, 2021

SuperSandro2000 Aug 5, 2021

stale bot commented Apr 19, 2022

Mindavi commented Apr 24, 2022

		@@ -0,0 +1,10 @@
		#!/usr/bin/env nix-shell
		#!nix-shell -i bash -p yarn2nix curl

	#!nix-shell -i bash -p yarn2nix curl
	#!nix-shell -i bash -p curl gnugrep yarn2nix

ttyd: 1.6.1 -> 1.6.3, generate blob from source #110978

ttyd: 1.6.1 -> 1.6.3, generate blob from source #110978

Conversation

iblech commented Jan 28, 2021

Motivation for this change

Things done

nixos-discourse commented Feb 3, 2021

SuperSandro2000 commented Feb 4, 2021

iblech commented Feb 4, 2021

Mic92 Feb 4, 2021

Choose a reason for hiding this comment

Mic92 Feb 4, 2021

Choose a reason for hiding this comment

This comment was marked as duplicate.

iblech commented Feb 4, 2021

Mic92 left a comment • edited Loading

Choose a reason for hiding this comment

Mic92 commented Feb 4, 2021

SuperSandro2000 Feb 4, 2021

Choose a reason for hiding this comment

Mic92 commented Feb 4, 2021

stale bot commented Aug 4, 2021

SuperSandro2000 Aug 5, 2021

Choose a reason for hiding this comment

stale bot commented Apr 19, 2022

Mindavi commented Apr 24, 2022

Mic92 left a comment •

edited

Loading