diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-05-27 17:16:45 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-05-27 17:16:45 +0200 |
| commit | 52b4ce275fda390172fcce9797300ba0d5a89d59 (patch) | |
| tree | bc65643e9756d6fcc3d8dd58f8b50d59ea3f0ee5 /gnu/packages/irods.scm | |
| parent | 00d8a4116427fb69f79e334bfbf91920a0d871d2 (diff) | |
| parent | b96b82bcd4bc24529941ff74a91432481f1a71b5 (diff) | |
| download | guix-52b4ce275fda390172fcce9797300ba0d5a89d59.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/irods.scm')
| -rw-r--r-- | gnu/packages/irods.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm index 5c9b66000c..a14ac87aa2 100644 --- a/gnu/packages/irods.scm +++ b/gnu/packages/irods.scm @@ -143,7 +143,7 @@ ("boost" ,boost-for-irods) ("cppzmq" ,cppzmq) ("fmt" ,fmt-6) - ("json" ,json-modern-cxx) + ("json" ,nlohmann-json) ("libarchive" ,libarchive) ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi ("linux-pam" ,linux-pam) @@ -247,7 +247,7 @@ stored.") ("cppzmq" ,cppzmq) ("fmt" ,fmt-6) ("irods" ,irods) - ("json" ,json-modern-cxx) + ("json" ,nlohmann-json) ("libarchive" ,libarchive) ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi ("mit-krb5" ,mit-krb5) |