JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,304 Commits 2 Branches 0 Tags 12 GiB
b1dcd271d1
Commit Graph

2163 Commits

Author SHA1 Message Date
Robin Gloster
10239a084f
packetbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:42 +01:00
Robin Gloster
4d08d1aa8f
metricbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:42 +01:00
Robin Gloster
66d0c4b1bd
heartbeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:41 +01:00
Robin Gloster
a0d087b6fe
filebeat: 5.2.1 -> 5.2.2, build from source 2017-03-20 23:01:39 +01:00
Tristan Helmich
8338506abe
packetbeat: init at 5.2.1 2017-03-20 22:37:44 +01:00
Tristan Helmich
9fe3b0eb13
filebeat: init at 5.2.1 2017-03-20 22:37:18 +01:00
Tristan Helmich
9fce67264d
metricbeat: init at 5.2.1 2017-03-20 22:37:17 +01:00
Tristan Helmich
9dfb7e42ad
heartbeat: init at 5.2.1 2017-03-20 22:37:13 +01:00
Nikolay Amiantov
179fe96a03 Merge pull request #24112 from abbradar/odroid 
Add ODROID-XU{3,4} support
 2017-03-20 17:44:09 +03:00
Jörg Thalheim
c031adedba
hplip: 3.16.5 -> 3.16.11 
fixes #24109
 2017-03-20 11:18:41 +01:00
Nikolay Amiantov
a9d44b5c30 ubootOdroidXU3: init 2017-03-20 11:07:12 +03:00
Evan Danaher
c34aa75d30 vim-utils: Handle overriding knownPlugins betters. 2017-03-19 18:44:02 -04:00
Michael Raskin
846b6d250a Merge pull request #23256 from edanaher/ensime 
Ensime
 2017-03-18 18:24:19 +01:00
Tuomas Tynkkynen
aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
 2017-03-14 00:49:22 +02:00
Vladimír Čunát
50fadc8b18
cups: split the $lib output 
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
 2017-03-12 18:36:30 +01:00
Vladimír Čunát
2e4c5711a2
cups: minor expression refactoring 2017-03-12 16:43:26 +01:00
Vladimír Čunát
b8685ddf68
cups: 2.1.4 -> 2.2.2 
The changelog seems safe, test succeeds on x86_64-linux.
 2017-03-12 16:43:02 +01:00
Lluís Batlle i Rossell
a2737b1fdf vlock: improve eintr patch 2017-03-11 10:00:06 +01:00
Jörg Thalheim
23990a9044 Merge pull request #23626 from yurrriq/update/pkgs/tools/misc/lilypond-with-fonts 
lilypond-with-fonts: fix typos
 2017-03-09 01:41:18 +01:00
Tuomas Tynkkynen
413bc03986 mess: Mark broken 
Even fixing the source urls doesn't make it build.
 2017-03-08 16:14:19 +02:00
Eric Bailey
90c5c9d8c9
lilypond-with-fonts: fix typos 
In development, I experimented with file globs, for loops and making the
supplementary fonts optional. As such, the original PR ended up with a
dysfunctional combination.

This commit fully adopts the for loop approach, which I prefer, since failing
matches, e.g. missing supplementary-fonts/, won't cause a failure.
 2017-03-07 23:02:26 -06:00
Franz Pletz
99ef5c84b4
cups-pk-helper: 0.2.5 -> 0.2.6 2017-03-07 11:27:18 +01:00
Anderson Torres
e96a2f8450 sound-of-sorting: 0.6.5 -> 20150721 (#23549) 
* sound-of-sorting: 0.6.5 -> 20150721

* sound-of-sorting: correct unstable version format
 2017-03-06 15:24:40 +01:00
Jörg Thalheim
d971a9bcca Merge pull request #23548 from yurrriq/update/pkgs/misc/lilypond/with-fonts 
lilypond: add openlilylib-fonts and lilypond-with-fonts
 2017-03-06 14:37:20 +01:00
Vi Po
133245f961
epson-escpr: 1.6.8 -> 1.6.12 
Improve documentation
 2017-03-06 08:31:36 -05:00
Eric Bailey
f497421e14
lilypond-with-fonts: use all fonts by default 
Add a list of all fonts to openlilylib-fonts and use that as the default
fonts argument to lilypond-with-fonts.
 2017-03-06 04:34:08 -06:00
romildo
810bf85bfa greybird: 2017-02-17 -> 2017-02-26 2017-03-06 07:26:07 -03:00
Eric Bailey
bdc9589df1
lilypond: add openlilylib-fonts and lilypond-with-fonts 2017-03-06 02:16:42 -06:00
Jörg Thalheim
c31c11ecef Merge pull request #23482 from rardiol/pcsxr 
pcsxr: remove name conflict with zlib 1.2.9
 2017-03-06 08:59:13 +01:00
Daiderd Jordan
5262f5e3a2 vim-plugins: add some more plugins 2017-03-04 13:16:46 +01:00
Daiderd Jordan
f14b001e27 vim-plugins: update with https sources 2017-03-04 13:16:46 +01:00
Daiderd Jordan
8977b1f2ee vim-plugins: use https for github repositories 2017-03-04 13:16:46 +01:00
Ricardo Ardissone
92d8680785 pcsxr: remove name conflict with zlib 1.2.9 2017-03-04 08:36:06 -03:00
Lluís Batlle i Rossell
1bd3fa6210
vlock: fix ENOPATCH 
Thanks, @dtzWill.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
 2017-03-04 09:19:20 +01:00
Lluís Batlle i Rossell
c2291aae44
vlock: fix EINTR handling 
Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
 2017-03-03 21:18:56 +01:00
Benno Fünfstück
1f7fe3dc07 vbam: fix location of etc in output 
Shell variables are not expanded in cmakeFlags, so the etc files ended up in
`$out/'$out'/etc` instead of the expected `$out/etc`.
 2017-03-03 12:27:49 +01:00
Christoph Hrdinka
c4eee0c4f1
retroarch.beetle-saturn: set platforms to x86_64-linux 
cc #23253.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-02-28 15:18:06 +01:00
Evan Danaher
4b9ec73288 vim-plugins: Add ensime-vim and dependencies. 2017-02-27 12:37:00 -05:00
Evan Danaher
dcab427908 vim-plugins: Add infrastructure for python[3]Dependencies. 
This allows vim plugins to specify python dependencies required at
runtime, and they will be added to the python environment.
 2017-02-27 12:36:03 -05:00
Jörg Thalheim
1861733b90 Merge pull request #23206 from yurrriq/add/pkgs/misc/lilypond/unstable 
lilypond-unstable: init at 2.19.24
 2017-02-27 08:29:12 +01:00
Eric Bailey
de597b03f7
lilypond-unstable: init at 2.19.24 2017-02-26 03:41:58 -06:00
Bart Brouns
6992824ec1 jack2-unstable: 2016-08-18 -> 2017-02-23 2017-02-26 10:17:38 +01:00
Edward Tjörnhammar
a78b801c54 Merge pull request #23176 from hrdinka/retroarch/mednafen2beetle 
retroarch: libretro-mednafen-* -> libretro-beetle-*
 2017-02-26 09:32:52 +01:00
Thomas Tuegel
0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4 
Remove KDE 4 desktop packages
 2017-02-25 12:21:44 -06:00
Christoph Hrdinka
1aaf2be2a0
retroarch: libretro-mednafen-* -> libretro-beetle-* 
Rename all mednafen-* libretro ports to beetle-* due #23163.

Closes #23163.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2017-02-25 16:19:09 +01:00
Arseniy Seroka
4610fc9310 Merge pull request #23172 from symphorien/plugins 
Plugins
 2017-02-25 17:06:34 +03:00
Symphorien Gibol
ac59309f69 vimPlugins.vim-indent-object: init at 2015-08-11 2017-02-25 14:57:41 +01:00
Symphorien Gibol
d95dd3df28 vimPlugins.argtextobj: init at 2010-10-17 2017-02-25 14:44:16 +01:00
Thomas Tuegel
f344817a3e
Remove Oxygen GTK themes 
- Not useful without the KDE 4 desktop
 2017-02-24 16:49:01 -06:00
Thomas Tuegel
25378a6aa0
Remove kde4.qtcurve 
- Not useful without the KDE 4 desktop
 2017-02-24 16:49:01 -06:00
Joachim F
a9555f580e Merge pull request #23141 from romildo/upd.greybird 
greybird: 2016-11-15 -> 2017-02-17
 2017-02-24 18:55:03 +01:00
Joachim F
ad0770fb42 Merge pull request #23144 from romildo/upd.numix-gtk-theme 
numix-gtk-theme: 2016-11-19 -> 2017-02-15
 2017-02-24 18:50:48 +01:00
Joachim F
63d251f2e3 Merge pull request #23147 from romildo/upd.zuki-themes 
zuki-themes: 2016-10-20 -> 2017-02-17
 2017-02-24 18:50:22 +01:00
romildo
b474c5cd30 zuki-themes: 2016-10-20 -> 2017-02-17 2017-02-24 07:49:15 -03:00
romildo
9ae7fb4b60 numix-gtk-theme: 2016-11-19 -> 2017-02-15 2017-02-24 06:48:09 -03:00
romildo
e27a7a3686 greybird: 2016-11-15 -> 2017-02-17 2017-02-24 06:22:42 -03:00
romildo
5b2199fcc6 blackbird: 2016-07-04 -> 2017-02-20 2017-02-24 05:45:11 -03:00
Shea Levy
c71bae0330 long-shebang: 1.1.0 -> 1.2.0 2017-02-23 18:27:12 -05:00
Vladimír Čunát
145d3ea81c
Merge branch 'master' into staging 2017-02-22 17:47:49 +01:00
Nick Novitski
7bb0611e2e vim_configurable: Add packPath option to vimrcConfig (#22776) 
* vim_configurable: Add packages option to vimrcConfig

Version 8 of vim adds the concept of "vim packages": directories which
contain one or more vim plugins, in either "start" or "opt"
subdirectories. Those in "start" are to be loaded automatically, while
those in "opt" can be loaded manually. Vim detects any packages located
in one of its "packpaths".

The packages option takes a set of sets describing one or more vim
packages, and adds the derivation containing these packages to the
packpath.

* fix documentation.
 2017-02-22 01:06:34 +01:00
Vladimír Čunát
9fe56e52dd
dolphinEmu*: fixup build with glibc-2.25 2017-02-21 19:03:36 +01:00
Jörg Thalheim
f2b1d6e5dc
vimPlugins.clang_complete: init at 2017-02-16 2017-02-19 21:33:18 +01:00
Anderson Torres
4129697445 higan: 101 -> 102 (#22942) 2017-02-19 18:27:04 +00:00
Jörg Thalheim
19798cb205 Merge pull request #22819 from makefu/pkgs/dymo/init 
cups-dymo: init at 1.4.0.5
 2017-02-19 16:53:19 +01:00
Anthony Cowley
c37464a9b1 ghostscript: fix installed library name on darwin 2017-02-16 13:32:39 -05:00
makefu
76da40e5a7
cups-dymo: init at 1.4.0.5 2017-02-15 09:07:40 +01:00
Daiderd Jordan
7929888e8d Merge pull request #22614 from cstrahan/ycm 
YouCompleteMe: use ycmd package
 2017-02-14 21:32:09 +01:00
Robin Gloster
d12639cb28 Merge pull request #22739 from Mic92/vam 
vim.vam: fix filetype detection
 2017-02-13 15:10:35 +01:00
Jörg Thalheim
b7d65f8af0
vim.vam: fix filetype detection 
According to https://github.com/MarcWeber/vim-addon-manager/blob/master/doc/vim-addon-manager-additional-documentation.txt#L1310
`filetype on` must be called after all VAM plugins are initialized.
Otherwise vim set `conf` filetype for some files containing hash tags.
 2017-02-13 14:10:23 +01:00
Jörg Thalheim
d673484683 Merge pull request #22720 from Mic92/vim-plugins 
vimPlugins: update to latest
 2017-02-13 01:34:57 +01:00
Jörg Thalheim
005a9d2d9d
vimPlugins: update to latest 2017-02-13 01:08:20 +01:00
Graham Christensen
2495065351 Merge pull request #22667 from avnik/wine-update 
wineUnstable: 2.0 -> 2.1
 2017-02-12 18:54:47 -05:00
Christoph Hrdinka
a7ca114545
libretro: add mGBA core 
Closes #22618.
 2017-02-12 12:38:20 +01:00
Alexander V. Nikolaev
9ed445a0f7 wineUnstable: 2.0 -> 2.1 2017-02-12 11:23:48 +02:00
Joachim F
2488e42cc5 Merge pull request #22620 from hrdinka/add/libretro-reicast 
libretro: add reicast core
 2017-02-11 20:15:59 +01:00
Joachim F
6d536f91ba Merge pull request #22662 from hrdinka/add/libretro-mednafen-saturn 
libretro: add mednafen-saturn core
 2017-02-11 20:13:40 +01:00
Tuomas Tynkkynen
20578372e1 U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by adding python2 
Also enable parallel building.
 2017-02-11 15:53:01 +02:00
Christoph Hrdinka
c4a47bdb5e
libretro: add mednafen-saturn core 2017-02-11 13:49:33 +01:00
Vladimír Čunát
66fe4af226
Merge recent staging 
It's the version last built on Hydra, almost fully.
 2017-02-10 18:07:14 +01:00
Christoph Hrdinka
95ee742dcd
attract-mode: init at 2.2.0 2017-02-10 12:25:26 +01:00
Christoph Hrdinka
d04ee2f91c
libretro: add reicast core 2017-02-10 12:11:29 +01:00
Charles Strahan
0fe9b1e203
vim-plugins: use ycmd package for youcompleteme 2017-02-10 01:10:54 -05:00
Herwig Hochleitner
ae33b4673d wine: 1.8.6 -> 2.0 2017-02-09 16:20:49 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Franz Pletz
4494b18fe4
electricsheep: 2.7b33-598d93d90 -> 2.7b33-2017-02-04 
Also some cleanups like removed unused buildInputs.
 2017-02-08 23:51:02 +01:00
Pascal Wittmann
04a128540d Merge pull request #22285 from nand0p/electricsheep 
electricsheep: 2.6.8 -> 2.7b33
 2017-02-07 10:20:20 +01:00
Fernando J Pando
17d74c4912 electricsheep: 2.6.8 -> 2.7b33 
- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
 2017-02-06 18:05:38 -05:00
Herwig Hochleitner
023c3c77ee cdemu: bugfix updates 
image-analyzer: 3.0.0 -> 3.0.1
cdemu-client: 3.0.1 -> 3.0.3
cdemu-daemon: 3.0.3 -> 3.0.5
gcdemu: 3.0.1 -> 3.0.2
libmirage: 3.0.4 -> 3.0.5
vhba: 20140928 -> 20161009
 2017-02-06 05:09:12 +01:00
Eelco Dolstra
42574f52b9
Remove references to $NIX_STRIP_DEBUG 
This was removed in 3ea1c30846.
 2017-02-05 11:08:32 +01:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Evan Danaher
03c10c64ad vim-plugins: add vim-lawrencium 2017-02-03 17:02:35 -05:00
Evan Danaher
20db0d793f vim-plugins: add neco-vim 2017-02-03 09:32:55 -05:00
Evan Danaher
b017334b46 vim-plugins: add vim-scala 2017-02-03 09:32:55 -05:00
Evan Danaher
127c299efc vim-plugins: add vim-highlightedyank 2017-02-03 09:32:54 -05:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Cray Elliott
3acd52d917 mgba: 0.5.1 -> 0.5.2 2017-02-02 15:34:38 -08:00
Antoine Racine
9fa9339a13 vimPlugins.alchemist-vim: init at rev c22d4883b7 2017-02-01 23:13:28 -05:00
Antoine Racine
b4f3674694 Add vim-elixir to vim plugins 2017-02-01 20:05:22 -05:00
Vladimír Čunát
9cd2dbc569
Merge branch 'master' into staging 
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
 2017-01-30 18:39:36 +01:00
Vladimír Čunát
49b136377a
Merge #16501: add a guide about vim plugins 2017-01-30 18:28:20 +01:00
Robert Helgesson
89150d3377
theme-vertex: 20161009 -> 20170128 2017-01-30 16:31:33 +01:00
Tuomas Tynkkynen
424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Robin Gloster
0cd1f6bb51
gxemul: get rid of composableDerivation 2017-01-27 17:36:38 +01:00
Tuomas Tynkkynen
be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Robin Gloster
246765f33d
libjack2: add patch to fix build with gcc6 2017-01-25 20:12:40 +01:00
Tuomas Tynkkynen
b29ee6c8ff U-Boot: Add 64-bit Raspberry Pi 3 build 
And rename the old ubootRaspberryPi3 to ubootRaspberryPi3_32bit.
 2017-01-25 02:14:47 +02:00
schneefux
9ffd864e01
vim plugins: added gruvbox 2017-01-21 16:07:28 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Tuomas Tynkkynen
1feedf25df U-Boot: 2016.11 -> 2017.01 2017-01-20 14:50:02 +02:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl 
Fix OpenCL support
 2017-01-20 12:09:17 +03:00
Nikolay Amiantov
10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
Arseniy Seroka
fe5cbf221f Merge pull request #21904 from instantepiphany/master 
vimPlugins: add typescript-vim, tsuquyomi
 2017-01-16 14:41:18 +03:00
Maximilian Güntner
99ca11810a
vim plugins: added vim-speeddating 2017-01-15 18:57:52 +01:00
Jordan Cran
3ba22934e8 vimPlugins: add typescript-vim, tsuquyomi 2017-01-15 23:35:55 +11:00
Robin Gloster
3405f703f2
gxemul: fix disappeared download link 2017-01-14 20:02:12 +01:00
Jude Taylor
a493b89907 vimPlugins: add delimitMate 2017-01-10 11:51:03 -08:00
Pascal Wittmann
de36c3b560
xlockmore: 5.49 -> 5.50 2017-01-09 19:51:34 +01:00
Vladimír Čunát
07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
Vladimír Čunát
d442a0ffc0
wine*: fixup build by using older flex 2017-01-06 16:25:37 +01:00
Vladimír Čunát
75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4 2017-01-06 14:05:22 +01:00
Matthias Beyer
eb07e35554 pipes: 1.1.0 -> 1.2.0 2017-01-04 16:29:30 +01:00
Rok Garbas
2c88414274 vimPlugins: update to latest 2017-01-04 10:53:27 +01:00
Herwig Hochleitner
cd9edbb15b wine: 1.8.4 -> 1.8.6 
wine: 2.0-rc2 -> 2.0-rc3
winetricks: 20160724 -> 20170101
 2017-01-02 13:20:19 +01:00
Daiderd Jordan
2c288548b9 Merge pull request #21574 from veprbl/ycm_fix 
youcompleteme: fix compilation
 2017-01-02 00:10:04 +01:00
Dmitry Kalinkin
f37c7e01d5
youcompleteme: fix compilation 
1) Replace --system-libclang with an explicit setting for the path to
nix libclang 3.9. Otherwise it will find system's libclang on darwin.

2) Remove clang/llvm from build inputs. This prevents ycm itself from
being compiled by clang 3.9. stdenv's standard compiler (gcc or
clang 3.7) will suffice.

3) Enable C++11 again as #16212 is caused by incopatibility between
clang 3.9 and libc++ 3.7, but we don't compile YCM with clang 3.9, so
this is not needed anymore.
 2017-01-01 17:35:16 -05:00
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