From 502f13d625cc0f1d8a8d8488e9f79e6abc9a2eb5 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 1 Oct 2015 21:51:41 +0200 Subject: [PATCH 1/6] sbcl: 1.2.15 -> 1.2.16 --- 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 661279db1a9..a865b7e1d4b 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.2.15"; + version = "1.2.16"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0l8nrf5qnr8c9hr6bn1kd86mnr2s37b493azh9rrk3v59f56wnnr"; + sha256 = "08bg99dhjpvfi3fg4ak6c8kcrfb2ssdsfwwj46nfwniq0jmavacf"; }; buildInputs = [ which ]; From 047d7c6f03a42389a50bbecb9698293a5e7f4788 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 1 Oct 2015 21:57:28 +0200 Subject: [PATCH 2/6] cmucl: fix on x86_64-linux --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b04283b945b..dcd15c789cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3710,7 +3710,7 @@ let closurecompiler = callPackage ../development/compilers/closure { }; - cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; compcert = callPackage ../development/compilers/compcert ( if system == "x86_64-linux" From 7b252d94a6e9fb8a8f74dfb4fe1cb2c3fc196f9f Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 1 Oct 2015 22:00:36 +0200 Subject: [PATCH 3/6] cmucl: 20b -> 21a --- pkgs/development/compilers/cmucl/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 027857ccda0..1276b1500a1 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -2,7 +2,7 @@ let inherit (stdenv) system; - version = "20b"; + version = "21a"; downloadUrl = arch: "http://common-lisp.net/project/cmucl/downloads/release/" + "${version}/cmucl-${version}-${arch}.tar.bz2"; @@ -13,7 +13,7 @@ let dist = if system == "i686-linux" then fetchDist { arch = "x86-linux"; - sha256 = "1s00r1kszk5zhmv7m8z5q2wcqjn2gn7fbqwji3hgnsdvbb1f3jdn"; + sha256 = "0w8dcaiasfd4fbj340zaf6wcjfgc4wzkvr24gbxa5rr3aw10rl02"; } else throw "Unsupported platform for cmucl."; in From da8b05363b339e6bbe6b9f38ce6275643ba6798b Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sat, 3 Oct 2015 00:15:13 +0200 Subject: [PATCH 4/6] sbclBootstrap: don't patchelf on darwin https://github.com/NixOS/nixpkgs/commit/00935b25541bea0d6324e08e2e3821ac5cad09fd#commitcomment-13552300 --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 0b5b48e088e..6e9124af611 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm) '' + postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; From 3a4db8d7e54ed53b7028d7f1ba23c37eb3a5d618 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sat, 3 Oct 2015 00:45:30 +0200 Subject: [PATCH 5/6] gtk-server: added --- .../interpreters/gtk-server/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/interpreters/gtk-server/default.nix diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix new file mode 100644 index 00000000000..34ca504259e --- /dev/null +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libffcall, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + v = "2.3.1"; + name = "gtk-server-${v}"; + + src = fetchurl { + url = "mirror://sourceforge/gtk-server/${name}-sr.tar.gz"; + sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb"; + }; + + buildInputs = [ libffcall gtk2 pkgconfig ]; + + configureOptions = [ "--with-gtk2" ]; + + meta = { + description = "gtk-server for interpreted GUI programming"; + homepage = "http://www.gtk-server.org/"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcd15c789cc..d78ff602cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3994,6 +3994,8 @@ let gforth = callPackage ../development/compilers/gforth {}; + gtk-server = callPackage ../development/interpreters/gtk-server {}; + # Haskell and GHC haskell = callPackage ./haskell-packages.nix { }; From 37eda842f6c78d93f20443d33823e677fef0f5c1 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sat, 3 Oct 2015 01:51:46 +0200 Subject: [PATCH 6/6] picolisp: exec in shell there is no need to keep the shell around --- pkgs/development/interpreters/picolisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index c43a3ce2429..cc9cac3a47f 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cat >"$out/bin/pil" <