summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2013-12-30 02:30:55 +0400
committerMichael Raskin <7c6f434c@mail.ru>2013-12-30 02:30:55 +0400
commitd22106ab2d1de5b2f1655c586f467903b234f0fe (patch)
tree1158206483b8dda3bbf4237a5e261a7249e23634 /pkgs
parentb05d8d83101dac7caa24728c3506386cebc2e0a6 (diff)
downloadnixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar.gz
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar.bz2
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar.lz
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar.xz
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.tar.zst
nixpkgs-d22106ab2d1de5b2f1655c586f467903b234f0fe.zip
Update SBCL to 1.1.14
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/sbcl/default.nix8
-rw-r--r--pkgs/development/compilers/sbcl/newglibc.patch43
2 files changed, 4 insertions, 47 deletions
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 34848795d4a..0c653064eac 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -4,11 +4,11 @@ let
   s= # Generated upstream information
   rec {
     baseName="sbcl";
-    version="1.1.13";
+    version="1.1.14";
     name="${baseName}-${version}";
-    hash="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.13/sbcl-1.1.13-source.tar.bz2";
-    sha256="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0";
+    hash="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.1.14/sbcl-1.1.14-source.tar.bz2";
+    sha256="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
   };
   buildInputs = with a; [
     clisp makeWrapper
diff --git a/pkgs/development/compilers/sbcl/newglibc.patch b/pkgs/development/compilers/sbcl/newglibc.patch
deleted file mode 100644
index dbc94b06d4c..00000000000
--- a/pkgs/development/compilers/sbcl/newglibc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fixes for glibc 2.17.
-
-linux-os.c is just a missing header (for personality()).
-
-In x86-64-linux-os.c, __USE_GNU is a glibc-internal name that features.h
-defines; _GNU_SOURCE is what it should actually be using to get GNU extensions.
-
-diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/linux-os.c work/sbcl-1.1.2/src/runtime/linux-os.c
---- tmp/sbcl-1.1.2/src/runtime/linux-os.c	2012-12-01 11:32:38.000000000 +0000
-+++ work/sbcl-1.1.2/src/runtime/linux-os.c	2012-12-31 01:20:37.619000000 +0000
-@@ -46,6 +46,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <linux/version.h>
-+#include <sys/personality.h>
- 
- #include "validate.h"
- #include "thread.h"
-diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c
---- tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c	2012-12-01 11:32:38.000000000 +0000
-+++ work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c	2012-12-31 01:20:25.450000000 +0000
-@@ -14,6 +14,9 @@
-  * files for more information.
-  */
- 
-+/* This is to get REG_RAX etc. from sys/ucontext.h. */
-+#define _GNU_SOURCE
-+
- #include <stdio.h>
- #include <stddef.h>
- #include <sys/param.h>
-@@ -21,11 +24,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <errno.h>
--
--#define __USE_GNU
- #include <sys/ucontext.h>
--#undef __USE_GNU
--
- 
- #include "./signal.h"
- #include "os.h"