Commit Graph

42432 Commits

Author SHA1 Message Date
lostdj
d8fc19da05 SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency
with JRE.

Closes #4081.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:11:35 +01:00
Mateusz Kowalczyk
c7bbc288b5 Merge branch 'cmplayer' of https://github.com/abbradar/nixpkgs
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:00:41 +01:00
Mateusz Kowalczyk
cdce34d82a Merge pull request #4153 from ambrop72/kdevelop47
Update KDevelop to 4.7.0.
2014-09-20 22:52:16 +01:00
Daniel Peebles
72e76a18c1 Update maven to 3.2.3 and put it in a more sensible location
Closes #4187.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:33:18 +01:00
Daniel Peebles
588a5e92a3 Add commons-math (binary until I get maven build working)
Drop jakarta name from fileupload and update its version

Jakarta regexp has been officially retired, and nothing in nixpkgs uses it, so let’s get rid of it.

Add commons-io

More commons additions/cleanup

Closes #4181

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:31:47 +01:00
Thomas Tuegel
26ebd25844 Merge branch 'maintainer-updates' 2014-09-20 15:55:25 -05:00
roconnor
bbd58db13a Merge pull request #4133 from vbgl/coq-8-3
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
2014-09-20 16:24:10 -04:00
Thomas Tuegel
49a1ff7a74 vobsub2srt: update to 20140817 2014-09-20 13:28:15 -05:00
Thomas Tuegel
fd293c2d88 biber: version bump to 1.9 2014-09-20 13:24:51 -05:00
Thomas Tuegel
ca76b95260 pcmanfm: version bump to 1.2.2 2014-09-20 13:21:01 -05:00
Thomas Tuegel
cfcf643bb9 Version bump: libfm-1.2.2.1 and menu-cache-0.7.0 2014-09-20 13:20:19 -05:00
Vincent Laporte
40e79043b0 mkOcamlPackages: simpler rule for lablgtk 2014-09-20 18:53:43 +01:00
Domen Kožar
1cbcd2baae Merge pull request #4184 from nathanielbaxter/dev/teamspeak_client
teamspeak client: Use nixpkgs libquazip. Remove qt4 dependancy.
2014-09-20 19:27:41 +02:00
Peter Simons
b608f55590 wai-websockets: jailbreak to fix build with recent io-streams 2014-09-20 18:02:43 +02:00
Peter Simons
d1edaee3c0 haskell-websockets-snap: jailbreak to fix build with recent io-streams 2014-09-20 18:00:08 +02:00
Peter Simons
2f21cb77f1 haskell-websockets: jailbreak to fix build with current versions of io-streams 2014-09-20 18:00:08 +02:00
Peter Simons
c06999c6c2 haskell-monad-journal: update to version 0.4.0.2 2014-09-20 18:00:07 +02:00
Peter Simons
1f7ec8cff5 haskell-fsnotify: re-generate expression with cabal2nix 2014-09-20 18:00:07 +02:00
Abhinav Gupta
d16452df12 fsnotify: 0.0.11 -> 0.1.0.3 2014-09-20 18:00:07 +02:00
Peter Simons
7d9d6cc482 haskell-streaming-commons: update to version 0.1.5 2014-09-20 18:00:07 +02:00
Peter Simons
f1a3b0fd58 haskell-shake: update to version 0.13.4 2014-09-20 18:00:07 +02:00
Peter Simons
8b4bcc1f98 haskell-rest-wai: update to version 0.1.0.4 2014-09-20 18:00:07 +02:00
Peter Simons
17185c1078 haskell-rest-types: update to version 1.11 2014-09-20 18:00:07 +02:00
Peter Simons
6ec3a69766 haskell-rest-snap: update to version 0.1.17.14 2014-09-20 18:00:06 +02:00
Peter Simons
ccc75f996b haskell-rest-happstack: update to version 0.2.10.3 2014-09-20 18:00:06 +02:00
Peter Simons
1d946eedd6 haskell-rest-gen: update to version 0.16 2014-09-20 18:00:06 +02:00
Peter Simons
9325c8b3b4 haskell-rest-core: update to version 0.33 2014-09-20 18:00:06 +02:00
Peter Simons
0270a7543c haskell-rest-client: update to version 0.4.0.1 2014-09-20 18:00:06 +02:00
Peter Simons
2f21c72199 haskell-random-fu: update to version 0.2.6.1 2014-09-20 18:00:06 +02:00
Peter Simons
b85511a86d haskell-pipes-binary: update to version 0.4.0.3 2014-09-20 18:00:05 +02:00
Peter Simons
c4123c06c6 haskell-persistent: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons
bb61652583 haskell-persistent-template: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons
bb847199fb haskell-persistent-sqlite: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons
245d5feee7 haskell-persistent-postgresql: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons
10d06ad787 haskell-persistent-mysql: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons
a833646da9 haskell-io-streams: update to version 1.2.0.0 2014-09-20 18:00:05 +02:00
Peter Simons
c72457f3e8 haskell-http-streams: update to version 0.7.2.0 2014-09-20 18:00:04 +02:00
Peter Simons
212c5e73a7 haskell-ghc-mod: update to version 5.1.0.2 2014-09-20 18:00:04 +02:00
Peter Simons
82a46ebb5c haskell-git-annex: update to version 5.20140919 2014-09-20 18:00:04 +02:00
Peter Simons
e95208ea86 haskell-ghc-mod: update default to version 5.x 2014-09-20 18:00:04 +02:00
Domen Kožar
dc09a2610f Merge pull request #4183 from nathanielbaxter/dev/quazip
quazip: Fix $out variable in installFlags.
2014-09-20 17:59:20 +02:00
Austin Seipp
9f15333589 openresty: 1.7.4.1rc1 -> 1.7.4.1rc2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-09-20 08:21:11 -05:00
Austin Seipp
49a5832805 spiped: 1.3.0 -> 1.4.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-09-20 07:39:44 -05:00
Jan Niklas Hasse
3b45556a3b atom: 0.99.0 -> 0.129.0
[Bjørn Forsman: include fixupPhase, to fix this startup error on NixOS:
 $ ./result/bin/atom
 ./result/bin/atom: /nix/store/q3r5ww6pg5yb4j6p0d8inrhbgzmik0b6-atom-0.129.0/bin/.atom-wrapped: /bin/bash: bad interpreter: No such file or directory
]
2014-09-20 14:02:08 +02:00
Nikolay Amiantov
6dfb6e5426 deadbeef: add package 2014-09-20 13:38:52 +02:00
Bjørn Forsman
263decc48a wireshark: fix meta.description 2014-09-20 13:28:46 +02:00
Bjørn Forsman
8983b60f87 wireshark: add CLI and Qt versions
In addition to our existing GTK version.

* Only install desktop file if building a GUI version.
* The Qt build appends "-qt" to the
  wireshark binary name. Undo it so the desktop file works.
* The 'wireshark' attribute still refers to the GTK version, for
  backwards compatibility.
2014-09-20 13:28:46 +02:00
Bjørn Forsman
1daa2e5a7e wireshark: update to 1.12.1 (latest stable)
There are no references to g_memmove in the source anymore, so remove
the now unneeded (and failing!) sed fixup.

Sourceforge no longer has wireshark sources, the page tells users to
download from www.wireshark.org instead. So do that.
2014-09-20 13:28:46 +02:00
Peter Simons
71230bafab Merge pull request #4182 from dmalikov/cabalg
haskellPackages.cabalg: 0.2.9
2014-09-20 12:07:10 +02:00
Nathaniel Baxter
5c898b15f3 quazip: Fix $out variable in installFlags. 2014-09-20 19:43:14 +10:00
Dmitry Malikov
7ad0646dc0 haskellPackages.cabalg: 0.2.9 2014-09-20 13:32:43 +04:00
Peter Simons
5d3bddf6ca haskell-http-streams: jailbreak to fix build with current openssl-streams 2014-09-20 11:29:36 +02:00
Peter Simons
377a1094cc haskell-lens: disable hlint test suite to fix the build
https://github.com/ekmett/lens/issues/478
2014-09-20 11:29:36 +02:00
Peter Simons
e444af5eb3 haskell-uuagc-cabal: update to version 1.0.6.0 2014-09-20 11:29:36 +02:00
Peter Simons
3e81fd4126 haskell-yesod-bin: update to version 1.2.13 2014-09-20 11:29:36 +02:00
Peter Simons
02d0b6e4fd haskell-yesod-auth: update to version 1.3.4.6 2014-09-20 11:29:36 +02:00
Peter Simons
16a701b8c5 haskell-shake: update to version 0.13.3 2014-09-20 11:29:36 +02:00
Peter Simons
3ada930077 haskell-rest-core: update to version 0.32.0.2 2014-09-20 11:29:36 +02:00
Peter Simons
5c34e9ecf4 haskell-markdown: update to version 0.1.11 2014-09-20 11:29:36 +02:00
Peter Simons
b4c812641c haskell-cabal-bounds: update to version 0.8.7 2014-09-20 11:29:36 +02:00
Peter Simons
93045512db haskell-persistent: update to version 2.0.3.1 2014-09-20 11:29:36 +02:00
Peter Simons
2a8b13edc1 haskell-persistent-template: update to version 2.0.3.2 2014-09-20 11:29:36 +02:00
Peter Simons
ec1d8b1b46 haskell-persistent-sqlite: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons
2b1ec2f9d0 haskell-persistent-postgresql: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons
681e8c7a11 haskell-persistent-mysql: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons
110db03506 haskell-openssl-streams: update to version 1.2.0.0 2014-09-20 11:29:36 +02:00
Peter Simons
55038f1cda haskell-language-c-inline: update to version 0.7.6.1 2014-09-20 11:29:35 +02:00
Peter Simons
67280d9701 haskell-hint: update to version 0.4.2.1 2014-09-20 11:29:35 +02:00
Peter Simons
664040624b haskell-haskell-generate: update to version 0.2.1 2014-09-20 11:29:35 +02:00
Peter Simons
8b47088786 haskell-gloss-raster-accelerate: update to version 1.8.15.0 2014-09-20 11:29:35 +02:00
Peter Simons
e5fb9135f6 haskell-gloss-accelerate: update to version 1.8.15.0 2014-09-20 11:29:35 +02:00
Peter Simons
47064f2730 haskell-foldl: update to version 1.0.7 2014-09-20 11:29:35 +02:00
Peter Simons
ea80932802 haskell-fay: update to version 0.20.2.0 2014-09-20 11:29:35 +02:00
Peter Simons
1be933998c haskell-esqueleto: update to version 2.0.1 2014-09-20 11:29:35 +02:00
Peter Simons
7010a5177d haskell-dimensional-tf: update to version 0.3.0.1 2014-09-20 11:29:35 +02:00
Peter Simons
ff76b34a2d haskell-cmdargs: update to version 0.10.10 2014-09-20 11:29:35 +02:00
Peter Simons
7568fe974b haskell-clock: update to version 0.4.1.1 2014-09-20 11:29:35 +02:00
Peter Simons
26e459816a haskell-cabal-cargs: update to version 0.7.3 2014-09-20 11:29:35 +02:00
Peter Simons
7bdbfa8595 haskell-boomerang: update to version 1.4.4 2014-09-20 11:29:35 +02:00
Peter Simons
2de7b6b47c haskell-blaze-builder: update to version 0.3.3.4 2014-09-20 11:29:35 +02:00
Peter Simons
6c4fc6e686 haskell-aws: update to version 0.10.5 2014-09-20 11:29:35 +02:00
Peter Simons
1bd318b389 haskell-aeson-qq: update to version 0.7.4 2014-09-20 11:29:35 +02:00
Peter Simons
d40a83ea53 haskell-ad: update to version 4.2.1 2014-09-20 11:29:35 +02:00
Peter Simons
abfb5085d9 haskell-MonadPrompt: update to version 1.0.0.5 2014-09-20 11:29:34 +02:00
Peter Simons
c63b7ccfa7 haskell-HTF: update to version 0.12.1.0 2014-09-20 11:29:34 +02:00
Peter Simons
eaa4dac188 haskell-Boolean: update to version 0.2.2 2014-09-20 11:29:34 +02:00
Peter Simons
f13d04368a haskell-pandoc: re-generate expression with new flags 2014-09-20 11:29:34 +02:00
Peter Simons
9adbb292dc Merge pull request #4176 from k0ral/youtube-dl
Upgraded youtube-dl to v2014.09.19
2014-09-20 11:28:56 +02:00
Domen Kožar
3d6e5f7894 Merge pull request #4166 from lostdj/ltp/master/btsync1482
bittorrentsync: bump from 1.3.94 to 1.4.82
2014-09-20 11:08:29 +02:00
Vladimír Čunát
c1c8d561b1 fix evaluation (bogus licenses in ocaml-modules) 2014-09-20 10:34:47 +02:00
Michael Raskin
18ca33ee7c Adopt fix from ewemoa to give more memory to acl2 build 2014-09-20 12:13:43 +04:00
Michael Raskin
d22a3b8d0e Fix /bin/mv reference in replace-literal 2014-09-20 11:53:21 +04:00
Shea Levy
d9716fb642 ats2: bump 2014-09-20 02:15:42 -04:00
Daniel Peebles
4cb2357782 Drop the jakarta name from BCEL and update its version.
Closes #4180.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 07:13:24 +01:00
roconnor
cbf79969b3 Merge pull request #4120 from NixOS/gnupg
Add pinentry optional dependency for gnupg.

Delete gnupg2_1.
2014-09-19 23:44:53 -04:00
William A. Kennington III
2c40aca91d xfsprogs: Add missing patch 2014-09-19 18:21:05 -07:00
koral
7e34168f3b Upgraded youtube-dl to v2014.09.19 2014-09-20 01:58:27 +02:00
William A. Kennington III
0001e4819e nginx: 1.6.1 -> 1.6.2
Additionally, update all extensions and convert them to fetchFromGitHub
2014-09-19 16:42:04 -07:00
William A. Kennington III
df12cc6ad0 kernel: 3.16.2 -> 3.16.3 2014-09-19 16:28:45 -07:00
William A. Kennington III
a235f6fc70 kernel: 3.14.18 -> 3.14.19 2014-09-19 16:28:32 -07:00