diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-10 18:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-10 18:01:45 +0000 |
| commit | da9d5848454b49d3f4b9e9e8f7421110516f36b4 (patch) | |
| tree | 66f9a7f9c44be41e15f4dcec1d7e3a5749fb8f9b /pkgs | |
| parent | 939ef9894d4cc313bceb33fc1ca80c3fc648fa75 (diff) | |
| parent | ace14e0119b4ec251749544e6c37443c44c95bf7 (diff) | |
| download | nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar.gz nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar.bz2 nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar.lz nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar.xz nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.tar.zst nixpkgs-da9d5848454b49d3f4b9e9e8f7421110516f36b4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
64 files changed, 1283 insertions, 484 deletions
diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index ae4454a6dc0..8e6ab17fbda 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitea , fetchpatch , cmake , wxGTK32 @@ -30,7 +30,7 @@ , expat , libid3tag , libopus -, ffmpeg_4 +, ffmpeg_5 , soundtouch , pcre , portaudio @@ -49,32 +49,27 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "unstable-2022-06-30"; + version = "1.3-beta2"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "tenacityteam"; repo = pname; - rev = "91f8b4340b159af551fff94a284c6b0f704a7932"; - sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE="; + rev = "v${version}"; + sha256 = "sha256-9gWoqFa87neIvRnezWI3RyCAOU4wKEHPn/Hgj3/fol0="; }; - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659"; - postFetch = "echo >> $out"; - sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww="; - }) - ]; - postPatch = '' - touch src/RevisionIdent.h + mkdir -p build/src/private + touch build/src/private/RevisionIdent.h - substituteInPlace src/FileNames.cpp \ - --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + substituteInPlace libraries/lib-files/FileNames.cpp \ + --replace /usr/include/linux/magic.h \ + ${linuxHeaders}/include/linux/magic.h ''; postFixup = '' - rm $out/tenacity + rm $out/audacity wrapProgram "$out/bin/tenacity" \ --suffix AUDACITY_PATH : "$out/share/tenacity" \ --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ @@ -90,7 +85,6 @@ stdenv.mkDerivation rec { "-lavdevice" "-lavfilter" "-lavformat" - "-lavresample" "-lavutil" "-lpostproc" "-lswresample" @@ -110,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib expat - ffmpeg_4 + ffmpeg_5 file flac glib diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7e6e75d970f..45a2fdd9baa 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-04-04"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "b1d0ec290e0b6506b9c608c02462d6c4568120f0"; - sha256 = "002fpqxk6wn3x8x7gc5fzqibg8agyd0lj72d1ckkj413ags45pll"; + rev = "3ea19ba666e226ac33c8e00c7bf99e81931d7c86"; + sha256 = "0jfa9z7iq32i8ydyxb2d6psmcgifhyhkigpa99n216j4m5m8azmy"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -125,12 +125,12 @@ final: prev: Ionide-vim = buildVimPluginFrom2Nix { pname = "Ionide-vim"; - version = "2022-11-24"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "a66845162ae4c2ad06d76e003c0aab235aac2ede"; - sha256 = "1hiq3h2ahwzfhci9lmxg3if78h7kb8cn6sab356qzyh6z2saxcvm"; + rev = "d41ef95b9732109bf6406c5e959492f31f09ce36"; + sha256 = "0dbfq26kgm4yb6837l8x73psflb65pp6a5cmixg4gw5ni9wzal7i"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-04-03"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "5487658767dd6932ad30b399f0d3b3e68f927793"; - sha256 = "1pip6f6a9slbqjb7ck0ff17s6vk2p2zl2gpc5ir7xq7ilhcimbm3"; + rev = "a592fbe98959d13014b022ec1b1418498309019c"; + sha256 = "0adx845p0vwyrzqx3ncl34dsmaac036bh0ydb6ib4kn3j5fq3slq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-04-04"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "cd45afc46b67992f8da5fbea285935ffdeb5572a"; - sha256 = "1i0808v51ljil0j3lvmq26mi51cgwv01ikcixsxm0ybzznnx8x0x"; + rev = "2cf2f0a9875c66c5179dda0c86143af3bc5ae119"; + sha256 = "0i7fhy0l94x3nd5wmzfmw4aqqrj2aw8vvhb8cdghyh8mqddbqj8n"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-03-20"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "9f4d1011ce90f76cb91f8cfc3db63c7557672efa"; - sha256 = "1ircjhjw0q132y9gih9i8m1q17pg148a5vfbbs8nzhxsbl5l61k5"; + rev = "b3e8838ec90d6b017b3b99715fdb2463d2de730f"; + sha256 = "1yf5h3l273hws5vhfsfigghcva5nb7fxyx3isj0dv5xx8lvgqsdq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -523,12 +523,12 @@ final: prev: ai-vim = buildVimPluginFrom2Nix { pname = "ai.vim"; - version = "2023-03-20"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "03e5f7ee4a34208148e3d51521dfcf9c674e82f9"; - sha256 = "1p1a28z5whk6srxnn5xlcrn9zxijj43hlrn4m6v2s6n1nj7az73y"; + rev = "17a61d5bd8b84791b7db6757abefb763f98a4fd1"; + sha256 = "0jnycmfmml8ba345s76wh4nrlf5jb5pmpyl5l2sg9fyqw2lz5r36"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -547,12 +547,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-04-02"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "b0ba31f88e09c033630ac15ae07143af7f658072"; - sha256 = "1hv88a37xxwmf5rwl24hpv92gy5b9il6bcc5yxxxfi5hrys7fma1"; + rev = "57254db9ef1e0b0bf21466ed2d3ebaf60338768f"; + sha256 = "01n04zi55y6nrg2dg2jpfacs7a140wa0m8rfkingdvx59n5g3j6j"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -859,24 +859,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-04-05"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "a074bc40869debfba2e8c80f93d031a7805a6dc3"; - sha256 = "1fg2rw0q6592w6iw11fm0j6nz4nffij665sslvikmq6q5d2x9nag"; + rev = "5c359a9915937ba798a38a56059685d53bc00ed5"; + sha256 = "039q2i6imd5bwjgybpa18lmlwjslm4z9war04xsm4hc8pcallj4q"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-03-30"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "a0e19486ccc1fb134f6ef7bf914d07bbb462e346"; - sha256 = "05f97ck17wlznig0iy6m1l6j7p0y78mm4gr7kc04xdq75042n351"; + rev = "5975a2da9240ad7642e4dc88f0647aca3c1bd5b8"; + sha256 = "1r6zkprwvdh5phcnwf5b47wfi5gfg0w3y60pz8kakp7k7hh8yiz0"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1159,12 +1159,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2023-03-25"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "425c8430771321b610ca068a7594668d7a7ea3d6"; - sha256 = "0si9cmpmh8jjiac3654v5avxyf9lsxdqmgv74h47blzwzn8dgrmn"; + rev = "01b9ac1dc6c181f6982eddd57deb1fc7f92d7a70"; + sha256 = "0paw8yf67ir96j8krka38m457254nkxr82pbrb8axwwwysz70nk2"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1675,12 +1675,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2023-03-26"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "c8e3a74b51597d69d240085a258636972ce98e15"; - sha256 = "0xb4bvh49z26cpi005q6ma0mv9mw49npcrayvd3c6pcdgr148p5p"; + rev = "389eadd48c27aa6dc0e6b992644704f026802a2e"; + sha256 = "0kbxjpw7j90pgvwmx3cb47jkk01wx5q6fqr660llinqc1vmj1rsq"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -2119,12 +2119,12 @@ final: prev: copilot-cmp = buildVimPluginFrom2Nix { pname = "copilot-cmp"; - version = "2023-04-03"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "308f3cf8d62a7dc2c711bd517b8cf3b0c970ef2b"; - sha256 = "1f7z512d0fy1q9bf70qba6jd9ha5mvif2zg1xjy3k023lz7xfh76"; + rev = "99467081478aabe4f1183a19a8ba585e511adc20"; + sha256 = "0qz25r7c53wppfbhrv5qhpfg0jxlqp8c1ixyc8ggkvw4bzc97lp6"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; @@ -2155,24 +2155,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "82e29fb9443f41573483fa83e39490d7a6324c8c"; - sha256 = "1y9kx1dk0gjqzlk99zjxaiwigws6rdsnw2xq57ayp2clv40riyr3"; + rev = "be72c7ad5d8dfe942fd5aec89505805c2e474b93"; + sha256 = "1q7hz1pj7rs1d2d53rk624qqmz0cglqxlh578b4ik9k87i0bfpzx"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "83b1b7b9545b94f20df42b4ef224de576e628aaf"; - sha256 = "1dnl4m03y8iddckjj1210hfas1ri2zhxcvlysd3x5qz6c8hdx4y7"; + rev = "ee47eb595100b311ebd81d7285304d58bf28db29"; + sha256 = "14i9mz2m4zq80ak2f9x71wc86r6kaf93kc7lc7jkhjllfpr537i8"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2191,12 +2191,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "45137deb2a34a8b1482fa0f49927e171223a9173"; - sha256 = "1k0dy5s26hnbb0qvq1ny081l17ahj4y8qfl9rsvvmhhrp49l2vfa"; + rev = "4c764a092b0a64ad45d69273fde35224cfb89861"; + sha256 = "064qcl093hv2hpfkxh34a53v2ww5hmgvcwarvgn2zs7r0r9wrqyk"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2335,12 +2335,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-29"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "4c2b038c5cfa70f90506f1551e5fd2d040174e08"; - sha256 = "1c3nvgp1g4pycg7cswjr41d0bqp3p3yaibna59nn2125v729fpjp"; + rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d"; + sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2709,24 +2709,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-03-28"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "0fb00f58591e6d28a8e344984403b3e390df2458"; - sha256 = "0mmd4xc93hgqlm0pykp8vaxkqm86ih8qbzbazvd4a12yfrx6fzjv"; + rev = "f4a5fe6424d3951607952d03c7d6595c7f721232"; + sha256 = "04j3rsrfcl7vbnkdjnhmcznw57l0b4v7mjpx2hfpz5xg1ck7v5y6"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-04-04"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "9aeef888e7c7b7cb14196bea86d53999f8b7de85"; - sha256 = "17wds8cfnl60sln89yf1r2v34p7az6yk6zdlb51w8pvwjalkvwc6"; + rev = "6bebefbc4c90e6d2b8c65e65b055d284475d89f8"; + sha256 = "0rpfy4cc6wb443y73gncb4l6iq82mka1gmblagknycrk64ycinaw"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2781,12 +2781,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-04-04"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "c705b3890779ea05bd910e9d06af8a209bfb6ad8"; - sha256 = "0k3khnwzngrrkx5sl38ci0r7i15nkz52hyc7h2163qqgpjq7hh01"; + rev = "91b9ba8a9474d2c4156dc2f3e858e07ae8faecf0"; + sha256 = "09cwg5vfccacxqm5y6k28f3kvmx80mczd1c7j4srdi824mqj9ffa"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2805,12 +2805,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-03-23"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2da3ba0d8b45a722db9d8e868a90dc0a9e28efec"; - sha256 = "1d3fljmw3nzv2ni2qsxd33z758bzraha0ykdngf9ck7jxjs19y5m"; + rev = "bdebafb8229403a1e138344802b6817b1cf660e8"; + sha256 = "0lm032db2f4kppdlpbn2w8gshbfp42y52y76py42r4y0xvls413n"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2891,12 +2891,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-03-23"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "2bb00fed357891e37a2f1313cd77e008ad353006"; - sha256 = "0nq91h3941rzk5bclizfqbklfvx3ikhr9nlf2zgg8cwrkfv4779l"; + rev = "3e259a9a606778cd9181ecb65301ec92af8a1681"; + sha256 = "0y49w7h0ng7xf5lgns218477xl71an9zllrkfnmjh105dapgbadk"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3048,12 +3048,12 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-04-03"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "fc9af19a02594bc0ef32a6b8e609e4bd0a9ce1f1"; - sha256 = "04qmjgfjcknrpssi6wz0za4h7bfkqdahm5hcqry97id11irvlz28"; + rev = "3508beaa48d316937d8332d17f7ddc1b7d3f9a83"; + sha256 = "1npwcscw01r109vlgkfk5wziwr31nscz3xv0k7gjhpb09chnrb43"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3264,12 +3264,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-04-04"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "e330c9aef615ec0728e4d69239676fb5b4783abc"; - sha256 = "0kws8dp4arh0sqs6fpsivwy2h7na57gsxlvikfxwip066hh0w3si"; + rev = "04d5a528a4159901607c11d46a398f45db2ed43f"; + sha256 = "0livhcb4mq4smkq3sqpsm96zdj0d25yx36gb3fv7mvyqlmfs45h1"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3360,12 +3360,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-03-26"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "8cb8dc053b7b24eac457395e3c535fdbcd95e97e"; - sha256 = "1mxpg3w9b5qizc277j3cr1fbdfzaxxr43gqnl1mah9sdr07s5djq"; + rev = "06c20ea71a4519fc60caba9ac688f2f6404f03d5"; + sha256 = "0s1iz769a287yi0gk5zffp8k78d19c8sgp75f88xbbppmbjaksm1"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3444,12 +3444,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-03-29"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "eb450d62cec8e78dc6129c2d41a1b2ffd2caafed"; - sha256 = "0k3mmjls51pxdxglrc3s4gxnrjd98997xzj2xrrhb8pzmsbmyzzm"; + rev = "9bf10d6924e342cc7304f4c033f8a207a57b2648"; + sha256 = "1ps47npdsx6zl5x4vkscgqw754144v5p048ljza1svkkpbyizqvv"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3480,12 +3480,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-04-04"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "7302dc4a20f87bb5e04f6d2a4cf372929b59f720"; - sha256 = "0smphxxxlqs8rjn2y22z6b4pkbj5yryjnh9g7lkmpy4mqxfhd3qn"; + rev = "8398343f2e161aec2d1a9324cd1c739eb379dd24"; + sha256 = "07w7zwz87d3ngz34cnp5g6pxg16n7ixaci32gxfvyixlpng43wcb"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3588,36 +3588,36 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat.nvim"; - version = "2022-12-20"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "172269867994c0da7adcf02e89a068cda85eb805"; - sha256 = "10wamh4f8kkydgj0wckbaajzc1cyc04q9bidkz612vj14809dc6w"; + rev = "43e6e083cd7cde5794b75d14ef1c9031c4bdd395"; + sha256 = "080a5s5yxh666vgp6gm1g3y490jjk7bgrnb81c34jy85xha15zm1"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-03-23"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "984d4bb876cccfeada376e86ba5babae59da1cce"; - sha256 = "0xmlndmrwzcizqyhis0qkg7hb78f0jk3bm8ay7az4nvikjz94mri"; + rev = "a6c5f652788b36c6ff2a0fdbefa271cb46f8f5e7"; + sha256 = "0cmwrjwn3kvkhg7w8hls3sl5zzh5s9i62870ddrs59mmnxk83q08"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-03-30"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "1a8ba635e511148801b55a1128aef933c296a301"; - sha256 = "1v9j8z6vjvhi7ywbd8dvc0m4yz4mjmks9q2z1pnjl57kqcq19i6a"; + rev = "046bd22cc704fef4f19d6a9320fc27bf4527479f"; + sha256 = "00snp6i8gqia9l1lv4j5qb85mvh1ckm4r6fkhm3im0g71pih2nj7"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3683,12 +3683,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-04-02"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "594009caf85b8e99a37a891a17d8460ce8c685ae"; - sha256 = "0xhhfksv424zy5fhjl8ygdncy971yyb8v3w72amak4w26md93z9i"; + rev = "fd369e6b501bd87712ff713e911273b95ddfb9cc"; + sha256 = "12db9kyjyhpyc3cd5gifi3d425q5aplmzs3s74ahn19w4ni14vpk"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3731,12 +3731,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-04-02"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "750a112a1cfaf2a7cd2d67a2d67f8f463b00d8af"; - sha256 = "19lip656xd59vk6ki1aryg53105zakp39x1llh3qdlmrk7w7g5lz"; + rev = "64d57ac5dcfd24a998ff38a76bf3204810273988"; + sha256 = "1q1yv1i5ynfwrxkiinlrhgjd6cc6c7pzvcv7f5ziadk7fvikpdlf"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -3910,12 +3910,12 @@ final: prev: inc-rename-nvim = buildVimPluginFrom2Nix { pname = "inc-rename.nvim"; - version = "2023-01-29"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "21c23c379342a731a0c90f226601ec0434627b26"; - sha256 = "06y92kb2g6qrpf31mq4j2l8v450i2zp36xm2adr4n0x68rxxa59b"; + rev = "fb1b7468f27d874feb209eac46be5205e20b7fd3"; + sha256 = "1lhrzhhkml5dr67w4ypvkghxfkqyvb7drjpkwzr6f1wy6jaa6gfq"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -4175,12 +4175,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-03-26"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d"; - sha256 = "10mhniygcxidp8wgzd1chfcdwmhh84rqk7g1k2bz0jsjkc31hxlp"; + rev = "3c87bfacd5f51033bbeeb04f837c88f94861f6af"; + sha256 = "0qs72s1m415fn37cjl6mbn07ivyk1x3q63clypb1rk7frswyz1bz"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4343,12 +4343,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-04-04"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "37f8594972f0213058d326151151f5aba9fc63ed"; - sha256 = "0indhcbvsigb2cxmyw8kc6ac0hr2sj29ifa2d4xgwkqv0gys00ah"; + rev = "b8cb553dff63a1ded1be1f258cf8e0e4c443e302"; + sha256 = "1q7gg1v70qx2sd7vzixj0q8hl8d4aa9n81hhsnl72zld36qx7h4k"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4679,12 +4679,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-03-29"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "416cc687ba7eedae1da36d8426ddd538c2ceb2f4"; - sha256 = "0aq0w6k02xyh6jffm9lwsns91p6ag211cv2vl0d2m99mw81ss8bh"; + rev = "2f242f4a910bcc5157ba3d9f1ff646d4e5a83a2f"; + sha256 = "06q5ws45fj4rgbdybgqnia57rj50xlyr1yrzxgp9b16qby7a3bqz"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4703,23 +4703,23 @@ final: prev: lsp_lines-nvim = buildVimPluginFrom2Nix { pname = "lsp_lines.nvim"; - version = "2023-03-16"; + version = "2023-04-09"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "dcff567b3a2d730f31b6da229ca3bb40640ec5a6"; - sha256 = "0p5p5l2vcdyjmazg8vyj9s5if87kij80klfpv4irqc2z13r6sy92"; + rev = "d9c8a71b8b6e6bfa2b5cf015f59450472dbf06fe"; + sha256 = "0l7q1x8bkfnzhfing5gsbsa2cgkrjx02w018rhhldcix2l5ih9p0"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-03-22"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1882019270be445a8cad4353f1530574f2b2d02d"; - sha256 = "1gs39ai4bk7pfn1q4pq3hb4cwixb39c65pf1pfwc3blv3a539d4j"; + rev = "775c0cdf5be5adcc08f27c9058edb00b5b517520"; + sha256 = "1b3pq2l2qilqvkvd051wv32myjp200wqcns00qgdx10frracvlvr"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4774,24 +4774,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2023-04-03"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "c28a7427c3fb29322db136f0564ec58807b26747"; - sha256 = "101k2gbcyzpyw0fh5rh2a72ypbkhv597khj4sz49ws0i45p0qc8c"; + rev = "84ffb80e452d95e2c46fa29a98ea11a240f7843e"; + sha256 = "1gm1s31vmg0zj018yi2czabsylnvxkzx3icy5vf6pvs907gm5gxv"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-03-27"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "bc8ec05022743d3f08bda7a76c6bb5e9a9024581"; - sha256 = "1zc0amafr1g3gkrxn2mppda0qpb3444xpjldm94h05qh78qz2j70"; + rev = "8fdb06d4601c019a9ee880473646364bdbed3206"; + sha256 = "1avzmyvvfffy9fh3kw58ag63kvm3aj0zld1mi1z0m7ihyza5v5aq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4883,12 +4883,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-03-24"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "b64fdede85fd5e0b720ce722919e0a9b95ed6547"; - sha256 = "0an210nwcm0drgdgq6divxffsqhbxlv50ksnbip52j6avdj38vb4"; + rev = "a8d5db8f227b9b236d1c54a9c6234bc033825ce7"; + sha256 = "1c8w86yxmyay2b3c7ifl4qxcibgi27sf6pmx5b43j21ixjv5455n"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4907,12 +4907,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-04-04"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "c625abf171dfaad790f5703465a93a94334e5049"; - sha256 = "13cb1dgm6l2wpiv5ja2adfhjca89836p53a3xn2y0li61kqrvvn3"; + rev = "2311d9d883eb709ad9979a726a38c5ce1343b63c"; + sha256 = "1w51kzsadw7wkddxs9alz0vy6y8c3bv1x77km6xk8jf068bi36l9"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5363,12 +5363,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-04-03"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "024d1a0548a0d61687e00c94dd362a1878d3ac2a"; - sha256 = "0mf8f66gdfx4l03jjp5p2lzjdz2il3fqfrx2a1rrrqz71zn78ihh"; + rev = "864b35006d3de24c60e44b566de8018f919b13e6"; + sha256 = "01xsqdbpwy9mj9rixadmlgbnb2nr2ssjgqhb2qsrxfxc2mk3dcvp"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5529,6 +5529,66 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; + neotest-dart = buildVimPluginFrom2Nix { + pname = "neotest-dart"; + version = "2023-03-13"; + src = fetchFromGitHub { + owner = "sidlatau"; + repo = "neotest-dart"; + rev = "43a61b8aab7908799d58369ba15dc4cd381d46ff"; + sha256 = "1kzb08sb38l2dzz9rs4qj6cfbgr0klplxrlb271q0i7xpaflif42"; + }; + meta.homepage = "https://github.com/sidlatau/neotest-dart/"; + }; + + neotest-deno = buildVimPluginFrom2Nix { + pname = "neotest-deno"; + version = "2022-12-09"; + src = fetchFromGitHub { + owner = "MarkEmmons"; + repo = "neotest-deno"; + rev = "7136b9342aeecb675c7c16a0bde327d7fcb00a1c"; + sha256 = "1qryyk6x47ffdsb258gxsk5aj3qc0jn6g7ljy8idn361rs12qjcc"; + }; + meta.homepage = "https://github.com/MarkEmmons/neotest-deno/"; + }; + + neotest-dotnet = buildVimPluginFrom2Nix { + pname = "neotest-dotnet"; + version = "2023-02-05"; + src = fetchFromGitHub { + owner = "Issafalcon"; + repo = "neotest-dotnet"; + rev = "b7d3b848454180760a3ef8c98c6b0f01b7ad3466"; + sha256 = "1r5advhhj64ck6brxngwq57b65h9q6fzf2yiffznz6xnyqgilimh"; + }; + meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; + }; + + neotest-elixir = buildVimPluginFrom2Nix { + pname = "neotest-elixir"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "jfpedroza"; + repo = "neotest-elixir"; + rev = "72ead0e41aa88582631ff7a14c13095b87c7ff75"; + sha256 = "1ys33qrgs5iw2f00k8d3da2dy49bxfp1yanzk9l6970q8mq9xfd3"; + }; + meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; + }; + + neotest-go = buildVimPluginFrom2Nix { + pname = "neotest-go"; + version = "2023-03-28"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "neotest-go"; + rev = "756edf3dddcb3b430110f9582e10b7e730428341"; + sha256 = "03ldff1cf1j4skj2swhqphna08xkpm33xzmlm87ln5jg7h5izjii"; + }; + meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; + }; + neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; version = "2023-03-31"; @@ -5541,6 +5601,126 @@ final: prev: meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; + neotest-jest = buildVimPluginFrom2Nix { + pname = "neotest-jest"; + version = "2023-01-26"; + src = fetchFromGitHub { + owner = "haydenmeade"; + repo = "neotest-jest"; + rev = "821bb227e31259307db30c88671a1c3724f78637"; + sha256 = "0zhia9flpzac17rc9l1ybv1x7zfvhmws65i8sq53dp1mlfvimzkp"; + }; + meta.homepage = "https://github.com/haydenmeade/neotest-jest/"; + }; + + neotest-pest = buildVimPluginFrom2Nix { + pname = "neotest-pest"; + version = "2022-11-24"; + src = fetchFromGitHub { + owner = "theutz"; + repo = "neotest-pest"; + rev = "a50582719267a847c84e1564e97c698d994f883c"; + sha256 = "00scdxkqkfsdq6sn1a7cdcrqpdi8bzi5z2qjqlysp6njilbd1jws"; + }; + meta.homepage = "https://github.com/theutz/neotest-pest/"; + }; + + neotest-phpunit = buildVimPluginFrom2Nix { + pname = "neotest-phpunit"; + version = "2022-10-09"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "neotest-phpunit"; + rev = "0e5c306434ebea413585c3d0d39c97f6a33ef977"; + sha256 = "1kbydwj6af7s945chh6bmykza7vnzs94cw55gs19324a1yd9ky7j"; + }; + meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; + }; + + neotest-plenary = buildVimPluginFrom2Nix { + pname = "neotest-plenary"; + version = "2022-12-30"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "neotest-plenary"; + rev = "d49bfd9470f791e7c29149e75d56b6f925bb391b"; + sha256 = "055k0q1zgi42hf8lcgi2fmfbs3yc4fhbfjy34p3p2k90i1izxy5q"; + }; + meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; + }; + + neotest-python = buildVimPluginFrom2Nix { + pname = "neotest-python"; + version = "2023-02-18"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "neotest-python"; + rev = "6c06041cfb45f45e276068020baa06c06fe20d5c"; + sha256 = "0gnbf72g06ryzib0z8yqhhvnvb39mswz9vrsddmy4w1c0crh9qqd"; + }; + meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; + }; + + neotest-rspec = buildVimPluginFrom2Nix { + pname = "neotest-rspec"; + version = "2023-04-05"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "neotest-rspec"; + rev = "7243a4cdc27fa1a857653b862e10b7f93c28aebf"; + sha256 = "0j6aahy5zk5g2afphikbzqnhpf8z5xz0k0g1x0cwwi22qziaq84f"; + }; + meta.homepage = "https://github.com/olimorris/neotest-rspec/"; + }; + + neotest-rust = buildVimPluginFrom2Nix { + pname = "neotest-rust"; + version = "2023-04-03"; + src = fetchFromGitHub { + owner = "rouge8"; + repo = "neotest-rust"; + rev = "5bb78ad3c1c11a28a2c48af59056455841e6546f"; + sha256 = "0wrb7nqqr9glsycqrfak6xi2l5pvb0ax48vr1jlcpg83ya2ljj3g"; + }; + meta.homepage = "https://github.com/rouge8/neotest-rust/"; + }; + + neotest-scala = buildVimPluginFrom2Nix { + pname = "neotest-scala"; + version = "2022-10-15"; + src = fetchFromGitHub { + owner = "stevanmilic"; + repo = "neotest-scala"; + rev = "685f0fac6196862b47025c6b91513af6a406501a"; + sha256 = "0ii8brm5maffqrhji6d4g2kd45mhydj3gby22sv81g9jz6ah0y3s"; + }; + meta.homepage = "https://github.com/stevanmilic/neotest-scala/"; + }; + + neotest-testthat = buildVimPluginFrom2Nix { + pname = "neotest-testthat"; + version = "2022-07-04"; + src = fetchFromGitHub { + owner = "shunsambongi"; + repo = "neotest-testthat"; + rev = "63be77b75a2ad33df39e3c4e4de10e163a21cfef"; + sha256 = "1ljk81sfi900pidmlgxavjcjrffq1dnqfhilqqccnzj5rb1gjnj9"; + }; + meta.homepage = "https://github.com/shunsambongi/neotest-testthat/"; + }; + + neotest-vitest = buildVimPluginFrom2Nix { + pname = "neotest-vitest"; + version = "2023-02-27"; + src = fetchFromGitHub { + owner = "marilari88"; + repo = "neotest-vitest"; + rev = "643d1fb7a3e874b82f51693bf6d37c427ab54c75"; + sha256 = "0lshr7w1j2rnaw74kvm72pz9fi6xx2s88s3by56wg82n8hzlnb7h"; + }; + meta.homepage = "https://github.com/marilari88/neotest-vitest/"; + }; + neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; version = "2023-02-10"; @@ -5675,12 +5855,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-04-04"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "f741f322ba269dc4d4c38e95b3784d38071d3abd"; - sha256 = "0mmg6rbdznldv94385g5ws9bmmm6f3sl2wcv0imwp9s6sl8qzl6v"; + rev = "b9a3385d4814d7c8aa6a9a68f42c6a8bc05282f4"; + sha256 = "18659nz8l24ip16gw3zji0cmhjjzvnhhparbgajw5m6bdq9jahwh"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5711,12 +5891,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "b378e5f4fae02e0d7afaccbf0a1308795afb5f3d"; - sha256 = "0c7x6r2p5jnrl00pmchi52wi22b6zrknn06nvwkghhik4k704w1y"; + rev = "c4b2773bcb0939d3123ff8e8006611b190b98b51"; + sha256 = "1vxrmwr1fd75wm97snk2ckflqsg5aixv2f1wa47jym4brnlcag4y"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5747,12 +5927,12 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-03-26"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "33db10e593edc7d720c0f5c0320899bd1dd014e1"; - sha256 = "1c7izqhr8x9rhwij9g6nqs1lvhnga6mpf1mfcpiid96s2ygvrbk2"; + rev = "e22c01b148b37dcb74c40faf801f7ee9de727dfc"; + sha256 = "0d45v508j66by6z7ykaii982xnp8kmhdcj86hhzly24s34jg1q9j"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -5819,12 +5999,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-04-04"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "13be3e34b7733bf2948e32c339694f657662ccfd"; - sha256 = "1qv0ifx4rvj18f3zhck0qnrvydr86x99269rg5bnh7jxyn7kcffg"; + rev = "5855128178fa78293acdfb5b4e41ef046779240b"; + sha256 = "0v2dd4yyh9949ig7kj3ra65xxldzwdppkg6y48n3qbn6x8f1v9vn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5879,12 +6059,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-03-26"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "0fd6519d44eac3a6736aafdb3fe9da916c3701d4"; - sha256 = "0ds77blb357mamxsjhhp8cj6mrnpvzmk3p0w1cy3wdikmbng940v"; + rev = "7470af886ffb3df32800e5ef9c072a6cd825770d"; + sha256 = "10mpzlikr2yx7ky25001jjcdcy0rprm6n81lwxg46xbim3mbxnb7"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -6059,12 +6239,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-03-31"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1dd02e82c77d558e30ba831db4c2e7ed534e874f"; - sha256 = "1qy0x38g273q7f7vzia9f2lvs294amgjqc022jc6p2fxmmry7rv5"; + rev = "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421"; + sha256 = "0h4vcdy7zrbrx29r2bw5nk01q1y983ffh59sl35rq5aa9xdwr4zf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6083,24 +6263,24 @@ final: prev: nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2023-04-02"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "b21f707b39bbe0b530a61371ab5fc1786bd16c22"; - sha256 = "1azrinnaf2qw8q41lvk65vdq1jk5af0k0b23a9c3pidwq330fr18"; + rev = "972b8b8b65823c433ee834ed02a7f06edf590dfc"; + sha256 = "154fspyyxh8s0z5bywi8266ns3vhxk4b6rgvd8qy9zkqm42spq3v"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-03-28"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "56a2df0e96bfa64ebd6967e7cad877a1530633d5"; - sha256 = "0grh6227yhy0sp8rvgr6p1wlb6jimwqaqhdlc5lxbcqi9h46lrvb"; + rev = "286f682f366fbc652b38dff893569374e9433dd3"; + sha256 = "1kd54ivihbm847iqxpbjz227zzwmca40lxmc4qaacbcm8afbs24i"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6191,12 +6371,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-04-04"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "f7e8728fae6c1b1667de5c76e34f0c36a5c3cc03"; - sha256 = "1nrhqbsz7z73qk83yncynvnd1bhbsrrpfjrla8q05dlv80vrr4ap"; + rev = "3841a166416a21f43bb5dbfa3664b0d56ce96366"; + sha256 = "1gg7jcgjsd3i88nbbsq9ql4k9zzk6q7iyz2zhcknq1cjrfzb0870"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6287,12 +6467,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-04-03"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "cc1cad5bf8dcfb2d604392dfa6b8730d9ecbee88"; - sha256 = "1bvaqkja0y4sv2msad7vxp7nb4mcbwlk4wgnp6ad1al3hhrcin3q"; + rev = "2a9969a09d8456104d7954b67ee6667d6645c71a"; + sha256 = "0yy9kwl2xkg38xl7rsjz9yz3w99md2ywj2w3whlv7hwk0w0pirb4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6311,12 +6491,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f"; - sha256 = "0ivr4iyq85gb2ddv6dzarp9wjfydi0ynvwa0vabziv4wxd55w9c3"; + rev = "27e9e1d2638ffd133b06f314a49ac55825cb1017"; + sha256 = "0fbq9gwrgr5gaz5k3aq5c7fw0gg5qkzw86qqff1ghz8b5jkjkkp5"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6575,36 +6755,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-04-04"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "d1410cb0896a3aad5d84ddc54284774a627c6d63"; - sha256 = "1bfdvsvy52ib81sdgrx65gp6y39h0063p3q352rkxy7sh4mw92kr"; + rev = "086bf310bd19a7103ee7d761eb59f89f3dd23e21"; + sha256 = "135d1dfgbfjh9sc5j2bgrkl6123pbn279fhs22p76i6jnn0fnyaz"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-04-04"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "871f5665d92d59a369cf916e9aa4d321d466f1e3"; - sha256 = "1psdawbsrp68qqpsbdmpnl9xp0p3y08s470vc4yaajrcn35mdb9l"; + rev = "a57d2a599b57a619f58a5c91c89d9bf12f8977b2"; + sha256 = "16bqwc60k9s38zrqrhwci4jwkq2c97k6irgb0i9mqgqddm9f7dn4"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-04-04"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "68eaeb86738c660f7f31afb2cbfb2bdec50bbd92"; - sha256 = "1pqs8mgks1ihkziq35qr0kpk0cdza263gq6ksjvj0jjrig24fim2"; + rev = "38203f5e6c62617b3c07662dc71ce3047ecd90d3"; + sha256 = "0l3583h890pqmil34bim5zy3ib1jfc3nz12ykhda2b42a1qad0b4"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6659,12 +6839,12 @@ final: prev: nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2023-03-17"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "25698e4033cd6cd3745454bfc837dd670eba0480"; - sha256 = "065j0188x7j72sz14i3i7q0vxfjbl5xz3566nybghcnqmksp9m2w"; + rev = "7a1c677985b8fc4cdfdb87dd55fbc16dadd86bbe"; + sha256 = "0yqxg4hmdjs2bn7hg5al012kf8ykhrjsg1ca22vnnaqz4j98il0k"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -6695,11 +6875,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-27"; + version = "2023-04-07"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "51d835d411df45b14b9531789eff0c590cabf018"; - sha256 = "0c8cy8bcmbn7lrr7ld9l5iss4k6hccn4m1mp25zx3blmwz0xi01d"; + rev = "2c82e0965be2baf67fa2d3d48f3747437fde7204"; + sha256 = "1f31bx466vl1if7kinbb1szrl65b9gq06v32nf9h6s5rs4yvmpv4"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6718,12 +6898,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-04-03"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "0568104bf8d0c3ab16395433fcc5c1638efc25d4"; - sha256 = "0s3bn0m9lml0b2b82zl1c7g7idrzbb7jhi7yf24cm5rl457iixp2"; + rev = "f16ec8f6e5d23e4349501dae46e0a661918e086e"; + sha256 = "08c76ps667wkyh8lzkjszpfhjr22cdxz7p30bkps42i71vq12d4n"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6802,24 +6982,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-04-01"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "b6f2e9b443cc8244ee374a3a06292cde03751374"; - sha256 = "10d37kmipizww73kw4g22m32nyvjipb0hj64dlrpngnrvbzxwh78"; + rev = "f37efab489a99b4a104e5ee18c73453d5e828b62"; + sha256 = "0m4r8w67na8yhwsr9j0xlrbhnwcfa41kv7jy55d8dz38kq0frkl0"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-04-04"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "45f8497106cfada657c7d7af73707acb8cbed13c"; - sha256 = "0v0ypym2gpjk91c94p62jx38c1qm91gg01razqybzhf12dixbs2k"; + rev = "5edf9784a5ab536dcdcdae5cc8d75a307863d529"; + sha256 = "1y41z4n4k20zqqgvjxjz9zrxh3if8snm2pxys7ma0rd0vfylgiwm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6947,12 +7127,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-03-30"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "070f7588629b956bba17d9892e6fa15bf19a2260"; - sha256 = "1bghyccnq0q1ysybiw7gsjbf5x1y6bgvfdc8grj8mgzgyzaqkxwf"; + rev = "87cf0069949bb9426ef4930efdcaea942438cf92"; + sha256 = "0cxf6mqjrhchixyc3m9dar141admannzwmdgpd392alvq6zi5yi8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7115,12 +7295,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-02-17"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56"; - sha256 = "11h0fi469fdjck318sa4fr4d4l1r57z3phhna6kclryz4mbjmk3v"; + rev = "934cb4c4adc2e7f4f351846a63c9532018c996ed"; + sha256 = "1s6wd3xrqpxmxmaa5spnwcazpr7695fwf5mxbrrr72va8amn5vy1"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -7224,12 +7404,12 @@ final: prev: promise-async = buildVimPluginFrom2Nix { pname = "promise-async"; - version = "2023-02-01"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "promise-async"; - rev = "7fa127fa80e7d4d447e0e2c78e99af4355f4247b"; - sha256 = "12d7l5b79fj4lpd3gfjqrmy6ffh06cxsr13vaw29rjif57wf0f53"; + rev = "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e"; + sha256 = "0cavxw5v3nhnrs26r7cqxirq2ydk5g1ymcd3m4gf4rjjw9n067sd"; }; meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; @@ -7778,12 +7958,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-04-04"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "653420ba71b13503cbd92ccdbd123fb629a87e6e"; - sha256 = "11jc36xcl57knp77j7wpr7hmxdb0xygi4kfrrjzkribvbf5sl41m"; + rev = "68a7fedd4032d230fea11dfe4f2e7409b3a01345"; + sha256 = "063sk1x4vzkxdyxbrqq42ip2kjdzc5ydgkqkgmnhm9dhl92zbnb6"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7850,12 +8030,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-03-23"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "bf1e4d016a08cc3fb2a3060309d00e04dbd4fc22"; - sha256 = "1mipgz1g0w0y2ghha0lsq8zjw4nqi0a8l6kfzk3jsjfbxji4cl2p"; + rev = "a4d96b68fb1ba00fb2e91d2f46705de9cddbb348"; + sha256 = "0qn5mryiay1ka0inhqivnq8fkn9cyz5gdyv3pfpkjb7s19kmkf36"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -8297,12 +8477,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-11-29"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "af3ce7c3cec81f2852bdb0a0651d2485fcd01214"; - sha256 = "1r0vn0v74g8bgyz4ycc9z8clpkn6fdy5v65y7igizcrjzxd3nlpb"; + rev = "be563539754b7af22bbe842ef217d4463f73468c"; + sha256 = "0ljikds0jd8kqzan8hgq8kq2gj4pllp91gm0rmjrc6sp8k0zs3j1"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -8478,12 +8658,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { pname = "telescope-live-grep-args.nvim"; - version = "2023-03-19"; + version = "2023-04-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "cf7994277c89e0a367e90f3ad054c983e2dfc22c"; - sha256 = "0hph0ywsjzh04qck61lw12b1q3ck57y44vhbriyrc6aphxngpz7c"; + rev = "0f75ea809c46af8997c64f49c52e3c641d887885"; + sha256 = "1dnr5ap329xzx3g6arwz7np1achwihwl2ryd4q5g3r8w1sbm3mbg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -8635,12 +8815,12 @@ final: prev: telescope-nvim = buildNeovimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-03-22"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "942fe5faef47b21241e970551eba407bc10d9547"; - sha256 = "0i9j8fm5739vqzxnpvifsyfggw7xlpf77nk22l500qpw4spksb1b"; + rev = "2ea61f1952f0ad10e4fcc282468a06d3e69674c2"; + sha256 = "0f4agdsy3fl53glm8fv9nqliijd16a5imlan3i8v6pk09339k61a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8659,12 +8839,12 @@ final: prev: template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; - version = "2023-02-02"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "b97ee201fa2d5edced1c6dbaf432d00fec0468f1"; - sha256 = "0cygqc07grd55w4bk42qil80353fr7hf3f73mc9n2y43knijamf8"; + rev = "e347d83c80bd1ec77e13a37962013199d216a8cd"; + sha256 = "0ihlrkf41vpq17mjiadq3375lcvn5kvdkqwwrdl52vw4gc8kbkq8"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; @@ -8743,12 +8923,12 @@ final: prev: text-case-nvim = buildVimPluginFrom2Nix { pname = "text-case.nvim"; - version = "2023-03-25"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "43e85e883da911685ac329234b8f1298b75ab8fe"; - sha256 = "0f52ksvlll6wzqw1lvd6raqxqhngbzi1ncbkj4kjif2yidgg3fyx"; + rev = "cd7cc65a412beb713e68f3b84e45990a939b7b6b"; + sha256 = "1fwrvsl4rdsrljb8y6g4zpv5vvlz8hxakcyz6f7zr4xxnr5rlb3c"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -8924,12 +9104,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-04-03"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "56958f35592b8439dd5014220fc0f3a6e5b01ded"; - sha256 = "0b2rrgzij2zdg893ig70gvlqzp9nkdgzav8v3n9lii8g2z2iv6yw"; + rev = "12fc4074a7dee23faabeb1f5dfd3af41d2aa04f1"; + sha256 = "1nq06hgsm1hky7w1h8hy2y1l3nyngky2xrknk9qqwy5yq1q6pngp"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -9068,12 +9248,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-04-04"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "3a7d21538ade233af2b7c6e52d617494629d7aab"; - sha256 = "0m61waxyx46w9q5csxqjb5l1qbbd24bfrx7a4nwjlz31ybng74mv"; + rev = "3525b4d70508b7587b3ea3b4df5f1ffae18928b8"; + sha256 = "05bkv361layal7bbj76h8zkzbf5ar41nzvzb3xmw3gsmm0h6nngn"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9248,12 +9428,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-03-29"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "7a05efb84e6068a0b0801d736b58fc645e5cdfd2"; - sha256 = "1641c2hs3m9f0hpsibnzxcjk7fg8f4dcpahdvqbyv12h3xbbbkq3"; + rev = "e5f0c592bc54bb8e3d6acc964a9db9f4037cbbf9"; + sha256 = "1h3k14nkgp0jjvhwfi9pvx7kkfc74whwisja14mykpbwzcdwhdiq"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -10616,12 +10796,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-02-22"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "ca44a13a379d9af75092bc2fe2efee8c5248e876"; - sha256 = "046gfn5hxhcd9fnbz4fi0l59cgngc73y1x2hvxvdyy698fx56wz0"; + rev = "ff6a8719baf17ab79df730b7ee9227444ee6a088"; + sha256 = "0f245bpzhcxdp62g92m33gpdj8br7iiwhk1i3l0jaf1h6mg1qraz"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -11566,12 +11746,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-04-04"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7d59166b18699d28a44c0c66d4299272ca26d62c"; - sha256 = "0c95z5dfv62sy4sr7fqmi79az2vlb29fgy6jkqn4svi42a167am6"; + rev = "6703edafe62dcb94b2757828b9b7435227c3e3ff"; + sha256 = "03srmixrpvyia3386n2kwkg9byrzh6lcdb4dd9j21ah212ll6nfy"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11638,12 +11818,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2023-02-24"; + version = "2023-04-08"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "5d3d1b6cbdc4be0b4c6105c1ab1f769d76d3c68f"; - sha256 = "0rp8nwdhqf73fmzlyvcksqyaqcbyk0qcp6vhkfx4h0r8spd890xb"; + rev = "cc82d88e2a791f54d2b6e2b26e41f743351ac947"; + sha256 = "1l3vdx87sgqbxbh1jz00xm8s589rca4pszqk4jj9yvn1vxljnk87"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -13908,12 +14088,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-03-23"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ac20c79b6b516472ac6a252f47867f12a3c7e05b"; - sha256 = "1qqwrkrchzv24jswvnd3zy333pwbjslzpj6yqh0caf0b5qhcwbkc"; + rev = "657132ead403951a59641b24bd771bb6da93e427"; + sha256 = "11kzpzah7wqm22wnrlr8hpyjaammkj2nlxh19m52xb8cc3fkzpys"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13921,12 +14101,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-03-28"; + version = "2023-04-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1043b590d98fa3f069a0879c65293aa2c7c31b0d"; - sha256 = "1wa01bmjlyry68rlk2f77g2b39jqydm3w9yic09g4f7qzxayy5kl"; + rev = "e8542f26b45e489fe7cfa7894737ccb0fe937fcd"; + sha256 = "1zlagp825rcl82kg4n38hvxvyywd6rx3496jh34lkcqzdvvbab2r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13949,20 +14129,20 @@ final: prev: src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "be45bd65f51a3426b854e710215cbcef477fd7f0"; - sha256 = "0p4f4vb8k7lvl9mrq2yf989mnp2a6ji27yqdhb4j5safsdcjkq08"; + rev = "71edcf6802eeb724ca679547d5cb7a8eadf0cfcb"; + sha256 = "0c08c24i17h2zykbsm0lv1brscwsbmyf9lvqh9zbi8ikbfswr5b7"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; virtual-types-nvim = buildVimPluginFrom2Nix { pname = "virtual-types.nvim"; - version = "2022-11-01"; + version = "2023-04-07"; src = fetchFromGitHub { owner = "jubnzv"; repo = "virtual-types.nvim"; - rev = "12d55d6dc7cebddf4ab276b5934e02e0d41416a1"; - sha256 = "14sk39py8kv9fsrw3sj6xg26mj11nf5aafqgiyc46isilmhizh4n"; + rev = "d652ec0b1781bbb0e83dc588fb62d638006cf61e"; + sha256 = "14pwp5mc232wazkm405irh9zl1j3ajwpj2qf594bf6xhx3qw2fav"; }; meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; }; @@ -14222,12 +14402,12 @@ final: prev: zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-01-30"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "910b8c240c6aaf5263db038db81c538602c766c3"; - sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; + rev = "74d444054a7377ec2a32c88130a197cae1439fc2"; + sha256 = "0f32lz22cwp9q7mwdl59zvrvrhr4fsdym7fi6bdbgzp44ca56r9y"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -14330,12 +14510,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-04-02"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "67b12761b2ab6885f1585ef9820221cdeae9100f"; - sha256 = "0i0pf0i3rq1ik88bimyqgli25lllfh89w9xsr5m9cknqjxf78iwh"; + rev = "f7d98de1e1c22b057248981bf531e8fa6132e225"; + sha256 = "183qkns5idryq2izng4lg3ah20d6wqrlz21vmsgwhal9594ppzkj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14378,12 +14558,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-04-04"; + version = "2023-04-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "fb476086012e18e0001c3dcc5b18fd34a847e5fe"; - sha256 = "15hxbb5mgqylvg3426jnx8lrydjddsrdpbka3klzfci86cvb3pnz"; + rev = "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b"; + sha256 = "07h7rdqxbz4vy3hqyl15am2bkv89h8afysby2jlqdcfn0y5wa5h1"; }; 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 fca176fabec..a537b028930 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -137,12 +137,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=fcacbeb"; + version = "0.0.0+rev=92d572e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d"; - hash = "sha256-sMNNnp1Ypljou0RZ9V0M4qVP/2Osrk1L8NCiyEGY1pw="; + rev = "92d572eef5ffdd4117e7ba36b56850a90cb79151"; + hash = "sha256-Zp8aEoLv/FPaTQPJzS2gS3htU9wpUwWB1gvRfYh4gsY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -579,12 +579,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=f71b93f"; + version = "0.0.0+rev=1723599"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "f71b93f399c9c2b315825827c95466e7405ec622"; - hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; + rev = "17235998809be904892f14ee57730d96795e9323"; + hash = "sha256-UhPlEanOBUpzqVPCqe8t5MIwdUwSeaoFJFsxpnUqwn8="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -942,12 +942,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=826ef28"; + version = "0.0.0+rev=c84d16e"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "826ef28d605d0925a86a99022cd222c96f2d0952"; - hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE="; + rev = "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639"; + hash = "sha256-SvzWWsXlcT5aIpswhKA8xo7iRIDaDZkeUuPGyvfc2fk="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1619,12 +1619,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=685c890"; + version = "0.0.0+rev=8f1c49f"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "685c8905831fa7a0b548f7d712b97436b6eb301f"; - hash = "sha256-kcr8dY69dKQgzK5D/Fimymq7W/NqS55yoGIvAjbMBQ8="; + rev = "8f1c49febcb8944d39df8554d32c749b4f5f3158"; + hash = "sha256-9/Otouynt5Cqh5UdeiMsTo+F22fBu1U+EuN7e+TYQy4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1923,14 +1923,14 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=e39a7bb"; + version = "0.0.0+rev=2886b52"; src = fetchFromGitHub { - owner = "vigoux"; - repo = "tree-sitter-viml"; - rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590"; - hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10="; + owner = "neovim"; + repo = "tree-sitter-vim"; + rev = "2886b52143d570d81f97c98be7a1e204ce9d3bcd"; + hash = "sha256-w8yHo5rtqqD80gbSChaHhSzt3ljPBKWYZ+pxaWFM35s="; }; - meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; + meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1af8c0532dc..d75e6eaaa42 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -464,7 +464,22 @@ https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, https://github.com/nvim-neotest/neotest/,HEAD, +https://github.com/sidlatau/neotest-dart/,HEAD, +https://github.com/MarkEmmons/neotest-deno/,HEAD, +https://github.com/Issafalcon/neotest-dotnet/,HEAD, +https://github.com/jfpedroza/neotest-elixir/,HEAD, +https://github.com/nvim-neotest/neotest-go/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, +https://github.com/haydenmeade/neotest-jest/,HEAD, +https://github.com/theutz/neotest-pest/,HEAD, +https://github.com/olimorris/neotest-phpunit/,HEAD, +https://github.com/nvim-neotest/neotest-plenary/,HEAD, +https://github.com/nvim-neotest/neotest-python/,HEAD, +https://github.com/olimorris/neotest-rspec/,HEAD, +https://github.com/rouge8/neotest-rust/,HEAD, +https://github.com/stevanmilic/neotest-scala/,HEAD, +https://github.com/shunsambongi/neotest-testthat/,HEAD, +https://github.com/marilari88/neotest-vitest/,HEAD, https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ea64eeacfdc..70f1de32f95 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1056,6 +1056,23 @@ let }; }; + equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsc-material-theme"; + publisher = "Equinusocio"; + version = "33.8.0"; + sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; + description = "The most epic theme now for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; + homepage = "https://github.com/material-theme/vsc-material-theme"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "prettier-vscode"; @@ -2194,6 +2211,23 @@ let }; }; + nonylene.dark-molokai-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dark-molokai-theme"; + publisher = "nonylene"; + version = "1.0.5"; + sha256 = "sha256-2qjV6iSz8DDU1yP1II9sxGSgiETmEtotFvfNjm+cTuI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nonylene.dark-molokai-theme/changelog"; + description = "Theme inspired by VSCode default dark theme, monokai theme and Vim Molokai theme"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nonylene.dark-molokai-theme"; + homepage = "https://github.com/nonylene/vscode-dark-molokai-theme"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amz-x ]; + }; + }; + nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index d1807d1c6e0..46a848513f9 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.30.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4="; + sha256 = "sha256-J5eEyLoeYC4JhreuN+ymeVMfnyf9ADL08FpnpmRy1vI="; }; - vendorSha256 = null; + vendorHash = null; # Don't compile the documentation stuff subPackages = [ "cmd/kubectl-dba" ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index dc03e8120ce..349c2e10cbc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.25"; + stable = "0.0.26"; ptb = "0.0.41"; canary = "0.0.150"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-WBcmy9fwGPq3Vs1+7lIOR7OiW/d0kZNIKp4Q5NRYBCw="; + sha256 = "sha256-MPdNxZJBmIN4NGEoYWvL2cmNm37/YT275m2bVWHXbwY="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py index 5413c93665f..fca1b769417 100644 --- a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py +++ b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py @@ -14,6 +14,7 @@ This will dramatically improve the experience : import json import os +import sys from pathlib import Path XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join( @@ -25,7 +26,11 @@ settings_path_temp = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json.tmp" if os.path.exists(settings_path): with settings_path.open(encoding="utf-8") as settings_file: - settings = json.load(settings_file) + try: + settings = json.load(settings_file) + except json.JSONDecodeError: + print("[Nix] settings.json is malformed, letting Discord fix itself") + sys.exit(0) else: settings = {} diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index dd1842e7d47..f586f4f3e9e 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -28,6 +28,7 @@ , libxkbcommon , libxkbfile , wayland +, wayland-scanner , gstreamer , gst-plugins-base , gst-plugins-good @@ -48,6 +49,11 @@ , Cocoa , CoreMedia , withUnfree ? false + +# tries to compile and run generate_argument_docbook.c +, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform + +, buildPackages }: let @@ -149,7 +155,10 @@ stdenv.mkDerivation rec { faac ]; - nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ]; + nativeBuildInputs = [ + cmake libxslt docbook-xsl-nons pkg-config + wayland-scanner + ]; doCheck = true; @@ -158,6 +167,7 @@ stdenv.mkDerivation rec { "-Wno-dev" "-DCMAKE_INSTALL_LIBDIR=lib" "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" + "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { BUILD_TESTING = false; # false is recommended by upstream @@ -168,6 +178,7 @@ stdenv.mkDerivation rec { WITH_JPEG = (libjpeg_turbo != null); WITH_OPENH264 = (openh264 != null); WITH_OSS = false; + WITH_MANPAGES = withManPages; WITH_PCSC = (pcsclite != null); WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 0ddf1fc8f9c..c89387bb83c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.2"; + version = "1.23.4"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-EowUQYfSznTuAHV7OIesFPM99zRmeKkzYNp7VANtR2U="; + hash = "sha256-a2ulTP7J5+f5ikdKVIq4l6GQEJ8PH+MGNV4C0NReFyQ="; }; - vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic="; + vendorHash = "sha256-d/So51ZMDdduUEgOOu9wc3kLh4dRzFR6S5BxcCVtiXI="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index cff9809b030..5ec866ea9c4 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , check , flex @@ -15,15 +16,28 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk="; + hash = "sha256-hsoEAFSXI2bvzZV33jdg1849fipPQlUu3MZVvht54fI="; }; + patches = [ + # TODO: remove me on next release + (fetchpatch { + url = "https://github.com/nickg/nvc/commit/c857e16c33851f8a5386b97bc0dada2836b5db83.patch"; + hash = "sha256-rvZHI1iQXT9zLpCugg5mGmMZBRbTe9PSHtDG7FVZ67Q="; + }) + ]; + + # TODO: recheck me on next release + postPatch = lib.optionalString stdenv.isLinux '' + sed -i "/vhpi4/d" test/regress/testlist.txt + ''; + nativeBuildInputs = [ autoreconfHook check @@ -36,15 +50,12 @@ stdenv.mkDerivation rec { libffi llvm zlib - ] ++ [ - (if stdenv.isLinux then elfutils else libelf) + ] ++ lib.optionals stdenv.isLinux [ + elfutils + ] ++ lib.optionals (!stdenv.isLinux) [ + libelf ]; - # TODO: recheck me on next release - postPatch = lib.optionalString stdenv.isLinux '' - sed -i "/vhpi4/d" test/regress/testlist.txt - ''; - preConfigure = '' mkdir build cd build @@ -63,7 +74,7 @@ stdenv.mkDerivation rec { description = "VHDL compiler and simulator"; homepage = "https://www.nickg.me.uk/nvc/"; license = licenses.gpl3Plus; - platforms = platforms.unix; maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index bd80a15d056..02de89a1b7a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.13.1"; + version = "1.14.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "0k0zbh6adwr99y9aazlyvp6s1k8zaq2j6x8kqb8q9a5qjjg56lay"; + sha256 = "1187805pxygyl547w75i4cl37kaw8y8ng11r5qqldv6fm74k31mk"; }; depsBuildBuild = [ @@ -165,6 +165,7 @@ stdenv.mkDerivation rec { # make sure there is _some_ profiling data on all binaries ./footclient --version ./foot --version + ./utils/xtgettcap ./tests/test-config # generate pgo data of wayland independent code ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 597e8105fa1..24680754c8d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -17,6 +17,7 @@ , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , libcxx ? null +, grossHackForStagingNext ? false # Whether or not to add `-B` and `-L` to `nix-support/cc-{c,ld}flags` , useCcForLibs ? @@ -407,7 +408,11 @@ stdenv.mkDerivation { touch "$out/nix-support/libcxx-cxxflags" touch "$out/nix-support/libcxx-ldflags" '' - + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' + # Adding -isystem flags should be done only for clang; gcc + # already knows how to find its own libstdc++, and adding + # additional -isystem flags will confuse gfortran (see + # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903) + + optionalString (libcxx == null && (if grossHackForStagingNext then isClang else true) && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 07832e97e56..e48d88f962f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -69,6 +69,7 @@ let dde-daemon = callPackage ./go-package/dde-daemon { }; deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; + startdde = callPackage ./go-package/startdde { }; #### TOOLS dde-device-formatter = callPackage ./tools/dde-device-formatter { }; diff --git a/pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch b/pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch new file mode 100644 index 00000000000..2dac0993d59 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch @@ -0,0 +1,153 @@ +From 47a700c64329f76ab91ac01d83a93f43bebe638b Mon Sep 17 00:00:00 2001 +From: rewine <lhongxu@outlook.com> +Date: Sun, 9 Apr 2023 17:14:00 +0800 +Subject: [PATCH] avoid use hardcode path + +--- + display/wayland.go | 4 ++-- + main.go | 10 +++++----- + misc/auto_launch/chinese.json | 4 ++-- + session.go | 15 +++++++++------ + 4 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/display/wayland.go b/display/wayland.go +index b980425..e44342a 100644 +--- a/display/wayland.go ++++ b/display/wayland.go +@@ -556,7 +556,7 @@ func (mm *kMonitorManager) applyByWLOutput(monitorMap map[uint32]*Monitor) error + + if len(args_enable) > 0 { + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) +- cmdline := exec.CommandContext(ctx, "/usr/bin/dde_wloutput", "set") ++ cmdline := exec.CommandContext(ctx, "dde_wloutput", "set") + cmdline.Args = append(cmdline.Args, args_enable...) + logger.Info("cmd line args_enable:", cmdline.Args) + +@@ -572,7 +572,7 @@ func (mm *kMonitorManager) applyByWLOutput(monitorMap map[uint32]*Monitor) error + } + if len(args_disable) > 0 { + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) +- cmdline := exec.CommandContext(ctx, "/usr/bin/dde_wloutput", "set") ++ cmdline := exec.CommandContext(ctx, "dde_wloutput", "set") + cmdline.Args = append(cmdline.Args, args_disable...) + logger.Info("cmd line args_disable:", cmdline.Args) + +diff --git a/main.go b/main.go +index 77b4e78..30aa3fd 100644 +--- a/main.go ++++ b/main.go +@@ -96,17 +96,17 @@ func shouldUseDDEKWin() bool { + } + + end: +- _, err = os.Stat("/usr/bin/kwin_no_scale") ++ _, err = exec.LookPath("kwin_no_scale") + return err == nil + } + + const ( +- cmdKWin = "/usr/bin/kwin_no_scale" ++ cmdKWin = "kwin_no_scale" + cmdDdeSessionDaemon = "/usr/lib/deepin-daemon/dde-session-daemon" +- cmdDdeDock = "/usr/bin/dde-dock" +- cmdDdeDesktop = "/usr/bin/dde-desktop" ++ cmdDdeDock = "dde-dock" ++ cmdDdeDesktop = "dde-desktop" + cmdLoginReminderHelper = "/usr/libexec/deepin/login-reminder-helper" +- cmdDdeHintsDialog = "/usr/bin/dde-hints-dialog" ++ cmdDdeHintsDialog = "dde-hints-dialog" + + loginReminderTimeout = 5 * time.Second + loginReminderTimeFormat = "2006-01-02 15:04:05" +diff --git a/misc/auto_launch/chinese.json b/misc/auto_launch/chinese.json +index 079a521..1856ab1 100644 +--- a/misc/auto_launch/chinese.json ++++ b/misc/auto_launch/chinese.json +@@ -13,7 +13,7 @@ + "Priority": 9, + "Group": [ + { +- "Command": "/usr/bin/dde-file-manager", ++ "Command": "dde-file-manager", + "Wait": false, + "Args": [ + "-d" +@@ -39,7 +39,7 @@ + "Priority": 7, + "Group": [ + { +- "Command": "/usr/bin/dde-shutdown", ++ "Command": "dde-shutdown", + "Wait": false, + "Args": [ + "-d" +diff --git a/session.go b/session.go +index 26f89ef..f412ca4 100644 +--- a/session.go ++++ b/session.go +@@ -18,6 +18,7 @@ import ( + "syscall" + "time" + ++ "github.com/adrg/xdg" + "github.com/godbus/dbus" + "github.com/linuxdeepin/dde-api/soundutils" + daemon "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.daemon" +@@ -53,8 +54,10 @@ const ( + + xsKeyQtFontName = "Qt/FontName" + xsKeyQtMonoFontName = "Qt/MonoFontName" ++) + +- ddeLockDesktopFile = "/usr/share/applications/dde-lock.desktop" ++var ( ++ ddeLockDesktopFile, _ = xdg.SearchDataFile("applications/dde-lock.desktop"); + ) + + type SessionManager struct { +@@ -90,7 +93,7 @@ type SessionManager struct { + } + + const ( +- cmdShutdown = "/usr/bin/dde-shutdown" ++ cmdShutdown = "dde-shutdown" + lockFrontDest = "com.deepin.dde.lockFront" + lockFrontIfc = lockFrontDest + lockFrontObjPath = "/com/deepin/dde/lockFront" +@@ -471,7 +474,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error { + return dbusutil.ToError(err) + } + +- if exe == "/usr/bin/dde-lock" { ++ if strings.Contains(exe, "dde-lock") { + m.setLocked(value) + return nil + } +@@ -491,7 +494,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error { + return dbusutil.ToError(fmt.Errorf("desktop file %q is invalid", desktopFile)) + } + exe = info.GetExecutable() +- if exe != "/usr/bin/dde-lock" { ++ if strings.Contains(exe, "dde-lock") { + return dbusutil.ToError(fmt.Errorf("exe %q of desktop file %q is invalid", exe, desktopFile)) + } + +@@ -798,7 +801,7 @@ func setupEnvironments2() { + // man gnome-keyring-daemon: + // The daemon will print out various environment variables which should be set + // in the user's environment, in order to interact with the daemon. +- gnomeKeyringOutput, err := exec.Command("/usr/bin/gnome-keyring-daemon", "--start", ++ gnomeKeyringOutput, err := exec.Command("gnome-keyring-daemon", "--start", + "--components=secrets,pkcs11,ssh").Output() + if err == nil { + lines := bytes.Split(gnomeKeyringOutput, []byte{'\n'}) +@@ -1389,4 +1392,4 @@ func initXEventMonitor() { + setDPMSMode(true) + } + }) +-} +\ No newline at end of file ++} +-- +2.39.2 + diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix new file mode 100644 index 00000000000..e0502deaf9c --- /dev/null +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, pkg-config +, go-dbus-factory +, go-gir-generator +, go-lib +, gettext +, dde-api +, libgnome-keyring +, gtk3 +, alsa-lib +, libpulseaudio +, libgudev +, libsecret +, jq +, wrapGAppsHook +, runtimeShell +, dde-polkit-agent +}: + +buildGoPackage rec { + pname = "startdde"; + version = "5.10.1"; + + goPackagePath = "github.com/linuxdeepin/startdde"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-dbTcYS7dEvT0eP45jKE8WiG9Pm4LU6jvR8hjMQv/yxU="; + }; + + patches = [ + ./0001-avoid-use-hardcode-path.patch + ]; + + postPatch = '' + substituteInPlace display/manager.go session.go \ + --replace "/bin/bash" "${runtimeShell}" + substituteInPlace display/manager.go main.go utils.go session.go \ + --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + substituteInPlace misc/xsessions/deepin.desktop.in --subst-var-by PREFIX $out + substituteInPlace watchdog/dde_polkit_agent.go misc/auto_launch/{default.json,chinese.json} \ + --replace "/usr/lib/polkit-1-dde/dde-polkit-agent" "${dde-polkit-agent}/lib/polkit-1-dde/dde-polkit-agent" + substituteInPlace startmanager.go launch_group.go memchecker/config.go \ + --replace "/usr/share/startdde" "$out/share/startdde" + substituteInPlace misc/lightdm.conf --replace "/usr" "$out" + ''; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + gettext + pkg-config + jq + wrapGAppsHook + ]; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + dde-api + libgnome-keyring + gtk3 + alsa-lib + libpulseaudio + libgudev + libsecret + ]; + + buildPhase = '' + runHook preBuild + addToSearchPath GOPATH "${go-dbus-factory}/share/gocode" + addToSearchPath GOPATH "${go-gir-generator}/share/gocode" + addToSearchPath GOPATH "${go-lib}/share/gocode" + addToSearchPath GOPATH "${dde-api}/share/gocode" + make -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath} + ''; + + passthru.providedSessions = [ "deepin" ]; + + meta = with lib; { + description = "Starter of deepin desktop environment"; + longDescription = '' + Startdde is used for launching DDE components and invoking user's + custom applications which compliant with xdg autostart specification + ''; + homepage = "https://github.com/linuxdeepin/startdde"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/startdde/deps.nix b/pkgs/desktops/deepin/go-package/startdde/deps.nix new file mode 100644 index 00000000000..0a0b403ea44 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/startdde/deps.nix @@ -0,0 +1,236 @@ +[ + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "0.6.9"; + sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA="; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://github.com/golang/xerrors"; + rev = "2f41105eb62f341cfe208d06de4ee3bdd3a083da"; + sha256 = "sha256-yZNeG+jcarcw/aOFhrhxWWE20r0P+/VJF4i/0JQfv1c="; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } + { + goPackagePath = "github.com/axgle/mahonia"; + fetch = { + type = "git"; + url = "https://github.com/axgle/mahonia"; + rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; + sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://github.com/golang/text"; + rev = "v0.3.7"; + sha256 = "sha256-XpIbgE6MxWwDQQcPXr2NIsE2cev2+CIabi566TYGfHY="; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://github.com/golang/image"; + rev = "70e8d0d3baa9a699c3865c753cbfa8ae65bd86ce"; + sha256 = "sha256-oMbDIke/qQ6cp7JLNsMusf7EIUfuj0WavFVfI0lxTDs="; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { + goPackagePath = "github.com/Lofanmi/pinyin-golang"; + fetch = { + type = "git"; + url = "https://github.com/Lofanmi/pinyin-golang"; + rev = "1db892057f20c56a3286cc1517e0642dacbff54c"; + sha256 = "sha256-nhO6AYZ3vc7nwgmmfTlE6m33caY9gGZoKiSYvFLqHQc="; + }; + } + { + goPackagePath = "github.com/mozillazg/go-pinyin"; + fetch = { + type = "git"; + url = "https://github.com/mozillazg/go-pinyin"; + rev = "8930bc1fcb5693689dc35d98ad2a4153662e34b1"; + sha256 = "sha256-kuMNiWpPeqsIsFgYIOsffxUfwcLPaMZWdZRBJAMDVvA="; + }; + } + { + goPackagePath = "github.com/kelvins/sunrisesunset"; + fetch = { + type = "git"; + url = "https://github.com/kelvins/sunrisesunset"; + rev = "39fa1bd816d52927b4cfcab0a1535b17eafe0a3d"; + sha256 = "sha256-awklKAW1YM3sWM21irbyu2sUMIo3kCOj12lzyVzDefw="; + }; + } + { + goPackagePath = "github.com/rickb777/date"; + fetch = { + type = "git"; + url = "https://github.com/rickb777/date"; + rev = "v1.18"; + sha256 = "sha256-8r8eFOF5dKtowE3dnjpSMIXJ/yX2IjiR7nZ/EApUZbA="; + }; + } + { + goPackagePath = "github.com/rickb777/plural"; + fetch = { + type = "git"; + url = "https://github.com/rickb777/plural"; + rev = "v1.4.1"; + sha256 = "sha256-nhN+ApdfUie45L+M2OZAPtSoiIZ1pZ2UpDX/DePS6Yw="; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "v0.9"; + sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; + }; + } + { + goPackagePath = "github.com/msteinert/pam"; + fetch = { + type = "git"; + url = "https://github.com/msteinert/pam"; + rev = "v1.0.0"; + sha256 = "sha256-Ji13ckPyZUBAovhK2hRHgf2LB1ieglX/XrIJBxVcsXc="; + }; + } + { + goPackagePath = "github.com/youpy/go-wav"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-wav"; + rev = "v0.3.2"; + sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM="; + }; + } + { + goPackagePath = "github.com/zaf/g711"; + fetch = { + type = "git"; + url = "https://github.com/zaf/g711"; + rev = "v1.2"; + sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY="; + }; + } + { + goPackagePath = "github.com/youpy/go-riff"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-riff"; + rev = "v0.1.0"; + sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8="; + }; + } + { + goPackagePath = "github.com/adrg/xdg"; + fetch = { + type = "git"; + url = "https://github.com/adrg/xdg"; + rev = "v0.4.0"; + sha256 = "sha256-zGjkdUQmrVqD6rMO9oDY+TeJCpuqnHyvkPCaXDlac/U="; + }; + } +] diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index ab7ceea4b11..a7574cdc655 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , shared-mime-info , qtbase diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index b8188fece80..8aefcbbe03b 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -2,7 +2,6 @@ , lib , extra-cmake-modules , plymouth -, nixos-icons , imagemagick , netpbm , perl diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index a60b78cb9d5..b9d3dd80a23 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , gettext , kdoctools @@ -12,7 +11,6 @@ , packagekit-qt , pcre , util-linux -, qtbase , qtquickcontrols2 , qtwebview , qtx11extras diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index eb094c68710..195e5757560 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , boost , kconfig diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 86d146c8b41..b3cb961e6d5 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }: +{ mkDerivation, extra-cmake-modules, qtbase, ki18n, kcoreaddons }: mkDerivation { pname = "kdecoration"; diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index 5c05eca4797..df552e1c87a 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,9 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , kconfig , kconfigwidgets , ki18n -, qtbase , qtx11extras , libXxf86vm }: diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index c30e1c44758..244756ec801 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,8 +1,6 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools -, qtbase , kcmutils , kdbusaddons , kdelibs4support diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix index 2f27dd201ce..bbc8c03f37c 100644 --- a/pkgs/desktops/plasma-5/kinfocenter/default.nix +++ b/pkgs/desktops/plasma-5/kinfocenter/default.nix @@ -2,7 +2,6 @@ , lib , extra-cmake-modules , kdoctools -, qtbase , qttools , kcmutils , kcompletion diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index f09104d534f..b7510cb95bc 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , kcmutils @@ -12,7 +11,6 @@ , libXcursor , pam , plasma-framework -, qtbase , qtdeclarative , qtx11extras , wayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 9a5ee90cd36..072b78f53d6 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , kcoreaddons diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index eab364d90d0..6310f9fee4a 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kguiaddons , kidletime diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 3f19acea6bd..2ce029be9de 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kcoreaddons , kdbusaddons diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 721eee49373..d437c4cf0b7 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kguiaddons , kidletime diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index 74fbd838187..961b56736ae 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,8 +1,6 @@ { mkDerivation -, lib , propagate , extra-cmake-modules -, qtbase , wayland-scanner , kconfig , kwayland diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 8e9be6f743c..17e9decf454 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kauth , kcompletion @@ -13,7 +12,6 @@ , kwidgetsaddons , kwindowsystem , plasma-framework -, qtbase , qtscript , qtwebengine , qtx11extras diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 87f5f3b170f..1045e5f68e5 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kcoreaddons , kdeclarative @@ -8,7 +7,6 @@ , krunner , kservice , plasma-framework -, qtbase , qtscript , qtdeclarative }: diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index 22ea8bf7825..a37a8cfe12b 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -2,10 +2,6 @@ , lib , extra-cmake-modules , kdoctools -, coreutils -, dbus -, gnugrep -, gnused , libdbusmenu , pam , wayland @@ -30,12 +26,9 @@ , maliit-framework , maliit-keyboard , qtfeedback -, qtwayland , qttools }: -let inherit (lib) getBin getLib; in - mkDerivation { pname = "plasma-mobile"; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 0a5947cdf19..1915196e494 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , substituteAll , extra-cmake-modules , kdoctools @@ -29,7 +28,6 @@ , modemmanager-qt , networkmanager-qt , qca-qt5 -, qtbase , qtdeclarative , qttools }: diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 07170892f27..0256461db94 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , kcmutils diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix index 58fac85690d..e92521c148b 100644 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , karchive , kcompletion diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index 80a54c93d58..44f69995a15 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kdoctools , qtquickcontrols2 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 730f7f3b6b4..7cc61535566 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -2,9 +2,6 @@ , lib , extra-cmake-modules , kdoctools -, coreutils -, gnugrep -, gnused , isocodes , libdbusmenu , libSM diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 3f4387ed5f3..f96c642f7b2 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kcoreaddons , kconfig @@ -11,7 +10,6 @@ , kwidgetsaddons , kwindowsystem , polkit-qt -, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix index a45488c287d..fbaf65bf0cf 100644 --- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix +++ b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , kconfig , kconfigwidgets diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 50801d31774..55f934587d0 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,11 +1,9 @@ { mkDerivation -, lib , extra-cmake-modules , shared-mime-info , libpthreadstubs , libXcursor , libXdmcp -, qtbase , qtquickcontrols2 , qtx11extras , karchive diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 5fa1a17c424..cbda6124a31 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,5 +1,4 @@ { mkDerivation -, lib , extra-cmake-modules , gettext , kdoctools diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index ffe94eab3ce..bf1c6e2ffae 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -29,6 +29,7 @@ , buildPackages , libxcrypt , disableGdbPlugin ? !enablePlugin +, disableBootstrap ? !stdenv.hostPlatform.isDarwin , nukeReferences , callPackage }: @@ -56,7 +57,6 @@ with builtins; let majorVersion = "12"; version = "${majorVersion}.2.0"; - disableBootstrap = !stdenv.hostPlatform.isDarwin; inherit (stdenv) buildPlatform hostPlatform targetPlatform; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index ea226337045..4050f3e4d12 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -79,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: { # Build definition checks for the Python modules needed at runtime by importing them. (buildPackages.python3.withPackages pythonModules) finalAttrs.setupHook # move .gir files - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; + # can't use canExecute, we need prebuilt when cross + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ (python3.withPackages pythonModules) @@ -106,8 +107,10 @@ stdenv.mkDerivation (finalAttrs: { inherit (buildPackages) bash; buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; }}" - "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" + # can't use canExecute, we need prebuilt when cross + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dgi_cross_use_prebuilt_gi=true" ]; doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index dede81b0a1c..645187368e1 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-ntgTgIJ3u1IbR/eYOgwmgR9Jvx28P+l44wAMlBEcbj8="; + sha256 = "sha256-UENh8oxZm7uukCr448Nrf7devDK4SIT3DVhvXbwfjw8="; }; buildInputs = [ libyaml ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9a012e401ee..7d5305fe62d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.1.0"; + version = "9.2.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-V39p0kg+zGdoIY9mJjtMLk2xzlTjHG0SPR2GjvHK9FI="; + sha256 = "sha256-uASIfQVbY/5I/PELEB6EGzzHfcgY4jIolbyH05TgiLA="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index bc3bdc2fd58..ba7fcaa46e6 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.11"; + version = "3.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; + hash = "sha256-PlMckYYKgfiF9+bpfSGa6XcsuJlYAIR4iTXa19l0LvA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 0ea28830afe..9b8d0fcd5ff 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,62 +1,58 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage -, fetchFromGitHub -, pythonOlder , cython , eventlet -, futures ? null -, iana-etc +, fetchFromGitHub , geomet +, gevent +, gremlinpython +, iana-etc , libev +, libredirect , mock , nose , pytestCheckHook +, pythonOlder , pytz , pyyaml , scales , six , sure -, gremlinpython -, gevent , twisted -, libredirect }: buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.25.0"; + version = "3.26.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "datastax"; repo = "python-driver"; - rev = version; - sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; + rev = "refs/tags/${version}"; + hash = "sha256-mLQEG41WyFtXY2PJzoM4uaI4Cm+0xSIAPGhijHHbTBk="; }; postPatch = '' - substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet' + substituteInPlace setup.py \ + --replace 'geomet>=0.1,<0.3' 'geomet' ''; - nativeBuildInputs = [ cython ]; - buildInputs = [ libev ]; - propagatedBuildInputs = [ six geomet ] - ++ lib.optionals (pythonOlder "3.4") [ futures ]; + nativeBuildInputs = [ + cython + ]; - # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, - # also /etc/resolv.conf is referenced by some tests - preCheck = (lib.optionalString stdenv.isLinux '' - echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - export LD_PRELOAD=${libredirect}/lib/libredirect.so - '') + '' - # increase tolerance for time-based test - substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' - ''; - postCheck = '' - unset NIX_REDIRECTS LD_PRELOAD - ''; + buildInputs = [ + libev + ]; + + propagatedBuildInputs = [ + six + geomet + ]; nativeCheckInputs = [ pytestCheckHook @@ -72,13 +68,34 @@ buildPythonPackage rec { twisted ]; + # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, + # also /etc/resolv.conf is referenced by some tests + preCheck = (lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + '') + '' + # increase tolerance for time-based test + substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + ''; + + pythonImportsCheck = [ + "cassandra" + ]; + + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + pytestFlagsArray = [ "tests/unit" ]; + disabledTestPaths = [ # requires puresasl "tests/unit/advanced/test_auth.py" ]; + disabledTests = [ # doesn't seem to be intended to be run directly "_PoolTests" @@ -91,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; + changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ turion ris ]; }; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index eadc07519a0..531d26158d1 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -1,21 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, django }: +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, poetry-core +, python +, pythonOlder +, ua-parser +}: buildPythonPackage rec { pname = "django-sesame"; - version = "1.7"; + version = "3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; - rev = version; - sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44"; + rev = "refs/tags/${version}"; + hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w="; }; - nativeCheckInputs = [ django ]; + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + django + ua-parser + ]; + + pythonImportsCheck = [ + "sesame" + ]; checkPhase = '' - make test + runHook preCheck + + ${python.interpreter} -m django test --settings=tests.settings + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 6328bd5003c..9f34ffcf348 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.1.0"; + version = "9.2.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-kdWmgmkvI7yaqyFytPnHN6OtF+gsRe58q6AlXFycfQ8="; + hash = "sha256-htJPNFiY0WuQlgfFkLh3RUmnx2X4aQ0+iUQgZ1+HDp0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index b6b055c2306..702f6257b79 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.7"; + version = "3.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-q9zaKccgqj8haP7zQGS0rplfLylsPXggjzhN6VWV4/A="; + hash = "sha256-refOq/QWRv1naCskVm6h1QmCH9/YkDJ90HU3Hzc2w4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index b30f218193e..28a3b8035ce 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , substituteAll +, cudaSupport ? false # runtime , ffmpeg @@ -9,10 +10,15 @@ # propagates , numpy , torch +, torchWithCuda , tqdm , more-itertools , transformers , ffmpeg-python +, numba +, openai-triton +, scipy +, tiktoken # tests , pytestCheckHook @@ -20,14 +26,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20230124"; + version = "20230314"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+3fs/EXK5NGlISuMTk7r2ZZ4tNFKbNFNkVS2LmHBvwk="; + hash = "sha256-qQCELjRFeRCT1k1CBc3netRtFvt+an/EbkrgnmiX/mc="; }; patches = [ @@ -39,13 +45,31 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - torch tqdm more-itertools transformers ffmpeg-python + numba + scipy + tiktoken + ] ++ lib.optionals (!cudaSupport) [ + torch + ] ++ lib.optionals (cudaSupport) [ + openai-triton + torchWithCuda ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "tiktoken==0.3.1" "tiktoken>=0.3.1" + '' + # openai-triton is only needed for CUDA support. + # triton needs CUDA to be build. + # -> by making it optional, we can build whisper without unfree packages enabled + + lib.optionalString (!cudaSupport) '' + sed -i '/if sys.platform.startswith("linux") and platform.machine() == "x86_64":/{N;d}' setup.py + ''; + preCheck = '' export HOME=$TMPDIR ''; @@ -56,14 +80,18 @@ buildPythonPackage rec { disabledTests = [ # requires network access to download models + "test_tokenizer" "test_transcribe" + # requires NVIDIA drivers + "test_dtw_cuda_equivalence" + "test_median_filter_equivalence" ]; meta = with lib; { + changelog = "https://github.com/openai/whisper/blob/v$[version}/CHANGELOG.md"; description = "General-purpose speech recognition model"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ hexa MayNiklas ]; }; } - diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 62feab353d9..41a0c834ba7 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-ZEQ7vJrQm1fQ9Ny7OO/0TVKFO3QYyepS9YV6vhu1NOw="; + hash = "sha256-CZqcQ7V2iIWpnHYbHxSoxlBLsU6WMa2HVXOa2vdYJm8="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ba78b1d50bc..25fd4552dae 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -3,12 +3,11 @@ buildGoModule rec { pname = "mysqld_exporter"; version = "0.14.0"; - rev = "v${version}"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; + rev = "v${version}"; sha256 = "sha256-SMcpQNygv/jVLNuQP8V6BH/CmSt5Y4dzYPsboTH2dos="; }; @@ -17,7 +16,7 @@ buildGoModule rec { ldflags = let t = "github.com/prometheus/common/version"; in [ "-s" "-w" "-X ${t}.Version=${version}" - "-X ${t}.Revision=${rev}" + "-X ${t}.Revision=${src.rev}" "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 9933a8e436a..9ab2285acf4 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -1,6 +1,6 @@ { "bookmarks": { - "sha256": "511aadcda0b1f051191c20cfd7048150536cfb1e748deb11b568bec4e535a173", + "sha256": "1jkbwzig4xd042jcbdbdh4whkpxb87f7ba0c89c78bdgcqzjv1a3", "url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz", "version": "11.0.4", "description": "- π Sort bookmarks into folders\n- π· Add tags and personal notes\n- π Full-text search\n- π² Synchronize with all your browsers and devices\n- πͺ Share bookmarks with other users and publicly\n- β Find broken links\n- β Generate RSS feeds of your collections\n- π Read archived versions of your links in case they are depublished\n- π¬ Create new bookmarks directly from within Nextcloud Talk\n- πΌ Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1cb3rjqgjysmirfvda4fqyr24ljh1203bzygmzzm9n26ji72636f", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.6/calendar-v3.5.6.tar.gz", - "version": "3.5.6", + "sha256": "0zzq556727yryxa0zas6agm6azl1898gbjx4wnl8d8m9hczf6xr2", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.7/calendar-v3.5.7.tar.gz", + "version": "3.5.7", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* π **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* π **WebCal Support!** Want to see your favorite teamβs matchdays in your calendar? No problem!\n* π **Attendees!** Invite people to your events\n* βοΈ **Free/Busy!** See when your attendees are available to meet\n* β° **Reminders!** Get alarms for events inside your browser and via email\n* π Search! Find your events at ease\n* βοΈ Tasks! See tasks with a due date directly in the calendar\n* π **Weβre not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", - "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", - "version": "21.2.0-beta1", + "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz", + "version": "21.2.0-beta2", "description": "π° A RSS/Atom Feed reader App for Nextcloud\n\n- π² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- π Automatic updates of your news feeds\n- π Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -120,7 +120,7 @@ ] }, "notes": { - "sha256": "adddee56456d0115f87a74405a6d62bd5e3af256e86199d87bbff3b2a6876299", + "sha256": "0b88xsznfi31la7iyj4b7j1qlb8wvrmq49z9dgdrwja3r81mxnsr", "url": "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz", "version": "4.5.1", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", @@ -160,9 +160,9 @@ ] }, "previewgenerator": { - "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz", + "version": "5.2.2", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -190,7 +190,7 @@ ] }, "tasks": { - "sha256": "fdfa3168ac80eaef3e2de5009eee02a369acc8d35dfd8283d1f25423bdf3c532", + "sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5", "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz", "version": "0.14.5", "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal β¦ - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", @@ -220,7 +220,7 @@ ] }, "twofactor_webauthn": { - "sha256": "291c20032cfc1f2fb081cc8721e272bc503d103987c6abb7ce442e497d278d0a", + "sha256": "10f6dm9cxljicmfk9l4ncg6r7c1jy1pvm0b5kvz35q9jgniq0hcs", "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v0.3.3/twofactor_webauthn-v0.3.3.tar.gz", "version": "0.3.3", "description": "A two-factor provider for WebAuthn devices", diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 00136197cdf..9479abfa0d4 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz", - "version": "4.3.1", + "sha256": "0hda62j3n2rs59d1rlnd20y20dahhkcs3zlhly7nw3s8csyd1whl", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.2/calendar-v4.3.2.tar.gz", + "version": "4.3.2", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* π **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* π **WebCal Support!** Want to see your favorite teamβs matchdays in your calendar? No problem!\n* π **Attendees!** Invite people to your events\n* βοΈ **Free/Busy!** See when your attendees are available to meet\n* β° **Reminders!** Get alarms for events inside your browser and via email\n* π Search! Find your events at ease\n* βοΈ Tasks! See tasks with a due date directly in the calendar\n* π **Weβre not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -100,9 +100,9 @@ ] }, "news": { - "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", - "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", - "version": "21.2.0-beta1", + "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz", + "version": "21.2.0-beta2", "description": "π° A RSS/Atom Feed reader App for Nextcloud\n\n- π² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- π Automatic updates of your news feeds\n- π Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -140,9 +140,9 @@ ] }, "polls": { - "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz", - "version": "5.0.0-rc1", + "sha256": "0g5fq9ls7fvcgh0nhpsc8b6ca5vnsisqzpnyq5bcw8bmhnznzj7g", + "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc2/polls.tar.gz", + "version": "5.0.0-rc2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -150,9 +150,9 @@ ] }, "previewgenerator": { - "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz", + "version": "5.2.2", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index aa98d791b09..af74be50241 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz", - "version": "4.3.1", + "sha256": "0hda62j3n2rs59d1rlnd20y20dahhkcs3zlhly7nw3s8csyd1whl", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.2/calendar-v4.3.2.tar.gz", + "version": "4.3.2", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* π **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* π **WebCal Support!** Want to see your favorite teamβs matchdays in your calendar? No problem!\n* π **Attendees!** Invite people to your events\n* βοΈ **Free/Busy!** See when your attendees are available to meet\n* β° **Reminders!** Get alarms for events inside your browser and via email\n* π Search! Find your events at ease\n* βοΈ Tasks! See tasks with a due date directly in the calendar\n* π **Weβre not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -90,9 +90,9 @@ ] }, "mail": { - "sha256": "0dz3macak3r3gqn4rxpkli2bmb284w3kywlfcra7gnkiqfivrf9v", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.0.3-beta1/mail-v3.0.3-beta1.tar.gz", - "version": "3.0.3-beta.1", + "sha256": "1q9vqjmr7mkxszjpwxcbwfqgn6m2qzrzmbxa7rbiy1dnb1frnsks", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.1.0/mail-v3.1.0.tar.gz", + "version": "3.1.0", "description": "**π A mail app for Nextcloud**\n\n- **π Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files β more to come.\n- **π₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **π Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **π Weβre not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **π¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -100,9 +100,9 @@ ] }, "news": { - "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", - "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", - "version": "21.2.0-beta1", + "sha256": "0l8ps13y00hq3xh1w874f3zx73gpmi4jxd3gzwhggx1r495gxqbh", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta2/news.tar.gz", + "version": "21.2.0-beta2", "description": "π° A RSS/Atom Feed reader App for Nextcloud\n\n- π² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- π Automatic updates of your news feeds\n- π Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -140,9 +140,9 @@ ] }, "polls": { - "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz", - "version": "5.0.0-rc1", + "sha256": "0g5fq9ls7fvcgh0nhpsc8b6ca5vnsisqzpnyq5bcw8bmhnznzj7g", + "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc2/polls.tar.gz", + "version": "5.0.0-rc2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -150,9 +150,9 @@ ] }, "previewgenerator": { - "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", - "version": "5.2.1", + "sha256": "0vwlx3z80i12f9hm0qrm014a0wybjk2j5is7vyn9wcizhr6mpzjv", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.2/previewgenerator-v5.2.2.tar.gz", + "version": "5.2.2", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index d0a7bce8bc0..d41b25953b5 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -9,8 +9,8 @@ }: let - py = python3.override { - packageOverrides = self: super: { + py = python3 // { + pkgs = python3.pkgs.overrideScope (self: super: { ipython = super.ipython.overridePythonAttrs (oldAttrs: rec { pname = "ipython"; version = "8.5.0"; @@ -31,7 +31,7 @@ let hash = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA="; }; }); - }; + }); }; in diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index cbc978821a0..4e52e605686 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation rec { description = "A multilingual input method framework"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.hostPlatform.isAarch64; # fails to build libgcroots (not supported on aarch64) maintainers = with maintainers; [ ericsagnes oxij ]; }; } diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index 04102746b24..e01a2f9cb6b 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "tmux-sessionizer"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "jrmoulton"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FSh3ww5KpktNSvqB3kcIaTxNHypwsVTHze0mgBtuJQE="; + sha256 = "sha256-fV+LBs+jbcOjArUfygEXkyxg/xGhI35YduUkx4AyQhk="; }; - cargoSha256 = "sha256-3DyLYegAzNbPpW6MUIDLm1QUqmGg8zH0Ps1dbdaSezs="; + cargoHash = "sha256-Bg4C4r3h/kaMsAqzit9JVuAe7vYrRB9W5OLOWPgCJHc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index 2a7701ed9e3..7a3364c8420 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -3,38 +3,45 @@ , rustPlatform , fetchFromGitHub , pkg-config +, openssl , pcsclite , PCSC , Foundation +, IOKit }: rustPlatform.buildRustPackage rec { pname = "age-plugin-yubikey"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg="; + hash = "sha256-V3NzZyCfslUBsARO5UC8N+cuptLxg2euM87DGqtLpPk="; }; - cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y="; + cargoHash = "sha256-5qmwCcrhDkJlyeTS+waMiTxro1HjMHiQE5Ds/4sVpx4="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = - if stdenv.isDarwin then [ - Foundation - PCSC - ] else [ - pcsclite - ]; + buildInputs = [ + openssl + ] + ++ lib.optional stdenv.isLinux pcsclite + ++ lib.optionals stdenv.isDarwin [ + IOKit + Foundation + PCSC + ]; meta = with lib; { - description = "YubiKey plugin for age clients"; + description = "YubiKey plugin for age"; homepage = "https://github.com/str4d/age-plugin-yubikey"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ vtuan10 ]; + changelog = "https://github.com/str4d/age-plugin-yubikey/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ kranzes vtuan10 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df369ff475b..d4686c68453 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6336,8 +6336,8 @@ with pkgs; agebox = callPackage ../tools/security/agebox { }; - age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation PCSC; + age-plugin-yubikey = darwin.apple_sdk_11_0.callPackage ../tools/security/age-plugin-yubikey { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation PCSC IOKit; }; artim-dark = callPackage ../data/themes/artim-dark { }; @@ -14846,6 +14846,15 @@ with pkgs; profiledCompiler = false; }); + gfortran-tmp-noisystem = wrapCCWith { grossHackForStagingNext = true; cc = (gcc.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + disableBootstrap = false; + }); }; + gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; langFortran = true; @@ -15327,8 +15336,12 @@ with pkgs; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; - julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; - julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; + julia_18 = callPackage ../development/compilers/julia/1.8.nix { + gfortran = gfortran-tmp-noisystem; + }; + julia_19 = callPackage ../development/compilers/julia/1.9.nix { + gfortran = gfortran-tmp-noisystem; + }; julia-lts-bin = julia_16-bin; julia-stable-bin = julia_18-bin; @@ -37823,7 +37836,7 @@ with pkgs; ngspice = callPackage ../applications/science/electronics/ngspice { }; - nvc = callPackage ../applications/science/electronics/nvc { }; + nvc = darwin.apple_sdk_11_0.callPackage ../applications/science/electronics/nvc { }; openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09b25833c63..6eb76522dd6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6817,7 +6817,9 @@ self: super: with self; { openai-triton = callPackage ../development/python-modules/openai-triton { llvmPackages = pkgs.llvmPackages_rocm; }; - openai-whisper = callPackage ../development/python-modules/openai-whisper { }; + openai-whisper = callPackage ../development/python-modules/openai-whisper { + cudaSupport = pkgs.config.cudaSupport or false; + }; openant = callPackage ../development/python-modules/openant { }; |