diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-27 00:01:13 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-27 00:01:13 -0500 |
commit | 92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293 (patch) | |
tree | db4ea2d4f6d993a44cfd2b6ec57e354f403216cb /pkgs/misc | |
parent | 319ebef3a361a914fc2e3b90bc9ff66ed8d2e107 (diff) | |
parent | 4866cbe3418a56e46e0378db50ce764a35679faa (diff) | |
download | nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar.gz nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar.bz2 nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar.lz nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar.xz nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.tar.zst nixlib-92f0f8dd68e9456c1dff0f6ffa864ebd0ca87293.zip |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/gnuk/generic.nix | 1 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 5 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 10 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 30 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 1 |
6 files changed, 44 insertions, 5 deletions
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 80a4518f3f70..e592b945a408 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { homepage = http://www.fsij.org/pages/gnuk; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = with platforms; linux; }; } diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index d264b7f3279b..a47c20184442 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = http://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu wkennington ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2e349cf691c9..8c9838ccec53 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; - + configureFlags = [ (stdenv.lib.enableFeature (optLibffado != null) "firewire") ]; @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; - + meta = with stdenv.lib; { description = "JACK audio connection kit"; homepage = http://jackaudio.org; license = "GPL"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4feaebf9058d..56157d077d0c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1618,6 +1618,16 @@ let }; }; + sved = buildVimPluginFrom2Nix { + name = "sved-2019-01-25"; + src = fetchFromGitHub { + owner = "peder2tm"; + repo = "sved"; + rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; + sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; + }; + }; + swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; version = "2018-09-12"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 9a29ba82dae6..c9785b66fbb4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -4,6 +4,7 @@ , xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake +, gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool , Cocoa, CoreFoundation, CoreServices @@ -172,6 +173,35 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + sved = let + # we put the script in its own derivation to benefit the magic of wrapGAppsHook + svedbackend = stdenv.mkDerivation { + name = "svedbackend-${super.sved.name}"; + inherit (super.sved) src; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + gobject-introspection + glib + (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) + ]; + preferLocalBuild = true; + installPhase = '' + install -Dt $out/bin ftplugin/evinceSync.py + ''; + }; + in + super.sved.overrideAttrs(old: { + preferLocalBuild = true; + postPatch = '' + rm ftplugin/evinceSync.py + ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + ''; + meta = { + description = "synctex support between vim/neovim and evince"; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3c39a7eeb4e1..101ac0a21121 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -222,6 +222,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim +peder2tm/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown |