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
Nikolay Amiantov
185220feb8
Add me as a maintainer
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