From 67af48c42006599675e18d4373386f094c4b6af1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Oct 2014 11:38:20 +0100 Subject: [PATCH] haskell-ihaskell: update to version 0.4.3.0 --- .../tools/haskell/ihaskell/default.nix | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix index 0dd20f30f70..53956a3e098 100644 --- a/pkgs/development/tools/haskell/ihaskell/default.nix +++ b/pkgs/development/tools/haskell/ihaskell/default.nix @@ -1,27 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -# This file was later edited to add patches, disable testing. -# Also patch the profile config to point to the ihaskell kernel exe { cabal, aeson, base64Bytestring, cereal, classyPrelude, cmdargs , filepath, ghcParser, ghcPaths, haskeline, haskellSrcExts, here , hlint, hspec, HTTP, HUnit, MissingH, monoTraversable, mtl, parsec , random, setenv, shelly, split, stm, strict, systemArgv0 , systemFilepath, tar, text, transformers, unorderedContainers -, utf8String, uuid, vector, zeromq4Haskell, fetchpatch +, utf8String, uuid, vector, zeromq4Haskell }: cabal.mkDerivation (self: { pname = "ihaskell"; - version = "0.4.2.0"; - sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c"; + version = "0.4.3.0"; + sha256 = "1k6i56cdzv5ikci20brq7qj07nqdpzkfj7xr69lh1gvx7xb24ida"; isLibrary = true; isExecutable = true; - patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/296.patch"; sha256 = "1h9gxq9l3j949prcwqkdkrc3q3sxai4b345hfp5hfi0mhfbysfn6"; }) ]; - prePatch = '' - tar xvf profile/profile.tar -C profile - sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py - ''; - doCheck = false; buildDepends = [ aeson base64Bytestring cereal classyPrelude cmdargs filepath ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP @@ -29,23 +21,20 @@ cabal.mkDerivation (self: { strict systemArgv0 systemFilepath tar text transformers unorderedContainers utf8String uuid vector zeromq4Haskell ]; - testDepends = [ # let's keep these anyway + testDepends = [ aeson base64Bytestring cereal classyPrelude cmdargs filepath ghcParser ghcPaths haskeline haskellSrcExts here hlint hspec HTTP HUnit MissingH monoTraversable mtl parsec random setenv shelly split stm strict systemArgv0 systemFilepath tar text transformers unorderedContainers utf8String uuid vector zeromq4Haskell ]; - postInstall = '' - patchShebangs . - ''; jailbreak = true; - meta = with self.stdenv.lib; { + doCheck = false; + meta = { homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; - license = licenses.mit; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with self.stdenv.lib.maintainers; [ edwtjo ]; }; })