From 8050aa1c806aa9845c7bf4556fa4e097e697c060 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 19 Jul 2015 22:05:32 +0200 Subject: [PATCH] scsh: 0.6.7 -> 0.7 pre-release The scsh HEAD is buildable, whereas 0.6.7 segfaults during image creation. --- .../development/interpreters/scsh/default.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 98b4f55f79b8..ad2bf945f966 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,26 +1,22 @@ -{stdenv, fetchurl}: - -let - pname = "scsh"; - version = "0.6.7"; - name = "${pname}-${version}"; -in +{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }: stdenv.mkDerivation { - inherit name; + name = "scsh-0.7pre"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f"; + src = fetchgit { + url = "git://github.com/scheme/scsh.git"; + rev = "f99b8c5293628cfeaeb792019072e3a96841104f"; + fetchSubmodules = true; + sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp"; }; - meta = { + buildInputs = [ autoconf automake autoreconfHook scheme48 ]; + configureFlags = ''--with-scheme48=${scheme48}''; + + meta = with stdenv.lib; { description = "A Scheme shell"; - longDescription = '' - SCSH is an implementation of the Scheme shell. It is implemented as - a heap image which is interpreted by the Scheme 48 virtual machine. - ''; homepage = http://www.scsh.net/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ joachifm ]; }; }