diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-02-18 21:56:57 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-02-18 21:56:57 +0100 |
commit | bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8 (patch) | |
tree | 8d0e10676cb162ef43366c328fb261bd5afe9254 /pkgs | |
parent | 9d78495066a70da40308658f05cedb11c3be1de1 (diff) | |
parent | 6c5bf4e060c359b00ef4f2e194fe000308bc47bf (diff) | |
download | nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar.gz nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar.bz2 nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar.lz nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar.xz nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.tar.zst nixpkgs-bbe6402ecacfc3a0e2c65e3527c2cbe148b98ff8.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs')
104 files changed, 1712 insertions, 626 deletions
diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 3051dc7ceb8..ed421277f9d 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.9.2"; + version = "unstable-2023-01-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; - rev = version; - hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8="; + rev = "0623386c813d0d68564002324958cef7217cec7f"; + hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY="; + hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso="; }; postPatch = '' diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index d6e56c98125..db7851d9e15 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.7"; + version = "7.5.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0="; + hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc="; }; postUnpack = '' diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index f0f5f50dfec..9b88cf9ab4b 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.7"; + version = "1.7.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bflQsVaCwV5zaU5k46wFQ45dIOg3dHmYfBVQHyw+EpM="; + sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 00df022f47b..debf89c617c 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.60"; + version = "2.3.62"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-YUZvTs77dGhG7dpxbQyGhrOMMx+8LotdMJflPflMDAE="; + sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0be4c3eb907..8683facf296 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-02-05"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "e48b140fb9132cc26cc82c7464e473b8f0af65db"; - sha256 = "17wkfx268j2lpwirw70fb6j4x8b96j9zsv36d3sbcz7dw1d68xqq"; + rev = "86db2ec0d332c125c6c7d726721c613380978e2e"; + sha256 = "0rp1fhsr0l4986nm6a96nw0612y2xa1d4ckkjxg7ca2nab6q24wj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-02-14"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "d35b99e36e32040ba06c48a25b5bd3e75be2a566"; - sha256 = "0x61xqxpb9wjvzmgb685xyfqsv6dfylh1f6px53xwz6ps5m1k36g"; + rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; + sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-02-09"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "624d065f1c3f88438839dba79b995bc858a4642a"; - sha256 = "01y84kzfjnjrd34m9j9gx5d0gj7sd2vby5vmpiddh9skz8pb26f6"; + rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e"; + sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -787,12 +787,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177"; - sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m"; + rev = "08b362ba12af1053871b192614b627bcb3c5299d"; + sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -847,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-02-09"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "2d53f49c21327da48f0447841027848f49e1fea4"; - sha256 = "1fm845zjw08pzcql7ikk8qz87wrffl4w2jwgqvrqx5207qlafcbn"; + rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; + sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-15"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "234ab8b8afec9139819416fc6ed5637e491a067c"; - sha256 = "1gs7hz29l0zhrrz8ylchspfd7kqyp8j95fy17v311vgbhr1wzg6w"; + rev = "c6cb480f397d19f73cf2ff491c547d751118dbae"; + sha256 = "0xlqmz0mg9h531a7667sxpr9q1nff525jjyw4fz07xwfs8q47wxr"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -991,12 +991,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-12-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; - sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; + rev = "8933abc09df6c381d47dc271b1ee5d266541448e"; + sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1243,12 +1243,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-27"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; - sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; + rev = "8fcc934a52af96120fe26358985c10c035984b53"; + sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1315,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-02-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "26522d209f5661c94f3a8bad8145160983d2252b"; - sha256 = "12iqfbcrwh2bq9p8pxv7fwivfb07jvrvhqwal1kydfhwhzfxiswl"; + rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; + sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1363,12 +1363,12 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-22"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "471949d19b1246f069eaf50729b39231eab3221b"; - sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; + rev = "21d281de0fda5bf4f57920f54eb60e212593ba63"; + sha256 = "1794rhyf0sjwzw3hbzxv53vispifyxxxp1niv6zw4bmrks3jxdg8"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-16"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "567cd6f8a350475dde4523328913c70d99d153a5"; - sha256 = "0mi9h05g8907i9vaknbvy0d696rxrsk6gw4ssas7k761ailx9pv2"; + rev = "b8aacc44913b4b8de089d067ef6f103512e76e18"; + sha256 = "10hdrw4yzadggaaz4x3vjpmk8jnalcprp8sn550mxy95al1ip4q8"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1891,12 +1891,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-02-13"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "418d3117dab2f54c4340ea73e0070dd78fc81753"; - sha256 = "0qmkj4xchl3q26pzf6x8ssm97ax72vav4jcq4410mf7xiahwcl1d"; + rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43"; + sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2095,12 +2095,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-02-13"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "137df557486f91627b8e4708a47088f36950f12c"; - sha256 = "1ipcmmp3df5dfxjaryxkwl2k48kkzxhn9hn428w76xhfa1z603iq"; + rev = "5304ea7079f38df200f4357401f1510fd00560a8"; + sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-15"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "ce0dbf6e7e5d94d6c2df250fb61f722c0d05b041"; - sha256 = "1w434kva86bynhkjg52jxhzcbbjlxbhkbb2sxi4z7gcns27bx7rx"; + rev = "2312a5024748e869a355d91170f2e8fbf2bd5a51"; + sha256 = "1sg2c2238m6nrmp700b2wvw9g9p1wfc7d1v4ma0lam4d1z0xhwyj"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2963,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2023-02-06"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "9dc6d15fdb877b2fb09ea0ba2dfde9beccb5965a"; - sha256 = "1xgb6ichs52qlzks3rlwx1v03q1yh2phl9papwd0h71mmns0plb1"; + rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; + sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2987,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-02-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "2ff7e2df6b1ffe8935d24ae90f5c173ea4cd8b1b"; - sha256 = "049jfhbbn899xahidgx2qwca98140wiymw678x6930b0cvf16w0r"; + rev = "07652ec0b659cba53e5dc07eeb660234a7b248ee"; + sha256 = "1w3l0byhnk873c9qfyp4gna96aff37769l82jqwdcvs7a2dalsz3"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-16"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "1f9824bba0cdcae491f911d0d6d1281fb5685782"; - sha256 = "0640dza1ipmwsgmh2bwqsyib7yn7c7y8ma5ki9842c6qdcah6sci"; + rev = "52f0cfd8021404988dc446734711f215bba6a6de"; + sha256 = "0ypidlvf3fc5nq4s9qz9w7378zzppv7qajwydm84v3g76p1aqm3a"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-15"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "5f1451ea7d9a9005b3f0bedeab20cef7a4c65993"; - sha256 = "1x5ab50i69dwndkbl9b1ng29pagl2wyj8f4sg7p8w7djq3l9k5bb"; + rev = "f388995990aba04cfdc7c3ab870c33e280601109"; + sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3611,12 +3611,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "819a29a463accc0981d996e704af1a892fa0d897"; - sha256 = "14sc9c2jhda0xf4n5nbzmv7lwgs5c632i9i2g00cakwa7m8af8s8"; + rev = "b4a4046d4910b4e7f42de30765ea78c888919757"; + sha256 = "12sl1yxib33pcpz38yxm8shhw71xkiw1ywlxxv1inph5avsy0ylk"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3659,12 +3659,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-01-30"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "81ceb3025e6c7030c42accc3951dad94f31ff0c8"; - sha256 = "0m8z7k0pw7vmwmw21lcil0iprdb9l9yfx4yjk05h65027j8xhk7c"; + rev = "b2e69dc3385772159b5dffd3a12a7af874692e10"; + sha256 = "11c5ng73vh9m29g4i3y4pc05pnblb90yggbh96vw5hkkvv0ahg9s"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4175,12 +4175,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "e916f41df26e33b01f1b3ebe28881090da3a7281"; - sha256 = "0dxq6nfr51abn0g7igljsj78yk672c1r85givkfyb9z0a97gxmq5"; + rev = "7339145a223dab7e7ddccf0986ffbf9d2cb804e8"; + sha256 = "0mw9sxnmyc5wipw7m1ap1s1f1a7mfi2qi9d2ibfibbrwbpx5n0yz"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4235,24 +4235,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-14"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "a2e57b7f8cfd01bb8bfb5abadf5e99acb9559700"; - sha256 = "04srn77salnn98p44nf9ydgbk9f6vlg2jychky9pd5gqx6fkbgk2"; + rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; + sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-02-13"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3cf37f4f958e47b3c124d45a5e8b654e18380035"; - sha256 = "13cjsbv9k2rkqs51n178cw47qhcwh1w4myafchasngbyh0y4ygww"; + rev = "9e38951df410c6d65fa2b932832d201d7cd6ca62"; + sha256 = "14sw0xaf7qr9896hcl9vb5ivmc6w15p1np0gqnyhjqbmcqj20yp8"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4583,12 +4583,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "d6af8aebb8b64877323f859d842eabdd79d021c3"; - sha256 = "064j8n94182f8c4m7wnal9rbr05pkzr5k8rhnaqzgfhcnsdlc7ih"; + rev = "4361fbcb9e56ecd22169865a6588db8b1764c06c"; + sha256 = "0kac8cc30j8w0d0417wsjdib9jiqbdyavhg34hn0sl3kwyp92nc4"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4787,12 +4787,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-15"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "fecabaff94c34bf8ed9c3b2a45d42a5906ea251c"; - sha256 = "1wsx9ky30wawyiflb613wm1bshrfbs7xdrf2ysllznn5bd1sn4xk"; + rev = "4546dec8b56bc56bc1d81e717e4a935bc7cd6477"; + sha256 = "179mz9pc7qp4vqmlmhd1pz9z0qagfkywb1l2sj7i1039smkf9p9a"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5219,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "45d2575527c080d6f87fd0b7741d877be88f0d26"; - sha256 = "1i62214yc69n99xbshm5yd3nj9j7wg4wqhn2gjclmay8vw05kak0"; + rev = "060986ec2fcb27cfa175ac24d6467f46261bc257"; + sha256 = "0y8lvqfgs3lqd09dmvh04dpj76r5qmjh7q09wblmrc0nf7big3q2"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5339,12 +5339,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-11"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9766bef893ec993af9408ea0d44a8f13adbd1e80"; - sha256 = "0wjiy1z19wgqn2jk419cm5545i3mp75zl6sq1srr5bfv8scvls2q"; + rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; + sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5399,24 +5399,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-02-13"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "8807379e37229ece7ae6ff12080ce505b98289b8"; - sha256 = "0v55zx0zk7i1wcyd80h3vnpf247l4zrmxgk1lqnizydaayafgjml"; + rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; + sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; - sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; + rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; + sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5543,12 +5543,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-02-14"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "14489dfa8c4241a919845ed9101fae074234f35b"; - sha256 = "09slqmdrcgdsdlwxgmkzg2py4qd91934cx3mq9x6k95jzf2ghyzg"; + rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; + sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5579,12 +5579,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "d48847d0f9df136727e0e7f6626ec334c4a8fca7"; - sha256 = "02qd9j9sxcgg0fp61nssgkhyzhn65llsprwajng27ajc0421kixy"; + rev = "c3980083e9d0db50e9cc9adf14e930ff0404e845"; + sha256 = "0jd21zwa2mjxkr3ad7s3w43gzxwdqahhnv3gml5cn9qqncybszgb"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5615,12 +5615,12 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-02-15"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "5067cfdd0e3f33c659fa50c710785a2da70ca306"; - sha256 = "09a52f5dhjzchm6n9xq3jxy2vx3lhpnwdmnp9ryak67rig86iyna"; + rev = "3ef7e6626825beb08d88747d574d8633e23a805b"; + sha256 = "0nsgqgm7hqyvhx2bg60zh5rrzcrhcll1lfqaspzkx9cic0yq42as"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -5699,12 +5699,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-02-15"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "a75bba0ae5e89df03f01c17a1d913884eeebcc2e"; - sha256 = "1gbnvh8p071f07h987q3b6k2zkhh9vf7qvvjmq2c3lgn6g3snzbl"; + rev = "a82aa08c0063843926947f3688b0e61fd71db680"; + sha256 = "14ijkjfbg5dm54wkp34rf6z9p5v2z7psxnfv526rqp9p4qqasghk"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5759,23 +5759,23 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-02-07"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "45ae3122a4c7744db41298b41f9f5a3f092123e6"; - sha256 = "16zryzm0ng0f8zl13jpkhjmqya0rbs4vy2zdm9zhd2qsnnpbb6rh"; + rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; + sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "a3e0146ba46a797a0118da0177cbec5e28722399"; + rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; @@ -5807,12 +5807,12 @@ final: prev: nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2022-09-20"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b"; - sha256 = "1yyxcnnh560gilkrqadpiwx3kpql4msw0as2v9i2v8m4z5yw36bd"; + rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; + sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5831,12 +5831,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-02-15"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "208d69f233d65526a22c6497ed57d0c80d99fa5f"; - sha256 = "1pv5mcs07a4cg05h23wxv4ddaxkzgd32fkr8p89k6fwl6v35s3jc"; + rev = "0c6a89af9a62ecc18f7cf89393b077af1063cd6c"; + sha256 = "1d490dli7r7sb0qviyy2b9n6ssy75iy8pszfbwyanp71v04k5v9w"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5939,12 +5939,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "82e98f340cf5183e1c8743a3986c5b2e8705063b"; - sha256 = "1d30acci28hw27k9ifdz41kkcwfmqblk816hv8zqxg2l7ylpycbb"; + rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; + sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5963,24 +5963,24 @@ final: prev: nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-12-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531"; - sha256 = "1glhxrv57gc3g60i876d5p3429z4kl6mhkbvrf41kvcqqb8m21m0"; + rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; + sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-02-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "110193102b4840be8bda6eb2358367026145ae3a"; - sha256 = "1a3j5ipwinsp0xfp5hg8sd2kspx972s6z5qrig463c4wdy6b3h3i"; + rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; + sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2023-02-12"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "a4ff0404d0fdd5213a9804c74c4a5ca40a1e4364"; - sha256 = "0zdzfrsn751ff34lbqjnr6m2pis0fij20d10dpjidy3dbrgzc34d"; + rev = "bb9e70fe83f2d176d3fae3234415c50f9231a8e2"; + sha256 = "1d84hy4vl3jkjzq0ir9p3rgal3nsagq5b9w0r20ql1c9n6cs2lqh"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6167,12 +6167,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-29"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "379be679d3c5f80964bc19131554b846dce5d34e"; - sha256 = "019wc4kxdyzpdbjazsy9ji1r0ymgbwx620ghvqw4wdvccyklg5if"; + rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; + sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6309,14 +6309,26 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; + nvim-nu = buildVimPluginFrom2Nix { + pname = "nvim-nu"; + version = "2023-01-03"; + src = fetchFromGitHub { + owner = "LhKipp"; + repo = "nvim-nu"; + rev = "1aad12e866f6d53dd5ec31ada79767199334a4ca"; + sha256 = "022gmlrncbs46fqkbcnc4y8jyfasqac5nd09qq1qxdjgkw4924kj"; + }; + meta.homepage = "https://github.com/LhKipp/nvim-nu/"; + }; + nvim-osc52 = buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2023-01-10"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "27da4724a887dabed3768b41fa51c785cb62ef26"; - sha256 = "1wylh055y2dyb7zcdk9sa41wnkfbknp2bgnlrhmxdq5h2bkr8hbd"; + rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; + sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; @@ -6395,23 +6407,23 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-02-07"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "1d8b7a40677fd87da7648d246c4675c3612a7582"; - sha256 = "1bcxyq8jglkpfkhrj0zq5gj74sivws00zavl5py37xrmqp0948a8"; + rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; + sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-02-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "90821ad682aac189cd0a38fd83fc96f0cbcc5d29"; + rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; @@ -6455,12 +6467,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-15"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b44871afb59e456bbff4113e416405c06c991cf5"; - sha256 = "1i6rlz06r0bg1zk33qzwz0h3sh7vglf9m2hfvm31i6pfsyngd1ib"; + rev = "17d7cf6f4b4057a949e86df6fbc2e271ba788823"; + sha256 = "088vpscxda9vph9ncvspyk51pkbykjmb6d5vrassiy1vpcvpa2bh"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6503,12 +6515,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-02-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "15d9c62cb04079cf440ceb6882f2cbfaed66eda1"; - sha256 = "0wr3f1x2xn0046q4283dw16aw2w05fkiv215fnxcy3hr09hflrr3"; + rev = "2f3583001e2bf793480f38cf0d055571787b0259"; + sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6551,11 +6563,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "24e6fda74d62475e1ca1cf1909af587710f14575"; - sha256 = "0vb2ncgc27iaks5xviwsq5cz7labc6gybqgcd1w0m167y3jz1zx6"; + rev = "352ce3e654cab593586fe02e7ca78c2cab13743d"; + sha256 = "026xi0grnqpp5j2vqx5n93y0g5avq0yx0qz23h88as5nhfa07wzj"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6574,12 +6586,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-02-13"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "bb6d4fd1e010300510172b173ab5205d37af084f"; - sha256 = "0aax38cimal8jnisvj2zryfjzjrrb3fwylbkh7gbyysdfz46fv06"; + rev = "53faf5e6d38cb3ca5c7487421524fa2b187b15b2"; + sha256 = "1ad7x73dnmjzzhkgn6xcb0f4ir5j3zfqmbi1fsxw7ydsb433563j"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6731,12 +6743,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-02-14"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "f79b875361d06a326d855393b5ed0ce4186a15c4"; - sha256 = "1n2pnncggjn1gpgl9xjwjhdzd9xpn3iv0z4zbz56qpcm9rdsmizs"; + rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; + sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6897,6 +6909,18 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; + pest-vim = buildVimPluginFrom2Nix { + pname = "pest.vim"; + version = "2020-04-20"; + src = fetchFromGitHub { + owner = "pest-parser"; + repo = "pest.vim"; + rev = "ebeeea5e0757adee037135cf3b8248589b22ae16"; + sha256 = "159h9f96x127w1i0cj0cwb8cr2k0fbb9l3vsyky60h344p8amcbi"; + }; + meta.homepage = "https://github.com/pest-parser/pest.vim/"; + }; + pgsql-vim = buildVimPluginFrom2Nix { pname = "pgsql.vim"; version = "2021-12-08"; @@ -6935,12 +6959,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "c481c660fa903a0e295902b1765ecfbd6e76a556"; - sha256 = "0d30s2rnjdizy8mibxl7pw99ij8209k09myv03d2sqnzapgx28ib"; + rev = "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56"; + sha256 = "11h0fi469fdjck318sa4fr4d4l1r57z3phhna6kclryz4mbjmk3v"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -7249,12 +7273,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-12-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "667ae447d2c7efb64461a2c58f5311d1248cdb5f"; - sha256 = "0j2mp8kan6gf1ynv90pkwghjpsqzhxdfxs1v0kh55vmld2r31r56"; + rev = "2d08fffeb8533d3678bd796010c13c7fa2534263"; + sha256 = "060rh1a4cdbs8w28l3lkgk8r7k80pd44dqczdb2bpnhyvc7mckn1"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -8177,12 +8201,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-12-08"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; - sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; + rev = "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de"; + sha256 = "1i76sjlw8irvk52g2sj90f9b3icdjvzp0zdc72fsbfjxd2kwr926"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -8201,12 +8225,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "4a7a7d2746c1c11d0e26b9dd638a62df08692ae5"; - sha256 = "0znrr8w23l7bgrf5py1zbb5q0k79sjm6fcv33m1wizxc3bg1h5hh"; + rev = "ee594419f3bc39b4123ad0cf8e7d4b7d6cad1303"; + sha256 = "0dyg09nw7kxylplln3p5905rb3y5jl6vzxx5nrix5a3qwfs2ijnl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8370,12 +8394,12 @@ final: prev: telescope-undo-nvim = buildVimPluginFrom2Nix { pname = "telescope-undo.nvim"; - version = "2023-01-29"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "b5e31b358095074b60d87690bd1dc0a020a2afab"; - sha256 = "1hpqd0dgb01in5dbqs2ps3wr12iqnf0pd0xdnaalvq7rmvsmvz7a"; + rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; + sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -8659,12 +8683,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "19aad0f41f47affbba1274f05e3c067e6d718e1e"; - sha256 = "1zslvsdv6y15yiqjyq52mdib15rk7k7k2qg1shwxhjjipgzykvpl"; + rev = "557664818f6af78de6192f0ce8bc2e887bf4943a"; + sha256 = "1pfr2240cwqjcdza18815lblcsr1ccd63phajcl31izsrx0ba78z"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8743,12 +8767,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-02-10"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "556ef3089709a6e253df1e500381fec5eb48e48a"; - sha256 = "0ragk770zibpqggvz8l78is0zr839r2py6k5261wmn1qwslagz06"; + rev = "247f9eeabae8e1efc0ed5bc613cc1a9c27e91828"; + sha256 = "174zv283scsv84wbbvm2j24fs0dy5dj5rcpqib3sdyxfydvvc18p"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8827,12 +8851,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; - sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; + rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; + sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -8851,12 +8875,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "aeac746d73251efd6c89d555d07cffe6c8176682"; - sha256 = "09sz5hwpci77k397xm01xf8sc37j91635ixb7lpq0da02ar7qs8l"; + rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; + sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9679,12 +9703,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-02-14"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "8331526e2ad92082087694809ba7cd57fbfd009a"; - sha256 = "1pmb86jrqz40jz21whn56bdsj6adp2xl6qgjn7sgq1nj25nppghm"; + rev = "ee44975ea9797d932de737a770ab6b743b5aa5db"; + sha256 = "14dsjy49jngi8r851casmyg1swwlx0kmhnalkfqs59jkda7bkg33"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9751,12 +9775,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; - sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; + rev = "1b76987b6719bee259ba8d1e03a1e7f624a3615f"; + sha256 = "0542dzzixavsfbpdm4qrsnv639gpl70grvv5jhllm2kq4dqyhjil"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -10615,12 +10639,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "633074c6a02866f967e0576c491f9ca0df3e9f9a"; - sha256 = "0fmsn2pqyklpcqvivhk7hvg8zndskrz9r9znd8m2wbdaa7rlsd79"; + rev = "819851b6ba8fdcf15454ae3a713622128c795774"; + sha256 = "0l36zy577zai4qv9327nysyaakbna8rmf6x7sj1h2dqgp7jag3fa"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11157,12 +11181,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-07-25"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "e48aae3c7e3136682b3f4c6cfd85867b392f7f1a"; - sha256 = "06caj10yw71rbksf0cjdxak3c1qm7qcby7jrc26llk5qhfpwgh2a"; + rev = "98cf55a5074695e3fca1ccace66ab5563e35111e"; + sha256 = "1kavcc0vpzgzly39qpbcb6a1kmp456c0jz6jc3vmw3sql8c070fa"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -13151,12 +13175,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-02-06"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "9d1dd5116c13b6d850a81291422a4a9818622b6c"; - sha256 = "00n2lq23m9b050ianbr5b655c23qasspvc5kf56dzpkjxgza56am"; + rev = "95a6ccbe9f33bc42dd4cee45731d8bc3fbcd92d1"; + sha256 = "1nxrva8gs2fq6vi3w26ns6lrfpbyfw495knidpx9pmvcf0ypxcva"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -14077,12 +14101,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-02-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "b0ab85552b0f60ab7a0aa46f432e709c124f8153"; - sha256 = "06c0cr5df3fmvqpzkxdnfr7dff0bab28ycngaq7i5bsbrd6pbjn3"; + rev = "60f8f40df0db92b5715642b3ea7074380c4b7995"; + sha256 = "0hgm542vdav33gj9dacy43anh9ql7x8jr1ihwbx11jlxqr5vhhp7"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14149,12 +14173,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "397201abffa681419a610ecbfd5d3c0fed45d20a"; - sha256 = "1q117ha9cs45nadq5m46qsaw2vxpa44a8r6sa64xk81cx7nlf2w4"; + rev = "66bb06771789d677ef2b7c9a0bd57941298f6a9f"; + sha256 = "1rp53hwm19bi53y0vndv2m4222ml7qz2iib23wqdj709azz6sr0j"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index fcf44b0b984..349977368b0 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,12 +115,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "18e4343"; + version = "5b6c4d0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "18e434383a4582b4fd183a30e55022c2923764e1"; - hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0="; + rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; + hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -426,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "069bd7c"; + version = "dd35c67"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "069bd7c864fe2dee1115140cc2621d140b16a643"; - hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw="; + rev = "dd35c67b1653963d3b4cca7bfbceb6ec2e6f006f"; + hash = "sha256-AVImNPg2d/vavpg+IBholzKiH8Hod4m7V3aJxWTnMKk="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -481,12 +481,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "127f5b5"; + version = "d8a4207"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; - hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E="; + rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; + hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -593,12 +593,12 @@ }; gosum = buildGrammar { language = "gosum"; - version = "68974b6"; + version = "bd0ec1f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-go-sum"; - rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7"; - hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4="; + rev = "bd0ec1fe9d68a5d4713d907417a43d489fa1b62a"; + hash = "sha256-BFwYKVbCBCC2ZvockKqiVFHOlTc3/YFIaZ2OqkO52yY="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; }; @@ -901,12 +901,12 @@ }; ledger = buildGrammar { language = "ledger"; - version = "47b8971"; + version = "f787ae6"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; - hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg="; + rev = "f787ae635ca79589faa25477b94291a87e2d3e23"; + hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -1445,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "7be06f4"; + version = "0d7a121"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98"; - hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU="; + rev = "0d7a121b2a08fb37109f7be1cc6654443cad661f"; + hash = "sha256-b3HtiAoknPgmivnN/GVHcFHbAgl1an41iSS13wTFyGA="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1549,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "d1f350b"; + version = "c5a9454"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da"; - hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U="; + rev = "c5a94547f01eb51b26446f9b94ee8644fa791223"; + hash = "sha256-2RNS0raJ0sEbBECwtI8hMG4Dir8KAx9PENwlRb7lY8o="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index dcfef882ef7..8af156a5841 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -531,6 +531,7 @@ https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, +https://github.com/LhKipp/nvim-nu/,HEAD, https://github.com/ojroques/nvim-osc52/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/olrtg/nvim-rename-state/,HEAD, @@ -580,6 +581,7 @@ https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/andsild/peskcolor.vim/,, +https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/motus/pig.vim/,, https://github.com/aklt/plantuml-syntax/,, diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix new file mode 100644 index 00000000000..482ea9e06fd --- /dev/null +++ b/pkgs/applications/emulators/xemu/default.nix @@ -0,0 +1,131 @@ +{ stdenv +, fetchFromGitHub +, lib +, makeDesktopItem +, copyDesktopItems +, pkg-config +, python3 +, ninja +, meson +, which +, perl +, wrapGAppsHook +, glib +, gtk3 +, libpcap +, openssl +, libepoxy +, libsamplerate +, SDL2 +, SDL2_image +, mesa +, libdrm +, libGLU +, gettext +, vte +}: + +stdenv.mkDerivation rec { + pname = "xemu"; + version = "0.7.84"; + + src = fetchFromGitHub { + owner = "xemu-project"; + repo = "xemu"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + }; + + nativeBuildInputs = [ + pkg-config + python3 + python3.pkgs.pyyaml + ninja + which + meson + perl + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + glib + gtk3 + openssl + mesa + libepoxy + libdrm + libpcap + libsamplerate + SDL2 + libGLU + SDL2_image + gettext + vte + ]; + + separateDebugInfo = true; + + dontUseMesonConfigure = true; + + setOutputFlags = false; + + configureFlags = [ + "--disable-strip" + "--meson=meson" + "--target-list=i386-softmmu" + "--disable-werror" + ]; + + buildFlags = [ "qemu-system-i386" ]; + + desktopItems = [(makeDesktopItem { + name = "xemu"; + desktopName = "xemu"; + exec = "xemu"; + icon = "xemu"; + })] ; + + preConfigure = let + branch = "master"; + commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; + in '' + patchShebangs . + configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") + substituteInPlace ./scripts/xemu-version.sh \ + --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" + # If the versions can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) + echo '${commit}' > XEMU_COMMIT + echo '${branch}' > XEMU_BRANCH + echo '${version}' > XEMU_VERSION + ''; + + preBuild = '' + cd build + substituteInPlace ./build.ninja --replace /usr/bin/env $(which env) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp qemu-system-i386 $out/bin/xemu + + for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512 + do + mkdir -p $out/share/icons/hicolor/$RES/apps/ + cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://xemu.app/"; + description = "Original Xbox emulator"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index a05dbc28be0..45688725c2a 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; diff --git a/pkgs/applications/graphics/kodelife/update.sh b/pkgs/applications/graphics/kodelife/update.sh new file mode 100755 index 00000000000..992f7c2bf43 --- /dev/null +++ b/pkgs/applications/graphics/kodelife/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix curl libxml2 jq + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +attr="${UPDATE_NIX_ATTR_PATH:-kodelife}" +version="$(curl -sSL https://hexler.net/kodelife/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + +pkgpath="$(findpath "$attr")" + +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" + +for system in aarch64-linux armv7l-linux x86_64-linux; do + url="$(nixeval "$attr".src.url "$system")" + + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" + + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +done diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix new file mode 100644 index 00000000000..05cdd0ce5cc --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, openal +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-effects"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBEffectsPlugin"; + rev = "release_${version}"; + hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + fetchSubmodules = true; + }; + + patches = [ + # Add install rule + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; + hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rm -r OpenRGB + ln -s ${openrgb.src} OpenRGB + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + glib + openal + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"; + description = "An effects plugin for OpenRGB"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix new file mode 100644 index 00000000000..539c203325f --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, libgtop +, lm_sensors +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-hardwaresync"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBHardwareSyncPlugin"; + rev = "release_${version}"; + hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + }; + + patches = [ + (fetchpatch { + name = "use-pkgconfig"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; + hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; + }) + (fetchpatch { + name = "add-install-rule"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; + hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rmdir OpenRGB + ln -s ${openrgb.src} OpenRGB + # Remove prebuilt stuff + rm -r dependencies/lhwm-cpp-wrapper + ''; + + buildInputs = [ + qtbase + glib + libgtop + lm_sensors + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin"; + description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ea81b58a209..bd1664e85ff 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }: stdenv.mkDerivation rec { pname = "openrgb"; @@ -25,6 +25,29 @@ stdenv.mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; + passthru.withPlugins = plugins: + let pluginsDir = symlinkJoin { + name = "openrgb-plugins"; + paths = plugins; + # Remove all library version symlinks except one, + # or they will result in duplicates in the UI. + # We leave the one pointing to the actual library, usually the most + # qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0). + postBuild = '' + for f in $out/lib/*; do + if [ "$(dirname $(readlink "$f"))" == "." ]; then + rm "$f" + fi + done + ''; + }; + in openrgb.overrideAttrs (old: { + qmakeFlags = old.qmakeFlags or [] ++ [ + # Welcome to Escape Hell, we have backslashes + ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""'' + ]; + }); + meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 1b42cd46a6b..ca2d75eac85 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-aDmaKf3iLBFD28n2u/QOf/GkgE64Birn0x3Kj5Qx2sg="; + sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix new file mode 100644 index 00000000000..c7abd03ccd7 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubeshark, nix-update-script }: + +buildGoModule rec { + pname = "kubeshark"; + version = "38.5"; + + src = fetchFromGitHub { + owner = "kubeshark"; + repo = "kubeshark"; + rev = version; + sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk="; + }; + + vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc="; + + ldflags = let t = "github.com/kubeshark/kubeshark"; in [ + "-s" "-w" + "-X ${t}/misc.GitCommitHash=${src.rev}" + "-X ${t}/misc.Branch=master" + "-X ${t}/misc.BuildTimestamp=0" + "-X ${t}/misc.Platform=unknown" + "-X ${t}/misc.Ver=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + checkPhase = '' + go test ./... + ''; + doCheck = true; + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd kubeshark \ + --bash <($out/bin/kubeshark completion bash) \ + --fish <($out/bin/kubeshark completion fish) \ + --zsh <($out/bin/kubeshark completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = kubeshark; + command = "kubeshark version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}"; + description = "The API Traffic Viewer for Kubernetes"; + homepage = "https://kubeshark.co/"; + license = licenses.asl20; + longDescription = '' + The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, + Think TCPDump and Wireshark re-invented for Kubernetes + capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters. + ''; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76647ede165..8a28228a3c0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -119,20 +119,20 @@ "vendorHash": "sha256-WndEg+n0hId7R35OeHamP+OxzzRee7f+qXIhWmos8WI=" }, "azuread": { - "hash": "sha256-StoT7ujiJhEMpQ4wMN/qzILFxJ18ZkgLkY56LwxKY+Y=", + "hash": "sha256-CTiYxmH39Jjh7wGKWmH0EoQa1H1bkV9hBNeHR+WVvF0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.34.0", + "rev": "v2.34.1", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-40oarnfSdA2Sif40C1gi+SupY4bNsp78TBfgNDCFf7U=", + "hash": "sha256-FPgq/BsciisMhdSYsYiHnMQJFaTAa/llQ1RVS/sOzhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.44.0", + "rev": "v3.44.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -420,11 +420,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=", + "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.17.0", + "rev": "v5.18.0", "spdx": "MIT", "vendorHash": null }, @@ -540,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", + "hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.1", + "rev": "v1.44.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1172,12 +1172,12 @@ "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", + "hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 818ceb74ea0..74d51ce4304 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.24"; + version = "3.5.25"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-4RQBaqC3nmyEq9Kqg0n9KIN9Gw4Z+uCl6hQeqo/NTls="; + hash = "sha256-Xb33/wz85RjBpRkKD09hfDr6txoB1ksKphbjrVt0QWg="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index baa4613b173..06a1d98762f 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-03-20"; + version = "unstable-2023-01-31"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "8cce6d20b49e917929521a13caed30e81037c868"; - hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; + rev = "0c9370cfe41ae7f99b4fceced896f66fb4e9195c"; + hash = "sha256-6KSzsPs8tSzVOxGUWj/AvSJihrSwamZgUNGvjnmNnag="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e292fb25211..dbcb872d161 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.6.2"; + version = "4.6.3"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0lrflhnlsajay8gbz1x91fqk2ckxwpqmm19hyjfqxkvi56nl7a0g"; + sha256 = "1kv7aqj4d85iz6vbgvfplyfr9y3rw31xhdgwiskrdfv8mqb0mr5v"; }; postPatch = '' diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix new file mode 100644 index 00000000000..acec5f7cabf --- /dev/null +++ b/pkgs/applications/office/iotas/default.nix @@ -0,0 +1,76 @@ +{ lib +, python3 +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, librsvg +, libsecret +, libadwaita +, gtksourceview5 +, webkitgtk_5_0 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "iotas"; + version = "0.1.9"; + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "cheywood"; + repo = pname; + rev = version; + hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libsecret + libadwaita + gtksourceview5 + webkitgtk_5_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pygtkspellcheck + requests + markdown-it-py + linkify-it-py + mdit-py-plugins + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Simple note taking with mobile-first design and Nextcloud sync"; + homepage = "https://gitlab.gnome.org/cheywood/iotas"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 03e88a7816d..e48355660cb 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -6,13 +6,13 @@ let pname = "trilium-desktop"; - version = "0.58.7"; + version = "0.58.8"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; + linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa"; + darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 349ae7f4c33..78bae4f4655 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - version = "0.58.7"; + serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; + version = "0.58.8"; in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 703416f074a..50eee7d3aa3 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct22b"; - version = "20221001_b"; + srcVersion = "feb23a"; + version = "20230201_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; + sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch deleted file mode 100644 index 3bbcb9f36e9..00000000000 --- a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py ---- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 -+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 -@@ -32,7 +32,7 @@ - libs.insert(0, '-L' + getvar('LIBDIR')) - - # Framework (specific for Mac) --if not getvar('PYTHONFRAMEWORK'): -- libs.extend(getvar('LINKFORSHARED').split()) -+#if not getvar('PYTHONFRAMEWORK'): -+# libs.extend(getvar('LINKFORSHARED').split()) - - print(' '.join(libs)) diff --git a/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch new file mode 100644 index 00000000000..a97665c2f86 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch @@ -0,0 +1,39 @@ +Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36: + +This update fixes a failure to build with source with bash 5.2. Bash's +`patsub_replacement` feature makes ampersand a special character when doing +variable substitution, which was not previously the case. This update instructs +bash to turn off the new behavior. + +The patch itself is adapted from +https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch. +--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600 +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600 +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600 +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat <<EOF + /********************* */ diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 873c3ca57c0..e9f04d2044d 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat ''; + patches = [ + ./cvc4-bash-patsub-replacement.patch + ]; + preConfigure = '' patchShebangs ./src/ ''; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c037e41d74c..09ad299d10d 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -19,7 +19,9 @@ , libwpd , libxslt , lyx +, makeWrapper , perl +, perlPackages , pkg-config , poppler_utils , python3Packages @@ -66,6 +68,7 @@ mkDerivation rec { file pkg-config python3Packages.setuptools + makeWrapper which ]; @@ -73,6 +76,7 @@ mkDerivation rec { bison chmlib python3Packages.python + python3Packages.mutagen xapian zlib ] ++ lib.optional withGui [ @@ -111,6 +115,10 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done + wrapProgram $out/share/recoll/filters/rclaudio.py \ + --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rclimg \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' '' + lib.optionalString (stdenv.isDarwin && withGui) '' @@ -130,6 +138,6 @@ mkDerivation rec { changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming ehmry ]; }; } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 28528318c16..404af2ec83b 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub +{ lib, stdenv, vdr, fetchFromGitHub , graphicsmagick, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${vdr.version}-${name}"; + name = "vdr-${name}-${vdr.version}"; inherit (vdr) src; buildInputs = [ vdr ]; preConfigure = "cd PLUGINS/src/${name}"; @@ -55,13 +55,13 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.26"; + version = "3.1.1"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; - rev = "v${version}"; + sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; + rev = "V${version}"; }; buildInputs = [ vdr ffmpeg ]; @@ -101,12 +101,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { repo = "vdr-plugin-epgsearch"; owner = "vdr-projects"; - sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; + sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; rev = "v${version}"; }; @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.1"; + version = "1.8.3"; buildInputs = [ vdr ]; @@ -160,7 +160,7 @@ in { repo = "vdr-plugin-vnsiserver"; owner = "vdr-projects"; rev = version; - sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; + sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE="; }; meta = with lib; { @@ -173,14 +173,15 @@ in { }; - text2skin = stdenv.mkDerivation { + text2skin = stdenv.mkDerivation rec { pname = "vdr-text2skin"; version = "1.3.4-20170702"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; - sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; + src = fetchFromGitHub { + repo = "vdr-plugin-text2skin"; + owner = "vdr-projects"; rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad"; + sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; }; buildInputs = [ vdr graphicsmagick ]; @@ -200,7 +201,7 @@ in { dontInstall = true; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; + inherit (src.meta) homepage; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index f31e7b79ae7..ed9c09087e4 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.3"; + version = "1.9.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM="; + sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc="; rev = "v${version}"; }; diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index 61a82f526d9..4c75b082506 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -7,14 +7,14 @@ , pkg-config }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "katriawm"; - version = "21.09"; + version = "22.12"; src = fetchzip { - name = finalAttrs.pname + "-" + finalAttrs.version; - url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8="; + name = self.pname + "-" + self.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz"; + hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc="; }; nativeBuildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "prefix=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; description = "A non-reparenting, dynamic window manager with decorations"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 7eeaf73d07c..63adf2a2765 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -20,7 +20,11 @@ let nativeBuildInputs = [ makeWrapper ]; passthru = { unwrapped = Agda; - tests = { inherit (nixosTests) agda; }; + inherit withPackages; + tests = { + inherit (nixosTests) agda; + allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self)); + }; }; inherit (Agda) meta; } '' diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 810ef52235e..3bf675b5d20 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, graalvm-ce, glibcLocales }: - -{ name ? "${args.pname}-${args.version}" - # Final executable name +{ lib +, stdenv +, glibcLocales + # The GraalVM derivation to use +, graalvmDrv +, name ? "${args.pname}-${args.version}" , executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src @@ -9,7 +11,6 @@ # Default native-image arguments. You probably don't want to set this, # except in special cases. In most cases, use extraNativeBuildArgs instead , nativeImageBuildArgs ? [ - "-jar" jar (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") "-H:Name=${executable}" "--verbose" @@ -18,16 +19,25 @@ , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # The GraalVM derivation to use -, graalvmDrv ? graalvm-ce # Locale to be used by GraalVM compiler , LC_ALL ? "en_US.UTF-8" , meta ? { } , ... } @ args: -stdenv.mkDerivation (args // { - inherit dontUnpack LC_ALL; +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "glibcLocales" + "jar" + "dontUnpack" + "LC_ALL" + "meta" + ]; +in +stdenv.mkDerivation ({ + inherit dontUnpack LC_ALL jar; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; @@ -36,7 +46,7 @@ stdenv.mkDerivation (args // { buildPhase = args.buildPhase or '' runHook preBuild - native-image ''${nativeImageBuildArgs[@]} + native-image -jar "$jar" ''${nativeImageBuildArgs[@]} runHook postBuild ''; @@ -61,4 +71,4 @@ stdenv.mkDerivation (args // { # need to have native-image-installable-svm available broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; -}) +} // extraArgs) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 7598ab5ed81..94a6e533dda 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -15,6 +15,7 @@ , libgee , libhandy , gnome-settings-daemon +, mesa , mutter , elementary-icon-theme , wingpanel-with-indicators @@ -22,7 +23,6 @@ , nixos-artwork , lightdm , gdk-pixbuf -, clutter-gtk , dbus , accountsservice , wrapGAppsHook @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice - clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { libgee libhandy lightdm + mesa # for libEGL mutter ]; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 56428a9124a..2a6c79666b3 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -17,8 +17,8 @@ , bamf , libcanberra-gtk3 , gnome-desktop +, mesa , mutter -, clutter , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -119,7 +119,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf - clutter gnome-settings-daemon gexiv2 gnome-desktop @@ -127,6 +126,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + mesa # for libEGL mutter ]; diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 9d7e18ce24e..2d1fa623745 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -19,9 +19,18 @@ stdenv.mkDerivation ({ }; unpackCmd = '' - tar -xf $curSrc contents.tar.gz + tar -xf $curSrc contents.tar.gz CHECKSUM metadata.config mkdir contents tar -C contents -xzf contents.tar.gz + mv metadata.config contents/hex_metadata.config + + # To make the extracted hex tarballs appear legitimate to mix, we need to + # make sure they contain not just the contents of contents.tar.gz but also + # a .hex file with some lock metadata. + # We use an old version of .hex file per hex's mix_task_test.exs since it + # is just plain-text instead of an encoded format. + # See: https://github.com/hexpm/hex/blob/main/test/hex/mix_task_test.exs#L410 + echo -n "${pkg},${version},$(cat CHECKSUM | tr '[:upper:]' '[:lower:]'),hexpm" > contents/.hex ''; installPhase = '' diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 71bf442c82c..d13b078494a 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0-beta2"; + version = "1.9.0-beta4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM="; }; patches = [ @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao joshniemela ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index b2ad0846cd6..991880bc31e 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.2.2"; - sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs="; + version = "25.2.3"; + sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE="; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index ecb3d5787eb..7271e5073c3 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -2,8 +2,8 @@ , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs -, supercollider-with-plugins, supercolliderPlugins -, writeText, runCommand +, gitUpdater, supercollider-with-plugins +, supercolliderPlugins, writeText, runCommand }: mkDerivation rec { @@ -26,6 +26,8 @@ mkDerivation rec { }) ]; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] @@ -39,24 +41,32 @@ mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - passthru.tests = { - # test to make sure sclang runs and included plugins are successfully found - sclang-sc3-plugins = let - supercollider-with-test-plugins = supercollider-with-plugins.override { - plugins = with supercolliderPlugins; [ sc3-plugins ]; - }; - testsc = writeText "test.sc" '' - var err = 0; - try { - MdaPiano.name.postln; - } { - err = 1; + passthru = { + updateScript = gitUpdater { + url = "https://github.com/supercollider/supercollider.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + + tests = { + # test to make sure sclang runs and included plugins are successfully found + sclang-sc3-plugins = let + supercollider-with-test-plugins = supercollider-with-plugins.override { + plugins = with supercolliderPlugins; [ sc3-plugins ]; }; - err.exit; + testsc = writeText "test.sc" '' + var err = 0; + try { + MdaPiano.name.postln; + } { + err = 1; + }; + err.exit; + ''; + in runCommand "sclang-sc3-plugins-test" { } '' + timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out ''; - in runCommand "sclang-sc3-plugins-test" {} '' - timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out - ''; + }; }; meta = with lib; { diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a596d6d770a..c7058817722 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, supercollider, fftw }: +{ stdenv, lib, fetchurl, cmake, supercollider, fftw, gitUpdater }: stdenv.mkDerivation rec { pname = "sc3-plugins"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { stripDebugList = [ "lib" "share" ]; + passthru.updateScript = gitUpdater { + url = "https://github.com/supercollider/sc3-plugins.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 09d07064527..bccba589e03 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "crossguid"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; diff --git a/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch new file mode 100644 index 00000000000..5d41552df37 --- /dev/null +++ b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch @@ -0,0 +1,26 @@ +From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Mon, 3 Oct 2022 22:57:34 +0200 +Subject: [PATCH] Use full path in pkgconfig + +Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch> +--- + PkgConfig.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in +index 381e2343..93860ff0 100644 +--- a/PkgConfig.pc.in ++++ b/PkgConfig.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: Eclipse Cyclone DDS library +-- +2.37.3 + diff --git a/pkgs/development/libraries/cyclondds/default.nix b/pkgs/development/libraries/cyclondds/default.nix new file mode 100644 index 00000000000..64944690839 --- /dev/null +++ b/pkgs/development/libraries/cyclondds/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cyclondds"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds"; + rev = version; + sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268="; + }; + + patches = [ + ./0001-Use-full-path-in-pkgconfig.patch + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Eclipse Cyclone DDS project"; + homepage = "https://cyclonedds.io/"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index e4509d058da..5cab69db676 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index b79c83cbf15..617d51d85ed 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gl3w"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index f92f20f1ee3..cd0320184b0 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.107.1"; + version = "1.108.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; + hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; + hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index f32ee433694..b58c25401c9 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -4,6 +4,8 @@ , SDL , glib , pkg-config + # sdl-config is not available when crossing +, withExamples ? stdenv.buildPlatform == stdenv.hostPlatform }: stdenv.mkDerivation rec { @@ -16,12 +18,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL glib ]; + buildInputs = lib.optional withExamples SDL ++ [ glib ]; - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + configureFlags = lib.optional (!withExamples) "--disable-examples"; meta = { description = "An abstraction library for audio visualisations"; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index ecb247de0ba..905d8330fe4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -10,21 +10,35 @@ cyrus_sasl, libbson, snappy, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.1"; + version = "1.23.2"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; + sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf"; }; # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + # https://github.com/mongodb/mongo-c-driver/pull/1157 + # related: + # https://github.com/NixOS/nixpkgs/issues/144170 + # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths. + postPatch = '' + substituteInPlace src/libmongoc/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + substituteInPlace src/libbson/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; nativeBuildInputs = [cmake pkg-config perl]; - buildInputs = [openssl zlib cyrus_sasl]; + buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security]; propagatedBuildInputs = [libbson snappy]; # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF @@ -35,6 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix index 10f6abd79ef..7b2901b69b7 100644 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 8d02b976c91..532ee7a0957 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 75ffe5ae06a..efa19a2ce19 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev +, withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic @@ -75,7 +76,8 @@ let buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. - ++ lib.optional withPerl perl; + ++ lib.optional withPerl perl + ++ lib.optional withZlib zlib; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -142,6 +144,7 @@ let # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" + ++ lib.optional withZlib "zlib" ; makeFlags = [ diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 8ed0c7a744b..5479502abb2 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }: stdenv.mkDerivation rec { pname = "platform-folders"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index f50f47413b4..4d0cbafe373 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + sha256 = "5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix index 49a00747cfa..e03e17905fa 100644 --- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -20,6 +20,8 @@ buildDunePackage { meta ; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix index ce859d366b0..8b0dbec3927 100644 --- a/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -19,13 +19,14 @@ buildDunePackage rec { pname = "netchannel"; - version = "2.1.1"; + version = "2.1.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz"; - sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs="; + hash = "sha256-lTmwcNKiaq5EdJdM4UaaAVdZ+hTCX5U9MPKY/r3i7fw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 0dfc302a49a..2c4d3bb2351 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.1.1"; + version = "1.0.5"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; + rev = "v${version}"; + sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; }; nativeBuildInputs = [ clang_12 ]; diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 40018a49c8c..52cd1a8cf28 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , dnspython +, deprecat , fetchFromGitHub , loguru , passlib @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.50"; + version = "1.7.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpenning"; repo = pname; - rev = version; - hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg="; + rev = "refs/tags/${version}"; + hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco="; }; postPatch = '' @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib + deprecat dnspython loguru toml @@ -51,6 +53,8 @@ buildPythonPackage rec { # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" + # Path issues with configuration files + "testParse_valid_filepath" ]; pythonImportsCheck = [ @@ -58,8 +62,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Module to parse, audit, query, build, and modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; + changelog = "https://github.com/mpenning/ciscoconfparse/blob/${version}/CHANGES.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix new file mode 100644 index 00000000000..da81c63cca8 --- /dev/null +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, wrapt +}: + +buildPythonPackage rec { + pname = "deprecat"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mjhajharia"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + wrapt + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deprecat" + ]; + + meta = with lib; { + description = "Decorator to deprecate old python classes, functions or methods"; + homepage = "https://github.com/mjhajharia/deprecat"; + changelog = "https://github.com/mjhajharia/deprecat/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix index 8b0425c3881..5b6bce687ea 100644 --- a/pkgs/development/python-modules/fortiosapi/default.nix +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -5,18 +5,23 @@ , packaging , paramiko , pexpect +, pythonOlder , requests +, six }: buildPythonPackage rec { pname = "fortiosapi"; version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fortinet-solutions-cse"; repo = pname; - rev = "v${version}"; - sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k"; + rev = "refs/tags/v${version}"; + hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg="; }; propagatedBuildInputs = [ @@ -25,11 +30,15 @@ buildPythonPackage rec { paramiko packaging oyaml + six ]; # Tests require a local VM doCheck = false; - pythonImportsCheck = [ "fortiosapi" ]; + + pythonImportsCheck = [ + "fortiosapi" + ]; meta = with lib; { description = "Python module to work with Fortigate/Fortios devices"; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index d51e4144854..1b0ec627d3c 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.11.4"; + version = "5.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = "refs/tags/${version}"; - sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; + sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index d65aca69316..a7800b783a8 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "jaconv"; - version = "0.3.1"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikegami-yukino"; repo = pname; - rev = "v${version}"; - hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index eed07e4a38d..b9193d13824 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.2.4"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = version; - hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw="; + hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 51c756db19e..cd1aad3d6a3 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.2"; + version = "14.0.3"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; + hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c720ea4dbcb..9a98f051583 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "7.0.0"; + version = "7.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-sJVAiAQtJ8tU8ZHRU5jzIICnHc6RJwMsvxexnt7b4Yw="; + hash = "sha256-u6xfsWHod8U7nM5S40ZU1z4qxNMlWdq+7yhnAtBh8oE="; }; patches = [ diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 186e468e049..39bdc6ad44e 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.3.3"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-ivqu9b+4FhGa5y+WnKRk4nF6MR4Vj62pSs2d7ycIZMc="; + hash = "sha256-agjerQTSkrpHCleqNUxg+NFiPnf9u9DQrs3vSR917oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index f622dccab29..0401fa3d4cb 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -29,9 +29,15 @@ buildPythonPackage rec { pexpect ]; + nativeBuildInputs = [ + # For cross compilation the doCheck is false and therefor the + # nativeCheckInputs not included. We have to include nose here, since + # setup.py requires nose unconditionally. + nose + ]; + nativeCheckInputs = [ mock - nose pytestCheckHook ] ++ passthru.optional-dependencies.GATTTOOL; diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 389dff30ad1..a3bbd94663c 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-ntnZITj8upzUzlrSTjQxY9xNTU+gJ2rE9PN35cpWwvM="; + hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 4fd3594b882..43e9ab052d5 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -27,6 +27,11 @@ , typer , typing-extensions , wasabi +, writeScript +, stdenv +, nix +, git +, nix-update }: buildPythonPackage rec { @@ -85,7 +90,19 @@ buildPythonPackage rec { "spacy" ]; - passthru.tests.annotation = callPackage ./annotation-test { }; + passthru = { + updateScript = writeScript "update-spacy" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} + + nix-update python3Packages.spacy + + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + ''; + tests.annotation = callPackage ./annotation-test { }; + }; meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP)"; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index d29b7ac7fa8..e44e2300763 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,374 +1,374 @@ [ { "pname": "ca_core_news_lg", - "version": "3.3.0", - "sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l", + "version": "3.5.0", + "sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.3.0", - "sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn", + "version": "3.5.0", + "sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.3.0", - "sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6", + "version": "3.5.0", + "sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.3.0", - "sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw", + "version": "3.5.0", + "sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.3.0", - "sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr", + "version": "3.5.0", + "sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.3.0", - "sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d", + "version": "3.5.0", + "sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.3.0", - "sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy", + "version": "3.5.0", + "sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.3.0", - "sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f", + "version": "3.5.0", + "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.3.0", - "sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in", + "version": "3.5.0", + "sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.3.0", - "sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d", + "version": "3.5.0", + "sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.3.0", - "sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7", + "version": "3.5.0", + "sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.3.0", - "sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda", + "version": "3.5.0", + "sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.3.0", - "sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b", + "version": "3.5.0", + "sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.3.0", - "sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v", + "version": "3.5.0", + "sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.3.0", - "sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3", + "version": "3.5.0", + "sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.3.0", - "sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl", + "version": "3.5.0", + "sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.3.0", - "sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il", + "version": "3.5.0", + "sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.3.0", - "sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw", + "version": "3.5.0", + "sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.3.0", - "sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9", + "version": "3.5.0", + "sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.3.0", - "sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc", + "version": "3.5.0", + "sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.3.0", - "sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14", + "version": "3.5.0", + "sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.3.0", - "sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd", + "version": "3.5.0", + "sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12", "license": "gpl3" }, { "pname": "fr_core_news_lg", - "version": "3.3.0", - "sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j", + "version": "3.5.0", + "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.3.0", - "sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav", + "version": "3.5.0", + "sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.3.0", - "sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz", + "version": "3.5.0", + "sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.3.0", - "sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3", + "version": "3.5.0", + "sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2", "license": "lgpllr" }, { "pname": "it_core_news_lg", - "version": "3.3.0", - "sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1", + "version": "3.5.0", + "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.3.0", - "sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1", + "version": "3.5.0", + "sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.3.0", - "sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h", + "version": "3.5.0", + "sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip", "license": "cc-by-nc-sa-30" }, { "pname": "lt_core_news_lg", - "version": "3.3.0", - "sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85", + "version": "3.5.0", + "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.3.0", - "sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q", + "version": "3.5.0", + "sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.3.0", - "sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy", + "version": "3.5.0", + "sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.3.0", - "sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl", + "version": "3.5.0", + "sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.3.0", - "sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky", + "version": "3.5.0", + "sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.3.0", - "sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5", + "version": "3.5.0", + "sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.3.0", - "sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0", + "version": "3.5.0", + "sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.3.0", - "sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss", + "version": "3.5.0", + "sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.3.0", - "sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5", + "version": "3.5.0", + "sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.3.0", - "sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0", + "version": "3.5.0", + "sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.3.0", - "sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc", + "version": "3.5.0", + "sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.3.0", - "sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1", + "version": "3.5.0", + "sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.3.0", - "sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq", + "version": "3.5.0", + "sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.3.0", - "sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1", + "version": "3.5.0", + "sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.3.0", - "sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s", + "version": "3.5.0", + "sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.3.0", - "sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0", + "version": "3.5.0", + "sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.3.0", - "sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824", + "version": "3.5.0", + "sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.3.0", - "sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl", + "version": "3.5.0", + "sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.3.0", - "sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g", + "version": "3.5.0", + "sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.3.0", - "sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72", + "version": "3.5.0", + "sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.3.0", - "sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm", + "version": "3.5.0", + "sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.3.0", - "sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq", + "version": "3.5.0", + "sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.3.0", - "sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp", + "version": "3.5.0", + "sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.3.0", - "sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0", + "version": "3.5.0", + "sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn", "license": "mit" }, { "pname": "sv_core_news_lg", - "version": "3.3.0", - "sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx", + "version": "3.5.0", + "sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.3.0", - "sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab", + "version": "3.5.0", + "sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.3.0", - "sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7", + "version": "3.5.0", + "sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "3.3.0", - "sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz", + "version": "3.5.0", + "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.3.0", - "sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx", + "version": "3.5.0", + "sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.3.0", - "sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc", + "version": "3.5.0", + "sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.3.0", - "sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q", + "version": "3.5.0", + "sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.3.0", - "sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v", + "version": "3.5.0", + "sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.3.0", - "sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc", + "version": "3.5.0", + "sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb", "license": "mit" } ] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 0e0f1f19640..4110e157d62 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -6,42 +6,72 @@ , sentencepiece , spacy , spacy-pkuseg -, spacy-transformers }: +, spacy-transformers +, writeScript +, stdenv +, jq +, nix +, moreutils +}: let buildModelPackage = { pname, version, sha256, license }: - let - lang = builtins.substring 0 2 pname; - in buildPythonPackage { - inherit pname version; - - src = fetchurl { - url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - inherit sha256; - }; + let + lang = builtins.substring 0 2 pname; + in + buildPythonPackage { + inherit pname version; + + src = fetchurl { + url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + propagatedBuildInputs = [ spacy ] + ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] + ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] + ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + + postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' + substituteInPlace meta.json \ + --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + ''; + + pythonImportsCheck = [ pname ]; - propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] - ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] - ++ lib.optionals (lang == "ru") [ pymorphy2 ] - ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + passthru.updateScript = writeScript "update-spacy-models" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ jq nix moreutils ]} - postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' - substituteInPlace meta.json \ - --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" - ''; + IFS=. read -r major minor patch <<<"${spacy.version}" + spacyVersion="$(echo "$major.$minor.0")" - pythonImportsCheck = [ pname ]; + pushd pkgs/development/python-modules/spacy/ || exit - meta = with lib; { - description = "Models for the spaCy NLP library"; - homepage = "https://github.com/explosion/spacy-models"; - license = licenses.${license}; - maintainers = with maintainers; [ rvl ]; + jq -r '.[] | .pname' models.json | while IFS= read -r pname; do + if [ "$(jq --arg pname "$pname" -r '.[] | select(.pname == $pname) | .version' models.json)" == "$spacyVersion" ]; then + continue + fi + + newHash="$(nix-prefetch-url "https://github.com/explosion/spacy-models/releases/download/$pname-$spacyVersion/$pname-$spacyVersion.tar.gz")" + jq --arg newHash "$newHash" --arg pname "$pname" --arg spacyVersion "$spacyVersion" \ + '[(.[] | select(.pname != $pname)), (.[] | select(.pname == $pname) | .sha256 = $newHash | .version = $spacyVersion)] | sort_by(.pname)' \ + models.json | sponge models.json + done + + popd || exit + ''; + + meta = with lib; { + description = "Models for the spaCy NLP library"; + homepage = "https://github.com/explosion/spacy-models"; + license = licenses.${license}; + maintainers = with maintainers; [ rvl ]; + }; }; - }; makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); -in makeModelSet (lib.importJSON ./models.json) - -# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url +in +makeModelSet (lib.importJSON ./models.json) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index c7e506e3ca2..c65563d6e6a 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -2,20 +2,24 @@ , buildPythonPackage , fetchPypi , nose +, setuptools , arrow , requests , units +, pint +, pydantic , pytz , six }: buildPythonPackage rec { pname = "stravalib"; - version = "1.1.0"; + version = "1.2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; + sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; nativeCheckInputs = [ @@ -26,7 +30,10 @@ buildPythonPackage rec { arrow requests units + pint + pydantic pytz + setuptools six ]; @@ -36,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; - homepage = "https://github.com/hozn/stravalib"; + homepage = "https://github.com/stravalib/stravalib"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index bbc7087ba2c..8cd3231bea0 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -18,7 +18,7 @@ # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, cudaPackages ? {} -, mklSupport ? false, mkl ? null +, mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport @@ -39,8 +39,6 @@ assert cudaSupport -> cudatoolkit != null # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); -assert mklSupport -> mkl != null; - let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 91b360f936e..7889a8ab03e 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests-cache , pytest }: buildPythonPackage rec { pname = "tvdb_api"; - version = "3.1.0"; + version = "3.2.0-beta"; - src = fetchPypi { - inherit pname version; - sha256 = "f63f6db99441bb202368d44aaabc956acc4202b18fc343a66bf724383ee1f563"; + src = fetchFromGitHub { + owner = "dbr"; + repo = "tvdb_api"; + rev = "ce0382181a9e08a5113bfee0fed2c78f8b1e613f"; + sha256 = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8="; }; propagatedBuildInputs = [ requests-cache ]; @@ -26,7 +28,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; - # https://github.com/dbr/tvdb_api/issues/94 - broken = true; }; } diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix new file mode 100644 index 00000000000..10c79c53209 --- /dev/null +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-pillow"; + version = "9.4.0.12"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "types-Pillow"; + sha256 = "sha256-4AdBSdXwbTWTwRisyD41P4VCvMc1dv/vtlaOqrVnE0g="; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "PIL-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for Pillow"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ arjan-s ]; + }; +} diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 8dfbd418157..aa59481b8ed 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.16.3"; + version = "0.16.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yk3rEOcHIEZLz3qKxeGzHuVUWWxG3GhSt9vc0pXcanQ="; + hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 4381dd83b62..9c692713609 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: https://rubygems.org/ specs: parallel (1.22.1) - pg (1.4.4) - pgsync (0.7.2) + pg (1.4.5) + pgsync (0.7.3) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.9.3) + slop (4.10.0) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index f556be4eb99..3224efedfc1 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78"; + sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.3"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; + sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; type = "gem"; }; - version = "4.9.3"; + version = "4.10.0"; }; tty-cursor = { groups = ["default"]; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 1f26f23e15c..1d59373f30a 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE="; + sha256 = "sha256-nxQ060M5TEUMKtJZ1j3A3v3s1cW1mnHy0/2ZXbxoaMc="; }; - cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc="; + cargoSha256 = "sha256-D/rY9d50uKkheEeHe6S04TSdmTyUVgrABIYrFOuZudY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 55b63dadad9..a582ce805a9 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.22"; + version = "1.0.23"; src = fetchCrate { inherit pname version; - sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw="; + sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4="; }; - cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U="; + cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; homepage = "https://github.com/dtolnay/cargo-tally"; + changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 614d9823f9f..7d496a5ec96 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -145,6 +145,9 @@ in buildFHSUserEnv rec { xorg.libXxf86vm libelf + # pressure-vessel (required for mangohud and possibly more) + elfutils.out + # Required glib gtk2 diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix index ad6cdf9bfa6..f9ac2181a41 100644 --- a/pkgs/misc/kitty-themes/default.nix +++ b/pkgs/misc/kitty-themes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2022-08-11"; + version = "unstable-2023-01-08"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = pname; - rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14"; - sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60="; + rev = "e0bb9d751033e82e455bf658744872c83f04b89d"; + sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 20679b3c951..78fe1ad0b99 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -70,12 +70,22 @@ let PM_ADVANCED_DEBUG = yes; PM_WAKELOCKS = yes; POWERCAP = yes; + # ACPI Firmware Performance Data Table Support + ACPI_FPDT = whenAtLeast "5.12" yes; + # ACPI Heterogeneous Memory Attribute Table Support + ACPI_HMAT = whenAtLeast "5.2" yes; + # ACPI Platform Error Interface + ACPI_APEI = yes; + # APEI Generic Hardware Error Source + ACPI_APEI_GHES = yes; } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; + # Intel DPTF (Dynamic Platform and Thermal Framework) Support + ACPI_DPTF = whenAtLeast "5.10" yes; }; external-firmware = { diff --git a/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch new file mode 100644 index 00000000000..2b59a508fda --- /dev/null +++ b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch @@ -0,0 +1,87 @@ +From 1640688018f329559c61352646f283f98938af31 Mon Sep 17 00:00:00 2001 +From: Cole Helbling <cole.helbling@determinate.systems> +Date: Thu, 16 Feb 2023 09:30:21 -0800 +Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed" + +This reverts commit 425c9bd06b7a70796d880828d15c11321bdfb76d. + +Some Equinix Metal instances, such as a3.large.x86, m3.large.x86 +(specific hardware revisions), and n3.large.x86, use the `ice` kernel +driver for their network cards, in conjunction with bonded devices. +However, this commit caused a regression where these bonded devices +would deadlock. This was initially reported by Jaroslav Pulchart on +the netdev mailing list[1], and there were follow-up patches from Dave +Ertman[2][3] that attempted to fix this but were not up to snuff for +various reasons[4]. + +Specifically, v2 of the patch ([3]) appears to fix the issue on some +devices (tested with 8086:159B network cards), while it is still broken +on others (such as an 8086:1593 network card). + +We revert the patch exposing the issue until upstream has a working +solution in order to make Equinix Metal instances work reliably again. + +[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/ +[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/ +[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/ +[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c +--- + drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c +index c5971a840b87..911902d2b93e 100644 +--- a/drivers/infiniband/hw/irdma/verbs.c ++++ b/drivers/infiniband/hw/irdma/verbs.c +@@ -60,6 +60,36 @@ static int irdma_query_device(struct ib_device *ibdev, + return 0; + } + ++/** ++ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed ++ * @link_speed: netdev phy link speed ++ * @active_speed: IB port speed ++ * @active_width: IB port width ++ */ ++static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed, ++ u8 *active_width) ++{ ++ if (link_speed <= SPEED_1000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_SDR; ++ } else if (link_speed <= SPEED_10000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_FDR10; ++ } else if (link_speed <= SPEED_20000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_DDR; ++ } else if (link_speed <= SPEED_25000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_EDR; ++ } else if (link_speed <= SPEED_40000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_FDR10; ++ } else { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_EDR; ++ } ++} ++ + /** + * irdma_query_port - get port attributes + * @ibdev: device pointer from stack +@@ -87,9 +117,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port, + props->state = IB_PORT_DOWN; + props->phys_state = IB_PORT_PHYS_STATE_DISABLED; + } +- +- ib_get_eth_speed(ibdev, port, &props->active_speed, +- &props->active_width); ++ irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed, ++ &props->active_width); + + if (rdma_protocol_roce(ibdev, 1)) { + props->gid_tbl_len = 32; +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f941ca9f007..5912abf4181 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,9 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + fix-em-ice-bonding = { + name = "fix-em-ice-bonding"; + patch = ./fix-em-ice-bonding.patch; + }; } diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index a187259db69..21247ce2aff 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90="; + hash = "sha256-UIAsij4fFxGAoKluQFAtrfgKIteM+LQtAKRDvRaNLSg="; }; - cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8="; + cargoHash = "sha256-NtPI8MZNUn+QYPuG9WNMVZJW6jmyi5gEfNw8MrkiwUQ="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; doCheck = false; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 7d629ddb68e..9958201c071 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -179,8 +179,6 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_DIR=/tmp ''; - checkTarget = "ptest"; - outputs = [ "out" "dev" "doc" ]; passthru = { diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 1def48d46d9..e8a9a6fc09c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-pz9eHmd7GC30r0uUObOlrcdkAX4c+szjYAXS1U999CE="; + hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 582ec11231c..c76295cec83 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -95,11 +95,12 @@ stdenv.mkDerivation rec { zlib ]; mesonFlags = [ - "-Dxwayland_eglstream=true" - "-Ddefault_font_path=${defaultFontPath}" - "-Dxkb_bin_dir=${xkbcomp}/bin" - "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" - "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" + (lib.mesonBool "xwayland_eglstream" true) + (lib.mesonOption "default_font_path" defaultFontPath) + (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") + (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb") + (lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled") + (lib.mesonBool "libunwind" (libunwind != null)) ]; meta = with lib; { diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 8009118be6b..b64980a1b54 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.23"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.10.0"; # 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; - hash = "sha256-OaZ8Eax8XE4xGs5yHh+1P8mwEfHkFNEtY6ZGLQc8Thk="; + hash = "sha256-W05ZxpqamYqtFY/2mV2+XODCeuWRE9KhMdMkaAGAiTU="; }; nativeBuildInputs = [ @@ -64,10 +64,7 @@ with py.pkgs; buildPythonApplication rec { ]; postPatch = '' - sed -i pyproject.toml \ - -e 's/colorama.*/colorama",/' \ - -e 's/cryptography.*/cryptography",/' \ - -e 's/distro.*/distro",/' + substituteInPlace pyproject.toml --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" ''; postInstall = '' diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index a0db37fba54..9f164d86140 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.10"; + version = "5.11"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU="; + hash = "sha256-6z6C1nWmnHLdLtLf7l1f4riGhuP2J2mt8mVWZIiege0="; }; vendorSha256 = null; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 3ee17eb630a..ac5855304f4 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -7,14 +7,15 @@ , libjpeg , gd , freetype +, runCommand }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ploticus"; version = "2.42"; src = fetchurl { - url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz"; + url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_src.tar.gz"; sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; @@ -42,6 +43,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postPatch = '' + substituteInPlace src/pl.h --subst-var out + ''; + preBuild = '' cd src ''; @@ -62,6 +67,16 @@ stdenv.mkDerivation rec { ln -s "pl" "$out/bin/ploticus" ''; + passthru.tests = { + prefab = runCommand "ploticus-prefab-test" { + buildInputs = [ finalAttrs.finalPackage ]; + } '' + # trivial test to see if the prefab path munging works + mkdir $out/ + pl -prefab scat inlinedata="A 1 2" x=2 y=3 -png -o $out/out.png + ''; + }; + meta = with lib; { description = "A non-interactive software package for producing plots and charts"; longDescription = '' @@ -77,4 +92,4 @@ stdenv.mkDerivation rec { homepage = "https://ploticus.sourceforge.net/"; platforms = with platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index c690df170b8..131db58c0b8 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -1,22 +1,32 @@ { lib , fetchFromGitHub , buildGoModule +, testers +, gh-dash }: buildGoModule rec { pname = "gh-dash"; - version = "3.6.0"; + version = "3.7.6"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-pQd41uQdfkbqIjdUIwUnKS/Qso495Ips8P2CXPd8JRU="; + hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg="; }; vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/dlvhdr/gh-dash/cmd.Version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { package = gh-dash; }; + }; meta = { description = "gh extension to display a dashboard with pull requests and issues"; diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix index 204914c280c..abe5c75f8b8 100644 --- a/pkgs/tools/misc/tvnamer/default.nix +++ b/pkgs/tools/misc/tvnamer/default.nix @@ -4,16 +4,20 @@ let python' = python3.override { - packageOverrides = self: super: rec { + packageOverrides = final: prev: rec { # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6 - requests-cache = super.requests-cache.overridePythonAttrs (super: rec { + requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec { version = "0.5.2"; - src = self.fetchPypi { - inherit (super) pname; + src = final.fetchPypi { + inherit (oldAttrs) pname; inherit version; sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs="; }; + nativeBuildInputs = with final; [ + setuptools + ]; + # too many changes have been made to requests-cache based on version 0.6 so # simply disable tests doCheck = false; diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 3a7d51f4c7c..4d1783b53ac 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -2,15 +2,16 @@ let pname = "via"; - version = "2.0.5"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs="; + sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; profile = '' diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 09771083f1c..d9331a8c28a 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -13,6 +13,7 @@ , ffmpegSupport ? true , rtmpSupport ? true , withAlias ? false # Provides bin/youtube-dl for backcompat +, update-python-libraries }: buildPythonPackage rec { @@ -53,6 +54,8 @@ buildPythonPackage rec { ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; + passthru.updateScript = [ update-python-libraries (toString ./.) ]; + meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py index 56b68ba27a5..1c58accb416 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -10,6 +10,7 @@ from typing import Any, Dict from .md import Converter from . import manual from . import options +from . import parallel def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: print(f"\x1b[1;31m{_desc_text}:\x1b[0m", file=sys.stderr) @@ -35,6 +36,7 @@ def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: def main() -> None: parser = argparse.ArgumentParser(description='render nixos manual bits') + parser.add_argument('-j', '--jobs', type=int, default=None) commands = parser.add_subparsers(dest='command', required=True) @@ -43,6 +45,7 @@ def main() -> None: args = parser.parse_args() try: + parallel.pool_processes = args.jobs if args.command == 'options': options.run_cli(args) elif args.command == 'manual': diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py index 3cba36140bb..8282d749324 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import argparse import json @@ -10,6 +12,7 @@ from xml.sax.saxutils import escape, quoteattr import markdown_it +from . import parallel from .docbook import DocBookRenderer, make_xml_id from .manpage import ManpageRenderer, man_escape from .md import Converter, md_escape @@ -148,15 +151,33 @@ class BaseConverter(Converter): return [ l for part in blocks for l in part ] + # this could return a TState parameter, but that does not allow dependent types and + # will cause headaches when using BaseConverter as a type bound anywhere. Any is the + # next best thing we can use, and since this is internal it will be mostly safe. + @abstractmethod + def _parallel_render_prepare(self) -> Any: raise NotImplementedError() + # this should return python 3.11's Self instead to ensure that a prepare+finish + # round-trip ends up with an object of the same type. for now we'll use BaseConverter + # since it's good enough so far. + @classmethod + @abstractmethod + def _parallel_render_init_worker(cls, a: Any) -> BaseConverter: raise NotImplementedError() + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: try: return RenderedOption(option['loc'], self._convert_one(option)) except Exception as e: raise Exception(f"Failed to render option {name}") from e + @classmethod + def _parallel_render_step(cls, s: BaseConverter, a: Any) -> RenderedOption: + return s._render_option(*a) + def add_options(self, options: dict[str, Any]) -> None: - for (name, option) in options.items(): - self._options[name] = self._render_option(name, option) + mapped = parallel.map(self._parallel_render_step, options.items(), 100, + self._parallel_render_init_worker, self._parallel_render_prepare()) + for (name, option) in zip(options.keys(), mapped): + self._options[name] = option @abstractmethod def finalize(self) -> str: raise NotImplementedError() @@ -194,6 +215,13 @@ class DocBookConverter(BaseConverter): self._varlist_id = varlist_id self._id_prefix = id_prefix + def _parallel_render_prepare(self) -> Any: + return (self._manpage_urls, self._revision, self._markdown_by_default, self._document_type, + self._varlist_id, self._id_prefix) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> DocBookConverter: + return cls(*a) + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: if lit := option_is(option, key, 'literalDocBook'): return [ f"<para><emphasis>{key.capitalize()}:</emphasis> {lit['text']}</para>" ] @@ -283,10 +311,19 @@ class ManpageConverter(BaseConverter): _options_by_id: dict[str, str] _links_in_last_description: Optional[list[str]] = None - def __init__(self, revision: str, markdown_by_default: bool): - self._options_by_id = {} + def __init__(self, revision: str, markdown_by_default: bool, + *, + # only for parallel rendering + _options_by_id: Optional[dict[str, str]] = None): + self._options_by_id = _options_by_id or {} super().__init__({}, revision, markdown_by_default) + def _parallel_render_prepare(self) -> Any: + return ((self._revision, self._markdown_by_default), { '_options_by_id': self._options_by_id }) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> ManpageConverter: + return cls(*a[0], **a[1]) + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: assert isinstance(self._md.renderer, OptionsManpageRenderer) links = self._md.renderer.link_footnotes = [] diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py new file mode 100644 index 00000000000..c968d3a1322 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py @@ -0,0 +1,58 @@ +# this module only has to exist because cpython has a global interpreter lock +# and markdown-it is pure python code. ideally we'd just use thread pools, but +# the GIL prohibits this. + +import multiprocessing + +from typing import Any, Callable, ClassVar, Iterable, Optional, TypeVar + +R = TypeVar('R') +S = TypeVar('S') +T = TypeVar('T') +A = TypeVar('A') + +pool_processes: Optional[int] = None + +# this thing is impossible to type because there's so much global state involved. +# wrapping in a class to get access to Generic[] parameters is not sufficient +# because mypy is too weak, and unnecessarily obscures how much global state is +# needed in each worker to make this whole brouhaha work. +_map_worker_fn: Any = None +_map_worker_state_fn: Any = None +_map_worker_state_arg: Any = None + +def _map_worker_init(*args: Any) -> None: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + (_map_worker_fn, _map_worker_state_fn, _map_worker_state_arg) = args + +# NOTE: the state argument is never passed by any caller, we only use it as a localized +# cache for the created state in lieu of another global. it is effectively a global though. +def _map_worker_step(arg: Any, state: Any = []) -> Any: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + # if a Pool initializer throws it'll just be retried, leading to endless loops. + # doing the proper initialization only on first use avoids this. + if not state: + state.append(_map_worker_state_fn(_map_worker_state_arg)) + return _map_worker_fn(state[0], arg) + +def map(fn: Callable[[S, T], R], d: Iterable[T], chunk_size: int, + state_fn: Callable[[A], S], state_arg: A) -> list[R]: + """ + `[ fn(state, i) for i in d ]` where `state = state_fn(state_arg)`, but using multiprocessing + if `pool_processes` is not `None`. when using multiprocessing is used the state function will + be run once in ever worker process and `multiprocessing.Pool.imap` will be used. + + **NOTE:** neither `state_fn` nor `fn` are allowed to mutate global state! doing so will cause + discrepancies if `pool_processes` is not None, since each worker will have its own copy. + + **NOTE**: all data types that potentially cross a process boundary (so, all of them) must be + pickle-able. this excludes lambdas, bound functions, local functions, and a number of other + types depending on their exact internal structure. *theoretically* the pool constructor + can transfer non-pickleable data to worker processes, but this only works when using the + `fork` spawn method (and is thus not available on darwin or windows). + """ + if pool_processes is None: + state = state_fn(state_arg) + return [ fn(state, i) for i in d ] + with multiprocessing.Pool(pool_processes, _map_worker_init, (fn, state_fn, state_arg)) as p: + return list(p.imap(_map_worker_step, d, chunk_size)) diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 77fed6e67e7..c7e9581d99b 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "apx"; - version = "1.4.2"; + version = "1.7.0-1"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; - rev = version; - sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + rev = "v${version}"; + hash = "sha256-tonI3S0a08MbR369qaKS2BoWc3QzXWzTuGx/zSgUz7s="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 9b3a9a44d9c..f73710c1d19 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.56.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-xNv4pI6iT6lNmjeUIW8ObPFJw9H1SiVTg9fRx6Osiwc="; + hash = "sha256-NACasOoCABoHmb4U5LvQ8EPO7G10A7uQtX4th/WJqrw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-Sez5jNFdL11cHBBPcY0b8qUiupmjPo9MHwUUi7FaNiA="; + vendorHash = "sha256-DLY0tcacGFcP17IqUVvpVkUjd2xQMO5JZxltmL4b+Wo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 8f5e48ee37e..1a7e45c8024 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hologram"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; rev = version; - sha256 = "sha256-rdV/oVo+M5ALyU3a3XlA4kt+TLg0Rnr7/qDyZ9iuIb4="; + hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4="; }; postPatch = '' @@ -17,14 +17,14 @@ buildGoModule rec { rm -f agent/metadata_service_test.go server/persistent_ldap_test.go server/server_test.go ''; - vendorSha256 = "sha256-pEYMpBiNbq5eSDiFT+9gMjGHDeTzWIej802Zz6Xtays="; + vendorHash = "sha256-HI5+02qSQVLy6ZKaFjy1bWtvVk5bqMBg1umu2ic5HuY="; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aaronjheng ]; license = licenses.asl20; }; } diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 18c32b9a9d9..948040deecb 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, callPackage, newScope, Agda }: +{ pkgs, lib, newScope, Agda }: let mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); mkAgdaPackages' = Agda: self: let - callPackage = self.callPackage; + inherit (self) callPackage; inherit (callPackage ../build-support/agda { inherit Agda self; inherit (pkgs.haskellPackages) ghcWithPackages; @@ -13,10 +13,7 @@ let lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); - agda = withPackages [] // { - inherit withPackages; - passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); - }; + agda = withPackages []; standard-library = callPackage ../development/libraries/agda/standard-library { inherit (pkgs.haskellPackages) ghcWithPackages; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361eacc84d3..6a346ba031f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2267,6 +2267,8 @@ with pkgs; xcpc = callPackage ../applications/emulators/xcpc { }; + xemu = callPackage ../applications/emulators/xemu { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; zesarux = callPackage ../applications/emulators/zesarux { }; @@ -3093,6 +3095,8 @@ with pkgs; cuelsp = callPackage ../development/tools/cuelsp {}; + cyclondds = callPackage ../development/libraries/cyclondds { }; + cyclone-scheme = callPackage ../development/interpreters/cyclone { }; cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; @@ -4960,6 +4964,8 @@ with pkgs; invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; + iotas = callPackage ../applications/office/iotas { }; + iotools = callPackage ../tools/misc/iotools { }; irpf = callPackage ../applications/finance/irpf { }; @@ -8865,6 +8871,8 @@ with pkgs; kubepug = callPackage ../development/tools/kubepug { }; + kubeshark = callPackage ../applications/networking/cluster/kubeshark { }; + kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; kubo = callPackage ../applications/networking/kubo { }; @@ -10359,7 +10367,11 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { + # Build currently fails on Go > 1.18 + # See https://github.com/evilsocket/opensnitch/issues/851 + buildGoModule = buildGo118Module; + }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -10476,6 +10488,15 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + openrgb-with-all-plugins = openrgb.withPlugins [ + openrgb-plugin-effects + openrgb-plugin-hardwaresync + ]; + + openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { }; + + openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; + openrussian-cli = callPackage ../misc/openrussian-cli { lua = lua5_3; }; @@ -12253,7 +12274,9 @@ with pkgs; sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { }; + sslscan = callPackage ../tools/security/sslscan { + openssl = openssl.override { withZlib = true; }; + }; sslmate = callPackage ../development/tools/sslmate { }; @@ -15039,7 +15062,9 @@ with pkgs; graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; - buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { }; + buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { + graalvmDrv = graalvm-ce; + }).override; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 56225b6d424..07b221caba7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -148,6 +148,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; @@ -169,6 +170,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bb654b8dc5..28812e16540 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2375,6 +2375,8 @@ self: super: with self; { deploykit = callPackage ../development/python-modules/deploykit { }; + deprecat = callPackage ../development/python-modules/deprecat { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; @@ -10806,7 +10808,9 @@ self: super: with self; { spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { + inherit (pkgs) jq; + }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; @@ -11834,6 +11838,8 @@ self: super: with self; { types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + types-pillow = callPackage ../development/python-modules/types-pillow { }; + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; types-psutil = callPackage ../development/python-modules/types-psutil { }; |