From 0695a74c68a5fafcbd89c6f9dfb548651d6f4a71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:31:49 +0200 Subject: [PATCH 1/8] haskell-silently: New package, v1.2.0.2. Let's begin silently and add the first dependency in our ongoing roadmap of butchering missing dependencies leading up to yesod-test: .---- yesod-test -------. | | | | | | .- hspec -. wai-test html-conduit -. | | | | : | | filesystem-conduit : hspec-expectations | : | : tagstream-conduit : : silently <- Yay, our first victim, silently killed by a chainsaw: .,.,.,.,.,.,.||\ ,-. ROAWRR! :::::::::::::: | o O `-' `'`'`'`'`'`'`---` Signed-off-by: aszlig --- .../libraries/haskell/silently/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/silently/default.nix diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix new file mode 100644 index 00000000000..4fb4323bd17 --- /dev/null +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "silently"; + version = "1.2.0.2"; + sha256 = "0qcprbjnh351hc9v12gww478qd4pw7wgpyjj1gmkx4mr80w0qmm1"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/trystan/silently"; + description = "Prevent or capture writing to stdout and other handles"; + 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 30edecc335d..eabe79f14ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1347,6 +1347,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + silently = callPackage ../development/libraries/haskell/silently {}; + skein = callPackage ../development/libraries/haskell/skein {}; smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; From fb5c721cbead4d01120ee6f78431d0a9c6faa521 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:17:44 +0200 Subject: [PATCH 2/8] haskell-hspec-expectations: New package, v0.3.0.2. Let's continue our trip into the ancient realms of yesod-test: .---- yesod-test -------. | | | | | | hspec wai-test html-conduit -. | | | filesystem-conduit | | tagstream-conduit `. . .`-___ ' ' ' `- ` `-'-'._, , ' ______ `', ''' '' `-(o,-` `. , ,'hspec, `' ) ,'' ,' __.-,,_,._,-,,' ,-', expectations `-,===,-'-,-'-,====='-, ,'''' ' `,,==-,-'-,-======,-'---' ,' -,-,-,-,,_ `-,__ '', ` ' ' ' /'/' `-,-.__`-,' )' Signed-off-by: aszlig --- .../haskell/hspec-expectations/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-expectations/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix new file mode 100644 index 00000000000..bd2d4d290ee --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -0,0 +1,14 @@ +{ cabal, HUnit }: + +cabal.mkDerivation (self: { + pname = "hspec-expectations"; + version = "0.3.0.2"; + sha256 = "1jwwi4pbv0pc88vdg5y0ljjq41sha4v4y5qaxi6qms7rl6cp4qkr"; + buildDepends = [ HUnit ]; + meta = { + homepage = "https://github.com/sol/hspec-expectations#readme"; + description = "Catchy combinators for HUnit"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eabe79f14ca..cd502e2f6d2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -940,6 +940,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; From ecceb38bfbcea0f795cc0641e0cb8174e4652d92 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:16:01 +0200 Subject: [PATCH 3/8] haskell-hspec: New package, v1.3.0. Well, we now have a direct dependency of yesod-test, things are coming close, almost TOO close. But we still have a long journey ahead. .---- yesod-test -------. | | | | | | : wai-test html-conduit -. : | | : | filesystem-conduit : | . | . tagstream-conduit . ,-.,-.,-.-,-.-,.-,-.,-.,-. ( down with the s^Hhspec! ) ,--. ,'`-'-`-'`-'-`-'--'-`-'-`-' |o o| `-'\. [|]-' \.-` .'. `\ | | '` | | | | \| hspec Signed-off-by: aszlig --- .../libraries/haskell/hspec/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec/default.nix diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix new file mode 100644 index 00000000000..1a22ff5df0d --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -0,0 +1,21 @@ +{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit +, QuickCheck, silently, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec"; + version = "1.3.0"; + sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal filepath hspecExpectations HUnit QuickCheck silently + time transformers + ]; + meta = { + homepage = "http://hspec.github.com/"; + description = "Behavior Driven Development for Haskell"; + 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 cd502e2f6d2..9534a72fcc4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -940,6 +940,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; + hspec = callPackage ../development/libraries/haskell/hspec {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; From b0522b53cd2658d28e0d6b5e7eb0950e2bc08e61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:36:05 +0200 Subject: [PATCH 4/8] haskell-filesystem-conduit: New package, v0.5.0.1. A fresh delivery of filesystem conduits just arrived, so we just have to add tagstream-conduit and we just have direct dependencies left. .- yesod-test -. | | wai-test | ,-------. html-conduit | FOOD! | | | ______/ tagstream-conduit |/` ._________________________. | | ,'`--__T__T__T_`:: | FILESYSTEM CONDUIT(S) | Vvvv. --------) _________,-': ...`-'`-'.............`-'`-'.........\^^^^_,'`-'.`-'`-'.: `""" Signed-off-by: aszlig --- .../haskell/filesystem-conduit/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/filesystem-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix new file mode 100644 index 00000000000..3e6252a4e00 --- /dev/null +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -0,0 +1,17 @@ +{ cabal, conduit, systemFileio, systemFilepath, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "filesystem-conduit"; + version = "0.5.0.1"; + sha256 = "1rpyrvs9hsi86zj6rghv91jn5lcx9wppg1wa4gp976kmagd4wl93"; + buildDepends = [ + conduit systemFileio systemFilepath text transformers + ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Use system-filepath data types with conduits"; + 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 9534a72fcc4..d8de1b65864 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -712,6 +712,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); filestore = callPackage ../development/libraries/haskell/filestore {}; + filesystemConduit = callPackage ../development/libraries/haskell/filesystem-conduit {}; + fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; From a4d82a227364112c89270c602c4d00d613388bbf Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:37:28 +0200 Subject: [PATCH 5/8] haskell-tagstream-conduit: New package, v0.5.2. So, look at how small we chopped our little tree, we finally got all dependencies for html-conduit: .- yesod-test -. | | wai-test html-conduit ___ <' `> <' ,.., `> |----------.. < `-'`-' > | conduit `. `< ^^ > |--------. | \vvvvv/' | | TAGSTREAM `^^^^^' Signed-off-by: aszlig --- .../haskell/tagstream-conduit/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tagstream-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix new file mode 100644 index 00000000000..2f22f8e905d --- /dev/null +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit +, text +}: + +cabal.mkDerivation (self: { + pname = "tagstream-conduit"; + version = "0.5.2"; + sha256 = "12hg9khc670499c3ymc0s4xd2sg71grlk21ykqmby972dva77vxr"; + buildDepends = [ + attoparsec blazeBuilder blazeBuilderConduit conduit text + ]; + meta = { + homepage = "http://github.com/yihuang/tagstream-conduit"; + description = "streamlined html tag parser"; + 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 d8de1b65864..15e70693861 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1467,6 +1467,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; + tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; From 86f00072caa1a7e8589ad089e086b7808b2ea012 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:34:06 +0200 Subject: [PATCH 6/8] haskell-html-conduit: New package, v0.1.0.2. ~~_-~,----.~- ~~-,' `.~- ,' | / | `. ,',' |`. | `,','/'\ | | | .'~`| |. .| |~`|' : (`-') (`-') : : `'~ ~~`' : "OMG! They killed html-conduit!" : `' /^\ () : Let's see what we have left: : ()`'~`' ,, : : ,_--_--_. : yesod-test `. '/ HTML! \` : | `.'~\_---_/~` : wai-test `._ _.' | ~~~~~~~| :.:.::.::: : :"::"' Signed-off-by: aszlig --- .../haskell/html-conduit/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/html-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix new file mode 100644 index 00000000000..b3482292b04 --- /dev/null +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -0,0 +1,19 @@ +{ cabal, conduit, filesystemConduit, resourcet, systemFilepath +, tagstreamConduit, text, transformers, xmlConduit, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "html-conduit"; + version = "0.1.0.2"; + sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4"; + buildDepends = [ + conduit filesystemConduit resourcet systemFilepath tagstreamConduit + text transformers xmlConduit xmlTypes + ]; + meta = { + homepage = "https://github.com/snoyberg/xml"; + description = "Parse HTML documents using xml-conduit datatypes"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15e70693861..e41d6031695 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -951,6 +951,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; html = self.html_1_0_1_2; + htmlConduit = callPackage ../development/libraries/haskell/html-conduit {}; + httpConduit = callPackage ../development/libraries/haskell/http-conduit {}; httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; From afe407545feaac9bd4bde8bb44c57bb5b2a838a9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:38:37 +0200 Subject: [PATCH 7/8] haskell-wai-test: New package, v1.3.0. ::::::: .||||||| /"""""""""". ,` `. | wai test? | | ,". .-, | ____) because! | | `-` `-' | `---------------' `. ,----. ,' `----./' Now guess what we have left? Just one single destination: , : .___. _ _ .___. ,'-.,-' ___ ,---' ,-. ,--: | | | | | | | | | :: ,'.,-' `--. : : : : | _ | :: `-,-- .--' `--' `--' | |_| | | I have to admit, that i got lazy wthi the ASCII drawings in this commit, but well... isn't this all about lazy ev Signed-off-by: aszlig --- .../libraries/haskell/wai-test/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-test/default.nix diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix new file mode 100644 index 00000000000..0c9b8eb2eb8 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, cookie, httpTypes, HUnit, text, transformers, wai +}: + +cabal.mkDerivation (self: { + pname = "wai-test"; + version = "1.3.0"; + sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + buildDepends = [ + blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie + httpTypes HUnit text transformers wai + ]; + meta = { + homepage = "http://www.yesodweb.com/book/wai"; + description = "Unit test framework (built on HUnit) for WAI applications"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e41d6031695..49e076902dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1590,6 +1590,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; + waiTest = callPackage ../development/libraries/haskell/wai-test {}; + warp = callPackage ../development/libraries/haskell/warp {}; WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { From 8f29e4edb3ecf410ac9c42803613b6564fc466b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:39:27 +0200 Subject: [PATCH 8/8] haskell-yesod-test: New package, version 0.3.0. You might have noticed, that the commit summary always abbreviated "version". That's no coincidence, as we want to empathize that our goal is (or was) yesod-test, right? /\ `.,' .''. ,`, () HOORAY! ,''. `,.' `,' () ___ __ ()_ __ `,' _(*__)(__) __\##/)(_*)_ ' ` _(__)(__)(*_)(__/||\)(*)(_)__ _(__*__)(__*__)(_*)(_*_)(__)(_*)_ _(_*__)(_*_)(_*_)(__*_)(_*_)(*_)(__)_ (_*_)(_*_)(_*____)(_)(___)(__)(_*_)(__) _(__*__)()_(_*_)(_)(*_)(__*)(_*__)(__*_) (_*(__)`--`---(___)' (__) _ (__*_)(__) (_(_*_):| .-. . (o) |(_*)(_) (___)::| ( o ) .' `._~ |:(*__*) | `-' .' ~-. |::(_*_) `. .' ______ `.| (_) We now `. .' _ .' () `. | finally `. | | `. `. () _.' .' have `. `.`--' ` ()' _,'| yesod-test `. ~~~-----~()~~ .' in nixpkgs | _ _ _ _ _() | by just `.|#|#|#|#|#()\ .' running ||#|#|#|#|.() `.___ cabal2nix `.________|() |.-.| on a bunch | || |^.-. of packages! | `| | | |^. `-._._| | | | |\. | | |_| next time, let's be `. .' productive, shall we? | | | | Signed-off-by: aszlig --- .../libraries/haskell/yesod-test/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-test/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix new file mode 100644 index 00000000000..2e504ca0f6d --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec +, htmlConduit, httpTypes, HUnit, monadControl, network, persistent +, poolConduit, text, transformers, wai, waiTest, xmlConduit +, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "yesod-test"; + version = "0.3.0"; + sha256 = "194m4va6am2fmnsvs60jclym6bvjmwp35nyv3srbdnqwg3r983h4"; + buildDepends = [ + attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit + httpTypes HUnit monadControl network persistent poolConduit text + transformers wai waiTest xmlConduit xmlTypes + ]; + meta = { + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49e076902dd..070310d5a85 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1673,6 +1673,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; + yesodTest = callPackage ../development/libraries/haskell/yesod-test {}; + yst = callPackage ../development/libraries/haskell/yst {}; zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {};