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: 5370f3ebf504
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f31a21f87c2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 2, 2019

  1. appstream-glib: 0.7.14 -> 0.7.15 

    https://github.com/hughsie/appstream-glib/blob/appstream_glib_0_7_15/NEWS
    @dtzWill @worldofpeace
    dtzWill authored and worldofpeace committed Mar 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e6a4c4a View commit details

  2. Merge pull request #56534 from dtzWill/update/appstream-glib-0.7.15 

    appstream-glib: 0.7.14 -> 0.7.15
    @worldofpeace
    worldofpeace authored Mar 2, 2019
    Copy the full SHA
    6f31a21 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/development/libraries/appstream-glib/default.nix
12 changes: 6 additions & 6 deletions pkgs/development/libraries/appstream-glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
, libuuid, json-glib, meson, gperf, ninja
, libuuid, json-glib, meson, gperf, ninja, gdk_pixbuf
}:
stdenv.mkDerivation rec {
name = "appstream-glib-0.7.14";
name = "appstream-glib-0.7.15";

outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
@@ -13,23 +13,23 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
sha256 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky";
sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m";
};

nativeBuildInputs = [
meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42
meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection
];
buildInputs = [
glib gettext sqlite libsoup
attr acl libuuid json-glib
libarchive gobject-introspection gperf
libarchive gperf gdk_pixbuf
];
propagatedBuildInputs = [ gtk3 ];

patches = [
(substituteAll {
src = ./paths.patch;
pngquant= "${pngquant}/bin/pngquant";
pngquant = "${pngquant}/bin/pngquant";
})
];