From 87e008d538c637ae36686416245bfc11ed6ae91a Mon Sep 17 00:00:00 2001
From: Andrew Miloradovsky <miloradovsky@gmail.com>
Date: Fri, 22 Jul 2016 16:22:06 +0000
Subject: [PATCH] guile-gnome-platform: 20150123 -> 2.16.4
No more `git clone`. Fetch a tarball.
---
lib/maintainers.nix | 1 +
.../guile-modules/guile-gnome/default.nix | 17 ++++++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 56816bb206c2..f4ca38a0597d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -432,4 +432,5 @@
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
zohl = "Al Zohali <zohl@fmap.me>";
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
+ amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
}
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index c58e37da4a61..a70049094da7 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,15 +1,14 @@
-{ fetchgit, stdenv, guile, guile_lib, gwrap
+{ fetchurl, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnome_vfs, gtk
, libglade, libgnome, libgnomecanvas, libgnomeui
, pango, guileCairo, autoconf, automake, texinfo }:
stdenv.mkDerivation rec {
- name = "guile-gnome-platform-20150123";
+ name = "guile-gnome-platform-2.16.4";
- src = fetchgit {
- url = "git://git.sv.gnu.org/guile-gnome.git";
- rev = "0fcbe69797b9501b8f1283a78eb92bf43b08d080";
- sha256 = "19nsxwhrmrs9n16sb99pgy6zp6zpvmsd285kcjb54y362li7yc83";
+ src = fetchurl {
+ url = "http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz";
+ sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
};
buildInputs = [
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
# The test suite tries to open an X display, which fails.
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
description = "GNOME bindings for GNU Guile";
longDescription =
@@ -51,8 +50,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/guile-gnome/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.taktoa ];
+ maintainers = with maintainers; [ taktoa amiloradovsky ];
};
}