libhttpseverywhere: 0.4.5 -> 0.6.5 #30352

sternenseemann · 2017-10-12T14:24:38Z

Motivation for this change

Update libhttpseverywhere to the latest version including support for the updated ruleset format.
Prior version's ruleset update funtionality ceased to work.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

jtojnar · 2017-10-12T17:14:19Z

pkgs/development/libraries/libhttpseverywhere/default.nix

  version = "${major}.${minor}";

  name = "libhttpseverywhere-${version}";

  src = fetchurl {
    url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2";
+    sha256 = "0pwnh5mbbcb9hpx7by5f5j5qj7kchflwx7dzh49hbkw1jvwrx655";
  };

  nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
  buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];


0.6.1 apparently dropped dependency on libxml2: https://github.com/GNOME/libhttpseverywhere/releases/tag/0.6.1

Thanks! Fixed.

jtojnar · 2017-10-12T17:16:40Z

pkgs/development/libraries/libhttpseverywhere/default.nix

  };

  nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
  buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ];

+  mesonFlags = "-Denable_valadoc=true";


It would be better to move the documentation to devdoc output but it would require patching meson.build

Is this a convention of nixpkgs? If so, I didn't know. Patched the build file.

jtojnar · 2017-10-13T05:20:36Z

pkgs/development/libraries/libhttpseverywhere/meson.patch

+-  install_subdir(meson.current_build_dir()+'/devhelp/httpseverywhere-'+api+'/httpseverywhere-'+api,
+-                 install_dir: get_option('datadir')+'/devhelp/books')
+  install_subdir(meson.current_build_dir()+'/devdoc/httpseverywhere-'+api+'/httpseverywhere-'+api,
+                 install_dir: get_option('datadir')+'/devdoc/books')


I think we just want install_dir to be join_paths(get_variable('devdoc'), get_option('datadir'), 'devhelp', 'books') or something. Changing the output or command is not necessary.

You should also add outputs = [ "out" "devdoc" ]; to the Nix expression for the derivation to be multi-output.

get_variable does not do, what we want here. There seems to be no possibility to access environment variables in meson, somehow. Any pointers or ideas?

Hmm, apparently meson does not offer access to env vars: mesonbuild/meson#9

For now we should probably just add the outputs attribute and move share/devhelp/books to $devdoc in the setup hook.

Okay, all done now, I think!

jtojnar · 2017-10-29T18:25:08Z

pkgs/development/libraries/libhttpseverywhere/default.nix


  doCheck = true;

  checkPhase = "./httpseverywhere_test";

+  outputs = [ "out" "devdoc" ];
+
+  fixupPhase = ''


The files should be in the same relative path. You can replace the whole fixupPhase with moveToOutput share/devhelp/books $devdoc but it would be best to put it in the setuphook.

how do I put it in there? I don't really get, how the setup-hook works yet.

Just add the line to pkgs/build-support/setup-hooks/multiple-outputs.sh, specifically the _multioutDocs function. It should be called automatically when the outputs attribute is present.

doesn't it automatically remove devdoc

If I understand it correctly, the REMOVE case is for when outputs attribute does not contain devdoc.

Right. _overrideFirst outputDevdoc "devdoc" REMOVE means that developer docs are moved to $devdoc if it exists and removed otherwise.

@sternenseemann The fix is now in nixos-unstable. If you rebase, you no longer need the fixupPhase.

jtojnar · 2017-11-29T21:55:35Z

pkgs/development/libraries/libhttpseverywhere/default.nix

-  major = "0.4";
-  minor = "5";
+  major = "0.6";
+  minor = "1";


0.6.4 was released.

jtojnar · 2017-11-29T21:57:10Z

pkgs/development/libraries/libhttpseverywhere/default.nix

@@ -1,24 +1,33 @@
-{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
+{stdenv, fetchurl, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:


valadoc can be removed, it is part of vala now.

Since Vala 0.38.0

sternenseemann · 2017-12-29T12:52:53Z

@jtojnar everything should be okay now.

Profpatsch · 2017-12-29T13:22:02Z

Cheers!

jtojnar · 2017-12-29T15:03:18Z

Thank you.

sternenseemann force-pushed the master branch from fb3a4fc to def3060 Compare October 12, 2017 14:59

jtojnar requested changes Oct 12, 2017

View reviewed changes

sternenseemann force-pushed the master branch from def3060 to fe125c7 Compare October 13, 2017 03:44

jtojnar reviewed Oct 13, 2017

View reviewed changes

sternenseemann force-pushed the master branch from fe125c7 to cce5974 Compare October 29, 2017 18:10

jtojnar reviewed Oct 29, 2017

View reviewed changes

jtojnar mentioned this pull request Nov 23, 2017

stdenv: Move devhelp books to outputDevdoc #31987

Merged

8 tasks

jtojnar added this to To Do in GNOME Nov 25, 2017

jtojnar moved this from To Do to In Progress in GNOME Nov 29, 2017

jtojnar reviewed Nov 29, 2017

View reviewed changes

sternenseemann force-pushed the master branch from cce5974 to fc0f7d8 Compare December 28, 2017 15:06

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Dec 28, 2017

sternenseemann changed the title ~~libhttpseverywhere: 0.5.4 -> 0.6.1~~ libhttpseverywhere: 0.4.5 -> 0.6.5 Dec 29, 2017

sternenseemann force-pushed the master branch from fc0f7d8 to b2bdb5b Compare December 29, 2017 12:52

libhttpseverywhere: 0.4.5 -> 0.6.5

2b77d47

sternenseemann force-pushed the master branch from b2bdb5b to 2b77d47 Compare December 29, 2017 13:06

Profpatsch merged commit 019c631 into NixOS:master Dec 29, 2017

GNOME automation moved this from In Progress to Done Dec 29, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libhttpseverywhere: 0.4.5 -> 0.6.5 #30352

libhttpseverywhere: 0.4.5 -> 0.6.5 #30352

sternenseemann commented Oct 12, 2017

jtojnar Oct 12, 2017

sternenseemann Oct 13, 2017

jtojnar Oct 12, 2017

sternenseemann Oct 13, 2017

jtojnar Oct 13, 2017

sternenseemann Oct 21, 2017

jtojnar Oct 25, 2017

sternenseemann Oct 29, 2017

jtojnar Oct 29, 2017

sternenseemann Oct 29, 2017

jtojnar Oct 29, 2017

sternenseemann Oct 30, 2017

jtojnar Oct 30, 2017 •

edited

vcunat Nov 23, 2017

jtojnar Nov 29, 2017

jtojnar Nov 29, 2017

jtojnar Nov 29, 2017

sternenseemann Dec 28, 2017

jtojnar Dec 28, 2017

sternenseemann commented Dec 29, 2017

Profpatsch commented Dec 29, 2017

jtojnar commented Dec 29, 2017

		@@ -1,24 +1,33 @@
		{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
		{stdenv, fetchurl, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:

libhttpseverywhere: 0.4.5 -> 0.6.5 #30352

libhttpseverywhere: 0.4.5 -> 0.6.5 #30352

Conversation

sternenseemann commented Oct 12, 2017

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

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

jtojnar Oct 30, 2017 • 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

sternenseemann commented Dec 29, 2017

Profpatsch commented Dec 29, 2017

jtojnar commented Dec 29, 2017

jtojnar Oct 30, 2017 •

edited