3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

7182 commits

Author SHA1 Message Date
Peter Simons df4c114252 Merge pull request #4036 from lostdj/ltp/master/ijifix
IntelliJ IDEA: do not assume that we are using OpenJDK.
2014-09-12 10:16:55 +02:00
William A. Kennington III 56411e9457 Fix typo in meta 2014-09-11 22:19:53 -07:00
William A. Kennington III 686a139f29 Merge pull request #4030 from AndersonTorres/small-fixups
Small style fixups
2014-09-11 21:27:54 -07:00
Domen Kožar 2632afa131 pypy: handle unsupported packages 2014-09-12 00:26:50 +02:00
Nick Sauce 759cc041ed smartgithg: new package
@vcunat added meta.platforms.
2014-09-11 21:51:01 +02:00
lostdj f3e0f5e755 IntelliJ IDEA: do not assume that we are using OpenJDK. 2014-09-11 20:51:12 +04:00
Michael Raskin bdea812836 Fix JWM source URL 2014-09-11 15:54:10 +04:00
Rob Vermaas fdfd948d96 panotools: update from 2.9.18 to 2.9.19 2014-09-11 13:34:50 +02:00
AndersonTorres b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Luca Bruno e3fd4499ef ekiga: fix icons. Closes #4015 2014-09-09 22:27:05 +02:00
Bjørn Forsman c888b97e19 linssid: new package
LinSSID is a graphical wireless scanning application for Linux.

http://sourceforge.net/projects/linssid/
2014-09-09 19:42:49 +02:00
John Wiegley bf009f87a9 coq_HEAD: update to latest Git version
In particular, to get the fix for #3585 in the Coq bug tracker
2014-09-09 18:02:32 +01:00
Eelco Dolstra 4ae3e32e82 Merge pull request #4012 from ibeex/master
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac 841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Domen Kožar 78e5e556cc Revert "fixes #1923"
This reverts commit 1849840aa3.

Breaks git-annex
2014-09-09 12:11:53 +02:00
Domen Kožar 1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Vladimír Čunát dd3192f5ee Revert "spaceFM: update from 0.9.2 to 0.9.4" (fixes #3916)
This reverts commit c53ae9b462.
It's just a temporary work-around until someone finds a real fix.
2014-09-08 18:28:14 +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