From 895ba33eb453de67b407323e0e0efbf42c4dbbec Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:23 +0000
Subject: Guile-Lib 0.1.9.

svn path=/nixpkgs/trunk/; revision=23650
---
 .../guile-modules/guile-lib/default.nix            | 26 ++++++++--------------
 pkgs/top-level/all-packages.nix                    |  2 +-
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index f94bc747811c9..eb69acdef6482 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,31 +1,23 @@
 {stdenv, fetchurl, guile, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.1.6";
+  name = "guile-lib-0.1.9";
+
   src = fetchurl {
-    url = "http://download.gna.org/guile-lib/" + name + ".tar.gz";
-    sha256 = "827744c7954078f1f37e0bf70252ec70b4d60c1482a3542a49bd09723cf65d12";
+    url = "mirror://savannah/guile-lib/${name}.tar.gz";
+    sha256 = "13sc2x9x0rmfgfa69wabyhajc70yiywih9ibszjmkhxcm2zx0gan";
   };
 
   buildInputs = [guile texinfo];
 
-  postInstall = ''
-    # Remove modules already provided by Guile.
-    if "${guile}/bin/guile" -c '(use-modules (srfi srfi-34))'
-    then
-	rm -f "$out/share/guile/site/srfi/srfi-34.scm"
-    fi
-    if "${guile}/bin/guile" -c '(use-modules (srfi srfi-35))'
-    then
-	rm -f "$out/share/guile/site/srfi/srfi-35.scm"
-    fi
-  '';
-
   doCheck = true;
 
   meta = {
     description = "Guile-Library, a collection of useful Guile Scheme modules";
-    homepage = http://home.gna.org/guile-lib/;
-    license = "GPL";
+    homepage = http://www.nongnu.org/guile-lib/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78e4a0c6a72e3..176c88dd5fc8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2210,7 +2210,7 @@ let
       libgnomeui pango;
   };
 
-  guileLib = callPackage ../development/guile-modules/guile-lib { };
+  guile_lib = callPackage ../development/guile-modules/guile-lib { };
 
   windowssdk = (
     import ../development/misc/windows-sdk {
-- 
cgit 1.4.1