From 51a59b34d333e79c57b70ece77f92d2b6e0e0abd Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 15:53:42 -0500 Subject: [PATCH 1/3] haskell-hsbencher and haskell-GenericPretty: add packages --- .../haskell/GenericPretty/default.nix | 15 +++++++++++++ .../libraries/haskell/hsbencher/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/haskell/GenericPretty/default.nix create mode 100644 pkgs/development/libraries/haskell/hsbencher/default.nix diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix new file mode 100644 index 000000000000..d2b8fedfc5e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/GenericPretty/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "GenericPretty"; + version = "1.2.1"; + sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php"; + meta = { + homepage = "https://github.com/RazvanRanca/GenericPretty"; + description = "A generic, derivable, haskell pretty printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix new file mode 100644 index 000000000000..6103fc9cddfe --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, dataDefault, filepath, GenericPretty, HUnit +, ioStreams, mtl, random, testFramework, testFrameworkHunit, text +, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher"; + version = "1.20.0.2"; + sha256 = "1ydx70ik48s9fsn51snpl4aq7imfwgqmfin46sqpz0xlcyxs040z"; + buildDepends = [ + async dataDefault filepath GenericPretty ioStreams mtl random time + ]; + testDepends = [ HUnit testFramework testFrameworkHunit text time ]; + doCheck = false; + meta = { + description = "Launch and gather data from Haskell and non-Haskell benchmarks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e41c22b34d49..f751b2a35045 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -900,6 +900,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + GenericPretty = callPackage ../development/libraries/haskell/GenericPretty {}; + genericsSop = callPackage ../development/libraries/haskell/generics-sop {}; ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; @@ -1247,6 +1249,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hS3 = callPackage ../development/libraries/haskell/hS3 {}; + hsbencher = callPackage ../development/libraries/haskell/hsbencher {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hsc3 = callPackage ../development/libraries/haskell/hsc3 {}; From 822d37f5a4d82ea10758cd5b07b4852caab9de65 Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 17:13:54 -0500 Subject: [PATCH 2/3] haskell-handa-gdata and haskell-hsbencher-fusion: add packages --- .../libraries/haskell/handa-gdata/default.nix | 27 +++++++++++++++++++ .../haskell/hsbencher-fusion/default.nix | 23 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/haskell/handa-gdata/default.nix create mode 100644 pkgs/development/libraries/haskell/hsbencher-fusion/default.nix diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix new file mode 100644 index 000000000000..b96c68297cbb --- /dev/null +++ b/pkgs/development/libraries/haskell/handa-gdata/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs +, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json +, network, pureMD5, random, regexPosix, resourcet, split, time +, unixCompat, utf8String, xml +}: + +cabal.mkDerivation (self: { + pname = "handa-gdata"; + version = "0.7.0.1"; + sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base64Bytestring binary caseInsensitive cmdargs dataDefault + filepath GenericPretty HTTP httpConduit json network pureMD5 random + regexPosix resourcet split time unixCompat utf8String xml + ]; + doCheck = false; + meta = { + homepage = "http://code.google.com/p/hgdata"; + description = "Library and command-line utility for accessing Google services and APIs"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix new file mode 100644 index 000000000000..c045cf8e720d --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, criterion, csv, dataDefault, filepath, handaGdata +, hsbencher, httpConduit, mtl, network, statistics, text, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher-fusion"; + version = "0.3.3"; + sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + criterion csv dataDefault filepath handaGdata hsbencher httpConduit + mtl network statistics text time + ]; + doCheck = false; + meta = { + description = "Backend for uploading benchmark data to Google Fusion Tables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f751b2a35045..c7860bb99a1b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1146,6 +1146,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + handaGdata = callPackage ../development/libraries/haskell/handa-gdata {}; + haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; haxl = callPackage ../development/libraries/haskell/haxl {}; @@ -1251,6 +1253,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsbencher = callPackage ../development/libraries/haskell/hsbencher {}; + hsbencherFusion = callPackage ../development/libraries/haskell/hsbencher-fusion {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hsc3 = callPackage ../development/libraries/haskell/hsc3 {}; From 055eeb6c514c967a79513e06747820987d2b6afd Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 18:08:53 -0500 Subject: [PATCH 3/3] haskell-hsbencher: update to 1.20.0.3 --- pkgs/development/libraries/haskell/hsbencher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix index 6103fc9cddfe..0786aa18b3c3 100644 --- a/pkgs/development/libraries/haskell/hsbencher/default.nix +++ b/pkgs/development/libraries/haskell/hsbencher/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hsbencher"; - version = "1.20.0.2"; - sha256 = "1ydx70ik48s9fsn51snpl4aq7imfwgqmfin46sqpz0xlcyxs040z"; + version = "1.20.0.3"; + sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl"; buildDepends = [ async dataDefault filepath GenericPretty ioStreams mtl random time ];