diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-01 22:36:22 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-02-02 10:32:37 +0100 |
| commit | 3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9 (patch) | |
| tree | 6202c8ff97f15955ba572892b246c6fc66740107 | |
| parent | e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e (diff) | |
| download | nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar.gz nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar.bz2 nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar.lz nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar.xz nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.tar.zst nixpkgs-3411da7c2f1091ab203e4bc3ae90fcd21c2f6fd9.zip | |
libchamplain: 0.12.20 → 0.12.21
https://gitlab.gnome.org/GNOME/libchamplain/-/compare/LIBCHAMPLAIN_0_12_20...0.12.21 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
| -rw-r--r-- | pkgs/development/libraries/libchamplain/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 34440d67818..1eda49ad3f9 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , meson @@ -23,25 +22,15 @@ stdenv.mkDerivation rec { pname = "libchamplain"; - version = "0.12.20"; + version = "0.12.21"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; + sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac="; }; - patches = lib.optionals withLibsoup3 [ - # Port to libsoup3 - # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; - excludes = [ ".gitlab-ci.yml" ]; - sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; - }) - ]; - - outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja @@ -68,6 +57,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Dvapi=true" + (lib.mesonBool "libsoup3" withLibsoup3) ]; passthru = { |