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

Commits on Nov 27, 2020

  1. geeqie: 1.4.0 -> 1.5.1

    @markus1189 @SuperSandro2000
    markus1189 authored and SuperSandro2000 committed Nov 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    89f75b0 View commit details

  2. Merge pull request #100824 from markus1189/geeqie-1-5-1 

    geeqie: 1.4.0 -> 1.5.1
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05d408e View commit details
Showing with 4 additions and 9 deletions.
  1. +4 −9 pkgs/applications/graphics/geeqie/default.nix
13 changes: 4 additions & 9 deletions pkgs/applications/graphics/geeqie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "geeqie";
version = "1.4";
version = "1.5.1";

src = fetchurl {
url = "http://geeqie.org/${pname}-${version}.tar.xz";
sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28";
};

patches = [
@@ -19,19 +19,14 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";
sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";
})
# Fixes build with exiv2 0.27.1
(fetchpatch {
name = "geeqie-exiv2-0.27.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d";
sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p";
})
];

preConfigure = "./autogen.sh";

nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool
wrapGAppsHook
];

buildInputs = [
gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
];
@@ -63,7 +58,7 @@ stdenv.mkDerivation rec {

homepage = "http://geeqie.sourceforge.net";

maintainers = with maintainers; [ jfrankenau pSub ];
maintainers = with maintainers; [ jfrankenau pSub markus1189 ];
platforms = platforms.gnu ++ platforms.linux;
};
}