diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/datastructures.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/datastructures.scm')
| -rw-r--r-- | gnu/packages/datastructures.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 5eca507a187..4973ce98aff 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm | |||
| @@ -140,14 +140,14 @@ in between these sequences may be different in both content and length.") | |||
| 140 | (define-public liburcu | 140 | (define-public liburcu |
| 141 | (package | 141 | (package |
| 142 | (name "liburcu") | 142 | (name "liburcu") |
| 143 | (version "0.12.2") | 143 | (version "0.13.0") |
| 144 | (source (origin | 144 | (source (origin |
| 145 | (method url-fetch) | 145 | (method url-fetch) |
| 146 | (uri (string-append "https://www.lttng.org/files/urcu/" | 146 | (uri (string-append "https://www.lttng.org/files/urcu/" |
| 147 | "userspace-rcu-" version ".tar.bz2")) | 147 | "userspace-rcu-" version ".tar.bz2")) |
| 148 | (sha256 | 148 | (sha256 |
| 149 | (base32 | 149 | (base32 |
| 150 | "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf")))) | 150 | "085s437nig6bdiv9im4k4qwqbrbnc4qw9flqi16jlb493az0vcnb")))) |
| 151 | (build-system gnu-build-system) | 151 | (build-system gnu-build-system) |
| 152 | (native-inputs | 152 | (native-inputs |
| 153 | `(("perl" ,perl))) ; for tests | 153 | `(("perl" ,perl))) ; for tests |
