From 1af6e5037b61c1939309de22ecac6dc2c95ad0a4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 30 Nov 2014 10:12:35 +0100 Subject: [PATCH 1/2] Update ghcjs --- pkgs/development/tools/haskell/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix index 9bf87014cc9..a5410d3c24b 100644 --- a/pkgs/development/tools/haskell/ghcjs/default.nix +++ b/pkgs/development/tools/haskell/ghcjs/default.nix @@ -15,8 +15,8 @@ cabal.mkDerivation (self: rec { version = "0.1.0"; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "bd3dfe56d55fd046bfbec4d9d834af4f46595535"; - sha256 = "82c37faf725a230945d71c617be259c94a0816d240663714c3a62b85e4a2b731"; + rev = "5c2d279982466e076223fcbe1e1096e22956e5a9"; + sha256 = "0bc37b4e8bd039208a126fea39850c99459265cb273ac7237939cdbaee6ef71f"; }; shims = fetchgit { url = git://github.com/ghcjs/shims.git; From f16e4508f4e9b7c8706875747c405041a5b8052b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 30 Nov 2014 18:08:28 +0100 Subject: [PATCH 2/2] Use optparse-applicative-0.11.0.1 in ghcjs --- pkgs/development/compilers/ghcjs/0.1.0.nix | 4 ++-- .../haskell/optparse-applicative/0.11.0.1.nix | 16 ++++++++++++++++ pkgs/development/tools/haskell/ghcjs/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix diff --git a/pkgs/development/compilers/ghcjs/0.1.0.nix b/pkgs/development/compilers/ghcjs/0.1.0.nix index 2c5d950b5f5..b3e13143dec 100644 --- a/pkgs/development/compilers/ghcjs/0.1.0.nix +++ b/pkgs/development/compilers/ghcjs/0.1.0.nix @@ -1,7 +1,7 @@ { cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , 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 , systemFilepath, tar, terminfo, textBinary, unorderedContainers , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall @@ -34,7 +34,7 @@ cabal.mkDerivation (self: rec { buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec 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 unorderedContainers vector wlPprintText yaml alex happy git gnumake gcc autoconf automake libtool patch gmp diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix new file mode 100644 index 00000000000..0685a51d3b0 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix @@ -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; + }; +}) diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix index a5410d3c24b..f757e63d176 100644 --- a/pkgs/development/tools/haskell/ghcjs/default.nix +++ b/pkgs/development/tools/haskell/ghcjs/default.nix @@ -1,7 +1,7 @@ { nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , 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 , systemFilepath, tar, terminfo, textBinary, unorderedContainers , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall @@ -41,7 +41,7 @@ cabal.mkDerivation (self: rec { buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec 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 unorderedContainers vector wlPprintText yaml alex happy git gnumake gcc autoconf automake libtool patch gmp diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e1597fb8d70..d139f386320 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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_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; pathPieces = callPackage ../development/libraries/haskell/path-pieces {};