3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

21334 commits

Author SHA1 Message Date
Arie Middelkoop 44dec2d5dd fixes the build of coccinelle. 2012-09-12 12:08:21 +02:00
aszlig 64b474e897
Merge branch 'haskell-yesod-test'.
This adds yesodTest to haskellPackages, which is required by default by the
cabal file generated using the Yesod scaffolder. But even if you don't use the
scaffolder it's useful for - well - writing tests, which most people might want
to do if they're not completely insane.

I'm merging this right in because it's non-trivial and just adds packages.
2012-09-12 07:16:34 +02:00
aszlig 8f29e4edb3
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:18 +02:00
aszlig afe407545f
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:18 +02:00
aszlig 86f00072ca
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:17 +02:00
aszlig a4d82a2273
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:17 +02:00
aszlig b0522b53cd
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. <o] [] []`:,:
  |_________________________|    >--------) _________,-':
...`-'`-'.............`-'`-'.........\^^^^_,'`-'.`-'`-'.:
                                      `"""

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-12 07:10:17 +02:00
aszlig ecceb38bfb
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:17 +02:00
aszlig fb5c721cbe
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:16 +02:00
aszlig 0695a74c68
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 <aszlig@redmoonstudios.org>
2012-09-12 07:10:16 +02:00
Eelco Dolstra ea2fbd7864 Fix Thunderbird/Firefox URLs
The Mozilla FTP site has old releases, so is preferred over HTTP.
2012-09-11 16:11:16 -04:00
Eelco Dolstra b1ce15f77b firefox: Update to 15.0.1
Also untabified the expression.
2012-09-11 13:47:34 -04:00
Eelco Dolstra fcd30ecfc1 systemd: Add to channel 2012-09-11 13:47:34 -04:00
Eelco Dolstra 4db2f403ba nspr: Update to 4.9.2 2012-09-11 13:47:34 -04:00
Peter Simons 52bdfef521 hopenssl: add myself as maintainer 2012-09-11 18:22:31 +02:00
Peter Simons 7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Rob Vermaas ff68b3e130 Add apacheAntOracleJDK variant 2012-09-11 17:07:52 +02:00
Arie Middelkoop 504e2ad128 updates coccinelle to 1.0-rc15 2012-09-11 15:02:37 +02:00
Peter Simons d6f289f10c haskell-yesod: update to version 1.1.0.3 2012-09-11 12:15:36 +02:00
Peter Simons cc22e43f5a haskell-yesod-static: update to version 1.1.0.1 2012-09-11 12:15:36 +02:00
Peter Simons bac22b8743 haskell-yesod-form: update to version 1.1.1.1 2012-09-11 12:15:36 +02:00
Peter Simons 6d21a18369 haskell-yesod-core: update to version 1.1.1.2 2012-09-11 12:15:36 +02:00
Peter Simons 44fe21f093 haskell-yesod-auth: update to version 1.1.1.1 2012-09-11 12:15:36 +02:00
Peter Simons 4d329a6ee5 haskell-xml-conduit: update to version 1.0.3.1 2012-09-11 12:15:36 +02:00
Peter Simons b24351998b haskell-wai-logger: update to version 0.3.0 2012-09-11 12:15:35 +02:00
Peter Simons 1622070cef haskell-skein: update to version 0.1.0.9 2012-09-11 12:15:35 +02:00
Peter Simons 7b27f68e42 haskell-shakespeare: update to version 1.0.1.3 2012-09-11 12:15:35 +02:00
Peter Simons 053d65377b haskell-resourcet: update to version 0.4.0.1 2012-09-11 12:15:35 +02:00
Peter Simons 1464dd7183 haskell-pool-conduit: update to version 0.1.0.3 2012-09-11 12:15:35 +02:00
Peter Simons 0af0365640 haskell-persistent: update to version 1.0.1.1 2012-09-11 12:15:35 +02:00
Peter Simons b32dc0cad7 haskell-persistent-template: update to version 1.0.0.1 2012-09-11 12:15:35 +02:00
Peter Simons bee2f63817 haskell-http-conduit: update to version 1.6.0.3 2012-09-11 12:15:35 +02:00
Peter Simons 5c75c45f26 haskell-fast-logger: update to version 0.3.1 2012-09-11 12:15:34 +02:00
Peter Simons 98865175ac haskell-async: update to version 2.0.1.3 2012-09-11 12:15:34 +02:00
Peter Simons d23a9edde1 haskell-diagrams: cosmetic 2012-09-11 12:13:55 +02:00
Peter Simons 20518a9556 haskell-yaml: update to version 0.8.0.2 2012-09-11 12:07:40 +02:00
Peter Simons 277527fef7 haskell-wai-extra: update to version 1.3.0.1 2012-09-11 12:07:40 +02:00
Peter Simons 027faa3045 haskell-wai-app-static: update to version 1.3.0.1 2012-09-11 12:07:39 +02:00
Peter Simons 80505bb416 haskell-monad-logger: update to version 0.2.0.1 2012-09-11 12:07:39 +02:00
Peter Simons 7ef7641d1e haskell-http-conduit: update to version 1.6.0.2 2012-09-11 12:07:39 +02:00
Peter Simons 6cff725ee9 haskell-file-embed: update to version 0.0.4.5 2012-09-11 12:07:39 +02:00
Peter Simons 74eaab50ce haskell-conduit: update to version 0.5.2.4 2012-09-11 12:07:39 +02:00
Peter Simons e81449b41e haskell-clientsession: update to version 0.8.0.1 2012-09-11 12:07:38 +02:00
Peter Simons b4102299e5 haskell-authenticate: update to version 1.3.1.1 2012-09-11 12:07:38 +02:00
Peter Simons 2a183e60bf all-packages.nix: recurse into haskellPackages_ghc761 package set to make it available to nix-env 2012-09-11 10:42:50 +02:00
aszlig 2c315dee85
Merge branch 'tcl-tkabber-fixup'
This introduces the following changes:

 * Fixes libPrefix in Tcl libraries I fucked up a few months ago and adds
   missing meta attributes.
 * Correctly set TKABBER_SITE_PLUGINS so Tkabber is able to find plugins, if
   present.
 * Rely on OPENSSL_X509_CERT_FILE instead of depending on cacert directly.
 * Introduces a new license called "Tcl/Tk", which applies to some Tcl libraries
   and is a variation of the BSD license with restrictions regarding
   governmental use.
 * New package tclgpg for GPG support in Tkabber.
2012-09-11 05:13:03 +02:00
aszlig 9ebc8cbc33
Merge branch 'chromium-update'
This updates the versions for the following channels:

stable: 21.0.1180.81 -> 21.0.1180.89
beta: 22.0.1229.14 -> 22.0.1229.39
dev: 23.0.1243.2 -> 23.0.1255.0

And also fixes build failures for the beta and dev channels.
2012-09-11 04:55:15 +02:00
aszlig 2347cfa4f9
chromium: Revert zlib changes for v22 and higher.
SVN revision 151720 breaks the build with system zlib, see:

http://src.chromium.org/viewvc/chrome?view=rev&revision=151720

The issue here is, that r151720 introduces changes directly in zlib, which
aren't upstream and unfortunately there is no more information stating the exact
reasons for this change, as all references to it are not publicly available:

http://crbug.com/139744
https://chromiumcodereview.appspot.com/10837057

So for the moment, we're going to add a patch, which applies to v22 and higher,
which essentially reverts r151720, until either more information on the issue is
available or it is resolved upstream.

As someone has already reported the issue, we just need to track the following
issue:

http://crbug.com/143623

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:26 +02:00
aszlig 20f883179e
chromium: Update channels to latest versions.
stable: 21.0.1180.89
beta: 22.0.1229.39
dev: 23.0.1255.0

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:25 +02:00
aszlig e99788541e
Merge branch 'conky-update'
This updates conky to version 1.9.0 and adds the weather plugins.

In addition, the patch removing curl/types.h from source files is removed as
well and instead replaced by a patch including stdbool.h, as some source files
don't compile well with C99 (instead, they should be compiled with a C++
compiler, as done in upstream's master).

We also now re-enable building with ncurses, which has been fixed in 1.9.0 as
well.
2012-09-11 00:00:13 +02:00