diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-01 14:17:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-01 14:17:46 +0200 |
| commit | b23038dd801fcbfad2980664758d820b29abebae (patch) | |
| tree | a743ff1a9428dea20b791e9556a32a077293ad41 /pkgs/desktops/gnome-3/3.16 | |
| parent | 96e1b7eaf9eaaa3592906a97e0c3cc4a4552769c (diff) | |
| parent | 562851a0680c35ecc34e59976e2f8eabe142dca6 (diff) | |
| download | nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar.gz nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar.bz2 nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar.lz nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar.xz nixlib-b23038dd801fcbfad2980664758d820b29abebae.tar.zst nixlib-b23038dd801fcbfad2980664758d820b29abebae.zip | |
Merge remote-tracking branch 'origin/master' into systemd-219
Diffstat (limited to 'pkgs/desktops/gnome-3/3.16')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 8251526bbd51..d84713903823 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -369,12 +369,13 @@ let gitg = callPackage ./misc/gitg { webkitgtk = webkitgtk24x; + libgit2 = pkgs.libgit2_0_21; }; libgda = callPackage ./misc/libgda { }; libgit2-glib = callPackage ./misc/libgit2-glib { - libgit2 = pkgs.libgit2.override { libssh2 = null; }; + libgit2 = pkgs.libgit2_0_21.override { libssh2 = null; }; }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix index dee9caf444c5..6563f7979700 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.3.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib |