From c6365ec0df0039746e3b365418bfa2c3dfaf3617 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 30 Nov 2015 22:21:53 +0100
Subject: [PATCH 1/3] sbcl: 1.3.0 -> 1.3.1

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 7b2cadc31d5..ba4378c5935 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
+    sha256 = "0ggdw2wfbl0gmfkcm3qbqvhalfb1r9wfxzmi8fd38s53f7j4grd2";
   };
 
   patchPhase = ''

From 6054d1310833d00b7892f4ba946c8c39a0e1976d Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 30 Nov 2015 22:22:12 +0100
Subject: [PATCH 2/3] libpst: add myself as maintainer

---
 pkgs/development/libraries/libpst/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index d4b602c9017..8fa781c4fda 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.five-ten-sg.com/libpst/;
     description = "A library to read PST (MS Outlook Personal Folders) files";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = [maintainers.tohl];
   };
 }

From 058cd04be485807513092473a4b706243a219e45 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 30 Nov 2015 22:33:44 +0100
Subject: [PATCH 3/3] Revert "sbcl: cleaner xc-host"

This reverts commit 393f0eecaeadf1a8893a3c9c88ea4304f4a309b8.
---
 pkgs/development/compilers/sbcl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index ba4378c5935..87cb5e6fcfd 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost} --disable-debugger --no-userinit --no-sysinit"
+    sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
   '';
 
   installPhase = ''