diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4304a2797b79..ed6291b3d081 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13510,7 +13510,8 @@ name = "Nathan Viets"; }; nyanbinary = { - email = "vextium@skiff.com"; + email = "nyanbinary@keemail.me"; + matrix = "@niko:conduit.rs"; github = "nyabinary"; githubId = 97130632; name = "Niko"; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index e96743784e04..d69cf4587aab 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -236,6 +236,7 @@ in { serviceConfig = { User = cfg.user; + StateDirectory = mkIf (hasPrefix "/var/lib/jenkins" cfg.home) "jenkins"; }; }; }; diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 7b468e7067cc..3e1a212693b9 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -373,7 +373,6 @@ in serviceConfig = { Type = "oneshot"; - MemoryDenyWriteExecute = true; PrivateDevices = true; PrivateNetworks = true; ProtectControlGroups = true; diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index b9ebbfbd9a29..e13876172dac 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -196,7 +196,7 @@ in before = [ "sshd.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "simple"; + Type = "notify"; Restart = "always"; ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; UMask = "0027"; diff --git a/nixos/modules/services/networking/tinyproxy.nix b/nixos/modules/services/networking/tinyproxy.nix index 42d45c460c2e..8ff12b52f10c 100644 --- a/nixos/modules/services/networking/tinyproxy.nix +++ b/nixos/modules/services/networking/tinyproxy.nix @@ -85,7 +85,7 @@ in User = "tinyproxy"; Group = "tinyproxy"; Type = "simple"; - ExecStart = "${getExe pkgs.tinyproxy} -d -c ${configFile}"; + ExecStart = "${getExe cfg.package} -d -c ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; KillSignal = "SIGINT"; TimeoutStopSec = "30s"; diff --git a/nixos/tests/guix/basic.nix b/nixos/tests/guix/basic.nix index 7f90bdeeb1e0..9b943b8965e6 100644 --- a/nixos/tests/guix/basic.nix +++ b/nixos/tests/guix/basic.nix @@ -11,7 +11,10 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { config, ... }: { environment.etc."guix/scripts".source = ./scripts; - services.guix.enable = true; + services.guix = { + enable = true; + gc.enable = true; + }; }; testScript = '' @@ -19,6 +22,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("multi-user.target") machine.wait_for_unit("guix-daemon.service") + machine.succeed("systemctl start guix-gc.service") # Can't do much here since the environment has restricted network access. with subtest("Guix basic package management"): diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 63feb7a698ec..c6d5e250ddb8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-11-14"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced"; - sha256 = "1xmnzr1hccgdaadjc8i207bz44272ng5aaaypdacaag2pciapq3s"; + rev = "fc0a13f803653051801cfcf7acfd600ce44454a9"; + sha256 = "0csinl0z5jy0wnrl2rbg04kbblwb4kzsx0s6hd4n9iq9iz2k51z8"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -787,12 +787,12 @@ final: prev: asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-09-21"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3"; - sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l"; + rev = "851da4282ffb2ce3d5e4c2f70d2d09da7839d48f"; + sha256 = "12xm92dz599w0imd7flpvay4d73hfvj0hrnz90aq6xvfrry8mzpq"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-12-10"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "fb9b0500270ba05b89cc27cd8b7762443bcfae22"; - sha256 = "0acy9r36p6xh4xyh0p7a3sw3mmfih8bgixx3qb9ikq3sbmdqmnh3"; + rev = "8b407bb6175846cdc4c499e2a8d28109615a2089"; + sha256 = "1lxm759ig6qi4l1ffw5kdy1agfwv8c8r91gs9iilc2igj90lxwwj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2360,12 +2360,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-11-23"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "2c31989063b145830d5f0bea8ab529d2aef2427b"; - sha256 = "0icjjxgmi1v8jsidvh3lhnn04nkqpgfgr83mg2qa9603f1a34fqw"; + rev = "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f"; + sha256 = "0m6s01in8bkfviq7p0xq9x5ldgj826ixbnz4586bgg9pzkr0lz4q"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2576,12 +2576,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2023-11-28"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "8a6d66bd6162e9c49804e9286a7d4ceba60355d5"; - sha256 = "0ykxdjsffx1fz82ayl5mb0j1syqk3b6cjw7a6qcfcgh2w4dmijvm"; + rev = "7eec2b7ddf98b462de02f8ad521327a7736aaf28"; + sha256 = "13mi4a4gdnbxbdf0z5l7bz6p0danlwl7xf0m9knzlkagqwdd10cn"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3034,12 +3034,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2023-10-26"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "7200e64c589f899d29f8963aad7543856d1c2545"; - sha256 = "095jnw5wmphr7fp4n63sdjh787hlvhpz4baqcvcy7n90aiq3r3sq"; + rev = "084cb4a282b2cb51d1c1c76c377abe08d0649818"; + sha256 = "1fg9z7cqfanxrqplw9b1lfn5r4v84g5lpnqmignrbbz2dac8blyc"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-12-09"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "7dc62b9ce32ac0f21cfb510f243644ce28a39299"; - sha256 = "15llm2qy0bgsb0gbyk0p841182cyx3rxa3m3ij378av9kcmcr9kf"; + rev = "7b9c383438a2e490e37d57b07ddeae3ab4f4cf69"; + sha256 = "01pj57fhyac3bid8f66gs5g9b64v5jjzgpfnn3nb5scf0bchlzbk"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3649,12 +3649,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "46b5be64aa9e7b1cf7d9c29a0e80f7f9a2250007"; - sha256 = "070q3yh2cy210z36k5zycxnga83r1hdalg2y7sgmamc6yfyc7gz0"; + rev = "209e9405d2df949cbffe5b7b9329756b83bf2339"; + sha256 = "0pkqxkgbg7bwla627k89mx5p055760d1icqjkc701cgx6jnrafiy"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3817,12 +3817,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "6e05045fb1a4845fe44f5c54aafe024444c422ba"; - sha256 = "0wj7cbh9rf77zzzylnx6fahvs7ygnjmqpkm95vaixbg5v5f0hdwj"; + rev = "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9"; + sha256 = "0n1pdil0di93sfmlxnw80xvwxgz36m3hllhzg16bmlcjwgagwclp"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4057,12 +4057,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-11-19"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5"; - sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4"; + rev = "dbb0b135fa69017e455d48c65109c634a425f067"; + sha256 = "06hyrwnz1nvika14mpvblxdfwhcfhj54a6cazq7pxxl08dxm5wz0"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4092,12 +4092,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-12-10"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "488283589a6c12184099bfa0d6e1626399d7f3e0"; - sha256 = "0ab8b6qvpdjh2hmpnhp15rfah54kdj6aqx8bvd9rbgs1ir6vzk39"; + rev = "7168f8e133abf55d30772a7c3b6519c85fbeff33"; + sha256 = "15p1gvbvzlymhzas3ckm357ilfk43mlbkc11b1fwgxyizy1dmsyw"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4860,12 +4860,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2023-12-09"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f91c7386e310aacd0505c69b9e69318c9ed320e1"; - sha256 = "0bi082kyclyzxarlg82yizgv3ipgs705gxy5yli2806yg487ighj"; + rev = "e27bc4fd2e8c8282f91359ec0bbc3c686573d245"; + sha256 = "0ki14k4q52cjgd8g1kr187i836jbrjawfrz66y7sy0k83g6djn05"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5484,12 +5484,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-24"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "d61da5decc7768769314c121a3232b6eadc73f2d"; - sha256 = "1jsjshi8hwiyazpchhc5smsp2p9n7g54i7px4crc0gdnm3sxk5q0"; + rev = "e6059169795ebdc9256ad1d104860b2c1a229384"; + sha256 = "0gvfc0bdqnvknmzc1w9yvnd8dyn9jclqgrqg0wfdq3g027nfw8pk"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5556,12 +5556,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "c87d3b73d763d4222cdef19323e6a2c4bee33013"; - sha256 = "1dd5k3pbd8fnnb8smbfi2af3d21190w587slixljzym2vhkm3072"; + rev = "333d2d1090c80ac936b960469a6e93982cbaeb21"; + sha256 = "1r9s3c3m99r6xslwm4xi8zg908rhqh19xsmzw9jvyjhkgb7pn82l"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5592,12 +5592,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-12-07"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "aae9a1f7ea5c9e1ad8ae22d4841a336d9f3945bb"; - sha256 = "0cm9g5czzwfqj1km5vddknfhp1w5aab42w7jfxiandadpk09wrki"; + rev = "cefce2a0dc243645fe70096fa083e6d93575a0ce"; + sha256 = "132c76dhhj3g2f8v96mmmi1mz0qikcgwzp3i54ilhgq35jqaglnr"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6048,12 +6048,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "cebebcde2af56522249199f375513cc1d74430ac"; - sha256 = "0bmvisz5swgxzxh6hw986cmx5a5h63yzn7fx4mgf9cxnba9vpy7k"; + rev = "a2361d2c6caaecbe2565836f94e7945df22963ab"; + sha256 = "0vf9pz7mpc3kyh75xmbzxvnz8fvpw1ivx8nnd09bbwvqfnxd9d13"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6265,12 +6265,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-12-10"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "b9c002e5926c14d8627839756b1710b87bd70990"; - sha256 = "0v33jlzc363vblnn4f38fydry0lz7szk9akmq6p5iz4vjs0ypwj9"; + rev = "25c447f2597df5344c790ef3d85ff55e26c5339e"; + sha256 = "07vxlpgy7h12abgfrbvifck82x2g0l4vz1ylw6n0z2f1krdc9z7p"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6601,12 +6601,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-12-01"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "968ad52ee472e950d104303c4c0bfcd3de664fe1"; - sha256 = "0lqhi74fjvsflx642g04k2zf8i8dxfycmgd7hh0nkc6012b1ma3x"; + rev = "ba409c31b8d8ae9a36f560f38cfb6b718acfa6ea"; + sha256 = "166rxrh67w5wg4a06cxyyd2xhi6syvkm0rzjllx98yyznrlbdzp5"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -6853,12 +6853,12 @@ final: prev: nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; - version = "2022-12-20"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "e4399dbaf6eabff998d3d5f1cbcd8d9933710027"; - sha256 = "01pbr8z8fn16vsdlsxrhd83rbx41pah477xr6p01lnmsqzwg3k7f"; + rev = "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b"; + sha256 = "13rjzsw44151gk9zwl7gmmmdysb6hz1i5mcw1mprif41v0zrm3x5"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -7200,12 +7200,12 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-24"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "463b8190db2455d3bc764d234076b8b42e405c28"; - sha256 = "1v024pi0xanax2q3blmq7cz8cl1vnb7shpzk4agda823qxm9kc3i"; + rev = "d05bcf2b9766c2f5217eea50fa8b35cdc47aa3f3"; + sha256 = "0n2gpdyzx356ciraqgamfyy1kx0mszhjnn025jk0ah2q4hdgs9k4"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; @@ -7248,12 +7248,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "bd405e45c5fb122c16af8f87fa2dd7ab1981b243"; - sha256 = "1jfjy8j91b66i2kkzikkybl56b62ybj8kshxyjjwlvlz9vaqd06j"; + rev = "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9"; + sha256 = "1cf0vzdk2jmj63x7cg9p5m2lhi5ch7p8mrsidclx9h4qpf4vl0ns"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7536,12 +7536,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-11-07"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "e0eeac5480704cc3fdd5bdadd4901ca5409d7838"; - sha256 = "09nl8id8adhk8qz8jz7ygwx5dmh96237gkp6fw2qdhvv4x7w843j"; + rev = "c11e469cc1a6d099bcac7e15a7bfc0720b8e96b5"; + sha256 = "07jkw02vqipwhz0c3ybfmf6ld12dz5w4s54lvs7g87q6lmdzk41s"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7608,12 +7608,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-12-10"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b6b9ca448b7f236e2e60f8393a729902511f9db9"; - sha256 = "0q6zp43wm8370j6m75avq8xz92hmxa5aiww2y34ypzgdw91s1wxr"; + rev = "42381aae7c1f785e4658cdb34a750be9851ba9af"; + sha256 = "1kfa6677p277crw7h9g563b951jlcbqklxl48vja4cvpvn1l0qza"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7871,12 +7871,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-11-24"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1ce62d9a29b5eca2c63fb955359f5212e4d1bc7b"; - sha256 = "12yykcj8g1xrl7xlyvfb6jkqyxd17ixnfsrqym0y3lva01gs44zl"; + rev = "6825996fc73546f1df50dbf8a6b9ddc11c0f011d"; + sha256 = "0wxm76skvaxw1wz1gxwqhsk5yayp6icjrys434h1mcaamzkr7j72"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -7944,12 +7944,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-11-15"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea"; - sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g"; + rev = "4dd6d6b4f11a021c913532ad461b61af29b75fa9"; + sha256 = "164bqvcqkrpdai50np9lld7nppc9ba1qld94n0fsafj0y4c89fb5"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8535,11 +8535,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "cc5f3a00819b3bef2789f95443057613ed7c42f8"; - sha256 = "054ivgg3ybrbacyz0blcsj3idy5is040vmljm2w61r6v80rf6h69"; + rev = "cc1783ca5f1f9bfed18bfc051bb88e0e4faaf17a"; + sha256 = "174fx4ijyjczqb2lg6s1i3g4m4mvph02s7wfdk2jf0png7dg2mq4"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8786,12 +8786,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-12-10"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "0afbc229f179ed31d8379e5ace0f13d93cd34446"; - sha256 = "102f7p9szvz4ykr5h7icwsw3hf2r5vhb9zqsmzy0sjxnqwxcvimp"; + rev = "1e6d6c93cddaaf7b97a5c22771b2a4bf877eeea8"; + sha256 = "0qbsirbjvbyhl08ij23lyangixrr8im7pxp9vcalri75vnsc0r73"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9027,12 +9027,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-12-02"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "c970c7a3cc7ba635fd73d43c81b40f04c00f5058"; - sha256 = "0ri4b6q4qqy1cwyhknysnldbrg2yx4cfi2ddgvnn6snq8jhkmjbw"; + rev = "f0003bf9c3f11b8b9209264f865b8864453ca926"; + sha256 = "08wfsxz6a6lzd2brnr2z8zanfnkik494ggq6my6nn9npbalkgdr0"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9316,12 +9316,12 @@ final: prev: stan-vim = buildVimPlugin { pname = "stan-vim"; - version = "2023-12-09"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "eigenfoo"; repo = "stan-vim"; - rev = "10b80f31f50622f3e18d18401894cbff7ad67e2c"; - sha256 = "11l0d10vkm93g6v1clvblp45hbrdigxf7azh8jm6p285wvjjjrwb"; + rev = "d14f7f5f96e802c48bd2b6e087cf7956054d9f38"; + sha256 = "0dvszn4d9xia3qxr3f8l43m1iqfjwl12s4k6igzj2mq4kdq132f0"; }; meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; @@ -9350,6 +9350,18 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + startup-nvim = buildVimPlugin { + pname = "startup.nvim"; + version = "2023-11-02"; + src = fetchFromGitHub { + owner = "startup-nvim"; + repo = "startup.nvim"; + rev = "088de9f5af8a10dfc39f8e397e3e9646940c7323"; + sha256 = "09hhl8l2b4q53i2scig6rx3zq7mcsa6f5za0ahmn3s9vh9862iqz"; + }; + meta.homepage = "https://github.com/startup-nvim/startup.nvim/"; + }; + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; version = "2023-12-10"; @@ -9509,12 +9521,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2023-09-21"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "9e537762cbb7647357eab22c61c7c5dda00138dd"; - sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb"; + rev = "f283ca1e8c1827b657d87865e97bfe2199432c90"; + sha256 = "1mns6mxwp9s4bzr5p1c9ck89azj4b3ilcmgr23ba8d8nmw2s71k2"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -9678,12 +9690,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-10-12"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962"; - sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l"; + rev = "8c2b3889eb31009ae510a43384d1957b37654176"; + sha256 = "1isbz68lbdm50x9mid0l1jid8q11msfsaayw8ravac0z5ybdb8k3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -10222,12 +10234,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-12-06"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "cbd041d91b90cd3c02df03fe6133208888f8e008"; - sha256 = "004sa4y23y3aa48fkmyj2z20s6gsl735kpw9yjbh7nyqnp1jk45w"; + rev = "91be5f327e42aa016da13b277540de8dba0b14e3"; + sha256 = "08pvns6275c1vjgnppcvz8jl0irqgwwf9135ck07fxxl1x2h3yw5"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -10402,12 +10414,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-12-10"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "d905047f8a173dae8d86bc3ab83b54b2da56845b"; - sha256 = "1rxpj90q1xck6rnmmzl2klssaiykllpf6r3ckvbhg7abms1i0zcf"; + rev = "308e7737d09de8c1100320ddc6bc270615ae791a"; + sha256 = "076ylgny48bl5iajw0hh3bqwlchj9pygq2bf3y0qlwckrzq05nbn"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10450,12 +10462,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-12-09"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "edd9ab2adfad86169e532208d31030be677ec692"; - sha256 = "07fi49wwzmfzzwq00vb6npxznp6cfnm436w8hks3smwnbhxpn69h"; + rev = "37ca00c65e9ba2f5adfe87780efda8071d894fae"; + sha256 = "07prqlwjlxix80ji537giam6w70699rgn5xslig5ivrmsldr42s7"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12346,11 +12358,11 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-09-11"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "6089a44e89e76f9eba138fb68bfd132420404ff7"; + rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1"; sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; @@ -12900,12 +12912,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-12-08"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "ee884dc7d45251d92f5972c4556c12fc101419c0"; - sha256 = "1lxb62wscfn50kpikz39q6fmywn8xdy46yc1ll5chmllrg48w8kq"; + rev = "a9761618b04ee1bf22005661cc8f598398d7b8d9"; + sha256 = "0hyqqk87fijraknkwwx9wzlvb6lpmn0wzrfzfb3j7as7rzbrb8gp"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13128,12 +13140,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-11-25"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3af8f3b38effc4a631a15bb283a4b701c251275d"; - sha256 = "1qca60s39q0w7l4zhj63jarh26dkqik8pw8ncwlbkinvfv5h3dbi"; + rev = "dd862d343029d869e5d6bc9fdc89d258f5270a1d"; + sha256 = "04n6hjgg4lsgazyz4s0w4ww8xy25plsmlvbpg86mg9q8si0p6k7z"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13273,12 +13285,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2022-08-29"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "7ec05df27b4922830ace2246de36ac7e53bea1db"; - sha256 = "1806c3g07gbggj5xv30v78c6czarl5v11aa2rxb7igizfsn13vwv"; + rev = "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd"; + sha256 = "0ggdbvv4mca4z0xhkdybimc4yy3bah1v21660wjs8n2v4f5rvslx"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14581,12 +14593,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-11-29"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ec4ff7e9c9b274e93295924e59c82b4f51e2ae42"; - sha256 = "04gsma772cf6rxig2b3d37pvmv3y7sg7qjczkr5fjahsxafr4rpg"; + rev = "a8dc763b3f534ec1a0c0ae5082689c10dcaf9d5f"; + sha256 = "1qavvd6hx4r898dpn70h805crgx8s2n9ldrd17z7ir6zp6c6gp0m"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -15482,12 +15494,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2022-01-31"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3"; - sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd"; + rev = "31dd31c96fc03fb158e1f40f72f3661ef5a9152d"; + sha256 = "0wph29fkp5hcziy3ym9854dds9lrm0g7w4b98bx1ks05lgx6wxzq"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -15925,6 +15937,18 @@ final: prev: meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; + yanky-nvim = buildVimPlugin { + pname = "yanky.nvim"; + version = "2023-11-27"; + src = fetchFromGitHub { + owner = "gbprod"; + repo = "yanky.nvim"; + rev = "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f"; + sha256 = "01pd9xgw9wh9xa4sk80g0n61ra4l9xvssqak6vv03kgrpyb1qizw"; + }; + meta.homepage = "https://github.com/gbprod/yanky.nvim/"; + }; + yats-vim = buildVimPlugin { pname = "yats.vim"; version = "2023-08-24"; @@ -16132,12 +16156,12 @@ final: prev: harpoon2 = buildVimPlugin { pname = "harpoon2"; - version = "2023-12-11"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "bb806acff3ceaec3b94bd3c92bc52945040004bf"; - sha256 = "1vfcp18s3pkfdhq5riw6fdwhyjb3q6m2kglp3wyganv8qrh7w1sh"; + rev = "8f67088e9d479397347b63e69920ee861a9838cd"; + sha256 = "0j5m4hm3fzkfwf1mjy3mq9askf3jkb9d5bfy8v50k2z4l9imbvz1"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 90c3b77dc5c7..8d1ed1981eb6 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -803,12 +803,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=f41a273"; + version = "0.0.0+rev=af4270a"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "f41a27386f1cfa1271122db5f0ff59b910520007"; - hash = "sha256-U/kpBEgUqJzJ3qQ40TMBuM1UKI9+HxnFEmmN8FfvS5w="; + rev = "af4270aed18500af1d24e6de5f6e7d243e2c8b05"; + hash = "sha256-H4IrEXdGGa0GQEMcteKgIBl+bkAoOy64Om2uc6Aany0="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -902,12 +902,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=ca10c43"; + version = "0.0.0+rev=d70b321"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "ca10c43a4c9bfe588c480d2941726c2fadcae699"; - hash = "sha256-HyS9Q6+WSUgyQ9mL5sZvQ4CHW+3MypT2U9b1X5NnMHc="; + rev = "d70b321b8b702939d722c2c15f4c28d14e91a400"; + hash = "sha256-CJ6xwEUhh/rGr07edmx99nY4eHdBdsysaOzmuKM6SDE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -979,12 +979,12 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=1d5df35"; + version = "0.0.0+rev=0135187"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"; - hash = "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U="; + rev = "0135187126370cbf112d759a50eab4a5c913a827"; + hash = "sha256-9FHCBaHQ/iXL3asJ3OZD9Gc02kPtWPNlPyRXiaEhkMU="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; @@ -1455,12 +1455,12 @@ }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=1f9308c"; + version = "0.0.0+rev=d41fd3e"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281"; - hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc="; + rev = "d41fd3e4c1f83a0e6429c2d035209e107e80e6f8"; + hash = "sha256-2OqwU10JW7l87v2QXtBn5znP8Ptq9GZ/1PNAQOXJPVA="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -2087,12 +2087,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=11526ab"; + version = "0.0.0+rev=ac07aa2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "11526ab1a2514c7302f3c4af60b0ebc992cee086"; - hash = "sha256-iDj2H1ScR478eE/ppxIDiLOx1Bb8e2KsWcWrKhlHACM="; + rev = "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"; + hash = "sha256-wWCXk7HnORmD1M761rv31yvPGLGynUyNYzrhZDNwzFs="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2188,12 +2188,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=1b7d451"; + version = "0.0.0+rev=b599f6a"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "1b7d451554f435d28c3217724acf00cdc627ee73"; - hash = "sha256-d/nAvvvfTg91pKfN3iHvqD+wb/2Qk/OSl7MOq3n+yH4="; + rev = "b599f6a1ca37cb5bae827a424cd98371a0d91bdc"; + hash = "sha256-GwDkAgWcMyASzfd8layZjjEigXelJbtQTgWe7VBLgwM="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2558,12 +2558,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=ce3481c"; + version = "0.0.0+rev=fdd1374"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "ce3481c10eabed0ba36cfa9f72957c4d3f88689d"; - hash = "sha256-Ro+Ft82dgfrFKZJI5GO+aLZS2qwgEh1pJMI9S6Z/8rU="; + rev = "fdd137445c50d73767548c1b2386e5f560d5d042"; + hash = "sha256-LjO0gRuvu8i4JZ71KKJVdEb5xvE56JP+5wL9Hua/eRg="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2658,12 +2658,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=55f5626"; + version = "0.0.0+rev=693ee4b"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "55f5626617726954a1a95aa93e363a6a04913fa1"; - hash = "sha256-vcSD1Dz4HUTaU3LtRfqRtryGHvuA7aSu5poLyD6UyLw="; + rev = "693ee4b3a995a9c305479b32c10e0a87013ff125"; + hash = "sha256-WgCeDShSDUJRSY3LcX8zT+JlJIxHwLhD7lKDIBLoIfc="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a1b66edbe294..f034ac4bae1c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1113,6 +1113,10 @@ self: super: { dependencies = with self; [ nvim-treesitter ]; }; + startup-nvim = super.startup-nvim.overrideAttrs { + dependencies = with super; [ plenary-nvim ]; + }; + statix = buildVimPlugin rec { inherit (statix) pname src meta; version = "0.1.0"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 924a5b8c363f..7f9a677b583c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -785,6 +785,7 @@ https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, +https://github.com/startup-nvim/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, @@ -1341,6 +1342,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,HEAD, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, +https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 41dd4cbb08b9..cc826faf11f1 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.0"; + version = "7.5.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LWfS722V0ubh4QaUNuGwrvFsVAzA9Hd5xLlDfTG0PBs="; + sha256 = "sha256-rgqs7L0V4OFOfHZw6poS/DxcCgxmcKZAc3TAal7B8FA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix deleted file mode 100644 index 8debefa0c11c..000000000000 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, libGL, xcbutilkeysyms, xdg-utils, libtool }: - -let - version = "4.30.5.1682"; - - rpath = lib.makeLibraryPath [ - xdg-utils - xorg.libXext - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXrandr - xorg.libXdamage - xorg.libXrender - xorg.libXfixes - xorg.libXcomposite - xorg.libXcursor - xorg.libxcb - xorg.libXi - xorg.libXScrnSaver - xorg.libXtst - freetype - fontconfig - openssl - glib - nss - nspr - dbus - alsa-lib - zlib - libtool - libxml2 - libxslt - expat - xcbutilkeysyms - systemd - libGL - ] + ":${stdenv.cc.cc.lib}/lib64"; -in stdenv.mkDerivation { - pname = "hipchat"; - inherit version; - - src = fetchurl { - url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - ar x $src - tar xfvz data.tar.gz - - mkdir -p $out/libexec/hipchat - d=$out/libexec/hipchat/lib - mv opt/HipChat4/* $out/libexec/hipchat/ - mv usr/share $out - - for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true - patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true - done - - patchShebangs $d/linuxbrowserlaunch.sh - - substituteInPlace $out/share/applications/hipchat4.desktop \ - --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat - - makeWrapper $d/HipChat.bin $out/bin/hipchat \ - --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \ - --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \ - --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ - --set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess - - makeWrapper $d/QtWebEngineProcess.bin $d/QtWebEngineProcess \ - --set QT_PLUGIN_PATH "$d/plugins" - ''; - - meta = with lib; { - description = "Desktop client for HipChat services"; - homepage = "http://www.hipchat.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ puffnfresh ]; - }; -} diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 3ef6218c3f0f..26fb3a24c50e 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.30"; + version = "0.0.32"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-H5kFgLHw1UXJksrlDO/Owhm/O3+vpohl4h6XYokNWPA="; + hash = "sha256-lMqtXST7IuSfdiVl3bkKOhWhigFCulg9/r4jf5bTfXo="; }; - cargoHash = "sha256-FACRG25ORnSu4pPpn5ibUqtkylWiNBV88Pabqc81Gvg="; + cargoHash = "sha256-i+pS6eChSZBOqGXUJIqcOpDfOkrYNHqXV14lM0hZUdE="; nativeBuildInputs = [ ncurses diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 6f724f183c2d..52a4cdcba2aa 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.2-0"; + version = "1.21.2-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-kH4m958gmIYpIwYmT2kIj9FcfXdyh8no06E0WQII/6E="; + hash = "sha256-2dkl8QI82URhPV2f4cOUZfpAhlGwU197ZkLD9KitIiA="; }; vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8="; diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index f7a9bd836745..7c9bbc4cfadf 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.12.3-1"; + version = "1.12.5-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-F2y5daIdNJZGNjOctN9iA6kHSRVSMWK8s80X+kXxzb4="; + hash = "sha256-oaQvJQVHXm7I+3rjt0DPMwGOXLhwgJP6wWu2bhaA1s4="; }; unpackPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index bffc27bd1eac..20de5d88fd33 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -14,7 +14,13 @@ buildLua { }; meta = { + description = "Automatically skips chapters based on title"; + longDescription = '' + MPV script that skips chapters based on their title, categorized using regexes. + The set of skipped categories can be configured globally, or by an auto-profile. + ''; homepage = "https://github.com/po5/chapterskip"; + license = lib.licenses.unfree; # https://github.com/po5/chapterskip/issues/10 maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix new file mode 100644 index 000000000000..6589caeb6896 --- /dev/null +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "french-numbers"; + version = "1.2.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI="; + }; + + cargoHash = "sha256-YmG+4837j7g3iK/nsP2P+WVcOqaPxKiS0jhcxkpEGXw="; + + cargoBuildFlags = [ "--features=cli" ]; + + meta = with lib; { + description = "Represent numbers in French language"; + homepage = "https://github.com/evenfurther/french-numbers"; + license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "french-numbers"; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 4b78fa9b9ce3..8544439986dd 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -5,12 +5,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "warp-terminal"; - version = "0.2023.11.07.08.02.stable_00"; + version = "0.2023.12.05.08.02.stable_00"; src = fetchurl { url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg"; - hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis="; + hash = "sha256-9olAmczIPRXV15NYCOYmwuEmJ7lMeaQRTTfukaYXMR0="; }; + sourceRoot = "."; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index e66b4940ff03..61bf45dd54ac 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -27,12 +27,29 @@ lib.makeScope newScope (self: { "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; meta.description = synopsis; meta.license = (lib.licenses // { + "agpl" = lib.licenses.agpl3Only; + "artistic" = lib.licenses.artistic2; + "bsd" = lib.licenses.bsd3; "bsd-1-clause" = lib.licenses.bsd1; "bsd-2-clause" = lib.licenses.bsd2; "bsd-3-clause" = lib.licenses.bsd3; + "gpl" = lib.licenses.gpl3Only; + "gpl-2" = lib.licenses.gpl2Only; + "gplv2" = lib.licenses.gpl2Only; + "gpl-3" = lib.licenses.gpl3Only; + "gpl-3.0" = lib.licenses.gpl3Only; + "gplv3" = lib.licenses.gpl3Only; + "lgpl" = lib.licenses.lgpl3Only; + "lgpl-2" = lib.licenses.lgpl2Only; "lgpl-2.0+" = lib.licenses.lgpl2Plus; + "lgpl-2.1" = lib.licenses.lgpl21Only; "lgpl-2.1-or-later" = lib.licenses.lgpl21Plus; + "lgpl-3" = lib.licenses.lgpl3Only; + "lgplv3" = lib.licenses.lgpl3Only; "public-domain" = lib.licenses.publicDomain; + "srfi" = lib.licenses.bsd3; + "unicode" = lib.licenses.ucd; + "zlib-acknowledgement" = lib.licenses.zlib; }).${license} or license; }) (lib.importTOML ./deps.toml)))); diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index 57070493eb6d..de216c24bb67 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -258,7 +258,7 @@ backendStdenv.mkDerivation rec { rm $out/host-linux-x64/libstdc++.so* ''} ${ - lib.optionalString (lib.versionAtLeast version "11.8") + lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "12") # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so # we only ship libtiff.so.6, so let's use qt plugins built by Nix. # TODO: don't copy, come up with a symlink-based "merge" @@ -266,6 +266,21 @@ backendStdenv.mkDerivation rec { rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP '' } + ${ + lib.optionalString (lib.versionAtLeast version "12") + # Use Qt plugins built by Nix. + '' + for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do + qtdir=$(basename $(dirname $qtlib)) + filename=$(basename $qtlib) + for qtpkgdir in ${lib.concatMapStringsSep " " (x: qt6Packages.${x}) ["qtbase" "qtimageformats" "qtsvg" "qtwayland"]}; do + if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then + ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib + fi + done + done + '' + } rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -336,6 +351,20 @@ backendStdenv.mkDerivation rec { wrapProgram "$out/bin/$b" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" done + ${ + lib.optionalString (lib.versionAtLeast version "12") + # Check we don't have any lurking vendored qt libraries that weren't + # replaced during installPhase + '' + qtlibfiles=$(find $out -name "libq*.so" -type f) + if [ ! -z "$qtlibfiles" ]; then + echo "Found unexpected vendored Qt library files in $out" >&2 + echo $qtlibfiles >&2 + echo "These should be replaced with symlinks in installPhase" >&2 + exit 1 + fi + '' + } ''; # cuda-gdb doesn't run correctly when not using sandboxing, so diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 631bfa72b51a..bcdd9274d091 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilds = true; passthru.tests = { - inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib; inherit arrow-cpp; }; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 77a14c44b7cb..e50f187c012d 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.1"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pZohueZvEIGgY6isci2mGGBewfi9SwnHHy8OwyJGR0w="; + hash = "sha256-UVYLyRVLRdt38obSLkSsQdroO95lwpwzerw+gYBIJ7w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index 67b43fdff3fb..7d0a53e033bc 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , pysimplesoap -, pytestCheckHook -, pytest-xdist , pythonOlder , setuptools }: diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 3280cc76803e..3056659cacbf 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "yte"; - version = "1.5.1"; - format = "pyproject"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "koesterlab"; - repo = pname; + repo = "yte"; rev = "refs/tags/v${version}"; - hash = "sha256-7erT5UpejPMIoyqhpYNEON3YWE2l5SdP2olOVpkbNkY="; + hash = "sha256-Rm3EKxRZCdYErkyWK9+fF2W7C+v5/MXD/LkehmB6UNQ="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML template engine with Python expressions"; homepage = "https://github.com/koesterlab/yte"; + changelog = "https://github.com/yte-template-engine/yte/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 0e15bec58def..64ad473c3b75 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE="; + hash = "sha256-tKLFJSlViiryH9j4ZaOtj6gA69fp//cG/ftBe2J2R+I="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index c1b57bab97e7..22157b26baea 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.33"; + version = "3.1.34"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-NcjzKA/QvxIoZMzgMmyAQm4KI8kCsj+K9wcI1n+HPbc="; + hash = "sha256-F0zXvxxnfiCoEzhDL5v82OImqOX3y5umyRy5PbVCls0="; }; patches = [ diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index 5b0e8e7c5928..0320b499b145 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.59.1"; + version = "1.59.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-PgDdCcXiy9Dpop2myuRoi8KQROZdJ76ce4ax7wU4bpc="; + hash = "sha256-tgDrzYaomB0Pj7JQmvp+8G25CBDxGiMYCUnbm8vRkDU="; }; vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw="; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.59.1/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.59.2/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <