Commit Graph

2497 Commits

Author SHA1 Message Date
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Edward Tjörnhammar
47203a86bf unison: sha correction 2015-02-17 12:35:29 +01:00
codyopel
e9c0bdb93e qbittorrent: add gui & webui optionals 2015-02-15 17:43:39 -05:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Rickard Nilsson
da6abad31a vimb: Update from 2.8 to 2.9 2015-02-13 15:06:46 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
William A. Kennington III
505ab03a1e notbit: Update git 2015-02-11 15:23:31 -08:00
cillianderoiste
26127df6cb Merge pull request #6288 from ehmry/ratox
ratox: bump to 0.2.1
2015-02-10 23:08:52 +01:00
Emery Hemingway
f5b3ca1473 ratox: bump to 0.2.1 2015-02-10 12:10:51 -05:00
lethalman
7614b2f984 Merge pull request #6229 from devhell/canto
canto-{curses,daemon}: Add packages
2015-02-10 10:34:11 +01:00
Brendan Long
a88b262459 syncthing: Update to 0.10.22 2015-02-09 17:55:18 -06:00
Pascal Wittmann
6b5658bf23 bro: update from 2.3.1 to 2.3.2 2015-02-09 12:20:10 +01:00
Nikolay Amiantov
a52db30bdb tkabber: update version 2015-02-09 13:10:12 +03:00
William A. Kennington III
5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
devhell
37f58c4f46 canto-{curses,daemon}: Add packages
This adds canto-daemon, a feedparser background service, and
canto-curses, a highly customizable curses-based frontend.
2015-02-08 14:16:17 +00:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
Jaka Hudoklin
f85abb041a Merge pull request #5622 from offlinehacker/panamax
panamax: new package and service
2015-02-07 14:56:25 +00:00
viric
5ae6bf304c Merge pull request #6210 from ehmry/ratox
ratox: initial package at v0.2
2015-02-07 15:47:07 +01:00
Emery Hemingway
b3118791e3 ratox: initial package
http://ratox.2f30.org/
2015-02-07 09:33:18 -05:00
Matej Cotman
8967a2b32d panamax: rewrite using 'pleasent ruby' 2015-02-07 15:32:20 +01:00
Jaka Hudoklin
ae34f923f7 panamax: simplify, refactor, add test 2015-02-07 15:32:20 +01:00
Matej Cotman
8c79a2df63 panamax: new package and service 2015-02-07 15:32:20 +01:00
Nathaniel Baxter
09fc276a11 flashplayer: Minor security update to 11.2.202.442 2015-02-07 11:04:48 +11:00
William A. Kennington III
67f28ac1a9 umurmur: Add meta platforms 2015-02-06 13:15:23 -08:00
William A. Kennington III
c6749d0306 umurmur: 0.2.13 -> 0.2.15 2015-02-06 13:13:49 -08:00
Pascal Wittmann
641cdbb8cf unison: update from 2.40.102 to 2.48.3 2015-02-06 19:59:14 +01:00
Luca Bruno
f53e18fc40 Fix luakit description 2015-02-06 14:50:39 +01:00
lethalman
4428076bd1 Merge pull request #5805 from matthiasbeyer/add-luakit
[WIP] Add package: luakit
2015-02-06 14:50:00 +01:00
Matthias Beyer
b5baa2c5e4 Add package: luakit
This patch adds the luakit browser. It has to be build using lua5.1, I
tried 5.2 but I couldn't run luakit due to a runtime error with it.

It also uses gtk3 here, override to use gtk2, which should also work.

Suggested-by: Benno Fünfstück <benno.fuenfstueck@gmail.com>
2015-02-06 14:19:16 +01:00
Domen Kožar
fdb5cf8107 chromium: remove preferLocalBuild due to intense IO in VM tests
(cherry picked from commit 84bd62da0a63e18fa285bacf0e648b82d601816e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-06 12:08:43 +01:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Luca Bruno
4ce497e74f Use buildFlags in buildGoPackage instead of makeFlags 2015-02-05 13:13:14 +01:00
Luca Bruno
e6e4c867e5 Port syncthing to buildGoPackage 2015-02-05 13:12:10 +01:00
Rok Garbas
217f6ed01b weechat: update to 1.1.1 2015-02-05 08:40:07 +01:00
Luca Bruno
9dfa4b487f Port pond to buildGoPackage 2015-02-04 13:14:15 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Kosyrev Serge
b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Andrey Arapov
7ed1435aa9 owncloud: update to 1.7.1 2015-02-02 18:28:55 +01:00
Nikolay Amiantov
28d9da7498 pidgin-otr: adopt and add platforms 2015-02-02 14:00:17 +03:00
Andrey Arapov
79c5029f2e flashplayer: minor update (sha256 correction) 2015-01-31 12:21:08 +01:00
Andrey Arapov
522d059dc9 libtoxcore, utox, qtox, toxic: Update to the newest Dev version 2015-01-31 03:20:12 +01:00
Pascal Wittmann
fcd3270737 Merge pull request #6011 from taku0/firefox-bin-35.0.1
Update firefox-bin to 35.0.1
2015-01-28 12:10:31 +01:00
taku0
c5079ee886 Update firefox-bin to 35.0.1 2015-01-28 09:49:33 +09:00
Ricardo M. Correia
f46a6c92c0 flashplayer: Update from 11.2.202.438 -> 11.2.202.440 2015-01-27 17:22:30 +01:00
Domen Kožar
09d8b0fca6 Merge pull request #5989 from skityl/master
Updated version number
2015-01-27 10:38:26 +01:00
Ricardo M. Correia
934ea63e8f firefox: Update from 35.0 -> 35.0.1 2015-01-27 04:39:45 +01:00
Thomas Tuegel
5360bbfb62 quassel: add Qt 5 version 2015-01-26 20:59:51 -06:00
skityl
400adb7ec4 Bumped version of irssi-0.8.16 to irssi-0.8.17
Signed-off-by: skityl <mopofhair@gmail.com>
2015-01-27 00:57:19 +11:00