hydron: unstable-2019-02-17 -> 3.0.4 #107810

freezeboy · 2020-12-28T16:04:26Z

Motivation for this change

Things done

Chiiruno · 2020-12-28T16:21:58Z

LGTM, but not on NixOS anymore so can't test. ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Monday, December 28th, 2020 at 10:18 AM, ofborg[bot] ***@***.***> wrote: ***@***.***(https://github.com/ofborg)[bot] requested your review on: [#107810](#107810) hydron: unstable-2019-02-17 -> 3.0.4. — You are receiving this because your review was requested. Reply to this email directly, [view it on GitHub](#107810 (comment)), or [unsubscribe](https://github.com/notifications/unsubscribe-auth/AHIGUHDVOEKAXUBGM2CQME3SXCVULANCNFSM4VMGA5LA).

SuperSandro2000 · 2020-12-28T16:32:36Z

pkgs/servers/hydron/default.nix

-buildGoPackage {
-  pname = "hydron-unstable";
-  version = "2019-02-17";
+buildGoPackage rec {


Can we use buildGoModule?

Chiiruno · 2020-12-28T16:35:48Z

That reminds me, you may want to reference this PR. [#67666](#67666) ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

…

On Monday, December 28th, 2020 at 10:32 AM, Sandro ***@***.***> wrote: @SuperSandro2000 commented on this pull request. --------------------------------------------------------------- In [pkgs/servers/hydron/default.nix](#107810 (comment)): > @@ -1,17 +1,18 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick , quicktemplate, go-bindata, easyjson }: -buildGoPackage { - pname = "hydron-unstable"; - version = "2019-02-17"; +buildGoPackage rec { Can we use buildGoModule? — You are receiving this because your review was requested. Reply to this email directly, [view it on GitHub](#107810 (review)), or [unsubscribe](https://github.com/notifications/unsubscribe-auth/AHIGUHFMJNCO2WDKEBHYEB3SXCXLDANCNFSM4VMGA5LA).

SuperSandro2000 · 2020-12-28T16:39:30Z

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

1 package built:

hydron

freezeboy · 2020-12-28T16:40:03Z

Trying to use buildGoModule right now

freezeboy · 2020-12-28T17:14:07Z

quicktemplate and statik looks ok, but hydron has problems

hydron case:

github.com/chai2010/webp

vendor/github.com/chai2010/webp/capi.go:24:10: fatal error: webp.h: No such file or directory
24 | #include "webp.h"
| ^~~~~~~~
compilation terminated.

and I am not sure why this happens with modules and not packages

pkgs/servers/hydron/default.nix

SuperSandro2000 · 2020-12-29T00:46:35Z

quicktemplate and statik looks ok, but hydron has problems

hydron case:

github.com/chai2010/webp

vendor/github.com/chai2010/webp/capi.go:24:10: fatal error: webp.h: No such file or directory
24 | #include "webp.h"
| ^~~~~~~~
compilation terminated.

and I am not sure why this happens with modules and not packages

I think buildGoModule could properly isolate the build dependencies.

SuperSandro2000 · 2020-12-29T01:26:36Z

Not sure why the header file (https://github.com/chai2010/webp/blob/master/internal/include/webp.h) is deleting while vendoring.

SuperSandro2000 · 2020-12-29T01:36:54Z

diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 18dba9ce55e..1fd56e6fd2d 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick
-, quicktemplate, go-bindata, easyjson }:
+{ stdenv, buildGoModule, fetchFromGitHub
+, pkg-config, ffmpeg
+, graphicsmagick, quicktemplate, go-bindata, easyjson }:

-buildGoPackage rec {
+buildGoModule rec {
   pname = "hydron";
   version = "3.0.4";

-  goPackagePath = "github.com/bakape/hydron";
-  goDeps = ./deps.nix;
-
   src = fetchFromGitHub {
     owner = "bakape";
     repo = "hydron";
@@ -15,9 +13,13 @@ buildGoPackage rec {
     sha256 = "BfMkKwz7ITEnAIMGUHlBH/Dn9yLjWKoqFWupPo1s2cs=";
   };

-  nativeBuildInputs = [ pkgconfig go-bindata ];
+  vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3";

-  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ];
+  runVend = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ ffmpeg ];

   meta = with stdenv.lib; {
     homepage = "https://github.com/bakape/hydron";

freezeboy · 2020-12-29T10:15:00Z

Thank you I applied it, (and removed some unused deps)

SuperSandro2000 · 2021-01-11T18:14:33Z

@freezeboy please fix the merge conflict.

pkgs/servers/hydron/default.nix

freezeboy · 2021-01-13T08:37:39Z

Fixed

SuperSandro2000 · 2021-01-13T11:07:08Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107810 run on x86_64-darwin 1

1 package built:

hydron

SuperSandro2000 · 2021-01-13T13:01:24Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

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

1 package built:

hydron

SuperSandro2000

other than that LGTM

pkgs/servers/hydron/deps.nix

ofborg bot requested a review from Chiiruno December 28, 2020 16:17

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

SuperSandro2000 reviewed Dec 28, 2020

View reviewed changes

SuperSandro2000 reviewed Dec 29, 2020

View reviewed changes

pkgs/servers/hydron/default.nix Outdated Show resolved Hide resolved

pkgs/servers/hydron/default.nix Outdated Show resolved Hide resolved

freezeboy force-pushed the update-hydron branch from 4754dbf to 63fc9b2 Compare December 29, 2020 10:14

ofborg bot requested a review from kalbasit December 29, 2020 10:26

SuperSandro2000 reviewed Jan 11, 2021

View reviewed changes

pkgs/servers/hydron/default.nix Outdated Show resolved Hide resolved

freezeboy force-pushed the update-hydron branch from 63fc9b2 to 9b2896f Compare January 11, 2021 18:17

ofborg bot added 8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 0 and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Jan 11, 2021

SuperSandro2000 reviewed Jan 12, 2021

View reviewed changes

pkgs/servers/hydron/default.nix Outdated Show resolved Hide resolved

freezeboy force-pushed the update-hydron branch from 9b2896f to 0f9b6e5 Compare January 13, 2021 08:36

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jan 13, 2021

SuperSandro2000 approved these changes Jan 13, 2021

View reviewed changes

pkgs/servers/hydron/deps.nix Show resolved Hide resolved

hydron: unstable-2019-02-17 -> 3.0.4

f398566

freezeboy force-pushed the update-hydron branch from 0f9b6e5 to f398566 Compare January 13, 2021 17:23

SuperSandro2000 merged commit 2d0dc97 into NixOS:master Jan 15, 2021

freezeboy deleted the update-hydron branch January 15, 2021 10:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hydron: unstable-2019-02-17 -> 3.0.4 #107810

hydron: unstable-2019-02-17 -> 3.0.4 #107810

freezeboy commented Dec 28, 2020

Chiiruno commented Dec 28, 2020 via email

SuperSandro2000 Dec 28, 2020

Chiiruno commented Dec 28, 2020 via email

SuperSandro2000 commented Dec 28, 2020

freezeboy commented Dec 28, 2020

freezeboy commented Dec 28, 2020

SuperSandro2000 commented Dec 29, 2020

github.com/chai2010/webp

SuperSandro2000 commented Dec 29, 2020

SuperSandro2000 commented Dec 29, 2020 •

edited

freezeboy commented Dec 29, 2020

SuperSandro2000 commented Jan 11, 2021

freezeboy commented Jan 13, 2021

SuperSandro2000 commented Jan 13, 2021

SuperSandro2000 commented Jan 13, 2021

SuperSandro2000 left a comment

hydron: unstable-2019-02-17 -> 3.0.4 #107810

hydron: unstable-2019-02-17 -> 3.0.4 #107810

Conversation

freezeboy commented Dec 28, 2020

Motivation for this change

Things done

Chiiruno commented Dec 28, 2020 via email

SuperSandro2000 Dec 28, 2020

Choose a reason for hiding this comment

Chiiruno commented Dec 28, 2020 via email

SuperSandro2000 commented Dec 28, 2020

freezeboy commented Dec 28, 2020

freezeboy commented Dec 28, 2020

github.com/chai2010/webp

SuperSandro2000 commented Dec 29, 2020

github.com/chai2010/webp

SuperSandro2000 commented Dec 29, 2020

SuperSandro2000 commented Dec 29, 2020 • edited

freezeboy commented Dec 29, 2020

SuperSandro2000 commented Jan 11, 2021

freezeboy commented Jan 13, 2021

SuperSandro2000 commented Jan 13, 2021

SuperSandro2000 commented Jan 13, 2021

SuperSandro2000 left a comment

Choose a reason for hiding this comment

SuperSandro2000 commented Dec 29, 2020 •

edited