Commit graph

7170 commits

Author SHA1 Message Date
Eelco Dolstra
88822dc23c Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging 2014-09-08 22:32:11 +02:00
Luca Bruno
e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
William A. Kennington III
cc5d2cf55a bitlbee: 3.2 -> 3.2.2 2014-09-06 18:47:47 -07:00
Eelco Dolstra
4ead67b785 firefox: Workaround for building on i686-linux
http://hydra.nixos.org/build/13992569
2014-09-07 00:47:17 +02:00
Vladimír Čunát
ac03d296b9 telegram-cli: work around a build problem 2014-09-06 21:28:03 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Peter Simons
6f819ef4f4 emacs-ensime: depend on scala-mode2 and sbt-mode 2014-09-06 13:30:44 +02:00
Peter Simons
1e92a86240 emacs-rainbow-delimiters: add version 1.3.8 2014-09-06 13:30:44 +02:00
Michael Raskin
c33fe2e663 Merge pull request #3985 from taku0/firefox-bin-32.0
firefox-bin: update to version 32.0
2014-09-06 13:38:26 +04:00
Aristid Breitkreuz
c37ad960ad Merge pull request #3980 from gounnoticed/patch-1
Add luna cpp build for eclipse
2014-09-06 10:54:40 +02:00
Aristid Breitkreuz
3ec51fba2f Merge pull request #3979 from ehmry/rsync
rsync: update 3.1.0 to 3.1.1
2014-09-06 10:50:49 +02:00
taku0
7d6ce52d19 firefox-bin: update to version 32.0 2014-09-05 19:59:01 -07:00
Pascal Wittmann
1d263f3776 calibre: update from 2.1.0 to 2.2.0 2014-09-05 23:53:50 +02:00
gounnoticed
de03197100 Add luna cpp build for eclipse
didnt have sha512 so used md5 instead.
2014-09-05 19:35:28 +01:00
Emery Hemingway
96adde8f6a rsync: update 3.1.0 to 3.1.1
fix http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2855
2014-09-05 10:43:06 -04:00
Peter Simons
7f5bc10186 emacs-ensime: add current git snapshot 2014-09-05 16:06:16 +02:00
Peter Simons
e8bff6f838 emacs-s: add version 1.9.0 2014-09-05 16:06:16 +02:00
Peter Simons
a4ec7a6316 emacs-dash: add version 1.5.0 2014-09-05 16:06:16 +02:00
Peter Simons
309851f999 scala-mode2: update to latest version 2014-09-05 16:06:16 +02:00
Pascal Wittmann
701cd70502 zim: fixed build; it also runs find now but the solution is hacky 2014-09-04 23:54:14 +02:00
Vladimír Čunát
42bb59a8a6 thunderbird: maintenance update, including security 2014-09-04 23:36:41 +02:00
Pascal Wittmann
440d876b54 moc: update from 2.5.0-beta2 to 2.5.0
also set platforms to linux, use default configurePhase and adopt it
2014-09-04 22:29:01 +02:00
Moritz Ulrich
0fe866c3a1 gtkwave: update from 3.3.53 to 3.3.61 2014-09-04 19:31:33 +02:00
Moritz Ulrich
bff6e8de3c gnuradio: update from 3.7.3 to 3.7.5 2014-09-04 19:31:33 +02:00
Moritz Ulrich
1e543f02df fldigi: update from 3.21.82 to 3.21.83 2014-09-04 19:31:33 +02:00
Moritz Ulrich
c5697874c2 diffuse: update from 0.4.7 to 0.4.8 2014-09-04 19:31:33 +02:00
Moritz Ulrich
32a3b65571 cgit: update from 0.10.1 to 0.10.2 2014-09-04 19:31:32 +02:00
Thomas Tuegel
ad83a961ae zotero: update to 4.0.22
Drop firefox-30.0, which we were only keeping around for
xulrunner-30.0. New Zotero version is compatible up to firefox-32.0.
2014-09-04 11:52:24 -05:00
AndersonTorres
40b13e798b CImg and WxCam - New Packages #3519
In this commit, I'm including two new softwares
* CImg: A small, simple image toolkit library
* WxCam: a small, simple, wxGTK-based webcam application
2014-09-04 20:44:05 +04:00
Moritz Ulrich
963a554b31 cura(engine): update to 14.0{7,3}. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
0863bcb683 gitAndTools.hub: update from 1.12.0 to 1.12.2, potentially fixes CVE-2014-0177 2014-09-04 17:05:20 +02:00
Peter Simons
e5878fa70b git-annex: re-build expression with latest cabal2nix 2014-09-04 16:20:57 +02:00
Moritz Ulrich
cce6dd11b6 subversionClient: update from 1.8.9 to 1.8.10, potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528 2014-09-04 16:06:42 +02:00
Moritz Ulrich
4678ddc1c0 gitAndTools.svn2git: update from 2.2.5 to 2.3.2 2014-09-04 16:06:41 +02:00
Jaka Hudoklin
0c398f6040 docker: add xz to PATH, make importing from archives work 2014-09-04 01:30:59 +02:00
Eelco Dolstra
88964f37a0 firefox: Update to 32.0 2014-09-03 22:51:55 +02:00
Domen Kožar
1568dcd4dc move ike to applications/networking folder 2014-09-03 22:31:26 +02:00
Michael Raskin
7a7a034f30 Merge pull request #3865 from edwtjo/dogecoin-1.8.0-refactor
dogecoin: autotools build factored out
2014-09-03 21:33:54 +04:00
Pascal Wittmann
b48c42f37b Merge pull request #3952 from tomfitzhenry/update-keepassx-to-2.0-alpha6
keepassx: update to 2.0-alpha6
2014-09-03 19:17:01 +02:00
Jaka Hudoklin
e5194e5aea docker: fix docker not finding dockerinit 2014-09-03 18:24:51 +02:00
Luca Bruno
83c968fa2c Add new kgraphviewer and massif-visualizer packages
I chose the unstable versions because the stable versions
seemed too outdated to me. They work with kde 4.12 anyway.
2014-09-03 17:04:22 +02:00
Michael Raskin
dae0d770fc Merge pull request #3213 from wmertens/google-hangouts
Google hangouts: Bump to 5.4.2.0
2014-09-03 15:35:18 +04:00
Tom Fitzhenry
03ff6450b9 keepassx: update to 2.0-alpha6 2014-09-03 12:32:11 +01:00
aszlig
fc434d1f5c
synergy: Update to new upstream version 1.5.1.
Bugfix release, fixing the following bugs:

 - Configuration file paths containing spaces don't work
 - Log path needs to be in quotes on windows
 - Installer fails when Windows Firewall is disabled

http://svn.synergy-project.org/tags/1.5.1/ChangeLog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-03 12:52:08 +02:00
Michael Raskin
83832944af Merge pull request #3486 from svenkeidel/gpodder
gpodder: Update to 3.8.0
2014-09-03 11:58:03 +04:00
AndersonTorres
4dac1990d7 FME: New Package #3695 2014-09-03 11:47:58 +04:00