diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/glib.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cfbe81f20f..c45c7d4937 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -624,21 +624,6 @@ It also contains adaptor classes for connection of dissimilar callbacks and has an ease of use unmatched by other C++ callback libraries.") (license license:lgpl2.1+))) -(define-public libsigc++-2 - (package - (inherit libsigc++) - (name "libsigc++") - (version "2.10.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://gnome/sources/libsigc++/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b")))))) - (define glibmm (package (name "glibmm") @@ -697,7 +682,7 @@ useful for C++.") (sha256 (base32 "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7")))) (propagated-inputs - `(("libsigc++" ,libsigc++-2) + `(("libsigc++" ,libsigc++) ("glib" ,glib))))) (define-public python2-pygobject-2 @@ -955,7 +940,7 @@ programming language. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.17") + (version "0.7.18") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -963,7 +948,7 @@ programming language. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw")))) + "00j0kkgf224nzmrha72g8pd72mymhph7vaisj35i4ffy7cpd47na")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) |