Commit graph

16712 commits

Author SHA1 Message Date
Balletie
d03e6162dc Update SFML to version 2.2, remove sfml_git, and update MARS (depended on sfml_git) 2015-04-20 16:49:39 +02:00
Peter Simons
a510ba0334 Drop broken packages sproxy and sproxy-web. 2015-04-19 18:48:29 +02:00
Peter Simons
d50fe49ded Merge pull request #7037 from peti/haskell-updates-ghc7101
Switch the default Haskell package set to GHC 7.10.1.
2015-04-19 17:57:33 +02:00
Jaka Hudoklin
ca0d1aa9a3 Merge pull request #6880 from offlinehacker/pkgs/skydns/add
Add skydns
2015-04-19 10:43:05 +02:00
Pascal Wittmann
be7e172052 Merge pull request #7456 from bcdarwin/button-lock
new emacs package: button-lock 1.0.2
2015-04-19 09:52:06 +02:00
Ben Darwin
8f7a867dcc emacsPackagesNg.popup: 0.5.0 -> 0.5.2 2015-04-19 02:36:31 -04:00
Ben Darwin
f023c0a023 new emacs package: button-lock 1.0.2 2015-04-19 01:02:49 -04:00
Arseniy Seroka
63d4512d33 Merge pull request #7455 from spwhitt/pil
pil, pillow: Patch out Darwin impurities
2015-04-19 04:30:18 +03:00
Spencer Whitt
edf9bcdbab pil, pillow: Patch out Darwin impurities 2015-04-18 19:58:02 -04:00
Austin Seipp
003f5a87b3 nixpkgs: add trace-cmd 2.5.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-18 14:45:47 -05:00
Austin Seipp
834c731a72 nixpkgs: add kdb+ 3.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-18 14:45:47 -05:00
Peter Simons
e813808a5d Switch haskellngPackages from GHC 7.8.4 to 7.10.1. 2015-04-18 20:43:20 +02:00
Mateusz Kowalczyk
88ce891dc8 Merge pull request #7447 from ehmry/mpd
Mpd
2015-04-18 16:03:57 +01:00
Emery Hemingway
64b9688ee4 mpd: opus and proxy support 2015-04-18 11:02:28 -04:00
Arseniy Seroka
594ce7bc5d Merge pull request #7435 from anderspapitto/master
add gmusicapi python package
2015-04-18 17:36:25 +03:00
Robin Gloster
ec10a5a675 switch to php5.6 as default version 2015-04-18 03:46:48 -07:00
Anders Papitto
c11c36daaa add gmusicapi python package
as well as several dependencies. Tested with a personal project that
relies on gmusicapi
2015-04-17 18:17:50 -07:00
Nikolay Amiantov
8f1d256435 agda: use GHC 7.8.4 for building 2015-04-18 00:40:00 +03:00
Forkk
079da8cdcd plex: init at 0.9.11.16.958
Added a package and module for Plex Media Server, an application for
managing media collections across multiple devices.
2015-04-17 12:11:30 -05:00
Arseniy Seroka
d8cd5d34ae Merge pull request #7417 from auntieNeo/asterisk
Added Asterisk telephony server
2015-04-17 18:47:39 +03:00
Luca Bruno
384abb5e29 Add automake 1.15 2015-04-17 17:18:10 +02:00
Remy Goldschmidt
de02110903 Added K Framework package.
Closes https://github.com/NixOS/nixpkgs/pull/7419.
2015-04-17 16:05:00 +02:00
Luca Bruno
19a1b86a15 collectd: update and reintroduce rabbitmq-c 0.4 to fix build for ZHF 2015-04-17 15:07:46 +02:00
Jonathan Glines
c1b5287193 Added Asterisk telephony server 2015-04-16 17:40:28 -06:00
Domen Kožar
a914bd8311 django: add 1.8 2015-04-16 14:10:19 -04:00
Domen Kožar
c1e716bfb9 django: don't wrap template scripts, fixes #3134 2015-04-16 14:10:19 -04:00
Arseniy Seroka
497bf2a696 Merge pull request #7040 from jagajaga/viber
viber: init pkg
2015-04-16 20:05:58 +03:00
Luca Bruno
23a92ba43c pond: fix build by renaming imports, also add renameImports to goBuildPackage 2015-04-16 18:43:37 +02:00
Luca Bruno
a0dcd49bbc btar: fix build by reintroducing librsync 0.9.x for ZHF 2015-04-16 17:59:33 +02:00
Nikolay Amiantov
4c1afe5cce leksah: move to haskell tools and add cabal to path 2015-04-16 15:53:57 +03:00
Nikolay Amiantov
5dec393125 lambdabot, mueval: move to development/tools/haskell 2015-04-16 15:53:57 +03:00
Nikolay Amiantov
4947f918ad lambdabot: add package 2015-04-16 13:32:48 +03:00
Nikolay Amiantov
58330b2a81 mueval: add package 2015-04-16 13:32:48 +03:00
Arseniy Seroka
d56e9b4f05 Merge pull request #7330 from RumataEstor/rust-beta
Provide rustc-1.0.0-beta as the default rust package
2015-04-16 13:05:40 +03:00
Tobias Geerinckx-Rice
2bc813dc5c Add hans: tunnel IPv4 over ICMP 2015-04-16 06:11:16 +02:00
Ryan Scheel (Havvy)
459133ce72 Remove nightly derivations for iojs 2015-04-15 21:01:48 -07:00
Arseniy Seroka
f029ccadc9 Merge pull request #7385 from Forkk/screencloud
Add package for Screencloud 1.2.0
2015-04-16 06:28:00 +03:00
Forkk
f7865c29c2 screencloud: init at 1.2.0
Added a package for Screencloud, a program for taking screenshots and
uploading them to various websites.

This package was a bit finicky due to some nonsense in the CMakeLists
file, but it seems to work properly.

The package also includes API keys for the screencloud.net website.
According to the author of the Arch Linux User Repo package for
screencloud, these keys are only used for usage tracking, so we should
be fine including them in the package here.
2015-04-15 22:04:39 -05:00
Forkk
78eb702d35 qxt: init at 0.6.2 2015-04-15 22:04:33 -05:00
Mateusz Kowalczyk
33d52b37f3 haskell-yi: improve wrapper and use haskell-ng
Now pkgs.yi is the package to use and override
2015-04-15 21:31:17 +01:00
Arseniy Seroka
7bc23e994c Merge pull request #7191 from nmikhailov/keybase_fix
keybase-node: fix imports, reenable build
2015-04-15 22:57:59 +03:00
Pascal Wittmann
74235b70f1 Merge pull request #7224 from AndersonTorres/aegisub
Aegisub: 3.2.1 -> 3.2.2
2015-04-15 19:39:12 +02:00
Nikolay Amiantov
77a153a655 leksah: add wrapper
Closes https://github.com/NixOS/nixpkgs/pull/7063.
2015-04-15 13:40:07 +02:00
Moritz Ulrich
3fa9fe1dd1 Pass: Use default gpg(2) & use lib.makeSearchPath. 2015-04-15 10:45:43 +02:00
Austin Seipp
fecba03ba6 nixpkgs: fix emacs24-nox
Fallout from bc4f39f48b

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-14 14:27:10 -05:00
Domen Kožar
0206245aba Revert "Fix buildPythonPackage overriding."
This reverts commit 6a1de6d4a7.

It broke eval
2015-04-14 15:02:49 -04:00
Forkk
c5457ebd9b qt-mobility: fix package
Fixed QtMobility's build script so that it builds correctly.

The package is now downloaded from a GitHub mirror repo instead of
Nokia's download site, which is no longer available.

Also added the package to all-packages.nix so that it can actually be
used (who knows why it wasn't in there).
2015-04-14 13:32:13 -05:00
Tom Hunger
6a1de6d4a7 Fix buildPythonPackage overriding.
makeOverridable takes a function and an argument, the parenthesis
caused there to be only one argument which works but cannot
be overridden.
2015-04-14 17:52:36 +01:00
Peter Simons
65822005f0 Merge pull request #7314 from edwtjo/ihaskell-fixups
IHaskell fixes
2015-04-14 14:21:44 +02:00
aszlig
311aa5d8d9
python-wrapper: Handle strings at the beginning.
This should fix #7366 for now, but using the (IMHO) pragmatic approach
of extending the sed expression to recognize strings.

However, this approach is obviously not parsing the full AST, nor does
it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to
match Python strings as best as possible without getting TOO unreadable.

We also use a little bit of Nix to help generating the SED expression,
because doing the whole quote matching block over and over again would
be quite repetitious and error-prone to change. The reason why I'm using
imap here is that we need to have unique labels to avoid jumping into
the wrong branch.

So the new expression is not only able to match continous regions of
triple-quoted strings, but also regions with only one quote character
(even with escaped inner quotes) and empty strings.

However, what it doesn't correctly recognize is something like this:

"string1" "string2" "multi
line
string"

Which is very unlikely that we'll find something like this in the wild.
Of course, we could handle it as well, but it would mean that we need to
substitute the current line into hold space until we're finished parsing
the strings, branch off to another label where we match multiline
strings of all sorts and swap hold/pattern space and finally print the
result. So to summarize: The SED expression would be 3 to 4 times bigger
than now and we gain very little from that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 07:13:15 +02:00