New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
json-c: 0.13.1 -> 0.14 #90883
json-c: 0.13.1 -> 0.14 #90883
Conversation
@ofborg build freeradius ttyd drm_info tpm2-tss opae libvmi libmypaint libubox libndctl liblognorm google-compute-engine-oslogin hubicfuse snapper yubikey-personalization zmap mpw syslogng rsyslog uqmi ntopng fastd netifd nfstrace solvespace mypaint sway ptask pianobar girara fwts bluez health-check multipath-tools shogun postgis kernelshark rpm-ostree was broken already |
rpm-ostree should be fixed by 508a132 |
Thanks, with 508a132 rpm-ostree builds fine against json-c-0.14. |
Looks great.
Some extra patches:
looks like a linking error but Void did not need any patch void-linux/void-packages@701b122 |
Building zmap with ninja gives us more info:
Looks like the Cflags are joined using semicolong for some reason, curiously causing a linking error. Removing the diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 636c913c7d6..2805480588c 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ postFixup = ''
+ substituteInPlace "$dev/lib/pkgconfig/json-c.pc" --replace 'Cflags: -I''${includedir}' 'Cflags:'
+ '';
+
meta = with stdenv.lib; {
description = "A JSON implementation in C";
homepage = "https://github.com/json-c/json-c/wiki"; |
Nice, thanks for the clue. Looks like it's a bug in the upstream CMakefile.txt, opened a PR: zmap/zmap#609. |
Only cryptsetup remains on 0.13.1 now. Unfortunately the upstream commits do not apply cleanly to our version. Looking at the difficulties Fedora had I'd suggest waiting for cryptsetup update to 2.3.3 (#91017) which is compatible with json-c-0.14. |
please rebase |
Rebased & dropped the newsboat commit because it's no longer needed. |
Dropped the cryptsetup commit (#91017 is merged) and the json-c 0.13 version because it's no longer needed. |
Thanks. |
Changes: https://github.com/json-c/json-c/blob/json-c-0.14-20200419/ChangeLog
Not really sure how to do library upgrade where some packages depend on the old version (until upstream fixes it). Most packages need no changes, I've included patches for those that have them in master, and made the rest to depend on the old version. Let me know is some other structure is preferred.
Motivation for this change
New version of popular library.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)