JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,778 Commits 2 Branches 0 Tags 13 GiB
ff965a59f5
Commit Graph

2188 Commits

Author SHA1 Message Date
Bart Brouns
59dbcefaa7
physlock: git-20150126 -> 0.5 2016-12-30 22:45:56 -05:00
Alexander V. Nikolaev
76b5f2c249 wineUnstable: 1.9.23 -> 2.0-rc2 
Update staging as well
 2016-12-22 16:06:18 +02:00
Balletie
bf82db37d2
light-locker: Conform meta.description to CONTRIBUTING 2016-12-18 19:38:12 +01:00
Balletie
786b5dd07b
light-locker: use systemd/logind instead of UPower 
Since systemd has been adopted for a while now, we should switch to
using it for light-locker as well. So I disabled ConsoleKit/UPower
support in favor of using systemd with logind. This fixed many issues
for me, and made light-locker working again.

I followed the PKGBUILD of Arch's package in determining the right
configure flags. See: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/light-locker
 2016-12-18 19:26:58 +01:00
Will Dietz
b035da2e4d Add vim-markdown plugin.... 2016-12-14 17:29:52 -06:00
Daniel Brockman
8c0f4755bd urbit: 2016-06-02 -> 0.4 (#20922) 2016-12-13 15:43:02 +01:00
romildo
500816150f flat-plat-gtk-theme: remove build dependency on gnome-shell 2016-12-10 07:11:30 -02:00
romildo
8bdf8b7b51 flat-plat-gtk-theme: eba3be5 -> 2016-12-03 2016-12-09 19:31:35 -02:00
Joachim F
67b79c32f5 Merge pull request #20990 from romildo/upd.numix-gtk-theme 
numix-gtk-theme: 2016-06-12 -> 2016-11-19
 2016-12-08 11:30:53 +01:00
Joachim F
b5116b8b12 Merge pull request #20984 from romildo/upd.paper-gtk-theme 
paper-gtk-theme: 2016-05-27 -> 2016.08-16
 2016-12-08 11:30:14 +01:00
romildo
0a09969693 numix-gtk-theme: 2016-06-12 -> 2016-11-19 2016-12-07 18:45:25 -02:00
romildo
1678119dcc paper-gtk-theme: 2016-05-27 -> 2016.08-16 2016-12-07 17:38:07 -02:00
romildo
1039d9d7eb arc-theme: 2016-10-13 -> 2016-11-25 2016-12-07 16:52:34 -02:00
Joachim F
583e5cfa0d Merge pull request #20881 from romildo/new.e17gtk 
e17gtk: init at 3.22.0
 2016-12-07 05:25:30 +01:00
Tuomas Tynkkynen
1e7bb272e1 U-Boot: Add platforms to legacy U-Boots 
Or they will be tried to be built on x86_64 since #19990.
 2016-12-05 02:17:41 +02:00
romildo
650501f5b1 e17gtk: init at 3.22.0 2016-12-03 08:20:33 -02:00
romildo
3170266657 adapta-gtk-theme: 3.21.3.68 -> 3.89.1.66 2016-12-02 22:26:27 -02:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Tuomas Tynkkynen
02e1846d62 U-Boot: 2016.05 -> 2016.11 2016-11-28 00:23:12 +02:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
romildo
a357777fc0 Greybird: 2016-09-13 -> 2016-11-15 2016-11-25 05:08:03 -02:00
Frederik Rietdijk
12d9fe12f0 urbit: use python2 2016-11-24 22:28:03 +01:00
Arseniy Seroka
39a0d766db Merge pull request #20678 from carlsverre/fix/ctrlp-cmatcher 
Fix/ctrlp cmatcher
 2016-11-24 22:53:15 +04:00
Arseniy Seroka
c8e014e5a6 Merge pull request #20681 from carlsverre/add/cpsm 
cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d
 2016-11-24 22:52:15 +04:00
Carl Sverre
a7500ca12b cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d 2016-11-24 00:16:24 -08:00
Carl Sverre
1d45e5d6c7 fix/ctrlp-cmatcher: add extra steps to additional-nix-code 2016-11-23 23:53:32 -08:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Pascal Wittmann
703deb0bc0
slock: 1.3 -> 1.4 
fixes CVE-2016-6866
 2016-11-20 15:12:04 +01:00
Arseniy Seroka
57260d4c79 Merge pull request #20483 from steveeJ/vim-plugins-deoplete-go 
vim-plugins/deoplete-go: init at 2016-11-12
 2016-11-18 23:35:21 +04:00
Michael Raskin
fd0d7229ff Merge pull request #20519 from avnik/wine-update 
wine-unstable: 1.9.22 -> 1.9.23
 2016-11-18 11:22:19 +00:00
Alexander V. Nikolaev
edcfa0f3fa wine-unstable: 1.9.22 -> 1.9.23 2016-11-18 13:16:02 +02:00
Pascal Wittmann
ec6e4689ea xlockmore: 5.47 -> 5.49 2016-11-17 22:34:03 +01:00
Stefan Junker
da23970660 vim-plugins/deoplete-go: init at 2016-11-12 2016-11-17 18:23:33 +01:00
Jaka Hudoklin
f4780da125 vimPlugins/vim-jsdoc: init at 0kr4p01p 2016-11-17 13:07:38 +01:00
Joe Hermaszewski
d6a3aaef89 vim-utils: fix typo 2016-11-13 12:07:10 +00:00
James Cunningham
5dee508acf vim plugins: add dracula theme 2016-11-10 16:24:45 +00:00
Arseniy Seroka
d4d2e7fd9e Merge pull request #20237 from vcunat/p/vim-fixes 
vim fixes
 2016-11-09 12:22:45 +03:00
Vladimír Čunát
8e86d3d451 vim-plugins: add clighter8 2016-11-07 20:21:42 +01:00
Vladimír Čunát
d8652a053b vimPlugins: auto-update 
- Rename couldn't be fetched; new URL should be OK.
- Two plugins got re-ordered (added ad-hoc, apparently).
- ctrlp* is suspected to contain non-generated code;
  I left it untouched this round but it should be fixed.
  /cc @carlsverre for 71a94dfd9
 2016-11-07 18:55:21 +01:00
Bart Brouns
78121c2118 build jack unstable without profiling 2016-11-07 12:59:05 +01:00
Michael Raskin
4bfa6989f0 wineUnstable: 1.9.20 -> 1.9.22 2016-11-04 08:58:17 +01:00
Alexander V. Nikolaev
d89c3acced wineUnstable: 1.9.20 -> 1.9.22 
Also update staging as well
 2016-11-04 06:04:15 +02:00
Kier Davis
9f4114a740
samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups' 
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from c41e771a38
 2016-11-02 15:13:46 +00:00
Frederik Rietdijk
84174c0cb8 libjack2Unstable: and remove the old file 
that I forgot to stage.
 2016-11-02 14:54:48 +01:00
Frederik Rietdijk
ab0ac18279 libjack2Unstable: fix evaluation 
broken by f64933596c
 2016-11-02 14:20:58 +01:00
Bart Brouns
d315ca4080 libjack2-git: 2015-09-03 -> 2016-08-18 2016-11-02 12:51:22 +01:00
Ioannis Koutras
270365a1ee samsung-unified-linux-driver: add 4.01.17 2016-11-01 19:19:53 +02:00
Dan Peebles
89915f8206 db45: remove outdated version 2016-11-01 03:10:13 +00:00
Frederik Rietdijk
beef906d2e Merge pull request #19882 from FRidh/hplip 
hplip: use mkPythonDerivation
 2016-10-28 20:00:08 +02:00
Frederik Rietdijk
7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Frederik Rietdijk
d9c7a14c6a hplip: use mkPythonDerivation 
since hplip is a Python package that doesn't use setuptools. Note that a
setup.py is provided, however, using buildPythonPackage fails.
 2016-10-26 10:46:53 +02:00
Jaka Hudoklin
48c94846c9 vim-plugins/editorconfig-vim: init at a459b8 2016-10-23 17:27:32 +02:00
Jaka Hudoklin
3ba12b3333 vim-plugins/auto-pairs: init at 1b3a1efb 2016-10-23 17:27:24 +02:00
Alexander Ried
459da7b86e gnome3: default to 3.22 (#19743) 
* gnome3: default to 3.22

* zuki-themes: add src for gnome 3.22, remove 3.18

* gnome3_22.vte_290: copy from gnome3.20

* termite: use vte-select-text from gnome3_20
 2016-10-22 19:54:20 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Graham Christensen
8d9a2c191f Merge pull request #19681 from grahamc/ghostscript 
ghostscript: 9.18 -> 9.20 for multiple CVEs
 2016-10-19 20:58:45 -04:00
Graham Christensen
3c2306e216
ghostscript: 9.18 -> 9.20 for multiple CVEs: https://lwn.net/Vulnerabilities/703324/ 2016-10-19 08:09:17 -04:00
Frederik Rietdijk
481eea3280 lilypond: use python2 2016-10-18 23:16:09 +02:00
Frederik Rietdijk
e7834d4ed9 jack2Full: use python2 2016-10-18 23:14:34 +02:00
Ram Kromberg
1e290ae75f mfcj6510dw: init at 3.0.0-1 2016-10-15 18:57:37 +03:00
romildo
b59b353d4d theme-vertex: revert package renaming 2016-10-14 14:27:50 -03:00
Tim Steinbach
24de66ce48 Merge pull request #19541 from romildo/upd.themes 
vertex-theme: 20160329 -> 20161009
 2016-10-14 09:28:05 -04:00
romildo
6eef45e58e arc-theme: 2016-06-06 -> 2016-10-13 2016-10-14 06:59:55 -03:00
romildo
6ed72b2c1a vertex-theme: 20160329 -> 20161009 2016-10-14 06:38:30 -03:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Michael Raskin
80ca889586 xscreensaver: 5.35 -> 5.36 2016-10-12 15:29:25 +02:00
Sander van der Burg
22a4d6bd54 fs-uae: 2.4.3 -> 2.8.0 2016-10-10 20:37:11 +00:00
AndersonTorres
fd38aeafcd mgba: git-20160325 -> 0.5.1 2016-10-09 16:47:54 +02:00
Robin Gloster
30accf4d3e
treewide: fix licence -> license occurences 2016-10-09 12:45:32 +02:00
Nikolay Amiantov
bc0970f1e3 zsnes: use more debian patches 
Fixes #19343
 2016-10-08 01:40:22 +03:00
Lorenzo Manacorda
3dab3b6fd6 vimPlugins: added Rename (#19298) 2016-10-06 18:34:39 +02:00
Edward Tjörnhammar
5b11c34b51
vimPlugins: added agda-vim vim-grammarous vim-easytags, updates 2016-10-05 15:11:20 +02:00
Michael Raskin
92675bb6e5 wineUnstable, wineStaging: 1.9.18 -> 1.9.20 2016-10-03 13:54:18 +02:00
Jörg Thalheim
4059854351
cups-kyocera: fix downloading of source 
the site blocked use of curl
fixes #14167
 2016-10-01 23:41:46 +02:00
Ivan Solyankin
226f62317c
cups-kyocera: init at 1.1203 2016-10-01 23:41:46 +02:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags 
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
 2016-10-01 16:13:41 +02:00
Michael Raskin
33ccf3abed xscreensaver: XScreenSaver actually needs GLU, so use mesa, not mesa_noglu 2016-09-28 10:05:12 +02:00
Joachim F
3177dd89bb Merge pull request #19008 from artuuge/epson-escpr 
epson-escpr: 1.6.5 -> 1.6.8
 2016-09-28 01:44:49 +02:00
artuuge
2168f2bf1b epson-escpr: 1.6.5 -> 1.6.8 2016-09-27 16:02:10 +02:00
Joachim F
81f47f7982 Merge pull request #18700 from yochai/master 
mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper
 2016-09-27 12:56:05 +02:00
Eelco Dolstra
cd901eac5f xscreensaver: Drop runtime dependency on mesa_noglu.dev and glu.dev 2016-09-26 19:58:52 +02:00
Yochai
3b548dacf4 mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper 2016-09-26 18:26:52 +03:00
Frederik Rietdijk
a07a60724b solfege: do not use top-level python packages 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
7d4f8d29e7 gcdemu: do not use top-level python packages 2016-09-25 23:13:41 +02:00
Joachim F
25828b546f Merge pull request #18867 from carlsverre/add/ctrlp-cmatcher 
ctrlp-cmatcher: init at 09-22-2016
 2016-09-24 00:11:06 +02:00
Tobias Geerinckx-Rice
0a2f4e4d56 Merge pull request #17850 from regnat/hplip 
hplip: Allow building with plugins on arm
 2016-09-23 21:39:36 +02:00
Carl Sverre
71a94dfd93 ctrlp-cmatcher: init at 09-22-2016 
Faster matcher for the ctrlp vim plugin.
 2016-09-22 22:59:37 -07:00
Charles Strahan
358232f68a
cnijfilter2: fix build 2016-09-17 15:54:07 -04:00
Hoang Xuan Phu
c678e121c4 vim-plugins: remove unused arguments 2016-09-17 16:45:34 +08:00
Hoang Xuan Phu
81cc672000 vim-plugins: add some more aliases 2016-09-17 16:44:56 +08:00
Hoang Xuan Phu
4ccbab01a9 vim-plugins: add acp, rainbow and vim-repeat 2016-09-17 16:40:15 +08:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
José Romildo Malaquias
cb948d5b5c Greybird: 2016-08-16 -> 2016-09-13 2016-09-14 18:31:56 -03:00
Herwig Hochleitner
9a10569480 wine: 1.8.3 -> 1.8.4; 1.9.16 -> 1.9.18 
- update mono and gecko versions
- update winetricks
- replace sourceforge download urls
 2016-09-13 17:33:24 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Michael Raskin
d1bf595cc5 wine: 1.8.3 -> 1.8.4; wineUnstable: 1.9.16 -> 1.9.18 2016-09-12 13:08:51 +02:00
Tuomas Tynkkynen
1517c80462 uboot: Fix build 2016-09-08 02:37:11 +03:00
Chris Martin
66f05a9b72 dell-530cdn: md5->sha256 2016-09-05 20:08:31 -04:00
Tuomas Tynkkynen
adf471c83c urbit: Fix build 2016-09-02 19:04:41 +03:00
Kamil Chmielewski
26072a5b67 vimPlugins: YouCompleteMe FIX gocode crash 
https://github.com/Valloric/ycmd/issues/586
 2016-09-01 14:45:04 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Nikolay Amiantov
2128224620 linuxPackages.vhba: disable PIC hardening 2016-08-31 16:00:31 +03:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Robin Gloster
1876ce8494
ataripp: add missing libSM dependency 2016-08-29 17:15:10 +00:00
Vladimír Čunát
b981fe2095 vim-indent-guides: init at 2016-04-17 2016-08-29 14:40:12 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Ram Kromberg
ee1cc78333 Revert "wine: use gcc49 for 64-bit builds" 
This reverts commit 24835df322.
 2016-08-27 12:27:42 +03:00
Stefan Junker
6715afca34 vimUtils.vimtex: 2016-07-26 -> 2016-08-19 (#17945) 2016-08-26 14:48:35 +02:00
Bjørn Forsman
35c20440ca treewide: foomatic_filters -> foomatic-filters 2016-08-26 08:46:17 +02:00
Franz Pletz
80ed6b5ccf
xautolock: fix broken build caused by glibc update 2016-08-25 23:30:34 +02:00
Franz Pletz
1054399bef moltengamepad: disable format hardening 2016-08-25 03:55:20 +02:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2 
Darwin misc. fixes
 2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
f410ec16c4 treewide: Fix output references to cups 2016-08-23 04:52:13 +03:00
Tuomas Tynkkynen
27bb66bd94 treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is used 2016-08-23 03:52:06 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Anderson Torres
d559c07bbe Higan: 100 -> 101 (#17903) 2016-08-22 18:12:03 +01:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg
5b047ac9b5 seafile-shared: vala -> vala_0_23 2016-08-21 20:15:14 +03:00
Nikolay Amiantov
edb9416228 Merge pull request #17819 from abbradar/printing-updates 
Printing and PDF-related updates
 2016-08-20 01:41:55 +04:00
Théophane Hufschmitt
2bee86d435 hplip: Allow building with plugins on arm 2016-08-19 19:14:50 +02:00
José Romildo Malaquias
3a2cff0e32 Greybird: 2016-03-11 -> 2016-08-16 2016-08-18 11:23:05 -03:00
Nikolay Amiantov
b8e3560504 cups_filters: 1.5.0 -> 1.11.1 2016-08-18 16:09:34 +03:00
Nikolay Amiantov
b64924b0d5 cups: 2.1.3 -> 2.1.4 2016-08-18 16:09:34 +03:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus. 
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
 2016-08-16 22:52:37 +02:00
Matthew Bauer
077005f6c4 sailsd: fix darwin build 2016-08-16 19:25:45 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
9330472a38 Merge pull request #17724 from avnik/upgrade/wine 
wine: 1.9.14 -> 1.9.16
 2016-08-15 00:27:18 +04:00
Nikolay Amiantov
526a8acb57 m33-linux: rename from m3d-linux, 2016-01-20 -> 2016-06-23 2016-08-14 22:37:10 +03:00
Shea Levy
7069047f2e long-shebang: 1.0.1 -> 1.1.0 2016-08-14 12:33:50 -04:00
Shea Levy
670801a56a long-shebang: 1.0.0 -> 1.0.1 2016-08-14 10:58:44 -04:00
Frederik Rietdijk
6842a24b21 Remove top-level pyqt4 
See #11567.
 2016-08-14 12:38:01 +02:00
Alexander V. Nikolaev
b81cf59bd7 wine: 1.9.14 -> 1.9.16 
Update wineUnstable and wineStaging
 2016-08-14 10:22:05 +03:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Mounium
1d1b875a9d flat-plat: made the theme discoverable 2016-08-04 13:02:22 +02:00
Robin Gloster
a748f315db fakenes: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
7e81a4294d dlx: disable format hardening 2016-08-04 07:48:23 +00:00
Robin Gloster
552a8c4219 talkfilters: disable format hardening 2016-08-03 20:28:05 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Mounium
ca18d16ce0 flat-plat: init at eba3be5 2016-08-03 11:28:54 +02:00
Robert Helgesson
cc9547dcf9 foo2zjs: remove use of builderDefsPackage (#17459) 2016-08-03 00:41:47 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
9b5dcffe22 retroarch: Propagate meta info to wrapper 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Shea Levy
52b787b0cd Add dell-530cdn printer driver 2016-08-01 08:32:38 -04:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Shea Levy
03a8f723bd Add long-shebang tool 2016-07-31 13:11:50 -04:00
AndersonTorres
9b1b3aa2ff higan: 099 -> 100 2016-07-30 19:36:01 -03:00
Rok Garbas
ac12a89278
vimPlugins.vim-auto-save: init and also vimPlugins updated 2016-07-27 13:23:30 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Gabriel Ebner
3beb7ec51e xautolock: add meta.platforms 2016-07-23 11:42:50 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Charles Strahan
4e84c6fc7c cnijfilter2: init at 5.30 (#17048) 
Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600,
MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490,
E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series.
 2016-07-21 01:09:36 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Brandon Kase
0ca5879b5a vimPlugins: fix youcompleteme on darwin 2016-07-18 19:01:58 +02:00
Nikolay Amiantov
aefd8c420c Merge pull request #17043 from womfoo/fix/qmake4Hook-builds 
reintroduce qmake .pro files after qmake4Hook changes
 2016-07-18 00:11:24 +04:00
Kranium Gikos Mendoza
615d818964 ppsspp: fix qmake4Hook build 
pass PPSSPPQt.pro which was removed in 34625f6
 2016-07-17 22:42:46 +08:00
Rok Garbas
3634e8ac3e vimPlugins: update existing plugins and added 3 more 
- github:sbdchd/neoformat
- github:elmcast/elm-vim
- github:sheerun/vim-polyglot
 2016-07-16 20:09:55 +02:00
Joachim F
35bbe646d6 Merge pull request #16984 from romildo/upd.blackbird 
blackbird: 2016-04-10 -> 2016-07-04
 2016-07-16 13:11:51 +02:00
Joachim F
820812f128 Merge pull request #16988 from romildo/upd.adapta 
adapta-gtk-theme: 3.21.2 -> 3.21.3.68
 2016-07-16 13:09:28 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
José Romildo Malaquias
f4d845b479 adapta-gtk-theme: 3.21.2 -> 3.21.3.68 2016-07-15 10:50:42 -03:00
José Romildo Malaquias
99a02d7f5d blackbird: 2016-04-10 -> 2016-07-04 2016-07-15 09:12:23 -03:00
J Phani Mahesh
bbd0a47950 vim-plugin:YouCompleteMe: propogatedBuildInputs -> propagatedBuildInputs 2016-07-14 17:26:19 +05:30
Rok Garbas
963327aacb vimPlugins: updating plugin and adding floobits plugin 2016-07-11 22:49:16 +02:00
Alexander V. Nikolaev
dc5293d80b wine: 1.9.13 -> 1.9.14 (#16862) 
* Update wineUnstable: 1.9.13 -> 1.9.14
* Update staging: 1.9.13 -> 1.9.14
* Add myself as co-maintainer, because I am do regular updates.
 2016-07-11 17:57:16 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5 
These cause an unnecessary rebuild of gcc.
 2016-07-11 10:46:34 +02:00
Matthias Beyer
7f4d52e27e Build libjack2 for supercollider with same GCC 
Also remove trailing whitespace
 2016-07-07 16:07:47 +02:00
William Casarin
7129ebbd5e dolphin-emu: 4.0.2 -> 5.0 2016-07-06 12:22:58 -07:00
Tuomas Tynkkynen
4085f4de5f Merge branch 'pr-newest-uboot' into master 2016-07-04 15:17:46 +03:00
Tuomas Tynkkynen
18572e2359 U-Boot: Drop Versatile build 
I had broken this at some point and the patch conflicts quite often.
Hopefully soon the Raspberry Pi 2 emulation in QEMU can be used instead.
 2016-07-04 01:52:58 +03:00
Tuomas Tynkkynen
4108e0324e U-Boot: Build for the Raspberry Pi 2 & 3 2016-07-04 01:52:58 +03:00
Tuomas Tynkkynen
428b51dd2f U-Boot: 2016.01 -> 2016.05 
Amongst many minor things, the USB keyboard becomes operative on the
Raspberry Pi. Yay!
 2016-07-04 01:52:19 +03:00
Tuomas Tynkkynen
1268f0753f U-Boot: Build for the Beaglebone Black 2016-07-03 20:48:07 +03:00
José Romildo Malaquias
c4ce1eece0 zuki-themes: init at 2016-07-01 2016-07-02 09:24:55 -03:00
Nikolay Amiantov
9159d50baf Merge pull request #16533 from avnik/wine-update 
wine: 1.9.11 -> 1.9.13
 2016-07-01 16:07:11 +04:00
Alexander V. Nikolaev
962e365444 wineStable: 1.8.2 -> 1.8.3 2016-07-01 14:30:54 +03:00
pngwjpgh
17e8032adb samsung-UnifiedLinuxDriver: fix multi-output cups (#16421) 2016-07-01 00:29:56 +02:00
Vladimír Čunát
3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +02:00
Vladimír Čunát
b8614a6c63 Merge #16328: gtk themes: clean up inconsistent naming 2016-06-28 21:48:45 +02:00
Alexander V. Nikolaev
8f53cfbd59 wine: 1.9.11 -> 1.9.13 2016-06-27 01:09:56 +03:00
Marc Weber
c3f56e912a Add nixpkgs documentation about how to create a derivation with Vim + plugins 2016-06-25 21:39:00 +02:00
AndersonTorres
6c252964fc higan: v098 -> v099 2016-06-25 12:20:32 -03:00
Nikolay Amiantov
8399068b80 winetricks: 20160219 -> 20160622 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
5ee7f081e3 wine: fix gstreamer support 2016-06-24 00:58:35 +03:00
Nikolay Amiantov
9e8592d6b9 wine: set default features in all-packages 
I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.
 2016-06-23 14:01:09 +03:00
Nikolay Amiantov
5bff6fef55 wine: restore old features 2016-06-23 13:28:55 +03:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge 
... from staging to master, reverted temporarily in aa9a04883e.
 2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
 2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4 
They were mostly missing <cmath> or <math.h>.
 2016-06-19 10:18:30 +02:00
Severen Redwood
e83687fe8e
Clean up the inconsistent naming of themes 2016-06-19 01:48:55 +12:00
Arseniy Seroka
d5b28fb554 Merge pull request #16301 from LnL7/vimplugins-deoplete-jedi 
vimPlugins: added deoplete-jedi
 2016-06-18 16:03:19 +03:00
Joachim Fasting
89913798b1 Merge pull request #16302 from brainrape/update_urbit 
urbit: 2015.09.26 -> 2016-06-02
 2016-06-18 14:52:32 +02:00
Severen Redwood
915edac0ce
adapta-gtk-theme: Init at 3.21.2 2016-06-18 23:33:29 +12:00
Márton Boros
08f41462d7 urbit: 2015.09.26 -> 2016-06-02 
Updated to latest revision in urbit git master, fixes build error caused by missing sources.
Updated description and website.
Fixed date/version format to ISO 8061.
 2016-06-18 08:36:10 +02:00
Daiderd Jordan
a20b8c114b vimPlugins: added deoplete-jedi 2016-06-17 08:16:39 +02:00
Joachim Fasting
5faefd4c04 Merge pull request #15826 from yawnt/postscript-lexmark 
postscript-lexmark: add package
 2016-06-16 15:29:03 +02:00
Moritz Ulrich
e72282be84 Merge pull request #16052 from dvc94ch/rust-cross 
Rust and cargo improvements
 2016-06-16 09:42:23 +02:00
Benno Fünfstück
41d523a8bc gnome-breeze: init 2016-06-16 00:02:53 +02:00
David Craven
54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
Arseniy Seroka
06027595fc
vimPlugins: update 2016-06-15 2016-06-15 00:03:59 +03:00
Joachim Fasting
f04291abe5 Merge pull request #16138 from romildo/upd.arc 
arc-gtk-theme-git: 2016-06-02 -> 2016-06-06
 2016-06-14 15:04:18 +02:00
Joachim Fasting
3d54210566 Merge pull request #15739 from matthewbauer/retroarch-disable-nvidia 
Remove nvidia-cg-toolkit as input for retroarch.
 2016-06-13 16:46:58 +02:00
José Romildo Malaquias
ce50ba74dc numix-gtk-theme: 2016-05-25 -> 2016-06-12 
Closes #16188.
 2016-06-13 10:03:30 +02:00
José Romildo Malaquias
0bd6b9ce98 paper-gtk-theme: 2016-05-25 -> 2016-05-27 
Closes #16194.
 2016-06-13 09:57:25 +02:00
Matthew Bauer
e37bb985a3 retroarch: 2015-11-20 -> 1.3.4 
also: remove nvidia-cg-toolkit as input for retroarch.
see #15707

darwin is also building but you have to trick it into
thinking it's a desktop app for the GUI to load

platforms is set to "platforms.all".
 2016-06-12 22:13:06 -05:00
Erik Rybakken
d49e0ff79f vimPlugins: add localvimrc 2016-06-11 23:13:15 +02:00
José Romildo Malaquias
9ddc8a1a5a arc-gtk-theme-git: 2016-06-02 -> 2016-06-06 2016-06-10 21:35:32 -03:00
Michael Raskin
da021cdda1 xscreensaver: an option to install all the hacks, including retired ones and DNA logo 2016-06-10 17:51:39 +02:00
Nikolay Amiantov
21f5510a54 Merge pull request #15367 from bendlas/update-wine 
wine-unstable: 1.9.7 -> 1.9.11; add optional dependencies; opencl-icd: init; refactor flags
 2016-06-10 16:47:31 +04:00
Michael Raskin
46d3001fa7 xscreensaver: use gle 2016-06-10 14:51:48 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rushmore Mushambi
83c40ada7e Merge pull request #16017 from kamilchm/rework-go 
Rework goPackages
 2016-06-09 17:09:13 +02:00
Nikolay Amiantov
2f1b355747 Merge pull request #15983 from ryantm/zsnes 
zsnes: add desktop item
 2016-06-09 17:34:09 +04:00
Ryan Mulligan
b54fa1e351 zsnes: add desktop item 
add desktop item so zsnes can be used without the terminal
add icons
 2016-06-09 06:22:13 -07:00
Kamil Chmielewski
6909d0e456 vimPlugins: FIX fzf outside goPackages 2016-06-09 11:21:30 +02:00
Brandon Kase
440004a017 vimPlugins: add purescript plugins 2016-06-04 17:25:08 -07:00
José Romildo Malaquias
3f80f0149f arc-gtk-theme: 2016-05-14 -> 2016-06-02 2016-06-03 20:03:40 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Moritz Ulrich
a1b0ca639c gnuk: Fix hashes. 
Fixes #15827.
 2016-06-03 12:16:54 +02:00
José Romildo Malaquias
f67c878241 mate-icon-theme: move to pkgs/desktops/mate/ 2016-05-31 15:08:51 -03:00
José Romildo Malaquias
e428c0346f mate-themes: move to pkgs/desktops/mate/ 2016-05-31 15:06:43 -03:00
Joachim Fasting
6aede2abad Merge pull request #15788 from romildo/upd.mate-icon-theme 
mate-icon-theme: 1.6.3 -> 1.14.1
 2016-05-30 22:36:11 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
yawnt
fe1f3b70bc postscript-lexmark: add package 2016-05-30 11:42:10 +02:00
Herwig Hochleitner
8c0f03ae9d wine: 1.9.10 -> 1.9.11 2016-05-30 04:05:55 +02:00
Herwig Hochleitner
1c215828d5 wine: make features configurable 2016-05-29 10:45:16 +02:00
Herwig Hochleitner
98d720d72c wine: 1.8.1 -> 1.8.2 2016-05-29 10:45:12 +02:00
Herwig Hochleitner
edb5a8c632 wine: 1.9.9 -> 1.9.10 2016-05-29 10:45:08 +02:00
Herwig Hochleitner
0f3ff1401d wine-staging: move libtxc_dxtn to buildInputs 
this adds it to RPATH, via LDFLAGS (see base.nix)
 2016-05-29 10:44:42 +02:00
Herwig Hochleitner
4416644eb3 wine-unstable: 1.9.7 -> 1.9.9 2016-05-29 10:44:42 +02:00
Herwig Hochleitner
33c6a9d1e7 wine: add optional dependencies 2016-05-29 10:44:42 +02:00
Joachim Fasting
ea5039e448 Merge pull request #15712 from rardiol/pcsxr94b 
pcsxr: init at 1.9.94
 2016-05-28 23:33:09 +02:00
Joachim Fasting
69091bae84 Merge pull request #15741 from romildo/fix.themes 
Numix and Paper themes: fix installation dir and update revision
 2016-05-28 22:30:55 +02:00
José Romildo Malaquias
2e0c97de6e mate-icon-theme: 1.6.3 -> 1.14.1 2016-05-28 14:43:21 -03:00
José Romildo Malaquias
ae08abb8b3 mate-themes: 1.6.3 -> 3.18.1 2016-05-28 13:28:47 -03:00
José Romildo Malaquias
ad6496f768 numix-gtk-theme: 2016-05-19 -> 2016-05-25 2016-05-27 00:03:15 -03:00
José Romildo Malaquias
923a63ad5d paper-gtk-theme: 2016-05-18 -> 2016-05-25 2016-05-26 23:56:42 -03:00
José Romildo Malaquias
ecce3999b2 paper-gtk-theme: fix installation directory 2016-05-26 23:56:42 -03:00
José Romildo Malaquias
f83cbcb51e numix-gtk-theme: fix installation directory 2016-05-26 22:01:45 -03:00
Ricardo Ardissone
38429f74b2 pcsxr: init at 1.9.94 2016-05-26 15:54:24 -03: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
Arseniy Seroka
ff87996847 Merge pull request #15688 from AmatCoder/AmatCoder-mednaffe 
mednaffe: Fix segfault on shutdown
 2016-05-25 23:32:34 +03:00
Michael Raskin
e23d64b94c xscreensaver: 5.34 -> 5.35 2016-05-25 15:26:06 +02:00
AmatCoder
15dbdc5930 mednaffe: Fix segfault on shutdown 2016-05-25 06:30:40 +00:00
Rok Garbas
54f5872f06 vimPlugins: updating plugins 2016-05-24 15:37:08 +02: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
José Romildo Malaquias
7e390822d2 paper-gtk-theme: 6a5f14cfe697b0a829456a1fd560acdcddc6043f -> 2016-05-18 2016-05-22 10:39:02 -03: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
José Romildo Malaquias
9752218d40 paper-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-22 05:58:57 -03:00
José Romildo Malaquias
603db7fa6f numix-gtk-theme: 2.5.1 -> 2016-05-19 2016-05-20 11:52:31 -03:00
José Romildo Malaquias
2d4b6129f9 numix-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to "pkgs/misc/themes/" 2016-05-20 11:21:42 -03:00
Rok Garbas
810a4dd656 vimPlugins.YankRing: fixing the build 2016-05-20 10:48:03 +02:00
Rok Garbas
4b2a5edd7c vimPlugins: update also fixes hashes due to change in fetchgit #15469 2016-05-20 10:40:11 +02:00
Charles Strahan
612d4a1684
mnemonicode: fix name 2016-05-19 16:19:18 -04:00
Charles Strahan
cd0d0944f9
mnemonicode: init at 2015-11-30 
mnemonicode is a set of routines which implement a method for encoding
binary data into a sequence of words which can be spoken over the phone,
for example, and converted back to data on the other side.
 2016-05-19 16:17:18 -04:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen
d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát
e429a4012e Merge #15360: xscreensaver: Fix xscreensaver-text 2016-05-17 09:13:59 +02:00
Rommel M. Martinez
7d06d451c3 moltengamepad-git: init at 2016-05-04 (#15462) 2016-05-17 08:09:33 +02:00
Rok Garbas
499195dfcf vimPlugins: updated existing plugins and added new ones 
- also added fzf manuall
- added following plugins to `vim-plugin-names` list:
    github:terryma/vim-expand-region
    github:rust-lang/rust.vim
    github:junegunn/fzf.vim
    github:hecal3/vim-leader-guide
    github:ctjhoa/spacevim
    github:Shougo/deoplete.nvim
 2016-05-17 02:01:10 +02:00
Rok Garbas
3c8bd93f23 base16: use patch for neovim terminal mode 2016-05-17 01:56:35 +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
Arseniy Seroka
82feebd53d Merge pull request #15479 from mpscholten/vim-plugin-vim-closetag 
vimPlugins: Init vim-closetag
 2016-05-15 21:27:39 +04:00
Marc Scholten
f3a912a0d5
vimPlugins: Init vim-closetag 2016-05-15 17:01:51 +02:00
Joachim Fasting
dffb9a28cf Merge pull request #15451 from romildo/new.blackbird 
blackbird: init at 2016-04-10
 2016-05-15 06:35:24 +02:00
Rok Garbas
3249796220 xautolock: adding patch that enables -lockaftersleep option 
and...
- added metadata
- added myself as a maintainer
 2016-05-15 05:47:35 +02:00
Rok Garbas
bfe8d8ac84 base16: init at revision 9b24598c0 (no release) 
also applied few patches from not merged PRs
 2016-05-15 03:58:28 +02:00
Arseniy Seroka
969ce217f7 Merge pull request #15458 from romildo/upd.arc 
arc: 2015-10-21 -> 2016-05-14
 2016-05-15 01:01:27 +03:00
Pascal Wittmann
b596fd4a42 xlockmore: 5.46 -> 5.47 2016-05-14 18:27:43 +02:00
José Romildo Malaquias
e081433bee arc: 2015-10-21 -> 2016-05-14 2016-05-14 13:05:03 -03:00
José Romildo Malaquias
6f42aeb716 blackbird: init at 2016-04-10 2016-05-14 07:41:25 -03:00
Louis Taylor
3b6550c29b sailsd: 0.1.1 -> 0.2.0 (#15445) 
Sails has now been split into a few subcomponents, sailsd being the main
one. This package has been renamed to sailsd, the sailing simulation
daemon.
 2016-05-14 11:05:37 +02:00
Brandon Kase
ea018f8339 racerd: init at 0.1.1 
Needed for Rust YouCompleteMe support
 2016-05-14 01:28:08 -07:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Alexey Lebedeff
288c355f01 xscreensaver: Fix xscreensaver-text helper 
xscreensaver-text invokes `appres` binary at runtime. When it's missing,
some screensavers will display Perl stacktraces.
 2016-05-10 18:31:27 +03:00
Sebastian Hagen
c84d366295
ghostscript: update upstream URL 
Closes #15342
 2016-05-10 10:32:48 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
zimbatm
9c3c8f55b6 Merge pull request #15303 from laMudri/numix 
numix-gtk-theme: 2.2.3 -> 2.5.1
 2016-05-08 13:38:42 +01:00
laMudri
39b3345c12 numix-gtk-theme: 2.2.3 -> 2.5.1 2016-05-08 12:23:50 +01:00
Tobias Geerinckx-Rice
628ac272da
hplip{,WithPlugin}: 3.16.3 -> 3.16.5 2016-05-08 00:45:08 +02:00
Arseniy Seroka
559553d34a Merge pull request #15127 from bkase/haskell-vim 
vimPlugins: add missing haskell plugins
 2016-05-05 14:46:59 +03:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Brandon Kase
17d85f4e91 vimPlugins: add missing haskell plugins 
* haskell-vim
* hlint-refactor-vim
* vim-haskellConcealPlus
 2016-05-03 23:12:16 -07:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
José Romildo Malaquias
4b2caa2409 Greybird: init at 2016-03-11 2016-05-03 06:45:17 -03:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00