lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
2bd4b710 bd1a0c97

+647 -397
+6
maintainers/maintainer-list.nix
··· 5562 5562 githubId = 2057309; 5563 5563 name = "Sergey Sofeychuk"; 5564 5564 }; 5565 + lxea = { 5566 + email = "nix@amk.ie"; 5567 + github = "lxea"; 5568 + githubId = 7910815; 5569 + name = "Alex McGrath"; 5570 + }; 5565 5571 lynty = { 5566 5572 email = "ltdong93+nix@gmail.com"; 5567 5573 github = "lynty";
+18
nixos/modules/hardware/video/switcheroo-control.nix
··· 1 + { config, pkgs, lib, ... }: 2 + 3 + with lib; 4 + let 5 + pkg = [ pkgs.switcheroo-control ]; 6 + cfg = config.services.switcherooControl; 7 + in { 8 + options.services.switcherooControl = { 9 + enable = mkEnableOption "switcheroo-control, a D-Bus service to check the availability of dual-GPU"; 10 + }; 11 + 12 + config = mkIf cfg.enable { 13 + services.dbus.packages = pkg; 14 + environment.systemPackages = pkg; 15 + systemd.packages = pkg; 16 + systemd.targets.multi-user.wants = [ "switcheroo-control.service" ]; 17 + }; 18 + }
+1
nixos/modules/module-list.nix
··· 359 359 ./services/games/terraria.nix 360 360 ./services/hardware/acpid.nix 361 361 ./services/hardware/actkbd.nix 362 + ./services/hardware/auto-cpufreq.nix 362 363 ./services/hardware/bluetooth.nix 363 364 ./services/hardware/bolt.nix 364 365 ./services/hardware/brltty.nix
+18
nixos/modules/services/hardware/auto-cpufreq.nix
··· 1 + { config, lib, pkgs, ... }: 2 + with lib; 3 + let 4 + cfg = config.services.auto-cpufreq; 5 + in { 6 + options = { 7 + services.auto-cpufreq = { 8 + enable = mkEnableOption "auto-cpufreq daemon"; 9 + }; 10 + }; 11 + 12 + config = mkIf cfg.enable { 13 + environment.systemPackages = [ pkgs.auto-cpufreq ]; 14 + 15 + systemd.packages = [ pkgs.auto-cpufreq ]; 16 + systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ]; 17 + }; 18 + }
-1
nixos/modules/system/activation/top-level.nix
··· 173 173 }; 174 174 175 175 options.configuration = mkOption { 176 - type = types.attrsOf types.anything; 177 176 default = {}; 178 177 description = "Arbitrary NixOS configuration options."; 179 178 };
+29
pkgs/applications/audio/yams/default.nix
··· 1 + { lib, fetchFromGitHub, python3Packages }: 2 + 3 + python3Packages.buildPythonPackage rec { 4 + pname = "yams"; 5 + version = "0.7.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "Berulacks"; 9 + repo = "yams"; 10 + rev = version; 11 + sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8"; 12 + }; 13 + 14 + propagatedBuildInputs = with python3Packages; [ 15 + pyyaml 16 + psutil 17 + mpd2 18 + requests 19 + ]; 20 + 21 + doCheck = false; 22 + 23 + meta = with lib; { 24 + homepage = "https://github.com/Berulacks/yams"; 25 + description = "Last.FM scrobbler for MPD"; 26 + license = licenses.gpl3Only; 27 + maintainers = with maintainers; [ ccellado ]; 28 + }; 29 + }
+23
pkgs/applications/misc/flavours/default.nix
··· 1 + { lib, fetchFromGitHub, rustPlatform }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "flavours"; 5 + version = "0.3.5"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "Misterio77"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj"; 12 + }; 13 + 14 + cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1"; 15 + 16 + meta = with lib; { 17 + description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; 18 + homepage = "https://github.com/Misterio77/flavours"; 19 + changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; 20 + license = licenses.mit; 21 + maintainers = with maintainers; [ fortuneteller2k ]; 22 + }; 23 + }
+7 -7
pkgs/development/libraries/farbfeld/default.nix
··· 1 - { lib, stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: 1 + { lib, stdenv, fetchurl, makeWrapper, file, libpng, libjpeg }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "farbfeld"; 5 5 version = "4"; 6 6 7 - src = fetchgit { 8 - url = "https://git.suckless.org/farbfeld"; 9 - rev = "refs/tags/${version}"; 10 - sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870"; 7 + src = fetchurl { 8 + url = "https://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz"; 9 + sha256 = "0ap7rcngffhdd57jw9j22arzkbrhwh0zpxhwbdfwl8fixlhmkpy7"; 11 10 }; 12 11 13 12 buildInputs = [ libpng libjpeg ]; 14 13 nativeBuildInputs = [ makeWrapper ]; 15 14 16 - installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; 15 + installFlags = [ "PREFIX=$(out)" ]; 17 16 postInstall = '' 18 17 wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" 19 18 ''; 20 19 21 20 meta = with lib; { 22 21 description = "Suckless image format with conversion tools"; 22 + homepage = "https://tools.suckless.org/farbfeld/"; 23 23 license = licenses.isc; 24 - platforms = platforms.linux; 24 + platforms = platforms.unix; 25 25 maintainers = with maintainers; [ pSub ]; 26 26 }; 27 27 }
+2 -1
pkgs/development/python-modules/linuxfd/default.nix
··· 19 19 meta = { 20 20 description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; 21 21 homepage = "https://github.com/FrankAbelbeck/linuxfd"; 22 - license = with lib.licenses; [ lgpl3 ]; 22 + platforms = lib.platforms.linux; 23 + license = with lib.licenses; [ lgpl3Plus ]; 23 24 }; 24 25 }
+4 -1
pkgs/development/python-modules/primer3/default.nix
··· 1 1 { lib 2 + , stdenv 2 3 , buildPythonPackage 3 4 , fetchFromGitHub 4 5 , cython 6 + , gcc 5 7 , click 6 8 }: 7 9 ··· 16 18 sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; 17 19 }; 18 20 19 - nativeBuildInputs = [ cython ]; 21 + nativeBuildInputs = [ cython ] 22 + ++ lib.optionals stdenv.isDarwin [ gcc ]; 20 23 21 24 # pytestCheckHook leads to a circular import issue 22 25 checkInputs = [ click ];
+110 -110
pkgs/misc/vim-plugins/generated.nix
··· 377 377 378 378 chadtree = buildVimPluginFrom2Nix { 379 379 pname = "chadtree"; 380 - version = "2021-02-02"; 380 + version = "2021-02-05"; 381 381 src = fetchFromGitHub { 382 382 owner = "ms-jpq"; 383 383 repo = "chadtree"; 384 - rev = "addb3b3f9963b86b1d3626e4b1920b129148625b"; 385 - sha256 = "1fpws70lxa9vs4yv6wpgnvw0khxhavq23plnsil29j4xlfm3ivw9"; 384 + rev = "c592de172d6e9ed36c8ca38814b3bb2a8ffde901"; 385 + sha256 = "1hs38ri6j6bfnl5ll8jcd3wcpv95h1rf19vd42x3h0i4npxba9hz"; 386 386 }; 387 387 meta.homepage = "https://github.com/ms-jpq/chadtree/"; 388 388 }; ··· 477 477 src = fetchFromGitHub { 478 478 owner = "weirongxu"; 479 479 repo = "coc-explorer"; 480 - rev = "ee76911b1fa4a12833e53a1f56b03ada4fc3b6cf"; 481 - sha256 = "0n2za8f43gj9mjcjvwdrd2q17qn72fl1d7invnhrcyq44452y0z5"; 480 + rev = "16fcaba5e3ee67b4149bf4ce6bd0c76991e982c2"; 481 + sha256 = "0r23i855f01c3isfhv4j5r34xj777ffyqn420m44077dyr7r3m9k"; 482 482 }; 483 483 meta.homepage = "https://github.com/weirongxu/coc-explorer/"; 484 484 }; ··· 497 497 498 498 coc-lua = buildVimPluginFrom2Nix { 499 499 pname = "coc-lua"; 500 - version = "2021-01-29"; 500 + version = "2021-02-03"; 501 501 src = fetchFromGitHub { 502 502 owner = "josa42"; 503 503 repo = "coc-lua"; 504 - rev = "9de6e72dca845727c1ef53a71a6cb07f7da4802c"; 505 - sha256 = "0csiisfwjn8rr4a9hi7law2fn1wp1fms9nf3h6f9ynqi2p63yxch"; 504 + rev = "14f4162f20e0d1dc7344e0620ffd11f3c811d4b2"; 505 + sha256 = "01xqvksvs61vg8sc6wpiilp833g61sza455297vg0im0cz7i8wpc"; 506 506 }; 507 507 meta.homepage = "https://github.com/josa42/coc-lua/"; 508 508 }; ··· 894 894 895 895 denite-nvim = buildVimPluginFrom2Nix { 896 896 pname = "denite-nvim"; 897 - version = "2021-02-02"; 897 + version = "2021-02-05"; 898 898 src = fetchFromGitHub { 899 899 owner = "Shougo"; 900 900 repo = "denite.nvim"; 901 - rev = "b3c400c1d71a7451ce4c181e81d33373100ac4ac"; 902 - sha256 = "1k4qgdmpn5r8h8d3arq9zis6m0h8fagikrjb0v8lfhsz83zl1293"; 901 + rev = "c56b0a7c0ff040f1de7e0bb48d76af56b4a4d2c1"; 902 + sha256 = "1yg3qawbfpi7jjl8bkl8yif245c03lz3vm52w2z7c970n3y6v2pm"; 903 903 }; 904 904 meta.homepage = "https://github.com/Shougo/denite.nvim/"; 905 905 }; ··· 1112 1112 1113 1113 deoplete-vim-lsp = buildVimPluginFrom2Nix { 1114 1114 pname = "deoplete-vim-lsp"; 1115 - version = "2020-12-21"; 1115 + version = "2021-02-04"; 1116 1116 src = fetchFromGitHub { 1117 1117 owner = "lighttiger2505"; 1118 1118 repo = "deoplete-vim-lsp"; 1119 - rev = "0c5d9e6efd6a7bea503faa854c41a3e5af00ec57"; 1120 - sha256 = "1hckg9p7srw2d674is0wzilnwwvw1s2q8xapr6dawslm5j364xlk"; 1119 + rev = "4e369aee9c443f31b3974c945f807ad93d27cb5c"; 1120 + sha256 = "14vfa6zvxprrrdi82dwnayhr2wxmifd7h5w8cl0hfw5zyrs5qsr0"; 1121 1121 }; 1122 1122 meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; 1123 1123 }; ··· 1463 1463 1464 1464 fzf-lsp-nvim = buildVimPluginFrom2Nix { 1465 1465 pname = "fzf-lsp-nvim"; 1466 - version = "2021-01-19"; 1466 + version = "2021-02-04"; 1467 1467 src = fetchFromGitHub { 1468 1468 owner = "gfanto"; 1469 1469 repo = "fzf-lsp.nvim"; 1470 - rev = "5b12d8de47608570b404270c00742e3977ed3103"; 1471 - sha256 = "0y23i1gj4y517qs4ff43fi3ivkz4gmidrvcf6n314nwjgzikff6w"; 1470 + rev = "1386cbae761415b9c7b45565d87283fb4d584aed"; 1471 + sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv"; 1472 1472 }; 1473 1473 meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; 1474 1474 }; ··· 1487 1487 1488 1488 galaxyline-nvim = buildVimPluginFrom2Nix { 1489 1489 pname = "galaxyline-nvim"; 1490 - version = "2021-01-31"; 1490 + version = "2021-02-04"; 1491 1491 src = fetchFromGitHub { 1492 1492 owner = "glepnir"; 1493 1493 repo = "galaxyline.nvim"; 1494 - rev = "fd3f069c6fb5eabc5dbad030b3c729bb0c6346ec"; 1495 - sha256 = "1wpx2wsq7fqabyv2cfgiqs835b6da0y1i4ajx1iyi727q39vm5qj"; 1494 + rev = "ee34f7fed7e2c8801a8c1a9101ab9392bc4e70a2"; 1495 + sha256 = "0lc94z24bpvfkyip76s4yprhfgprqhzviywhp2ds2dlm7xr6bwj5"; 1496 1496 }; 1497 1497 meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; 1498 1498 }; ··· 1547 1547 1548 1548 git-messenger-vim = buildVimPluginFrom2Nix { 1549 1549 pname = "git-messenger-vim"; 1550 - version = "2020-12-27"; 1550 + version = "2021-02-02"; 1551 1551 src = fetchFromGitHub { 1552 1552 owner = "rhysd"; 1553 1553 repo = "git-messenger.vim"; 1554 - rev = "a67de1d08cffa547183bbc2f95c4e29723504263"; 1555 - sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl"; 1554 + rev = "1a67c3426541c88e570096b1e6dc954eac0047fd"; 1555 + sha256 = "03gyic6qf59sl166sp9pw2rg73fxhghkm4cpfyyssm7npvlgckni"; 1556 1556 }; 1557 1557 meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; 1558 1558 }; ··· 1571 1571 1572 1572 gitsigns-nvim = buildVimPluginFrom2Nix { 1573 1573 pname = "gitsigns-nvim"; 1574 - version = "2021-01-31"; 1574 + version = "2021-02-02"; 1575 1575 src = fetchFromGitHub { 1576 1576 owner = "lewis6991"; 1577 1577 repo = "gitsigns.nvim"; 1578 - rev = "24f0bc9d4ebedad374be608c10cd9b08e079c338"; 1579 - sha256 = "0jb4kfz49a1q0lcc7kkg29y1mjga5i1iqglvb1jq9yrm1gvrk4yq"; 1578 + rev = "fe58abc2d82328d489ac1678d2ac99c4ad94321e"; 1579 + sha256 = "03sm5a9pis0m2qbqzl6x6zf6limr0pbzcxmdf7hk83q8zg2y91wb"; 1580 1580 }; 1581 1581 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; 1582 1582 }; ··· 1980 1980 1981 1981 julia-vim = buildVimPluginFrom2Nix { 1982 1982 pname = "julia-vim"; 1983 - version = "2021-01-07"; 1983 + version = "2021-02-03"; 1984 1984 src = fetchFromGitHub { 1985 1985 owner = "JuliaEditorSupport"; 1986 1986 repo = "julia-vim"; 1987 - rev = "ce48f42f1fd1d4566503ae26307026c895905a10"; 1988 - sha256 = "08yk47pvyh550iqv6zvrxcjdinn0w9p5al1v49m7p49jfqck3h1m"; 1987 + rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc"; 1988 + sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7"; 1989 1989 }; 1990 1990 meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; 1991 1991 }; ··· 2112 2112 2113 2113 lf-vim = buildVimPluginFrom2Nix { 2114 2114 pname = "lf-vim"; 2115 - version = "2020-11-19"; 2115 + version = "2021-02-04"; 2116 2116 src = fetchFromGitHub { 2117 2117 owner = "ptzz"; 2118 2118 repo = "lf.vim"; 2119 - rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; 2120 - sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; 2119 + rev = "018f28d495f58ba99c952df75926481e1b5667f4"; 2120 + sha256 = "058f3rjdwfl8p63l5bf7csixl0714dy2dbrbzwig8if4bxn3dkp9"; 2121 2121 }; 2122 2122 meta.homepage = "https://github.com/ptzz/lf.vim/"; 2123 2123 }; ··· 2232 2232 2233 2233 lspsaga-nvim = buildVimPluginFrom2Nix { 2234 2234 pname = "lspsaga-nvim"; 2235 - version = "2021-02-02"; 2235 + version = "2021-02-05"; 2236 2236 src = fetchFromGitHub { 2237 2237 owner = "glepnir"; 2238 2238 repo = "lspsaga.nvim"; 2239 - rev = "1a39791278d1ce53ffdbb9b455e5150d44b0b600"; 2240 - sha256 = "0x0kanhpb1q4bzwsvv0288rh1gqgbq1j9r8a2f9q22nlppqr1by0"; 2239 + rev = "f50c266b285aec9a2645f9f48f55db2de0ccef94"; 2240 + sha256 = "149jwbwhzxvh6mvbkbhkkwh3y5gzfh2r2jc3p00y2arhxsx478fa"; 2241 2241 }; 2242 2242 meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; 2243 2243 }; 2244 2244 2245 2245 lualine-nvim = buildVimPluginFrom2Nix { 2246 2246 pname = "lualine-nvim"; 2247 - version = "2021-01-31"; 2247 + version = "2021-02-05"; 2248 2248 src = fetchFromGitHub { 2249 2249 owner = "hoob3rt"; 2250 2250 repo = "lualine.nvim"; 2251 - rev = "8c09fc82283961169c37250f639117d729d038d5"; 2252 - sha256 = "0k6pfns8cfjzy0rckmp249kk644y0nk8rfk4163xx3mi4p46741p"; 2251 + rev = "66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac"; 2252 + sha256 = "0lcvxlxlr0inl93k5kvpphmacg6iprx9ym5jivmqnkvqsfzzv860"; 2253 2253 }; 2254 2254 meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; 2255 2255 }; ··· 2628 2628 2629 2629 neogit = buildVimPluginFrom2Nix { 2630 2630 pname = "neogit"; 2631 - version = "2021-02-02"; 2631 + version = "2021-02-05"; 2632 2632 src = fetchFromGitHub { 2633 2633 owner = "TimUntersberger"; 2634 2634 repo = "neogit"; 2635 - rev = "c3c3d2aa860f2b4acbdb334ce0777e3ec25259d9"; 2636 - sha256 = "1mxbpv9vv2mb0dgdyb97gw1c5nfjvzkbn7fkwvcvg996xhvap9cs"; 2635 + rev = "f3740d68852557b64da832969bc2302c10759eb7"; 2636 + sha256 = "1spgcvj25m5h6r4k6a41m233zl3wavj6yj84jpsjmg7xabw75c14"; 2637 2637 }; 2638 2638 meta.homepage = "https://github.com/TimUntersberger/neogit/"; 2639 2639 }; ··· 2880 2880 2881 2881 nvim-compe = buildVimPluginFrom2Nix { 2882 2882 pname = "nvim-compe"; 2883 - version = "2021-02-02"; 2883 + version = "2021-02-05"; 2884 2884 src = fetchFromGitHub { 2885 2885 owner = "hrsh7th"; 2886 2886 repo = "nvim-compe"; 2887 - rev = "f2573c9dd52be7e7ced176a6375766758cf646be"; 2888 - sha256 = "1c2xib3vqjc8z1z1v1b11iywimxrbawma3zn5kl5fzihnc67mxkd"; 2887 + rev = "b5e4239d19f6e5d69df724cb9a924a9b7cb1b739"; 2888 + sha256 = "1vn637x06ar3rnjgfwlsm7c59gfs4bia177x4gzj9kj4kl0aadcp"; 2889 2889 }; 2890 2890 meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; 2891 2891 }; ··· 2904 2904 2905 2905 nvim-dap = buildVimPluginFrom2Nix { 2906 2906 pname = "nvim-dap"; 2907 - version = "2021-01-26"; 2907 + version = "2021-02-02"; 2908 2908 src = fetchFromGitHub { 2909 2909 owner = "mfussenegger"; 2910 2910 repo = "nvim-dap"; 2911 - rev = "1461a3bacb22143e04039cf1a29024dad8876949"; 2912 - sha256 = "12ay8gjxp94v365an45a6bv034gnmdkirrvw0jvbpymky0pznmgj"; 2911 + rev = "c0245b577f09173d18a8931c36e7299f10eaf232"; 2912 + sha256 = "0gqa9kmb35vpididwv1ylk1ja8pcy4vxn30zfw1myc0jsxwknhlx"; 2913 2913 }; 2914 2914 meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; 2915 2915 }; ··· 2940 2940 2941 2941 nvim-highlite = buildVimPluginFrom2Nix { 2942 2942 pname = "nvim-highlite"; 2943 - version = "2021-01-26"; 2943 + version = "2021-02-04"; 2944 2944 src = fetchFromGitHub { 2945 2945 owner = "Iron-E"; 2946 2946 repo = "nvim-highlite"; 2947 - rev = "b0bca9edd3d4430f7a07387b72ea2ecaf370d808"; 2948 - sha256 = "1j0gfszx92m3v7wzaxfmxbi93qsnfc8zg4kvjnbvpwfgvyvbizgs"; 2947 + rev = "daa245b13b77b478b5b9f62e2e0bb79e65dcf5e8"; 2948 + sha256 = "19qibdkwzcqxkzzdc0bi2s1nf8rbzikkygs0yf41an5ll35xl528"; 2949 2949 }; 2950 2950 meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; 2951 2951 }; ··· 3000 3000 3001 3001 nvim-lspconfig = buildVimPluginFrom2Nix { 3002 3002 pname = "nvim-lspconfig"; 3003 - version = "2021-02-01"; 3003 + version = "2021-02-04"; 3004 3004 src = fetchFromGitHub { 3005 3005 owner = "neovim"; 3006 3006 repo = "nvim-lspconfig"; 3007 - rev = "0fb71129de54577254a3ae143850d11b6902a279"; 3008 - sha256 = "0w5q4xwa22smgvfmba0j2k1bzihvvmqhpdlnjaap0g0jp69vcq99"; 3007 + rev = "e0ee3364c02c5eb739ce7af5a13e8cc50aae8d3d"; 3008 + sha256 = "0kcdy6scrxb01rwajcimay7257n7xiwrl48pm24nlb3k2fzmsr9s"; 3009 3009 }; 3010 3010 meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; 3011 3011 }; 3012 3012 3013 3013 nvim-lsputils = buildVimPluginFrom2Nix { 3014 3014 pname = "nvim-lsputils"; 3015 - version = "2021-01-12"; 3015 + version = "2021-02-05"; 3016 3016 src = fetchFromGitHub { 3017 3017 owner = "RishabhRD"; 3018 3018 repo = "nvim-lsputils"; 3019 - rev = "fae88180b573e935f4a0827eb096208a7c76b215"; 3020 - sha256 = "1i7gmh3zb2i8jig0j6drvknsx5p4dxm1v8b6bdrnjgs4pyrpy7si"; 3019 + rev = "b68862afee6dfb611d866818cafdba41cf51d749"; 3020 + sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm"; 3021 3021 }; 3022 3022 meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; 3023 3023 }; ··· 3060 3060 3061 3061 nvim-treesitter = buildVimPluginFrom2Nix { 3062 3062 pname = "nvim-treesitter"; 3063 - version = "2021-02-01"; 3063 + version = "2021-02-04"; 3064 3064 src = fetchFromGitHub { 3065 3065 owner = "nvim-treesitter"; 3066 3066 repo = "nvim-treesitter"; 3067 - rev = "d3901e583389ef0c356203f056bad37ec81a888c"; 3068 - sha256 = "033w6x6yg4p6dfqs753vbwyl22aar24jn87ya9l07nm4wkm7w7d9"; 3067 + rev = "93854135974cec0bba9a6026b28c1ec84fe70a00"; 3068 + sha256 = "0681d0d17c7lz2nqlsbn8n8j1gkfbhzahg3f0qw5sg0f5likrx57"; 3069 3069 }; 3070 3070 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; 3071 3071 }; ··· 3108 3108 3109 3109 nvim-ts-rainbow = buildVimPluginFrom2Nix { 3110 3110 pname = "nvim-ts-rainbow"; 3111 - version = "2021-01-27"; 3111 + version = "2021-02-02"; 3112 3112 src = fetchFromGitHub { 3113 3113 owner = "p00f"; 3114 3114 repo = "nvim-ts-rainbow"; 3115 - rev = "adad3ea7eb820b7e0cc926438605e7637ee1f5e6"; 3116 - sha256 = "0vbd0a3kblbx28s2p7ljsalb1hymr2qjhjqgr03sg1a6hmxib1i0"; 3115 + rev = "d3532beb184b64696095f101678e737277df8d1e"; 3116 + sha256 = "12wxajgrzs3qjdjig55c56pa7va6sqnklq9hzi26z4k5isghbc3z"; 3117 3117 }; 3118 3118 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; 3119 3119 }; ··· 3240 3240 3241 3241 packer-nvim = buildVimPluginFrom2Nix { 3242 3242 pname = "packer-nvim"; 3243 - version = "2021-02-02"; 3243 + version = "2021-02-03"; 3244 3244 src = fetchFromGitHub { 3245 3245 owner = "wbthomason"; 3246 3246 repo = "packer.nvim"; 3247 - rev = "8262aa68acb1b3e95f96bc66d70e92578fd82a6d"; 3248 - sha256 = "1j0w71igl2icdmprl0krbv9ndda52dmmq9ijbz747x1g421d4rgn"; 3247 + rev = "c5b7f23e0b406767c1918d6888962fdb97f951e8"; 3248 + sha256 = "01w01543af4mbaa5hy5gfvbyz14sibf391dal987rn7zzjlsby7f"; 3249 3249 }; 3250 3250 meta.homepage = "https://github.com/wbthomason/packer.nvim/"; 3251 3251 }; ··· 3336 3336 3337 3337 plenary-nvim = buildVimPluginFrom2Nix { 3338 3338 pname = "plenary-nvim"; 3339 - version = "2021-01-31"; 3339 + version = "2021-02-03"; 3340 3340 src = fetchFromGitHub { 3341 3341 owner = "nvim-lua"; 3342 3342 repo = "plenary.nvim"; 3343 - rev = "54ce65bc00d36c112b449db829ee36da9778f347"; 3344 - sha256 = "1h1z8daqycscdp1p1bmix1ifsgs725flly1pijn575ri6fd44n41"; 3343 + rev = "a022a1b11c3a74a18df383894ddab58169c5ace0"; 3344 + sha256 = "0k395lm8azlyyrnnkjgyyidhf7s33alm5n2rffcpmygbh5i4665d"; 3345 3345 }; 3346 3346 meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; 3347 3347 }; ··· 3866 3866 3867 3867 sql-nvim = buildVimPluginFrom2Nix { 3868 3868 pname = "sql-nvim"; 3869 - version = "2021-02-01"; 3869 + version = "2021-02-02"; 3870 3870 src = fetchFromGitHub { 3871 3871 owner = "tami5"; 3872 3872 repo = "sql.nvim"; 3873 - rev = "b9fcca9444861b013c4de20f9e732f0bcd88a570"; 3874 - sha256 = "03kmxargbsyasimgq6mq5i6795gjbxxdj237gvzfx4vjgaifm55c"; 3873 + rev = "9e0303c615445d6699a8c775f38e0e0fc457a5c3"; 3874 + sha256 = "0z1awkvz6vl5zci4qzibfb6nkk1c56rg5d4rqrhm5l1dh31pwjy3"; 3875 3875 }; 3876 3876 meta.homepage = "https://github.com/tami5/sql.nvim/"; 3877 3877 }; ··· 4034 4034 4035 4035 tcomment_vim = buildVimPluginFrom2Nix { 4036 4036 pname = "tcomment_vim"; 4037 - version = "2020-11-18"; 4037 + version = "2021-02-03"; 4038 4038 src = fetchFromGitHub { 4039 4039 owner = "tomtom"; 4040 4040 repo = "tcomment_vim"; 4041 - rev = "2037d05870e10e03b2e157a09ae007c179efd253"; 4042 - sha256 = "1z7c95rzgpm1f2cdmx3yv3f0ai7kq0kx8wd6mp4aqpdysi1qh9jk"; 4041 + rev = "2de3885686e7011f7efe0e31c2b6e0c002f9dd1a"; 4042 + sha256 = "009x5bgj6grmwl35s0silkbnylpa5sjr4h0wyp6rl9xlj381vvn5"; 4043 4043 }; 4044 4044 meta.homepage = "https://github.com/tomtom/tcomment_vim/"; 4045 4045 }; 4046 4046 4047 4047 telescope-frecency-nvim = buildVimPluginFrom2Nix { 4048 4048 pname = "telescope-frecency-nvim"; 4049 - version = "2021-02-02"; 4049 + version = "2021-02-03"; 4050 4050 src = fetchFromGitHub { 4051 4051 owner = "nvim-telescope"; 4052 4052 repo = "telescope-frecency.nvim"; 4053 - rev = "93904dd90fd474e846d823901a1880e43e7177aa"; 4054 - sha256 = "189a5jlirgzvx7pgij6jil2kl0qhgg2kzl9sqn5ay98gcvcl6adk"; 4053 + rev = "a5803b6755b3499aeabecb90f834aa060a2a8835"; 4054 + sha256 = "1fwcfxw9v6962pbf79s5hn75jcbfmsy6nig2z3s7s746pkfkjw9j"; 4055 4055 }; 4056 4056 meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; 4057 4057 }; ··· 4083 4083 4084 4084 telescope-nvim = buildVimPluginFrom2Nix { 4085 4085 pname = "telescope-nvim"; 4086 - version = "2021-02-01"; 4086 + version = "2021-02-05"; 4087 4087 src = fetchFromGitHub { 4088 4088 owner = "nvim-telescope"; 4089 4089 repo = "telescope.nvim"; 4090 - rev = "9e76b1613a25cc6f63d17eb73432523924662619"; 4091 - sha256 = "1yr7a7z48nfm5c7mmblbpdp42kfyp14b2d1fg03pkb792dkcqk2a"; 4090 + rev = "5f1d16acf6716261bd52466733e096a49b9eadad"; 4091 + sha256 = "1ybn9c6lxry5gs7rhnziv5i8gm45w4yrnkbvpzf898h5y6ifs5l5"; 4092 4092 }; 4093 4093 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; 4094 4094 }; ··· 4588 4588 4589 4589 vim-airline = buildVimPluginFrom2Nix { 4590 4590 pname = "vim-airline"; 4591 - version = "2021-02-02"; 4591 + version = "2021-02-05"; 4592 4592 src = fetchFromGitHub { 4593 4593 owner = "vim-airline"; 4594 4594 repo = "vim-airline"; 4595 - rev = "bffa7a4d23addaedc64075b06c00f1cbb5dec667"; 4596 - sha256 = "0ghf7z6ras1jslirf9dxq8xxjksyaj6nlr0js385g5z8n9xv1chp"; 4595 + rev = "c01977d027de854c6a85ed5c57915a7e8848f4b9"; 4596 + sha256 = "0xvv1dymvgazs57phxbxljihz92zd4aa5yjqqf4g9xvl59vxc798"; 4597 4597 }; 4598 4598 meta.homepage = "https://github.com/vim-airline/vim-airline/"; 4599 4599 }; ··· 5356 5356 5357 5357 vim-erlang-tags = buildVimPluginFrom2Nix { 5358 5358 pname = "vim-erlang-tags"; 5359 - version = "2021-01-30"; 5359 + version = "2021-02-03"; 5360 5360 src = fetchFromGitHub { 5361 5361 owner = "vim-erlang"; 5362 5362 repo = "vim-erlang-tags"; 5363 - rev = "d9f2b8bd1f8478cce21084fde8b6b34f2564a54e"; 5364 - sha256 = "1w689p5ywf5ik074611ka5cd3iznmr87vpykp1y86k5628lcq2yh"; 5363 + rev = "125d494953da1746bc16cb716019a3d855fd3536"; 5364 + sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi"; 5365 5365 }; 5366 5366 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; 5367 5367 }; ··· 5488 5488 5489 5489 vim-floaterm = buildVimPluginFrom2Nix { 5490 5490 pname = "vim-floaterm"; 5491 - version = "2021-02-01"; 5491 + version = "2021-02-05"; 5492 5492 src = fetchFromGitHub { 5493 5493 owner = "voldikss"; 5494 5494 repo = "vim-floaterm"; 5495 - rev = "671f2aa87731ddeefe6573e4596c9f0d806e3b11"; 5496 - sha256 = "1lla4wb3jrp14hbcb03va7ikigy05rncw30wy9zsq93hm2zazbsj"; 5495 + rev = "2a47359fe7eca7655747ad871530a66f7fdd22f8"; 5496 + sha256 = "1769lf2xgy11cmyg8n46xb7d4qn8c9b2ygiibj7skdyx9m88y4fw"; 5497 5497 }; 5498 5498 meta.homepage = "https://github.com/voldikss/vim-floaterm/"; 5499 5499 }; ··· 5680 5680 5681 5681 vim-graphql = buildVimPluginFrom2Nix { 5682 5682 pname = "vim-graphql"; 5683 - version = "2020-12-20"; 5683 + version = "2021-02-03"; 5684 5684 src = fetchFromGitHub { 5685 5685 owner = "jparise"; 5686 5686 repo = "vim-graphql"; 5687 - rev = "c5169b2705f23cc4926606a7786d8e8fae138d5c"; 5688 - sha256 = "19nmdkbd4wcip18bb4inx64mc0awjj3bbahbhpsd8g6d889r9jha"; 5687 + rev = "553d125f7b0e56743e80e2439f5cd7f27771a8e3"; 5688 + sha256 = "0nfp411zxjda5k7mh9400rjipqg6liizdkfqcc887zicaw3pylkm"; 5689 5689 }; 5690 5690 meta.homepage = "https://github.com/jparise/vim-graphql/"; 5691 5691 }; ··· 5921 5921 5922 5922 vim-illuminate = buildVimPluginFrom2Nix { 5923 5923 pname = "vim-illuminate"; 5924 - version = "2021-02-01"; 5924 + version = "2021-02-05"; 5925 5925 src = fetchFromGitHub { 5926 5926 owner = "RRethy"; 5927 5927 repo = "vim-illuminate"; 5928 - rev = "17cdf0311271b017e66c66c56c253b63db3a20d0"; 5929 - sha256 = "1aivrwf7vhdsqcz4qbx3plqfw50myaphmidak1nb4zch1niqyypp"; 5928 + rev = "1ce3c4de54d2f0115129b50c4b056620953336f4"; 5929 + sha256 = "1g6lfxvs4nqlkyj0f7gd5f297r20cjxs6m6mza3bymivl9lwbj8p"; 5930 5930 }; 5931 5931 meta.homepage = "https://github.com/RRethy/vim-illuminate/"; 5932 5932 }; ··· 6294 6294 6295 6295 vim-lsc = buildVimPluginFrom2Nix { 6296 6296 pname = "vim-lsc"; 6297 - version = "2021-01-28"; 6297 + version = "2021-02-04"; 6298 6298 src = fetchFromGitHub { 6299 6299 owner = "natebosch"; 6300 6300 repo = "vim-lsc"; 6301 - rev = "53530bf2b53b8af7299aa6499ca30e74c90480ec"; 6302 - sha256 = "1464jk1mlmpz9chs5hc6nx718r981z7rc68fyxzksfsn3gmk5isq"; 6301 + rev = "25d625aa0274b4c9845afd49a5c8f21aceb25073"; 6302 + sha256 = "0pdmzv3rxdawxy4qy5p283nzrjs4lc0ki2j7xxiz5bhdgnznbkcc"; 6303 6303 }; 6304 6304 meta.homepage = "https://github.com/natebosch/vim-lsc/"; 6305 6305 }; ··· 7171 7171 7172 7172 vim-ruby = buildVimPluginFrom2Nix { 7173 7173 pname = "vim-ruby"; 7174 - version = "2020-08-28"; 7174 + version = "2021-02-03"; 7175 7175 src = fetchFromGitHub { 7176 7176 owner = "vim-ruby"; 7177 7177 repo = "vim-ruby"; 7178 - rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; 7179 - sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; 7178 + rev = "4788a08433c3c90e131fc7d110d82577e1234a86"; 7179 + sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw"; 7180 7180 }; 7181 7181 meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; 7182 7182 }; ··· 7916 7916 7917 7917 vim-vsnip = buildVimPluginFrom2Nix { 7918 7918 pname = "vim-vsnip"; 7919 - version = "2021-01-29"; 7919 + version = "2021-02-02"; 7920 7920 src = fetchFromGitHub { 7921 7921 owner = "hrsh7th"; 7922 7922 repo = "vim-vsnip"; 7923 - rev = "3e79f6333c045c39588293664cc77f89d18a62e8"; 7924 - sha256 = "053vp6mnj2daipfwy68168iadvng7w0xj1rg1mfsp83dws3x6g8y"; 7923 + rev = "cacfe408e58f9b2cbc6ecd0f1135ff4810e42889"; 7924 + sha256 = "0cfhrkmss1bzjgr30bn43wa1h4z1ylkh2ixxsdjbchhpqjmzfq1c"; 7925 7925 }; 7926 7926 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; 7927 7927 }; ··· 8193 8193 8194 8194 vimtex = buildVimPluginFrom2Nix { 8195 8195 pname = "vimtex"; 8196 - version = "2021-02-01"; 8196 + version = "2021-02-02"; 8197 8197 src = fetchFromGitHub { 8198 8198 owner = "lervag"; 8199 8199 repo = "vimtex"; 8200 - rev = "0bc7c9c5f8376978ea2667f9fb54c293921183cc"; 8201 - sha256 = "10k7265iwn7pr567g0kl159xwi7zjkjhal62c0n0d98akzdi4wbi"; 8200 + rev = "7a25a6b7f8c51eabe5d4d47951c73fde7d2ece72"; 8201 + sha256 = "0vqpj2jg0nmjra0icm90p2dwf6jx87qjvch6hmvxj0m3g8kjs1cl"; 8202 8202 }; 8203 8203 meta.homepage = "https://github.com/lervag/vimtex/"; 8204 8204 }; ··· 8241 8241 8242 8242 vista-vim = buildVimPluginFrom2Nix { 8243 8243 pname = "vista-vim"; 8244 - version = "2021-02-02"; 8244 + version = "2021-02-05"; 8245 8245 src = fetchFromGitHub { 8246 8246 owner = "liuchengxu"; 8247 8247 repo = "vista.vim"; 8248 - rev = "5e5f89f1c02579f1587475e0671cf0fe4b1bfeaf"; 8249 - sha256 = "11h27vm0gi4lxf68dwnsr86ch6f0kyglfzg5a0i6av9mlsw7fj9z"; 8248 + rev = "d5b19ed3db6fd3e9598b399d8a9977ff926ad24e"; 8249 + sha256 = "0idd04aj76f3in8h5ljgxqkf9rpv29cbg58j8wbm874hfy72mm2i"; 8250 8250 }; 8251 8251 meta.homepage = "https://github.com/liuchengxu/vista.vim/"; 8252 8252 };
+303 -243
pkgs/misc/vim-plugins/overrides.nix
··· 1 - { lib, stdenv 2 - , python, cmake, meson, vim, ruby 3 - , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch 4 - , llvmPackages, rustPlatform, buildGoModule 5 - , pkg-config, curl, openssl, libgit2, libiconv 6 - , xkb-switch, fzf, skim, stylish-haskell 7 - , python3, boost, icu, ncurses 8 - , ycmd, rake 9 - , gobject-introspection, glib, wrapGAppsHook 1 + { lib 2 + , stdenv 3 + , python 4 + , cmake 5 + , meson 6 + , vim 7 + , ruby 8 + , which 9 + , fetchFromGitHub 10 + , fetchgit 11 + , fetchurl 12 + , fetchzip 13 + , fetchpatch 14 + , llvmPackages 15 + , rustPlatform 16 + , buildGoModule 17 + , pkg-config 18 + , curl 19 + , openssl 20 + , libgit2 21 + , libiconv 22 + , xkb-switch 23 + , fzf 24 + , skim 25 + , stylish-haskell 26 + , python3 27 + , boost 28 + , icu 29 + , ncurses 30 + , ycmd 31 + , rake 32 + , gobject-introspection 33 + , glib 34 + , wrapGAppsHook 10 35 , substituteAll 11 36 , languagetool 12 37 , tabnine 13 - , Cocoa, CoreFoundation, CoreServices 38 + 39 + , Cocoa 40 + , CoreFoundation 41 + , CoreServices 42 + 14 43 , buildVimPluginFrom2Nix 15 44 , nodePackages 16 45 , dasht 17 46 , sqlite 18 47 , code-minimap 19 48 20 - # deoplete-khard dependency 49 + # deoplete-khard dependency 21 50 , khard 22 51 23 - # vim-go dependencies 24 - , asmfmt, delve, errcheck, godef, golint 25 - , gomodifytags, gotags, gotools, go-motion 26 - , gnused, reftools, gogetdoc, golangci-lint 27 - , impl, iferr, gocode, gocode-gomod, go-tools 52 + # vim-go dependencies 53 + , asmfmt 54 + , delve 55 + , errcheck 56 + , godef 57 + , golint 58 + , gomodifytags 59 + , gotags 60 + , gotools 61 + , go-motion 62 + , gnused 63 + , reftools 64 + , gogetdoc 65 + , golangci-lint 66 + , impl 67 + , iferr 68 + , gocode 69 + , gocode-gomod 70 + , go-tools 28 71 , gopls 29 72 30 - # direnv-vim dependencies 73 + # direnv-vim dependencies 31 74 , direnv 32 75 33 - # vCoolor dependency 76 + # vCoolor dependency 34 77 , gnome3 35 78 36 - # fruzzy dependency 79 + # fruzzy dependency 37 80 , nim 38 81 }: 39 82 ··· 61 104 src = skim.vim; 62 105 }; 63 106 64 - LanguageClient-neovim = let 65 - version = "0.1.160"; 66 - LanguageClient-neovim-src = fetchFromGitHub { 67 - owner = "autozimu"; 68 - repo = "LanguageClient-neovim"; 69 - rev = version; 70 - sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; 71 - }; 72 - LanguageClient-neovim-bin = rustPlatform.buildRustPackage { 73 - pname = "LanguageClient-neovim-bin"; 107 + LanguageClient-neovim = 108 + let 109 + version = "0.1.160"; 110 + LanguageClient-neovim-src = fetchFromGitHub { 111 + owner = "autozimu"; 112 + repo = "LanguageClient-neovim"; 113 + rev = version; 114 + sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; 115 + }; 116 + LanguageClient-neovim-bin = rustPlatform.buildRustPackage { 117 + pname = "LanguageClient-neovim-bin"; 118 + inherit version; 119 + src = LanguageClient-neovim-src; 120 + 121 + cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; 122 + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; 123 + 124 + # FIXME: Use impure version of CoreFoundation because of missing symbols. 125 + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" 126 + preConfigure = lib.optionalString stdenv.isDarwin '' 127 + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" 128 + ''; 129 + }; 130 + in 131 + buildVimPluginFrom2Nix { 132 + pname = "LanguageClient-neovim"; 74 133 inherit version; 75 134 src = LanguageClient-neovim-src; 76 135 77 - cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; 78 - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; 136 + propagatedBuildInputs = [ LanguageClient-neovim-bin ]; 79 137 80 - # FIXME: Use impure version of CoreFoundation because of missing symbols. 81 - # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" 82 - preConfigure = lib.optionalString stdenv.isDarwin '' 83 - export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" 138 + preFixup = '' 139 + substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ 140 + --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" 84 141 ''; 85 142 }; 86 - in buildVimPluginFrom2Nix { 87 - pname = "LanguageClient-neovim"; 88 - inherit version; 89 - src = LanguageClient-neovim-src; 90 - 91 - propagatedBuildInputs = [ LanguageClient-neovim-bin ]; 92 143 93 - preFixup = '' 94 - substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ 95 - --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" 96 - ''; 97 - }; 98 - 99 - clang_complete = super.clang_complete.overrideAttrs(old: { 144 + clang_complete = super.clang_complete.overrideAttrs (old: { 100 145 # In addition to the arguments you pass to your compiler, you also need to 101 146 # specify the path of the C++ std header (if you are using C++). 102 147 # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). ··· 111 156 ''; 112 157 }); 113 158 114 - direnv-vim = super.direnv-vim.overrideAttrs(oa: { 159 + direnv-vim = super.direnv-vim.overrideAttrs (oa: { 115 160 preFixup = oa.preFixup or "" + '' 116 161 substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ 117 162 --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ ··· 119 164 ''; 120 165 }); 121 166 122 - clighter8 = super.clighter8.overrideAttrs(old: { 167 + clighter8 = super.clighter8.overrideAttrs (old: { 123 168 preFixup = '' 124 169 sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ 125 170 -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim 126 171 ''; 127 172 }); 128 173 129 - command-t = super.command-t.overrideAttrs(old: { 174 + command-t = super.command-t.overrideAttrs (old: { 130 175 buildInputs = [ ruby rake ]; 131 176 buildPhase = '' 132 177 rake make ··· 134 179 ''; 135 180 }); 136 181 137 - cpsm = super.cpsm.overrideAttrs(old: { 182 + cpsm = super.cpsm.overrideAttrs (old: { 138 183 buildInputs = [ 139 184 python3 140 185 stdenv ··· 150 195 ''; 151 196 }); 152 197 153 - ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs(old: { 198 + ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { 154 199 buildInputs = [ python ]; 155 200 buildPhase = '' 156 201 patchShebangs . ··· 158 203 ''; 159 204 }); 160 205 161 - defx-nvim = super.defx-nvim.overrideAttrs(old: { 206 + defx-nvim = super.defx-nvim.overrideAttrs (old: { 162 207 dependencies = with super; [ nvim-yarp ]; 163 208 }); 164 209 165 - deoplete-fish = super.deoplete-fish.overrideAttrs(old: { 210 + deoplete-fish = super.deoplete-fish.overrideAttrs (old: { 166 211 dependencies = with super; [ deoplete-nvim vim-fish ]; 167 212 }); 168 213 169 - deoplete-go = super.deoplete-go.overrideAttrs(old: { 214 + deoplete-go = super.deoplete-go.overrideAttrs (old: { 170 215 buildInputs = [ python3 ]; 171 216 buildPhase = '' 172 217 pushd ./rplugin/python3/deoplete/ujson 173 218 python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build 174 219 popd 175 220 find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; 176 - ''; 221 + ''; 177 222 }); 178 223 179 - deoplete-khard = super.deoplete-khard.overrideAttrs(old: { 224 + deoplete-khard = super.deoplete-khard.overrideAttrs (old: { 180 225 dependencies = [ self.deoplete-nvim ]; 181 226 passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; 182 227 meta = { ··· 187 232 }; 188 233 }); 189 234 190 - ensime-vim = super.ensime-vim.overrideAttrs(old: { 235 + ensime-vim = super.ensime-vim.overrideAttrs (old: { 191 236 passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; 192 237 dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; 193 238 }); 194 239 195 - forms = super.forms.overrideAttrs(old: { 240 + forms = super.forms.overrideAttrs (old: { 196 241 dependencies = with super; [ super.self ]; 197 242 }); 198 243 199 - fruzzy = let # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix 200 - nimpy = fetchFromGitHub { 201 - owner = "yglukhov"; 202 - repo = "nimpy"; 203 - rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; 204 - sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; 205 - }; 206 - binaryheap = fetchFromGitHub { 207 - owner = "bluenote10"; 208 - repo = "nim-heap"; 209 - rev = "c38039309cb11391112571aa332df9c55f625b54"; 210 - sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; 211 - }; 212 - in super.fruzzy.overrideAttrs(old: { 213 - buildInputs = [ nim ]; 214 - patches = [ 215 - (substituteAll { 216 - src = ./patches/fruzzy/get_version.patch; 217 - version = old.version; 218 - }) 219 - ]; 220 - configurePhase = '' 221 - substituteInPlace Makefile \ 222 - --replace \ 223 - "nim c" \ 224 - "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" 225 - ''; 226 - buildPhase = '' 227 - make build 228 - ''; 229 - }); 244 + fruzzy = 245 + let 246 + # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix 247 + nimpy = fetchFromGitHub { 248 + owner = "yglukhov"; 249 + repo = "nimpy"; 250 + rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; 251 + sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; 252 + }; 253 + binaryheap = fetchFromGitHub { 254 + owner = "bluenote10"; 255 + repo = "nim-heap"; 256 + rev = "c38039309cb11391112571aa332df9c55f625b54"; 257 + sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; 258 + }; 259 + in 260 + super.fruzzy.overrideAttrs (old: { 261 + buildInputs = [ nim ]; 262 + patches = [ 263 + (substituteAll { 264 + src = ./patches/fruzzy/get_version.patch; 265 + version = old.version; 266 + }) 267 + ]; 268 + configurePhase = '' 269 + substituteInPlace Makefile \ 270 + --replace \ 271 + "nim c" \ 272 + "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" 273 + ''; 274 + buildPhase = '' 275 + make build 276 + ''; 277 + }); 230 278 231 - ghcid = super.ghcid.overrideAttrs(old: { 279 + ghcid = super.ghcid.overrideAttrs (old: { 232 280 configurePhase = "cd plugins/nvim"; 233 281 }); 234 282 235 - vimsence = super.vimsence.overrideAttrs(old: { 283 + vimsence = super.vimsence.overrideAttrs (old: { 236 284 meta = with lib; { 237 285 description = "Discord rich presence for Vim"; 238 286 homepage = "https://github.com/hugolgst/vimsence"; ··· 240 288 }; 241 289 }); 242 290 243 - vim-gist = super.vim-gist.overrideAttrs(old: { 291 + vim-gist = super.vim-gist.overrideAttrs (old: { 244 292 dependencies = with super; [ webapi-vim ]; 245 293 }); 246 294 247 - minimap-vim = super.minimap-vim.overrideAttrs(old: { 295 + minimap-vim = super.minimap-vim.overrideAttrs (old: { 248 296 preFixup = '' 249 297 substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ 250 298 --replace "code-minimap" "${code-minimap}/bin/code-minimap" ··· 259 307 meta.maintainers = with lib.maintainers; [ vcunat ]; 260 308 }; 261 309 262 - ncm2 = super.ncm2.overrideAttrs(old: { 310 + ncm2 = super.ncm2.overrideAttrs (old: { 263 311 dependencies = with super; [ nvim-yarp ]; 264 312 }); 265 313 266 - ncm2-jedi = super.ncm2-jedi.overrideAttrs(old: { 314 + ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: { 267 315 dependencies = with super; [ nvim-yarp ncm2 ]; 268 316 passthru.python3Dependencies = ps: with ps; [ jedi ]; 269 317 }); 270 318 271 - ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: { 319 + ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs (old: { 272 320 dependencies = with super; [ neoinclude-vim ]; 273 321 }); 274 322 275 - ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: { 323 + ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs (old: { 276 324 dependencies = with super; [ neosnippet-vim ]; 277 325 }); 278 326 279 - ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: { 327 + ncm2-syntax = super.ncm2-syntax.overrideAttrs (old: { 280 328 dependencies = with super; [ neco-syntax ]; 281 329 }); 282 330 283 - ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { 331 + ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: { 284 332 dependencies = with super; [ ultisnips ]; 285 333 }); 286 334 287 - nvim-lsputils = super.nvim-lsputils.overrideAttrs(old: { 335 + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { 288 336 dependencies = with super; [ popfix ]; 289 337 }); 290 338 291 - fzf-vim = super.fzf-vim.overrideAttrs(old: { 339 + fzf-vim = super.fzf-vim.overrideAttrs (old: { 292 340 dependencies = [ self.fzfWrapper ]; 293 341 }); 294 342 295 - skim-vim = super.skim-vim.overrideAttrs(old: { 343 + skim-vim = super.skim-vim.overrideAttrs (old: { 296 344 dependencies = [ self.skim ]; 297 345 }); 298 346 299 - sql-nvim = super.sql-nvim.overrideAttrs(old: { 347 + sql-nvim = super.sql-nvim.overrideAttrs (old: { 300 348 postPatch = '' 301 349 substituteInPlace lua/sql/defs.lua \ 302 350 --replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or" 303 351 ''; 304 - }); 352 + }); 305 353 306 - sved = let 307 - # we put the script in its own derivation to benefit the magic of wrapGAppsHook 308 - svedbackend = stdenv.mkDerivation { 309 - name = "svedbackend-${super.sved.name}"; 310 - inherit (super.sved) src; 311 - nativeBuildInputs = [ wrapGAppsHook ]; 312 - buildInputs = [ 313 - gobject-introspection 314 - glib 315 - (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) 316 - ]; 317 - preferLocalBuild = true; 318 - installPhase = '' 319 - install -Dt $out/bin ftplugin/evinceSync.py 320 - ''; 321 - }; 322 - in 323 - super.sved.overrideAttrs(old: { 354 + sved = 355 + let 356 + # we put the script in its own derivation to benefit the magic of wrapGAppsHook 357 + svedbackend = stdenv.mkDerivation { 358 + name = "svedbackend-${super.sved.name}"; 359 + inherit (super.sved) src; 360 + nativeBuildInputs = [ wrapGAppsHook ]; 361 + buildInputs = [ 362 + gobject-introspection 363 + glib 364 + (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) 365 + ]; 366 + preferLocalBuild = true; 367 + installPhase = '' 368 + install -Dt $out/bin ftplugin/evinceSync.py 369 + ''; 370 + }; 371 + in 372 + super.sved.overrideAttrs (old: { 324 373 preferLocalBuild = true; 325 374 postPatch = '' 326 375 rm ftplugin/evinceSync.py ··· 331 380 }; 332 381 }); 333 382 334 - vimacs = super.vimacs.overrideAttrs(old: { 383 + vimacs = super.vimacs.overrideAttrs (old: { 335 384 buildPhase = '' 336 385 substituteInPlace bin/vim \ 337 386 --replace '/usr/bin/vim' 'vim' \ ··· 347 396 }; 348 397 }); 349 398 350 - vimshell-vim = super.vimshell-vim.overrideAttrs(old: { 399 + vimshell-vim = super.vimshell-vim.overrideAttrs (old: { 351 400 dependencies = with super; [ vimproc-vim ]; 352 401 }); 353 402 354 - vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: { 403 + vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: { 355 404 buildInputs = lib.optional stdenv.isDarwin Cocoa; 356 405 }); 357 406 358 - vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: { 407 + vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: { 359 408 dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; 360 409 }); 361 410 362 - vim-addon-async = super.vim-addon-async.overrideAttrs(old: { 411 + vim-addon-async = super.vim-addon-async.overrideAttrs (old: { 363 412 dependencies = with super; [ vim-addon-signs ]; 364 413 }); 365 414 366 - vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs(old: { 415 + vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs (old: { 367 416 dependencies = with super; [ vim-addon-mw-utils ]; 368 417 }); 369 418 370 - vim-addon-completion = super.vim-addon-completion.overrideAttrs(old: { 419 + vim-addon-completion = super.vim-addon-completion.overrideAttrs (old: { 371 420 dependencies = with super; [ tlib_vim ]; 372 421 }); 373 422 374 - vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs(old: { 423 + vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs (old: { 375 424 dependencies = with super; [ tlib_vim ]; 376 425 }); 377 426 378 - vim-addon-mru = super.vim-addon-mru.overrideAttrs(old: { 427 + vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: { 379 428 dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; 380 429 }); 381 430 382 - vim-addon-nix = super.vim-addon-nix.overrideAttrs(old: { 431 + vim-addon-nix = super.vim-addon-nix.overrideAttrs (old: { 383 432 dependencies = with super; [ 384 433 vim-addon-completion 385 434 vim-addon-goto-thing-at-cursor 386 435 vim-addon-errorformats 387 436 vim-addon-actions 388 - vim-addon-mw-utils tlib_vim 437 + vim-addon-mw-utils 438 + tlib_vim 389 439 ]; 390 440 }); 391 441 392 - vim-addon-sql = super.vim-addon-sql.overrideAttrs(old: { 442 + vim-addon-sql = super.vim-addon-sql.overrideAttrs (old: { 393 443 dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; 394 444 }); 395 445 396 - vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs(old: { 446 + vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs (old: { 397 447 dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; 398 448 }); 399 449 400 - vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs(old: { 450 + vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs (old: { 401 451 dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; 402 452 }); 403 453 404 - vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs(old: { 454 + vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs (old: { 405 455 dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; 406 456 }); 407 457 408 - vim-bazel = super.vim-bazel.overrideAttrs(old: { 458 + vim-bazel = super.vim-bazel.overrideAttrs (old: { 409 459 dependencies = with super; [ vim-maktaba ]; 410 460 }); 411 461 412 - vim-beancount = super.vim-beancount.overrideAttrs(old: { 462 + vim-beancount = super.vim-beancount.overrideAttrs (old: { 413 463 passthru.python3Dependencies = ps: with ps; [ beancount ]; 414 464 }); 415 465 416 - vim-closer = super.vim-closer.overrideAttrs(old: { 466 + vim-closer = super.vim-closer.overrideAttrs (old: { 417 467 patches = [ 418 468 # Fix duplicate tag in doc 419 469 (fetchpatch { ··· 423 473 ]; 424 474 }); 425 475 426 - vim-codefmt = super.vim-codefmt.overrideAttrs(old: { 476 + vim-codefmt = super.vim-codefmt.overrideAttrs (old: { 427 477 dependencies = with super; [ vim-maktaba ]; 428 478 }); 429 479 430 - vim-dasht = super.vim-dasht.overrideAttrs(old: { 480 + vim-dasht = super.vim-dasht.overrideAttrs (old: { 431 481 preFixup = '' 432 482 substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ 433 483 --replace "['dasht']" "['${dasht}/bin/dasht']" 434 484 ''; 435 485 }); 436 486 437 - vim-easytags = super.vim-easytags.overrideAttrs(old: { 487 + vim-easytags = super.vim-easytags.overrideAttrs (old: { 438 488 dependencies = with super; [ vim-misc ]; 439 489 patches = [ 440 - (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags 490 + (fetchpatch { 491 + # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags 441 492 url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; 442 493 sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; 443 494 }) ··· 447 498 # change the go_bin_path to point to a path in the nix store. See the code in 448 499 # fatih/vim-go here 449 500 # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 450 - vim-go = super.vim-go.overrideAttrs(old: let 451 - binPath = lib.makeBinPath [ 452 - asmfmt 453 - delve 454 - errcheck 455 - go-motion 456 - go-tools 457 - gocode 458 - gocode-gomod 459 - godef 460 - gogetdoc 461 - golint 462 - golangci-lint 463 - gomodifytags 464 - gopls 465 - gotags 466 - gotools 467 - iferr 468 - impl 469 - reftools 470 - ]; 471 - in { 472 - postPatch = '' 473 - ${gnused}/bin/sed \ 474 - -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ 475 - -i autoload/go/config.vim 476 - ''; 477 - }); 501 + vim-go = super.vim-go.overrideAttrs (old: 502 + let 503 + binPath = lib.makeBinPath [ 504 + asmfmt 505 + delve 506 + errcheck 507 + go-motion 508 + go-tools 509 + gocode 510 + gocode-gomod 511 + godef 512 + gogetdoc 513 + golint 514 + golangci-lint 515 + gomodifytags 516 + gopls 517 + gotags 518 + gotools 519 + iferr 520 + impl 521 + reftools 522 + ]; 523 + in 524 + { 525 + postPatch = '' 526 + ${gnused}/bin/sed \ 527 + -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ 528 + -i autoload/go/config.vim 529 + ''; 530 + }); 478 531 479 - vim-grammarous = super.vim-grammarous.overrideAttrs(old: { 532 + vim-grammarous = super.vim-grammarous.overrideAttrs (old: { 480 533 # use `:GrammarousCheck` to initialize checking 481 534 # In neovim, you also want to use set 482 535 # let g:grammarous#show_first_error = 1 ··· 489 542 ]; 490 543 }); 491 544 492 - lens-vim = super.lens-vim.overrideAttrs(old: { 545 + lens-vim = super.lens-vim.overrideAttrs (old: { 493 546 # remove duplicate g:lens#animate in doc/lens.txt 494 547 # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 495 548 # https://github.com/camspiers/lens.vim/pull/40/files ··· 501 554 ]; 502 555 }); 503 556 504 - vim-hier = super.vim-hier.overrideAttrs(old: { 557 + vim-hier = super.vim-hier.overrideAttrs (old: { 505 558 buildInputs = [ vim ]; 506 559 }); 507 560 508 - vim-isort = super.vim-isort.overrideAttrs(old: { 561 + vim-isort = super.vim-isort.overrideAttrs (old: { 509 562 postPatch = '' 510 563 substituteInPlace ftplugin/python_vimisort.vim \ 511 564 --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' ··· 513 566 }); 514 567 515 568 vim-markdown-composer = 516 - let 517 - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { 518 - pname = "vim-markdown-composer-bin"; 519 - inherit (super.vim-markdown-composer) src version; 520 - cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; 521 - }; 522 - in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec { 523 - preFixup = '' 524 - substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ 525 - --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ 526 - "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" 527 - ''; 528 - }); 569 + let 570 + vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { 571 + pname = "vim-markdown-composer-bin"; 572 + inherit (super.vim-markdown-composer) src version; 573 + cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; 574 + }; 575 + in 576 + super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { 577 + preFixup = '' 578 + substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ 579 + --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ 580 + "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" 581 + ''; 582 + }); 529 583 530 - vim-metamath = super.vim-metamath.overrideAttrs(old: { 584 + vim-metamath = super.vim-metamath.overrideAttrs (old: { 531 585 preInstall = "cd vim"; 532 586 }); 533 587 534 - vim-snipmate = super.vim-snipmate.overrideAttrs(old: { 588 + vim-snipmate = super.vim-snipmate.overrideAttrs (old: { 535 589 dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; 536 590 }); 537 591 538 592 539 - vim-wakatime = super.vim-wakatime.overrideAttrs(old: { 593 + vim-wakatime = super.vim-wakatime.overrideAttrs (old: { 540 594 buildInputs = [ python ]; 541 595 }); 542 596 543 - vim-xdebug = super.vim-xdebug.overrideAttrs(old: { 597 + vim-xdebug = super.vim-xdebug.overrideAttrs (old: { 544 598 postInstall = false; 545 599 }); 546 600 547 - vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { 601 + vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: { 548 602 patchPhase = '' 549 603 substituteInPlace plugin/xkbswitch.vim \ 550 604 --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so ··· 552 606 buildInputs = [ xkb-switch ]; 553 607 }); 554 608 555 - vim-yapf = super.vim-yapf.overrideAttrs(old: { 609 + vim-yapf = super.vim-yapf.overrideAttrs (old: { 556 610 buildPhase = '' 557 611 substituteInPlace ftplugin/python_yapf.vim \ 558 612 --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' 559 613 ''; 560 614 }); 561 615 562 - vimproc-vim = super.vimproc-vim.overrideAttrs(old: { 616 + vimproc-vim = super.vimproc-vim.overrideAttrs (old: { 563 617 buildInputs = [ which ]; 564 618 565 619 buildPhase = '' ··· 571 625 ''; 572 626 }); 573 627 574 - YankRing-vim = super.YankRing-vim.overrideAttrs(old: { 628 + YankRing-vim = super.YankRing-vim.overrideAttrs (old: { 575 629 sourceRoot = "."; 576 630 }); 577 631 578 - YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: { 632 + YouCompleteMe = super.YouCompleteMe.overrideAttrs (old: { 579 633 buildPhase = '' 580 634 substituteInPlace plugin/youcompleteme.vim \ 581 635 --replace "'ycm_path_to_python_interpreter', '''" \ ··· 594 648 }; 595 649 }); 596 650 597 - jedi-vim = super.jedi-vim.overrideAttrs(old: { 651 + jedi-vim = super.jedi-vim.overrideAttrs (old: { 598 652 # checking for python3 support in vim would be neat, too, but nobody else seems to care 599 653 buildInputs = [ python3.pkgs.jedi ]; 600 654 meta = { ··· 603 657 }; 604 658 }); 605 659 606 - lf-vim = super.lf-vim.overrideAttrs(old: { 660 + lf-vim = super.lf-vim.overrideAttrs (old: { 607 661 dependencies = with super; [ bclose-vim ]; 608 662 }); 609 663 ··· 615 669 ''; 616 670 }); 617 671 618 - vCoolor-vim = super.vCoolor-vim.overrideAttrs(old: { 672 + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { 619 673 # on linux can use either Zenity or Yad. 620 674 propagatedBuildInputs = [ gnome3.zenity ]; 621 675 meta = { ··· 624 678 }; 625 679 }); 626 680 627 - unicode-vim = let 628 - unicode-data = fetchurl { 629 - url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; 630 - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; 631 - }; 632 - in super.unicode-vim.overrideAttrs(old: { 681 + unicode-vim = 682 + let 683 + unicode-data = fetchurl { 684 + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; 685 + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; 686 + }; 687 + in 688 + super.unicode-vim.overrideAttrs (old: { 633 689 634 690 # redirect to /dev/null else changes terminal color 635 691 buildPhase = '' ··· 637 693 echo "Building unicode cache" 638 694 ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null 639 695 ''; 640 - }); 696 + }); 641 697 642 - vim-hexokinase = super.vim-hexokinase.overrideAttrs(old: { 643 - preFixup = let 644 - hexokinase = buildGoModule { 645 - name = "hexokinase"; 646 - src = old.src + "/hexokinase"; 647 - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; 648 - }; 649 - in '' 650 - ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase 651 - ''; 698 + vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: { 699 + preFixup = 700 + let 701 + hexokinase = buildGoModule { 702 + name = "hexokinase"; 703 + src = old.src + "/hexokinase"; 704 + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; 705 + }; 706 + in 707 + '' 708 + ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase 709 + ''; 652 710 653 711 meta.platforms = lib.platforms.all; 654 712 }); 655 713 656 - vim-clap = super.vim-clap.overrideAttrs(old: { 657 - preFixup = let 658 - maple-bin = rustPlatform.buildRustPackage { 659 - name = "maple"; 660 - src = old.src; 714 + vim-clap = super.vim-clap.overrideAttrs (old: { 715 + preFixup = 716 + let 717 + maple-bin = rustPlatform.buildRustPackage { 718 + name = "maple"; 719 + src = old.src; 661 720 662 - nativeBuildInputs = [ 663 - pkg-config 664 - ]; 721 + nativeBuildInputs = [ 722 + pkg-config 723 + ]; 665 724 666 - buildInputs = [ 667 - openssl 668 - ] ++ lib.optionals stdenv.isDarwin [ 669 - CoreServices 670 - curl 671 - libgit2 672 - libiconv 673 - ]; 725 + buildInputs = [ 726 + openssl 727 + ] ++ lib.optionals stdenv.isDarwin [ 728 + CoreServices 729 + curl 730 + libgit2 731 + libiconv 732 + ]; 674 733 675 - cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; 676 - }; 677 - in '' 678 - ln -s ${maple-bin}/bin/maple $target/bin/maple 679 - ''; 734 + cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; 735 + }; 736 + in 737 + '' 738 + ln -s ${maple-bin}/bin/maple $target/bin/maple 739 + ''; 680 740 681 741 meta.platforms = lib.platforms.all; 682 742 }); 683 743 684 - completion-tabnine = super.completion-tabnine.overrideAttrs(old: { 744 + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { 685 745 buildInputs = [ tabnine ]; 686 746 687 747 postFixup = '' ··· 690 750 ''; 691 751 }); 692 752 693 - telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs(old: { 753 + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { 694 754 dependencies = [ self.sql-nvim ]; 695 755 }); 696 756
+12 -12
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 1 1 { 2 2 "4.14": { 3 3 "extra": "-hardened1", 4 - "name": "linux-hardened-4.14.217-hardened1.patch", 5 - "sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx", 6 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch" 4 + "name": "linux-hardened-4.14.219-hardened1.patch", 5 + "sha256": "0pgpb7phjgil01xbpwqdwyk8k3pv5qlikw4721cmy10aj97plpqw", 6 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.219-hardened1/linux-hardened-4.14.219-hardened1.patch" 7 7 }, 8 8 "4.19": { 9 9 "extra": "-hardened1", 10 - "name": "linux-hardened-4.19.172-hardened1.patch", 11 - "sha256": "0c64rmlfaxj3jfjl8q3fncwmxjmbn7184d0m3vavznrl7lcy50xa", 12 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.172-hardened1/linux-hardened-4.19.172-hardened1.patch" 10 + "name": "linux-hardened-4.19.173-hardened1.patch", 11 + "sha256": "19ikdwvp3mjh6cl2anhlpzmk1ha4lw1lf9rmvls7pzc7d1bmlwi0", 12 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.173-hardened1/linux-hardened-4.19.173-hardened1.patch" 13 13 }, 14 14 "5.10": { 15 15 "extra": "-hardened1", 16 - "name": "linux-hardened-5.10.12-hardened1.patch", 17 - "sha256": "03b6ndq4r7w1az0i8cahfm3pf3cn6a1rwra06lgdp9dk4naf4hby", 18 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.12-hardened1/linux-hardened-5.10.12-hardened1.patch" 16 + "name": "linux-hardened-5.10.13-hardened1.patch", 17 + "sha256": "1pn6ddkpairsij8p5130h8iwqq65v6ngn0c3pf6rlavy4az1sw82", 18 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.13-hardened1/linux-hardened-5.10.13-hardened1.patch" 19 19 }, 20 20 "5.4": { 21 21 "extra": "-hardened1", 22 - "name": "linux-hardened-5.4.94-hardened1.patch", 23 - "sha256": "08lzygjg7n9rx27r5gik360vfmaczpp14z01dc5r5hkmxkiaz8ww", 24 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.94-hardened1/linux-hardened-5.4.94-hardened1.patch" 22 + "name": "linux-hardened-5.4.95-hardened1.patch", 23 + "sha256": "04c54xk75gb4p4yfrmjam25jafqz47cqapr38jw2v1plwc98ng4m", 24 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.95-hardened1/linux-hardened-5.4.95-hardened1.patch" 25 25 } 26 26 }
+2 -2
pkgs/os-specific/linux/kernel/linux-4.14.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.14.218"; 6 + version = "4.14.219"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "0l2rcpccf71amngii7vs18x4x6gb0bwxdb2gszabip03bshqdzp3"; 16 + sha256 = "1p81p2g1dax225mbc704g1yl96i93nq19j9fpkrzr4f066kwmvkm"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.19.172"; 6 + version = "4.19.173"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "08hl7vw5r61gnzagnm8nbhlbm0h226crp4m19zh0qr2q0pmwqd2g"; 16 + sha256 = "0pqr8k0kfnaklb31y29xvqdmgn0pak4qd9pl77lsh6pkwqvd5zfj"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.4.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.4.254"; 4 + version = "4.4.255"; 5 5 extraMeta.branch = "4.4"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 9 - sha256 = "11wca1mprlcyk7r5h1c8rx3hr7l6mj4i85jaaf106s7wqcm8wamd"; 9 + sha256 = "0l45csywd30qrs8gwzjjijr5hwpd5s05rbyrxb37vck78znk0f1g"; 10 10 }; 11 11 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.9.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.9.254"; 4 + version = "4.9.255"; 5 5 extraMeta.branch = "4.9"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 9 - sha256 = "1djw5mlff73j7m1176qspdzhf6zyv4m0gkdvlxq4g4mdrbqfx6xn"; 9 + sha256 = "066101fzq5lr1pznw1hwlvsdgqpv8n7b2yi09qpv3xi0r41jvpxg"; 10 10 }; 11 11 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.10.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.10.12"; 6 + version = "5.10.13"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; 16 + sha256 = "1wp1vy9y50ncwlx5yqgya5gy0vdqgzn0icffg6dzmvjwwc68qs86"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.4.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.4.94"; 6 + version = "5.4.95"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "0f9bml584g6jb822j7xyxx9j2g3s49p08xz4bkx9lbiinxyzagf2"; 16 + sha256 = "0jfl2jwq9z6iymn6sfrdcf9w63nijdzf3ncxc77a5gs6yd2fa2h3"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
··· 6 6 , ... } @ args: 7 7 8 8 let 9 - version = "5.10.8-rt24"; # updated by ./update-rt.sh 9 + version = "5.10.12-rt26"; # updated by ./update-rt.sh 10 10 branch = lib.versions.majorMinor version; 11 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 12 in buildLinux (args // { ··· 18 18 19 19 src = fetchurl { 20 20 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; 21 - sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; 21 + sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; 22 22 }; 23 23 24 24 kernelPatches = let rt-patch = { 25 25 name = "rt"; 26 26 patch = fetchurl { 27 27 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 28 - sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30"; 28 + sha256 = "06sb7cj24v4kh7zghndpxv95pkihahc7653lxdw4wj9jhi58bs2k"; 29 29 }; 30 30 }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; 31 31
+58
pkgs/os-specific/linux/switcheroo-control/default.nix
··· 1 + { lib 2 + , ninja 3 + , meson 4 + , fetchFromGitLab 5 + , systemd 6 + , libgudev 7 + , pkg-config 8 + , glib 9 + , python3 10 + , gobject-introspection 11 + }: 12 + 13 + python3.pkgs.buildPythonApplication rec { 14 + pname = "switcheroo-control"; 15 + version = "2.3"; 16 + 17 + format = "other"; 18 + 19 + src = fetchFromGitLab { 20 + domain = "gitlab.freedesktop.org"; 21 + owner = "hadess"; 22 + repo = pname; 23 + rev = version; 24 + hash = "sha256-1Pze2TJ9mggfcpiLFwJ7/9WhsdJx4G3GoA7+Z47shuc="; 25 + }; 26 + 27 + nativeBuildInputs = [ 28 + ninja 29 + meson 30 + pkg-config 31 + 32 + # needed for glib-compile-resources 33 + glib 34 + ]; 35 + 36 + buildInputs = [ 37 + systemd 38 + libgudev 39 + ]; 40 + 41 + propagatedBuildInputs = [ 42 + python3.pkgs.pygobject3 43 + ]; 44 + 45 + mesonFlags = [ 46 + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" 47 + "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d" 48 + ]; 49 + 50 + meta = with lib; { 51 + description = "D-Bus service to check the availability of dual-GPU"; 52 + homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/"; 53 + changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS"; 54 + license = licenses.gpl3Plus; 55 + maintainers = [ ]; 56 + platforms = platforms.linux; 57 + }; 58 + }
+26
pkgs/servers/maddy/default.nix
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 + 3 + buildGoModule rec { 4 + pname = "maddy"; 5 + version = "0.4.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "foxcpp"; 9 + repo = "maddy"; 10 + rev = "v${version}"; 11 + sha256 = "1mi607hl4c9y9xxv5lywh9fvpybprlrgqa7617km9rssbgk4x1v7"; 12 + }; 13 + 14 + vendorSha256 = "16laf864789yiakvqs6dy3sgnnp2hcdbyzif492wcijqlir2swv7"; 15 + 16 + buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; 17 + 18 + subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; 19 + 20 + meta = with lib; { 21 + description = "Composable all-in-one mail server"; 22 + homepage = "https://foxcpp.dev/maddy"; 23 + license = licenses.gpl3Plus; 24 + maintainers = with maintainers; [ lxea ]; 25 + }; 26 + }
+2 -2
pkgs/tools/misc/microplane/default.nix
··· 2 2 3 3 buildGoPackage rec { 4 4 pname = "microplane"; 5 - version = "0.0.25"; 5 + version = "0.0.26"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Clever"; 9 9 repo = "microplane"; 10 10 rev = "v${version}"; 11 - sha256 = "0vynkv3d70q8d079kgdmwbavyyrjssqnd223dl1rikyy7sd5sli8"; 11 + sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm"; 12 12 }; 13 13 14 14 goPackagePath = "github.com/Clever/microplane";
+2 -2
pkgs/tools/misc/microplane/deps.nix
··· 194 194 fetch = { 195 195 type = "git"; 196 196 url = "https://go.googlesource.com/sync"; 197 - rev = "6e8e738ad208923de99951fe0b48239bfd864f28"; 198 - sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; 197 + rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be"; 198 + sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y"; 199 199 }; 200 200 } 201 201 {
+2 -2
pkgs/tools/misc/wlr-randr/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "wlr-randr"; 5 - version = "0.1.0"; 5 + version = "0.2.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "emersion"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; 11 + sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ meson ninja cmake pkg-config ];
+9 -1
pkgs/top-level/all-packages.nix
··· 1261 1261 1262 1262 fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; 1263 1263 1264 + flavours = callPackage ../applications/misc/flavours { }; 1265 + 1264 1266 flood = nodePackages.flood; 1265 1267 1266 1268 fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; ··· 8053 8055 8054 8056 subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; 8055 8057 8056 - sudo = if stdenv.isDarwin then darwin.sudo else callPackage ../tools/security/sudo { }; 8058 + sudo = callPackage ../tools/security/sudo { }; 8057 8059 8058 8060 suidChroot = callPackage ../tools/system/suid-chroot { }; 8059 8061 ··· 12973 12975 12974 12976 yaml2json = callPackage ../development/tools/yaml2json { }; 12975 12977 12978 + yams = callPackage ../applications/audio/yams { }; 12979 + 12976 12980 ycmd = callPackage ../development/tools/misc/ycmd { 12977 12981 inherit (darwin.apple_sdk.frameworks) Cocoa; 12978 12982 python = python3; ··· 18432 18436 18433 18437 storm = callPackage ../servers/computing/storm { }; 18434 18438 18439 + switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; 18440 + 18435 18441 slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; 18436 18442 18437 18443 slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; ··· 19520 19526 enableDmeventd = true; 19521 19527 enableCmdlib = true; 19522 19528 }; 19529 + 19530 + maddy = callPackage ../servers/maddy/default.nix { }; 19523 19531 19524 19532 mbelib = callPackage ../development/libraries/audio/mbelib { }; 19525 19533