Commit graph

8316 commits

Author SHA1 Message Date
Vladimír Čunát
b003138081 libav: major update and refactoring
Also leaving 0_8 branch, as it's compatible with older ffmpeg versions.
I'm planning that all expressions will be able to switch easily
between ffmpeg and libav (whatever default we choose, but I prefer libav).
2013-08-13 20:08:26 +02:00
Peter Simons
1ccc0025e4 haskell-union-find: add version 0.2 2013-08-11 23:56:02 +02:00
Peter Simons
9547cdaadc haskell-language-c: drop obsolete version 0.3.2.1 2013-08-11 23:50:05 +02:00
Peter Simons
39f336b92f haskell-numeric-extras: add version 0.0.3 2013-08-11 23:50:05 +02:00
Peter Simons
db322400df haskell-tls-extra: jailbreak to fix build with recent versions of cipher-aes 2013-08-11 23:50:05 +02:00
Peter Simons
35221e2be3 haskell-intervals: add version 0.2.2 2013-08-11 23:50:05 +02:00
Peter Simons
e8002fadf0 haskell-c2hs: update to version 0.16.5 2013-08-11 23:50:04 +02:00
Gergely Risko
de35a6dbb9 Export ghci config files for ghc-vis and ghc-heap-view 2013-08-11 23:50:04 +02:00
Peter Simons
185439ca5f haskell-crypto-cipher-types: disable test suite
https://github.com/vincenthz/hs-crypto-cipher/issues/29
2013-08-11 23:50:04 +02:00
Peter Simons
ea27769a61 haskell-securemem: add version 0.1.2 2013-08-11 23:50:04 +02:00
Peter Simons
0700209478 haskell-crypto-cipher-types: add version 0.0.1 2013-08-11 23:50:04 +02:00
Peter Simons
60a58dda25 haskell-crypto-cipher-tests: add version 0.0.1 2013-08-11 23:50:04 +02:00
Peter Simons
30cb6ebdd1 haskell-monoid-extras: update to version 0.3.0.0 2013-08-11 23:50:04 +02:00
Peter Simons
669cb32bae haskell-texmath: update to version 0.6.3 2013-08-11 23:50:04 +02:00
Peter Simons
a2ec6565d4 haskell-stm-conduit: update to version 2.1.2 2013-08-11 23:50:04 +02:00
Peter Simons
aab1fed918 haskell-postgresql-simple: update to version 0.3.5.0 2013-08-11 23:50:04 +02:00
Peter Simons
a0cb696441 haskell-hastache: update to version 0.5.1 2013-08-11 23:50:03 +02:00
Peter Simons
af90db8e24 haskell-hakyll: update to version 4.3.3.0 2013-08-11 23:50:03 +02:00
Peter Simons
bd40d4aa2c haskell-github: update to version 0.7.1 2013-08-11 23:50:03 +02:00
Peter Simons
bb05fc78ab haskell-diagrams-svg: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
cfe56579e5 haskell-diagrams-lib: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
255abace30 haskell-diagrams: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
1a48ac3b50 haskell-diagrams-core: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
e472833cee haskell-diagrams-contrib: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
668c691afb haskell-diagrams-cairo: update to version 0.7 2013-08-11 23:50:03 +02:00
Peter Simons
0a77a99c57 haskell-bindings-posix: update to version 1.2.6 2013-08-11 23:50:03 +02:00
Ivan Kozik
1866619acc Fix a few typos 2013-08-11 10:55:53 +00:00
Song Wenwu
4705462a2f add libvisual 0.4.0 2013-08-11 11:15:07 +08:00
Bjørn Forsman
4e8dfe71d3 liburcu: new package
liburcu is a userspace RCU (read-copy-update) library that is used by
LTTng - Linux Trace Toolkit (next generation).
2013-08-10 14:32:56 +02:00
Carles Pagès
2725cbef42 Add libtxc_dxtn-1.0.1.
I thought this was needed by Steam, but it only applies when not using
propietary drivers, and even then it doesn't look like well supported.
2013-08-10 06:08:17 +03:00
Eelco Dolstra
0656eff736 pixman: Update to 0.30.2 2013-08-09 23:53:52 +02:00
Vladimír Čunát
207ca1f05a darwin: attempt to fix pango via flattening cairo includes
Changes hash only on darwin.
2013-08-07 18:28:04 +02:00
Eelco Dolstra
d17f7d2fdf nss: Update to 3.15.1 2013-08-07 17:12:33 +02:00
Vladimír Čunát
758c21bf3b introspection disabling -- libchamplain
Didn't build as it was, and not needed anywhere AFAIK.
2013-08-07 09:19:46 +02:00
Vladimír Čunát
de5b992ecf qt, glew: propagate glu
After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
2013-08-06 10:37:15 +02:00
Vladimír Čunát
72a8019334 introspection disabling -- clutter-gtk, NM-applet, gnome_panel
Didn't build as it was, and not needed anywhere AFAIK.
2013-08-06 09:27:34 +02:00
Vladimír Čunát
a926bad1cc disable auto-detected introspection for libwnck and clutter
Didn't build as it was, and not needed anywhere AFAIK.
2013-08-06 08:06:26 +02:00
Peter Simons
d766bb6f32 haskell-stylish-haskell: update to version 0.5.7.0 2013-08-05 10:56:30 +02:00
Peter Simons
0b93f03230 haskell-shakespeare: update to version 1.0.5.1 2013-08-05 10:56:30 +02:00
Peter Simons
0979e4a832 haskell-numeric-prelude: update to version 0.4.0.3 2013-08-05 10:56:30 +02:00
Peter Simons
d65b81b36b haskell-MissingH: update to version 1.2.0.1
Don't run the check phase to avoid depending on the obsolete testpack package.
2013-08-05 10:56:30 +02:00
Vladimír Čunát
7fbcc56260 add introspection into GTK libs (part of #517)
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
2013-08-04 21:11:24 +02:00
Peter Simons
cc691d95f5 haskell-lens: jailbreak to fix build with latest version of generic-deriving 2013-08-03 12:08:23 +02:00
Peter Simons
1d06592025 haskell-unix-time: update to version 0.2.0 2013-08-03 12:08:23 +02:00
Peter Simons
02db4b9f70 haskell-unix-process-conduit: update to version 0.2.2 2013-08-03 12:08:23 +02:00
Peter Simons
30135c6b50 haskell-stm-conduit: update to version 2.1.1 2013-08-03 12:08:23 +02:00
Peter Simons
e6239c406f haskell-reactive-banana: update to version 0.7.1.3 2013-08-03 12:08:23 +02:00
Peter Simons
cb8f500a17 haskell-profunctor-extras: update to version 3.3.3.1 2013-08-03 12:08:23 +02:00
Peter Simons
5fd7636a2e haskell-generic-deriving: update to version 1.6.1 2013-08-03 12:08:23 +02:00
Peter Simons
dd0031cbad haskell-feed: update to version 0.3.9.1 2013-08-03 12:08:23 +02:00
Peter Simons
bcd9344f9b haskell-fast-logger: update to version 0.3.3 2013-08-03 12:08:22 +02:00
Peter Simons
bf1ce4f47b haskell-MonadRandom: update to version 0.1.11 2013-08-03 12:08:22 +02:00
Vladimír Čunát
d5ac09f60f poppler: bugfix update, waiting with major bump 2013-08-03 10:46:48 +02:00
Vladimír Čunát
98f3716650 clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát
d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Vladimír Čunát
d239d24a89 mesa: bugfix update 9.1.4 -> 9.1.6 2013-08-02 17:13:54 +02:00
Mathijs Kwik
bdb525e020 add haskell-llvm-general 2013-08-02 11:47:38 +02:00
Eelco Dolstra
32b036a430 apr-util: Update to 1.5.2 2013-07-31 15:02:54 +02:00
Eelco Dolstra
ab7f2aea8e apr: Update to 1.4.8
Also drop the accept4 hack because Linux 2.6.32 is now the minimal
kernel version supported by Nixpkgs.
2013-07-31 15:02:23 +02:00
Peter Simons
ef659fa8c0 haskell-unix-process-conduit: update to version 0.2.1.2 2013-07-31 11:09:17 +02:00
Peter Simons
5f960aac0f haskell-haskell-src-meta: update to version 0.6.0.3 2013-07-31 11:09:17 +02:00
Peter Simons
34db77c302 haskell-feed: update to version 0.3.9 2013-07-31 11:09:02 +02:00
Peter Simons
dc4f9a37be haskell-cmdargs: update to version 0.10.5 2013-07-31 11:09:02 +02:00
Eelco Dolstra
b509c78ea3 webkitSVN: Remove
It hasn't been updated in a long time.
2013-07-30 16:52:11 +02:00
Eelco Dolstra
11b5b06fbd libpng: Update to 1.6.3 2013-07-29 21:39:56 +02:00
Peter Simons
416bd743f0 haskell-language-java: update to version 0.2.5.1 2013-07-29 11:27:01 +02:00
Jason \"Don\" O'Conal
48a0d477db qt4: fix build on darwin (close #750) 2013-07-28 09:47:05 +02:00
Jason \"Don\" O'Conal
75dedeb8bd gtk2: fix build on darwin (close #749)
* add xlibs.libXi to build inputs
2013-07-27 20:01:08 +02:00
Peter Simons
5ff9c0c067 haskell-dns: disable the test suite to fix the build
The test suite assumes that it can read /etc/resolv.conf.
2013-07-26 19:40:48 +02:00
Peter Simons
9d7cb9b593 haskell-unix-process-conduit: update to version 0.2.1.1 2013-07-26 19:40:47 +02:00
Peter Simons
b04d577dcb haskell-language-java: update to version 0.2.5 2013-07-26 19:40:47 +02:00
Peter Simons
93b8532f17 haskell-hinotify: update to version 0.3.6 2013-07-26 19:40:47 +02:00
Peter Simons
88cb67fc88 haskell-dns: update to version 0.3.7 2013-07-26 19:40:47 +02:00
Rickard Nilsson
1870210926 libvirt: Update to 1.1.0 2013-07-24 14:42:01 +02:00
Peter Simons
775fbbe46b haskell-yesod-platform: update to version 1.2.3 2013-07-23 15:58:44 +02:00
Peter Simons
91c98e03c6 haskell-fclabels: update to version 1.1.7.1 2013-07-23 15:58:44 +02:00
Peter Simons
025995edaf haskell-fclabels: disable the Haddock documentation to fix the build
https://github.com/sebastiaanvisser/fclabels/issues/20
2013-07-23 14:15:30 +02:00
Peter Simons
57844acb42 haskell-unix-time: update to version 0.1.10 2013-07-23 14:15:30 +02:00
Peter Simons
cf4c6a6949 haskell-simple-sendfile: update to version 0.2.12 2013-07-23 14:15:30 +02:00
Peter Simons
ba95a91106 haskell-postgresql-simple: update to version 0.3.4.0 2013-07-23 14:15:30 +02:00
Peter Simons
3f2d39e421 haskell-highlighting-kate: update to version 0.5.5 2013-07-23 14:15:29 +02:00
Peter Simons
fad190185b haskell-fclabels: update to version 1.1.7 2013-07-23 14:15:29 +02:00
Peter Simons
08c2f03b29 haskell-fast-logger: update to version 0.3.2 2013-07-23 14:15:29 +02:00
Peter Simons
b95e01dd88 haskell-monad-par: update to version 0.3.4.3 2013-07-23 14:15:29 +02:00
Rob Vermaas
212a2a5c37 Fix junit 2013-07-22 21:29:07 +02:00
Rickard Nilsson
3fa913d5ec libspotify: Fix build for linux.
For Linux, the phases was run in the wrong order. I've
fixed that, but the package is still a complete mess that
needs to be cleaned up. The linux and darwin builds should
probably be separated into two different Nix expressions
to avoid the current conditional mess.
2013-07-22 16:31:38 +02:00
Peter Simons
7eea045b28 haskell-yesod-bin: update to version 1.2.2 2013-07-21 16:23:58 +02:00
Peter Simons
8d83506452 haskell-yaml: update to version 0.8.4 2013-07-21 16:23:58 +02:00
Peter Simons
88da6b5d89 haskell-xml-types: update to version 0.3.4 2013-07-21 16:23:58 +02:00
Peter Simons
9102dbe667 haskell-xml-conduit: update to version 1.1.0.5 2013-07-21 16:23:58 +02:00
Peter Simons
f749af3daa haskell-shakespeare-text: update to version 1.0.0.6 2013-07-21 16:23:57 +02:00
Peter Simons
fdf9b9784c haskell-shakespeare-js: update to version 1.1.4.1 2013-07-21 16:23:57 +02:00
Peter Simons
e1c3350da4 haskell-shakespeare-css: update to version 1.0.6.2 2013-07-21 16:23:57 +02:00
Peter Simons
8e736f12d4 haskell-contravariant: update to version 0.4.3 2013-07-21 15:52:33 +02:00
Peter Simons
a98a96bffe haskell-conduit: update to version 1.0.7.3 2013-07-21 15:52:33 +02:00
Peter Simons
1d8c4711f6 haskell-comonad-transformers: update to version 3.0.4 2013-07-21 15:52:33 +02:00
Peter Simons
8740b48d86 haskell-classy-prelude: update to version 0.5.9 2013-07-21 15:52:33 +02:00
Peter Simons
16581965df haskell-attoparsec-conduit: update to version 1.0.1.2 2013-07-21 15:52:33 +02:00
Peter Simons
a2b44374ab haskell-atomic-primops: update to version 0.4 2013-07-21 15:52:33 +02:00
Peter Simons
2d0c35ad88 Merge pull request #771 from aforemny/haskell-qrencode
Add haskell-qrencode
2013-07-21 06:41:58 -07:00
Peter Simons
0685198b53 Merge pull request #770 from aforemny/haskell-elm
Add Elm and elm-server
2013-07-21 06:41:26 -07:00
Alexander Foremny
7f874ca558 Add haskell-happstack-lite 2013-07-20 12:30:55 +02:00
Alexander Foremny
f2f0674c5b Add haskell-qrencode 2013-07-20 12:29:00 +02:00
Rickard Nilsson
8a357239ac libevent: Update to 2.0.21 2013-07-19 13:07:12 +02:00
Evgeny Egorochkin
a0c3bc137b JUnit: fix url 2013-07-18 20:37:32 +03:00
Lluís Batlle i Rossell
328774ab1f Updating qgis (1.8.0 & geos (3.3.8).
I also add libspatialindex and libspatialite, to get the latest qgis building.
2013-07-18 11:43:01 +02:00
Peter Simons
f1e8140966 haskell-hackage-db: update to version 1.7 2013-07-17 19:07:51 +02:00
Peter Simons
8807aab195 haskell-Hipmunk: update to version 5.2.0.11 2013-07-17 19:07:51 +02:00
Eelco Dolstra
8eea8bbd1f mesa: Update to 9.1.4 2013-07-17 15:29:02 +02:00
Peter Simons
ccc6de3f77 haskell-semigroupoids: update to version 3.1 2013-07-17 13:06:47 +02:00
Peter Simons
8db3aac875 haskell-numtype: update to version 1.0.1 2013-07-17 13:06:47 +02:00
Peter Simons
b7962135db haskell-numtype-tf: update to version 0.1.1 2013-07-17 13:06:47 +02:00
Peter Simons
c2f14b02ed haskell-dimensional: update to version 0.12.1 2013-07-17 13:06:47 +02:00
Peter Simons
b24d3e5b79 haskell-dimensional-tf: update to version 0.2 2013-07-17 13:06:47 +02:00
Peter Simons
49818d17da haskell-active: update to version 0.1.0.6 2013-07-17 13:06:46 +02:00
Peter Simons
3a9c3b9b41 haskell-MonadRandom: update to version 0.1.10 2013-07-17 13:06:46 +02:00
Lluís Batlle i Rossell
9a6d5bf9c6 Revert "libva: update (fix h264encode)"
It breaks the latest vlc, and I don't need the new libva that much.
http://hydra.nixos.org/build/5540612/nixlog/1/tail-reload

This reverts commit 6a13cd01ac.
2013-07-16 22:27:05 +02:00
Peter Simons
c428feb0c4 haskell-gitit: jailbreak to support recent versions of happstack-server 2013-07-16 15:41:34 +02:00
Peter Simons
1cbfea141c haskell-zeromq3-haskell: update to version 0.5 2013-07-16 15:41:34 +02:00
Peter Simons
751c267649 haskell-unbound: update to version 0.4.2 2013-07-16 15:41:34 +02:00
Peter Simons
8663959559 haskell-th-orphans: update to version 0.7.0.1 2013-07-16 15:41:34 +02:00
Peter Simons
752a1889d5 haskell-snap: update to version 0.12.1 2013-07-16 15:41:34 +02:00
Peter Simons
e24f16aef6 haskell-random-source: update to version 0.3.0.6 2013-07-16 15:41:34 +02:00
Peter Simons
073667d20d haskell-happstack-server: update to version 7.3.0 2013-07-16 15:41:33 +02:00
Peter Simons
15555c4577 haskell-happstack-hamlet: update to version 7.0.3 2013-07-16 15:41:33 +02:00
Peter Simons
9518e1190a haskell-dual-tree: update to version 0.1.0.3 2013-07-16 15:41:33 +02:00
Lluís Batlle i Rossell
6a13cd01ac libva: update (fix h264encode) 2013-07-14 22:27:51 +02:00
Peter Simons
dc988c815b haskell-src-meta: jailbreak to fix build with recent versions of th-orphans 2013-07-14 21:51:37 +02:00
Peter Simons
84d43394c6 pkgs/development/libraries/aspell/dictionaries.nix: strip trailing whitespace 2013-07-14 21:32:47 +02:00
Peter Simons
2741391fda Partially revert commit 075796e053.
The commit downgraded the german language dictionary from version 20030222-1 to
20120607 (and broke the build in the process). That change was probably not
intended?
2013-07-14 21:32:33 +02:00
Peter Simons
b71c382f6f haskell-bindings-posix: fix bogus change committed earlier 2013-07-14 21:22:57 +02:00
Peter Simons
913685d0ac haskell-snap: jailbreak to fix build with recent versions of comonad 2013-07-14 21:11:29 +02:00
Peter Simons
0bdc4a1a94 haskell-th-orphans: update to version 0.7 2013-07-14 21:09:17 +02:00
Peter Simons
dca0df5364 haskell-shelly: update to version 1.3.0.7 2013-07-14 21:05:59 +02:00
Peter Simons
bdcc7b7d18 haskell-pipes-concurrency: update to version 1.2.1 2013-07-14 21:05:59 +02:00
Peter Simons
7923a212f7 haskell-monad-par-extras: update to version 0.3.3 2013-07-14 21:05:58 +02:00
Peter Simons
3602951e6f haskell-comonads-fd: update to version 3.0.3 2013-07-14 21:05:58 +02:00
Peter Simons
b193bd0db3 haskell-comonad: update to version 3.1 2013-07-14 21:05:58 +02:00
Peter Simons
1ae62db2e0 haskell-bindings-posix: update to version 1.2.3 2013-07-14 21:05:58 +02:00
Peter Simons
26dd59b8b4 haskell-acid-state: update to version 0.11.4 2013-07-14 21:05:58 +02:00
Peter Simons
07c3591ddb haskell-SDL: update to version 0.6.5 2013-07-14 21:05:58 +02:00
Peter Simons
e401940008 haskell-abstract-deque: disable test suite to avoid bug in GHC 7.4.2 2013-07-14 21:05:50 +02:00
Domen Kožar
7b11eac353 Merge pull request #746 from lovek323/gst-plugins-base
gst-plugins-base: fix build on darwin
2013-07-14 06:19:44 -07:00
Michael Raskin
9566d66171 Fix gtkspell 2013-07-14 14:47:28 +04:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Evgeny Egorochkin
d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin
5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Evgeny Egorochkin
bb48cab777 Fix licenses. My fixes were more carefully checked against sources and home page license claims :) 2013-07-14 02:11:41 +03:00
Evgeny Egorochkin
075796e053 aspell dictionaries: update where possible and try to make it easier to automatically parse versions 2013-07-14 02:08:55 +03:00
Evgeny Egorochkin
567b74b5d3 vmime: indicate that this is a pre-release version 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin
bbd631250d ucl: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin
c8e8cfc0d1 libmrss: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin
f889b52c30 libgeotiff: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin
36d0df0498 lesstif: fix version to match tarball 2013-07-14 02:08:49 +03:00
Jason "Don" O'Conal
291e0a111a gst-plugins-base: fix build on darwin
* add libintl
2013-07-14 08:06:01 +10:00
Shea Levy
e193a4f898 Fix gtk2 build
libintlOrEmpty is [], not null, when libintl isn't needed

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 16:01:06 -04:00
Shea Levy
3b274caaac Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 15:54:39 -04:00
Gergely Risko
a97936fba8 Add bindings-DSL and bindings-posix hackage packages 2013-07-12 16:26:48 +02:00
Jason \"Don\" O'Conal
f2dea7d287 xvidcore: fix build on darwin
* remove unnecessary gcc flag
* add --enable-macosx_module configure flag
* add --disable-assembly configure flag
* fix postInstall phase
2013-07-12 16:26:48 +02:00
Jason \"Don\" O'Conal
6fc89eead6 qt48: fix build on darwin
* build with clang
2013-07-12 16:26:47 +02:00
Jason \"Don\" O'Conal
3d6f857f99 pangomm: fix build on darwin
* add cairo to build inputs
* fix cairo include path
2013-07-12 16:26:47 +02:00
Jason \"Don\" O'Conal
ab067cf633 openal: fix build on darwin
* disable alsaLib
2013-07-12 16:26:47 +02:00
Jason \"Don\" O'Conal
481be8185f libvpx: fix build on darwin
* remove --enable-shared configure flag
* replace '-arch x86_64' with 'march=x86-64'
2013-07-12 16:26:46 +02:00
Jason \"Don\" O'Conal
7b975abc16 libvdpau: fix build on drawin
* force x86_64 arch
2013-07-12 16:26:46 +02:00
Jason \"Don\" O'Conal
f3c863b8e3 libsoup: fix build on darwin
* add libintlOrEmpty to build inputs
* add -lintl to LDFLAGS
2013-07-12 16:26:46 +02:00
Jason \"Don\" O'Conal
dcc4ffdb7f libsndfile: fix build on darwin
* build with gccApple
* add Carbon headers to include path
2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal
3a1a7b2d6a libsamplerate: fix build on darwin
* build with gccApple
* add Carbon include path
2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal
c449a67e01 libmikmod: fix build on darwin
* build with gccApple
2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal
970346e2d1 libmad: fix build on darwin
* stop building with an i486 architecture

Conflicts:
	pkgs/development/libraries/libmad/default.nix
2013-07-12 16:26:45 +02:00
Jason \"Don\" O'Conal
7573056652 gtk++: fix build on darwin
* add -lintl to CFLAGS
2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal
8c54b95273 glib: fix build on darwin
* add libintlOrEmpty to build inputs
* add -lintl to CFLAGS
2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal
735555d86f ffmpeg: fix build on darwin
* build with gccApple
* don't delete '*.a' files when building xvidcore
2013-07-12 16:26:44 +02:00
Jason \"Don\" O'Conal
7ef50f5098 audiofile: fix build on darwin
* disable alsaLib
* build with gccApple
2013-07-12 16:26:43 +02:00
Evgeny Egorochkin
67b0d62aa9 attica: version bump to 0.4.2 2013-07-12 16:36:11 +03:00
Evgeny Egorochkin
5a562ccac8 Soprano: version bump to 2.9.3 2013-07-12 16:36:11 +03:00
Evgeny Egorochkin
4d29005771 Fix url 2013-07-12 02:52:20 +03:00
Peter Simons
2efe295e92 haskell-hledger-web: update to version 0.21.3 2013-07-11 01:31:48 +02:00
Peter Simons
6fde3cf455 haskell-xml-conduit: update to version 1.1.0.4 2013-07-10 10:29:23 +02:00
Peter Simons
a77b49be65 haskell-shelly: update to version 1.3.0.6 2013-07-10 10:29:23 +02:00
Peter Simons
2ddb1bce74 haskell-postgresql-libpq: update to version 0.8.2.3 2013-07-10 10:29:23 +02:00
Peter Simons
a7c66776cb haskell-persistent: update to version 1.2.2.0 2013-07-10 10:29:23 +02:00
Peter Simons
eda01e3439 haskell-atomic-primops: update to version 0.2.2 2013-07-10 10:29:23 +02:00
Peter Simons
cc121fb9fe haskell-abstract-deque: update to version 0.2.2 2013-07-10 10:29:23 +02:00
Gergely Risko
b42f757d6b Build haddock for transformers-compat 2013-07-10 10:29:22 +02:00
Rickard Nilsson
a49aeec10d openldap: Upgrade to 2.4.35 2013-07-10 08:49:54 +02:00
Mathijs Kwik
6e8a060bca spice: enable client
this will split nicely once we merge multiple-outputs
2013-07-09 07:22:45 +02:00
aszlig
1a9e99a8e4
Add new package minmay in version 1.0.0.
This is a fork of the iksemel library, which is no longer maintained and is
highly broken in regards to TLS support (even in the release versions).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-08 14:27:43 +02:00
Peter Simons
56518d73b8 haskell-yesod-platform: update to version 1.2.2 2013-07-08 14:05:03 +02:00
Peter Simons
31d4df10dc haskell-yesod-auth: update to version 1.2.0.2 2013-07-08 14:05:03 +02:00
Peter Simons
5e867b6e80 haskell-threadmanager: update to version 0.1.7 2013-07-08 14:05:03 +02:00
Peter Simons
8976670d9d haskell-persistent: update to version 1.2.1.1 2013-07-08 14:05:02 +02:00
Peter Simons
62afa83e71 haskell-oeis: update to version 0.3.5 2013-07-08 14:05:02 +02:00
Peter Simons
68c14a66be haskell-network-conduit-tls: update to version 1.0.0.3 2013-07-08 14:05:02 +02:00
Peter Simons
df2295fa5f haskell-hmatrix: update to version 0.15.0.0 2013-07-08 14:05:02 +02:00
Peter Simons
1d0fa21944 haskell-filesystem-conduit: update to version 1.0.0.1 2013-07-08 14:05:02 +02:00
Peter Simons
ff42719fd7 haskell-data-binary-ieee754: update to version 0.4.4 2013-07-08 14:05:02 +02:00
Peter Simons
75e376120a haskell-conduit: update to version 1.0.7.1 2013-07-08 14:05:02 +02:00
Peter Simons
7b89bb2da4 haskell-attoparsec-conduit: update to version 1.0.1.1 2013-07-08 14:05:02 +02:00
Rok Garbas
5d3a07f57e Merge pull request #723 from lovek323/darwin-tools
otool and setfile: cleanup
2013-07-07 04:49:04 -07:00
Jason \"Don\" O'Conal
ec9f54602e avahi: fix build on darwin 2013-07-07 13:44:06 +02:00
Jason \"Don\" O'Conal
0dd6c44183 portaudio: fix license (fix #728) 2013-07-07 13:16:00 +02:00
Jason "Don" O'Conal
525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Lluís Batlle i Rossell
be2dfd1b72 Updating libzrtpcpp to 2.3.4.
I think it fixes the security threats exposed in:
http://blog.azimuthsecurity.com/2013/06/attacking-crypto-phones-weaknesses-in.html
2013-07-06 14:34:15 +02:00
Rok Garbas
33d957b34b Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify
Conflicts:
	pkgs/top-level/all-packages.nix
2013-07-06 13:51:31 +02:00
Jason \"Don\" O'Conal
cd5f3dc1fa portaudio: fix build on darwin
* remove alsaLib from build inputs
* add --build=x86_64 to configure flags
* add --without-oss to configure flags
* add --enable-static to configure flags
* add --enable-shared to configure flags
* add framework header files
* disable failed tests
* copy all headers on install
* build with gccApple
2013-07-06 13:46:18 +02:00
Peter Simons
400d4a03b0 Update references to 'rLang' to the new name 'R'. 2013-07-04 23:41:22 +02:00
Jason \"Don\" O'Conal
f5a130b6b3 newsbeuter: add expression 2013-07-04 19:17:07 +02:00
Eelco Dolstra
e638620100 spice: Update to 0.12.3 2013-07-04 18:27:26 +02:00
Eelco Dolstra
e3e35c1f15 spice-protocol: Update to 0.12.6 2013-07-04 18:27:26 +02:00
Vladimír Čunát
4a0952d2fa fix bad "licence" names
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
2013-07-04 18:16:34 +02:00
Peter Simons
cfbae2de73 haskell-shelly: update to version 1.3.0.3 2013-07-04 17:56:12 +02:00
Peter Simons
f0738b3c16 haskell-oeis: update to version 0.3.4 2013-07-04 17:56:12 +02:00
Vladimír Čunát
e9f0d1013d qt4: maintenance update 4.8.4 -> 4.8.5
Also fixed search path for libGL.
Tested building against master.
2013-07-04 15:29:23 +02:00
Peter Simons
3df0409cb6 liblapack: propagate the 'shared' flag to atlas 2013-07-04 13:42:47 +02:00
Jason \"Don\" O'Conal
9007e57f28 python27: compile with tkinterp on darwin 2013-07-04 13:11:25 +02:00
Jason \"Don\" O'Conal
bd61c42d22 tk: fix build on darwin 2013-07-04 13:11:24 +02:00
Vladimír Čunát
01548459be Merge pull request #711 from lovek323/gnuplot
gnuplot and others: fix build on darwin
2013-07-04 02:17:35 -07:00
Jason "Don" O'Conal
cf3364bdb6 libspotify: add darwin library 2013-07-04 19:12:26 +10:00
Jason "Don" O'Conal
3babc55ae2 wxGTK29: fix build on darwin
* use clang to compile
* add configure flags to enable building for 64-bit
* add setFile to build inputs
2013-07-04 08:50:15 +10:00
Peter Simons
9e98650f8d boost: generalize the header-only expression
The 'header-only-wrapper' expression can now wrap any version of boost
that's passed to it as an argument.
2013-07-03 21:38:34 +02:00
Peter Simons
ea04555518 boost-headers: update to version 1.54.0 2013-07-03 21:26:31 +02:00
Peter Simons
cb31653acb boost: add version 1.54.0 2013-07-03 18:55:51 +02:00
Peter Simons
b3a3f0f521 haskell-yaml: update to version 0.8.3 2013-07-03 18:48:11 +02:00
Peter Simons
d31b934ad2 haskell-shelly: update to version 1.3.0.2 2013-07-03 18:48:11 +02:00
Peter Simons
4d8327877c haskell-shakespeare-css: update to version 1.0.6.1 2013-07-03 18:48:11 +02:00
Peter Simons
d36c915686 haskell-oeis: update to version 0.3.3 2013-07-03 18:48:11 +02:00
Jason "Don" O'Conal
3e14bb6fdf gst-plugins-base: fix build on darwin
* remove alsaLib and cdparanoia from build inputs
* add cairo to build inputs
2013-07-04 00:25:53 +10:00
Jason "Don" O'Conal
216d47be0c gobject-introspection: fix build on darwin
* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs
2013-07-03 22:03:48 +10:00
Jason "Don" O'Conal
84f5d870f3 glib: remove unnecessary restrictions on darwin 2013-07-03 22:03:47 +10:00
Jason "Don" O'Conal
3b54af72b1 cracklib: fix build on darwin
* add libintlOrEmpty to build inputs
2013-07-03 22:03:47 +10:00
Jason "Don" O'Conal
bdf5a5c20e liboil: fix build on darwin
* force --build=x86_64
2013-07-03 19:57:38 +10:00
Peter Simons
8e95d2564d haskell-time: bring back version 1.1.2.4 to un-break Haskell Platform 2009.2.0.2 2013-07-01 12:16:38 +02:00
Peter Simons
d9a71f35c8 haskell-oeis: the test suite depends on network access 2013-07-01 12:11:06 +02:00
Peter Simons
8bb29fb94a haskell-http-attoparsec: add version 0.1.0 2013-07-01 12:11:05 +02:00
Peter Simons
2ece8f76f5 haskell-warp-tls: add version 1.4.1.3 2013-07-01 12:11:05 +02:00
Peter Simons
b8a44d7289 haskell-byteable: add version 0.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
66a0b56567 haskell-zeromq3-haskell: update to version 0.4 2013-07-01 12:11:05 +02:00
Peter Simons
028dd8b25e haskell-yesod: update to version 1.2.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
9e6de5d8c7 haskell-yesod-form: update to version 1.3.0.1 2013-07-01 12:11:05 +02:00
Peter Simons
928af0cb55 haskell-yesod-core: update to version 1.2.3 2013-07-01 12:11:05 +02:00
Peter Simons
4c3f84b572 haskell-yesod-bin: update to version 1.2.1 2013-07-01 12:11:05 +02:00
Peter Simons
aa4d6ca07d haskell-xss-sanitize: update to version 0.3.4 2013-07-01 12:11:05 +02:00
Peter Simons
3c5de343a2 haskell-warp: update to version 1.3.9 2013-07-01 12:11:05 +02:00
Peter Simons
e0470dcdff haskell-wai-test: update to version 1.3.1.1 2013-07-01 12:11:05 +02:00
Peter Simons
66e80948bb haskell-void: update to version 0.6.1 2013-07-01 12:11:05 +02:00
Peter Simons
435eab8d23 haskell-unix-time: update to version 0.1.9 2013-07-01 12:11:04 +02:00
Peter Simons
edc1b8d14a haskell-threadmanager: update to version 0.1.6 2013-07-01 12:11:04 +02:00
Peter Simons
2af75c20c7 haskell-tagged: update to version 0.6.1 2013-07-01 12:11:04 +02:00
Peter Simons
643455fcea haskell-smallcheck: update to version 1.0.4 2013-07-01 12:11:04 +02:00
Peter Simons
b7e4259ac5 haskell-shelly: update to version 1.3.0.1 2013-07-01 12:11:04 +02:00
Peter Simons
ec8723e71a haskell-shake: update to version 0.10.6 2013-07-01 12:11:04 +02:00
Peter Simons
7a5c803932 haskell-semigroupoids: update to version 3.0.3 2013-07-01 12:11:04 +02:00
Peter Simons
d71ce2786d haskell-profunctor-extras: update to version 3.3.1 2013-07-01 12:11:04 +02:00
Peter Simons
15a1283937 haskell-persistent: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
f35d36ed00 haskell-persistent-sqlite: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
be17d7d06c haskell-persistent-postgresql: update to version 1.2.1 2013-07-01 12:11:04 +02:00
Peter Simons
88034ca819 haskell-oeis: update to version 0.3.2 2013-07-01 12:11:03 +02:00
Peter Simons
42c3918056 haskell-mime-mail: update to version 0.4.2 2013-07-01 12:11:03 +02:00
Peter Simons
265e043cff haskell-io-choice: update to version 0.0.5 2013-07-01 12:11:03 +02:00
Peter Simons
469ec818b7 haskell-http-reverse-proxy: update to version 0.2.0 2013-07-01 12:11:03 +02:00
Peter Simons
585ee36fb9 haskell-http-conduit: update to version 1.9.4.1 2013-07-01 12:11:03 +02:00
Peter Simons
e3f3271812 haskell-hspec: update to version 1.6.1 2013-07-01 12:11:03 +02:00
Peter Simons
e6535b526a haskell-hspec-meta: update to version 1.6.1 2013-07-01 12:11:03 +02:00
Peter Simons
f3ee0ca904 haskell-hledger: update to version 0.21.3 2013-07-01 12:11:03 +02:00
Peter Simons
54fb831ad7 haskell-hledger-lib: update to version 0.21.3 2013-07-01 12:11:03 +02:00
Peter Simons
2838565f9a haskell-highlighting-kate: update to version 0.5.4 2013-07-01 12:11:03 +02:00
Peter Simons
717a181d0d haskell-gloss: update to version 1.7.8.4 2013-07-01 12:11:02 +02:00
Peter Simons
3b29e271dd haskell-file-embed: update to version 0.0.4.9 2013-07-01 12:11:02 +02:00
Peter Simons
932df79a85 haskell-errors: update to version 1.4.2 2013-07-01 12:11:02 +02:00
Peter Simons
de20da33c3 haskell-either: update to version 3.4.1 2013-07-01 12:11:02 +02:00
Peter Simons
4b40122b69 haskell-dimensional: update to version 0.12 2013-07-01 12:11:02 +02:00
Peter Simons
2c33e25eed haskell-cryptohash: update to version 0.9.1 2013-07-01 12:11:02 +02:00
Peter Simons
3af166f42b haskell-constraints: update to version 0.3.3 2013-07-01 12:11:02 +02:00
Peter Simons
2cb552f2dc haskell-conduit: update to version 1.0.7 2013-07-01 12:11:02 +02:00
Peter Simons
3e5b4ccd9a haskell-comonads-fd: update to version 3.0.2 2013-07-01 12:11:02 +02:00
Peter Simons
d83f8248c3 haskell-comonad: update to version 3.0.3 2013-07-01 12:11:02 +02:00
Peter Simons
126dd12da2 haskell-comonad-transformers: update to version 3.0.3 2013-07-01 12:11:01 +02:00
Peter Simons
6e07719f4c haskell-cmdargs: update to version 0.10.4 2013-07-01 12:11:01 +02:00
Peter Simons
ee53871062 haskell-authenticate-oauth: update to version 1.4.0.7 2013-07-01 12:11:01 +02:00
Peter Simons
cf0fba67dc haskell-acid-state: update to version 0.11.3 2013-07-01 12:11:01 +02:00
Peter Simons
b0b9f1fd5c haskell-time: update to version 1.4.1 2013-07-01 12:11:01 +02:00
Gergely Risko
64cbe2d6ee Update hflags to 0.2 2013-07-01 11:40:38 +02:00
Mathijs Kwik
04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Michael Raskin
6d42b3b1dc srtp: fix URL 2013-06-30 12:09:42 +04:00
Lluís Batlle i Rossell
169c8ce3f7 Linphone 3.6.1
Lots of updates and new/old libs to get the latest linphone

It segfaults on running.
2013-06-29 16:59:08 +02:00
Domen Kožar
26e9afaa28 Merge pull request #658 from aristidb/master
Pulseaudio 4.0 (and sbc 1.1)
2013-06-29 07:57:18 -07:00
Lluís Batlle i Rossell
7c74edc9bc sipwitch: update to 1.6.1 to fix build 2013-06-29 15:30:05 +02:00
Lluís Batlle i Rossell
748a0f607b Updating siproxd to 0.8.1, and libosip. 2013-06-29 15:14:02 +02:00
Bjørn Forsman
b02b7bd162 sqlite: set meta.platforms so that Hydra will build it
I'm sure that sqlite works on more platforms than linux, but I cannot
verify that myself (I only have linux). So I'll leave it up to the users
of other platforms to expand this as needed.
2013-06-29 13:36:08 +02:00
Vladimír Čunát
9404b2cc12 qt3: fix infinite recursion created by 0b17251c06 2013-06-28 08:33:43 +02:00
Mathijs Kwik
f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik
e78b013fe3 libpng: merge apng expression (keep patch disabled by default)
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra
989c58eb29 Process /etc/fonts/conf.d before upstream fonts/conf.d
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
2013-06-27 13:31:35 +02:00
Lluís Batlle i Rossell
5ff3d84137 Adding sflphone.
Merge branch 'sflphone'
2013-06-27 00:10:13 +02:00
Lluís Batlle i Rossell
d3e7649eee Update ucommon to 6.0.5.
The hope that newer means better.
2013-06-26 23:47:34 +02:00
Lluís Batlle i Rossell
c77f6a0c2f As libccrtp propagates ucommon, it's not needed in libzrtpcpp. 2013-06-26 23:47:09 +02:00
Lluís Batlle i Rossell
3d8cd48c58 Making ccrtp propagate its build time requirement, ucommon. 2013-06-26 23:46:47 +02:00
Evgeny Egorochkin
9dc3599960 Merge pull request #676 from errge/master
Add regex-tdfa-text
2013-06-25 05:17:34 -07:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Gergely Risko
9b2a657f42 Add regex-tdfa-text 2013-06-25 13:01:41 +02:00
aszlig
5228e569e8
gpgme: Update to latest upstream version 1.4.1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-24 10:33:16 +02:00
Aristid Breitkreuz
ad06d4df18 update pulseaudio to 4.0 and sbc to 1.1 2013-06-22 17:25:47 +02:00
Peter Simons
933f77f10d Merge pull request #662 from rnons/yesod-bin
yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin.
2013-06-22 05:09:35 -07:00
Domen Kozar
dbe9bf7e59 networkmanagerapplet: 0.9.8.0 -> 0.9.8.2
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
2013-06-21 19:59:20 +02:00
Eelco Dolstra
143473406f freetype: Update to 2.4.12
Also update the Infinality patches.

Note that FreeType 2.5 was released a few days ago, but I don't know
how stable it is.
2013-06-21 18:44:33 +02:00
rnons
f84119331c yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. 2013-06-21 22:55:37 +08:00
aszlig
f974573a5e
iksemel: Add new package with version 1.4.
This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
Peter Simons
8c2b28b4a6 haskell-mongoDB: update to version 1.4.1 2013-06-20 12:37:54 +02:00
Peter Simons
b2b6c81d4c haskell-ghc-heap-view: update to version 0.5.1 2013-06-20 12:37:54 +02:00
Lluís Batlle i Rossell
5f28fb15af Note about the source of previous build fix in glext85 2013-06-19 17:38:38 +02:00
Lluís Batlle i Rossell
d4aa6099bd Fixing vaapi-vdpau build with newer mesa. 2013-06-19 17:33:44 +02:00
Peter Simons
962e2aede8 haskell-postgresql-simple: update to version 0.3.3.2 2013-06-19 10:42:43 +02:00
Peter Simons
c7097891e0 haskell-persistent-template: update to version 1.2.0.2 2013-06-19 10:42:43 +02:00
Peter Simons
f14d6839b1 haskell-hakyll: update to version 4.3.1.0 2013-06-19 10:42:43 +02:00
Peter Simons
5e5b04d00a haskell-JuicyPixels: update to version 3.1 2013-06-19 10:42:43 +02:00
Peter Simons
7154e32f65 Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10. 2013-06-19 10:42:42 +02:00
Vladimír Čunát
4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Evgeny Egorochkin
6b4eaf71fe Merge pull request #636 from craff/glsurf
Glsurf (3D drawing of implicit surfaces and curves)
2013-06-18 22:34:08 -07:00
Oliver Charles
81b564b52e haskellPackages: vector-0.9.1 fix 'primitive' dependency 2013-06-19 00:28:30 +01:00
Vladimír Čunát
e366dc565a Fix the hash changes accidentally caused in 98436616
Moreover I'm not sure It's legal to add *lists inside* buildInputs.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát
3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Sander van der Burg
98436616a5 Replaced ad-hoc gettext buildinput by libintlOrEmpty 2013-06-18 22:01:40 +02:00
Vladimír Čunát
92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát
ab7d7333be dbus: attempt to fix build on FreeBSD and Darwin
Also build it there.
2013-06-18 17:52:09 +02:00
Vladimír Čunát
a8f153267c qt48: security fix for CVE-2013-0254
Taken from Gentoo.
2013-06-18 13:57:15 +02:00
Vladimír Čunát
53fa11cfc9 poppler: attempt to fix missing libiconv on non-Linux 2013-06-18 12:53:19 +02:00
Sander van der Burg
23f43527e1 harfbuzz needs libintl on non glibc platforms 2013-06-18 10:36:28 +02:00
Jason \"Don\" O'Conal
85bfa943f7 glib: fix on darwin (merge #644)
* include Foundation.h header
* add myself to maintainers
* build with gccApple

@vcunat: minor refactoring.
2013-06-18 08:17:36 +02:00
Vladimír Čunát
6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Lluís Batlle i Rossell
2c71506929 nlopt: build octave plugins 2013-06-17 12:47:45 +02:00
Vladimír Čunát
cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Peter Simons
41a0ef966b haskell-Chart: use the homepage URL specified in the cabal file 2013-06-17 09:57:37 +02:00
Gergely Risko
7a602e5f86 Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk 2013-06-17 09:53:28 +02:00
Christophe Raffalli
c205449003 upgraded freeglut to 2.8.1 (menu are broken in 2.8.0) 2013-06-16 22:33:41 +02:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Mathijs Kwik
1f4c079bc3 Re-propagate libdrm 2013-06-15 17:15:07 +04:00
Peter Simons
9ce5dec479 cosmetic 2013-06-15 13:40:59 +02:00
Peter Simons
5a1e9a9cf2 haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4 2013-06-15 13:18:51 +02:00
Peter Simons
0ec9ca98a9 haskell-shake: update to version 0.10.5 2013-06-15 12:39:16 +02:00
Peter Simons
67fc03f1e4 haskell-accelerate: update to version 0.13.0.5 2013-06-15 12:39:16 +02:00
Peter Simons
41b4c3da48 haskell-accelerate-io: update to version 0.13.0.2 2013-06-15 12:39:16 +02:00
Peter Simons
ad8413ac0b haskell-accelerate-cuda: update to version 0.13.0.3 2013-06-15 12:39:16 +02:00
Peter Simons
0f25c404bc haskell-hashable: add version 1.2.0.10 2013-06-15 12:39:15 +02:00
Peter Simons
c0d78bf9a6 Merge pull request #621 from errge/xtest
Add haskell/xtest
2013-06-15 03:37:39 -07:00
Peter Simons
c7ee3ca11c Merge pull request #622 from errge/hit
Add hit and (it's dependency,) bytedump
2013-06-15 03:37:12 -07:00
Peter Simons
c9192f5ed5 Merge pull request #624 from errge/template-default
Add template-default
2013-06-15 03:36:42 -07:00
Peter Simons
4399352078 Merge pull request #625 from errge/vector
Add vectorThUnbox
2013-06-15 03:34:13 -07:00
Mathijs Kwik
4d19da7e99 gtk-2: remove unneeded argument 2013-06-14 13:49:35 +02:00
Eelco Dolstra
672ae93687 jquery-ui: Update to 1.10.3
Also add a symlink jquery.js (jquery.min.js is gone).
2013-06-14 13:38:37 +02:00
Gergely Risko
fab2610bcf Add vectorThUnbox 2013-06-14 13:09:11 +02:00
Gergely Risko
4d49435cf6 Add template-default 2013-06-14 13:04:40 +02:00
Gergely Risko
89f28c9923 Add hit and (it's dependency,) bytedump 2013-06-14 11:57:24 +02:00
Gergely Risko
efb46727cb Add haskell/xtest 2013-06-14 11:35:52 +02:00
Michael Raskin
7093dd2c70 Some fixes 2013-06-14 07:46:33 +04:00
Michael Raskin
1a41887398 Fix a missing option declaration after merge 2013-06-14 00:11:34 +04:00
Michael Raskin
605c5a55a8 Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates 2013-06-14 00:10:35 +04:00
Vladimír Čunát
94d8de2b99 dbus: fix build on non-Linux platforms
We do not want systemd there.
This should fix the tarball job systemd assertion problems.
2013-06-13 21:02:00 +02:00
Vladimír Čunát
84bf7818a4 dbus: minor update, fixing DOS CVE-2013-2168
I tried building some X apps, all seems fine.
2013-06-13 20:57:41 +02:00
Vladimír Čunát
fa6caedfea qt48: hopefully a version that works for all possibilities
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
c7536d2fa6 Merge pull request #617 from lovek323/vim_configurable
Get vim_configurable compiling on darwin
2013-06-13 05:41:12 -07:00
Vladimír Čunát
34f152e0d3 qt48: hopefully a good fix for parallel builds, finally
It caused rare failures, mainly for Qt for creator build.
2013-06-13 13:02:23 +02:00
Peter Simons
21e1ec9079 haskell-hakyll: update to version 4.3.0.0 2013-06-13 10:43:40 +02:00
Peter Simons
01c57234db haskell-concurrent-extra: update to version 0.7.0.6 2013-06-13 10:43:40 +02:00
Jason "Don" O'Conal
8232b0eef1 pango: add correct cairo include path 2013-06-13 18:11:36 +10:00
Jason "Don" O'Conal
dc0c630e54 gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Vladimír Čunát
e931f3b935 libgcrypt: attempt to fix i686-freebsd builds, #616
It would probably be better to get newer "as" from somewhere, but I
don't see how.
2013-06-13 10:00:04 +02:00
Jason "Don" O'Conal
930b88c2a9 cairo: add correct include path for pixman.h 2013-06-13 16:47:29 +10:00
Jason "Don" O'Conal
d884c2b639 gdk-pixbuf: add libintlOrEmpty to build inputs 2013-06-13 16:36:47 +10:00
Peter Simons
71439b3e96 Merge pull request #610 from lovek323/sup
Add sup expression
2013-06-12 23:33:19 -07:00
Jason "Don" O'Conal
7e52e251e8 atk: add libintlOrEmpty as build input 2013-06-13 16:30:27 +10:00
Jason "Don" O'Conal
150a6a7063 Rename ruby gpgme gem to ruby-gpgme 2013-06-13 14:14:44 +10:00
Jason "Don" O'Conal
a5e65e66b1 sup: separate dependencies
create separate expressions for gems requiring native extensions to be
built:

* gpgme
* ncursesw_sup
* xapian_full_alaveteli
2013-06-13 10:45:51 +10:00
Gergely Risko
c51077b222 Add hflags 2013-06-12 21:25:53 +02:00
Alexander Foremny
bb53645b0f Add Elm and elm-server 2013-06-12 13:27:22 +02:00
Song Wenwu
92ba0a0913 gtk+: enable NLS support (merge #611)
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02:00
Peter Simons
acc6039e2c haskell-iteratee: jailbreak to fix build with recent versions of ListLike 2013-06-12 08:45:34 +02:00
Peter Simons
70b10b6267 haskell-snap-core: update to version 0.9.4.0 2013-06-12 08:45:34 +02:00
Peter Simons
0e169b92ec haskell-persistent: update to version 1.2.0.2 2013-06-12 08:45:34 +02:00
Peter Simons
a7c884eb18 haskell-acid-state: update to version 0.10.0 2013-06-12 08:45:34 +02:00
Peter Simons
fd1291e985 haskell-ListLike: update to version 4.0.0 2013-06-12 08:45:34 +02:00
Peter Simons
97f45745bd haskell-Agda: update to version 2.3.2.1 2013-06-12 08:45:33 +02:00
Vladimír Čunát
6b433019fa libvpx: update
Also set the shared-vpx for firefox, just to be sure.
Firefox, Chromium, and other seem to work fine.
2013-06-11 18:03:48 +02:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin
55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Peter Simons
1db5bd4aa9 haskell-hsdns: update to version 1.6.1 2013-06-11 13:14:28 +02:00
Peter Simons
03a65dbb11 haskell-ghc-vis: update to version 0.7.1 2013-06-10 11:26:50 +02:00
Peter Simons
d829182009 haskell-entropy: update to version 0.2.2.1 2013-06-10 11:26:50 +02:00
Peter Simons
977aaa93f9 haskell-contravariant: update to version 0.4.1 2013-06-10 11:26:50 +02:00
Peter Simons
6a7672d511 haskell-accelerate: update to version 0.13.0.4 2013-06-10 11:26:50 +02:00