[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
148/180: gnu: jsoncpp: Apply patch to regular package.
From: |
guix-commits |
Subject: |
148/180: gnu: jsoncpp: Apply patch to regular package. |
Date: |
Fri, 29 Oct 2021 15:57:10 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 2980b01c1c5211348a904a36fd66cccdbc39e8fb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Oct 21 20:24:51 2021 -0400
gnu: jsoncpp: Apply patch to regular package.
* gnu/packages/serialization.scm (jsoncpp)[source]: Apply patch.
(jsoncpp-with-pkg-version): Delete variant package.
* gnu/packages/jami.scm (libring)[inputs]: Adjust accordingly.
---
gnu/packages/jami.scm | 2 +-
gnu/packages/serialization.scm | 21 ++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 7d71837..5cb9284 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -422,7 +422,7 @@
("eudev" ,eudev)
("ffmpeg" ,ffmpeg-jami)
("jack" ,jack-1)
- ("jsoncpp" ,jsoncpp-with-pkg-version)
+ ("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
("libgit2" ,libgit2)
("libnatpmp" ,libnatpmp)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index dc21dba..4501dfb 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -425,6 +425,8 @@ in which the loaded data is arranged in memory.")
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
+ (patches
+ (search-patches "jsoncpp-pkg-config-version.patch"))
(sha256
(base32
"0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))))
@@ -444,25 +446,6 @@ preserve existing comment in unserialization/serialization
steps, making
it a convenient format to store user input files.")
(license license:expat)))
-;; XXX: TODO(core-updates): Remove this package and apply the patch to the
-;; jsoncpp package. This patch fixes the package version declared in the
-;; pkg-config file.
-(define-public jsoncpp-with-pkg-version
- (package
- (inherit jsoncpp)
- (name "jsoncpp")
- (version "1.9.4")
- (home-page "https://github.com/open-source-parsers/jsoncpp")
- (source (origin
- (method git-fetch)
- (uri (git-reference (url home-page) (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))
- (patches
- (search-patches "jsoncpp-pkg-config-version.patch"))))))
-
;; Tensorflow does not build with jsoncpp 1.8.x. It is built with commit
;; 4356d9bba191e1e16ce7a92073cbf3e63564e973, which lies between version 1.7.2
;; and 1.7.3.
- 120/180: gnu: mit-krb5: Absorb 1.19.2 graft., (continued)
- 120/180: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/29
- 129/180: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/29
- 87/180: gnu: gdb: Normalize indentation., guix-commits, 2021/10/29
- 109/180: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 114/180: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/29
- 121/180: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/29
- 135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/29
- 137/180: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/29
- 139/180: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/29
- 144/180: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/29
- 148/180: gnu: jsoncpp: Apply patch to regular package.,
guix-commits <=
- 150/180: gnu: curl: Update to 7.79.1., guix-commits, 2021/10/29
- 97/180: gnu: Add python-flit-core., guix-commits, 2021/10/29
- 100/180: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/29
- 152/180: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/10/29
- 159/180: gnu: gstreamer: Disable the pipelines-seek test., guix-commits, 2021/10/29
- 162/180: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/10/29
- 166/180: gnu: python2-lit: Remove package., guix-commits, 2021/10/29
- 168/180: gnu: Add cling., guix-commits, 2021/10/29
- 170/180: gnu: gtkmm-3: Update to 3.24.5., guix-commits, 2021/10/29
- 110/180: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/29