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: b9c9ff9fb32f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca18f905df34
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 3, 2019

  1. gnome3.seahorse: 3.32.2 -> 3.34 

    * dropped gobject-introspection
    @worldofpeace
    worldofpeace committed Oct 3, 2019

    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
    ca18f90 View commit details
Showing with 49 additions and 23 deletions.
  1. +49 −23 pkgs/desktops/gnome-3/apps/seahorse/default.nix
72 changes: 49 additions & 23 deletions pkgs/desktops/gnome-3/apps/seahorse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,65 @@
{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap, gcr
, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }:
{ stdenv
, fetchurl
, fetchpatch
, vala
, meson
, ninja
, libpwquality
, pkgconfig
, gtk3
, glib
, wrapGAppsHook
, itstool
, gnupg
, libsoup
, gnome3
, gpgme
, python3
, openldap
, gcr
, libsecret
, avahi
, p11-kit
, openssh
, gsettings-desktop-schemas
}:

stdenv.mkDerivation rec {
pname = "seahorse";
version = "3.32.2";
version = "3.34";

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

patches = [
# fix build with recent libsecret
# https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch;
sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj";
})
];

doCheck = true;

nativeBuildInputs = [
meson ninja pkgconfig vala itstool wrapGAppsHook
python3 gobject-introspection
meson
ninja
pkgconfig
vala
itstool
wrapGAppsHook
python3
];

buildInputs = [
gtk3 glib gcr
gsettings-desktop-schemas gnupg
gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit
openssh openldap libpwquality
gtk3
glib
gcr
gsettings-desktop-schemas
gnupg
gnome3.adwaita-icon-theme
gpgme
libsecret
avahi
libsoup
p11-kit
openssh
openldap
libpwquality
];

postPatch = ''