1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

12890 commits

Author SHA1 Message Date
Moritz Ulrich 31cdbe4a31 Chicken: Fix build on OS X.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-29 11:47:00 +01:00
Michael Raskin 69c132ae9c Merge pull request #1296 from lovek323/guile-ncurses
Guile ncurses
2013-11-28 21:43:23 -08:00
Jason "Don" O'Conal 2e55d2c1ef guile_ncurses: fix build 2013-11-29 02:41:28 +00:00
Jason "Don" O'Conal b3504c7bf5 complexity: fix build 2013-11-28 23:52:49 +00:00
Moritz Ulrich 78cb479f73 Chicken: Set PLATFORM for all supported platforms.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 23:23:40 +01:00
Moritz Ulrich 32fbf27bc3 Chicken: Downgrade to latest stable release & add pkgs.chicken-dev.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 22:08:30 +01:00
Michael Raskin 075883c218 Support LuaJIT usage when building love2d 2013-11-28 23:01:05 +04:00
Jason "Don" O'Conal e4d0b4384e rubyLibs.rubyzip: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal 9f6353cc2b rubyLibs.pry: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal 8cdea678f0 rubyLibs.launchy: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal b323b561ec rubyLibs.coderay: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal f52a0d1110 rubyLibs.syntax: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal e5387aeef3 rubyLibs.rmagick: add expression 2013-11-27 23:17:53 +01:00
Jason "Don" O'Conal bc1c117e85 rubyLibs.rest_client: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 426d78edac rubyLibs.rb_kqueue: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal de1aa7a358 rubyLibs.posix_spawn: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal c1b8edcf2d rubyLibs.lumberjack: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 0110cea196 rubyLibs.listen: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 718f643b1c rubyLibs.jekyll: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 9dbd599a62 rubyLibs.guard: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal e7659105cf rubyLibs.formatador: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 18013d4a76 rubyLibs.fast_steamer: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 49213d5b4c rubyLibs.excon: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal 55e698467f rubyLibs.colorator: add expression 2013-11-27 23:17:52 +01:00
Jason "Don" O'Conal a54e4d3966 rubyLibs.coderay: add expression 2013-11-27 23:17:51 +01:00
Jason "Don" O'Conal 72214690f4 rubyLibs.celluloid: add expression 2013-11-27 23:17:51 +01:00
Vladimír Čunát 8c1a49bf7a glibcLocales: refactoring fe32d12 according to comments 2013-11-27 21:34:14 +01:00
Peter Simons 469ce846c3 Merge pull request #1286 from ocharles/haskell-odbc
haskellPackages.HDBCodbc: Do not build Haddocks
2013-11-27 07:18:30 -08:00
Rickard Nilsson ce2732f2f2 New Haskell package: CodecImageDevIL, bindings to libdevil 2013-11-27 13:46:57 +01:00
Oliver Charles 82265ee89d haskellPackages.HDBCodbc: Do not build Haddocks
The Haddocks currently fail to build, which means that HDBC-ODBC
cannot be install.
2013-11-27 12:37:23 +00:00
Peter Simons 9d02e36ec7 Merge pull request #1285 from ocharles/foldl
haskellPackages.foldl: New expression
2013-11-27 04:34:42 -08:00
Peter Simons e15f6bcecb haskell-diagrams-contrib: jailbreak to support semigroups 0.12 2013-11-27 13:32:42 +01:00
Peter Simons 45f78c667d haskell-wai-logger: update to version 0.3.2 2013-11-27 13:32:41 +01:00
Peter Simons 76a25e937e haskell-stringsearch: update to version 0.3.6.5 2013-11-27 13:32:41 +01:00
Peter Simons 51b633bcf6 haskell-semigroups: update to version 0.12 2013-11-27 13:32:41 +01:00
Oliver Charles 6bf6769ae4 haskellPackages.foldl: New expression 2013-11-27 12:22:28 +00:00
Lluís Batlle i Rossell 6f4c08b0b7 Adding fontconfig support to ffmpeg. 2013-11-27 12:37:59 +01:00
Oliver Charles 46445a3295 haskellPackages.indexedFree: New expression 2013-11-27 08:57:17 +00:00
Moritz Ulrich a14eaaa9f0 ino: update to 0.3.6
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-26 23:55:31 +01:00
Peter Simons 25116b7b63 haskell-statestack: add version 0.2 2013-11-26 21:09:24 +01:00
Peter Simons 99a4fcfc1b haskell-hdevtools: re-generate expression with cabal2nix 2013-11-26 21:09:24 +01:00
Peter Simons a5e6f9c09e haskell-hslua: update to version 0.3.9 2013-11-26 21:09:24 +01:00
Peter Simons 7abb8e4bcd haskell-diagrams-svg: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons 9b89e3a47a haskell-diagrams-lib: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons ba11016555 haskell-diagrams: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons 35380a7591 haskell-diagrams-core: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons 1f802fb2f5 haskell-diagrams-contrib: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons 1bd3d139b7 haskell-diagrams-cairo: update to version 1.0 2013-11-26 21:09:24 +01:00
Peter Simons 144872c9b4 haskell-conduit: update to version 1.0.9.3 2013-11-26 21:09:23 +01:00
Peter Simons bd73c33b27 haskell-bert: update to version 1.2.2 2013-11-26 21:09:23 +01:00
Peter Simons 6385ac407a haskell-asn1-types: update to version 0.2.2 2013-11-26 21:09:23 +01:00
Peter Simons 6cd81e146a haskell-yesod-static: update to version 1.2.1.1 2013-11-26 21:09:23 +01:00
Peter Simons 50a2395bdf haskell-yaml: update to version 0.8.5.2 2013-11-26 21:09:23 +01:00
Peter Simons 58ebe9eae3 haskell-tabular: update to version 0.2.2.5 2013-11-26 21:09:23 +01:00
Peter Simons 15a805b114 haskell-shelly: update to version 1.3.2 2013-11-26 21:09:23 +01:00
Peter Simons ed1225b0d9 haskell-pipes-network: update to version 0.6.1 2013-11-26 21:09:23 +01:00
Peter Simons df3a1cd691 haskell-mersenne-random-pure64: update to version 0.2.0.4 2013-11-26 21:09:23 +01:00
Peter Simons e7fd532cd8 haskell-language-java: update to version 0.2.6 2013-11-26 21:09:22 +01:00
Peter Simons 2fb6ec7033 haskell-http-conduit: update to version 1.9.5.2 2013-11-26 21:09:22 +01:00
Peter Simons 94be3f6ea1 haskell-highlighting-kate: update to version 0.5.5.1 2013-11-26 21:09:22 +01:00
Peter Simons 7428b4c6f7 haskell-digestive-functors-heist: update to version 0.8.1.0 2013-11-26 21:09:22 +01:00
Peter Simons 06b3ee931f haskell-conduit: update to version 1.0.9.2 2013-11-26 21:09:21 +01:00
Peter Simons 704f8b7fbc haskell-cereal-conduit: update to version 0.7.2 2013-11-26 21:09:21 +01:00
Peter Simons 70b50fe963 haskell-ListLike: update to version 4.0.1 2013-11-26 21:09:21 +01:00
Peter Simons 55fcd713b8 haskell-yesod-bin: update to version 1.2.4.1 2013-11-26 21:09:21 +01:00
Peter Simons 1767a37a98 haskell-xml-conduit: update to version 1.1.0.8 2013-11-26 21:09:21 +01:00
Peter Simons 1ab18e5281 haskell-wai: update to version 1.4.1 2013-11-26 21:09:21 +01:00
Peter Simons dfc2345559 haskell-wai-handler-launch: update to version 1.3.1.5 2013-11-26 21:09:20 +01:00
Peter Simons e2fb1c3c54 haskell-tasty-hunit: update to version 0.4.1 2013-11-26 21:09:20 +01:00
Peter Simons 491c52a390 haskell-statistics: update to version 0.10.5.1 2013-11-26 21:09:20 +01:00
Peter Simons 5930813756 haskell-shake: update to version 0.10.10 2013-11-26 21:09:20 +01:00
Peter Simons 5f52272550 haskell-pipes: update to version 4.0.1 2013-11-26 21:09:20 +01:00
Peter Simons 3543da4eb4 haskell-pipes-safe: update to version 2.0.1 2013-11-26 21:09:20 +01:00
Peter Simons dca56f2352 haskell-pipes-bytestring: update to version 1.0.2 2013-11-26 21:09:20 +01:00
Peter Simons 1387beca0d haskell-netwire: update to version 5.0.0 2013-11-26 21:09:20 +01:00
Peter Simons a3cf9f562b haskell-language-ecmascript: update to version 0.15.3 2013-11-26 21:09:20 +01:00
Peter Simons efd82cdc2b haskell-hmatrix: update to version 0.15.2.0 2013-11-26 21:09:19 +01:00
Peter Simons 94f85d42c7 haskell-haskeline: update to version 0.7.1.1 2013-11-26 21:09:19 +01:00
Peter Simons f37f2f1791 haskell-ghc-syb-utils: update to version 0.2.1.2 2013-11-26 21:09:19 +01:00
Peter Simons c89a375a40 haskell-ghc-mod: update to version 3.1.4 2013-11-26 21:09:19 +01:00
Peter Simons c1301780bd haskell-doctest: update to version 0.9.10 2013-11-26 21:09:19 +01:00
Peter Simons e377575a68 haskell-cuda: update to version 0.5.1.1 2013-11-26 21:09:19 +01:00
Peter Simons 05fcd91c57 haskell-conduit: update to version 1.0.9.1 2013-11-26 21:09:19 +01:00
Peter Simons f7e5bf4e79 haskell-blaze-builder: update to version 0.3.3.0 2013-11-26 21:09:19 +01:00
Peter Simons e7327b989c haskell-accelerate: update to version 0.14.0.0 2013-11-26 21:09:19 +01:00
Peter Simons e7e6f40081 haskell-accelerate-io: update to version 0.14.0.0 2013-11-26 21:09:19 +01:00
Peter Simons 318da895c3 haskell-accelerate-fft: update to version 0.14.0.0 2013-11-26 21:09:18 +01:00
Peter Simons fe96c6bc11 haskell-accelerate-examples: update to version 0.14.0.0 2013-11-26 21:09:18 +01:00
Peter Simons 3565daeb02 haskell-accelerate-cuda: update to version 0.14.0.0 2013-11-26 21:09:18 +01:00
Peter Simons f871ee09ca haskell-MonadCatchIO-transformers: update to version 0.3.1.0 2013-11-26 21:09:18 +01:00
Peter Simons d019c243f3 haskell-HTTP: add version 4000.2.9 2013-11-26 21:09:18 +01:00
Peter Simons b20b8b9844 happy: update to version 1.19.1 2013-11-26 21:09:18 +01:00
Peter Simons 0d811d4a10 haskell-gloss-raster-accelerate: add version 1.8.0.0 2013-11-26 21:09:18 +01:00
Peter Simons ed9a255951 haskell-gloss-accelerate: add version 1.8.0.0 2013-11-26 21:09:18 +01:00
Peter Simons 2cfc208f26 haskell-ekg: add version 0.3.1.3 2013-11-26 21:09:18 +01:00
Peter Simons 09c50d6f9c alex: update to version 3.1.2 2013-11-26 21:09:17 +01:00
Shea Levy d34e1ac42c fix build-node-package
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-26 10:18:42 -05:00
Peter Simons 8aa2de3e1d Merge pull request #1256 from tomberek/add_hdevtools
Add hdevtools
2013-11-26 00:48:21 -08:00
aszlig d809fd135f
protobuf: Update to new upstream version 2.5.0.
Starting from version 32, Chromium now relies on protobuf version 2.5.0,
so let's update it, especially because it doesn't have backwards
compatible changes in the release notes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-11-26 02:59:47 +01:00
Ian-Woo Kim fe32d12ef7 glibc-locales: don't depend on /nix/store location
previously, $TMPDIR/nix/store is hard-coded so that only building and installing is correct with /nix/store
See #1273.
2013-11-25 08:31:48 +01:00
Michael Raskin 5c90e785b2 Updating LuaRocks to 2.1.1 2013-11-25 10:59:38 +04:00
Michael Raskin 940c52f4c3 Update SlimerJS - there is still no fresh release for xulrunner 25 2013-11-25 10:59:37 +04:00
Michael Raskin b7dc2c78de Updating ASDF 2013-11-25 10:59:36 +04:00
Michael Raskin c89df12be9 Updating Sodium crypto library 2013-11-25 10:59:36 +04:00
Michael Raskin a4701db302 Updating SBCL to 1.1.13 2013-11-25 10:59:36 +04:00
Shea Levy 2186207b82 node: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-25 00:08:09 -05:00
Lluís Batlle i Rossell 370dec91cc Updating amrnb to the latest version. 2013-11-24 14:57:55 +01:00
Lluís Batlle i Rossell bf48a6f3d6 Adding freetype to ffmpeg. To use the drawtext filter. 2013-11-24 14:57:54 +01:00
Shea Levy 7ab7be0cc3 Add automake 1.14
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-23 21:18:37 -05:00
Thomas Bereknyei 53f05a812f Add hdevtools
4 spaces per indent
2013-11-23 16:12:21 -05:00
Michael Raskin a7675b2aae Merge pull request #1265 from iyzsong/swig
swig: bump 2.0.4 -> 2.0.11
2013-11-22 23:28:34 -08:00
aszlig 440af2e5e5
log4cxx: Clean up package expression.
Add meta.license and use a version attribute instead of hardcoding
everything.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-11-22 17:26:00 +01:00
aszlig c853841c8c
log4cxx: Fix build by adding missing includes.
This adds a bit too many includes but in the end it won't hurt on the
size of the build output because those are optimized away. But having a
whole bunch of sed expressions just for selectively adding includes just
clutters up the package expression.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-11-22 17:25:59 +01:00
Song Wenwu 61b8ebc77f swig: bump 2.0.4 -> 2.0.11 2013-11-22 09:41:17 +08:00
Bjørn Forsman fed248c78e sdcc: bump 3.2.0 -> 3.3.0
SDCC 3.3.0 Feature List:

 * Many small improvements in code generation for the z80-related ports - merged smallopts branch
 * lospre (currently enabled for z80-related and hc08-related ports only) - merged lospre branch
 * More efficient initialization of globals in z80, z180, r2k and r3ka ports.
 * Inclusion of tests from the gcc test suite into the sdcc regression test suite led to many bugs being found and fixed.
 * Split sdas390 from sdas8051
 * Merged big parts of ASxxxx v5 into sdas
 * New pic devices (synchronization with MPLABX 1.60). (Except for very old MCU-s.)
 * New script which disassembles those hex files, in which MCS51 code there is. (mcs51-disasm.pl)
 * Added the PIC16F1788 and PIC16F1789 devices.
 * C11 _Alignof operator.
 * C11 _Alignas alignment specifier.
 * C11 _Static_Assert static assertion.

Numerous feature requests and bug fixes are included as well.
2013-11-21 23:22:06 +01:00
Rok Garbas d14831c5da zc_buildout_nix: update to 2.2.1 2013-11-21 12:30:04 +01:00
Oliver Charles 7a18f1125e haskellPackages.ariadne: New expression and related dependencies 2013-11-21 10:28:56 +01:00
Peter Simons 144a833cd0 Merge pull request #1259 from ocharles/haskell
haskellPackages.socketActivation and haskellPackages.quickcheckInstances
2013-11-21 01:25:34 -08:00
Peter Simons 2d1304e86d Merge pull request #1247 from ocharles/digits
haskellPackages.digits: New expression
2013-11-21 01:21:47 -08:00
Oliver Charles d93d7c645c haskellPackages.quickcheckInstances: New expression 2013-11-21 08:45:38 +00:00
Oliver Charles fe3253355d haskellPackages.socketActivation: New expression 2013-11-21 08:45:09 +00:00
Rommel M. Martinez 794afb0c78 Update xonotic to 0.7.
Add scheme48 1.9.
2013-11-21 09:41:01 +01:00
viric fa9284b941 Merge pull request #1231 from zimbatm/golang-darwin-fix
Fixes go 1.1.2 compilation on OSX Maverick
2013-11-20 06:10:04 -08:00
viric 6c8054cabe Merge pull request #1212 from lovek323/awesome
Awesome: fix issue with awesome-client, add expression for 3.5
2013-11-20 06:09:35 -08:00
Oliver Charles 1bf33cf083 haskellPackages.digits: New expression 2013-11-20 09:10:54 +00:00
Jason "Don" O'Conal 76ab3916de awesome-3-5: add expression and nixos module 2013-11-20 01:05:09 +00:00
Shea Levy 06fe4d9904 Partial revert of b09f8110db
Didn't mean to commit this change

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-19 09:04:32 -05:00
Shea Levy 2909634cac nss: Bump
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-18 15:39:13 -05:00
Shea Levy b09f8110db nspr: Bump to 4.10.2
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-18 15:23:30 -05:00
Bjørn Forsman c41cf22b62 xmlrpc-c: update 1.25.25 -> 1.25.26
From http://xmlrpc-c.sourceforge.net/change_super_stable.html:

  Release 1.25.26, released September 29, 2013.

  Fix interpretation of dateTime.iso8601 variant with timezone
  information. As broken, it would add up to a second to the correct
  datetime or reject the message claiming that it has invalid syntax.
  Always broken (recognition of the timezone variant was introduced in
  Xmlrpc-c 1.20 (September 2009).
2013-11-18 20:49:15 +01:00
Peter Simons 2df5e8122b haskell-language-ecmascript: fix build
The test suite fails because of <https://github.com/jswebtools/language-ecmascript/issues/7>.
Jailbreak to support current versions of QuickCheck: <https://github.com/jswebtools/language-ecmascript/issues/49>.
2013-11-18 12:14:16 +01:00
Oliver Charles 9d51b03053 haskellPackages.smallcheck: Update to 1.1 2013-11-18 11:28:18 +01:00
Oliver Charles db8c22c6d3 haskellPackages.tasty*: Add ocharles to the list of maintainers 2013-11-18 11:28:17 +01:00
Oliver Charles 41a0cb7bd9 haskellPackages.tastyTh: New expression 2013-11-18 11:28:17 +01:00
Oliver Charles 6e89adc6ba haskellPackages.tastyGolden: New expression 2013-11-18 11:28:17 +01:00
Oliver Charles 17b738330c haskellPackages.tastyQuickcheck: New expression 2013-11-18 11:28:17 +01:00
Oliver Charles 2e8c5b626c haskellPackages.tastyHspec: New expression 2013-11-18 11:28:17 +01:00
Oliver Charles 1eb47b17af haskellPackages.tastyAntXml: New expression 2013-11-18 11:28:17 +01:00
Peter Simons 8786aa1213 Merge pull request #1218 from ocharles/web-routes
haskellPackages.webRoutesBoomerang: new expression
2013-11-18 02:26:42 -08:00
zimbatm 8677a22dd5 Fixes go 1.1.2 compilation on OSX Maverick
Apparently Apple thinks that faking gcc wiht a clang stub but not providing a
compatile libgcc.a is not going to cause any issues. They really do hate GPL.
2013-11-17 13:51:37 +00:00
Bjørn Forsman 9f9f905819 json-c: add meta.platforms and break overlong line 2013-11-17 12:15:02 +01:00
Jason "Don" O'Conal f49f9225d5 newsbeuter: add dev expression 2013-11-17 12:06:38 +01:00
Kim Simmons db3abf1c45 nanomsg: new package
Socket library built in C but provides bindings in many languages.
Highly efficient and easy to use.

[@bjornfor: whitespace fixes, quote shell variables and add meta.platforms]
2013-11-16 17:06:12 +01:00
Petr Rockai e3f2e2e10b libcxx: Update to 190100 and build with libc++abi. 2013-11-16 13:53:48 +01:00
Petr Rockai 2c9f0e059a clang: Do not try to build clang-tblgen in LLVM's build path. 2013-11-16 13:53:48 +01:00
Peter Simons 188834603a haskell-shake: update to version 0.10.9 2013-11-16 12:33:40 +01:00
Peter Simons 17fd8d5627 haskell-system-posix-redirect: update to version 1.1.0.1 2013-11-16 12:33:39 +01:00
Kim Simmons 49bf246491 Minifix: didn't use the name variable in the package. 2013-11-15 17:41:33 +01:00
Kim Simmons a8e3167228 LuaJIT: New package
Just-in-time compiler for lua 5.1 with strong focus on performance.
Uses the same API as lua 5.1 which makes it extremely easy to integrate.
2013-11-15 17:20:29 +01:00
Oliver Charles 3203c7177c haskellPackages.webRoutesBoomerang: new expression 2013-11-15 13:09:30 +00:00
Bjørn Forsman 04ce6241ac lttv: update 1.5-beta1 -> 1.5
This makes lttv build again with the new GTK+ version that was recently
updated in nixpkgs.
2013-11-15 00:19:15 +01:00
Domen Kožar 38185f8e51 pypy: 2.1 -> 2.2 2013-11-14 16:22:04 +01:00
Bjørn Forsman fbfa569efd stlink: fix chroot build
Add sha256 attribute to fetchgit to make it a fixed-output derivation
(needed for chroot builds).
2013-11-13 23:30:47 +01:00
Bjørn Forsman a8d63681db stlink: fix package name
To stop nixpkgs-lint from saying "stlink: package has no version".
2013-11-13 23:25:48 +01:00
Eelco Dolstra 847544d895 php: Update to 5.4.21 2013-11-13 17:33:58 +01:00
Peter Simons e006e06be6 haskell-pem: update to version 0.2.1 2013-11-13 15:12:29 +01:00
Peter Simons 37f44b6089 haskell-crypto-pubkey: update to version 0.2.2 2013-11-13 15:12:29 +01:00
Peter Simons f646bb6c8b haskell-crypto-numbers: update to version 0.2.3 2013-11-13 15:12:29 +01:00
Peter Simons 4441ae7424 haskell-cpu: update to version 0.1.2 2013-11-13 15:12:29 +01:00
Lluís Batlle i Rossell fda66c9ff4 Updating tox to master 2013-11-13 09:21:44 +01:00
Aristid Breitkreuz f923c32204 boost: fix hardcoded hash
Closes #1209

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 23:02:39 +00:00
Moritz Ulrich 96552b683e Erlang: Update to R16B02.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:06:46 +01:00
Vladimír Čunát 9220d5b002 libxml2 on FreeBSD: disable impure python detection
This might be good for all platforms,
when we do some big rebuild again.
2013-11-12 14:09:15 +01:00
Vladimír Čunát 91028bd151 upower: fix Xfce via --enable-deprecated
Also drop older libusb1 version which is no longer needed with newer upower.
2013-11-12 10:05:57 +01:00
Vladimír Čunát 85d21a6963 libxml2: bump 2.9.0 -> 2.9.1 (CVE-2013-1969)
And drop patch that has been merged upstream.
Close #1199.
Hack around python install problems (the rest is from bjornfor).
2013-11-11 22:32:46 +01:00
Peter Simons a6d30242a1 Merge pull request #1201 from errge/master
Add direct-sqlite haskell library
2013-11-11 13:16:20 -08:00
Peter Simons 393689dcea Merge pull request #1202 from Zoomulator/master
gtest: New package, the google c++ testing framework.
2013-11-11 13:15:47 -08:00
Peter Simons 2192ddec0e boost: say hello to version 1.55.0 2013-11-11 22:08:47 +01:00
Kim Simmons 530a8dc7dc gtest: New package, the google c++ testing framework.
BSD licensed testing framework from google:
https://code.google.com/p/googletest/
2013-11-11 16:51:23 +01:00
Gergely Risko d9ed78cbd9 Add direct-sqlite haskell library 2013-11-11 16:36:14 +01:00
Peter Simons 7aefd575b5 haskell-yesod-static: disable the yesod-static test suite
It produces a strange error:

  Running 1 test suites...
  Test suite tests: RUNNING...

  /nix/store/gwm3821513h0jwcgxr73r3ay90shaq7r-haskell-base64-bytestring-ghc7.6.3-1.0.0.1/bin/../lib/ghc-7.6.3/package.conf.d/base64-bytestring-1.0.0.1.installedconf:1:19272:
      Not in scope: `main'
      Perhaps you meant `min' (imported from Prelude)
  ...

I'm not sure what this means.
2013-11-11 14:39:59 +01:00
Peter Simons 716318c54d haskell-process-conduit: add version 1.0.0.1 2013-11-11 14:39:59 +01:00
Peter Simons 4159147663 haskell-control-monad-loop: add version 0.1 2013-11-11 14:39:59 +01:00
Peter Simons c9afccda1d haskell-yesod: update to version 1.2.3 2013-11-11 14:39:59 +01:00
Peter Simons bdbda93222 haskell-yesod-static: update to version 1.2.1 2013-11-11 14:39:59 +01:00
Peter Simons 07fa9cec40 haskell-yesod-form: update to version 1.3.4 2013-11-11 14:39:59 +01:00
Peter Simons e3f874c0f7 haskell-yesod-core: update to version 1.2.5 2013-11-11 14:39:59 +01:00
Peter Simons 59d4efda21 haskell-yesod-bin: update to version 1.2.4 2013-11-11 14:39:59 +01:00
Peter Simons f4775459ac haskell-threads: update to version 0.5.0.3 2013-11-11 14:39:59 +01:00
Peter Simons 598541fc15 haskell-html-conduit: update to version 1.1.0.1 2013-11-11 14:39:59 +01:00
Peter Simons 95fdcdb200 haskell-conduit: update to version 1.0.9 2013-11-11 14:39:58 +01:00
Peter Simons 876e2278c9 haskell-bifunctors: update to version 4.1.1 2013-11-11 14:39:58 +01:00
Peter Simons 20b512de7c haskell-keter: update to version 1.0.1.2 2013-11-11 14:39:58 +01:00
Peter Simons 6509447e81 haskell-thyme: update to version 0.3.0.3 2013-11-11 14:39:58 +01:00
Peter Simons 57d39d5083 haskell-tasty: update to version 0.4.0.1 2013-11-11 14:39:58 +01:00
Peter Simons 11c930d02a haskell-language-c-quote: update to version 0.7.5 2013-11-11 14:39:58 +01:00
Peter Simons 2f466ae9a0 haskell-cereal: update to version 0.4.0.1 2013-11-11 14:39:58 +01:00
Peter Simons cbaf113858 haskell-HsSyck: update to version 0.51 2013-11-11 14:39:58 +01:00
Peter Simons 9537b2c8d2 haskell-HList: update to version 0.2.3 2013-11-11 14:39:58 +01:00
Peter Simons 0cd6b6e896 haskell-thyme: update to version 0.3.0.2 2013-11-11 14:39:58 +01:00
Peter Simons 7d97e8c982 haskell-texmath: update to version 0.6.5.2 2013-11-11 14:39:58 +01:00
Peter Simons f25b2c1be6 haskell-HsOpenSSL: update to version 0.10.3.5 2013-11-11 14:39:58 +01:00
Peter Simons 62fd4cebe1 haskell-parallel: update to version 3.2.0.4 2013-11-11 14:39:57 +01:00
Peter Simons 9e036f4560 haskell-deepseq: update to 1.3.0.1 2013-11-11 14:39:57 +01:00
Peter Simons 2a98488609 haskell-snap-core: update to version 0.9.5.0 2013-11-11 14:39:54 +01:00
Peter Simons dbffabdee6 haskell-parseargs: update to version 0.1.5.2 2013-11-11 14:39:54 +01:00
Peter Simons 2176c172ca haskell-hxt: update to version 9.3.1.2 2013-11-11 14:39:54 +01:00
Peter Simons fb621b1724 haskell-cuda: update to version 0.5.1.0 2013-11-11 14:39:54 +01:00
Peter Simons ccd4ca7c41 haskell-abstract-par: update to version 0.3.3 2013-11-11 14:39:54 +01:00
Peter Simons e127d7a0a6 haskell-dual-tree: update to version 0.2 2013-11-11 14:39:54 +01:00
Peter Simons fb89b4fb0a haskell-wai-extra: update to version 1.3.4.6 2013-11-11 14:39:54 +01:00
Peter Simons 67a59ade44 haskell-texmath: update to version 0.6.5.1 2013-11-11 14:39:54 +01:00
Peter Simons c00944712d haskell-tasty: update to version 0.4 2013-11-11 14:39:54 +01:00
Peter Simons 9a904615a9 haskell-pipes-parse: update to version 2.0.2 2013-11-11 14:39:54 +01:00
Peter Simons de03376a13 haskell-lifted-base: update to version 0.2.1.1 2013-11-11 14:39:53 +01:00
Peter Simons c01cb9d67c haskell-dbus: update to version 0.10.5 2013-11-11 14:39:52 +01:00
Peter Simons def8a6801c haskell-cufft: update to version 0.1.0.1 2013-11-11 14:39:52 +01:00
Peter Simons 9a615b6d9c haskell-cuda: update to version 0.5.0.2 2013-11-11 14:39:52 +01:00
Peter Simons 096e81f5a0 haskell-crypto-numbers: update to version 0.2.2 2013-11-11 14:39:51 +01:00
Peter Simons 8b863aab40 haskell-active: update to version 0.1.0.9 2013-11-11 14:39:51 +01:00
Peter Simons 226f773457 haskell-accelerate-fft: update to version 0.13.0.0 2013-11-11 14:39:51 +01:00
Peter Simons c99c70dd8e haskell-accelerate-examples: update to version 0.13.0.0 2013-11-11 14:39:51 +01:00
Peter Simons 3a922b76f7 haskell-accelerate-cuda: update to version 0.13.0.4 2013-11-11 14:39:51 +01:00
Peter Simons 0f09271562 haskell-Chart: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons 6af70de21a haskell-Chart-gtk: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons c1d17c070f haskell-Chart-cairo: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons 53cc2aa312 haskell-parsers: update to version 0.10.1.1 2013-11-11 14:39:48 +01:00
Peter Simons b1f7180d6c Merge pull request #1188 from peti/reimplement-ghcWithPackagesOld-by-wrapping-ghcWithPackages
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
2013-11-11 05:00:11 -08:00
Karn Kallio 1e80c57274 scala: add expression for scala 2.10.x branch. 2013-11-11 12:11:00 +01:00
Bjørn Forsman f4f18c11b6 uhd: bump 3.5.2 -> 3.5.4
It seems upstream changed the hash of the 3.5.2 archive so it doesn't
build anymore. Bump it instead of just updating the hash.
2013-11-10 16:22:38 +01:00
Bjørn Forsman edfd4cbb03 libvirtd: add missing dependency on dnsmasq
Fixes this:

Nov 09 16:13:27 nixos-laptop systemd[1]: Starting Libvirt Virtual Machine Management Daemon...
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: libvirt version: 1.1.4
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory
Nov 09 16:13:28 nixos-laptop systemd[1]: Started Libvirt Virtual Machine Management Daemon.
2013-11-10 14:00:04 +01:00
Bjørn Forsman e0b7eeb0ad uhd: new package
UHD is USRP Hardware Driver (for Software Defined Radio).
2013-11-09 22:15:52 +01:00
Peter Simons e4d841eef4 Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
This change is intended to fix <https://github.com/NixOS/nixpkgs/issues/1161>
and to address some of the concerns that come up during the discussion of
<d64917ad17>.
2013-11-09 20:41:52 +01:00
Peter Simons 981c287355 ghc: several enhancements to the new "with-packages" wrapper
1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of
    "--global-package-db". The result was that packages installed locally in
    ~/.ghc and ~/.cabal were invisible to GHC. This has been fixed.

 2) The wrapper now deals gracefully with an empty package set: if no package
    is requested to be included in the wrapped environment, the wrapper just
    installs a pristine GHC.

 3) Correctly configure the "docdir" path returned by ghc-paths.

 4) Added some comments that describe the idea behind our ghc-paths patches and
    gives users same sample shell code that can be used to import our special
    environment variables into the currently running shell, so that programs
    outside of the wrapped environment can use them, too.
2013-11-09 20:36:25 +01:00
Vladimír Čunát 619a1f5614 changes proposed for 13-10 update
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Jonas Hoersch 2923631287 libunibreak: meta.platforms attribute 2013-11-09 18:16:16 +01:00
Jason "Don" O'Conal 62ebdd7a6a rubyLibs.resque_web: add expression 2013-11-09 17:44:28 +01:00
Vladimír Čunát 8d14c7baa6 polkit: major update 0.105 -> 0.112
- It now uses JavaScript for configuration (only),
  so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
  Phreedom tested NetworkManager config conversion.
2013-11-09 16:29:18 +01:00
Vladimír Čunát 35a3d07c4f Merge #1082: Update QtCreator to 2.8.1, add Qt 5.1.1 and QtSDK 2013-11-09 16:26:59 +01:00
Vladimír Čunát 61528849e3 mesa: bugfix update 9.1.6 -> .7
Thist is just for master before the official release,
x-updates has 9.2.* already.
2013-11-09 16:26:54 +01:00
Vladimír Čunát 2a9bdac39a gtk2: minor update .20 -> .22 2013-11-09 16:26:53 +01:00
Moritz Ulrich 698065715a Leiningen: Update to 2.3.3
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-08 21:30:34 +01:00
Lluís Batlle i Rossell 3e8e635be7 Updating gdb to 7.6.1 2013-11-08 17:27:57 +01:00
Peter Simons 29588edfe1 python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.

After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.

Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:

  pkgs.python27Full.override {
    extraLibs = [pkgs.pylint];
    postBuild = ''
      cd ${pkgs.pylint}/bin
      for i in *; do
        rm $out/bin/$i
        sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
        chmod +x $out/bin/$i
      done;
    '';
  };
2013-11-07 15:13:02 +01:00
Peter Simons 46419ae454 python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
2013-11-07 14:00:08 +01:00
Peter Simons b66a59bf41 haskell-uu-parsinglib: update to version 2.8.1.1 2013-11-07 14:00:08 +01:00
Peter Simons f92a5cbfc6 pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
Peter Simons 89c566fcfd pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.

The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
2013-11-07 12:14:19 +01:00
Peter Simons 9c1982cd68 Merge pull request #1179 from cpages/sdl2
SDL2: some improvements to the expression.
2013-11-07 02:16:00 -08:00
Vladimír Čunát 0eeee298ef perl: avoid --no-cpp-precomp on darwin, (close #1160)
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch

Conflicts (trivial):
	pkgs/development/interpreters/perl/5.16/default.nix
2013-11-07 10:39:28 +01:00
Carles Pagès b81caba5fb SDL2: some improvements to the expression.
Based on comments in the pull request from @edolstra and @peti. I also added
missing metadata, setting myself as maintainer.
2013-11-06 23:17:46 +01:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Eelco Dolstra 77dc219127 gcc: Support FreeBSD 2013-11-06 10:41:02 +01:00
Lluís Batlle i Rossell cfe5f74e88 Updating poppler to 0.24.3. 2013-11-06 10:09:08 +01:00
Michael Raskin 66c034d03e Merge pull request #1171 from cpages/sdl2
Update SDL2 to v2.0.1
2013-11-05 20:32:07 -08:00
Shea Levy 9817bada91 Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 18:02:21 -05:00
Lluís Batlle i Rossell 1045df3197 Updating mkvtoolnix, libebml, libmatroska to latest versions. 2013-11-05 23:20:27 +01:00
Rickard Nilsson 2d44f3e8af sbt: Update to 0.13.0
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
2013-11-05 14:51:14 +01:00
Rickard Nilsson b5554b3f5c libvirt: Update to 1.1.4
Remove the patch that has been added upstream.
2013-11-05 14:15:42 +01:00
Eelco Dolstra da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Eelco Dolstra d9c13a73c2 gurobi: Remove
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra 01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Carles Pagès b551f8bced SDL2: clean configure flags.
I removed some flags that are no longer present, one that was redundant
(default value) and added a comment regarding why enable-static is there.
2013-11-04 19:49:57 +01:00
Peter Simons 0e831bd525 Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. 2013-11-04 19:42:49 +01:00
Carles Pagès 1138f0a96b SDL2: update to v2.0.1 2013-11-04 19:37:53 +01:00
Eric Kow d1e8f9c047 haskell-wxc: noHaddock 2013-11-02 18:09:08 +00:00
Peter Simons 8352df8d66 haskell-yesod-platform: update to version 1.2.4.4 2013-11-01 14:20:11 +01:00
Peter Simons 5fd1c46beb haskell-trifecta: update to version 1.2.1.1 2013-11-01 14:20:11 +01:00
Peter Simons 2de6d71694 haskell-trifecta: update to version 1.1 2013-11-01 14:20:11 +01:00
Peter Simons dda0d13d22 haskell-text-icu: update to version 0.6.3.7 2013-11-01 14:20:11 +01:00
Peter Simons a4cfdfad5d haskell-terminfo: update to version 0.3.2.6 2013-11-01 14:20:11 +01:00
Peter Simons 6e180df18c haskell-intervals: update to version 0.4 2013-11-01 14:20:11 +01:00
Peter Simons 15851f0661 haskell-free: update to version 4.2 2013-11-01 14:20:11 +01:00
Peter Simons 03e7ab54a0 haskell-fclabels: update to version 2.0.0.5 2013-11-01 14:20:11 +01:00
Peter Simons 40a31df497 haskell-Elm: update to version 0.10.0.2 2013-11-01 14:20:11 +01:00
Mathijs Kwik b6519f08da haskell-parsers: bring back 0.9 for idris 2013-11-01 08:02:19 +01:00
Mathijs Kwik 3c2b7f5e33 haskell-trifecta: bring back 1.1 for idris 2013-11-01 08:02:19 +01:00
Mathijs Kwik 07d68731ff haskell-trifecta: jailbreak on comonad 2013-11-01 08:02:13 +01:00
Domen Kožar ebcdbbbdd2 Merge pull request #1132 from lovek323/php54-pcntl
php54: add pcntl option
2013-10-31 07:29:38 -07:00
Peter Simons 86443f4efd haskell-cabal2nix: update to version 1.55 2013-10-31 09:02:25 +01:00
Peter Simons 7337c675df haskell-uuid: update to version 1.3.3 2013-10-31 09:02:25 +01:00
Peter Simons 7deb37d1f9 haskell-symbol: update to version 0.2.0 2013-10-31 09:02:25 +01:00
Peter Simons 4bf277e39b haskell-postgresql-simple: update to version 0.3.9.1 2013-10-31 09:02:25 +01:00
Peter Simons 7399dba217 haskell-pipes-parse: update to version 2.0.1 2013-10-31 09:02:24 +01:00
Peter Simons df12cd8a7b haskell-intervals: update to version 0.3 2013-10-31 09:02:24 +01:00
Peter Simons e0c633a402 haskell-hslua: update to version 0.3.8 2013-10-31 09:02:24 +01:00
Peter Simons f7ea8a57df haskell-hexpat: update to version 0.20.4 2013-10-31 09:02:24 +01:00
Peter Simons ece9b21522 haskell-feed: update to version 0.3.9.2 2013-10-31 09:02:24 +01:00
Peter Simons 436885b067 haskell-fclabels: update to version 2.0.0.2 2013-10-31 09:02:24 +01:00
Peter Simons 56dfdba91b haskell-constraints: update to version 0.3.4.2 2013-10-31 09:02:24 +01:00
Peter Simons 29054f9a87 haskell-blaze-builder: update to version 0.3.2.0 2013-10-31 09:02:24 +01:00
Peter Simons aa3fad72ad haskell-HDBC-postgresql: update to version 2.3.2.2 2013-10-31 09:02:24 +01:00
Peter Simons 793be25a9a haskell-gloss: update to version 1.8.1.1 2013-10-31 09:02:24 +01:00
Peter Simons 90d80c3d35 haskell-OpenGL: update 2.9.x branch to version 2.9.1.0 2013-10-31 09:02:24 +01:00
Domen Kozar d9ba437875 libedit: add FreeBSD support 2013-10-31 00:47:33 +01:00
Michael Raskin 92e3206c2a Updating SlimerJS to Git version for compatibility with fresh xulrunner 2013-10-31 02:59:45 +04:00
Pascal Wittmann 6e062f1434 Agda: update to 2.3.2.2.
This update also fixes the build errors on hydra that were caused by
an incompatible version of haskell-src-ext.

Close #1153.
2013-10-30 23:30:39 +02:00
Eric Kow 0f8b1b1a5c libusb1: avoid -lgcc_s on darwin
close #1151
2013-10-30 19:19:54 +02:00
Vladimir Still d7d3c8fd82 sqliteodbc: update to 0.995, add more metadata
close #1122
2013-10-30 19:00:09 +02:00
Domen Kožar 09fa7304ae ninka: update to 1.1 and refactor 2013-10-30 11:47:12 +01:00
Michael Raskin 52d5290118 Update SlimerJS 2013-10-30 13:03:47 +04:00
Rok Garbas b040814679 changes in: redshift, geoclue, libsoup
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
2013-10-29 16:25:31 +01:00
Domen Kožar 789af5fb08 libedit: 20100424-3.0 -> 20130712-3.1 2013-10-29 09:35:25 +01:00
Michael Raskin 3bda40c150 A few hooks for easier library handling when CFFI is used 2013-10-29 11:29:46 +04:00
Michael Raskin 22ddf66b54 Adding a facility to generate Lisp module definitions from QuickLisp; no sane update facility yet; adding Esrap-PEG as a test 2013-10-29 10:56:33 +04:00
aszlig 46b2bd427c
portmidi: New package in version 217.
This uses a patch from Gentoo to disable Java support for now, as it is
not needed for supporting Mixxx (which is the package I'm preparing).
Hopefully, the patch will be applied upstream so we can safely drop it
here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:48 +01:00
Peter Simons 094edba311 ghc-with-packages.nix: make sure that GHC itself is included in the environment 2013-10-28 17:54:28 +01:00
Baptist BENOIST 736b295bc5 vtk: Use the Qt libraries as an argument instead of a boolean
To prevent multiple Qt libraries when developing with a custom one, the Qt
support can now be activated by directly supplying the Qt libraries as an
argument (qtLib).

qtSDK and qtFull users/developers now just have to define an override such
as the following one in order to use it inside their development
environment:

vtk.override { qtLib = qt4SDK; };

The previous behavior is still the same for vtk and vtkWithQt4 end-users.

Change-Id: I517762d4ff7de46d32cc46e6e725fd62737caa52
2013-10-28 10:00:32 +01:00