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: 025881c23649
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e8a13f7e5c0
Choose a head ref
  • 8 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 28, 2018

  1. shotwell: 0.28.0 → 0.28.1

    jtojnar committed Mar 28, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    30f8c93 View commit details
  2. orca: 3.27.91 → 3.28.0

    jtojnar committed Mar 28, 2018

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    globin’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    1449a47 View commit details
  3. evince: add comic support

    jtojnar committed Mar 28, 2018

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    globin’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    78190d2 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    6d1c022 View commit details
  5. Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    globin’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    5d4f602 View commit details
  6. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    d70b9e4 View commit details
  7. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    9ccc726 View commit details
  8. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    6e8a13f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/shotwell/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

let
pname = "shotwell";
version = "0.28.0";
version = "0.28.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/orca/default.nix
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@
with lib;
let
pname = "orca";
version = "3.27.91";
version = "3.28.0";
in buildPythonApplication rec {
name = "${pname}-${version}";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/evince/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, intltool, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook
, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
, librsvg, gobjectIntrospection, yelp-tools
, recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 pango atk gdk_pixbuf libxml2
gnome3.gsettings-desktop-schemas
poppler ghostscriptX djvulibre libspectre
poppler ghostscriptX djvulibre libspectre libarchive
libsecret librsvg gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional supportXPS gnome3.libgxps;

4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "gnome-keyring-${version}";
version = "3.28.0.1";
version = "3.28.0.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i";
sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

let
pname = "gnome-themes-extra";
version = "3.27.92";
version = "3.28";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm";
sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/libgweather/default.nix
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@

let
pname = "libgweather";
version = "3.28.0";
version = "3.28.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/misc/gpaste/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:

stdenv.mkDerivation rec {
version = "3.28.0";
version = "3.28.1";
name = "gpaste-${version}";

src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir";
sha256 = "19rdi2syshrk32hqnjh63fm0wargw546j5wlsnsg1axml0x1xww9";
};

nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

let
pname = "libgnome-games-support";
version = "1.4.0";
version = "1.4.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
};

nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;