Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c547c03c9003
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 025960d22964
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 5, 2019

  1. libchamplain: 0.12.16 → 0.12.19 

    Mainly meson port.

https://mail.gnome.org/archives/libchamplain-list/2019-February/msg00001.html
https://mail.gnome.org/archives/libchamplain-list/2019-February/msg00002.html
https://mail.gnome.org/archives/libchamplain-list/2019-March/msg00000.html
    @jtojnar
    jtojnar committed Mar 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b8c1d9 View commit details

  2. evolution-data-server: propagate libsoup 

    It is required by libedataserver-1.2
    @jtojnar
    jtojnar committed Mar 5, 2019
    Copy the full SHA
    025960d View commit details
Showing with 16 additions and 12 deletions.
  1. +1 −1 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
  2. +15 −11 pkgs/development/libraries/libchamplain/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libcanberra-gtk3 pcre
];

propagatedBuildInputs = [ libsecret nss nspr libical db ];
propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ];

cmakeFlags = [
"-DENABLE_UOA=OFF"
26 changes: 15 additions & 11 deletions pkgs/development/libraries/libchamplain/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
, clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:

let
pname = "libchamplain";
version = "0.12.16";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libchamplain";
version = "0.12.19";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "191aid1qsfkab5whbzj2r3g63dpdgrwp5141mfywvqyvdhr2x11n";
};

outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];

nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];

buildInputs = [ sqlite libsoup ];

nativeBuildInputs = [ pkgconfig gobject-introspection ];
propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk ];

propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];
mesonFlags = [
"-Dgtk_doc=true"
"-Dvapi=true"
];

passthru = {
updateScript = gnome3.updateScript {