Commit graph

184 commits

Author SHA1 Message Date
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Joachim Fasting 4393e6f619 transmission: build transmission-cli
As of version 2.92, transmission-cli is no longer built by default (it
is deprecated).  This breaks the bittorrent vmtest.  For now, explicitly
enable the cli.
2016-03-13 07:08:01 +01:00
Christoph Hrdinka c5695bc8be transmission: 2.90 -> 2.92 2016-03-08 15:40:17 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Domen Kožar 756604cc08 transmission: 2.84 -> 2.90 2016-02-29 13:08:33 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Simon Vandel Sillesen 71ab92a396 qbittorrent: 3.3.1 -> 3.3.3 2016-01-21 19:15:04 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Shell Turner f229791454 freenet: rewrite wrapper to not depend on PATH 2016-01-05 01:06:54 +00:00
Simon Vandel Sillesen fecea0b305 qbittorrent: 3.2.3 -> 3.3.1
* upstream has switched to qt5 as default, so also done here
* Adds a patch to use the qt lrelease tool correct
2016-01-02 22:47:28 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Thomas Tuegel fc13f37f2c firestr: Qt 5 infrastructure update 2015-12-20 07:56:50 -06:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Domen Kožar 4b0fcf8ea1 Merge pull request #11553 from FRidh/pil
WIP: remove PIL as dependency
2015-12-08 22:15:05 +01:00
Frederik Rietdijk 9455476f47 tribler: use pillow instead of pil
Program opens. Didn't test any further.
2015-12-08 16:30:25 +01:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Eelco Dolstra 81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Chris Double 2756b088d8 Update freenet to build 1470.
This stores freenet data files in ~/.local/share/freenet by default,
or $XDG_DATA_HOME/freenet if set.
2015-10-25 18:46:09 +13:00
Lluís Batlle i Rossell c1e6e97f6b Updating twisterd to 0.9.30
(cherry picked from commit f2264ec42a9792091639eef1050b08403f368ff2)
2015-10-07 11:37:59 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
Carter Charbonneau 170177ad26 retroshare: 0.6-svn-7445 -> 0.6-git-fabc3a3 (close #9542) 2015-09-20 20:44:55 +02:00
devhell 49a5d06d3c transmission-remote-gtk: 1.1.1 -> 1.2
This commit includes some rework since the original googlecode
repository redirects to the GitHub page.

Built and tested successfully on local.

From the Changelog:
```
* Wed Jun 11 2014 1.2
- A basic RSS reader which uses libmrss.
- Fix some 32bit platforms reporting 0 connected peers and unknown ETA.
- Resolve some GTK deprecations.
- Fix a crash in port test callback.
- Fix decimal marker in status bar version.
- Support for GeoIPCity.dat.
- Fix a crash when removing lots of columns (something changed in GTK).
- Optional and non-default support for validating SSL certs.
- Remove all GTK2 support.
- Allow alt-speed limits to override global speed limits in the statusbar
  display.
```
2015-09-19 21:18:22 +01:00
Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Domen Kožar fb16b908bc qbittorrent: partial revert of 1d78f31b76
It still fails on 32bit:
http://hydra.nixos.org/build/25460116/nixlog/1/raw

(cherry picked from commit 57391b7322d97aa03158c730aec318cb0e8d2b2d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 20:23:28 +02:00
Eelco Dolstra 9013dc5826 inotifyTools -> inotify-tools
Fixes #9456.
2015-09-01 10:52:47 +02:00
Simon Vandel Sillesen 1d78f31b76 qBittorrent: 3.1.11 -> 3.2.3 2015-08-13 04:07:08 +02:00
Eelco Dolstra bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219
Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
John Chee 225ae4c5f8 tribler: strip pngs (close #8810)
This prevents libpng exceptions from being thrown.
Accepted upstream: https://github.com/Tribler/tribler/pull/1561
2015-07-18 10:11:03 +02:00
John Chee 962f68f390 tribler: 5.5.x-25411 -> 6.4.3 2015-07-11 15:09:46 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Pascal Wittmann 3838f1d490 firestr: fix build (qt5.multimedia was missing) 2015-05-31 19:13:28 +02:00
Eelco Dolstra bfedb4940c transmission: Fix build
http://hydra.nixos.org/build/22182663
2015-05-13 16:05:34 +02:00
Domen Kožar b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
Emery Hemingway 8b7a05cba6 firestr: initial package at 0.8
http://firestr.com/
2015-04-26 14:57:22 -04:00
Joachim Fasting d8e0dfdc5b ldcpp: reimplement using mkDerivation
Also add libnotify support
2015-04-24 11:54:38 +02:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel e9c0bdb93e qbittorrent: add gui & webui optionals 2015-02-15 17:43:39 -05: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
Kosyrev Serge b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Emery Hemingway 86213a1f23 transmission-remote-gtk: meta fixup (close #5420) 2014-12-21 10:35:24 +01:00
Arseniy Seroka 3477bc9a47 fix some hashes 2014-11-30 02:25:41 +03:00
Vincent Laporte 4ec6e0c935 mldonkey: adds license information 2014-11-19 08:26:43 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Arseniy Seroka a20e2d8f93 Merge pull request #4779 from gavinrogers/master
frostwire: initial working package
2014-11-04 23:03:52 +03:00
Gavin Rogers cb68376fcd frostwire: initial working package
This installs from the official frostwire tarball. Similar to the
jdiskreport package. Everything works fine on the systems I've tried.

I've made myself the maintainer.
Also upgraded it to 6.0.0 as it was released stable.
2014-11-04 18:57:01 +00:00
Vladimír Čunát ed867a50eb iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
William A. Kennington III 8f8712b1e1 qbittorrent: Refactor 2014-11-02 17:22:28 -08:00