public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from basvandijk/update-ghcjs

Browse Source 
Update ghcjs
This commit is contained in:
ryantrinkle
2014-11-30 12:35:52 -05:00
parent 3973b89247 f16e4508f4
commit ec3ea85bb0
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghcjs/0.1.0.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm { cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
, zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable , zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable
, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_9_1_1 , haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_11_0_1,
, parallel, safe, shelly, split, stringsearch, syb, systemFileio , parallel, safe, shelly, split, stringsearch, syb, systemFileio
, systemFilepath, tar, terminfo, textBinary, unorderedContainers , systemFilepath, tar, terminfo, textBinary, unorderedContainers
, vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall
@@ -34,7 +34,7 @@ cabal.mkDerivation (self: rec {
buildDepends = [ buildDepends = [
filepath HTTP mtl network random stm time zlib aeson attoparsec filepath HTTP mtl network random stm time zlib aeson attoparsec
bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta
lens optparseApplicative_0_9_1_1 parallel safe shelly split lens optparseApplicative_0_11_0_1 parallel safe shelly split
stringsearch syb systemFileio systemFilepath tar terminfo textBinary stringsearch syb systemFileio systemFilepath tar terminfo textBinary
unorderedContainers vector wlPprintText yaml unorderedContainers vector wlPprintText yaml
alex happy git gnumake gcc autoconf automake libtool patch gmp alex happy git gnumake gcc autoconf automake libtool patch gmp
pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
+16
View File
@@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiWlPprint, transformers, transformersCompat }:
cabal.mkDerivation (self: {
pname = "optparse-applicative";
version = "0.11.0.1";
sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9";
buildDepends = [ ansiWlPprint transformers transformersCompat ];
meta = {
homepage = "https://github.com/pcapriotti/optparse-applicative";
description = "Utilities and combinators for parsing command line options";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/tools/haskell/ghcjs/default.nix
+4 -4
View File
@@ -1,7 +1,7 @@
{ nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm { nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
, zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable , zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable
, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_9_1_1 , haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_11_0_1
, parallel, safe, shelly, split, stringsearch, syb, systemFileio , parallel, safe, shelly, split, stringsearch, syb, systemFileio
, systemFilepath, tar, terminfo, textBinary, unorderedContainers , systemFilepath, tar, terminfo, textBinary, unorderedContainers
, vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall
@@ -15,8 +15,8 @@ cabal.mkDerivation (self: rec {
version = "0.1.0"; version = "0.1.0";
src = fetchgit { src = fetchgit {
url = git://github.com/ghcjs/ghcjs.git; url = git://github.com/ghcjs/ghcjs.git;
rev = "bd3dfe56d55fd046bfbec4d9d834af4f46595535"; rev = "5c2d279982466e076223fcbe1e1096e22956e5a9";
sha256 = "82c37faf725a230945d71c617be259c94a0816d240663714c3a62b85e4a2b731"; sha256 = "0bc37b4e8bd039208a126fea39850c99459265cb273ac7237939cdbaee6ef71f";
}; };
shims = fetchgit { shims = fetchgit {
url = git://github.com/ghcjs/shims.git; url = git://github.com/ghcjs/shims.git;
@@ -41,7 +41,7 @@ cabal.mkDerivation (self: rec {
buildDepends = [ buildDepends = [
filepath HTTP mtl network random stm time zlib aeson attoparsec filepath HTTP mtl network random stm time zlib aeson attoparsec
bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta
lens optparseApplicative_0_9_1_1 parallel safe shelly split lens optparseApplicative_0_11_0_1 parallel safe shelly split
stringsearch syb systemFileio systemFilepath tar terminfo textBinary stringsearch syb systemFileio systemFilepath tar terminfo textBinary
unorderedContainers vector wlPprintText yaml unorderedContainers vector wlPprintText yaml
alex happy git gnumake gcc autoconf automake libtool patch gmp alex happy git gnumake gcc autoconf automake libtool patch gmp
pkgs/top-level/haskell-packages.nix
+1
View File
@@ -1835,6 +1835,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {}; optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {};
optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {}; optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {};
optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {};
optparseApplicative = self.optparseApplicative_0_10_0; optparseApplicative = self.optparseApplicative_0_10_0;
pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pathPieces = callPackage ../development/libraries/haskell/path-pieces {};