1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

761 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
lostdj f3e0f5e755 IntelliJ IDEA: do not assume that we are using OpenJDK. 2014-09-11 20:51:12 +04: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
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
gounnoticed de03197100 Add luna cpp build for eclipse
didnt have sha512 so used md5 instead.
2014-09-05 19:35:28 +01: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 d812281674 zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux 2014-09-02 17:57:09 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Vladimír Čunát acba6b4da2 ed: update to 1.10, working around *.lz problem 2014-08-30 23:00:58 +02:00
Eelco Dolstra 74b808a66f Revert "ed: update to 1.10 (close #3852)"
This reverts commit 60902b97fe. It
breaks building on Darwin:

  http://hydra.nixos.org/build/13832410

It also adds a gratuitous dependency to the stdenv bootstrap.
2014-08-30 22:41:01 +02:00
Longrin Wischnewski 33cbd6687c wxhexeditor: adding version 0.22
wxhexeditor: add the package to all-packages.nix

wxhexeditor: fix shebang
2014-08-30 12:24:43 +01:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Mateusz Kowalczyk 60902b97fe ed: update to 1.10 (close #3852) 2014-08-29 13:58:51 +02:00
Mathijs Kwik 0e1ed7bbc9 fix js2-mode revision 2014-08-25 13:56:53 +02:00
Mathijs Kwik fb2449c026 add emacs color-theme solarized 2014-08-25 13:56:53 +02:00
Mathijs Kwik 3be7d4b478 idris-mode: upgrade to 0.9.14 2014-08-25 13:56:52 +02:00
Edward Tjörnhammar 8bd3c67552 IDEA: 13.1.3 -> 13.1.4
Changed, attribute name separator changed to dashes and decription.
Added longDescription.
2014-08-25 11:03:35 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Cray Elliott 5ec6492ea0 Mark yi and yi-contrib as broken
They no longer build with lens v4.4.0.1 and up
2014-08-24 20:28:12 +02:00
Eelco Dolstra ce6b86cc68 Fix various evaluation problems
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Moritz Ulrich 10ba4b67e4 Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
2014-08-21 12:45:28 +02:00
Vladimír Čunát 56d9b2cc8a merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
Jascha Geerds bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Mateusz Kowalczyk 83f532fdfd haskell-yi: update to 0.8.2
Allows it to work with glib/gtk/pango 0.13.x
2014-08-11 13:56:12 +02:00
John Wiegley 326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Eelco Dolstra 0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Aycan iRiCAN c35224efb6 Merge remote-tracking branch 'upstream/master' 2014-08-06 10:21:57 +03:00
Bjørn Forsman 310400e0f5 intellij-idea: don't access 'shortName' license attribute
I don't think packages should poke into the license attributes.
2014-08-05 07:22:06 +02:00
Jascha Geerds eaad8d6923 Packaging PyCharm IDE 2014-08-05 07:15:43 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Aycan iRiCAN 307a08c9a3 removed rev 2014-08-03 21:21:52 +03:00
Aycan iRiCAN 02dcf1e493 Upgrade js2-mod to 20140114 2014-08-03 21:20:26 +03:00
Joachim Fasting 2fc0537018 nano: bump to version 2.3.6 2014-08-01 18:19:03 +02:00
Joachim Fasting decb4266f1 nano: support system-wide nanorc
This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
2014-08-01 18:19:03 +02:00
Matej Cotman b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Pascal Wittmann cf744cb715 org: update from 8.2.7b to 8.2.7c 2014-07-30 12:14:15 +02:00
Peter Simons d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Moritz Ulrich e4f978d09f bbdb3: New package. 2014-07-27 10:55:43 +02:00
Matej Cotman dbc829f5d4 new package: zed 0.12.0 (installer) 2014-07-26 14:41:20 +02:00