1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

1541 commits

Author SHA1 Message Date
Joachim Fasting 39d7f65a33 Merge pull request #15710 from chris-martin/sublime-desktop-item
sublime: add a desktop item and icons
2016-05-27 16:57:32 +02:00
Joachim Fasting 0eaea886b9 Merge pull request #15685 from chris-martin/idea-wmClass
idea: set StartupWMClass on desktop item
2016-05-27 16:56:51 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Chris Martin 79a50c0473 sublime: add a desktop item and icons 2016-05-25 19:26:37 -04:00
Rok Garbas e9c86755dd neovim: make clipboard work ootb 2016-05-25 15:02:41 +02:00
Chris Martin acaa3d9474 idea: set StartupWMClass on desktop item
This makes all Idea product behave nicely with the Gnome launcher.

The WM class for every Idea product is in the form

    jetbrains-<product>[-ce]

Where <product> is e.g. "idea", "pycharm", etc., and "-ce" is appended
for community editions.
2016-05-24 22:43:13 -04:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Nick Novitski 15c6fa023f neovim: fix Man command 2016-05-21 21:51:40 +02:00
Tuomas Tynkkynen ebf6b3cd51 treewide: Make explicit that 'dev' output of poppler is used 2016-05-19 10:02:29 +02:00
Tuomas Tynkkynen 5e5c5382f6 treewide: Make explicit that 'dev' output of cairo is used 2016-05-19 10:00:28 +02:00
Joachim Fasting 013fd785a1
emacs25pre: 25.0.93 -> 25.0.94 2016-05-18 03:54:17 +02:00
Thomas Tuegel d191c5c498 Merge pull request #15517 from mdorman/emacs-updates
emacs-packages: various updates
2016-05-17 09:14:23 -05:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Michael Alan Dorman 0bd9f7b2d6 melpa-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman 114550baa3 melpa-stable-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman ced6d155b2 org-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman c56614bdb8 elpa-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Franz Pletz e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained
Update unmaintained packages
2016-05-16 23:45:11 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Matthias Beyer 5e6bb86f5d joe: 4.1 -> 4.2 2016-05-16 16:12:20 +02:00
Matthias Beyer 57f2e6e0b5 ed: 1.12 -> 1.13 2016-05-15 13:19:37 +02:00
Arseniy Seroka bc880acb22 Merge pull request #15459 from romildo/upd.atom
atom: 1.6.2 -> 1.7.3
2016-05-15 01:01:09 +03:00
José Romildo Malaquias 080f9c579a atom: 1.6.2 -> 1.7.3 2016-05-14 13:54:27 -03:00
Arseniy Seroka 67d1b8f757 Merge pull request #15431 from zimbatm/sublime-3114
sublime3: 3103 -> 3114
2016-05-14 00:07:01 +03:00
Thomas Tuegel 5e694aa3b3 Merge pull request #15430 from mdorman/emacs-revert
Revert removal of three hand-maintained emacs packages
2016-05-13 11:57:34 -05:00
Adam Russell 74883be684
idea.idea14-ultimate: init at 14.1.7
(cherry picked from commit a4f13a8bae)
2016-05-13 15:54:34 +02:00
Arseniy Seroka efa8c3b6be Merge pull request #15428 from chris-martin/idea-security-update
Idea security update
2016-05-13 15:15:28 +03:00
zimbatm dabef63eaf sublime3: 3103 -> 3114 2016-05-13 11:36:50 +01:00
Michael Alan Dorman 1b314a70c2 Revert "Remove obsolete pcache version"
This reverts commit 5cc4ff09fa.
2016-05-13 06:35:19 -04:00
Michael Alan Dorman ada0d47b3e Revert "Remove obsolete s version"
This reverts commit 7ccdbff95b.
2016-05-13 06:35:06 -04:00
Michael Alan Dorman 0d4dfbd570 Revert "Remove obsolete xml-rpc version"
This reverts commit 5017e24756.
2016-05-13 06:34:44 -04:00
Chris Martin ff48229c42 idea.webstorm: 10.0.4 -> 10.0.5 2016-05-13 04:57:20 -04:00
Chris Martin ee511456fc idea.phpstorm: 10.0.1 -> 10.0.4 2016-05-13 04:57:03 -04:00
Chris Martin 8cf2a2dbeb idea.pycharm-professional: 2016.1.2 -> 2016.1.3 2016-05-13 04:56:36 -04:00
Chris Martin 89f46ab3e3 idea.pycharm-community: 2016.1.2 -> 2016.1.3 2016-05-13 04:55:57 -04:00
Chris Martin 22b8bb4bd0 idea.ruby-mine: 7.1.2 -> 7.1.5 2016-05-13 04:55:32 -04:00
Chris Martin 69448be776 idea.idea-ultimate: 2016.1.1 -> 2016.1.2 2016-05-13 04:55:10 -04:00
Chris Martin ac076eeb20 idea.idea15-ultimate: 15.0.5 -> 15.0.6 2016-05-13 04:54:48 -04:00
Chris Martin 4217743b94 idea.idea-community: 2016.1.1 -> 2016.1.2 2016-05-13 04:54:25 -04:00
Chris Martin 149ba81f79 idea.idea14-community: 14.1.6 -> 14.1.7 2016-05-13 04:53:55 -04:00
Chris Martin 9fe577bdc0 idea.clion: 1.2.4 -> 1.2.5 2016-05-13 04:53:22 -04:00
Chris Martin 7d0570a253 idea.android-studio: 2.0.0.20 -> 2.1.1.0 2016-05-13 04:52:14 -04:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Arseniy Seroka d3e7141ef3 Merge pull request #15409 from joelmo/netbeans
netbeans: 8.0.2 -> 8.1
2016-05-13 01:26:51 +03:00
Joel Moberg 9e929f3eb6 netbeans: 8.0.2 -> 8.1 2016-05-12 15:08:17 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Michael Alan Dorman 5cc4ff09fa Remove obsolete pcache version 2016-05-08 18:33:29 -04:00
Michael Alan Dorman 7ccdbff95b Remove obsolete s version 2016-05-08 18:33:29 -04:00