public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-19 18:24:24 +02:00
parent 9f208b5d8a e7e5aaa0b9
commit 8213ff161c
294 changed files with 61697 additions and 32101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/drivers/foo2zjs/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim }:
stdenv.mkDerivation rec {
name = "foo2zjs-20171202";
name = "foo2zjs-20180519";
src = fetchurl {
url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
sha256 = "b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182";
sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
};
buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];

4
pkgs/misc/drivers/moltengamepad/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libudev }:
{ stdenv, fetchFromGitHub, udev }:
stdenv.mkDerivation rec {
name = "moltengamepad-git-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ libudev ];
buildInputs = [ udev ];
buildPhase = ''
make

6
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl
, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls
, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin
@@ -36,10 +36,10 @@ in stdenv.mkDerivation rec {
buildInputs = [
curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml
portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
qt5.qtbase
] ++ stdenv.lib.optionals stdenv.isLinux [
bluez libudev libevdev alsaLib vulkan-loader
bluez udev libevdev alsaLib vulkan-loader
] ++ stdenv.lib.optionals stdenv.isDarwin [
CoreBluetooth cf-private OpenGL ForceFeedback IOKit
];

4
pkgs/misc/emulators/retroarch/cores.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch
, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis
, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
, miniupnpc, sfml, xorg, zlib }:
let
@@ -149,7 +149,7 @@ in with stdenv.lib.licenses;
extraBuildInputs = [
cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
gettext glib gtk2 hidapi
libevdev libudev
libevdev udev
] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
}).override {
cmakeFlags = [

6
pkgs/misc/libcardiacarrest/default.nix
View File

@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libcardiacarrest-${version}";
version = "11.0-6"; # <PA API version>-<version>
version = "12.1-6"; # <PA API version>-<version>
src = fetchFromGitHub {
owner = "oxij";
repo = "libcardiacarrest";
rev = "1220b37b3de75238fedee1a66ca703fe1c8c71c3";
sha256 = "0fkfiixjybac3rwcd26621hh5dw4f5gnmm230cr4g8fl0i2ikmrz";
rev = "4df92b6cc66c7f9fe947dd9bbf4802cf20fe63a2";
sha256 = "0zfjn4nvcx8r4f6czcix5b9nsszhhhlbypcwqzi4ddhazl1gyfm6";
};
outputs = [ "out" "dev" ];

231
pkgs/misc/vim-plugins/default.nix
View File

@@ -1,5 +1,5 @@
# TODO check that no license information gets lost
{ fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
, which, fetchgit, llvmPackages, rustPlatform
, xkb_switch, rustracerd, fzf, skim
, python3, boost, icu, ncurses
@@ -14,9 +14,9 @@ let
_skim = skim;
inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
buildVimPluginFrom2Nix vimHelpTags;
in
inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
buildVimPluginFrom2Nix vimHelpTags;
# TL;DR
# Add your plugin to ./vim-plugin-names
@@ -32,7 +32,7 @@ in
# Documentation & usage see vim-utils.nix.
# attribute names should be the same as used by vim-pi to make dependency
# resolution work
rec {
self = rec {
# This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
# which recreates this the following derivations based on ./vim-plugin-names
pluginnames2nix = vimUtils.pluginnames2Nix {
@@ -53,114 +53,6 @@ rec {
# Section II
# Update with vimUtils.vimPlugins.pluginnames2Nix command
# aliasess
airline = vim-airline;
alternative = a-vim; # backwards compat, added 2014-10-21
bats = bats-vim;
calendar = calendar-vim;
coffee-script = vim-coffee-script;
coffeeScript = coffee-script; # backwards compat, added 2014-10-18
Solarized = vim-colors-solarized;
solarized = vim-colors-solarized;
colors-solarized = vim-colors-solarized;
caw = caw-vim;
colorsamplerpack = Colour_Sampler_Pack;
Colour_Sampler_Pack = Colour-Sampler-Pack;
command_T = command-t; # backwards compat, added 2014-10-18
commentary = vim-commentary;
committia = committia-vim-git;
concealedyank = concealedyank-vim;
context-filetype = context_filetype-vim;
Cosco = cosco-vim;
css_color_5056 = vim-css-color;
CSApprox = csapprox;
csv = csv-vim;
ctrlp = ctrlp-vim;
cute-python = vim-cute-python-git;
denite = denite-nvim;
easy-align = vim-easy-align;
easygit = vim-easygit;
easymotion = vim-easymotion;
echodoc = echodoc-vim;
eighties = vim-eighties;
extradite = vim-extradite;
fugitive = vim-fugitive;
ghc-mod-vim = ghcmod-vim;
ghcmod = ghcmod-vim;
goyo = goyo-vim;
Gist = gist-vim;
gitgutter = vim-gitgutter;
gundo = gundo-vim;
Gundo = gundo-vim; # backwards compat, added 2015-10-03
haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
haskellConcealPlus = vim-haskellConcealPlus;
haskellconceal = vim-haskellconceal;
hier = vim-hier;
hlint-refactor = hlint-refactor-vim;
hoogle = vim-hoogle;
Hoogle = vim-hoogle;
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
mayansmoke = mayansmoke-git;
multiple-cursors = vim-multiple-cursors;
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
neocomplete = neocomplete-vim;
neoinclude = neoinclude-vim;
neomru = neomru-vim;
neosnippet = neosnippet-vim;
neoyank = neoyank-vim-git;
The_NERD_Commenter = nerdcommenter;
The_NERD_tree = nerdtree;
open-browser = open-browser-vim;
pathogen = vim-pathogen;
peskcolor = peskcolor-vim-git;
polyglot = vim-polyglot;
prettyprint = vim-prettyprint;
quickrun = vim-quickrun;
rainbow_parentheses = rainbow_parentheses-vim;
repeat = vim-repeat;
riv = riv-vim;
rhubarb = vim-rhubarb;
sensible = vim-sensible;
signature = vim-signature;
snipmate = vim-snipmate;
sourcemap = sourcemap-vim;
"sourcemap.vim" = sourcemap-vim;
surround = vim-surround;
sleuth = vim-sleuth;
solidity = vim-solidity;
stylish-haskell = vim-stylish-haskell;
stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
Supertab = supertab;
Syntastic = syntastic;
SyntaxRange = vim-SyntaxRange;
table-mode = vim-table-mode;
taglist = taglist-vim;
tabpagebuffer = tabpagebuffer-vim;
tabpagecd = vim-tabpagecd;
Tabular = tabular;
Tagbar = tagbar;
thumbnail = thumbnail-vim;
tlib = tlib_vim;
tmux-navigator = vim-tmux-navigator;
tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
tslime = tslime-vim;
unite = unite-vim;
UltiSnips = ultisnips;
vim-grepper = vim-grepper-git;
vim-test = vim-test-git;
vimproc = vimproc-vim;
vimshell = vimshell-vim;
vinegar = vim-vinegar;
watchdogs = vim-watchdogs;
WebAPI = webapi-vim;
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
yankring = YankRing-vim;
Yankring = YankRing-vim;
YouCompleteMe = youcompleteme;
xterm-color-table = xterm-color-table-vim;
zeavim = zeavim-vim;
fzfWrapper = buildVimPluginFrom2Nix {
name = fzf.name;
src = fzf.src;
@@ -3320,4 +3212,115 @@ rec {
dependencies = [];
};
}
} // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliasess
airline = vim-airline;
alternative = a-vim; # backwards compat, added 2014-10-21
bats = bats-vim;
calendar = calendar-vim;
coffee-script = vim-coffee-script;
coffeeScript = coffee-script; # backwards compat, added 2014-10-18
Solarized = vim-colors-solarized;
solarized = vim-colors-solarized;
colors-solarized = vim-colors-solarized;
caw = caw-vim;
colorsamplerpack = Colour_Sampler_Pack;
Colour_Sampler_Pack = Colour-Sampler-Pack;
command_T = command-t; # backwards compat, added 2014-10-18
commentary = vim-commentary;
committia = committia-vim-git;
concealedyank = concealedyank-vim;
context-filetype = context_filetype-vim;
Cosco = cosco-vim;
css_color_5056 = vim-css-color;
CSApprox = csapprox;
csv = csv-vim;
ctrlp = ctrlp-vim;
cute-python = vim-cute-python-git;
denite = denite-nvim;
easy-align = vim-easy-align;
easygit = vim-easygit;
easymotion = vim-easymotion;
echodoc = echodoc-vim;
eighties = vim-eighties;
extradite = vim-extradite;
fugitive = vim-fugitive;
ghc-mod-vim = ghcmod-vim;
ghcmod = ghcmod-vim;
goyo = goyo-vim;
Gist = gist-vim;
gitgutter = vim-gitgutter;
gundo = gundo-vim;
Gundo = gundo-vim; # backwards compat, added 2015-10-03
haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
haskellConcealPlus = vim-haskellConcealPlus;
haskellconceal = vim-haskellconceal;
hier = vim-hier;
hlint-refactor = hlint-refactor-vim;
hoogle = vim-hoogle;
Hoogle = vim-hoogle;
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
mayansmoke = mayansmoke-git;
multiple-cursors = vim-multiple-cursors;
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
neocomplete = neocomplete-vim;
neoinclude = neoinclude-vim;
neomru = neomru-vim;
neosnippet = neosnippet-vim;
neoyank = neoyank-vim-git;
The_NERD_Commenter = nerdcommenter;
The_NERD_tree = nerdtree;
open-browser = open-browser-vim;
pathogen = vim-pathogen;
peskcolor = peskcolor-vim-git;
polyglot = vim-polyglot;
prettyprint = vim-prettyprint;
quickrun = vim-quickrun;
rainbow_parentheses = rainbow_parentheses-vim;
repeat = vim-repeat;
riv = riv-vim;
rhubarb = vim-rhubarb;
sensible = vim-sensible;
signature = vim-signature;
snipmate = vim-snipmate;
sourcemap = sourcemap-vim;
"sourcemap.vim" = sourcemap-vim;
surround = vim-surround;
sleuth = vim-sleuth;
solidity = vim-solidity;
stylish-haskell = vim-stylish-haskell;
stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
Supertab = supertab;
Syntastic = syntastic;
SyntaxRange = vim-SyntaxRange;
table-mode = vim-table-mode;
taglist = taglist-vim;
tabpagebuffer = tabpagebuffer-vim;
tabpagecd = vim-tabpagecd;
Tabular = tabular;
Tagbar = tagbar;
thumbnail = thumbnail-vim;
tlib = tlib_vim;
tmux-navigator = vim-tmux-navigator;
tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
tslime = tslime-vim;
unite = unite-vim;
UltiSnips = ultisnips;
vim-grepper = vim-grepper-git;
vim-test = vim-test-git;
vimproc = vimproc-vim;
vimshell = vimshell-vim;
vinegar = vim-vinegar;
watchdogs = vim-watchdogs;
WebAPI = webapi-vim;
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
yankring = YankRing-vim;
Yankring = YankRing-vim;
YouCompleteMe = youcompleteme;
xterm-color-table = xterm-color-table-vim;
zeavim = zeavim-vim;
});
in self