Domen Kožar
9bbf60c80e
Merge pull request #7109 from ctheune/submit/update-ruby-doc
...
Update the ruby packaging docs to show how to bundle Ruby Gem-based
2015-03-31 19:08:22 +02:00
Christian Theune
86d82df72b
Update the ruby packaging docs to show how to bundle Ruby Gem-based
...
applications using bundix.
Fixes #5985
2015-03-31 19:04:42 +02:00
Domen Kožar
a87e2ae717
fix eval
2015-03-31 18:20:43 +02:00
Domen Kožar
146eb665d0
Revert "cups: 1.7.5 -> 2.0.2"
...
This reverts commit 032859faba
.
Conflicts:
pkgs/misc/cups/default.nix
Breaks nixos printing tests, see
032859faba (commitcomment-10495609)
2015-03-31 16:51:07 +02:00
Tobias Geerinckx-Rice
0d9ebe7535
ipv6calc: use new geolite-legacy package
...
GeoIP look-ups now actually work.
2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice
b011d10cee
netsniff-ng: use new geolite-legacy package
2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice
1a77b59a85
Add geolite-legacy 2015-03-26
...
The geoip package only installs a GeoIP _library_ which is useless
without a GeoIP _database_.
The only package to currently install such a database is ntopng, which
manually downloads Maxmind's GeoLite Legacy files to a private location.
Provide these as a separate package so other packages can use them as
well.
2015-03-31 16:36:15 +02:00
lethalman
1670a75285
Merge pull request #6982 from obadz/monodevelop
...
Monodevelop + Mono upgrade
2015-03-31 16:30:42 +02:00
Vladimír Čunát
81fc066900
Merge #4678 : nixos iso-image: support USB booting
...
by using syslinux (i.e. support the dd-method in addition to unetbootin).
@vcunat tidied the PR by squashing closely related changes together.
2015-03-31 15:12:16 +02:00
Peter Simons
9ce8d10dae
haskell-cartel supports GHC 7.10.1 now.
2015-03-31 14:21:09 +02:00
Peter Simons
bb38374158
haskell-xmonad-contrib: fix build
2015-03-31 14:21:08 +02:00
Arseniy Seroka
f8c1aa96b8
apulse: fix sha
2015-03-31 15:11:47 +03:00
Peter Simons
6644bca846
idris: fix build by providing appropriate versions of the build inputs
...
Resolves https://github.com/NixOS/nixpkgs/issues/7014 .
2015-03-31 13:56:16 +02:00
Tobias Geerinckx-Rice
2032740ea6
gparted 0.21.0 -> 0.22.0
2015-03-31 13:54:42 +02:00
Tobias Geerinckx-Rice
ff1bccdbd5
python-packages: gdrivefs 0.14.2 -> 0.14.3
2015-03-31 13:54:41 +02:00
Peter Simons
3bf3e8076c
Merge pull request #7087 from phile314/master
...
haskell-uhc: New version, disable broken platforms.
2015-03-31 13:25:38 +02:00
Karn Kallio
39a3fd1454
pure: advance to version 0.64; use llvm 3.5 as 3.6 breaks the build
2015-03-31 13:21:47 +02:00
Karn Kallio
2758e7c246
gdal: add libpng (for mysql workbench support)
2015-03-31 13:21:02 +02:00
lethalman
b4824ffc5d
Merge pull request #7103 from gebner/verit
...
Add veriT, an SMT solver.
2015-03-31 12:31:26 +02:00
lethalman
9151983435
Merge pull request #7100 from bcdarwin/fix-twelf
...
twelf: fix by actually including the Twelf SML heap image in the package...
2015-03-31 12:24:12 +02:00
Karn Kallio
3fe7f80ef2
symbola: advance to version 7.21, correcting hash error
2015-03-31 11:09:06 +02:00
lethalman
b6c7eba554
Merge pull request #7097 from prikhi/update-pencil
...
pencil: v2.0.5 -> v2.0.8
2015-03-31 10:10:23 +02:00
Gabriel Ebner
20428cd90f
Add veriT.
2015-03-31 09:14:38 +02:00
Ben Darwin
54dab782be
twelf: fix by actually including the Twelf SML heap image in the package and referencing the SML interpreter so the smlnj package won't be gc'd
2015-03-31 01:11:57 -04:00
Eric Seidel
9fc4c55620
Merge pull request #6815 from giogadi/add-darwin-swt
...
Add Darwin case for java.swt
2015-03-30 21:45:05 -07:00
Eric Seidel
454b8b25aa
Merge pull request #7002 from spwhitt/libmad
...
libmad: build on Darwin
2015-03-30 20:35:44 -07:00
Spencer Whitt
a6303c724f
libmad: build on Darwin
2015-03-30 23:29:19 -04:00
Pavan Rikhi
f67ce9160d
pencil: v2.0.5 -> v2.0.8
...
Switch to actively developed fork.
2015-03-30 22:59:04 -04:00
Arseniy Seroka
7facba28be
Merge pull request #7075 from oxij/x11support-gcc
...
gcc 4.8: add x11Support option so that it would stop evaluating gtk by default
2015-03-31 03:20:40 +03:00
Arseniy Seroka
cde096f440
xkblayout-state: fix name
2015-03-31 03:18:42 +03:00
Arseniy Seroka
62ad004862
apulse: update
2015-03-31 03:17:43 +03:00
aszlig
6a4370f1ba
qca2: Update to new upstream version 2.1.0.
...
This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.
Tested against a few builds like PSI and Tomahawk.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-31 02:13:06 +02:00
Tobias Geerinckx-Rice
ee7c9bd86a
Add simple-scan 3.16.0.1
2015-03-31 00:51:47 +02:00
Tobias Geerinckx-Rice
c7362b6b03
netsniff-ng: 0.5.9-rc4-{49-g6f54288 -> 53-gdd5d906}
...
Fixes a bug that prevented mz from working at all.
2015-03-31 00:51:47 +02:00
obadz
1129f6b0db
mono 3.8.0 -> 3.12.1
...
monodevelop 5.1.4.0 -> 5.7.0.660
2015-03-30 23:48:25 +01:00
Christian Theune
b15078b579
Provide a basic package for sensu.
...
The server currently starts without error messages (on OS X) if you also
install redis and rabbitmq-server and start their processes without any
further configuration:
$ redis-server
$ rabbitmq-server
$ sensu-server
Haven't tried much more yet, but will in a bit.
(Amended: fix whitespace and string literal formatting issues, and
superfluous dependencies created by the generator script.
Thanks the-kenny!)
2015-03-30 23:56:15 +02:00
Arseniy Seroka
cb9f2f8503
merging ssd-guru: fix conflicts
2015-03-30 23:35:14 +03:00
Shea Levy
df50903da8
Merge branch 'submit/enable-syncthing-osx' of git://github.com/ctheune/nixpkgs
...
Enable syncthing for Mac OS X.
2015-03-30 16:17:53 -04:00
Christian Theune
6daa2462c6
Enable syncthing for Mac OS X.
...
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
2015-03-30 22:07:02 +02:00
Nikolay Amiantov
7c03829024
Merge pull request #7060 from abbradar/nm-l2tp
...
Support L2TP in NetworkManager
2015-03-30 23:05:42 +03:00
Shea Levy
b77aec818a
Merge branch 'master' of git://github.com/ctheune/nixpkgs
...
bump syncthing version to 0.10.30
2015-03-30 16:03:04 -04:00
Christian Theune
703e43949d
bump syncthing version to 0.10.30
2015-03-30 21:55:51 +02:00
Edward Tjörnhammar
1092b9da48
Merge pull request #7066 from edwtjo/xbmc-pruning
...
Remove XBMC expressions in favor of the Kodi ones
2015-03-30 21:46:29 +02:00
Edward Tjörnhammar
1345a65765
Remove XBMC expressions in favor of the Kodi ones
2015-03-30 21:43:32 +02:00
Philipp Hausmann
a2b584ba5f
haskell-uhc: New version, disable broken platforms.
2015-03-30 18:47:38 +02:00
John Wiegley
f2df60e2fb
Merge pull request #7047 from codyopel/ffmpeg-darwin
...
ffmpeg: improve cross platform support & fix licensing issues, resolves #7013
2015-03-30 11:47:03 -05:00
lethalman
9c6e5527b2
Merge pull request #7028 from kevinmarsh/enum34
...
Update python package enum34 1.0 -> 1.0.4
2015-03-30 18:09:34 +02:00
lethalman
f72b0c43f6
Merge pull request #6762 from lethalman/nixos-install
...
nixos-install: support -j, --cores and --option. Closes #6755
2015-03-30 18:06:53 +02:00
lethalman
fed2cf85ec
Merge pull request #7065 from pmahoney/skarnet-2015-03-28
...
update s6, execline, other skarnet.org
2015-03-30 17:57:41 +02:00
lethalman
dc560b5b02
Merge pull request #7031 from cwoac/mediatomb
...
Add MediaTomb service
2015-03-30 17:49:46 +02:00