diff options
61 files changed, 697 insertions, 436 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 41d539dd5f1..303c430b8e5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -224,10 +224,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/emacs-packages.nix @adisbladis # Neovim -/pkgs/applications/editors/neovim @jonringer @teto +/pkgs/applications/editors/neovim @figsoda @jonringer @teto # VimPlugins -/pkgs/applications/editors/vim/plugins @jonringer +/pkgs/applications/editors/vim/plugins @figsoda @jonringer # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer diff --git a/doc/doc-support/parameters.xml b/doc/doc-support/parameters.xml index 8b413dcd337..50ff25fe107 100644 --- a/doc/doc-support/parameters.xml +++ b/doc/doc-support/parameters.xml @@ -2,11 +2,14 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:param name="section.autolabel" select="1" /> - <xsl:param name="section.label.includes.component.label" select="1" /> + <xsl:param name="chapter.autolabel" select="0" /> + <xsl:param name="part.autolabel" select="0" /> + <xsl:param name="preface.autolabel" select="0" /> + <xsl:param name="reference.autolabel" select="0" /> + <xsl:param name="section.autolabel" select="0" /> <xsl:param name="html.stylesheet" select="'style.css overrides.css highlightjs/mono-blue.css'" /> <xsl:param name="html.script" select="'./highlightjs/highlight.pack.js ./highlightjs/loader.js'" /> - <xsl:param name="xref.with.number.and.title" select="1" /> + <xsl:param name="xref.with.number.and.title" select="0" /> <xsl:param name="use.id.as.filename" select="1" /> <xsl:param name="toc.section.depth" select="0" /> <xsl:param name="admon.style" select="''" /> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 39b94a5e75b..47d7ad9f194 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3847,12 +3847,6 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; - e-user = { - email = "nixos@sodosopa.io"; - github = "outergod"; - githubId = 93086; - name = "Alexander Kahl"; - }; eadwu = { email = "edmund.wu@protonmail.com"; github = "eadwu"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5e5a61875db..af6684a03f9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -743,6 +743,7 @@ with lib.maintainers; { vim = { members = [ + figsoda jonringer softinio teto diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md index 6b223d843ac..3299d2d7ecb 100644 --- a/nixos/doc/manual/configuration/wireless.section.md +++ b/nixos/doc/manual/configuration/wireless.section.md @@ -50,7 +50,7 @@ networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; ``` or you can use it to directly generate the `wpa_supplicant.conf`: diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 6db20cdd641..9b72e840f4b 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -102,11 +102,14 @@ let ''; manualXsltprocOptions = toString [ - "--param section.autolabel 1" - "--param section.label.includes.component.label 1" + "--param chapter.autolabel 0" + "--param part.autolabel 0" + "--param preface.autolabel 0" + "--param reference.autolabel 0" + "--param section.autolabel 0" "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" - "--param xref.with.number.and.title 1" + "--param xref.with.number.and.title 0" "--param toc.section.depth 0" "--param generate.consistent.ids 1" "--stringparam admon.style ''" diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml index 82bc2013515..d39ec4fac49 100644 --- a/nixos/doc/manual/from_md/configuration/wireless.section.xml +++ b/nixos/doc/manual/from_md/configuration/wireless.section.xml @@ -54,7 +54,7 @@ networking.wireless.networks = { echelon = { pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; }; -} +}; </programlisting> <para> or you can use it to directly generate the diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 5aa407a1502..8fd514abea5 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 19602ee4b5d..0451d54bf0b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -185,12 +185,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-11-16"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "2ef04f4be7a9ffc648751e8c0d0c7236074c1dc1"; - sha256 = "0yszjbl4q4pn3f6k90jx2i4bkqm55r4gjl7s6fmf6igcphmslkgm"; + rev = "4a1043074517fc35217f47c7fa3ff320c47f83f5"; + sha256 = "17w2qnaxq0iyhcfv6613zsh4g0plwr5fiv9qvs3m8z049jm5rbiv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "cb67722e14fbfafd2ba3913bd9850005816ccccf"; - sha256 = "1afsd603v2v68d7cwp9vhjbdy5b89jwrkrra284akc1gmzkbck3d"; + rev = "88a5121859a96c42b75165946e7ff0d318c31a8e"; + sha256 = "10aqwqx9jxc9hpp9ivni4lq91n5zm0qpiqr6f9zz0ch2m8yz3mdv"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-12-01"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "50d28ad4e3e1ff89b5fc1bff985760c19c2fa782"; - sha256 = "1m8wix6myx572d13qbn3g77az9zwbiszcldjk1nqq3isz2ix2b8n"; + rev = "97279a10cc797af96d3e7295026e51e4968d09a1"; + sha256 = "14mylgpk764iac0rwvwgm1k77na7p2df5q1iav5mygl2jfl5amss"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -979,12 +979,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "3b91377f0e8655894b29c166c796ab9e2c0bf077"; - sha256 = "1121rlyd9kj08ixnjq541x02ckf5g2l1gyic342d11lpwwbpmqc7"; + rev = "d3aad0aa9d432cf8a312f3c33ae63987f8eae0f5"; + sha256 = "1i2w80h0zcm7i40hlp1r1ym5d7hk3m2ar19a6i6q4j6ws2wr29a0"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1735,12 +1735,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6adfb13aa16733aa5ede483f428750ce03954c4d"; - sha256 = "02nchj8kb038x75p7p4kvlpvvhfnc51v88ymffpjszplxmih5znn"; + rev = "45346d5a2591c55ac464e4060a281d6b09a9fed3"; + sha256 = "04sm1kaav6m1m72bwzkvr1scr8m36vxw9pgjk65nbahraiasf71p"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2023,24 +2023,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9a1f60036152f55337095f754d2cba7c56224357"; - sha256 = "1idfkgvgswz2jlrp06ijazfh6j3qd57x9m1swzq0r412q504bnll"; + rev = "9a227a77325daaaba4605e5423d70302724a2b9c"; + sha256 = "0w4gxph7lfn2l5hsipnqxa4lzsy4zw54c66ws78kkj2hgf4l7g8w"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "eb30460696570af7d6adc75870274ec541cfce71"; - sha256 = "1d67vyvz8fwibsp8vbiqjkjdkxcixgj53czc1v2p50q3d98bhv49"; + rev = "4c8ccb671c03903bae9af3c5c4f9af72957dfc98"; + sha256 = "1kl6cjr0hvciwpg18q7bmqvi71i1pirxdcv09vp4zk6mi7f9d9qm"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2059,12 +2059,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6a49da213ab217360cbcad46df01f3be74a2970e"; - sha256 = "0dn47bwk4irpwb0r99zw2m23nqvas9hc5k78vxssr1zpilcbg58d"; + rev = "000dab4a373bc9ca86bb9392578edefbb90e33fe"; + sha256 = "03niqwmnkn3dz4n1hi7mjn290hnmvcn3nxg17nzr8akj6ks8cxv1"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2625,12 +2625,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff"; - sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi"; + rev = "1ee6072c6638de86abc9aef43ac315fd7eede6aa"; + sha256 = "0xq0m5qy3c48bvc6rrhr9w3rzy51a0gl2wi4y64mxp96aapz7j6h"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2831,12 +2831,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-11-07"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "908a3db77d5a061d98a45c36f8483886a8868c90"; - sha256 = "0fbz3317bilp8iznrjm6vzqgby20fq11nha5c2wzps92f4bcyp96"; + rev = "41710c31fffa76d08b8cfcd53d5defa7c07a3fc6"; + sha256 = "0859is1vxk8qz3bav12ppqsdrwaf2lfwfc55wnjpwjhld951pky3"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2976,12 +2976,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-12-05"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9b3e497cf0c3abcf73d791968a9768a22405fa13"; - sha256 = "14j3w7aqnz62fxkrhyklbip9qpdj0cmfxj3japvxbjksh7iba35b"; + rev = "6e527e04b003739b67bcf62152282e658de16063"; + sha256 = "1ji0k854gjvf5qd6brcbwvz7kp9whl12yjmfvnji6cldwhaprx0q"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3144,12 +3144,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-09-19"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "0e05a83f7683140038b1c5513938e1256f9b190e"; - sha256 = "04zn8a7b47z9vkg5acqv6my790d0f28gi94wwrxndm9c70fcw55l"; + rev = "41dd2cfd805478c5601df229549029b20f930381"; + sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3396,12 +3396,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d2efdea91ec79e480e51d5149d58daa328633c43"; - sha256 = "1nqx2g2z1gbg907n7vhcgak4bd0qz7na5pl8i3jyk5cc22z0mzfc"; + rev = "c64ec557672c9c8ecc71a438533525482021377f"; + sha256 = "0q8y068cl75c12c2l9viw58p7swcjgn2p42wlvm9c0ks4mz03bgm"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3467,12 +3467,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c2701b5d15f9634dbdcae0e34d6f6ec952adc5da"; - sha256 = "1s8vm54d3n5c1g89cw04n88fmyn6cgcyygshpj46m0qgykpigs20"; + rev = "eefbcd2b1bd0b0e5ef8fcc2c087017db1e126d66"; + sha256 = "1gk3471lz4mg2k3jsl5y2jh3a16b564s6907i9bhprc4mgq5p7bg"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4043,12 +4043,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-12-05"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f28b1e7c1eee525adb17c24de3cc15a7fa1a6ef9"; - sha256 = "0b311535cvqybg4m517wm7xpjrc0shi3za56c0v5zs6sjnm0n2vs"; + rev = "3336057e841e1adcf1daf9430c9b435a9a010b84"; + sha256 = "1c0dasxgq057z2jv1cngrk2gqrwzci2rx5mhizwixk2g40n6d4xy"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4151,12 +4151,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-11-23"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "b6773302598503da8f6cb32aa47c96ff456dbdac"; - sha256 = "1g2afxk8gi09v6j6hddymis2xvn1d20ndks0mjzc0lwrr3yvwzkv"; + rev = "e4db24252d9b1bd7b329511e8caa69fefed67362"; + sha256 = "0lf8sbf1m0y76sqcqv7faybiballgy9n775vv33v80ax2rmgq62y"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -4486,12 +4486,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-12-10"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "40b5c6272384d90365e7149e0fcc73afae5e87cc"; - sha256 = "1hsp7d9mb877whm7rcbvg4k3l9rjz3p3jfjwsr6n6wpspq9xids1"; + rev = "8b25e74761eead3dc47ce04b5e017fd23da7ad7e"; + sha256 = "0jf85bynp91dyg4xx06w4ha0cim6m5v26g5wxpml3flmwglj58fa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4967,12 +4967,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "7c59fa1292377a43e314d6d493438ff8af8aa853"; - sha256 = "0n4n5cyppnhwg5gd865iy6ifm36ysw876v5rphnhlvlsa34alng6"; + rev = "7b6ec340b347fe560e77db25785ffd0b215ff138"; + sha256 = "0sqsn7amvlfgg4avwwp0vjay1l867g6wf8d7g8971hp1dssz4x51"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -4991,12 +4991,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-07"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "f353ec5ac10a9e581c92dc0f937025c54e216022"; - sha256 = "1wmy5hncm1lz5r99vcspg95435yyg0jdzm2kjca79nsmqp613ffl"; + rev = "17c6f31af8cb4c561275e89cd93d2cedda896706"; + sha256 = "0r5d0zfq3ch6l5khrggb7b6c7lammgbq5bl787rscvmvdmcngf6c"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5015,12 +5015,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-12-06"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "19bc8377e61482f36703a3e1651aef206af88086"; - sha256 = "0599ljv4f8vsk3h4rpisqj69c4sgjw51rpv8nz7s9nbn43crcqy1"; + rev = "66030fc1c3b7b6d5bc31ece188bc472ee2d91ee1"; + sha256 = "1mfap26fpfh4ynxgg7m6a8k132d5h07iv6hfmpd55csfa19prvp5"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5351,12 +5351,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-11-25"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "4b6d4072923cfc3a3f6aea55eafd8b4ad0ddc489"; - sha256 = "1bvwhqcpdkym94wyr7jn26jd81sz5hzsikd129x22ynwakq0ajzw"; + rev = "11445b5a28155baaf289c2212b5eb6a3e29e0e57"; + sha256 = "0bs5cck14hyipxxmpvpw5vlifhl1cn3hfajxz87hhvlw6bgsghzs"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5399,12 +5399,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "adaa799264c92eea42d500c8b98e19caf32c14dc"; - sha256 = "1vi9n07mf258pkkhh8c28l846j88f248gzwcrv40i8n3v3mxz7f6"; + rev = "623cc25016647eb62392aead7612f27d539c33de"; + sha256 = "0kxjd17qxs6x18r5hxg9ii7mlcj1nwvj6j0d3rdplp2bqbrx6hb1"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a8fd28aec46fe9f5dd42f8d5939217ce60787d73"; - sha256 = "0sxq0nlhgk2q1yz8nyj21z2mxgfg383jm00s6j0hggq02v3a86mz"; + rev = "68d96871118a13365f3c33e4838990030fff80ec"; + sha256 = "0kb2kc61fhnf4g95vy5mhck4jm9ijlgmv3rv613j0i9aslnlipm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5759,12 +5759,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-12-03"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "bc4f02545a0ee3b474e30d6654efe41f5a0a1cb5"; - sha256 = "0v0yva74h1gk8piwil0pg5r5w663psrkg42y1sgpbla70i7j12ff"; + rev = "44895245d10d98b221ba60858a4a94fd229b54ff"; + sha256 = "0ns32lk3k1dshvikbpm43nkciiv9d0frwm1bp8721p9w1cgi0amm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386"; - sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9"; + rev = "0c038493b37e67bed287ff99722a9ced5cdfe617"; + sha256 = "1hpxvmm407dhzaqb531wz1147y28m9z62lsz8s8ry60zc5s8rqhd"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5915,12 +5915,12 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-10-26"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "6efe3806c6e0d9ae684d756d4d7053cbdfb562eb"; - sha256 = "0d0lcaxxqwg2cw8gx4zmddwvb49xxrvlc03ij68wwwmvjgvw2v01"; + rev = "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce"; + sha256 = "05b2wnw9p5wpcc85fh40ddw90ls4k0mcmpa5rcadhy5c4xaf3q2h"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; @@ -5951,12 +5951,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-27"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "343e07de11b15f93e44ebd47eb98dce6b7da2e6b"; - sha256 = "14rdzmh8w7qvmvqdv360nba1l2phmmbxs90ifjrxicw21b48jmyi"; + rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; + sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6083,12 +6083,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-24"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6b45fbffdabb2d8cd80d310006c92e59cec8fd74"; - sha256 = "1qdhyclzsw1inwwzw3kr1jxq3cz0qr358whj93y16x7id3ylsx52"; + rev = "6cc6b54d3728a17e34bb5c9b9db05c7e5690813d"; + sha256 = "06sbki4m8za9zsj643fj5wzx44xsa1nv23as1m9ip99cwqrvxqcc"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6107,24 +6107,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7177d95ac0f46bf02ff3f8375e135149a3fc79b8"; - sha256 = "1h0qvy6dh1lkm74r11r6d989adfbcx3xszyj13pchcangp7mhfrv"; + rev = "0cd8ac4751c39440a1c28c6be4704f3597807d29"; + sha256 = "1avm9ds7lbi2fjpqcq7v05j7h91d0id3absdc95q4bgrfx3rnw5w"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "619f1ace03860d668c7a661332c38480f2db2584"; - sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3"; + rev = "ae0317d78a9f6fad78870d6645b60528e13ae6fa"; + sha256 = "16d70n17fli233y4aigsr4ddm2h6myj85p4lsl2xk5sypd5bkczc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6167,12 +6167,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-10"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e8b7807e0398754bd7dbb5cae043340374975f77"; - sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9"; + rev = "731be7f2358fb9f3e2bc7d8698b82c882cf132a4"; + sha256 = "08wfd3ykas1pzqmfljk0945fp78337jfnl0maqws6il5f5l8lbzg"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6359,12 +6359,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-12-09"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "ceb1ad90a20c39a87799e5f0facfa02d7cb19a23"; - sha256 = "0wq15k4g02hi7dvkwg1j7mr2cgl6yvisk9dsyzkdsh30yfpg11cb"; + rev = "74275ddff64746b311b0f1ee1a60b01f857ff2c8"; + sha256 = "0ib109jrz6jvag8jghr21jjd4rrsql9iqk1bl8gjd4ylhjsb38li"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6419,12 +6419,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-09"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "aba09c510a60ad469f3fd46e0a7c492ec610e5fb"; - sha256 = "0mv1wa4p5bsylvjc7z979bhh3flpyndkvzvz079l2kanja033996"; + rev = "1b8819bc6201b0a32c64ca13852c82186c2b2119"; + sha256 = "0dnv47ai6f9rcbr1q345smj3nxhyqfmb92a17w5hqfpifgsmsaim"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8239,12 +8239,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "3a28195c7d683fe076df51849f8252c7da50c8b4"; - sha256 = "1aj8m1845dajiffisw23fha6w5r34m2k7dipdarm9qkipf59i3b2"; + rev = "9afe7983ce6351936a81d57adac651dc8f16c20b"; + sha256 = "1na8yxl0b1150c6b4shigh3asm2gy1yjlidp6bxhivzwh01rpp9j"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -9499,12 +9499,12 @@ final: prev: vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2020-07-11"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "c1c91ecfd30f0e4e946854a6f7c67eb2d1e21c98"; - sha256 = "0ldkyzsn4b555pb9qdr0k6w6m3w7ziy7v6bcnx0n8ppq4fl68pz2"; + rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52"; + sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -10605,12 +10605,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-11-20"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "71c98ed6eacb4f1c0b9e4950ef679eda6a651cdd"; - sha256 = "0jxcmriva73s0icllpbh6q6s2fw0ysjm7fk449kdd5fvd5y5ssq5"; + rev = "9234b2e2590e973c06113c05abd180de0c9dbcc1"; + sha256 = "04793snqfy6p27pl31mghfaszbwwb08fg93bv35ah3ghv3abyh7c"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -12416,6 +12416,18 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; + vim-teal = buildVimPluginFrom2Nix { + pname = "vim-teal"; + version = "2021-01-05"; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "vim-teal"; + rev = "d2aa107b257879e774680792a2aebaf9cd5742e0"; + sha256 = "02ag8vhmh1zj99vhvqslfnasw9i5psx396r7qyag0yyzyp9ynzkc"; + }; + meta.homepage = "https://github.com/teal-language/vim-teal/"; + }; + vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; version = "2021-07-10"; @@ -13294,6 +13306,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winbar-nvim = buildVimPluginFrom2Nix { + pname = "winbar.nvim"; + version = "2022-07-18"; + src = fetchFromGitHub { + owner = "fgheng"; + repo = "winbar.nvim"; + rev = "13739fdb31be51a1000486189662596f07a59a31"; + sha256 = "1b9zfn5fpgibgjn64a6hb8w9d0zprkm1bz050fcd1vrv9dq1s7s7"; + }; + meta.homepage = "https://github.com/fgheng/winbar.nvim/"; + }; + windows-nvim = buildVimPluginFrom2Nix { pname = "windows.nvim"; version = "2022-11-17"; @@ -13525,12 +13549,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-10"; + version = "2022-12-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "1d22da687d36c37133b13f2b41658c1c989e77e0"; - sha256 = "1mrdb8l4qpq39fbanwgk55mjhx55j8yif2h9bm4q6f0vqqs0n505"; + rev = "e7fbf2496ce0f1cdf9883a6b99d86afc2f3efadc"; + sha256 = "0y7scdkzn3j580vk0m3n4vksnhdnq3fgx6qr9vygk15jn1qxdga8"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13549,24 +13573,24 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-11"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "75b70f46770332e1bd51a4b0f2798a16b448e37b"; - sha256 = "05jkbs77ffn9cpm8r005r208g6c03ammlmn7x62rlp25in4gyd0n"; + rev = "ac29dc7e06b340baeee7273d3232cca346f6f7cd"; + sha256 = "0chxw8cm8x9v0nawasipsx5f7fapfp5b31jfz217nydhhwwvfr2h"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-11-30"; + version = "2022-12-12"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "947e5298766f30bdb813749bf867913b29a06eac"; - sha256 = "0yvahswdzqphay5wak2rlaqjaf44kylsvmx697slwp8h1846xchw"; + rev = "b7645942bf91154f76ca016b612131168522d19e"; + sha256 = "1x91l9dkmzkfj4dmzg2vm0qxkmr2ilmqql7c774jcwfhr90zd54x"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -13595,6 +13619,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + lspsaga-nvim-original = buildVimPluginFrom2Nix { + pname = "lspsaga-nvim-original"; + version = "2022-12-12"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "lspsaga.nvim"; + rev = "db0c1414efb928a9387e0a3271d75dcc3370822f"; + sha256 = "0gg6vyrj13iwn4kj5jinm8799i6smyxnyrqz8qm7bay4lzbsg7mr"; + }; + meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2022-02-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c72727be28d..e9f4ba92b68 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -373,6 +373,7 @@ https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/onsails/lspkind-nvim/,, https://github.com/tami5/lspsaga.nvim/,, +https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original https://github.com/arkav/lualine-lsp-progress/,, https://github.com/nvim-lualine/lualine.nvim/,, https://github.com/l3mon4d3/luasnip/,, @@ -1042,6 +1043,7 @@ https://github.com/machakann/vim-swap/,, https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/kana/vim-tabpagecd/,, https://github.com/tpope/vim-tbone/,, +https://github.com/teal-language/vim-teal/,HEAD, https://github.com/hashivim/vim-terraform/,, https://github.com/juliosueiras/vim-terraform-completion/,, https://github.com/vim-test/vim-test/,, @@ -1115,6 +1117,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/fgheng/winbar.nvim/,main, https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 699aa303462..f1ae106df46 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -185,6 +185,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { passthru = { inherit pkgArches; + inherit (src) updateScript; tests = { inherit (nixosTests) wine; }; }; meta = { diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 7306112ce25..e00f3940671 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -12,6 +12,15 @@ let fetchurl = args@{url, sha256, ...}: pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; + + updateScriptPreamble = '' + set -eou pipefail + PATH=${with pkgs; lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq nix ]} + sources_file=${__curPos.file} + source ${./update-lib.sh} + ''; + + inherit (pkgs) writeShellScript; in rec { stable = fetchurl rec { @@ -42,6 +51,24 @@ in rec { # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch ]; + + updateScript = writeShellScript "update-wine-stable" ('' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_stable=$(get_latest_wine_version "$major.0") + latest_gecko=$(get_latest_lib_version wine-gecko) + + # Can't use autobump on stable because we don't want the path + # <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>. + if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then + set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" + fi + + autobump stable.gecko32 "$latest_gecko" + autobump stable.gecko64 "$latest_gecko" + + do_update + ''); }; unstable = fetchurl rec { @@ -56,6 +83,23 @@ in rec { url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; + + updateScript = writeShellScript "update-wine-unstable" '' + ${updateScriptPreamble} + major=''${UPDATE_NIX_OLD_VERSION%.*} + latest_unstable=$(get_latest_wine_version "$major.x") + latest_mono=$(get_latest_lib_version wine-mono) + + update_staging() { + staging_url=$(get_source_attr staging.url) + set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + } + + autobump unstable "$latest_unstable" "" update_staging + autobump unstable.mono "$latest_mono" + + do_update + ''; }; staging = fetchFromGitHub rec { @@ -81,6 +125,22 @@ in rec { inherit (unstable) gecko32 gecko64; inherit (unstable) mono; + + updateScript = writeShellScript "update-wine-wayland" '' + ${updateScriptPreamble} + wayland_rev=$(get_source_attr wayland.rev) + + latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) + + if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then + latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') + wayland_url=$(get_source_attr wayland.url) + set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" + set_source_attr wayland rev "\"$latest_wayland_rev\"" + fi + + do_update + ''; }; winetricks = fetchFromGitHub rec { @@ -90,5 +150,16 @@ in rec { owner = "Winetricks"; repo = "winetricks"; rev = version; + + updateScript = writeShellScript "update-winetricks" '' + ${updateScriptPreamble} + winetricks_repourl=$(get_source_attr winetricks.gitRepoUrl) + + latest_winetricks=$(list-git-tags --url="$winetricks_repourl" | grep -E '^[0-9]{8}$' | sort --reverse --numeric-sort | head -n 1) + + autobump winetricks "$latest_winetricks" 'nix-prefetch-url --unpack' + + do_update + ''; }; } diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh new file mode 100644 index 00000000000..8192d3b5ab5 --- /dev/null +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -0,0 +1,49 @@ +wine_url_base=https://dl.winehq.org/wine + +sed_exprs=() + +get_source_attr() { + nix-instantiate --eval --json -E "(let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$1" | jq -r +} + +set_source_attr() { + path="$1" + name="$2" + value="$3" + line=$(nix-instantiate --eval -E "(builtins.unsafeGetAttrPos \"$name\" (let pkgs = import ./. {}; in pkgs.callPackage $sources_file { inherit pkgs; }).$path).line") + sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") +} + +set_version_and_sha256() { + set_source_attr "$1" version "\"$2\"" + set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" +} + +get_latest_wine_version() { + list-directory-versions --pname=wine --url="$wine_url_base/source/$1" | grep -v 'diff\|rc\|tar' | sort --reverse --version-sort -u | head -n 1 +} + +get_latest_lib_version() { + curl -s "$wine_url_base/$1/" | grep -o 'href="[0-9.]*/"' | sed 's_^href="\(.*\)/"_\1_' | sort --reverse --version-sort -u | head -n 1 +} + +to_sri() { + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$1" +} + +autobump() { + attr="$1" + latest="$2" + fetcher="${3:-nix-prefetch-url}" + more="${4:-}" + version=$(get_source_attr "$attr.version") + if [[ "$version" != "$latest" ]]; then + url=$(get_source_attr "$attr.url") + set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" + [[ -z "$more" ]] || $more "$version" "$latest" + fi +} + +do_update() { + [[ "${#sed_exprs[@]}" -eq 0 ]] || sed -i "${sed_exprs[@]}" "$sources_file" +} diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 61ca6515c44..c5d8e9bd95b 100644 --- a/pkgs/applications/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "$out/bin/winetricks" ''; + passthru = { + inherit (src) updateScript; + }; + meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = lib.licenses.lgpl21; diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 79b1d62509b..2e5353faeb7 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs="; + sha256 = "sha256-wc1hBHqVH/ooXqF97Ev/mVdbfS9JCrreq2n2PIg/pEs="; }; - cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw="; + cargoSha256 = "sha256-CraJexOepja1CJnp9ngCVBWiFy84rWXzDRTWa0sxQs0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 28fee5b61a4..1a1840a2702 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { - "hash": "sha256-4f29+7irL+6uNTEFnUu46LGz4aBDwortClCZ0+EDZ4Q=", + "hash": "sha256-VGrMkgX7WmIz7v0+D1OPYerslVueGw5XRBtWebLrkQk=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.193.1", + "rev": "v1.194.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -75,13 +75,13 @@ "vendorHash": null }, "argocd": { - "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", + "hash": "sha256-8gyNJrRmrLev53dmMMjpZ3COTwPg5FYaxYBgkrdAWXo=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v4.1.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" + "vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ=" }, "auth0": { "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", @@ -442,24 +442,24 @@ "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { - "hash": "sha256-VqQK6NifhilmnJL5L4EHmmeFWZPBmQhoUl3mz8igSck=", + "hash": "sha256-EKPXlEpZVcQ0r97Um3kX8YZneaoKJrY76414hC5+1iA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.45.0", + "rev": "v4.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw=" + "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" }, "google-beta": { - "hash": "sha256-/fdgwdIIFHLEMeqsWashkQJlIoFU86ZmsbA4pX18FhE=", + "hash": "sha256-4ksd2LPAG6GeEexeThy4FnzTcDwDo753FP+02pCoyFU=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.45.0", + "rev": "v4.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw=" + "vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -471,13 +471,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=", + "hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.31.1", + "rev": "v1.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" + "vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0=" }, "gridscale": { "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", @@ -888,11 +888,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", + "hash": "sha256-2qOFrNwBFp30gLR9pFEaByx1vD8TZUayISaKZ7fytZo=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.4", + "rev": "v2.7.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 7b53d2210fe..5d5e8615a85 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; + sha256 = "sha256-ms0CVYSYccRuiLBZ+lEEyMH0Zhti5sMM49XuEUe9sKw="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; + sha256 = "sha256-QbjXjdKMjGwXQ3DoyAJN1SxnHjVeAk140j1me/iWlZQ="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 05eff6e82e5..7f2e9ccf006 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.21"; + stable = "0.0.22"; ptb = "0.0.38"; canary = "0.0.145"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "KDKUssPRrs/D10s5GhJ23hctatQmyqd27xS9nU7iNaM="; + sha256 = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 0b246125ffe..6d955128cb1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,7 +1,7 @@ { pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf -, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 +, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 + libglvnd libnotify libX11 libXcomposite @@ -96,7 +97,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ --run "${lib.getExe disableBreakingUpdates}" diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 648569a9c03..e8ac07b50cf 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA="; + sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 2c8d36a4df6..22d9ada544c 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-P9LwgEUz8QgUVQYISIx3Sa8ibFxNTGNNO5Vn014UB88="; + sha256 = "sha256-1wtpbwTO8MdEvcdo5ImNuiNOtyPfaKFpr2Rezac4ofU="; }; doCheck = false; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 7547d6d4051..699103b98f5 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,28 +1,31 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc="; + sha256 = "sha256-XslMwA1DhztK9DPNCucUpzjCQXz6PN8ml8JBvKtJeqg="; }; - cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY="; - - # remove timeouts in tests to make them less flaky - patches = [ ./tests-no-timeout.patch ]; + cargoSha256 = "sha256-KxwBF5t8lcaH8ZD4SorIBiq7p6r9LGHfEOyNXtB9HJw="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + checkInputs = [ webfs ]; + + # remove timeouts in tests to make them less flaky + TEST_SRVC_DISABLE_TIMEOUT = 1; + meta = with lib; { description = "Sysrev version control"; homepage = "https://github.com/insilica/rs-srvc"; + changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ john-shaffer ]; mainProgram = "sr"; diff --git a/pkgs/applications/version-management/srvc/tests-no-timeout.patch b/pkgs/applications/version-management/srvc/tests-no-timeout.patch deleted file mode 100644 index d353b9e5f44..00000000000 --- a/pkgs/applications/version-management/srvc/tests-no-timeout.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/tests/common/mod.rs -+++ b/tests/common/mod.rs -@@ -1,15 +1,13 @@ - #![allow(dead_code)] - - use std::path::PathBuf; --use std::time::Duration; - - use assert_cmd::Command; - #[cfg(unix)] - use rexpect::session::PtySession; - --pub fn cmd(timeout_millis: u64) -> Command { -+pub fn cmd(_: u64) -> Command { - let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap(); -- cmd.timeout(Duration::from_millis(timeout_millis)); - cmd.env_remove("RUST_BACKTRACE"); - cmd - } -@@ -19,14 +17,14 @@ pub fn spawn( - dir: &str, - args: Vec<&str>, - timestamp_override: u64, -- timeout_millis: u64, -+ _: u64, - ) -> Result<PtySession, rexpect::errors::Error> { - let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr")); - cmd.args(args); - cmd.current_dir(dir); - cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string()); - cmd.env_remove("RUST_BACKTRACE"); -- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?) -+ rexpect::session::spawn_command(cmd, None) - } - - pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> { diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index e77fe067670..6c267aad77e 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -28,13 +28,6 @@ , wxGTK , zlib -, CoreText -, CoreFoundation -, AppKit -, Carbon -, IOKit -, Cocoa - , spellcheckSupport ? true , hunspell ? null @@ -51,6 +44,7 @@ , portaudio ? null , useBundledLuaJIT ? false +, darwin }: assert spellcheckSupport -> (hunspell != null); @@ -62,6 +56,7 @@ assert portaudioSupport -> (portaudio != null); let luajit52 = luajit.override { enable52Compat = true; }; inherit (lib) optional; + inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; in stdenv.mkDerivation rec { pname = "aegisub"; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index ee09ee43229..fe6ac234cc1 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.22+matrix.1"; + version = "6.8.23+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "V1ALhD0zLm6Rq2KFpZXULPiB7sAPaNDhCpxScr+apDE="; + sha256 = "GIPgw1exAgw/D5vNpQQkUnTye66jfLLI5/asrthEDPQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index da5e6366fb6..88204a47365 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -17,7 +17,6 @@ , lua , libuchardet , libiconv -, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , xcbuild , waylandSupport ? stdenv.isLinux @@ -75,11 +74,12 @@ , xineramaSupport ? stdenv.isLinux, libXinerama , xvSupport ? stdenv.isLinux, libXv , zimgSupport ? true, zimg +, darwin }: let + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); - in stdenv.mkDerivation rec { pname = "mpv"; version = "0.35.0"; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index c3bb4c7ff01..acd889ce85b 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.6"; + version = "0.15.7"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "14l4m9xgp9slg4hfaqkwvzdvmg26qj2livldni3lmivvcagjgb2x"; + sha256 = "0aq5sr93z6c5l76sqbj3g48z6yrhxfqxri0x1ajmjwhcwjg79d6v"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1vw3igxv4zr5gf1ml5ls17w9cc9shdn8fvbk6dkfnxrs93cwrq0k"; + sha256 = "032jqrk46k9zbq058ms8rnrq0209rd8vkxwj73vqrlgqvpzlfl5k"; }; diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index a1aad41fe97..1766c45995a 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -56,12 +56,7 @@ stdenv.mkDerivation rec { ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ - '') - # Need to adjust ld flags for darwin manually - # https://github.com/dzaima/CBQN/issues/26 - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=(LD_LIBS="-ldl -lffi") - ''; + ''); installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 46d6180eb1d..b6554979c7e 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -5,13 +5,15 @@ , doxygen , freeglut , freetype -, GLUT , libGL , libGLU -, OpenGL , pkg-config +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; +in stdenv.mkDerivation rec { pname = "ftgl"; version = "2.4.0"; diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 72d21ed0d2c..b09e7dcb739 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , fetchFromGitLab , cmake , ninja @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; }; + patches = [ + # Fixed upstream, remove when the new version releases: + # https://gitlab.com/inkscape/lib2geom/-/issues/49 + (fetchpatch { + name = "expect-double-eq-in-choose-test.patch"; + url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; + sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 6c7bdeec0bd..f343c4383c4 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "2.10.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-HiVM/opZuR7Gkt421ps+nKiiKERG8sUD8qBLIMGNCJI="; + sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; }; buildInputs = [ zlib openssl libre ]; makeFlags = [ diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5672167336..52f6d679b99 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,10 +7,12 @@ , pango , pkg-config , wxGTK -# darwin deps -, Cocoa +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "wxSVG"; version = "1.5.24"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index b4d668d5fba..7cf8e083f34 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar nviets ]; }; } diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix new file mode 100644 index 00000000000..1b5ac51b120 --- /dev/null +++ b/pkgs/development/libraries/zmusic/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, alsa-lib +, cmake +, fluidsynth +, libsndfile +, mpg123 +, ninja +, pkg-config +, soundfont-fluid +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zmusic"; + version = "1.1.11"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "ZMusic"; + rev = version; + hash = "sha256-QvP8ranwBs8VupBie4vrHdm517OOpCuV3Rbjeb/L9PY="; + }; + + outputs = [ "out" "dev" ]; + + patches = [ + (fetchpatch { + name = "system-fluidsynth.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0"; + hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; + }) + ]; + + postPatch = '' + substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ + --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ + --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + alsa-lib + fluidsynth + libsndfile + mpg123 + zlib + ]; + + meta = with lib; { + description = "GZDoom's music system as a standalone library"; + homepage = "https://github.com/ZDoom/ZMusic"; + license = with licenses; [ + free + gpl3Plus + lgpl21Plus + lgpl3Plus + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; + }; +} diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index f4c7ba91bef..b57e9d4f60c 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.1.11"; + version = "4.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-JaHIq1tUMxEaxigT1Z3EpJK4P2Yapki0A53WNrHo4tQ="; + hash = "sha256-DHjB8hT9rP1yyeo9I5D8JGIXq+17RYX+e6H7BBuWTw4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 7d44be14636..a5c7cccffb3 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,5 +1,6 @@ { lib -, fetchPypi +, fetchFromGitHub +, fetchpatch , buildPythonPackage , pycodestyle , glibcLocales @@ -11,11 +12,21 @@ buildPythonPackage rec { pname = "autopep8"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ixZZx/AD5pMZn1LK/9wGWFuwcWkAu8anRC/ZMdZYwHc="; + src = fetchFromGitHub { + owner = "hhatto"; + repo = "autopep8"; + rev = "v${version}"; + sha256 = "sha256-77ZVprACHUP8BmylTtvHvJMjb70E1YFKKdQDigAZG6s="; }; + patches = [ + (fetchpatch { + name = "fix-pycodestyle-2.10.0.patch"; + url = "https://github.com/hhatto/autopep8/pull/659.patch"; + hash = "sha256-ulvQqJ3lUm8/9QZwH+whzrxbz8c11/ntc8zH2zfmXiE="; + }) + ]; + propagatedBuildInputs = [ pycodestyle tomli ]; checkInputs = [ @@ -23,11 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # missing tox.ini file from pypi package - "test_e101_skip_innocuous" - ]; - LC_ALL = "en_US.UTF-8"; meta = with lib; { diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch new file mode 100644 index 00000000000..7da8ab1b2e9 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch @@ -0,0 +1,15 @@ +diff -ru a/absl/base/config.h b/absl/base/config.h +--- a/absl/base/config.h ++++ b/absl/base/config.h +@@ -558,9 +558,9 @@ + __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) || \ + (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000)))) +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 + #else +-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 ++// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 + #endif + + // ABSL_HAVE_STD_ANY diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 1fb3d070beb..39461fd7953 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -168,7 +168,7 @@ let ''; }; bazel-build = if stdenv.isDarwin then _bazel-build.overrideAttrs (prev: { - bazelBuildFlags = prev.bazelBuildFlags ++ [ + bazelFlags = prev.bazelFlags ++ [ "--override_repository=rules_cc=${rules_cc_darwin_patched}" "--override_repository=llvm-raw=${llvm-raw_darwin_patched}" ]; @@ -311,6 +311,8 @@ let # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion patchShebangs . + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + cat ${./com_google_absl_fix_macos.patch} >> third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional. @@ -375,7 +377,7 @@ let then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg=" else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE="; aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg="; - x86_64-darwin = "sha256-/qPUDgfKsWCZh/pgZM4wm9+4U9U5kxxv7q3Uh7zKSO4="; + x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E="; aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -424,7 +426,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - broken = !(xlaSupport -> cudaSupport) || (stdenv.hostPlatform.system == "x86_64-darwin"); + broken = !(xlaSupport -> cudaSupport); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7f0d94a9f30..0a1e191ba36 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,37 +1,40 @@ { lib , stdenv +, fetchurl , buildPackages , bzip2 , curlMinimal , expat -, fetchurl , libarchive , libuv , ncurses , openssl , pkg-config -, qtbase +, ps , rhash , sphinx , texinfo -, wrapQtAppsHook , xz , zlib -, SystemConfiguration -, ps , isBootstrap ? false , useOpenSSL ? !isBootstrap , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" , buildDocs ? !(isBootstrap || (uiToolkits == [])) +, darwin +, libsForQt5 }: let + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; +# Minimal, bootstrap cmake does not have toolkits +assert isBootstrap -> (uiToolkits == []); stdenv.mkDerivation rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index e7f80f7bc9a..05bfd5655b2 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -1,17 +1,18 @@ { lib , fetchFromGitHub , buildGoModule +, installShellFiles }: buildGoModule rec { pname = "cirrus-cli"; - version = "0.92.0"; + version = "0.92.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q6hpsyZZep8IERYh7/oVcCQdgc/s6HufiuE4oNPBaZc="; + sha256 = "sha256-ehJyC5NXB53i7ZpWTKySnMwWiqgbgBbnxIVWhyrXC0A="; }; vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; @@ -21,6 +22,14 @@ buildGoModule rec { "-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cirrus \ + --bash <($out/bin/cirrus completion bash) \ + --zsh <($out/bin/cirrus completion zsh) \ + --fish <($out/bin/cirrus completion fish) + ''; + # tests fail on read-only filesystem doCheck = false; diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index 1d5bdc3b694..9689df362aa 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -1,25 +1,28 @@ { lib , stdenvNoCC -, fetchurl +, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { - pname = "cpm"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cpm-cmake"; version = "0.36.0"; - src = fetchurl { - url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-F5YA1Z8OdSihipjo7QhqIZMKBcvm9WyfJ5l4WZwW9Cc="; + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "cpm.cmake"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; }; - dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - install -Dm644 $src $out/share/cpm/CPM.cmake + mkdir -p $out/share/{,doc/}cpm + install -Dm644 cmake/CPM.cmake $out/share/cpm/CPM.cmake + install -Dm644 README.md CONTRIBUTING.md $out/share/doc/cpm/ runHook postInstall ''; @@ -37,4 +40,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ken-matsui ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index d8efaea3fde..4ee3c14dacd 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-1on1+YTuPCl/XfgfCB49thvqiN45IAHebP12gQlhzsE="; + sha256 = "sha256-X1vds6+brQ5pl7MG2/n0CqCoS0nbjnQUcIgJqji/u60="; }; vendorSha256 = null; @@ -46,5 +46,6 @@ buildGoModule rec { homepage = "https://github.com/go-delve/delve"; maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; license = licenses.mit; + mainProgram = "dlv"; }; } diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 203178eed8d..1171700ff99 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.31.0"; + version = "0.32.0"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sUu1D3HAxUTQFas4ylQ9LYC0dcKPyljoU+keENg17os="; + sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; }; - cargoSha256 = "sha256-alwsxC1xDAAhqMTkgmUO4iDDUAK0lisXn3Yxgo7ZBhg="; + cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 5ab050d5de5..067aedf9882 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-xoZVo+JEOXaME7gE9PuTfNmAyVTgczNuSzA4zYAfUmc="; + sha256 = "sha256-uL6GPi+dcPkSAaGt1Fv2cJT3Q8nJaxqs8b5w9PFJm9g="; }; vendorSha256 = "sha256-a8NZ9Uws6OKfXWUL6oTZKoAG8pTYxxSNkefZtbqwyf4="; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index e917a5a76da..29667566454 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -2,7 +2,7 @@ , substituteAll , fetchurl , ocaml -, dune_2 +, dune_3 , buildDunePackage , yojson , csexp @@ -15,16 +15,17 @@ }: let - merlinVersion = "4.6"; + merlinVersion = "4.7"; hashes = { - "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; - "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; - "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; + "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; + "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; + "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; + "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; }; - ocamlVersionShorthand = lib.concatStrings - (lib.take 2 (lib.splitVersion ocaml.version)); + ocamlVersionShorthand = lib.substring 0 3 + (lib.concatStrings (lib.splitVersion ocaml.version)); version = "${merlinVersion}-${ocamlVersionShorthand}"; in @@ -36,6 +37,7 @@ else buildDunePackage { pname = "merlin"; inherit version; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; @@ -46,7 +48,7 @@ buildDunePackage { (substituteAll { src = ./fix-paths.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; - dune = "${dune_2}/bin/dune"; + dune = "${dune_3}/bin/dune"; }) ]; @@ -59,14 +61,14 @@ buildDunePackage { buildInputs = [ dot-merlin-reader yojson - (if lib.versionAtLeast version "4.6-414" + (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp) menhirSdk menhirLib ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck patchShebangs tests/merlin-wrapper diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index e3fef3f4cc4..90c0aee0ff3 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -7,7 +7,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.6-414" + buildInputs = if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] else [ yojson csexp ]; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 99d3eb61e43..69f0c4b814d 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; + sha256 = "sha256-vMmbed2UOe/N8V7LbvYm7BbOOHD69qaizkYf66VCZMs="; }; - cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; + cargoSha256 = "sha256-xo3EUDWoE1OFTaA9y3ymGA/l2fwNqnPBLpNc8xyjasY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 3eb69fa3c11..aaa800269a7 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,107 +1,102 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth -, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 -, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem, gtk3 }: - -let - zmusic = stdenv.mkDerivation rec { - pname = "zmusic"; - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "ZMusic"; - rev = version; - hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ fluidsynth ]; - - cmakeFlags = [ "-DDYN_FLUIDSYNTH=OFF" ]; - - preConfigure = '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - source/mididevices/music_fluidsynth_mididevice.cpp - ''; +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, SDL2 +, bzip2 +, cmake +, fluidsynth +, game-music-emu +, gtk3 +, libGL +, libjpeg +, libsndfile +, libvpx +, mpg123 +, ninja +, openal +, pkg-config +, vulkan-loader +, zlib +, zmusic +}: + +stdenv.mkDerivation rec { + pname = "gzdoom"; + version = "4.10.0"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "gzdoom"; + rev = "g${version}"; + fetchSubmodules = true; + hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; }; - gzdoom = stdenv.mkDerivation rec { - pname = "gzdoom"; - version = "4.8.2"; - - src = fetchFromGitHub { - owner = "ZDoom"; - repo = "gzdoom"; - rev = "g${version}"; - hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; - buildInputs = [ - SDL2 - bzip2 - fluidsynth - game-music-emu - gtk3 - libGL - libjpeg - libsndfile - libvpx - mpg123 - openal - zlib - zmusic - ]; - - patches = [ - (fetchpatch { # TODO: Delete me when upgrading to 4.9 - url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch"; - sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0="; - }) - ]; - - NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; - - cmakeFlags = [ "-DDYN_GTK=OFF" ]; - - desktopItems = [ - (makeDesktopItem { - name = "gzdoom"; - exec = "gzdoom"; - desktopName = "GZDoom"; - categories = [ "Game" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in fm_banks/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - for i in soundfonts/*; do - install -Dm644 "$i" "$out/lib/gzdoom/$i" - done - mkdir $out/bin - makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom - - runHook postInstall + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + bzip2 + fluidsynth + game-music-emu + gtk3 + libGL + libjpeg + libsndfile + libvpx + mpg123 + openal + vulkan-loader + zlib + zmusic + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/UpdateRevision.cmake \ + --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ + --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")" + ''; + + cmakeFlags = [ + "-DDYN_GTK=OFF" + "-DDYN_OPENAL=OFF" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + mv $out/bin/gzdoom $out/share/games/doom/gzdoom + makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + ''; + + meta = with lib; { + homepage = "https://github.com/ZDoom/gzdoom"; + description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; + longDescription = '' + GZDoom is a feature centric port for all DOOM engine games, based on + ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; - - meta = with lib; { - homepage = "https://github.com/ZDoom/gzdoom"; - description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ azahi lassulus ]; - }; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ azahi lassulus ]; }; -in gzdoom +} diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 4d3aec01439..d7a2e5d1f5f 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, wxGTK32 +, darwin +}: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2022-10-12"; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index c7aaec55c76..999a4b2578e 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "SELinux policy core utilities (packaging additions)"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms; - maintainers = [ maintainers.e-user ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 30311bbd58c..efd2078d99a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { changelog = "https://sssd.io/release-notes/sssd-${version}.html"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ e-user illustris ]; + maintainers = with maintainers; [ illustris ]; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4f5f3b585da..21f232d0c2d 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, libyamlcpp, nlohmann_json +, libyamlcpp, nlohmann_json, re2 }: with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a"; - libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U="; + libsRev = "0.9.1"; + libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -17,16 +17,23 @@ let sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; }; + driver = fetchFromGitHub { + owner = "falcosecurity"; + repo = "libs"; + rev = "3.0.1+driver"; + sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; + }; + in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.29.3"; + version = "0.30.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0="; + sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -40,6 +47,8 @@ stdenv.mkDerivation rec { gcc elfutils tbb + libb64 + re2 protobuf grpc libyamlcpp @@ -57,12 +66,21 @@ stdenv.mkDerivation rec { sha256 = libsSha256; }} libs chmod -R +w libs - cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include") + cp -r ${driver} driver-src + chmod -R +w driver-src + cmakeFlagsArray+=( + "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" + "-DVALIJSON_INCLUDE=${valijson}/include" + "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" + ) ''; cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" "-DSYSDIG_VERSION=${version}" + "-DUSE_BUNDLED_B64=OFF" + "-DUSE_BUNDLED_TBB=OFF" + "-DUSE_BUNDLED_RE2=OFF" "-DCREATE_TEST_TARGETS=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 29a296dcef6..7e255c01d35 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f736ef284358923e312f8e1e3c6ce7c97b20965b09eb65705e9f7e3d5e9a9d79"; + sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 4cc6369b7eb..8859b8c7e11 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eWYx45k18HDcXkgfKl9G4Q1h/BcCy+NDVhh5ndoW+Fk="; + sha256 = "sha256-Z+FZ5AtxgO+tCB9HHZhyttXt8LXbCi/6tG8WkNRuhgk="; }; - vendorSha256 = "sha256-+wPcCF5AZ1HzNH1egCiK4eUQ0UmPPJzKB45lk7SOuCI="; + vendorSha256 = "sha256-AQX4O25PR0icR0Llz66t+2AdJm58RDimhOO5NBMRu7s="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 4431283f40d..c6ee509df35 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -34,14 +34,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.4"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.6"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-zmyn9hotkePRap9qVzAZi1u4YuiT+Qt+IDh7TD0Yq9A="; + hash = "sha256-3zB0Uy2pmkrOLb+/mXZGs/pnzo6zi2zVPyeNPGPVQJM="; }; nativeBuildInputs = [ @@ -61,7 +61,6 @@ with py.pkgs; buildPythonApplication rec { pyyaml rsa ruamel-yaml - wcwidth python-dateutil jmespath urllib3 @@ -77,8 +76,6 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "distro>=1.5.0,<1.6.0" "distro" \ - --replace "docutils>=0.10,<0.16" "docutils" \ - --replace "wcwidth<0.2.0" "wcwidth" \ --replace "cryptography>=3.3.2,<=38.0.1" "cryptography>=3.3.2,<=38.0.3" ''; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 9c397bb9be0..db2c2f5e146 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "'D is not GLib' utility libraries"; homepage = "https://pagure.io/SSSD/ding-libs"; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ e-user ]; + maintainers = with lib.maintainers; [ ]; license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 8fb8a19dabe..5b154c8c9ac 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM="; + sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw="; }; - vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE="; + vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno="; doCheck = false; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b4a277eeec4..b1f963e807f 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchFromGitHub , fontconfig, freetype, libX11, libXext, libXt, xorgproto -, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools , perl # For building web manuals , which, ed +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; +in stdenv.mkDerivation rec { pname = "plan9port"; version = "2022-09-12"; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index 8aeaaaa4249..891e26017e6 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = "custom"; homepage = "http://www.jclark.com/jade/"; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ e-user ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 17b2bb3521b..50c02d83be2 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e1a6851ad..66f013098a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -434,7 +434,7 @@ with pkgs; cp437 = callPackage ../tools/misc/cp437 { }; - cpm = callPackage ../development/tools/cpm { }; + cpm-cmake = callPackage ../development/tools/cpm-cmake { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -1201,7 +1201,6 @@ with pkgs; aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK32; - inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; } // (config.aegisub or {})); aerc = callPackage ../applications/networking/mailreaders/aerc { }; @@ -7245,9 +7244,7 @@ with pkgs; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; - }; + ftgl = callPackage ../development/libraries/ftgl { }; ftop = callPackage ../os-specific/linux/ftop { }; @@ -10629,10 +10626,7 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; - inherit (darwin) DarwinTools; - }; + plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; @@ -13484,6 +13478,8 @@ with pkgs; zmap = callPackage ../tools/security/zmap { }; + zmusic = callPackage ../development/libraries/zmusic { }; + zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; @@ -16945,18 +16941,11 @@ with pkgs; ctmg = callPackage ../tools/security/ctmg { }; - cmake = callPackage ../development/tools/build-managers/cmake { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - inherit (libsForQt5) qtbase wrapQtAppsHook; - }; + cmake = callPackage ../development/tools/build-managers/cmake { }; + # can't use override - it triggers infinite recursion cmakeMinimal = callPackage ../development/tools/build-managers/cmake { isBootstrap = true; - qtbase = null; - wrapQtAppsHook = null; - # There is no SystemConfiguration in bootstrapTools, so this version gets - # patched to remove that dependency. - SystemConfiguration = null; }; cmakeCurses = cmake.override { @@ -23175,7 +23164,6 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30; - inherit (darwin.apple_sdk.frameworks) Cocoa; }; wtk = callPackage ../development/libraries/wtk { }; @@ -30715,7 +30703,6 @@ with pkgs; mpv-unwrapped = callPackage ../applications/video/mpv { inherit lua; - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; # Wraps without trigerring a rebuild @@ -37362,9 +37349,7 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem {}; - soundOfSorting = callPackage ../misc/sound-of-sorting { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; |