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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-03 12:06:41 +01:00
parent b810a5d23c 237966224d
commit 470f05cb5d
317 changed files with 3210 additions and 2827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/mame/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@ with stdenv;
let
majorVersion = "0";
minorVersion = "225";
minorVersion = "226";
desktopItem = makeDesktopItem {
name = "MAME";
@@ -26,7 +26,7 @@ in mkDerivation {
owner = "mamedev";
repo = "mame";
rev = "mame${majorVersion}${minorVersion}";
sha256 = "0ln5z8xp81j2af2s94dixnk9n68qpi6b3plynp3pharg6dd55yac";
sha256 = "0pnsvz4vkjkqb1ac5wzwz31vx0iknyg5ffly90nhl13kcr656jrj";
};
hardeningDisable = [ "fortify" ];
pkgs/misc/emulators/mednaffe/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "AmatCoder";
repo = "mednaffe";
rev = "${version}";
rev = version;
sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";
};
pkgs/misc/tmux-plugins/default.nix
+50 -6
View File
@@ -66,14 +66,32 @@ in rec {
continuum = mkDerivation {
pluginName = "continuum";
version = "unstable-2018-02-23";
version = "unstable-2020-10-16";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "tmux-continuum";
rev = "1531b3770a7cf7373d15fedd239c5331b99342d1";
sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m";
rev = "26eb5ffce0b559d682b9f98c8d4b6c370ecb639b";
sha256 = "1glwa89bv2r92qz579a49prk3jf612cpd5hw46j4wfb35xhnj3ab";
};
dependencies = [ resurrect ];
meta = {
homepage = "https://github.com/tmux-plugins/tmux-continuum";
description = "continous saving of tmux environment";
longDescription =
''
Features:
* continuous saving of tmux environment
* automatic tmux start when computer/server is turned on
* automatic restore when tmux is started
Together, these features enable uninterrupted tmux usage. No matter the
computer or server restarts, if the machine is on, tmux will be there how
you left it off the last time it was used.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
};
};
copycat = mkDerivation {
@@ -266,12 +284,38 @@ in rec {
resurrect = mkDerivation {
pluginName = "resurrect";
version = "unstable-2020-03-21";
version = "unstable-2020-09-18";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "tmux-resurrect";
rev = "327c0481ad20c429b4e692e092659f8b3346b08f";
sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw";
rev = "e4825055c92e54b0c6ec572afc9b6c4723aba6c8";
sha256 = "0a96drkx1kpadkbxabcnvb542p75xdh2dbizvlq2lac5ldpb4hmx";
};
meta = {
homepage = "https://github.com/tmux-plugins/tmux-resurrect";
description = "Restore tmux environment after system restart";
longDescription =
''
This plugin goes to great lengths to save and restore all the details
from your tmux environment. Here's what's been taken care of:
* all sessions, windows, panes and their order
* current working directory for each pane
* exact pane layouts within windows (even when zoomed)
* active and alternative session
* active and alternative window for each session
* windows with focus
* active pane for each window
* "grouped sessions" (useful feature when using tmux with multiple monitors)
* programs running within a pane! More details in the restoring programs doc.
Optional:
* restoring vim and neovim sessions
* restoring pane contents
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
};
};
pkgs/misc/vim-plugins/generated.nix
+39 -27
View File
@@ -389,12 +389,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2020-10-30";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "a8a3cf41638e5b7b128086888e2dead665407beb";
sha256 = "19a3blvfzqjzd5y3l4g03h3c8yxfl9fsdvc6mir0n76krpnk647l";
rev = "eb10e21721ee527d86cbc4422d4cdc5d53ea65fd";
sha256 = "10qgca7hncxmlmbcd0d9rmkdjd22qp88llz0dlsgm6ckng46nbpn";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@@ -461,12 +461,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2020-10-28";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "ad1793dce0a59afcf8b324b45a1168c032deb162";
sha256 = "1khmmvba6cg0pff37nkbm7zmp3mnvpc889pql6dm6xjqrhpqsda7";
rev = "2adc879786ca65c3fdc3dd94743acbbed3f54465";
sha256 = "1j4kjxflm0ldaa0pgjm081x95hqxhhanv45mwwnmcg2lkpd6lnq5";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -570,12 +570,12 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2020-10-17";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "0e63269e176232cdd9f1c20d94dfd3b8ad5702a1";
sha256 = "0ixryjfszx09g27awdaqf5xrc7yjb5mlpc57ph3w61hdv65yps7b";
rev = "a4c31e1c0136e943fa7dd48ecc11849158d3554e";
sha256 = "0xvz1s3lx75k9fgn319b0q6d8vj7cpw6mj2xkh73qmaqvvx3bni1";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -1836,12 +1836,12 @@ let
lean-vim = buildVimPluginFrom2Nix {
pname = "lean-vim";
version = "2020-10-10";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean.vim";
rev = "c3a99f34a92af8a86e162134276222309e01e896";
sha256 = "09kz4iy0flwdawhd0phy6jl6zkxp3qdyhl8snl0n12sbskzq7i1b";
rev = "d1b3037680be79f114a87620844117e20ca7efcf";
sha256 = "0x3cz4is30jsrp7dym4rz4xngv9mimybl4kqnry9x0nkqzn55910";
};
meta.homepage = "https://github.com/leanprover/lean.vim/";
};
@@ -2580,12 +2580,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2020-10-30";
version = "2020-10-31";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "dd7900fc44b9cc6773bd4f8b5c0175887991520c";
sha256 = "0nfdvmlzqfga596n5awdhz9mc6gwnys73ixxkqi49f2g9x215ksd";
rev = "9327b113c2360d503ab183718c57e3e1b0819887";
sha256 = "1xgw0464563rc6wnjhf9m2f25wii80d78laa8ifjbjivrv4b0y1k";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3385,12 +3385,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2020-10-30";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "telescope.nvim";
rev = "37c4f1b355d843e95ba41f2a73d83de58fb74dae";
sha256 = "0ly9vcnmf1b881fh1r5v4231h5n8kld2k9q1bxzvy87p2wsfb5sn";
rev = "54ef9d90d5a032906bfb007113930dac0f665f72";
sha256 = "0zh6dpxfibm0clafs2zsnb4ffmh3438qiccc60md2s7hwhzynvyq";
};
meta.homepage = "https://github.com/nvim-lua/telescope.nvim/";
};
@@ -4814,12 +4814,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2020-10-19";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "a5e2535d31aa1d7c0fa8a4e77ee96b92ad185be5";
sha256 = "0ixpy4vvvh7kgwq4wvyiw8cm3aj89mql2phf49rmi60d9kli3kn9";
rev = "35ea9acf5fc409d1eed341333789f18c2d135c66";
sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5281,6 +5281,18 @@ let
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
};
vim-LanguageTool = buildVimPluginFrom2Nix {
pname = "vim-LanguageTool";
version = "2020-10-29";
src = fetchFromGitHub {
owner = "dpelle";
repo = "vim-LanguageTool";
rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964";
sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns";
};
meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
};
vim-lastplace = buildVimPluginFrom2Nix {
pname = "vim-lastplace";
version = "2020-01-20";
@@ -6015,12 +6027,12 @@ let
vim-prosession = buildVimPluginFrom2Nix {
pname = "vim-prosession";
version = "2020-10-12";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-prosession";
rev = "e735468710a5cd6037b6d4c0e4c8c2bc1353cf4b";
sha256 = "0ava297hpm1cf8j18ypfrziwavqcv982hisvh1d8yjxal521pam1";
rev = "1be0c069a2b362369913ffaeed5293ffe1932ef6";
sha256 = "0hqfwlkz64kkh8w6w5k7gw2i0x7spddbgixjcrp1lr6n6bslkj2d";
};
meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
};
@@ -7385,12 +7397,12 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
version = "2020-10-30";
version = "2020-11-01";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
rev = "2c1dce274988814102aafc57c4e0675c2d130e6c";
sha256 = "10kzqzm587nz1qgscgwrvjs77vk6grck28g5z1lhrxhpn1jng943";
rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7";
sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
pkgs/misc/vim-plugins/vim-plugin-names
+1
View File
@@ -83,6 +83,7 @@ digitaltoad/vim-pug
direnv/direnv.vim
dleonard0/pony-vim-syntax
dmix/elvish.vim
dpelle/vim-LanguageTool
dracula/vim as dracula-vim
drewtempelmeyer/palenight.vim
drmingdrmer/xptemplate