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

Commits on Apr 1, 2019

  1. squash! shotwell: fix eval 

    shotwell: 0.30.2 -> 0.31.0
    @worldofpeace
    worldofpeace committed Apr 1, 2019
    Copy the full SHA
    b9f8a4d View commit details

  2. squash! gnome3.gnome-online-accounts: 3.30.2 -> 3.31.90 

    gnome3.gnome-online-accounts: 3.30.2 -> 3.32.0

https://gitlab.gnome.org/GNOME/gnome-online-accounts/blob/3.32.0/NEWS
    @worldofpeace
    worldofpeace committed Apr 1, 2019
    Copy the full SHA
    27b6645 View commit details
Showing with 4 additions and 12 deletions.
  1. +2 −10 pkgs/applications/graphics/shotwell/default.nix
  2. +2 −2 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
12 changes: 2 additions & 10 deletions pkgs/applications/graphics/shotwell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,21 +37,13 @@

stdenv.mkDerivation rec {
pname = "shotwell";
version = "0.30.2";
version = "0.31.0";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r";
sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx";
};

patches = [
# fix building against gexiv2 0.12
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/shotwell/commit/318c30394f4661e8d96e4fd906356a0736a30504.patch;
sha256 = "0wnvdia25dw7wzr0ix5y26mrfpli8jxc8w9rywrd988q3zr1y54g";
})
];

nativeBuildInputs = [
meson
ninja
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

let
pname = "gnome-online-accounts";
version = "3.31.90";
version = "3.32.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0w2jirjcaqc4r5mgmwk1cgq864xa0qnly6yrpdcllgg3sj7x4hsx";
sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w";
};

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