From 32fbf27bc364ae3e7e233f5adbc142658e5a1346 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 28 Nov 2013 22:08:19 +0100 Subject: [PATCH] Chicken: Downgrade to latest stable release & add pkgs.chicken-dev. Signed-off-by: Moritz Ulrich --- .../development/compilers/chicken/default.nix | 44 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index deb93257df73..6032c7602cf7 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, devSnapshot ? false }: +let + version = if devSnapshot + then "4.8.2" + else "4.8.0.5"; + srcRelease = fetchurl { + url = "http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz"; + sha256 = "1yrhqirqj3l535zr5mv8d1mz9gq876wwwg4nsjfw27663far54av"; + }; + srcDev = fetchurl { + url = "http://code.call-cc.org/dev-snapshots/2013/08/08/chicken-4.8.2.tar.gz"; + sha256 = "01g7h0664342nl536mnri4c72kwj4z40vmv1250xfndlr218qdqg"; + }; +in stdenv.mkDerivation { - name = "chicken-4.8.1"; + name = "chicken-${version}"; - meta = { - homepage = http://www.call-cc.org/; - description = "Chicken Scheme"; - }; - - src = fetchurl { - url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz; - md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7"; - }; + src = if devSnapshot + then srcDev + else srcRelease; buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; + + meta = { + homepage = http://www.call-cc.org/; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.all; + description = "A portable compiler for the Scheme programming language"; + longDescription = '' + CHICKEN is a compiler for the Scheme programming language. + CHICKEN produces portable and efficient C, supports almost all + of the R5RS Scheme language standard, and includes many + enhancements and extensions. CHICKEN runs on Linux, MacOS X, + Windows, and many Unix flavours. + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c55655966317..4754567e0089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2233,6 +2233,10 @@ let chicken = callPackage ../development/compilers/chicken { }; + chicken-dev = chicken.override { + devSnapshot = true; + }; + ccl = builderDefsPackage ../development/compilers/ccl {}; clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {