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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-05 18:16:35 +00:00 committed by GitHub
parent 97c6846592 48f6dbe1f8
commit 02b77065d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 647 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5562,6 +5562,12 @@
githubId = 2057309; githubId = 2057309;
name = "Sergey Sofeychuk"; name = "Sergey Sofeychuk";
}; };
lxea = {
email = "nix@amk.ie";
github = "lxea";
githubId = 7910815;
name = "Alex McGrath";
};
lynty = { lynty = {
email = "ltdong93+nix@gmail.com"; email = "ltdong93+nix@gmail.com";
github = "lynty"; github = "lynty";

18
nixos/modules/hardware/video/switcheroo-control.nix Normal file
View File

@ -0,0 +1,18 @@
{ config, pkgs, lib, ... }:
with lib;
let
pkg = [ pkgs.switcheroo-control ];
cfg = config.services.switcherooControl;
in {
options.services.switcherooControl = {
enable = mkEnableOption "switcheroo-control, a D-Bus service to check the availability of dual-GPU";
};
config = mkIf cfg.enable {
services.dbus.packages = pkg;
environment.systemPackages = pkg;
systemd.packages = pkg;
systemd.targets.multi-user.wants = [ "switcheroo-control.service" ];
};
}

1
nixos/modules/module-list.nix
View File

@ -359,6 +359,7 @@
./services/games/terraria.nix ./services/games/terraria.nix
./services/hardware/acpid.nix ./services/hardware/acpid.nix
./services/hardware/actkbd.nix ./services/hardware/actkbd.nix
./services/hardware/auto-cpufreq.nix
./services/hardware/bluetooth.nix ./services/hardware/bluetooth.nix
./services/hardware/bolt.nix ./services/hardware/bolt.nix
./services/hardware/brltty.nix ./services/hardware/brltty.nix

18
nixos/modules/services/hardware/auto-cpufreq.nix Normal file
View File

@ -0,0 +1,18 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.auto-cpufreq;
in {
options = {
services.auto-cpufreq = {
enable = mkEnableOption "auto-cpufreq daemon";
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.auto-cpufreq ];
systemd.packages = [ pkgs.auto-cpufreq ];
systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ];
};
}

1
nixos/modules/system/activation/top-level.nix
View File

@ -173,7 +173,6 @@ in
}; };
options.configuration = mkOption { options.configuration = mkOption {
type = types.attrsOf types.anything;
default = {}; default = {};
description = "Arbitrary NixOS configuration options."; description = "Arbitrary NixOS configuration options.";
}; };

29
pkgs/applications/audio/yams/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "yams";
version = "0.7.3";
src = fetchFromGitHub {
owner = "Berulacks";
repo = "yams";
rev = version;
sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8";
};
propagatedBuildInputs = with python3Packages; [
pyyaml
psutil
mpd2
requests
];
doCheck = false;
meta = with lib; {
homepage = "https://github.com/Berulacks/yams";
description = "Last.FM scrobbler for MPD";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ccellado ];
};
}

23
pkgs/applications/misc/flavours/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "flavours";
version = "0.3.5";
src = fetchFromGitHub {
owner = "Misterio77";
repo = pname;
rev = "v${version}";
sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj";
};
cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1";
meta = with lib; {
description = "An easy to use base16 scheme manager/builder that integrates with any workflow";
homepage = "https://github.com/Misterio77/flavours";
changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fortuneteller2k ];
};
}

14
pkgs/development/libraries/farbfeld/default.nix
View File

@ -1,27 +1,27 @@
{ lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: { lib, stdenv, fetchurl, makeWrapper, file, libpng, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "farbfeld"; pname = "farbfeld";
version = "4"; version = "4";
src = fetchgit { src = fetchurl {
url = "https://git.suckless.org/farbfeld"; url = "https://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz";
rev = "refs/tags/${version}"; sha256 = "0ap7rcngffhdd57jw9j22arzkbrhwh0zpxhwbdfwl8fixlhmkpy7";
sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870";
}; };
buildInputs = [ libpng libjpeg ]; buildInputs = [ libpng libjpeg ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
''; '';
meta = with lib; { meta = with lib; {
description = "Suckless image format with conversion tools"; description = "Suckless image format with conversion tools";
homepage = "https://tools.suckless.org/farbfeld/";
license = licenses.isc; license = licenses.isc;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
}; };
} }

3
pkgs/development/python-modules/linuxfd/default.nix
View File

@ -19,6 +19,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls";
homepage = "https://github.com/FrankAbelbeck/linuxfd"; homepage = "https://github.com/FrankAbelbeck/linuxfd";
license = with lib.licenses; [ lgpl3 ]; platforms = lib.platforms.linux;
license = with lib.licenses; [ lgpl3Plus ];
}; };
} }

5
pkgs/development/python-modules/primer3/default.nix
View File

@ -1,7 +1,9 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, cython , cython
, gcc
, click , click
}: }:
@ -16,7 +18,8 @@ buildPythonPackage rec {
sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g";
}; };
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ]
++ lib.optionals stdenv.isDarwin [ gcc ];
# pytestCheckHook leads to a circular import issue # pytestCheckHook leads to a circular import issue
checkInputs = [ click ]; checkInputs = [ click ];

220
pkgs/misc/vim-plugins/generated.nix
View File

@ -377,12 +377,12 @@ let
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "addb3b3f9963b86b1d3626e4b1920b129148625b"; rev = "c592de172d6e9ed36c8ca38814b3bb2a8ffde901";
sha256 = "1fpws70lxa9vs4yv6wpgnvw0khxhavq23plnsil29j4xlfm3ivw9"; sha256 = "1hs38ri6j6bfnl5ll8jcd3wcpv95h1rf19vd42x3h0i4npxba9hz";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -477,8 +477,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weirongxu"; owner = "weirongxu";
repo = "coc-explorer"; repo = "coc-explorer";
rev = "ee76911b1fa4a12833e53a1f56b03ada4fc3b6cf"; rev = "16fcaba5e3ee67b4149bf4ce6bd0c76991e982c2";
sha256 = "0n2za8f43gj9mjcjvwdrd2q17qn72fl1d7invnhrcyq44452y0z5"; sha256 = "0r23i855f01c3isfhv4j5r34xj777ffyqn420m44077dyr7r3m9k";
}; };
meta.homepage = "https://github.com/weirongxu/coc-explorer/"; meta.homepage = "https://github.com/weirongxu/coc-explorer/";
}; };
@ -497,12 +497,12 @@ let
coc-lua = buildVimPluginFrom2Nix { coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua"; pname = "coc-lua";
version = "2021-01-29"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "josa42"; owner = "josa42";
repo = "coc-lua"; repo = "coc-lua";
rev = "9de6e72dca845727c1ef53a71a6cb07f7da4802c"; rev = "14f4162f20e0d1dc7344e0620ffd11f3c811d4b2";
sha256 = "0csiisfwjn8rr4a9hi7law2fn1wp1fms9nf3h6f9ynqi2p63yxch"; sha256 = "01xqvksvs61vg8sc6wpiilp833g61sza455297vg0im0cz7i8wpc";
}; };
meta.homepage = "https://github.com/josa42/coc-lua/"; meta.homepage = "https://github.com/josa42/coc-lua/";
}; };
@ -894,12 +894,12 @@ let
denite-nvim = buildVimPluginFrom2Nix { denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim"; pname = "denite-nvim";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "denite.nvim"; repo = "denite.nvim";
rev = "b3c400c1d71a7451ce4c181e81d33373100ac4ac"; rev = "c56b0a7c0ff040f1de7e0bb48d76af56b4a4d2c1";
sha256 = "1k4qgdmpn5r8h8d3arq9zis6m0h8fagikrjb0v8lfhsz83zl1293"; sha256 = "1yg3qawbfpi7jjl8bkl8yif245c03lz3vm52w2z7c970n3y6v2pm";
}; };
meta.homepage = "https://github.com/Shougo/denite.nvim/"; meta.homepage = "https://github.com/Shougo/denite.nvim/";
}; };
@ -1112,12 +1112,12 @@ let
deoplete-vim-lsp = buildVimPluginFrom2Nix { deoplete-vim-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-vim-lsp"; pname = "deoplete-vim-lsp";
version = "2020-12-21"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lighttiger2505"; owner = "lighttiger2505";
repo = "deoplete-vim-lsp"; repo = "deoplete-vim-lsp";
rev = "0c5d9e6efd6a7bea503faa854c41a3e5af00ec57"; rev = "4e369aee9c443f31b3974c945f807ad93d27cb5c";
sha256 = "1hckg9p7srw2d674is0wzilnwwvw1s2q8xapr6dawslm5j364xlk"; sha256 = "14vfa6zvxprrrdi82dwnayhr2wxmifd7h5w8cl0hfw5zyrs5qsr0";
}; };
meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/";
}; };
@ -1463,12 +1463,12 @@ let
fzf-lsp-nvim = buildVimPluginFrom2Nix { fzf-lsp-nvim = buildVimPluginFrom2Nix {
pname = "fzf-lsp-nvim"; pname = "fzf-lsp-nvim";
version = "2021-01-19"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gfanto"; owner = "gfanto";
repo = "fzf-lsp.nvim"; repo = "fzf-lsp.nvim";
rev = "5b12d8de47608570b404270c00742e3977ed3103"; rev = "1386cbae761415b9c7b45565d87283fb4d584aed";
sha256 = "0y23i1gj4y517qs4ff43fi3ivkz4gmidrvcf6n314nwjgzikff6w"; sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv";
}; };
meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
}; };
@ -1487,12 +1487,12 @@ let
galaxyline-nvim = buildVimPluginFrom2Nix { galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim"; pname = "galaxyline-nvim";
version = "2021-01-31"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glepnir"; owner = "glepnir";
repo = "galaxyline.nvim"; repo = "galaxyline.nvim";
rev = "fd3f069c6fb5eabc5dbad030b3c729bb0c6346ec"; rev = "ee34f7fed7e2c8801a8c1a9101ab9392bc4e70a2";
sha256 = "1wpx2wsq7fqabyv2cfgiqs835b6da0y1i4ajx1iyi727q39vm5qj"; sha256 = "0lc94z24bpvfkyip76s4yprhfgprqhzviywhp2ds2dlm7xr6bwj5";
}; };
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
}; };
@ -1547,12 +1547,12 @@ let
git-messenger-vim = buildVimPluginFrom2Nix { git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim"; pname = "git-messenger-vim";
version = "2020-12-27"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rhysd"; owner = "rhysd";
repo = "git-messenger.vim"; repo = "git-messenger.vim";
rev = "a67de1d08cffa547183bbc2f95c4e29723504263"; rev = "1a67c3426541c88e570096b1e6dc954eac0047fd";
sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl"; sha256 = "03gyic6qf59sl166sp9pw2rg73fxhghkm4cpfyyssm7npvlgckni";
}; };
meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
}; };
@ -1571,12 +1571,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-01-31"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "24f0bc9d4ebedad374be608c10cd9b08e079c338"; rev = "fe58abc2d82328d489ac1678d2ac99c4ad94321e";
sha256 = "0jb4kfz49a1q0lcc7kkg29y1mjga5i1iqglvb1jq9yrm1gvrk4yq"; sha256 = "03sm5a9pis0m2qbqzl6x6zf6limr0pbzcxmdf7hk83q8zg2y91wb";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -1980,12 +1980,12 @@ let
julia-vim = buildVimPluginFrom2Nix { julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim"; pname = "julia-vim";
version = "2021-01-07"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JuliaEditorSupport"; owner = "JuliaEditorSupport";
repo = "julia-vim"; repo = "julia-vim";
rev = "ce48f42f1fd1d4566503ae26307026c895905a10"; rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc";
sha256 = "08yk47pvyh550iqv6zvrxcjdinn0w9p5al1v49m7p49jfqck3h1m"; sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7";
}; };
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
}; };
@ -2112,12 +2112,12 @@ let
lf-vim = buildVimPluginFrom2Nix { lf-vim = buildVimPluginFrom2Nix {
pname = "lf-vim"; pname = "lf-vim";
version = "2020-11-19"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ptzz"; owner = "ptzz";
repo = "lf.vim"; repo = "lf.vim";
rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; rev = "018f28d495f58ba99c952df75926481e1b5667f4";
sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; sha256 = "058f3rjdwfl8p63l5bf7csixl0714dy2dbrbzwig8if4bxn3dkp9";
}; };
meta.homepage = "https://github.com/ptzz/lf.vim/"; meta.homepage = "https://github.com/ptzz/lf.vim/";
}; };
@ -2232,24 +2232,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix { lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim"; pname = "lspsaga-nvim";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glepnir"; owner = "glepnir";
repo = "lspsaga.nvim"; repo = "lspsaga.nvim";
rev = "1a39791278d1ce53ffdbb9b455e5150d44b0b600"; rev = "f50c266b285aec9a2645f9f48f55db2de0ccef94";
sha256 = "0x0kanhpb1q4bzwsvv0288rh1gqgbq1j9r8a2f9q22nlppqr1by0"; sha256 = "149jwbwhzxvh6mvbkbhkkwh3y5gzfh2r2jc3p00y2arhxsx478fa";
}; };
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
}; };
lualine-nvim = buildVimPluginFrom2Nix { lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim"; pname = "lualine-nvim";
version = "2021-01-31"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hoob3rt"; owner = "hoob3rt";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "8c09fc82283961169c37250f639117d729d038d5"; rev = "66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac";
sha256 = "0k6pfns8cfjzy0rckmp249kk644y0nk8rfk4163xx3mi4p46741p"; sha256 = "0lcvxlxlr0inl93k5kvpphmacg6iprx9ym5jivmqnkvqsfzzv860";
}; };
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
}; };
@ -2628,12 +2628,12 @@ let
neogit = buildVimPluginFrom2Nix { neogit = buildVimPluginFrom2Nix {
pname = "neogit"; pname = "neogit";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimUntersberger"; owner = "TimUntersberger";
repo = "neogit"; repo = "neogit";
rev = "c3c3d2aa860f2b4acbdb334ce0777e3ec25259d9"; rev = "f3740d68852557b64da832969bc2302c10759eb7";
sha256 = "1mxbpv9vv2mb0dgdyb97gw1c5nfjvzkbn7fkwvcvg996xhvap9cs"; sha256 = "1spgcvj25m5h6r4k6a41m233zl3wavj6yj84jpsjmg7xabw75c14";
}; };
meta.homepage = "https://github.com/TimUntersberger/neogit/"; meta.homepage = "https://github.com/TimUntersberger/neogit/";
}; };
@ -2880,12 +2880,12 @@ let
nvim-compe = buildVimPluginFrom2Nix { nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe"; pname = "nvim-compe";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-compe"; repo = "nvim-compe";
rev = "f2573c9dd52be7e7ced176a6375766758cf646be"; rev = "b5e4239d19f6e5d69df724cb9a924a9b7cb1b739";
sha256 = "1c2xib3vqjc8z1z1v1b11iywimxrbawma3zn5kl5fzihnc67mxkd"; sha256 = "1vn637x06ar3rnjgfwlsm7c59gfs4bia177x4gzj9kj4kl0aadcp";
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
}; };
@ -2904,12 +2904,12 @@ let
nvim-dap = buildVimPluginFrom2Nix { nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap"; pname = "nvim-dap";
version = "2021-01-26"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "1461a3bacb22143e04039cf1a29024dad8876949"; rev = "c0245b577f09173d18a8931c36e7299f10eaf232";
sha256 = "12ay8gjxp94v365an45a6bv034gnmdkirrvw0jvbpymky0pznmgj"; sha256 = "0gqa9kmb35vpididwv1ylk1ja8pcy4vxn30zfw1myc0jsxwknhlx";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
}; };
@ -2940,12 +2940,12 @@ let
nvim-highlite = buildVimPluginFrom2Nix { nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite"; pname = "nvim-highlite";
version = "2021-01-26"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Iron-E"; owner = "Iron-E";
repo = "nvim-highlite"; repo = "nvim-highlite";
rev = "b0bca9edd3d4430f7a07387b72ea2ecaf370d808"; rev = "daa245b13b77b478b5b9f62e2e0bb79e65dcf5e8";
sha256 = "1j0gfszx92m3v7wzaxfmxbi93qsnfc8zg4kvjnbvpwfgvyvbizgs"; sha256 = "19qibdkwzcqxkzzdc0bi2s1nf8rbzikkygs0yf41an5ll35xl528";
}; };
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
@ -3000,24 +3000,24 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-02-01"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "0fb71129de54577254a3ae143850d11b6902a279"; rev = "e0ee3364c02c5eb739ce7af5a13e8cc50aae8d3d";
sha256 = "0w5q4xwa22smgvfmba0j2k1bzihvvmqhpdlnjaap0g0jp69vcq99"; sha256 = "0kcdy6scrxb01rwajcimay7257n7xiwrl48pm24nlb3k2fzmsr9s";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
nvim-lsputils = buildVimPluginFrom2Nix { nvim-lsputils = buildVimPluginFrom2Nix {
pname = "nvim-lsputils"; pname = "nvim-lsputils";
version = "2021-01-12"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RishabhRD"; owner = "RishabhRD";
repo = "nvim-lsputils"; repo = "nvim-lsputils";
rev = "fae88180b573e935f4a0827eb096208a7c76b215"; rev = "b68862afee6dfb611d866818cafdba41cf51d749";
sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm";
}; };
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
}; };
@ -3060,12 +3060,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2021-02-01"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "d3901e583389ef0c356203f056bad37ec81a888c"; rev = "93854135974cec0bba9a6026b28c1ec84fe70a00";
sha256 = "033w6x6yg4p6dfqs753vbwyl22aar24jn87ya9l07nm4wkm7w7d9"; sha256 = "0681d0d17c7lz2nqlsbn8n8j1gkfbhzahg3f0qw5sg0f5likrx57";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -3108,12 +3108,12 @@ let
nvim-ts-rainbow = buildVimPluginFrom2Nix { nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow"; pname = "nvim-ts-rainbow";
version = "2021-01-27"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "p00f"; owner = "p00f";
repo = "nvim-ts-rainbow"; repo = "nvim-ts-rainbow";
rev = "adad3ea7eb820b7e0cc926438605e7637ee1f5e6"; rev = "d3532beb184b64696095f101678e737277df8d1e";
sha256 = "0vbd0a3kblbx28s2p7ljsalb1hymr2qjhjqgr03sg1a6hmxib1i0"; sha256 = "12wxajgrzs3qjdjig55c56pa7va6sqnklq9hzi26z4k5isghbc3z";
}; };
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
}; };
@ -3240,12 +3240,12 @@ let
packer-nvim = buildVimPluginFrom2Nix { packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim"; pname = "packer-nvim";
version = "2021-02-02"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "8262aa68acb1b3e95f96bc66d70e92578fd82a6d"; rev = "c5b7f23e0b406767c1918d6888962fdb97f951e8";
sha256 = "1j0w71igl2icdmprl0krbv9ndda52dmmq9ijbz747x1g421d4rgn"; sha256 = "01w01543af4mbaa5hy5gfvbyz14sibf391dal987rn7zzjlsby7f";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -3336,12 +3336,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix { plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim"; pname = "plenary-nvim";
version = "2021-01-31"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "54ce65bc00d36c112b449db829ee36da9778f347"; rev = "a022a1b11c3a74a18df383894ddab58169c5ace0";
sha256 = "1h1z8daqycscdp1p1bmix1ifsgs725flly1pijn575ri6fd44n41"; sha256 = "0k395lm8azlyyrnnkjgyyidhf7s33alm5n2rffcpmygbh5i4665d";
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
}; };
@ -3866,12 +3866,12 @@ let
sql-nvim = buildVimPluginFrom2Nix { sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim"; pname = "sql-nvim";
version = "2021-02-01"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "sql.nvim"; repo = "sql.nvim";
rev = "b9fcca9444861b013c4de20f9e732f0bcd88a570"; rev = "9e0303c615445d6699a8c775f38e0e0fc457a5c3";
sha256 = "03kmxargbsyasimgq6mq5i6795gjbxxdj237gvzfx4vjgaifm55c"; sha256 = "0z1awkvz6vl5zci4qzibfb6nkk1c56rg5d4rqrhm5l1dh31pwjy3";
}; };
meta.homepage = "https://github.com/tami5/sql.nvim/"; meta.homepage = "https://github.com/tami5/sql.nvim/";
}; };
@ -4034,24 +4034,24 @@ let
tcomment_vim = buildVimPluginFrom2Nix { tcomment_vim = buildVimPluginFrom2Nix {
pname = "tcomment_vim"; pname = "tcomment_vim";
version = "2020-11-18"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomtom"; owner = "tomtom";
repo = "tcomment_vim"; repo = "tcomment_vim";
rev = "2037d05870e10e03b2e157a09ae007c179efd253"; rev = "2de3885686e7011f7efe0e31c2b6e0c002f9dd1a";
sha256 = "1z7c95rzgpm1f2cdmx3yv3f0ai7kq0kx8wd6mp4aqpdysi1qh9jk"; sha256 = "009x5bgj6grmwl35s0silkbnylpa5sjr4h0wyp6rl9xlj381vvn5";
}; };
meta.homepage = "https://github.com/tomtom/tcomment_vim/"; meta.homepage = "https://github.com/tomtom/tcomment_vim/";
}; };
telescope-frecency-nvim = buildVimPluginFrom2Nix { telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim"; pname = "telescope-frecency-nvim";
version = "2021-02-02"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope-frecency.nvim"; repo = "telescope-frecency.nvim";
rev = "93904dd90fd474e846d823901a1880e43e7177aa"; rev = "a5803b6755b3499aeabecb90f834aa060a2a8835";
sha256 = "189a5jlirgzvx7pgij6jil2kl0qhgg2kzl9sqn5ay98gcvcl6adk"; sha256 = "1fwcfxw9v6962pbf79s5hn75jcbfmsy6nig2z3s7s746pkfkjw9j";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
}; };
@ -4083,12 +4083,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim"; pname = "telescope-nvim";
version = "2021-02-01"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "9e76b1613a25cc6f63d17eb73432523924662619"; rev = "5f1d16acf6716261bd52466733e096a49b9eadad";
sha256 = "1yr7a7z48nfm5c7mmblbpdp42kfyp14b2d1fg03pkb792dkcqk2a"; sha256 = "1ybn9c6lxry5gs7rhnziv5i8gm45w4yrnkbvpzf898h5y6ifs5l5";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -4588,12 +4588,12 @@ let
vim-airline = buildVimPluginFrom2Nix { vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline"; pname = "vim-airline";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-airline"; owner = "vim-airline";
repo = "vim-airline"; repo = "vim-airline";
rev = "bffa7a4d23addaedc64075b06c00f1cbb5dec667"; rev = "c01977d027de854c6a85ed5c57915a7e8848f4b9";
sha256 = "0ghf7z6ras1jslirf9dxq8xxjksyaj6nlr0js385g5z8n9xv1chp"; sha256 = "0xvv1dymvgazs57phxbxljihz92zd4aa5yjqqf4g9xvl59vxc798";
}; };
meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.homepage = "https://github.com/vim-airline/vim-airline/";
}; };
@ -5356,12 +5356,12 @@ let
vim-erlang-tags = buildVimPluginFrom2Nix { vim-erlang-tags = buildVimPluginFrom2Nix {
pname = "vim-erlang-tags"; pname = "vim-erlang-tags";
version = "2021-01-30"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-erlang"; owner = "vim-erlang";
repo = "vim-erlang-tags"; repo = "vim-erlang-tags";
rev = "d9f2b8bd1f8478cce21084fde8b6b34f2564a54e"; rev = "125d494953da1746bc16cb716019a3d855fd3536";
sha256 = "1w689p5ywf5ik074611ka5cd3iznmr87vpykp1y86k5628lcq2yh"; sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi";
}; };
meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
}; };
@ -5488,12 +5488,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix { vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm"; pname = "vim-floaterm";
version = "2021-02-01"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "voldikss"; owner = "voldikss";
repo = "vim-floaterm"; repo = "vim-floaterm";
rev = "671f2aa87731ddeefe6573e4596c9f0d806e3b11"; rev = "2a47359fe7eca7655747ad871530a66f7fdd22f8";
sha256 = "1lla4wb3jrp14hbcb03va7ikigy05rncw30wy9zsq93hm2zazbsj"; sha256 = "1769lf2xgy11cmyg8n46xb7d4qn8c9b2ygiibj7skdyx9m88y4fw";
}; };
meta.homepage = "https://github.com/voldikss/vim-floaterm/"; meta.homepage = "https://github.com/voldikss/vim-floaterm/";
}; };
@ -5680,12 +5680,12 @@ let
vim-graphql = buildVimPluginFrom2Nix { vim-graphql = buildVimPluginFrom2Nix {
pname = "vim-graphql"; pname = "vim-graphql";
version = "2020-12-20"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jparise"; owner = "jparise";
repo = "vim-graphql"; repo = "vim-graphql";
rev = "c5169b2705f23cc4926606a7786d8e8fae138d5c"; rev = "553d125f7b0e56743e80e2439f5cd7f27771a8e3";
sha256 = "19nmdkbd4wcip18bb4inx64mc0awjj3bbahbhpsd8g6d889r9jha"; sha256 = "0nfp411zxjda5k7mh9400rjipqg6liizdkfqcc887zicaw3pylkm";
}; };
meta.homepage = "https://github.com/jparise/vim-graphql/"; meta.homepage = "https://github.com/jparise/vim-graphql/";
}; };
@ -5921,12 +5921,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix { vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2021-02-01"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-illuminate"; repo = "vim-illuminate";
rev = "17cdf0311271b017e66c66c56c253b63db3a20d0"; rev = "1ce3c4de54d2f0115129b50c4b056620953336f4";
sha256 = "1aivrwf7vhdsqcz4qbx3plqfw50myaphmidak1nb4zch1niqyypp"; sha256 = "1g6lfxvs4nqlkyj0f7gd5f297r20cjxs6m6mza3bymivl9lwbj8p";
}; };
meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.homepage = "https://github.com/RRethy/vim-illuminate/";
}; };
@ -6294,12 +6294,12 @@ let
vim-lsc = buildVimPluginFrom2Nix { vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc"; pname = "vim-lsc";
version = "2021-01-28"; version = "2021-02-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "natebosch"; owner = "natebosch";
repo = "vim-lsc"; repo = "vim-lsc";
rev = "53530bf2b53b8af7299aa6499ca30e74c90480ec"; rev = "25d625aa0274b4c9845afd49a5c8f21aceb25073";
sha256 = "1464jk1mlmpz9chs5hc6nx718r981z7rc68fyxzksfsn3gmk5isq"; sha256 = "0pdmzv3rxdawxy4qy5p283nzrjs4lc0ki2j7xxiz5bhdgnznbkcc";
}; };
meta.homepage = "https://github.com/natebosch/vim-lsc/"; meta.homepage = "https://github.com/natebosch/vim-lsc/";
}; };
@ -7171,12 +7171,12 @@ let
vim-ruby = buildVimPluginFrom2Nix { vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby"; pname = "vim-ruby";
version = "2020-08-28"; version = "2021-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-ruby"; owner = "vim-ruby";
repo = "vim-ruby"; repo = "vim-ruby";
rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; rev = "4788a08433c3c90e131fc7d110d82577e1234a86";
sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw";
}; };
meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
}; };
@ -7916,12 +7916,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix { vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip"; pname = "vim-vsnip";
version = "2021-01-29"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "vim-vsnip"; repo = "vim-vsnip";
rev = "3e79f6333c045c39588293664cc77f89d18a62e8"; rev = "cacfe408e58f9b2cbc6ecd0f1135ff4810e42889";
sha256 = "053vp6mnj2daipfwy68168iadvng7w0xj1rg1mfsp83dws3x6g8y"; sha256 = "0cfhrkmss1bzjgr30bn43wa1h4z1ylkh2ixxsdjbchhpqjmzfq1c";
}; };
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
}; };
@ -8193,12 +8193,12 @@ let
vimtex = buildVimPluginFrom2Nix { vimtex = buildVimPluginFrom2Nix {
pname = "vimtex"; pname = "vimtex";
version = "2021-02-01"; version = "2021-02-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lervag"; owner = "lervag";
repo = "vimtex"; repo = "vimtex";
rev = "0bc7c9c5f8376978ea2667f9fb54c293921183cc"; rev = "7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72";
sha256 = "10k7265iwn7pr567g0kl159xwi7zjkjhal62c0n0d98akzdi4wbi"; sha256 = "0vqpj2jg0nmjra0icm90p2dwf6jx87qjvch6hmvxj0m3g8kjs1cl";
}; };
meta.homepage = "https://github.com/lervag/vimtex/"; meta.homepage = "https://github.com/lervag/vimtex/";
}; };
@ -8241,12 +8241,12 @@ let
vista-vim = buildVimPluginFrom2Nix { vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim"; pname = "vista-vim";
version = "2021-02-02"; version = "2021-02-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liuchengxu"; owner = "liuchengxu";
repo = "vista.vim"; repo = "vista.vim";
rev = "5e5f89f1c02579f1587475e0671cf0fe4b1bfeaf"; rev = "d5b19ed3db6fd3e9598b399d8a9977ff926ad24e";
sha256 = "11h27vm0gi4lxf68dwnsr86ch6f0kyglfzg5a0i6av9mlsw7fj9z"; sha256 = "0idd04aj76f3in8h5ljgxqkf9rpv29cbg58j8wbm874hfy72mm2i";
}; };
meta.homepage = "https://github.com/liuchengxu/vista.vim/"; meta.homepage = "https://github.com/liuchengxu/vista.vim/";
}; };

546
pkgs/misc/vim-plugins/overrides.nix
View File

@ -1,39 +1,82 @@
{ lib, stdenv { lib
, python, cmake, meson, vim, ruby , stdenv
, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , python
, llvmPackages, rustPlatform, buildGoModule , cmake
, pkg-config, curl, openssl, libgit2, libiconv , meson
, xkb-switch, fzf, skim, stylish-haskell , vim
, python3, boost, icu, ncurses , ruby
, ycmd, rake , which
, gobject-introspection, glib, wrapGAppsHook , fetchFromGitHub
, fetchgit
, fetchurl
, fetchzip
, fetchpatch
, llvmPackages
, rustPlatform
, buildGoModule
, pkg-config
, curl
, openssl
, libgit2
, libiconv
, xkb-switch
, fzf
, skim
, stylish-haskell
, python3
, boost
, icu
, ncurses
, ycmd
, rake
, gobject-introspection
, glib
, wrapGAppsHook
, substituteAll , substituteAll
, languagetool , languagetool
, tabnine , tabnine
, Cocoa, CoreFoundation, CoreServices
, Cocoa
, CoreFoundation
, CoreServices
, buildVimPluginFrom2Nix , buildVimPluginFrom2Nix
, nodePackages , nodePackages
, dasht , dasht
, sqlite , sqlite
, code-minimap , code-minimap
# deoplete-khard dependency # deoplete-khard dependency
, khard , khard
# vim-go dependencies # vim-go dependencies
, asmfmt, delve, errcheck, godef, golint , asmfmt
, gomodifytags, gotags, gotools, go-motion , delve
, gnused, reftools, gogetdoc, golangci-lint , errcheck
, impl, iferr, gocode, gocode-gomod, go-tools , godef
, golint
, gomodifytags
, gotags
, gotools
, go-motion
, gnused
, reftools
, gogetdoc
, golangci-lint
, impl
, iferr
, gocode
, gocode-gomod
, go-tools
, gopls , gopls
# direnv-vim dependencies # direnv-vim dependencies
, direnv , direnv
# vCoolor dependency # vCoolor dependency
, gnome3 , gnome3
# fruzzy dependency # fruzzy dependency
, nim , nim
}: }:
@ -61,42 +104,44 @@ self: super: {
src = skim.vim; src = skim.vim;
}; };
LanguageClient-neovim = let LanguageClient-neovim =
version = "0.1.160"; let
LanguageClient-neovim-src = fetchFromGitHub { version = "0.1.160";
owner = "autozimu"; LanguageClient-neovim-src = fetchFromGitHub {
repo = "LanguageClient-neovim"; owner = "autozimu";
rev = version; repo = "LanguageClient-neovim";
sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; rev = version;
}; sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58";
LanguageClient-neovim-bin = rustPlatform.buildRustPackage { };
pname = "LanguageClient-neovim-bin"; LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
pname = "LanguageClient-neovim-bin";
inherit version;
src = LanguageClient-neovim-src;
cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
preConfigure = lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
'';
};
in
buildVimPluginFrom2Nix {
pname = "LanguageClient-neovim";
inherit version; inherit version;
src = LanguageClient-neovim-src; src = LanguageClient-neovim-src;
cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; propagatedBuildInputs = [ LanguageClient-neovim-bin ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols. preFixup = ''
# Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
preConfigure = lib.optionalString stdenv.isDarwin '' --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
''; '';
}; };
in buildVimPluginFrom2Nix {
pname = "LanguageClient-neovim";
inherit version;
src = LanguageClient-neovim-src;
propagatedBuildInputs = [ LanguageClient-neovim-bin ]; clang_complete = super.clang_complete.overrideAttrs (old: {
preFixup = ''
substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
--replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
'';
};
clang_complete = super.clang_complete.overrideAttrs(old: {
# In addition to the arguments you pass to your compiler, you also need to # In addition to the arguments you pass to your compiler, you also need to
# specify the path of the C++ std header (if you are using C++). # specify the path of the C++ std header (if you are using C++).
# These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@ -111,7 +156,7 @@ self: super: {
''; '';
}); });
direnv-vim = super.direnv-vim.overrideAttrs(oa: { direnv-vim = super.direnv-vim.overrideAttrs (oa: {
preFixup = oa.preFixup or "" + '' preFixup = oa.preFixup or "" + ''
substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \
--replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
@ -119,14 +164,14 @@ self: super: {
''; '';
}); });
clighter8 = super.clighter8.overrideAttrs(old: { clighter8 = super.clighter8.overrideAttrs (old: {
preFixup = '' preFixup = ''
sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
-i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
''; '';
}); });
command-t = super.command-t.overrideAttrs(old: { command-t = super.command-t.overrideAttrs (old: {
buildInputs = [ ruby rake ]; buildInputs = [ ruby rake ];
buildPhase = '' buildPhase = ''
rake make rake make
@ -134,7 +179,7 @@ self: super: {
''; '';
}); });
cpsm = super.cpsm.overrideAttrs(old: { cpsm = super.cpsm.overrideAttrs (old: {
buildInputs = [ buildInputs = [
python3 python3
stdenv stdenv
@ -150,7 +195,7 @@ self: super: {
''; '';
}); });
ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: { ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {
buildInputs = [ python ]; buildInputs = [ python ];
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
@ -158,25 +203,25 @@ self: super: {
''; '';
}); });
defx-nvim = super.defx-nvim.overrideAttrs(old: { defx-nvim = super.defx-nvim.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ]; dependencies = with super; [ nvim-yarp ];
}); });
deoplete-fish = super.deoplete-fish.overrideAttrs(old: { deoplete-fish = super.deoplete-fish.overrideAttrs (old: {
dependencies = with super; [ deoplete-nvim vim-fish ]; dependencies = with super; [ deoplete-nvim vim-fish ];
}); });
deoplete-go = super.deoplete-go.overrideAttrs(old: { deoplete-go = super.deoplete-go.overrideAttrs (old: {
buildInputs = [ python3 ]; buildInputs = [ python3 ];
buildPhase = '' buildPhase = ''
pushd ./rplugin/python3/deoplete/ujson pushd ./rplugin/python3/deoplete/ujson
python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
popd popd
find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
''; '';
}); });
deoplete-khard = super.deoplete-khard.overrideAttrs(old: { deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
dependencies = [ self.deoplete-nvim ]; dependencies = [ self.deoplete-nvim ];
passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
meta = { meta = {
@ -187,52 +232,55 @@ self: super: {
}; };
}); });
ensime-vim = super.ensime-vim.overrideAttrs(old: { ensime-vim = super.ensime-vim.overrideAttrs (old: {
passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];
}); });
forms = super.forms.overrideAttrs(old: { forms = super.forms.overrideAttrs (old: {
dependencies = with super; [ super.self ]; dependencies = with super; [ super.self ];
}); });
fruzzy = let # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix fruzzy =
nimpy = fetchFromGitHub { let
owner = "yglukhov"; # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix
repo = "nimpy"; nimpy = fetchFromGitHub {
rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; owner = "yglukhov";
sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; repo = "nimpy";
}; rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da";
binaryheap = fetchFromGitHub { sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k";
owner = "bluenote10"; };
repo = "nim-heap"; binaryheap = fetchFromGitHub {
rev = "c38039309cb11391112571aa332df9c55f625b54"; owner = "bluenote10";
sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; repo = "nim-heap";
}; rev = "c38039309cb11391112571aa332df9c55f625b54";
in super.fruzzy.overrideAttrs(old: { sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352";
buildInputs = [ nim ]; };
patches = [ in
(substituteAll { super.fruzzy.overrideAttrs (old: {
src = ./patches/fruzzy/get_version.patch; buildInputs = [ nim ];
version = old.version; patches = [
}) (substituteAll {
]; src = ./patches/fruzzy/get_version.patch;
configurePhase = '' version = old.version;
substituteInPlace Makefile \ })
--replace \ ];
"nim c" \ configurePhase = ''
"nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" substituteInPlace Makefile \
''; --replace \
buildPhase = '' "nim c" \
make build "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}"
''; '';
}); buildPhase = ''
make build
'';
});
ghcid = super.ghcid.overrideAttrs(old: { ghcid = super.ghcid.overrideAttrs (old: {
configurePhase = "cd plugins/nvim"; configurePhase = "cd plugins/nvim";
}); });
vimsence = super.vimsence.overrideAttrs(old: { vimsence = super.vimsence.overrideAttrs (old: {
meta = with lib; { meta = with lib; {
description = "Discord rich presence for Vim"; description = "Discord rich presence for Vim";
homepage = "https://github.com/hugolgst/vimsence"; homepage = "https://github.com/hugolgst/vimsence";
@ -240,11 +288,11 @@ self: super: {
}; };
}); });
vim-gist = super.vim-gist.overrideAttrs(old: { vim-gist = super.vim-gist.overrideAttrs (old: {
dependencies = with super; [ webapi-vim ]; dependencies = with super; [ webapi-vim ];
}); });
minimap-vim = super.minimap-vim.overrideAttrs(old: { minimap-vim = super.minimap-vim.overrideAttrs (old: {
preFixup = '' preFixup = ''
substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \
--replace "code-minimap" "${code-minimap}/bin/code-minimap" --replace "code-minimap" "${code-minimap}/bin/code-minimap"
@ -259,68 +307,69 @@ self: super: {
meta.maintainers = with lib.maintainers; [ vcunat ]; meta.maintainers = with lib.maintainers; [ vcunat ];
}; };
ncm2 = super.ncm2.overrideAttrs(old: { ncm2 = super.ncm2.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ]; dependencies = with super; [ nvim-yarp ];
}); });
ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: { ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: {
dependencies = with super; [ nvim-yarp ncm2 ]; dependencies = with super; [ nvim-yarp ncm2 ];
passthru.python3Dependencies = ps: with ps; [ jedi ]; passthru.python3Dependencies = ps: with ps; [ jedi ];
}); });
ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: { ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs (old: {
dependencies = with super; [ neoinclude-vim ]; dependencies = with super; [ neoinclude-vim ];
}); });
ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: { ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs (old: {
dependencies = with super; [ neosnippet-vim ]; dependencies = with super; [ neosnippet-vim ];
}); });
ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: { ncm2-syntax = super.ncm2-syntax.overrideAttrs (old: {
dependencies = with super; [ neco-syntax ]; dependencies = with super; [ neco-syntax ];
}); });
ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: {
dependencies = with super; [ ultisnips ]; dependencies = with super; [ ultisnips ];
}); });
nvim-lsputils = super.nvim-lsputils.overrideAttrs(old: { nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: {
dependencies = with super; [ popfix ]; dependencies = with super; [ popfix ];
}); });
fzf-vim = super.fzf-vim.overrideAttrs(old: { fzf-vim = super.fzf-vim.overrideAttrs (old: {
dependencies = [ self.fzfWrapper ]; dependencies = [ self.fzfWrapper ];
}); });
skim-vim = super.skim-vim.overrideAttrs(old: { skim-vim = super.skim-vim.overrideAttrs (old: {
dependencies = [ self.skim ]; dependencies = [ self.skim ];
}); });
sql-nvim = super.sql-nvim.overrideAttrs(old: { sql-nvim = super.sql-nvim.overrideAttrs (old: {
postPatch = '' postPatch = ''
substituteInPlace lua/sql/defs.lua \ substituteInPlace lua/sql/defs.lua \
--replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or" --replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or"
''; '';
}); });
sved = let sved =
# we put the script in its own derivation to benefit the magic of wrapGAppsHook let
svedbackend = stdenv.mkDerivation { # we put the script in its own derivation to benefit the magic of wrapGAppsHook
name = "svedbackend-${super.sved.name}"; svedbackend = stdenv.mkDerivation {
inherit (super.sved) src; name = "svedbackend-${super.sved.name}";
nativeBuildInputs = [ wrapGAppsHook ]; inherit (super.sved) src;
buildInputs = [ nativeBuildInputs = [ wrapGAppsHook ];
gobject-introspection buildInputs = [
glib gobject-introspection
(python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) glib
]; (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ]))
preferLocalBuild = true; ];
installPhase = '' preferLocalBuild = true;
install -Dt $out/bin ftplugin/evinceSync.py installPhase = ''
''; install -Dt $out/bin ftplugin/evinceSync.py
}; '';
in };
super.sved.overrideAttrs(old: { in
super.sved.overrideAttrs (old: {
preferLocalBuild = true; preferLocalBuild = true;
postPatch = '' postPatch = ''
rm ftplugin/evinceSync.py rm ftplugin/evinceSync.py
@ -331,7 +380,7 @@ self: super: {
}; };
}); });
vimacs = super.vimacs.overrideAttrs(old: { vimacs = super.vimacs.overrideAttrs (old: {
buildPhase = '' buildPhase = ''
substituteInPlace bin/vim \ substituteInPlace bin/vim \
--replace '/usr/bin/vim' 'vim' \ --replace '/usr/bin/vim' 'vim' \
@ -347,73 +396,74 @@ self: super: {
}; };
}); });
vimshell-vim = super.vimshell-vim.overrideAttrs(old: { vimshell-vim = super.vimshell-vim.overrideAttrs (old: {
dependencies = with super; [ vimproc-vim ]; dependencies = with super; [ vimproc-vim ];
}); });
vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: {
buildInputs = lib.optional stdenv.isDarwin Cocoa; buildInputs = lib.optional stdenv.isDarwin Cocoa;
}); });
vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
}); });
vim-addon-async = super.vim-addon-async.overrideAttrs(old: { vim-addon-async = super.vim-addon-async.overrideAttrs (old: {
dependencies = with super; [ vim-addon-signs ]; dependencies = with super; [ vim-addon-signs ];
}); });
vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: { vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils ]; dependencies = with super; [ vim-addon-mw-utils ];
}); });
vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: { vim-addon-completion = super.vim-addon-completion.overrideAttrs (old: {
dependencies = with super; [ tlib_vim ]; dependencies = with super; [ tlib_vim ];
}); });
vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: { vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs (old: {
dependencies = with super; [ tlib_vim ]; dependencies = with super; [ tlib_vim ];
}); });
vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: { vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: {
dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; dependencies = with super; [ vim-addon-other vim-addon-mw-utils ];
}); });
vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: { vim-addon-nix = super.vim-addon-nix.overrideAttrs (old: {
dependencies = with super; [ dependencies = with super; [
vim-addon-completion vim-addon-completion
vim-addon-goto-thing-at-cursor vim-addon-goto-thing-at-cursor
vim-addon-errorformats vim-addon-errorformats
vim-addon-actions vim-addon-actions
vim-addon-mw-utils tlib_vim vim-addon-mw-utils
tlib_vim
]; ];
}); });
vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: { vim-addon-sql = super.vim-addon-sql.overrideAttrs (old: {
dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ];
}); });
vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: { vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
}); });
vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: { vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
}); });
vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: { vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs (old: {
dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ];
}); });
vim-bazel = super.vim-bazel.overrideAttrs(old: { vim-bazel = super.vim-bazel.overrideAttrs (old: {
dependencies = with super; [ vim-maktaba ]; dependencies = with super; [ vim-maktaba ];
}); });
vim-beancount = super.vim-beancount.overrideAttrs(old: { vim-beancount = super.vim-beancount.overrideAttrs (old: {
passthru.python3Dependencies = ps: with ps; [ beancount ]; passthru.python3Dependencies = ps: with ps; [ beancount ];
}); });
vim-closer = super.vim-closer.overrideAttrs(old: { vim-closer = super.vim-closer.overrideAttrs (old: {
patches = [ patches = [
# Fix duplicate tag in doc # Fix duplicate tag in doc
(fetchpatch { (fetchpatch {
@ -423,21 +473,22 @@ self: super: {
]; ];
}); });
vim-codefmt = super.vim-codefmt.overrideAttrs(old: { vim-codefmt = super.vim-codefmt.overrideAttrs (old: {
dependencies = with super; [ vim-maktaba ]; dependencies = with super; [ vim-maktaba ];
}); });
vim-dasht = super.vim-dasht.overrideAttrs(old: { vim-dasht = super.vim-dasht.overrideAttrs (old: {
preFixup = '' preFixup = ''
substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \
--replace "['dasht']" "['${dasht}/bin/dasht']" --replace "['dasht']" "['${dasht}/bin/dasht']"
''; '';
}); });
vim-easytags = super.vim-easytags.overrideAttrs(old: { vim-easytags = super.vim-easytags.overrideAttrs (old: {
dependencies = with super; [ vim-misc ]; dependencies = with super; [ vim-misc ];
patches = [ patches = [
(fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags (fetchpatch {
# https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags
url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch";
sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4";
}) })
@ -447,36 +498,38 @@ self: super: {
# change the go_bin_path to point to a path in the nix store. See the code in # change the go_bin_path to point to a path in the nix store. See the code in
# fatih/vim-go here # fatih/vim-go here
# https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
vim-go = super.vim-go.overrideAttrs(old: let vim-go = super.vim-go.overrideAttrs (old:
binPath = lib.makeBinPath [ let
asmfmt binPath = lib.makeBinPath [
delve asmfmt
errcheck delve
go-motion errcheck
go-tools go-motion
gocode go-tools
gocode-gomod gocode
godef gocode-gomod
gogetdoc godef
golint gogetdoc
golangci-lint golint
gomodifytags golangci-lint
gopls gomodifytags
gotags gopls
gotools gotags
iferr gotools
impl iferr
reftools impl
]; reftools
in { ];
postPatch = '' in
${gnused}/bin/sed \ {
-Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ postPatch = ''
-i autoload/go/config.vim ${gnused}/bin/sed \
''; -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \
}); -i autoload/go/config.vim
'';
});
vim-grammarous = super.vim-grammarous.overrideAttrs(old: { vim-grammarous = super.vim-grammarous.overrideAttrs (old: {
# use `:GrammarousCheck` to initialize checking # use `:GrammarousCheck` to initialize checking
# In neovim, you also want to use set # In neovim, you also want to use set
# let g:grammarous#show_first_error = 1 # let g:grammarous#show_first_error = 1
@ -489,7 +542,7 @@ self: super: {
]; ];
}); });
lens-vim = super.lens-vim.overrideAttrs(old: { lens-vim = super.lens-vim.overrideAttrs (old: {
# remove duplicate g:lens#animate in doc/lens.txt # remove duplicate g:lens#animate in doc/lens.txt
# https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985
# https://github.com/camspiers/lens.vim/pull/40/files # https://github.com/camspiers/lens.vim/pull/40/files
@ -501,11 +554,11 @@ self: super: {
]; ];
}); });
vim-hier = super.vim-hier.overrideAttrs(old: { vim-hier = super.vim-hier.overrideAttrs (old: {
buildInputs = [ vim ]; buildInputs = [ vim ];
}); });
vim-isort = super.vim-isort.overrideAttrs(old: { vim-isort = super.vim-isort.overrideAttrs (old: {
postPatch = '' postPatch = ''
substituteInPlace ftplugin/python_vimisort.vim \ substituteInPlace ftplugin/python_vimisort.vim \
--replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'
@ -513,38 +566,39 @@ self: super: {
}); });
vim-markdown-composer = vim-markdown-composer =
let let
vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
pname = "vim-markdown-composer-bin"; pname = "vim-markdown-composer-bin";
inherit (super.vim-markdown-composer) src version; inherit (super.vim-markdown-composer) src version;
cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc=";
}; };
in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec { in
preFixup = '' super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ preFixup = ''
--replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \
"let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \
''; "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']"
}); '';
});
vim-metamath = super.vim-metamath.overrideAttrs(old: { vim-metamath = super.vim-metamath.overrideAttrs (old: {
preInstall = "cd vim"; preInstall = "cd vim";
}); });
vim-snipmate = super.vim-snipmate.overrideAttrs(old: { vim-snipmate = super.vim-snipmate.overrideAttrs (old: {
dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; dependencies = with super; [ vim-addon-mw-utils tlib_vim ];
}); });
vim-wakatime = super.vim-wakatime.overrideAttrs(old: { vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
buildInputs = [ python ]; buildInputs = [ python ];
}); });
vim-xdebug = super.vim-xdebug.overrideAttrs(old: { vim-xdebug = super.vim-xdebug.overrideAttrs (old: {
postInstall = false; postInstall = false;
}); });
vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: {
patchPhase = '' patchPhase = ''
substituteInPlace plugin/xkbswitch.vim \ substituteInPlace plugin/xkbswitch.vim \
--replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so
@ -552,14 +606,14 @@ self: super: {
buildInputs = [ xkb-switch ]; buildInputs = [ xkb-switch ];
}); });
vim-yapf = super.vim-yapf.overrideAttrs(old: { vim-yapf = super.vim-yapf.overrideAttrs (old: {
buildPhase = '' buildPhase = ''
substituteInPlace ftplugin/python_yapf.vim \ substituteInPlace ftplugin/python_yapf.vim \
--replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
''; '';
}); });
vimproc-vim = super.vimproc-vim.overrideAttrs(old: { vimproc-vim = super.vimproc-vim.overrideAttrs (old: {
buildInputs = [ which ]; buildInputs = [ which ];
buildPhase = '' buildPhase = ''
@ -571,11 +625,11 @@ self: super: {
''; '';
}); });
YankRing-vim = super.YankRing-vim.overrideAttrs(old: { YankRing-vim = super.YankRing-vim.overrideAttrs (old: {
sourceRoot = "."; sourceRoot = ".";
}); });
YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: { YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: {
buildPhase = '' buildPhase = ''
substituteInPlace plugin/youcompleteme.vim \ substituteInPlace plugin/youcompleteme.vim \
--replace "'ycm_path_to_python_interpreter', '''" \ --replace "'ycm_path_to_python_interpreter', '''" \
@ -594,7 +648,7 @@ self: super: {
}; };
}); });
jedi-vim = super.jedi-vim.overrideAttrs(old: { jedi-vim = super.jedi-vim.overrideAttrs (old: {
# checking for python3 support in vim would be neat, too, but nobody else seems to care # checking for python3 support in vim would be neat, too, but nobody else seems to care
buildInputs = [ python3.pkgs.jedi ]; buildInputs = [ python3.pkgs.jedi ];
meta = { meta = {
@ -603,7 +657,7 @@ self: super: {
}; };
}); });
lf-vim = super.lf-vim.overrideAttrs(old: { lf-vim = super.lf-vim.overrideAttrs (old: {
dependencies = with super; [ bclose-vim ]; dependencies = with super; [ bclose-vim ];
}); });
@ -615,7 +669,7 @@ self: super: {
''; '';
}); });
vCoolor-vim = super.vCoolor-vim.overrideAttrs(old: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
# on linux can use either Zenity or Yad. # on linux can use either Zenity or Yad.
propagatedBuildInputs = [ gnome3.zenity ]; propagatedBuildInputs = [ gnome3.zenity ];
meta = { meta = {
@ -624,12 +678,14 @@ self: super: {
}; };
}); });
unicode-vim = let unicode-vim =
unicode-data = fetchurl { let
url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; unicode-data = fetchurl {
sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt";
}; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";
in super.unicode-vim.overrideAttrs(old: { };
in
super.unicode-vim.overrideAttrs (old: {
# redirect to /dev/null else changes terminal color # redirect to /dev/null else changes terminal color
buildPhase = '' buildPhase = ''
@ -637,51 +693,55 @@ self: super: {
echo "Building unicode cache" echo "Building unicode cache"
${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null
''; '';
}); });
vim-hexokinase = super.vim-hexokinase.overrideAttrs(old: { vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: {
preFixup = let preFixup =
hexokinase = buildGoModule { let
name = "hexokinase"; hexokinase = buildGoModule {
src = old.src + "/hexokinase"; name = "hexokinase";
vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; src = old.src + "/hexokinase";
}; vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
in '' };
ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase in
''; ''
ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase
'';
meta.platforms = lib.platforms.all; meta.platforms = lib.platforms.all;
}); });
vim-clap = super.vim-clap.overrideAttrs(old: { vim-clap = super.vim-clap.overrideAttrs (old: {
preFixup = let preFixup =
maple-bin = rustPlatform.buildRustPackage { let
name = "maple"; maple-bin = rustPlatform.buildRustPackage {
src = old.src; name = "maple";
src = old.src;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
openssl openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
CoreServices CoreServices
curl curl
libgit2 libgit2
libiconv libiconv
]; ];
cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c=";
}; };
in '' in
ln -s ${maple-bin}/bin/maple $target/bin/maple ''
''; ln -s ${maple-bin}/bin/maple $target/bin/maple
'';
meta.platforms = lib.platforms.all; meta.platforms = lib.platforms.all;
}); });
completion-tabnine = super.completion-tabnine.overrideAttrs(old: { completion-tabnine = super.completion-tabnine.overrideAttrs (old: {
buildInputs = [ tabnine ]; buildInputs = [ tabnine ];
postFixup = '' postFixup = ''
@ -690,7 +750,7 @@ self: super: {
''; '';
}); });
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs(old: { telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: {
dependencies = [ self.sql-nvim ]; dependencies = [ self.sql-nvim ];
}); });

24
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -1,26 +1,26 @@
{ {
"4.14": { "4.14": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.14.217-hardened1.patch", "name": "linux-hardened-4.14.219-hardened1.patch",
"sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx", "sha256": "0pgpb7phjgil01xbpwqdwyk8k3pv5qlikw4721cmy10aj97plpqw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.219-hardened1/linux-hardened-4.14.219-hardened1.patch"
}, },
"4.19": { "4.19": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.19.172-hardened1.patch", "name": "linux-hardened-4.19.173-hardened1.patch",
"sha256": "0c64rmlfaxj3jfjl8q3fncwmxjmbn7184d0m3vavznrl7lcy50xa", "sha256": "19ikdwvp3mjh6cl2anhlpzmk1ha4lw1lf9rmvls7pzc7d1bmlwi0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.172-hardened1/linux-hardened-4.19.172-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.173-hardened1/linux-hardened-4.19.173-hardened1.patch"
}, },
"5.10": { "5.10": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.10.12-hardened1.patch", "name": "linux-hardened-5.10.13-hardened1.patch",
"sha256": "03b6ndq4r7w1az0i8cahfm3pf3cn6a1rwra06lgdp9dk4naf4hby", "sha256": "1pn6ddkpairsij8p5130h8iwqq65v6ngn0c3pf6rlavy4az1sw82",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.12-hardened1/linux-hardened-5.10.12-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.13-hardened1/linux-hardened-5.10.13-hardened1.patch"
}, },
"5.4": { "5.4": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.4.94-hardened1.patch", "name": "linux-hardened-5.4.95-hardened1.patch",
"sha256": "08lzygjg7n9rx27r5gik360vfmaczpp14z01dc5r5hkmxkiaz8ww", "sha256": "04c54xk75gb4p4yfrmjam25jafqz47cqapr38jw2v1plwc98ng4m",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.94-hardened1/linux-hardened-5.4.94-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.95-hardened1/linux-hardened-5.4.95-hardened1.patch"
} }
} }

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.218"; version = "4.14.219";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3"; sha256 = "1p81p2g1dax225mbc704g1yl96i93nq19j9fpkrzr4f066kwmvkm";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.172"; version = "4.19.173";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g"; sha256 = "0pqr8k0kfnaklb31y29xvqdmgn0pak4qd9pl77lsh6pkwqvd5zfj";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.254"; version = "4.4.255";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd"; sha256 = "0l45csywd30qrs8gwzjjijr5hwpd5s05rbyrxb37vck78znk0f1g";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.254"; version = "4.9.255";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn"; sha256 = "066101fzq5lr1pznw1hwlvsdgqpv8n7b2yi09qpv3xi0r41jvpxg";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.12"; version = "5.10.13";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; sha256 = "1wp1vy9y50ncwlx5yqgya5gy0vdqgzn0icffg6dzmvjwwc68qs86";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.94"; version = "5.4.95";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2"; sha256 = "0jfl2jwq9z6iymn6sfrdcf9w63nijdzf3ncxc77a5gs6yd2fa2h3";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.10.8-rt24"; # updated by ./update-rt.sh version = "5.10.12-rt26"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30"; sha256 = "06sb7cj24v4kh7zghndpxv95pkihahc7653lxdw4wj9jhi58bs2k";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

58
pkgs/os-specific/linux/switcheroo-control/default.nix Normal file
View File

@ -0,0 +1,58 @@
{ lib
, ninja
, meson
, fetchFromGitLab
, systemd
, libgudev
, pkg-config
, glib
, python3
, gobject-introspection
}:
python3.pkgs.buildPythonApplication rec {
pname = "switcheroo-control";
version = "2.3";
format = "other";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "hadess";
repo = pname;
rev = version;
hash = "sha256-1Pze2TJ9mggfcpiLFwJ7/9WhsdJx4G3GoA7+Z47shuc=";
};
nativeBuildInputs = [
ninja
meson
pkg-config
# needed for glib-compile-resources
glib
];
buildInputs = [
systemd
libgudev
];
propagatedBuildInputs = [
python3.pkgs.pygobject3
];
mesonFlags = [
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d"
];
meta = with lib; {
description = "D-Bus service to check the availability of dual-GPU";
homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/";
changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS";
license = licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.linux;
};
}

26
pkgs/servers/maddy/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "maddy";
version = "0.4.3";
src = fetchFromGitHub {
owner = "foxcpp";
repo = "maddy";
rev = "v${version}";
sha256 = "1mi607hl4c9y9xxv5lywh9fvpybprlrgqa7617km9rssbgk4x1v7";
};
vendorSha256 = "16laf864789yiakvqs6dy3sgnnp2hcdbyzif492wcijqlir2swv7";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ];
subPackages = [ "cmd/maddy" "cmd/maddyctl" ];
meta = with lib; {
description = "Composable all-in-one mail server";
homepage = "https://foxcpp.dev/maddy";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lxea ];
};
}

4
pkgs/tools/misc/microplane/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "microplane"; pname = "microplane";
version = "0.0.25"; version = "0.0.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Clever"; owner = "Clever";
repo = "microplane"; repo = "microplane";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vynkv3d70q8d079kgdmwbavyyrjssqnd223dl1rikyy7sd5sli8"; sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm";
}; };
goPackagePath = "github.com/Clever/microplane"; goPackagePath = "github.com/Clever/microplane";

4
pkgs/tools/misc/microplane/deps.nix generated
View File

@ -194,8 +194,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/sync"; url = "https://go.googlesource.com/sync";
rev = "6e8e738ad208923de99951fe0b48239bfd864f28"; rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be";
sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y";
}; };
} }
{ {

4
pkgs/tools/misc/wlr-randr/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wlr-randr"; pname = "wlr-randr";
version = "0.1.0"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emersion"; owner = "emersion";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ=";
}; };
nativeBuildInputs = [ meson ninja cmake pkg-config ]; nativeBuildInputs = [ meson ninja cmake pkg-config ];

10
pkgs/top-level/all-packages.nix
View File

@ -1261,6 +1261,8 @@ in
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
flavours = callPackage ../applications/misc/flavours { };
flood = nodePackages.flood; flood = nodePackages.flood;
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
@ -8053,7 +8055,7 @@ in
subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; subsurface = libsForQt514.callPackage ../applications/misc/subsurface { };
sudo = if stdenv.isDarwin then darwin.sudo else callPackage ../tools/security/sudo { }; sudo = callPackage ../tools/security/sudo { };
suidChroot = callPackage ../tools/system/suid-chroot { }; suidChroot = callPackage ../tools/system/suid-chroot { };
@ -12973,6 +12975,8 @@ in
yaml2json = callPackage ../development/tools/yaml2json { }; yaml2json = callPackage ../development/tools/yaml2json { };
yams = callPackage ../applications/audio/yams { };
ycmd = callPackage ../development/tools/misc/ycmd { ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python3; python = python3;
@ -18434,6 +18438,8 @@ in
storm = callPackage ../servers/computing/storm { }; storm = callPackage ../servers/computing/storm { };
switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { };
slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
@ -19523,6 +19529,8 @@ in
enableCmdlib = true; enableCmdlib = true;
}; };
maddy = callPackage ../servers/maddy/default.nix { };
mbelib = callPackage ../development/libraries/audio/mbelib { }; mbelib = callPackage ../development/libraries/audio/mbelib { };
mbpfan = callPackage ../os-specific/linux/mbpfan { }; mbpfan = callPackage ../os-specific/linux/mbpfan { };