diff options
Diffstat (limited to 'pkgs')
304 files changed, 5518 insertions, 2951 deletions
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 4abc6d4956f47..0ebc6c604bdc9 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -52,6 +52,7 @@ , upower , vamp-plugin-sdk , wavpack +, wrapGAppsHook3 }: mkDerivation rec { @@ -65,7 +66,9 @@ mkDerivation rec { hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; + + dontWrapGApps = true; buildInputs = [ chromaprint @@ -118,9 +121,9 @@ mkDerivation rec { wavpack ]; - qtWrapperArgs = [ - "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" - ]; + preFixup='' + qtWrapperArgs+=(--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive ''${gappsWrapperArgs[@]}) + ''; # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index d9d14b9670db7..1daefa5e7271d 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-+sRXpRAtbLpQlyJUhbc1Cuzh6aV8HRvYH/ja9sfvKoA="; + sha256 = "sha256-vuvL6yYF43++De5RLsMgoSpmIjfLzvq5QpRfdJTESuw="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix deleted file mode 100644 index 768402f4e5a7c..0000000000000 --- a/pkgs/applications/editors/apostrophe/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja -, wrapGAppsHook3, pkg-config, desktop-file-utils -, appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium -, shared-mime-info, libhandy, fira, sassc -}: - -let - pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools levenshtein pyenchant - pygobject3 pycairo pypandoc chardet - ]); - -in stdenv.mkDerivation rec { - pname = "apostrophe"; - version = "2.6.3"; - - src = fetchFromGitLab { - owner = "World"; - repo = pname; - domain = "gitlab.gnome.org"; - rev = "v${version}"; - sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M="; - }; - - nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook3 sassc gobject-introspection ]; - - buildInputs = [ glib pythonEnv gtk3 - gnome.adwaita-icon-theme webkitgtk gspell texliveMedium - glib-networking libhandy ]; - - postPatch = '' - substituteInPlace data/media/css/web/base.css \ - --replace 'url("/app/share/fonts/FiraSans-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraSans-Regular.otf") format("otf")' \ - --replace 'url("/app/share/fonts/FiraMono-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraMono-Regular.otf") format("otf")' - - patchShebangs --build build-aux/meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveMedium}/bin" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/apostrophe"; - description = "A distraction free Markdown editor for GNU/Linux"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.sternenseemann ]; - mainProgram = "apostrophe"; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index e73899e66fea8..c2c2ca8a56ffc 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -48,7 +48,7 @@ "new": "sqlite-lua" }, "vim-fsharp": { - "date": "2024-04-21", + "date": "2024-05-06", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e477fa1f520ec..616d46e65190f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-04-11"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "bb36f71b77d8e15788a5b62c82a1c9ec7b209e49"; - sha256 = "1vjckraf062d7dybf1iphp7i7lwphzgc1bns0jzfardbd1q9gw3f"; + rev = "530e94a9fa19577401e968a9673282c3d79f01e3"; + sha256 = "1hjin3p1w6qypq8374mixd5jxz6zviddp3is0a4x9c5047s2ivi2"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-04-20"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "d4eded0ab36ba60aa7e13893a2064a74d2cdb6bd"; - sha256 = "0xzdm4ggh5bggnxjgcaxkzdiwfxs11yblgmpwvzqjhpzv8qnzkx1"; + rev = "b73af2cbe778e560b723bc65eb385302257f44a4"; + sha256 = "1y0bxr88v3kkay5vqz1k2m3c65aw0fnb50ip85x8ksjfxhvxjqll"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -257,12 +257,12 @@ final: prev: QFEnter = buildVimPlugin { pname = "QFEnter"; - version = "2023-10-20"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "426c04312ae67ac28dce38ccc5fafdd1ed4a3d9f"; - sha256 = "02s3mq0hxszi7fbm256xgh4nz5mc5frg8rz6dnll7sk26as8fgrd"; + rev = "1e4bf00b264e0f1541401c28c4b63ace5bb3d2be"; + sha256 = "1aksyxm89jmrrdw77979jdxp83z0lj1n1qhyipjmjz0vdljr6w50"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-04-18"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "f7cae6f1b38cb296f48ce1a9c5ed1a419d912a42"; - sha256 = "0mdriqqna37a9fjbilaq2qkkn4ik4jn2dz1x6ra51pgh42r86qhl"; + rev = "2ef728ff7e790431f1f71052bfd4c5568157e110"; + sha256 = "1y25yp9n3x8w2psrmcbzbm4gghr368ly9amksw0z7g4jnkw1913p"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,36 +498,36 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2024-03-09"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "5072b1b1065a6b22bdd46b5c21780a91d6a08071"; - sha256 = "195ns7dw3g4sq3pmh3h3xas4kfmwwhidlg4q7nnffkd6x9cdg31w"; + rev = "ceb6e06d1c8c30d8ddfe3afb03cd2c47b08b2798"; + sha256 = "076z8cjkzkwy6qnjavsj8mvbq5f5kld2jdcq0x337hsfmzgj3s6h"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; - version = "2023-12-15"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "adwaita.nvim"; - rev = "981bce791959d79cd1316e59e23906e3c05efb44"; - sha256 = "1lrxns172mad4936x1njagn5j30nyxwrw82dmhzf4yfkz8pra251"; + rev = "c9379097755701ab597140bafd097fbaff3dd517"; + sha256 = "18qswcjppgcxcf5p8vlr0nwb6p6s3j68a7ng05bpx49i5nwrd0vy"; }; meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-04-19"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "7045e7cb0017d222122a1f6e5795e69754d8b9db"; - sha256 = "04mclw1drrkr4x4gnb26p6szg6glbkkff7cbrxy4g7fyx6lhl9fy"; + rev = "83a79f39b709c20be4c830d241379fa85ef21a7c"; + sha256 = "0097knf20gkc622pdpkxhhjl6fim8h4130xhigv6xa52jsl4jdl2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-04-20"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "adee52fba040428264aee956d99033572fc405a3"; - sha256 = "125hcnl146bh8bpsp3v62dbdqpzwma5n69f8y6gpk5anh4yc1sai"; + rev = "70eeae54fbd5c2e254604d543674f02d42c0ccdd"; + sha256 = "0wyahv3gb56kaqw9mz9jklnc8h20zis1fc4662cyaks14fav9cjc"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -691,12 +691,12 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-04-19"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "37f32c94cf6e01826af5d96337c70d2f9be0a280"; - sha256 = "0v23gw86rmciaqbi27ifd3f5mw0vknm2482yznb30dpq3pk53327"; + rev = "a133010d392e5e12f28e3315d634c74912b3ec24"; + sha256 = "1870j9681pc0zdjip5nk1cdmdac37kd9phvjmz1q4jvy9m4hy475"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; @@ -895,14 +895,14 @@ final: prev: auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; - version = "2022-11-01"; + version = "2024-04-25"; src = fetchFromGitHub { - owner = "pocco81"; + owner = "okuuva"; repo = "auto-save.nvim"; - rev = "979b6c82f60cfa80f4cf437d77446d0ded0addf0"; - sha256 = "13kv2p0gj20fg79ch27a9vp10ki11vjj4fx626cj526qpnbs4qbd"; + rev = "5fe9ab0c42f0457f2a973e814a6352b8eeb04730"; + sha256 = "1c4xmp1cy3h7z68yh09bcazdqj8kimyrddgl0wc068sb6pmnpbbi"; }; - meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; + meta.homepage = "https://github.com/okuuva/auto-save.nvim/"; }; auto-session = buildVimPlugin { @@ -1027,12 +1027,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-04-18"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "aaeda8100e3a7ebcc65b5897c9027eca2bd9cbf2"; - sha256 = "1734skv1z9qd8p6dspda1hhq79rd4y4bkyggf0iphz8qw7g0qm8m"; + rev = "f624433d750dbf69ce93ee057fbc1c595aa13e31"; + sha256 = "06mxl2cfdfv8d0jwrsm69221v9hlx1c4gbz1zfgzwcm464pyqaqg"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1087,12 +1087,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-03-25"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad"; - sha256 = "12c3xiv3dxjng86dahz0aw93v62ygqy7pkb3485yjs7a2v6jg5d9"; + rev = "bcc9ed2e88ef55b7e9d50b2f80f6a2d4b8080b1d"; + sha256 = "15f4lqcm6qbfwf2djs72hni9ibwbqjkdniniizh7fsz91k1afq8r"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1291,36 +1291,36 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-04-19"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "f6f00d9ac1a51483ac78418f9e63126119a70709"; - sha256 = "1681xqpvxb7zhfig69d0qf287qzxfwcwb6vipnhykiisd8vn9inv"; + rev = "73540cb95f8d95aa1af3ed57713c6720c78af915"; + sha256 = "0z3fg5zff1gng6wzsbj56sbbvmq9f30y6bzzkd9kjrfzsml6cybc"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; bufjump-nvim = buildVimPlugin { pname = "bufjump.nvim"; - version = "2021-12-05"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "kwkarlwang"; repo = "bufjump.nvim"; - rev = "a020f81bb82f758da51594a07bfcb9635a6b0f73"; - sha256 = "1a8n466drd9rz2q0h0cpc6xs1djgwshyh8gndx9kqw1n56vsa777"; + rev = "ae2728a77defbd27e9e5ef64c854fb0813ffba01"; + sha256 = "0d8rhgx9vyw58f5ryjwz5ibiwpvjdhrmd27nw4sh7z4bq1n9gxib"; }; meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/"; }; bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-04-18"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "4ed0785a5a812d9dc96164f2ceab10f5dce68270"; - sha256 = "0dpbh9l4a3009k0qi016zm03wjc12jbf31lhj78mmqnpazfn7gfh"; + rev = "448ad2a159c5f2540f6c9738f3bb9e6f15a41734"; + sha256 = "19anlq6kjlbmhzr2sqqykxfksflkfij10kj82cxlj47r7nqzjgpf"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1363,24 +1363,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-04-08"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "1283eef5494c092a047baa34ed3e667f3cb2715e"; - sha256 = "1wipfpypa2zjdc2n4cjkiaxcfh0mraiwiripg3vmd4mf37wbxphv"; + rev = "f388f1981d222967c741fe9927edf9ba5fa3bcbe"; + sha256 = "1d0v96vxghm5dzjm03hhrds0qafvhbjnq1il9z7bkg3r062vs6j1"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-04-18"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "a8271021ec4f5cae4b9a276ab8662e9a7d6074f9"; - sha256 = "0cpzpz17smp3dc4lwid3gkkjwangndy1d6fbijrl1l2jpa8dzrgq"; + rev = "dac7ee382afa77dec64df11eac8cb7be830a69a6"; + sha256 = "1l34c38rc35wp6mhccbvxq5ddj39gc770rdnyhg9nxqzsql281js"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1435,12 +1435,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-04-20"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "ea9cb04feadc1f7fbd2902fc65f0308354583f5d"; - sha256 = "0mqnh1155pg0dw07hzn7jd5x42gwvffkpn7w1pk4jnmaas3yxpkh"; + rev = "44c7ef5568f5377f3d9b5a8b7b267c015ea3205c"; + sha256 = "10d5ia00q5wfycnvyxfn5hffy2n5jk4igjm5859i56i11pl0qmsa"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1459,12 +1459,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2024-03-25"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe"; - sha256 = "1qms0pkm1a7mri3bhn3aqy5lis6b1a9x6hwa383z2dp8iqqkcran"; + rev = "430a8f56605cb1d0ed9876301d6e9bf675195e16"; + sha256 = "1gqbl3s963dmz0bldxl99sg7zvqgmcfz3x1g8i5whaqqx3ig82m3"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1531,12 +1531,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-04-14"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "8506c426d5b361dbaa7c61c0490a2589a9c555ce"; - sha256 = "1kmrfbxwzi60mf88qfcwjcwn0js9wci0yz89d99zgrm0vxl5jpkh"; + rev = "1c309e42bf0fe1ee79caa4de7b3cc39a170de382"; + sha256 = "1mnczi00llsr309zd3w45axlkffafms83f2dsdb8avmyfbjaf46w"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -2155,12 +2155,12 @@ final: prev: coc-fzf = buildVimPlugin { pname = "coc-fzf"; - version = "2024-01-04"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "96490e570daf1c10679ac0b183ebf2ca1024b079"; - sha256 = "0iyjrax9sqimx7vrkk98qy3zag4vbw3g3kw4p6mmyjryi20kw66m"; + rev = "6f19832e9e80ceacb98faac2688364b4f7a5b8e4"; + sha256 = "1hjp5f1mrsrch83yi0f74a2pxsp7qmmrgp7ibd1v2wqvb4cnwsfp"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -2215,12 +2215,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a8823eed914f89cdd3940ed9f5f62786e6d585c1"; - sha256 = "1s3hcbhx5kn3b6m1793m02kl94g8hb53jc5lhjhgkg4qhx27hsq9"; + rev = "ad6b31032f4eb4c407dfc30c3de94e67571ecc07"; + sha256 = "0jyymnlj3qs4f6ilmq2wxj3ghxq0iand4am0d70i81s7izw26wcg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2239,24 +2239,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-04-16"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "dfcac077fa023b7194c6403ac9a8f931b9c24f28"; - sha256 = "03lykrm0d5xm8i5f002xfy7l8wmzji5bqy4ygl3vals12ni5ymph"; + rev = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825"; + sha256 = "0zssbn655hqxihmswbhih5w9k75gkhyqn9bm8n9vdqihygh5g9js"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-04-02"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "31dd2962c81759be007895db6ce089feec397c86"; - sha256 = "07ihw108z3lz86f29jqkm9skc4rywqw84mv8gwviaplndpd2z893"; + rev = "9406f13cf3eaa08318b76746bd105a04506cab27"; + sha256 = "083qfmiskr0xahi5c8h46qkrsy4bahcy63rf74g315wwfcv491vz"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2503,12 +2503,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-04-17"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a6965ac128eba75537ec2bc5ddd5d5e357062bdc"; - sha256 = "00knvdl5msvn178skxqxb0ip722cnqrpp8xr1id4z6j5vbysmhiy"; + rev = "12b3995537f52ba2810a9857e8ca256881febbda"; + sha256 = "1czcfc475qrf8mg9x5m0iziw8ap242w04zjdcild5yf30an3xh1g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2576,12 +2576,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-04-13"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "1e135c5303bc60598f6314a2276f31dc91aa34dd"; - sha256 = "06b5c0xgs3xiajdw7ag3qbv4i0qwn4s084r4pj5v8d9iyc834kiz"; + rev = "b603990a639bb4b8651d054ef8d5a8fe5db56e0c"; + sha256 = "0zkfdjxcbxs9bw01prmf6zavc41jv3688f7g88flp5cria4j9dw6"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2624,12 +2624,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-04-18"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "98e389717df1a29f557f7a5d8f1d8a7e5c0560dd"; - sha256 = "16ngidw3lg1virbd731pp9z1s20j8mva6569blkj7cnk08kprh7l"; + rev = "23ab6c20039a43bb21ce1c586ef0eece026c68bd"; + sha256 = "0ng4z0600fsbg7ln72305vyvhn7fd4rj0xzi1n7f57avhqvc4lpr"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2660,12 +2660,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-04-13"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "786d12a70c9b91fa2d0d102bb07df02be0db31a1"; - sha256 = "1krd7srvzjrikpirfypw09cv2flcy22jv8amrbxfxykrgg2vn6dd"; + rev = "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4"; + sha256 = "0prrq6fgw1nhmqb80gbfkgnqqk209l1vzszw6k20b13r303adpyk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2756,12 +2756,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-04-19"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "9a7f07ad318a96f19845683014d27be00495ea98"; - sha256 = "1w8ic8ngfk1x99yl7bx7kfqmwi0py6xj198yczvxwzmgfxby5sjc"; + rev = "a9cb4b229127e1b06964e73b5d55fad300b560be"; + sha256 = "1zmzng24211752fpircdlxbw3hflja7366hymyszwl7x061w04n0"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2792,24 +2792,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-04-18"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "6d06924b562de6f0bb136edf1bf549afbf6b7d00"; - sha256 = "1c5xhwsj84rs00zds9279wfvxc2xjmdfix36mvxdklrq6f083ifd"; + rev = "a0a78099658c7d4be3714f657b18ca8285d5d106"; + sha256 = "1vfzh9dsfggchxsyypkl8njdapmy5vhd0kwihvv32997x2sh1qks"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-04-17"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "4ac809ff035eb246392ce4593c49705e894dbbea"; - sha256 = "1zjycn3qj6mpa7c5aknka2dfq8d05ac8rc6sfh81sal2hwdnq1d1"; + rev = "c7d04c3bf0a83e37434a4319040c2384a7f97acc"; + sha256 = "1di8yxzag3siiqxvl5b11zgarpdwvd65apj5wlnwijp9nraxpgz9"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2912,12 +2912,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-04-17"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c727a3f05a804d1f04b11735f8241518465de9a7"; - sha256 = "1h08jrxa07b59ipxqlk2ni78bn1h2w4qdg0m46bwgn7pb24479f6"; + rev = "2a393849db9531d14106dcd437f9b7deb5012057"; + sha256 = "08yzbr2y07aj4bl0z8zv925qdmfx4pvjwpqk7829rp62nng7dc18"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3298,24 +3298,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-03-13"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "18e5beb3845f085b6a33c24112b37988f3f93c06"; - sha256 = "0pvkm9s0lg0vlk7qbn1sjf6sis3i3xba1824xml631bg6hahw37l"; + rev = "5162edb1442a729a885c45455a07e9a89058be2f"; + sha256 = "04h3q6ls7r9kx17l1kmcb82s4220sd98rxfm0w9cif4dq1gzpap3"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-04-20"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "e3c7de9f733587373959b220d5a1970c476a3d9f"; - sha256 = "02ipdrrian2s0ddbjaga681sgflcw6nqcq707g7v1f094fc2rvj5"; + rev = "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d"; + sha256 = "1m7ld10gr4cqhm8hw4qqlcvgdk32yb5p7n2rgr5x8339xnv2xwha"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3395,24 +3395,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-04-19"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "2bd059ef683c232f9d6fa898bfe93173f0d4253e"; - sha256 = "1phyrapplsn5iivl1vfnvg4nfilxdp8digcfy6d9khsbpggjhcmq"; + rev = "51cb9191aa2776477e2e75180f9a466f0efaac43"; + sha256 = "0yaxr9vjxj5ah7p98gzhdid8iwhjr64a76rlx0jjvmbzbz26vv8l"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-04-20"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "3c4f8344a341818417b3d75c04eb96d894cb4640"; - sha256 = "1jwqflzdr9qk27gqsd0h4nfi2scq274l2rgbmyccybj5kmdjv654"; + rev = "51eddb03a7a8c9f00d6415b356a4d3b75d8e75b6"; + sha256 = "1fckakkqgagn7n6wr92333acxy7wi3c7ny6y1pxr88nigzb5p9sk"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2024-03-12"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "f6c3109f714d89641fb939b42044b2136f8520b7"; - sha256 = "17j4x4wx50mhhafmp1c5rn644vsnx2473g9i32gg9hmzf27phcdn"; + rev = "cb60faf7486cd6edae884a58fb9c2793bc4e75ea"; + sha256 = "0ifzy31m11spjkdi3xc42r1zp9si38zgmp43a0bdxznbm6ka5hm5"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3564,24 +3564,24 @@ final: prev: fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; - version = "2023-08-03"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "451d277bbd003d57da939fa129541dba5c63c154"; - sha256 = "0hpx6n0fwi27xgd2qc7a73v897n7al6psza8m1pnacf9wb6lxsdw"; + rev = "28d5bcc86d01a75911cf9c165d16840b7f0d4f98"; + sha256 = "0f5k4v063ik43vzxgbzs38nzbyhjqfs2014v0b6xvdwkmp0cm3x6"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-04-19"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "2aa8b757313cc01f7779865bef7c7cc391753bd8"; - sha256 = "1xbaa553l7hc2jfgdj9q44xxgv8bkia51w54297p548w90by3kfl"; + rev = "b43be71ebc3ff0e451a627b47751fd7747dc15fb"; + sha256 = "0j5a6nsjv4nsrhvwlbnrm7cys94k62kx4450famb07b8q7miwi72"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3660,12 +3660,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-03-05"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "3363c140dca2ef0b89e2be0317917f077d752cd7"; - sha256 = "1c9k848y320fkn4mbsxb3x7i5dfwms1waq12yig1fn9mspw83vqy"; + rev = "03ba12a5a92a02d171005775a8150998c4060a74"; + sha256 = "0fa49443b21rzfvbyx4kri673y7nny8j3jgd591y71mfiaa7w5bw"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3685,12 +3685,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-10-17"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "48817af25f51c0590653bbc290866e4890fe1cbe"; - sha256 = "0cf1ll91mhqw73p3y366fxylrq0y222jl2kb8sxf2s4gisxpppcg"; + rev = "7bb4a9c75d1e20cd24185afedeaa11681829ba23"; + sha256 = "10f52qma6gh03pml1434w6lr7i8qh1jccl6yx4bmni9dscbv10hx"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3829,12 +3829,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-03-31"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ea068f1becd91bcd4591fceb6420d4335e2e14d3"; - sha256 = "172lhjssr4yh14vjxbkwx02hsnyykhqmvzzr1bx4aaawd22x0bz6"; + rev = "fa36367422da5a38560892e3db6d090a635d9d41"; + sha256 = "13q4hby88b7s3qy5xxsk385hxdc89ypxd33ipanzbx4h1bkvxj3g"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3949,12 +3949,12 @@ final: prev: fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-03-22"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "45d96c9cb1213204479593236dfabf911ff15443"; - sha256 = "12jr0svh80q6wchg59c4gwqgrbf1w9p1v3xdx4djs5vbshcdpxyc"; + rev = "269c08641ed5a842a19c03ca14e3eac3ac7ea74b"; + sha256 = "0fvqw0pkmynjhksy5hid2yzghjv25irkjvixz0dagggjwd635vx7"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4117,12 +4117,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-04-20"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "035da036e68e509ed158414416c827d022d914bd"; - sha256 = "1k5qd4k7izirgvc8yvg1hjgfx00f9fml7k0ayzk45lnhzb5c7bah"; + rev = "bc933d24a669608968ff4791b14d2d9554813a65"; + sha256 = "1c8vkgfpmagnczzjdnxg9md3wiw7irlv02v7v0yv2q0piii9s6av"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4177,12 +4177,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-04-19"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "cbc6aca611cdc664f9bfc3c0a9aa9f9912fa9720"; - sha256 = "1a1a7ddg70l74ngwwrygg5r39h1yzwws0myzy5jk837lmr909sb1"; + rev = "d5e2b8cdd84afdb0c49c42a6e8972acc645e0283"; + sha256 = "04nxy9493jzjsf5lnfw86hnfp7xg9yn42091fjj40v3pr787398x"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4273,12 +4273,12 @@ final: prev: grapple-nvim = buildVimPlugin { pname = "grapple.nvim"; - version = "2024-04-11"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "cbochs"; repo = "grapple.nvim"; - rev = "12172536620464f8cc124e07c6e3ccd306ea3c5c"; - sha256 = "0rpiq47zb0ms6bbbd3c1ywmq5vc88132xcqwfnbfn3d2hrvbz8d1"; + rev = "493f174a1ace3f2d55ba2191129e43b3875b9124"; + sha256 = "0b55kkvjsw176510gic7jm2ym6nvllaz4wi91fihmmhdp7k9s988"; }; meta.homepage = "https://github.com/cbochs/grapple.nvim/"; }; @@ -4345,24 +4345,24 @@ final: prev: gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-04-19"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "9143e172617e708d6588f424772ef20340877dd9"; - sha256 = "0ad1s2l7vd9h2ycva5wwxisadsiqlr55pfjas23cra8gw5ngn9cj"; + rev = "75a7ffdf3cc73177a2784ca2252d9f9f1adee974"; + sha256 = "0rdsr1ajha40slzhz5i7cqcxhh0b0f6z174dss3yhdaqrhg0ci3b"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-01-29"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "6e4027ae957cddf7b193adfaec4a8f9e03b4555f"; - sha256 = "1kk38xpwqlzvm3rgdii25nyxd8bcsgjjzin3a7sb0kyg5x3ynscd"; + rev = "dd0ab08b17d2ead7bdb4838b48e1d08034ead0f0"; + sha256 = "04kdyrws4w9qhrk09kkh5wrk1cwi2jvnr1y790cyrjs0fch3f97g"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4429,12 +4429,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-04-03"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "ad39b73b07aab7d1f48a624ba6f3ae35ad0a2e56"; - sha256 = "0fpn0sif0y7xrp8f01fkz0qq0c29l6r5shc6q9bvl32dzp7n2ryp"; + rev = "8b9d36f51e2a6eccc651b92bb20187df4e2eaa3f"; + sha256 = "10dh8xd048sra73fw54p7f8mr7fzqifl67m9fk2rcwwmp5i601k5"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4500,12 +4500,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-04-21"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "4fdb49333093c0a8aae35cfac68e71cf595666ef"; - sha256 = "0qgrkxmqzlp1z5zxkdzy37lwfc7y3bpqgiy17hxszdrjy6n44vih"; + rev = "fc2cd2960e44a473ee67c8385589537729ca3626"; + sha256 = "0dk279lk4jm97mqsyycz9g7xbc790r1kl8ya4a4fnfpacjk4lysj"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4596,12 +4596,12 @@ final: prev: highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2023-09-20"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "50a6884a8476be04ecce8f1c4ed692c5000ef0a1"; - sha256 = "09fmds9ibl6n4fgxmmypifnxpyc0slpinc2h5cvx0959i9ak0l13"; + rev = "a0dbc6afa19b438ca5a6f54bc7f1a10399f21a15"; + sha256 = "01731762ck8nj6ipfdrw30qnkim359gn6zplp41airwiyjji8dp7"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; @@ -4667,12 +4667,12 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-04-21"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "059e88e9dcaad3280ea1fd5c757f6904f274aed5"; - sha256 = "1m5li7gy18d4z2fzzm6ipghn67m2i9a5fq7v1l6qy3vxgh9vzrq7"; + rev = "6ff23501a1fd1c75c91dfd99ff5befcfdb02c11d"; + sha256 = "0a621aljh16apa8vc6nf4l4h2h7amxdwx5hqw3fmiipxc9g9cczr"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; @@ -4691,12 +4691,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-03-07"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "1084aa544477cf878d466cacaec0d8d4692c7360"; - sha256 = "0f80nhm6lfa6nph6a4w7748ggvmwg2wh29nwv1sniakjvnk0vr6b"; + rev = "82684ebd5f2a812d6d05a629b14109618b54cbfc"; + sha256 = "1d7f9sfl6455799ra9fvyvmwcrs8803xgmsp0qb9rgw2n37ky22i"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4715,7 +4715,7 @@ final: prev: hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "2024-03-15"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "nvimtools"; repo = "hydra.nvim"; @@ -4787,12 +4787,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-04-18"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "301de7919b2c0378cb7a782663f67abbcb198b17"; - sha256 = "0cxqffdync3hfg7xfahwnsd5rwz1gd2mqcgsgm615qbx364as8d9"; + rev = "604692f493519128c58893c28273d4247bc71a4d"; + sha256 = "12g5fwg1mzkqlmmr6kzg9vbqnr745n00a6j2za2si3g7wm277wji"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2024-04-02"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "5e03e986625961d1fac296d1bf332a6510c3add6"; - sha256 = "0zcii0ypqv66xmy4w964kry4zij87fx9mckxifck0xy1y79ncp7r"; + rev = "1d7d3f647d0928614c00ca9ef4ce695c45147c05"; + sha256 = "0j15b6ii3pcsdwm6vxi9fw3yim7hphzlnbmarwhla5bw3ci6h7z5"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -5076,12 +5076,12 @@ final: prev: jq-vim = buildVimPlugin { pname = "jq.vim"; - version = "2023-10-17"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6f10c6977d46cbb3b3d0f2170e726f36af588bc2"; - sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; + rev = "39df435b321e8e741ed150fbab4a27e63e0604d1"; + sha256 = "0f0xb2pgk7sd7kn0c4az8zwxmb8m61nrnb17wjf557yixavc6nh6"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; @@ -5100,24 +5100,25 @@ final: prev: jsonfly-nvim = buildVimPlugin { pname = "jsonfly.nvim"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Myzel394"; repo = "jsonfly.nvim"; - rev = "e47fd7713b083120af6cdb1548de8af513a0ec6f"; - sha256 = "0wnjzqx68kqwza2pnaazmp1l986pys86ncj8hrdfcp4nvmz2i3xv"; + rev = "acd899ce82d902cb91869c932092ffdbf3de9de4"; + sha256 = "02qrjbj4x86494fk5jm24qhi73qzj23h43g55y07bijv5ypxzrky"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/"; }; julia-vim = buildVimPlugin { pname = "julia-vim"; - version = "2023-12-15"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "20542b50610e075e5f4199187800ede2425f6cb8"; - sha256 = "02yy03w15s4f779qphg2smcsa6dka8vspsyixqajc4w9g7y1si7k"; + rev = "16b0cc336eb1b74205396a7677940d88976e2365"; + sha256 = "0r34z1c760h86axrihxg5fhz945710p29j8xc0xdr2lyv2d17kdn"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -5136,12 +5137,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-02-28"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "bfa818c7bf6259152f1d89cf9fbfba3554c93695"; - sha256 = "0kjrk5j2jy19q9q684spc0xfgjs8xavjr9zd98idz13yz21yfakr"; + rev = "860e4f80df71221d18bf2cd9ef1deb4d364274d2"; + sha256 = "1cmlv5r9ckihk0y496lr5zy2baks2qxkvfnd0l49bv3rp9zfbym1"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5244,24 +5245,24 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-04-16"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "19d2a4de3a57deed4aab304704c1f5e77454f4f3"; - sha256 = "089drz8djyhsksi19ixcpfnci7ag121gsj17cq2a91l8m430j0y4"; + rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; + sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-03-29"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "31ddbea7c10b6920c9077b66c97951ca8682d5c8"; - sha256 = "0yb46njab5jid29fx6cl6and583pmnhysz637b18xcil5x0my8ik"; + rev = "d3974346b6cef2116c8e7b08423256a834cb7cbc"; + sha256 = "1k8nx3wgh87kv15qa023caqxbngajx1f2b44g8bvzxhs5jf1ldfh"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5316,24 +5317,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-04-12"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b"; - sha256 = "1glf2xf4frr1in0yyar3aybmhrymrn5lzc261jdflpi749yfhadi"; + rev = "f1f19fc268b406b00b50091f51f16d9634fbe449"; + sha256 = "0s5bwc2j27l9yz5jp769sfk0h9ifvr4xzr43bvz7yk4hi136g1s6"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "02a7799750a56865c58e3ea58e13b19ae1d2dc31"; - sha256 = "1y7v6xa9n620vlzcvvcf7xc1pfbzidz7ybr7yf1k30gyv3sxpp4j"; + rev = "b15d9b6751d106bc5d94ed4567da3a134bef51a4"; + sha256 = "08br65j9glb9z0x59vq8fcfiw5c29gjkvbfq3nyqlkrjcv8rh63i"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5484,12 +5485,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2022-08-03"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "86aaec1700b27618d33d6182f44691d84d2cb6e5"; - sha256 = "1a07gsrzbwsdbwm56rmh7k83kxp16awclgf51i0a15zpgwl2kv01"; + rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; + sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5676,12 +5677,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-04-19"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "b93f040edd57888cd6a1e7d9dee47dddc4463f8f"; - sha256 = "02nhnm7lfdrx6yfwm754khndkq4732qnv99j91d46q68xi305p0n"; + rev = "e00dcf8a6019a88139626c1668dccdc295abd324"; + sha256 = "1q1qrnw9nlwgas7n7xxryaznprkjdfw94l974mhfzb1kzm1k2rz3"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5747,12 +5748,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-03-31"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "a4d442896a9ff1f83ee3db965d81b659ebc977d5"; - sha256 = "0567ckm6aq985md5mccy1zz6q409fk6r682h7vpfslz3iic6q6l6"; + rev = "052234296f13e2705d5d290c7bd5a36d3dd81fde"; + sha256 = "136ywjiv4vg4lkqbgqjhavm2nv8xgskbz2a5gkqsbilz8wqkrr46"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5795,12 +5796,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-04-16"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "03c8e67eb7293c404845b3982db895d59c0d1538"; - sha256 = "1abfssd3352kp7r54rnbl85cjz1cbxl4w48vr437k1dr6b3zcgcq"; + rev = "b152822e1a4bafb6bdf11a16cc26525cbd95ee00"; + sha256 = "0z3qk24fwbrx4waf18lkjn1vp3zqxwsccfybqv8jwviygqyl32iy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5904,12 +5905,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-04-06"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "44509689b9bf3984d729cc264aacb31cb7f41668"; - sha256 = "1z65m3hfx1avi4wfzsf8ypin5d37j3mcipay9rnriwhc8q8vwbb1"; + rev = "05744f0f1967b5757bd05c08df4271ab8ec990aa"; + sha256 = "17w39gkj30d54xjdjxmwq11827l7ymwm2p8fx2x7lmmwin85imyb"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6048,12 +6049,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-04-18"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e623d29561746637b49d30d6434338f88f44e856"; - sha256 = "1if6r4w7qpi3d0z1zdwfwz211n5rfiizxvjjsywdb4659ap5b0mw"; + rev = "fb4df45edec418443e4801719f1cb98e89697724"; + sha256 = "15v2lrbwbjjkkrv6w7dzjc4yls2kqcfdgvhibgk702nkv3yz1py8"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6084,12 +6085,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-04-18"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "3486f98dfed4cfbfa83922f73c7189cc88e9e2f2"; - sha256 = "055kcpcjbr011rmccns63k21sg8x24yn9f2r45n30pl92irpvmqa"; + rev = "4c8890890426d57f20fc6d459c7631e0bbb50975"; + sha256 = "1vwqg20d83gcfjwmay6yz96n4qnjlampkw58i9r03s0k3kwyik28"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6120,12 +6121,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-04-16"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "08b7268c59f6d4b4030107d9b9fa934f4063d9e7"; - sha256 = "10f9m8jji4yq7pxbrk46wi2s4awvshm8hi6wq50ckwsabfn1wjb5"; + rev = "705ea8debb9d9afe4e631166fcc6121782dd0b32"; + sha256 = "0hs2ylf1rj0655kpwr4blh399r8k7lg0r2a4nbnymy1pbkx1gh1i"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6144,12 +6145,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-04-19"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "f3a40c744d177862682f0787eef7e5ab0f4e0118"; - sha256 = "1p9x9zqb3lsi6gzp9n0yh62w69im265yg2xp1dfhvzg3nn2s7pkw"; + rev = "df5ccef3b6fda3582f7746e45327ee031f668826"; + sha256 = "18sqq0jblwykp2cxy1nhwbz0sk0qk2yhwkprnpv37213lkyni66g"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6480,24 +6481,24 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-04-20"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "19cd99ec623de29a9d0e649b606a13d1775058af"; - sha256 = "16dj2b3vw9zv7p01qiyf6wnnn3lwrh271kx3b4gismg1zbbrhzwi"; + rev = "d4a48c2a6fdeec138605cee4eb6f8c6fafd0b3ed"; + sha256 = "115y09nj71gjrxz20f46pb464ipxds742nx2cvp8z1cslk0gq6qg"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-04-20"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65"; - sha256 = "1dyw315fhh6fll1gxq764yqlrd7xb153y4g7dvc7rih9rnqi3h4m"; + rev = "aa7a58023166533da83ca7b11c0d2569e45d7381"; + sha256 = "1x4mddm4ax3chmk996w5dw8rzxa7yap356rc68rq6p3016frsmd1"; }; meta.homepage = "https://github.com/IogaMaster/neocord/"; }; @@ -6552,12 +6553,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-04-16"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0cae7abc30cb91d661f28257c331fcb5b5198e31"; - sha256 = "0alyscd5qhh30p6bsd3qr2h7qsc57yb4g8c0g7abc5z0jsw58cg9"; + rev = "f4f7a1017da57f31c182c46fb2535099718fa178"; + sha256 = "04hhg23xzfkbiq6b3wvz0sl84236s2d51lvnm41463f9wiqjnm3a"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6612,24 +6613,24 @@ final: prev: neorepl-nvim = buildVimPlugin { pname = "neorepl.nvim"; - version = "2024-01-03"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "ii14"; repo = "neorepl.nvim"; - rev = "e60b114217248907a3a1d27bab9988a092865ee0"; - sha256 = "11h6r6929g15mg1sdclim1fmnw68sv90z3qjpxl46s0yvffhl3zd"; + rev = "b927ffdbe67fb25ef9e8fd9324234e3d54cfb7f7"; + sha256 = "1yd3kh5ddhldk8y4fc8gn55wh4a53g8c9x7x8313d98162383b2n"; }; meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; neorg = buildVimPlugin { pname = "neorg"; - version = "2024-04-20"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "e03e82bdf6a2c3173f6e417a63087c7255533b81"; - sha256 = "1n83wjzxd7y8cmbxgmszxlh3anb32cbrzk9zrlfdpawyn2dyby48"; + rev = "03fb74927f358320f66cdd1337265c8e7f049fa3"; + sha256 = "1qs0a4zq9983fm7hqjkpv08v1jwskih3nifg4q300qwc6rz5n8dg"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6648,12 +6649,12 @@ final: prev: neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-04-19"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "c513218d864d4ccfdaaea991c6de67bdb84bc116"; - sha256 = "0i6xy9xqplv9aii148g1nnwv3shnjqiq9m0gab6gav9l6144mzz9"; + rev = "e78657719485c5663b88e5d96ffcfb6a2fe3eec0"; + sha256 = "19f7q9d0gx1g08c4cyd66c4ldznzgrzi632kv7z0cbk58hisac3d"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6696,12 +6697,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-04-08"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f03a78cef74db5638e4312e18b767294a90de8da"; - sha256 = "1lvwmgicnqm5r7wg0325ijjfkyl5wyawx7hbzmlmr87g3z1cp62j"; + rev = "5caac5cc235d495a2382bc2980630ef36ac87032"; + sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6806,12 +6807,12 @@ final: prev: neotest-gtest = buildVimPlugin { pname = "neotest-gtest"; - version = "2023-12-10"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "alfaix"; repo = "neotest-gtest"; - rev = "6e794ac91f4c347e2ea5ddeb23d594f8fc64f2a8"; - sha256 = "0syyi8y064pm06nj0fczqqy5dnmmps3ykc4k06jl05pk3jfilhaa"; + rev = "5ebf583aa5d119b6acfd8077578d05638d6a35f5"; + sha256 = "1hk7n0mqhr28flb522922rmjhfb08qphlvzyhf47pjbp25199yxc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/alfaix/neotest-gtest/"; @@ -6819,24 +6820,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-04-21"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0367f44e49aa64d8b66fc9f736a61e9a60ce9526"; - sha256 = "1yb9l9gac08sqx6maxhfhb1dj796l48gflx1l59l4fxm9sw7djkj"; + rev = "7641b927cfea4697d070a2b7c626a6eef5aaab56"; + sha256 = "0d59v5lqymgp71fcknqff2s5i7kl6r5c83ljimgbaqwpwff1a4y9"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-04-20"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "68dd64e296c6da73aacd7ad795ac789e15087ee6"; - sha256 = "03iap2dsawqj1c8jac6lm1knc16ikiwzgp7hnpv2k43vny52l492"; + rev = "2991ac582116bf01e4ff2e612c5e33c1b4e58fb0"; + sha256 = "0ym735mb22gigpqm6pby1zlrylxabd56rjvyqg8xqv9ccnrb67f7"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -6855,12 +6856,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-04-19"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "f56e5a84fc89aafb6e0be368a58ad1a6f8723444"; - sha256 = "18xi436a164ly3d1wb0a8pzsa1fb8rshqm4r9rp0da85ms2nl14c"; + rev = "0543bf4e997b2c970707cb297e2f74c438eb0653"; + sha256 = "053j4xm84i5z2a2qpka7vgq462928mg81gwkwvr2jbxjm4h4sk2r"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -6879,12 +6880,12 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2024-03-21"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "5799a4ea84450af14461d24edbde43913f9b3008"; - sha256 = "00dwkqikfsnbvnmjpv8n7m45g1pcvg20mhj04nfj2lv9pyylmwqh"; + rev = "baae8dfa0a3aaacd9f0bb6845d6348f5bcdc48bb"; + sha256 = "1szdxgydihik1pm0p7p9qa4mib5hv8gmk566fx6xmvzihyi72p3v"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6927,12 +6928,12 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-04-05"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "c1c3f36e1b1a23698534e6326e90876f87b773a4"; - sha256 = "0yfd23mkvpzddgxxsfnzcix0qr4l1cjfk0i8crw8kzb01n6dh5v3"; + rev = "201f4891b5a0edc2e5f12196f35726f4d4eca410"; + sha256 = "1y8k8zrxc6dnz83n2wlk6h3hsm3jy248a36qc99z2mdijm6n83lg"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6987,12 +6988,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2023-12-10"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "742f97f971a39d44b4832b432083608834a0e59c"; - sha256 = "06sxdbxqfv2wzrw1v0hzsvy4cnynrym3irzi0c43gqiq7k1fksq4"; + rev = "3b94c749e26e2c02e5f07aaea6149a7e417db1e7"; + sha256 = "0irklycyjqjwns5w9jb92x3r012gkhrsjinggxvbwhlj2bkhq6b0"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; @@ -7083,12 +7084,12 @@ final: prev: netman-nvim = buildVimPlugin { pname = "netman.nvim"; - version = "2024-02-19"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "d0ec9d4ca195b2c87bf46ab050130a2c806310c4"; - sha256 = "0043r66vr10qwdd305q4ckizk8lkm0xy4wazm0yfhq37jwrbhh7d"; + rev = "68eecb29d913d4f35efa9bd0e8636046f70f998f"; + sha256 = "1102gyjcj2hb7lfsqgpp2aflhf61qk61l45zka8zcyg7xwlbbhav"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -7143,24 +7144,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-04-19"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "94aead739b6223feb19650077c9694e6c1c63fbf"; - sha256 = "0baw75s3r09pf747rm3mni07pszkba5ykk1vky2lqq2ga7xplalf"; + rev = "42b85926978c8cba6ed4a57c84a530449e59904b"; + sha256 = "03fzkrs4qigrbc0rmj6zgfniyng6779hr0811x7i3r747b8p7ksz"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-04-12"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d"; - sha256 = "09hij99myk1ry8sik71sd2cdicaqrhidpkay6yzs0j67wr0705yv"; + rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb"; + sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7203,12 +7204,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "78064fe0dbb67d2f449854bd2fe7fc2b1af0a8c0"; - sha256 = "0yh9xalsj4y2yh7avabvnw2jj7b1nl1amsxmcxm9jiz0xw50nkbf"; + rev = "076025a0ec2e209c6241e50928e4976477d229d4"; + sha256 = "1m3kv9516jzzh7v5k0m3h8cvk74cslhs8mzamrhxfj8k04pq97md"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7263,24 +7264,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-03-26"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12"; - sha256 = "1plky0f7nmh6g62sgil366m54di9jd86xk7y0nq8pc4m8lv0ga6b"; + rev = "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7"; + sha256 = "01yhrmqqrw5779q1lbx6vwpyqvwhh9mai5x17vby0qr1l1gns7wd"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-04-20"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "88821b67e6007041f43b802f58e3d9fa9bfce684"; - sha256 = "09mv5ndk0xnij3nv2p1qcm6k59xh0j2nl949960d24aln4h354dl"; + rev = "f5632db2491fbe02b54f1a321a98548a8ba2bd15"; + sha256 = "0v97f5ip7slgcijg2ydma6g9ihmx65v4z30ibw68rxwjxfcnjif5"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7335,12 +7336,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-03-18"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "cbd2668414331c10039278f558630ed19b93e69b"; - sha256 = "1429x2c6j6nap3nzsmsnxflgbs7wbj0g3mi5d2kww8413qvl5gk6"; + rev = "274fa89a9b4bed746647c2917091902f882509ec"; + sha256 = "1ii7hs97jci5lwa91x12j1sqdqyrbwybkqr9m7r4r9rzwnrzyz9m"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7371,12 +7372,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "f8e6c59985f1d5f820f051395e88064a8d16ef2a"; - sha256 = "1ss67kpn8lkgcdj90yjg69dfdy3w2v32znqc2nbl6hblgmxfakd4"; + rev = "156eeef8ecae812acd79d5eb58070d734a6202c6"; + sha256 = "1jpsiqkgml1x81vc0x2d94k3a3xwbmp7s5wnh9rfdnrrwc6zv5pq"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7419,12 +7420,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-04-06"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "4f41e5940bc0443fdbe5f995e2a596847215cd2a"; - sha256 = "0cfi0wmqy8vrrf17s71jyg6c5s8ghb7xjapzhj9l9l6g1s7v9bxm"; + rev = "14e97371b2aab6ee70054c1070a123dfaa3e217e"; + sha256 = "0vbvy8fp32rd3463mhi6qnh21gj2mi227qspdrvp0y18f7anvi1c"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7491,12 +7492,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-04-02"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ce16de5665c766f39c271705b17fff06f7bcb84f"; - sha256 = "10i720fidv41421as9i2xp4d4kr69zfyvkxjhgv6h41fdi75070c"; + rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3"; + sha256 = "00axjaxgnv6s7rk89sk2wnq5nsqhmv0dm9sn6l1l3cg1vwqqjgxg"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7623,12 +7624,12 @@ final: prev: nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-03-25"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "36abe1d320cb61bfdf094d4e0fe815ef58f2302a"; - sha256 = "1xvf1rag0jnhdr7bd29sdj49f7bbshn5gl10rg8axsb71kqir0a1"; + rev = "5faf165f5062187320eaf9d177c3c1f647adc22e"; + sha256 = "1ml1ln2psdb14bgrpa2zpalgqhimj0qzd28cnkzhhsdg49a19hyk"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7647,12 +7648,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-03-19"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "edfa93f60b189e5952c016eee262d0685d838450"; - sha256 = "00q07mb401gn1gw666xsc1sp1gvmxj9ilgblrlgjv51pq6vh4318"; + rev = "5934302d63d1ede12c0b22b6f23518bb183fc972"; + sha256 = "0qzbny9dlra0dyfhg4ljywrsnrq373xa9mzawj8nck3kbiv3ia6v"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7671,12 +7672,12 @@ final: prev: nvim-dbee = buildVimPlugin { pname = "nvim-dbee"; - version = "2024-01-13"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "kndndrj"; repo = "nvim-dbee"; - rev = "513708655383f9253cb6d46523a2152a8d13e775"; - hash = "sha256-HiceS+e8aQhrCUBqtLKwOZ2IRA7l0yHlHsF95rmMjhE="; + rev = "85622c8d95b53f62329627fd461c52fca7cb612b"; + sha256 = "1nhbs8lniblx4cn9x232qlg6gj0vgmyzqqw49d0994ap9fx90dc2"; }; meta.homepage = "https://github.com/kndndrj/nvim-dbee/"; }; @@ -7707,12 +7708,12 @@ final: prev: nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; - version = "2023-09-05"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "bd095495146a2a827774ad3ad1ef0cc843b5e257"; - sha256 = "0z7da3sfv5dng5aw259aj2r9ghi9hg8h58n9vrmw3jvf683jgzka"; + rev = "c89b15aee136eeb4649901552da37a404415c356"; + sha256 = "1w20gavhjj62alh51ssix8a88crr9xq63zhw5w5j32plpd0gnczp"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -7731,12 +7732,12 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2023-10-14"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c0328e23b815bbe55935945332c5e5dc88092792"; - sha256 = "154vry38gq0kv2ya23pgnbby9hizivyamnv0vcag3g27nj7xk2a4"; + rev = "9b149e6d215870e31a3712de93152c5b4febe23f"; + sha256 = "0rnihq0dz8n60cii5hpd00xam51k5m5jj7lx5s6y4sa7v7dl7amc"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -7767,12 +7768,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-04-13"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "e1f68ff238802fdee67c3f8ac547c1832ae2b8ee"; - sha256 = "1n1iqhn67q3fzff4kvqz2ikp5scjbb2wls267aamdqg8apq5dpq1"; + rev = "2d35a04be004e11a1e90a9de98fd2e51847f8f53"; + sha256 = "0szzbmwvhxzy818mv1cnw0ivaalshkifp40yzxgmlr0jkfby3g42"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7886,12 +7887,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-04-16"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f098232d70cebe90e27404928c9bc19ca7a5a7b5"; - sha256 = "1xnirwlnby8fr99qkcicwd1npmkx7i557jzvgxfv4m8f4b2vw923"; + rev = "861a04313501563bb1b11f125ae9b7237a517b9b"; + sha256 = "1na2gi7vccqjgjh4b2qjwcgn906aql4jsa81sfxbwrbb4rcjikk8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7922,12 +7923,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5"; - sha256 = "0rqjcksb0dcvvxnc0r4n499xlkviwp2sbn29r8b1bnf68d7qnapx"; + rev = "7383bacd57abd6d86e51765b80d7adf5707ab30d"; + sha256 = "1qrpkxrnjp4ggj8ay533scgy0f6fcjdhivzfrkvs9vcdzdfnjr34"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7982,12 +7983,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-03-02"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "4f9bf0c821092f20dd34c1a4ea5b07b0500ff089"; - sha256 = "05d2v6yfs60n4xli5c682nlczqnib9pg6hxp79fiidhdidrf9zfj"; + rev = "c6268555d0b471262af78818f11a086ddf30688b"; + sha256 = "1bzq2ybqhpsi0f7z14d2kvgn84xfj7zv7n2jpgk1ki0jsdw396xg"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -8042,12 +8043,12 @@ final: prev: nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-04-04"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "5800f585def265d52f1d8848133217c800bcb25d"; - sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + rev = "8765cbc4d0c629c8158a5341e1b4305fd93c3a90"; + sha256 = "0drzp2fyancyz57k8nkwc1bd7bksy1f8bpy92njiccpdflwhkyjm"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -8078,12 +8079,12 @@ final: prev: nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2023-03-07"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b"; - sha256 = "0sck8ac7f2b46yqv0v114jakf934z4z2x6pix0fiipgyfza2vfax"; + rev = "64e1677db3319ec5900afa666a2c85c31adc0705"; + sha256 = "0cgdky2zai7mfshac2szfq346i0ql9c4miax10hz76kb2nq8v7wx"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -8186,12 +8187,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-02-24"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "6295b6cb30725c343a8986096c9f04b0e7646c52"; - sha256 = "1rplgghm6xr803xhgshrnbs4qvda4331znywsfwycxqyl7zvynsf"; + rev = "1184a8734e998649f3bb9a5db9efd4543282050b"; + sha256 = "0lgqiwnsm4ahgkv7qnxyi48m2i7wybxkxv29869v71bidnbkm6yb"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8222,36 +8223,36 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-04-17"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "9653847cf2f225648967f6e9363643e327387579"; - sha256 = "15866wdyck6snm0iz9iqd036wqkbfwnliwd5f220r9g5v3cwg5lg"; + rev = "4651801ba37a9407b7257287aec45b6653ffc5e9"; + sha256 = "0xna3g63ypagl4jxv9m0kfjzlqnhnlhzjm1gapgmmrzbcb9m3ml3"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-03-31"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "828444de406bc7df3b30c8e000ce6f54f0754499"; - sha256 = "0jar0wqkq4hc9vpw0z1jk69a1jk22bbqn01g1pg7pf7n9m5363zb"; + rev = "76819082ef964db1f67f92454e18ad28ae34b37b"; + sha256 = "1g0c3lids9kww2awsz0ykgvwm7945a9nvxg96iads735hfwc7p49"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-04-11"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "a4e30d33add8a9743b4f518b3a788b3c8e5def71"; - sha256 = "09m95jd84y3b2wrair263f0csqqdx8h45fjq9jrr4f3108494xc1"; + rev = "6d0dc3dbb557bcc6a024969da461df4ba803fc48"; + sha256 = "0ig2izp7jhahri926avzwpzz9qklbnvpma6n9m7mfipf7jcn95rw"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8294,48 +8295,48 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-04-21"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa"; - sha256 = "0cb4p6bndid12h2bjdj5ybksqjmwv1876jx5a2wlj6h0q50wfjs0"; + rev = "64f61e4c913047a045ff90bd188dd3b54ee443cf"; + sha256 = "1j7r1avcwj79lyny3wjs71yyjjprbh0dv026ab78qcw1x9p0b3md"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-04-20"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ea4f6d5175812a3f48302d638a766bc18fcbb04a"; - sha256 = "0smghl0nv4w1rpn7gqsq6lbarh5nzbhvi8pfysh5f7am0p42y86m"; + rev = "fc7657a071ad7be0616d7c66a74991a3c1b1dbcd"; + sha256 = "0xayng2x920s9kh9xgpd34q4x5q034653ncx61rf04lfcq3hl4qv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-04-19"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "ba4289ad345ececd335a9cdd7b9616fd0bb6be92"; - sha256 = "0cfklfz2anc8021qi0q8dbrdmnndnd073azgsiwaagbh75s3sgh1"; + rev = "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7"; + sha256 = "1qp53mwmrj4cpjrj44d93q2igzv6nkbragn4ag8g7j1982vwnxl0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2024-02-15"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "60e8c288e011403f248b5f6478dde12bed8a6c55"; - sha256 = "0dly21jk1wm80s7ypwpwfm4mx1srbmaww0441854dwvh2s7j634v"; + rev = "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6"; + sha256 = "0rx5dyhli5hwzh94lwjj71gs0k7vk28zlq01pvk9y3b1n50r6qkf"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; @@ -8438,12 +8439,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-04-21"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "beb6367ab8496c9e43f22e0252735fdadae1872d"; - sha256 = "1qqwfzfk5w2sfaavfa2nn01caj753j272hpnhmvgwknfgvl9cv81"; + rev = "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87"; + sha256 = "1ara99md1vcbmqymqal206yyfisqiq7ghsrid274rm77zm1lf61q"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8522,12 +8523,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-04-19"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "ec0f44e1921d2701bd99a542031d280f1e3930b5"; - sha256 = "1b9b72yrp1xfkag41hxjk903payfrcnjdi7lr5880183mm0im04w"; + rev = "db41b1f20459293436fab510bec58c82a73bd1f7"; + sha256 = "1v5bybcaazkkmjgpwb2gc7klp42kj3lghp52ikciyb65ywy458d9"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8570,12 +8571,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-04-19"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "1f05774e1c2dbc1940104b5c950d5c7b65ec6e0b"; - sha256 = "0l6y9xnz8l7flq0jlh9xxnsp9inny9mbbqg2j2sg0rivq630bbnh"; + rev = "bcfc0a2e01def5019aa14fac2fc6de20dedb6d3d"; + sha256 = "0yq419k1zbklcb2qihwcxgsrp7sh1hb13s56lpp7xs8bq0b7mkg8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8751,12 +8752,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-04-19"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "389e91f6f935aa845bc0cd13dd80f75431c34751"; - sha256 = "1fzckfi00bb4mi5l9wadhgv98z7fmlgryx24zipcr7k98pdaw36h"; + rev = "d4cc3210f235a845de8d372d02482163d31ded93"; + sha256 = "1wnfvyvkpgcdqchw8aqba5jczykc8cz99m7avm1y055iqph9wlvw"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8775,36 +8776,36 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-04-09"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e67aa5082c65eeffd8a57b672e1353e8cf2ca7a9"; - sha256 = "0223cmm4hg9c9ywifr0c7zk091ny5sndarkq7sa9vk5vmar5sz15"; + rev = "f99c93c4516ef7fb5e6714dea7417793f946ab10"; + sha256 = "1v34ka188gdhx1hy3ckq2kgmm8y1bdql84msxra5g8agd57ryvrb"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-03-16"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "bdfd2da90e9a7686d00e55afa9f772c4b6809413"; - sha256 = "0dc3yndh7fy8fvhh0pr97850bq0563jlqrxi9bb9sm6hzdkvnp92"; + rev = "dbd836893fb99cfc33119d7c4abbdb700210f54b"; + sha256 = "1sy82vh9629wwyvc1j3q0vqfj7vichw90kl4vsa087v8sfn8r35z"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-04-13"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "dd701ed0639ef1e10d0ca8dec039719e916c4a7b"; - sha256 = "1xr0xzf5h1r8ax6djvq1vq936yqmvwa4l0hbjqq090mgnj60arh5"; + rev = "89942ad366c8a9bb93f82411de17dc7c644b4e3b"; + sha256 = "1qs3l0ymcfc223yqk44vqwgvyr4brrd5pz1h7l9lk7p4hy34s9rc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8920,12 +8921,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-04-04"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "ca9900c31ee6e254a0ba7011ba49f48ebf4c8db2"; - sha256 = "0s9g1jmq1qzkxi1gcvmyf0nmwgqrh11r0swy9pl32916k37zvqzl"; + rev = "9c5fc98a4cb64f66b6f33cae9d31ee8cd54d43ed"; + sha256 = "0n4hf1k7z7w3dvll3al0mk752768x5shbick2324aqh6l77jjx0x"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -8956,12 +8957,12 @@ final: prev: pest-vim = buildVimPlugin { pname = "pest.vim"; - version = "2023-06-16"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "pest-parser"; repo = "pest.vim"; - rev = "78a65344a89804ec86a0d025a3799f47c2331389"; - sha256 = "01bc7c3hddz6lnmpzrlah8i0llr976a1lyazslw194r5ig1hb0id"; + rev = "7cfcb43f824e74d13dfe631359fff2ec23836a77"; + sha256 = "1vpfh4nyxwbndqv4hmymrqskjc5l2dyiwfp4s7mhpdcnq950q1qi"; }; meta.homepage = "https://github.com/pest-parser/pest.vim/"; }; @@ -9028,12 +9029,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-03-25"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "8aad4396840be7fc42896e3011751b7609ca4119"; - sha256 = "06ahw1mxjp5g1kbsdza29hyawr4blqzw3vb9d4rg2d5qmnwcbky0"; + rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; + sha256 = "03x9mxxqscahs3plml9pw0q6yacyiz6nvw4pcbpqlcqj99f0qbdz"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -9461,12 +9462,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-04-17"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "20c5b5259afa7f4867474cc463211d64c93ba371"; - sha256 = "0ysmzf2lfry8abaajjanp3b3358nbgd2d2zs9qfjyrbk0fmqw0gc"; + rev = "f96edb54a2940322bc7ed81a1031be04db7d3a99"; + sha256 = "0yfmpkwx38ynwyn9prkkqqaqgi55dam9zswjj3nls30rxahqvg1p"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9581,12 +9582,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-04-21"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "dd4d5d8d1313f0bb343af90e2432ad2f2a9fedaf"; - sha256 = "1zph7b9vdd96xai19g6di48r5p5px0pz8kkq5hfkriq2apygpb99"; + rev = "2eb8776df1aab03f514b38ddc39af57efbd8970b"; + sha256 = "137k9skchcqplzrm07xkwxnrnnm3k5cam28a9yn2qaw4rmwf1zkp"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9677,12 +9678,12 @@ final: prev: searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "2022-10-31"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "110949af8963185b4e732b45ae57beb731bfcede"; - sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7"; + rev = "6cf79dc53794b06a95791a034341f1332e04dd58"; + sha256 = "138wazdwncgknh4jmaa22i7q8fa8qgc18085xykfvbcf9ljvi0ya"; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -9822,12 +9823,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "95d11bfc83263236431ead7dc017f5ab0ff992ca"; - sha256 = "0x9s5801si869gh7jazlfd9asiwk5fkr1gv67qf7bs55pc0z9rbf"; + rev = "7c8118c6d568cbf71ce5c253f028d5d68eb3a044"; + sha256 = "0clzgxw1b755kq9hbayhjl858jvpjivrcw94s8ciqar1wiq0bxdj"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10231,12 +10232,12 @@ final: prev: suda-vim = buildVimPlugin { pname = "suda.vim"; - version = "2024-04-18"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "04469d855e36fffcda6be036eb7ff005f64fa0d6"; - sha256 = "18igbn0ldh3mwf8qlnfbbidk88l1wfjx1v95dmdwd1xif642bppn"; + rev = "b97fab52f9cdeabe2bbb5eb98d82356899f30829"; + sha256 = "12chb6hv6ynl54dzwb7qz6rf9vwjglxfnzcmmhc2q2wm0y264gbi"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -10401,12 +10402,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-04-20"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "c442ae7788c30dbd41d259c51df4046cb8269a96"; - sha256 = "0rd451fz9i6wbyzjrdkjz4phwlq8fz1lcgmbdjrjxvax3hkpbbqx"; + rev = "26cf934f872e2fbfab55d572c5eb7dad0e82238e"; + sha256 = "157zglv8l9qdkralyddnfi6zavr3km6wcxk2x4hs5vg1pi60v8qa"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10521,12 +10522,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-04-17"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "24fd8c1e7eb989dba9efa5d174e42870f08da8fb"; - sha256 = "1ky0035jar8i06k8w4mkizbcyiib393zk3cwr14fnsvq94jp23bs"; + rev = "319276a7853ff996b7bb1ed4250d8047c84ad29d"; + sha256 = "05b8a9h8ni5pmj0x9r3pc8j4h77nbj2s6wmlx20w4h2vmwwp7k26"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -10582,24 +10583,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-03-24"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "5ee5002373655fd684a4ad0d47a3de876ceacf9a"; - sha256 = "1ar218ymgx6432183xvd0rinnv0gwiqic9czv4z9hiwxgw9cwcfd"; + rev = "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5"; + sha256 = "01dpbmcjnd2iwwiw0zawhh7d1vh4x3wvqf55w7kh4b111bl9399z"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-04-06"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "94a532cb9c4713db83acf5432f5aadfd096e2af9"; - sha256 = "17243ls89kdalb0vlx84blwxan9g8xdin9fvzyk5xkb8b1wbpz5p"; + rev = "6b6565e6584c86ca501bdac485cbdc2ca64556e4"; + sha256 = "0rmj6sk7yz5qmn6mdpcww2lgsq9q4x7r166a8lhwlm8ch3lddcf6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10679,12 +10680,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-04-21"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "bd6b110a08cc5b7c098020325ff55218a5b249da"; - sha256 = "1dj6bdx98596l2lnjcdd2c5zm5j00cid0kdb0zd6vhv1jfw8zqsx"; + rev = "f4c69bb9807367ee7b21a50d265c061ee58ea777"; + sha256 = "193wv9lykjscc6cm2ycnygiw6d2kv02dpsqb944bhh7fkkgkc75i"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10715,12 +10716,12 @@ final: prev: telescope-sg = buildVimPlugin { pname = "telescope-sg"; - version = "2023-12-16"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "Marskey"; repo = "telescope-sg"; - rev = "68289496f5612a756953756f8d1e8cc0ecee9e5d"; - sha256 = "07fnrqrf59krvql35zayggl42icgjv23k5sqwyv5vz1wmsp4j1pg"; + rev = "caceaa670f26a581fb20ce99576ed8155c3ae96d"; + sha256 = "0aii4vy97zyh2fpdkawwdanwd7sd0751ih5yznjcwn8cvrv74wl5"; }; meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; @@ -10763,12 +10764,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2024-03-26"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "d19e2edc8b18d03283bd91f67310ac300ad003ce"; - sha256 = "0pp98xgdgcpykbsm56bj6w9j178xricds7hsqzwgcckf4zwknn01"; + rev = "95b61c01ea3a4c9e8747731148e905bbcf0ccaee"; + sha256 = "17imd6f1qykxv4wk67ihj7ir07yvcmrr0cqvidv1as3k77riclxb"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10799,12 +10800,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-02-11"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "c8ac635fb51065bb3a77f51bcec585a8dddf8652"; - sha256 = "19a3p666wdjbnar1ifk73yf02i6gr24818svawsh8h1hsva0zyn8"; + rev = "0b6ca4e354b706e2dce80f35ee6ff4cc75b9af08"; + sha256 = "00hx112zkc65a8m5miw14f7k4z3gb310d667hnmvxda5ij2fss1s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10824,12 +10825,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-04-21"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "7d1698f3d88b448e0639974248cc17f49b7b8acf"; - sha256 = "1k3fhgpakr1b8x9fk7sq699h3479k8x9yc3jbq7xq2jk7p0n4m62"; + rev = "fac83a556e7b710dc31433dec727361ca062dbe9"; + sha256 = "0caam3dm86z9g3qw1c418pzsqhzq8yvzpf26j4sbczrvy6s1x0aa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10860,12 +10861,12 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2024-03-21"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "1cc8cef28ef10575bf72806959e72d35fec5dc5a"; - sha256 = "0i1ffzz88w2n3ja2kip5fhy7s8klb0r7av62fn5pmhiy0pkn09vp"; + rev = "f361e9d907d2e5df703ee995f9032021ef674f2f"; + sha256 = "0fx7cc3xh5bpd1c6jlgp4qxlh6bfzgja7mf9mp84lhd6gj9mfqy6"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -10932,12 +10933,12 @@ final: prev: texpresso-vim = buildVimPlugin { pname = "texpresso.vim"; - version = "2024-04-18"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "let-def"; repo = "texpresso.vim"; - rev = "30f9b8277b18326e0aa6882fb96d51bc1b40a222"; - sha256 = "1iagc7kld327mkkravk30dz2a0dq4i8718w0k1jrlj0z54981gbn"; + rev = "1cc949fde8ed3220968039b6b1b6ccdd9f475087"; + sha256 = "15il903x1li60ys6ni77qs4xfsqkwrkwkxijda5j166xb2gq89wr"; }; meta.homepage = "https://github.com/let-def/texpresso.vim/"; }; @@ -10992,12 +10993,12 @@ final: prev: tint-nvim = buildVimPlugin { pname = "tint.nvim"; - version = "2023-08-28"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "levouh"; repo = "tint.nvim"; - rev = "862835626941d263466754b9c8e2ce2cb004f5ac"; - sha256 = "0m00zy9ihmwh1f28sk92rbrfd3h4azc41zzpy4jbh82gbnq8k4ks"; + rev = "02bd0527a315a80e4e25bb2dd7b6994fb0daae01"; + sha256 = "08bhm1p78xh692vjvg870k73kiaz523gffcs8dpzr2zqqa086jkg"; }; meta.homepage = "https://github.com/levouh/tint.nvim/"; }; @@ -11028,12 +11029,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-03-05"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "63e9c5e054099dd30af306bd8ceaa2f1086e1b07"; - sha256 = "0ynzljwq6hv7415p7pr0aqx8kycp84p3p3dy4jcx61dxfgdpgc4c"; + rev = "53ea7eab504730e7e8397fd2ae0133053d56afc8"; + sha256 = "13cbfjiq3d6vvzbbp31ssy6x0lbd6d1y67b8x3jq6cf5jfi0as1z"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -11077,24 +11078,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-04-19"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "dca1c80fb8ec41c97e7c3ef308719d8143fbbb05"; - sha256 = "11rmk7hpmf75n0lgchj7hvsw9915m493hlgqsmjkkyhs9w0bwb4n"; + rev = "066cccf48a43553a80a210eb3be89a15d789d6e6"; + sha256 = "1z058jxwcynwyw6fnkjsqdpnmbl9pa956fnm1x4w96hy00d5pklq"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-03-28"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5"; - sha256 = "10fngz9assyp6rby36v0qdg5brsrxs921pp984ifyk8c8d4sdl12"; + rev = "67afeaf7fd6ebba000633e89f63c31694057edde"; + sha256 = "0mn7hq0ldg7g4gcmnb7lajilwa4wl1h7an92ffdpp7yy01p0yhdx"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11137,12 +11138,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-02-09"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "60e27280030f9cd8dfb6ceb335922c6ff76682cc"; - sha256 = "1rrcnldpl9d4fifk48w6sgrar0zhi6pbd6iqildzp3bmhf83smd1"; + rev = "e1e82ab4237619d342c7102c9f13d4b9833bfd39"; + sha256 = "1sfrcafs9i69rsy1m3ng2qfibs5bncsfbggz3apsdyv6vxnzw28m"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11171,6 +11172,19 @@ final: prev: meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; + triptych-nvim = buildVimPlugin { + pname = "triptych.nvim"; + version = "2024-04-21"; + src = fetchFromGitHub { + owner = "simonmclean"; + repo = "triptych.nvim"; + rev = "a0e148aa979895fb4425b3653ee2ad15d64a4d90"; + sha256 = "1gf2jdfpknap877ljpjbx37j4qg7lz91g9cd2p8l6894q322qw9z"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; + }; + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; version = "2024-03-29"; @@ -11257,12 +11271,12 @@ final: prev: typescript-vim = buildVimPlugin { pname = "typescript-vim"; - version = "2024-02-04"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "e83ccab88c7a045ce795583adb66956afd464a31"; - sha256 = "0zjdwjvp9wk7gb1h569c2h5fsmr41p51wz7k0kiig4xfz1i9s7yg"; + rev = "eb4d90d3e449b4a3c1a17f56e4429ff4e0a6b3a6"; + sha256 = "0nczd6x91i1p56ndkw3m5lhcq3madqcyffzb3avr9zqwlmw36aas"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -11293,12 +11307,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-02-22"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "6ecf7461d44513af89f8257f057fcc99e9297612"; - sha256 = "01dj9fdzaliwpxh358dql0ndvnykqn8v9w20b7pkn09p1airq937"; + rev = "042587c63b2b2776a83337748d53dba8b67ec545"; + sha256 = "1636jwzim6v3sf2jfrbvc1p5x38ddhjfsssq2v31a3rzkyv74qg3"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11341,12 +11355,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-04-17"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ac4d817f5e18a0b462b23dcd124f849633d650fe"; - sha256 = "00dsvdqp02bf8zvnk8ljn0f38wb38h8iabsrarycl2a3v6jr8lgr"; + rev = "9739cfedb2eee6697dffa6e9fa0c097eb400e23e"; + sha256 = "1c5n3risndd7blm4slvwgzih9pvhi0nzsipamf2px3326qrx3sca"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11401,24 +11415,24 @@ final: prev: vader-vim = buildVimPlugin { pname = "vader.vim"; - version = "2020-02-13"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vader.vim"; - rev = "6fff477431ac3191c69a3a5e5f187925466e275a"; - sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk"; + rev = "429b669e6158be3a9fc110799607c232e6ed8e29"; + sha256 = "14j4a55hhi7jbk9aafzl67w2w0dn0jyspddal430cm7rhvvv7k5d"; }; meta.homepage = "https://github.com/junegunn/vader.vim/"; }; venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2024-04-18"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "a5430d75875acbe93e9685cdeb78c6eb2a329ed5"; - sha256 = "1dwl75chqbp888yp2ykyqszz0glli2vx2cbw3lsgnrzlhql53alm"; + rev = "b09c2f36ddf70b498281845109bedcf08a7e0de0"; + sha256 = "0mhkmccr3l9ggqlr0gzc5fcdmx7ap66gqbihdnkc4mbn9jipcp0h"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -11437,12 +11451,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-03-30"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "9cd59bb0cabd34fc093f561f97041be71fdade33"; - sha256 = "1aa2rr4z2f5nps2g3nzjs1kshszk8vbx4pwsr4x1a1llyi9i8gqr"; + rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; + sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -11785,12 +11799,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-02-17"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d9f42cb46710e31962a9609939ddfeb0685dd779"; - sha256 = "1a4pcyzvqsmsvz7fxf2h5b4v3xlsqv15qyr35xniji44196aaajc"; + rev = "ff0f9a45a5d81d2c8aa67601c264b18c4fe26b15"; + sha256 = "1bw6xfc4l41g3rmvyvyxvvq3iyjb0adn5yfamaxi3jkamgc09ik3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12449,8 +12463,8 @@ final: prev: src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "faa65935660a4596414fe21d57e2110faeb9e869"; - sha256 = "0q6nzkvlv7igkg7k3p52rsqnxcd7l70lnlmlh9mjqhfaphpw2j8w"; + rev = "950e80352b325ff26d3b0faf95b29e301c200f7d"; + sha256 = "1f0q7ziqjsgbki0r3hyb0wd2cqmbap4dv7dbx0ydf7fxf6881bwx"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -12493,12 +12507,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-03-07"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "960bbb7de11b7282a68d579a64e838b487934493"; - sha256 = "0x7ax3d6srqa8b7hhnyxh8rp2f9aiv5z5vlv5n6mjgjgcpbqydg6"; + rev = "37523ffe0849b51db07fa7f48430c2aca5420a0e"; + sha256 = "0lcdpmppy4h0q700z9jkn3k5w0kpfv4kg87mvr4wmzh4pcxac5gh"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -12517,12 +12531,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-03-27"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "066922699bdf1c6e14d517b844454b12b93ce25a"; - sha256 = "0zqzn7lqgaf9iw49iik0g115nx7ny9z43db9cmxkk8lp5p660v6b"; + rev = "5835df6497cc0e79cb149518d01f4f5c86dc546f"; + sha256 = "13abp9ri5nbampwahw8dcmgzalqqq21lcb68zdpx520h3xkjkkxq"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13057,12 +13071,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-04-08"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "dac8e5c2d85926df92672bf2afb4fc48656d96c7"; - sha256 = "1m33vpkfw1dx3kxxgw8r278a5rch4sd3ngc9mbnap97f0q8karm6"; + rev = "ce882460cf3db12e99f8bf579cbf99e331f6dd4f"; + sha256 = "1sc586alzbfhznqkkg8ck2xmkvchmvaa2w21iqk33sxnkmwfxs6j"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13165,12 +13179,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2024-01-05"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "67ef116100b40f9ca128196504a2e0bc0a2753b0"; - sha256 = "1haxh6m22f03lz30q8389hnfn78v4zpx3r6bibvb96v7swpbxqdi"; + rev = "e801371917e52805a4ceb1e93f55ed1fba712f82"; + sha256 = "0aa3fphgl0c0y3lmivvfmvrqrs5iqn5dkvdv2jhl1q73y6pnhxiz"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13815,12 +13829,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-04-09"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "a2777b4b113dafc639f541ad4f0f7da0adc640f4"; - sha256 = "07dwja75dlwjmn687jbk56yz3srijjagppqn7xyl4bzd0svi4s97"; + rev = "a621ede3bcf551144358c112ba1f4e6c2e84e092"; + sha256 = "1ih2jd14faq80jdxrz42pdmcnz3k5pl4h5hn90x03w1m14bkpmxz"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13851,12 +13865,12 @@ final: prev: vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; - version = "2024-01-05"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "a715d602745cdb1c35cfe73c50d3dd266eb5a349"; - sha256 = "08rqvaqxvm7h6xh5fqbqf8s32nrs2h817j2aw2mj40jiwgsvmkfc"; + rev = "cf0abc5f89c88f0c5219abe89334a8a3ef91fefd"; + sha256 = "1c8wgq1w8dg32l8hga695wdisb7m42nl3nzpwx5ywfr1vjwl6ah3"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -13911,12 +13925,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2023-11-06"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "281346a221434574dd7f8767a352b2bf0b218b74"; - sha256 = "0fa5b41qlall8z2pziwgc43sj24kpavrhdz9amwwsiv2g9wl5cli"; + rev = "58561ed511753c4ef0fd446010daa1c2b7979d42"; + sha256 = "101hf1y607671yr488samydpn2hgp1hrj4qnxmicbsjyndg2c8dy"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -14079,12 +14093,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-04-20"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "4b3732c31b408953a1bb0fca6f003400abb5bfaa"; - sha256 = "1p02j2k68csvcp5wshhzk29byavsc76gpj7a935smirj9d8nhcmr"; + rev = "54ade15279bc11eea0780bf06d191e6e97c3ea5d"; + sha256 = "0hcfr8bvxp442sls8iyw43gc9k7kwh3y47v777smz3als89pi76f"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -15160,12 +15174,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2023-09-14"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "1353fa47ee3a81083c284e28ff4f7d92655d7c9e"; - sha256 = "1ybhld3nmdr08icj8fkmi3pn3wz38afp5974cx5hkkshydz2cx1s"; + rev = "45e53f01e4e1c4a3ee20814de232162713aff578"; + sha256 = "12dqwhks52ng0hh98a1sbn5qjmwn77ch25h6n7kp1ffql6gjsadi"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15400,12 +15414,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-03-21"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "87988b173b7642e6a5124f9e5559148c4159d076"; - sha256 = "0922p2nbaj8vf2wl697v8yjmfccyvn793mn7n0axlw3xr162qdkv"; + rev = "947f96bdad01d0cf6e3886c2b0c910f4793b2f96"; + sha256 = "028zax2lli0v0j2v65d2qmksny3a6m5wpxjsr8y16ryqsaipkk8h"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -15568,12 +15582,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2023-09-16"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "3645b5ceb1898fe5a5cf968a5f078479cb8068f0"; - sha256 = "1z31942gbwywayl8gq0ky9f73q6zpg6c7r828h753xly5dq7s7b8"; + rev = "8312705fb7038997464e32db83b6fc6ba6d70323"; + sha256 = "13mzd4xkgg5hrv9wy8ynbys37plad8q1lwfvvnkigdnxac369hbq"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16121,12 +16135,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-03"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "e2ff111f123da6cf97f95b96b10eb95854f953c9"; - sha256 = "0kg3wwgxv1gclyvdws52chyz1jfgmi4hc2pdg9fmkqpkk0g17r68"; + rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; + sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16217,12 +16231,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-04-11"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5d11a253dd1ecabd4612a885175216032d814300"; - sha256 = "1kx5xid8sybwc7fmmcn6j36r8n0m3g0529q5p0mywfn337m8q3np"; + rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23"; + sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16361,12 +16375,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-01-31"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "c0230fb9f3d0f4aa10c6598549a733e20eeaa92f"; - sha256 = "0pdl26s4n3wnjh2mf0vwwxwvjc8hg4i5cfsj8fip7k8zsgwg14vx"; + rev = "96d3400598a95957062e42820cdeaa6ab22cba72"; + sha256 = "1q6wy7mzi4lqjy37l4rbnjbvy7a0cmm2cccd07ywfd2cx31m26w0"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -16542,12 +16556,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-04-20"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "268dd8d311adebb121fa0a4b31cdabcb98072403"; - sha256 = "1nd6yafqvdx0h7mad3pwfp3fxs8kssjyd758q3f99612fhl63c61"; + rev = "5732cd898cc7027e58191fe4be64da8dbc158995"; + sha256 = "1m3i05p0vvryv74dwkxh40hapb8xg96bjq84p20q26q4lhnpczny"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16638,12 +16652,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-04-20"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "d47aab1fbe423bf14275745684205dca08366277"; - sha256 = "0g4dh47rasd5973mjv8cpsd1c6bf5c1bv7pc05sbjkb8vck2lsl5"; + rev = "bf62428d842ed1fb9c33353be10af40bac51e825"; + sha256 = "1g9zsrq6nxbs0gaxkmc6zam09z3rv6zrng25myd537vwdmnnd4r1"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16722,12 +16736,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-04-18"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "0035cd000cb2a5c60ea67c176ce795852ea04448"; - sha256 = "0xzxscvaflappikhi7l0v6i92cls6jp1y8fq2pfai9rnsyizvh7p"; + rev = "84e1e17198c738198d0effd8827437842a8b3a1b"; + sha256 = "1l9ydins0h2qgq4zl98gnhj6jllllh4xxrn96jdrm4bf5g1x7g44"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16951,12 +16965,12 @@ final: prev: zellij-nvim = buildVimPlugin { pname = "zellij.nvim"; - version = "2023-12-03"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Lilja"; repo = "zellij.nvim"; - rev = "483c855ab7a3aba60e522971991481807ea3a47b"; - sha256 = "17lapf7lznlw557k00dpvx04j5pkgdqk95aw5js3aamydnhi976g"; + rev = "99659823e2ee81e4ba5a2579093776ee39a93b15"; + sha256 = "18i6gbzi3ijhix09wjv5z297hwpnfifb3x6vn37l8352icfx3wyq"; }; meta.homepage = "https://github.com/Lilja/zellij.nvim/"; }; @@ -17059,12 +17073,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-04-14"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a1439ad7c584efb3d0ce14ccb835967f030450fe"; - sha256 = "1ngjll0khnx1nighazw64kvfdl139z8xhv0hh2r4bb40ynxnhdf9"; + rev = "6af91673ceccbd6e073b66c439e7fce239f72d24"; + sha256 = "0g4smxrlvrvpb8zzigca4gybvc5s6czh4wc85jpjjx8js80ckjqj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17179,12 +17193,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-04-19"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "6512f7d1faa4fd86c53e9c5c8492b4bdda692613"; - sha256 = "165yndfj0m3wib17wa15fswsfwixm1bxalprpbdwvyzd2f9p1fd0"; + rev = "9c16efc915346c7bde5288ad94f0ea40a7267d31"; + sha256 = "0z9z23x2g72z2k7fdmgjz07r2lvn5jsmvb7md4jd98hjxjxid3zd"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 42c846ee5ebc1..4d74487e584dc 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,57 +27,57 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=b7a7167"; + version = "0.0.0+rev=f12fc56"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"; - hash = "sha256-GXjjRcB0ml9MMYuJUWAlORWrOUsRxrwZ6kmg0fp3kNQ="; + rev = "f12fc56469d778285fb35b5bdb943edcfe77c48a"; + hash = "sha256-BR9siCgn3jPwlC1+HgJEo3N8I36nr0KGaOO2zWLv9T4="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=4ddf79e"; + version = "0.0.0+rev=8518c3f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"; - hash = "sha256-DbxzbbmKq0GxbKIKtoygEhbdYeEwp23Nkk15WI2AQW4="; + rev = "8518c3fa6b8562af545a496d55c9abd78f53e732"; + hash = "sha256-slPZSjN9SJQj4d5NDpxL1DbnnYia1Aroh7/bQJA2P0Q="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=afdc3d5"; + version = "0.0.0+rev=b0306e9"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"; - hash = "sha256-YYzJMGmizeqZxBF2YXYPLjAo54Y60z7RFhLcmOJbeGY="; + rev = "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"; + hash = "sha256-xmuusYIDpttr97ZJrouW0VB02pZG8usQ9kMsARRHeJI="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=b422ccd"; + version = "0.0.0+rev=4be1807"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"; - hash = "sha256-FrXd4dR28GP1CAP+SaGSRO8TImok9MjVw2vWyZgUijQ="; + rev = "4be180759ec13651f72bacee65fa477c64222a1a"; + hash = "sha256-qc9InFEQgeFfFReJuQd8WjTNK4fFMEaWcqQUcGxxuBI="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -116,12 +116,12 @@ }; bass = buildGrammar { language = "bass"; - version = "0.0.0+rev=c9ba456"; + version = "0.0.0+rev=28dc705"; src = fetchFromGitHub { owner = "vito"; repo = "tree-sitter-bass"; - rev = "c9ba4568af24cd3403029730687c0a43d1350a43"; - hash = "sha256-F131TkIt2mW2n8Da3zI1/B0yoT9Ezo2hWoptpsdMrb4="; + rev = "28dc7059722be090d04cd751aed915b2fee2f89a"; + hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM="; }; meta.homepage = "https://github.com/vito/tree-sitter-bass"; }; @@ -160,23 +160,23 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=7e0e2ac"; + version = "0.0.0+rev=a5d04fd"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"; - hash = "sha256-7He69Nk1b0gUCnLcfALQk46E2JPDhVpIIqS6qtJIx4k="; + rev = "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"; + hash = "sha256-SzHFNIeR6ukWXKkLd2Trg9zuKLMwNAolXGPIDBDaFRg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; blueprint = buildGrammar { language = "blueprint"; - version = "0.0.0+rev=863cea9"; + version = "0.0.0+rev=60ba737"; src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; - rev = "863cea9f83ad5637300478e0559262f1e791684b"; - hash = "sha256-QbkwdqH4Q+bqsp7XawUNXR45ROxfpMf+goCBFTw07I4="; + rev = "60ba73739c6083c693d86a1a7cf039c07eb4ed59"; + hash = "sha256-ojm6OKgriKUqUcRBf8WgHv+BvPjUuYOaabC8VXE+Kwk="; }; meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; }; @@ -193,23 +193,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=9de5652"; + version = "0.0.0+rev=e1384e2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "9de565257ada70ac441c640e3b5d6850e2df5ab8"; - hash = "sha256-QNI2V1CG1DdkMIzR+NUcM/IjtQHnJcYn9Nk3sUmkINE="; + rev = "e1384e2f132936019b43aaaae154cd780fb497ce"; + hash = "sha256-TxmJCKs7wqkceczHtOCVSzhlIZmpY86MuQo05Yy4J98="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; cairo = buildGrammar { language = "cairo"; - version = "0.0.0+rev=6216c6e"; + version = "0.0.0+rev=6238f60"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-cairo"; - rev = "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"; - hash = "sha256-D8yAkxaokkdNFLnBDWTa6Xu21ibpVw1A4sd/llh8BKs="; + rev = "6238f609bea233040fe927858156dee5515a0745"; + hash = "sha256-QjCt3sRINrNbaxtNwj43+g7D3xYmuh0BIAo6wWQ/54g="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-cairo"; }; @@ -226,12 +226,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=fe7a2a7"; + version = "0.0.0+rev=a461f20"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"; - hash = "sha256-4ianrWSctAIufc/8I1pxWvoij1nG7mcRemQs0fj1Qt8="; + rev = "a461f20dedb43905febb12c1635bc7d2e43e96f0"; + hash = "sha256-nAdyG068usqGr9OI/bZXiNfSkIg/+L6KTcylZVNNc+o="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -270,23 +270,23 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=83ae738"; + version = "0.0.0+rev=bf2a65b"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "83ae738bed7e914cee9090c3fe4c80a32ab45905"; - hash = "sha256-0qWcrn65vtOYz54NVi/sj+GqnGMztEpZJsl9sjbF5sw="; + rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"; + hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; cooklang = buildGrammar { language = "cooklang"; - version = "0.0.0+rev=81c2a86"; + version = "0.0.0+rev=4ebe237"; src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; - rev = "81c2a8667846b1e60db68b5601d864fe00fd1d3a"; - hash = "sha256-zlffOW/ZJxpn3T2CMkrznkLLtuqxp7gIxVHEItvMepY="; + rev = "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"; + hash = "sha256-VB3BxSrhIbD8TytfOJx7IhTwl/aWasB8t3xnrO34rQE="; }; meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; @@ -314,46 +314,46 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=72fd001"; + version = "0.0.0+rev=2369fa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "72fd00128f1c38319670cbf4bcedbba0dc849d96"; - hash = "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE="; + rev = "2369fa991eba294e9238e28280ffcd58132f94bc"; + hash = "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=02b4ee7"; + version = "0.0.0+rev=2e868a7"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "02b4ee757654b7d54fe35352fd8e53a8a4385d42"; - hash = "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g="; + rev = "2e868a75a518531656b493cba36ef60d8c61cc89"; + hash = "sha256-KGhTAYeuEkEDbKyKAI359RXpcdFjVHxWNLPAjZ4l+68="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; csv = buildGrammar { language = "csv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "csv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=50a28f4"; + version = "0.0.0+rev=c794560"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "50a28f4600c559e3d19a1825e854dfe6dcac1d49"; - hash = "sha256-xVf9sD5CbXDn1Kw9vkgKd+hWmerQgHf7ntUtynRXpBo="; + rev = "c794560823013fc4cc29944d862b7158d9585408"; + hash = "sha256-YiLsKDLiiH8JUFdnaqYrEk7xy4IIAFUFVSjwhXEoD8U="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +381,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=6da4647"; + version = "0.0.0+rev=ac0bb84"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "6da46473ab8accb13da48113f4634e729a71d335"; - hash = "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s="; + rev = "ac0bb849ccd1a923963af47573b5e396736ff582"; + hash = "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -436,12 +436,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=63f176e"; + version = "0.0.0+rev=0e9a836"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "63f176e7db5fca073b55b98b7e5e95afd1587fcb"; - hash = "sha256-8ksZvW0Gb3fZXUDA/uv3AzxDaD3s9B2ZyAIIp261jQg="; + rev = "0e9a836ec47612ade15645fb1680adb549894a6c"; + hash = "sha256-PdToOLDgEYKVCYT7jmCBNWtuQ0XLgOYF1/PycSxP3XU="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -469,35 +469,35 @@ }; doxygen = buildGrammar { language = "doxygen"; - version = "0.0.0+rev=a750758"; + version = "0.0.0+rev=4a30eba"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-doxygen"; - rev = "a750758da90955c86fcc22fcbb6fa44a7d009865"; - hash = "sha256-/4yBu5S9bQhxGO9JcNZukn+xpfzfaQQRLqVuDHgMYd0="; + rev = "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"; + hash = "sha256-yR2JtWYdy84z38Idx84qIuUPoBMiSj/7TVw0J1+g/U8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=96beba9"; + version = "0.0.0+rev=5910ee2"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; - hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; + rev = "5910ee285378e07ff1e63a9f5d21898f62310aed"; + hash = "sha256-X/DhTD/cNWoBxWvBBwPmGqAUtJjWkvo0PnbFK/lrTUg="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=7d5cc9e"; + version = "0.0.0+rev=3ded1cb"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "7d5cc9e27e3e340c8b521d11c8da84047494fe30"; - hash = "sha256-0rjD8SJGot/KAsLVW98e7X2tbNPntScRk/oEsS1wmAg="; + rev = "3ded1cba9eab14b07377b700b1132d259480abae"; + hash = "sha256-lT+qHnHqBDJs042Yz10PNyxUbTa7nt+cnxDvAZJRryA="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -625,12 +625,12 @@ }; fennel = buildGrammar { language = "fennel"; - version = "0.0.0+rev=215e391"; + version = "0.0.0+rev=8ad1770"; src = fetchFromGitHub { owner = "alexmozaidze"; repo = "tree-sitter-fennel"; - rev = "215e3913524abc119daa9db7cf6ad2f2f5620189"; - hash = "sha256-myh0+ZNDzdUZFAdsw8uVGyo0VYh0wKNZ11vlJKTSZnA="; + rev = "8ad17704b3c2469155947d4e8fcb618cf1328459"; + hash = "sha256-7a2spHMApW+yc/wrpVwWl9ykPAdC4QTOeMIs1jxajsU="; }; meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel"; }; @@ -702,23 +702,23 @@ }; fsh = buildGrammar { language = "fsh"; - version = "0.0.0+rev=fa33477"; + version = "0.0.0+rev=fad2e17"; src = fetchFromGitHub { owner = "mgramigna"; repo = "tree-sitter-fsh"; - rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; - hash = "sha256-6TLG2edQeo+jRVAnO6mq3pC8RYNFi2UVVT3mQGZqk5U="; + rev = "fad2e175099a45efbc98f000cc196d3674cc45e0"; + hash = "sha256-91r1FCQTocDkhS5Tx0vnFliitMStVzNTpf6BwPyaqVM="; }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; func = buildGrammar { language = "func"; - version = "0.0.0+rev=0834e35"; + version = "0.0.0+rev=f780ca5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-func"; - rev = "0834e35ecf8b23fbf9ad15b088af6a897e19d4a8"; - hash = "sha256-2+YOp7MnwZR2qg95h/ywjJwDSLUnodtkwwpv9zuy8p8="; + rev = "f780ca55e65e7d7360d0229331763e16c452fc98"; + hash = "sha256-jM0VJZlfhenAZbhabpgsoRIGny3WSDoimZtwogcvaSI="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-func"; }; @@ -812,12 +812,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=bcf9c45"; + version = "0.0.0+rev=a0b11a1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"; - hash = "sha256-XdgPPX5gKvr4yIpMy6M7AKxaMrilt5Pzp6gUa8o+EwE="; + rev = "a0b11a15935b95848176c747a8b5776752d90d7c"; + hash = "sha256-h7IDqQpqPFC5WwR2fPxCKLvvdYCFqm5CPf6EJ36qsxQ="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -834,12 +834,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=e7817c9"; + version = "0.0.0+rev=9f61177"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"; - hash = "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78="; + rev = "9f611774fb5b95993e31e03f137b4a689c63f827"; + hash = "sha256-WLKfP4gE2bOU5ksDmbcTdf6Gud8BoFOv3wX6UyNgkvM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -999,12 +999,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=95a4f00"; + version = "0.0.0+rev=af32d88"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"; - hash = "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08="; + rev = "af32d884088ce7b74541b5e51820baa7e305caae"; + hash = "sha256-w4F1PtVjg7FWPRQQMSV8nU7GwCISiCgaIre+S63N+T0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1066,23 +1066,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=d200375"; + version = "0.0.0+rev=de5d490"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "d200375a29b24764b78d7051df0024ed7c2f1ab0"; - hash = "sha256-HCbH8Lyi2ziaUTxhgVPQ4hyOZhRxNFW66gAkoFT/Ubg="; + rev = "de5d490e52aa7be2a877df7022f93dff05f03eb9"; + hash = "sha256-5eHyyk6m8VNjenjM1xDBhZcROwzSm/O+9GtgyiXNHFc="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=3e65f65"; + version = "0.0.0+rev=64f1902"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"; - hash = "sha256-IGfKnEG1b9TSPBjxb+NjgweyKp7HUyZCe2gR/xnV5CY="; + rev = "64f19029339e75d6762feae39e7878595860c980"; + hash = "sha256-rJZo17tAbDbnnx6PTOlzgJYClnGrRNfQ6fLJqIVMMCw="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1110,12 +1110,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=bfa075d"; + version = "0.0.0+rev=e4d834e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "bfa075d83c6b97cd48440b3829ab8d24a2319809"; - hash = "sha256-zUbcez+kWKJb7ZV8rC17NJ61P85hgA3HXtQCFevFwvs="; + rev = "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"; + hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1163,6 +1163,17 @@ }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; + idl = buildGrammar { + language = "idl"; + version = "0.0.0+rev=d9a260e"; + src = fetchFromGitHub { + owner = "cathaysia"; + repo = "tree-sitter-idl"; + rev = "d9a260eda455deaa36d2edf398963b0736ed0845"; + hash = "sha256-4NQmZ8H5mmKQDaPlKkAgDKfARjM+m6G9Wb7PcQk+NS0="; + }; + meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; + }; ini = buildGrammar { language = "ini"; version = "0.0.0+rev=bcb84a2"; @@ -1174,6 +1185,17 @@ }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; + inko = buildGrammar { + language = "inko"; + version = "0.0.0+rev=4cef9aa"; + src = fetchFromGitHub { + owner = "inko-lang"; + repo = "tree-sitter-inko"; + rev = "4cef9aa4980606311b906b2f2b8c6cf791c60396"; + hash = "sha256-NnZ5sSNwVVsx1I8eacvTl+1Vn/PL3NsrlFNPHQMUP6I="; + }; + meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; + }; ispc = buildGrammar { language = "ispc"; version = "0.0.0+rev=9b2f9ae"; @@ -1209,12 +1231,12 @@ }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=fff4560"; + version = "0.0.0+rev=c002746"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"; - hash = "sha256-erxZ5nYvUwrzdRnkni8WEsxB04ghI7H3DLASfCoHXYs="; + rev = "c0027460e8f9629afeeb27f7949ecf961c82d707"; + hash = "sha256-/h8h+Rxabs+uBs/c9K1nc/K7viygBhuH3DJbqeQSCpI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1253,12 +1275,12 @@ }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=c23f7a9"; + version = "0.0.0+rev=ab0ba82"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"; - hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY="; + rev = "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"; + hash = "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1297,12 +1319,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=6c2f018"; + version = "0.0.0+rev=fd814fc"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"; - hash = "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw="; + rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; + hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1330,15 +1352,26 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=260afd9"; + version = "0.0.0+rev=eca05ed"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "260afd9a92bac51b3a4546303103c3d40a430639"; + rev = "eca05edbab1918d7d36a0d30d086ba7b6b1e8803"; hash = "sha256-cmtUGmytAgiqBi31CNxEX+vE3YXmH1hphsIHvGRd7SY="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; + koto = buildGrammar { + language = "koto"; + version = "0.0.0+rev=919440e"; + src = fetchFromGitHub { + owner = "koto-lang"; + repo = "tree-sitter-koto"; + rev = "919440e1376109bab4edac52594c17c02ae0be5a"; + hash = "sha256-R3p0X741yOBAC6NTB46PTkh41NLmaVUvQPLBG1+PG+Y="; + }; + meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; + }; kusto = buildGrammar { language = "kusto"; version = "0.0.0+rev=8353a12"; @@ -1363,12 +1396,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=ae2134a"; + version = "0.0.0+rev=cd82eb4"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"; - hash = "sha256-hQaQBQYK0o5qRH5Mjv3pIAUHJe6BWHGzg2I4KCVG2KE="; + rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; + hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1419,12 +1452,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=09a9e31"; + version = "0.0.0+rev=a9b8012"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "09a9e31e2af734a8974dad6ed349648f601eee8c"; - hash = "sha256-GQIi1PFYFlOBkUOGYWQG6M0A+ve3IBl/G0rCcAVyRKM="; + rev = "a9b8012366eab7d0c28bbda5f75a847be931008f"; + hash = "sha256-n8kT4bxRSp3EOJwsm0S4kKYq6Iln1vvvho/di4N0lRs="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1553,12 +1586,12 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=49442bd"; + version = "0.0.0+rev=90ae195"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "49442bd087901c60f019b4e34dcb6ecdc8849067"; - hash = "sha256-KoAoEuADv6Xj/bpZV5XGW7nXugSCfk6St2xzx7x2oPA="; + rev = "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"; + hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; @@ -1575,35 +1608,35 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=c2845c1"; + version = "0.0.0+rev=ed52870"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "c2845c1c0b23e2faf6febfa72a042e5346374ebf"; - hash = "sha256-SQR/1lAWdvNDwa40wNI3uGSF9OBgtyjxVM5lsP4CgIU="; + rev = "ed528701a1ee52d4735c3439da262c898e506fc3"; + hash = "sha256-VDwKpSRRlZDjrJH7NqKUZm596M/glWhAimkmH0POue4="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=1a3d3c9"; + version = "0.0.0+rev=90ef608"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"; - hash = "sha256-9RFz8qaAapJSNxy8YH/6FZG2j1tcrhNWRhxx+fNo7z8="; + rev = "90ef60852c410bd964cd3b954366e4c403c17314"; + hash = "sha256-GiM9jXtaL/GEUmBuiMB7pZP0VnHVzRETwwCHQsHyaTM="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; nasm = buildGrammar { language = "nasm"; - version = "0.0.0+rev=3bc691d"; + version = "0.0.0+rev=570f3d7"; src = fetchFromGitHub { owner = "naclsn"; repo = "tree-sitter-nasm"; - rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d"; - hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM="; + rev = "570f3d7be01fffc751237f4cfcf52d04e20532d1"; + hash = "sha256-205joaeq4ZSyfgxagPQTsx0zpZwSEpq1VCQoHJ77OL8="; }; meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; }; @@ -1810,24 +1843,24 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=29838ad"; + version = "0.0.0+rev=58054be"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; - hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; + rev = "58054be104db0809ea6f119514a4d904f95e5b5c"; + hash = "sha256-oMn+0p+b01gSgGm5nrXO5FX9Je6y8bBNwP72x2e0hZU="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=29838ad"; + version = "0.0.0+rev=58054be"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; - hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; + rev = "58054be104db0809ea6f119514a4d904f95e5b5c"; + hash = "sha256-oMn+0p+b01gSgGm5nrXO5FX9Je6y8bBNwP72x2e0hZU="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1966,12 +1999,12 @@ }; psv = buildGrammar { language = "psv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "psv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2022,23 +2055,23 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=a227610"; + version = "0.0.0+rev=71778c2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"; - hash = "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88="; + rev = "71778c2a472ed00a64abf4219544edbf8e4b86d7"; + hash = "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=ff04ba6"; + version = "0.0.0+rev=fa5c382"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "ff04ba61857ba05b80221e71b423b2728dbebe1e"; - hash = "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE="; + rev = "fa5c3821dd2161f5c8528a8cbdb258daa6dc4de6"; + hash = "sha256-5Fc9u7sTWG/RRcg/B5uiF8wjsbHCNt+fcOtCPgf4gyo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -2055,34 +2088,34 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=9fa49ff"; + version = "0.0.0+rev=239f262"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "9fa49ff3315987f715ce5666ff979a7742fa8a98"; - hash = "sha256-q20gLVLs0LpqRpgo/qNRDfExbWXhICWZjM1ux4+AT6M="; + rev = "239f2627b4c7859fd9adc53609cb40fa0a5431ce"; + hash = "sha256-xlQ/C8rrjOMUZpciOJ+gjmS4zlRJYnhWtkoBKxssXCA="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=2e31ca2"; + version = "0.0.0+rev=608c011"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "2e31ca2771f6042b0e4e0c41a6290014a9e1face"; - hash = "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0="; + rev = "608c01187fb9f525a1e4cf585bb63d73dea280b7"; + hash = "sha256-kOlWlABRCv0eZcTNOkRhJxA4t0IUUvk1pi1s8UiWons="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=c55f8b4"; + version = "0.0.0+rev=3914005"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"; - hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o="; + rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; + hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2110,12 +2143,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=519a611"; + version = "0.0.0+rev=e5e807a"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "519a61132a51222e3ce73d3b7ef07465f587f346"; - hash = "sha256-MLsbOdH4R3nZxqTFtPstTsbr+yjAz7UvKB/lsD8aWxM="; + rev = "e5e807a50fcd104a2d740d354632fc671700a0bf"; + hash = "sha256-xEh1oHrLPjLT5LSJfOBFgi0nholVr8EFVGlEMPNIxSI="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2132,12 +2165,12 @@ }; readline = buildGrammar { language = "readline"; - version = "0.0.0+rev=e436eae"; + version = "0.0.0+rev=3d4768b"; src = fetchFromGitHub { owner = "ribru17"; repo = "tree-sitter-readline"; - rev = "e436eaef452266a3d00c195f0eb757d6502c767a"; - hash = "sha256-y38TDQ+7wBzEKol/UQ5Xk6f15wUW7hJxByDuhx9d0hQ="; + rev = "3d4768b04d7cfaf40533e12b28672603428b8f31"; + hash = "sha256-kky3u5+NGOlxx8RxeMNszG+XJ6D36+z2us9c0nK/Jds="; }; meta.homepage = "https://github.com/ribru17/tree-sitter-readline"; }; @@ -2242,12 +2275,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=b77c0d8"; + version = "0.0.0+rev=0435214"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"; - hash = "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ="; + rev = "04352146022062c101b8ddd853adf17eadd8cf56"; + hash = "sha256-4CTh6fKSV8TuMHLAfEKWsAeCqeCM2uo6hVmF5KWhyPY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2298,23 +2331,23 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=b950ddf"; + version = "0.0.0+rev=6858753"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "b950ddf54c564fec0efead602268b6e0d3e5f26e"; - hash = "sha256-AYZ7MlAh9AEvyHsGw6stiJFSEb4/FDLfuqFPhpAorAA="; + rev = "68587530d86aaeb1f1cb17fdada795281cdd0556"; + hash = "sha256-hWMfiwQEd39WKifIM6NhbXnoKI5zPIGxU2GBvfdjQ9s="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=d5fbeaf"; + version = "0.0.0+rev=0701312"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"; - hash = "sha256-ECzYJue7tKx9Eg043fl5x18ySvPlkWPU21Ga2Zqunv0="; + rev = "0701312b74b87fe20e61aa662ba41c5815b5d428"; + hash = "sha256-GwJptJ3AP3i4rVdXi2JmhngbSHCz3fqy+ymwSlx6h94="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2331,12 +2364,12 @@ }; smithy = buildGrammar { language = "smithy"; - version = "0.0.0+rev=8327eb8"; + version = "0.0.0+rev=fa898ac"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; - rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"; - hash = "sha256-6z2Psw+cjC11CXoGOJ/lkBPJXKqECCSrhchOiAPmd14="; + rev = "fa898ac0885d1da9a253695c3e0e91f5efc587cd"; + hash = "sha256-tB+q4RNru4Zi3jU9fBLKdzsXT0uP1PECLfeCCNTyaIo="; }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; @@ -2353,35 +2386,35 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=1653da0"; + version = "0.0.0+rev=fa5c61c"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "1653da09ccd183f4312fba819056a13af22a65f6"; - hash = "sha256-1IW04F6CxTIdGHxRocM1QmfgXHHf5Jn/eaZ6M8o2EU8="; + rev = "fa5c61c7c5a2d9e8e99439e2cec90225f4acb86b"; + hash = "sha256-evB+BQPPANC0JV7i74KYbGyFxE3N5OSOOF+ujA93y2E="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2476,12 +2509,12 @@ }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=3b35bd0"; + version = "0.0.0+rev=affa438"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"; - hash = "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU="; + rev = "affa4389186b6939d89673e1e9d2b28364f5ca6f"; + hash = "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; @@ -2509,12 +2542,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=e2f0b7c"; + version = "0.0.0+rev=5f5d7a2"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"; - hash = "sha256-DFoNyZmpzSDI37Gto2DxeoRZuDgLtx9NJxyYGIG6lrY="; + rev = "5f5d7a2a04f2d367a010ed908cc956e7b05fde4f"; + hash = "sha256-8BTyk99cc4kWpx1tvfMLyrKeZUQRRN0oMGw4Vz54Gtc="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2563,6 +2596,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; + tact = buildGrammar { + language = "tact"; + version = "0.0.0+rev=f65460e"; + src = fetchFromGitHub { + owner = "tact-lang"; + repo = "tree-sitter-tact"; + rev = "f65460eb0746037bc15913e2737afcf87745b66b"; + hash = "sha256-qoyiJzM1GMvHMpI3unnW9SysHMEw28mb64Xt1pO/hTI="; + }; + meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; + }; tcl = buildGrammar { language = "tcl"; version = "0.0.0+rev=8784024"; @@ -2588,12 +2632,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=e2218a2"; + version = "0.0.0+rev=c06e7bf"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "e2218a2376e3ff18c9963b21aa567770baab0462"; - hash = "sha256-lyxXb71FVfpWw4IbU5P6uDVETNSDO+r7+YgZDvaIEbc="; + rev = "c06e7bf0edfa211f6a7665a3c7fa25c1198850b2"; + hash = "sha256-E2Dkq4o9RDzPHnIq9TgjXAtJS5u6l/zV6KAcq+NSD6Y="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2644,23 +2688,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=410122a"; + version = "0.0.0+rev=763f9a4"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "410122a012abb06fbacc8c0b8f288b684f8113e1"; - hash = "sha256-vWxMaka5h8L+tJctiflEWT1/nofPYHIgpf1/3jfsgVU="; + rev = "763f9a4edcb1747595842164614aa143eec084dd"; + hash = "sha256-xkJbiDsheVhcSoMRLLvF4GPOBPRsGxWClyF8khTd0CI="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=1415bd8"; + version = "0.0.0+rev=9138ea5"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "1415bd8b5bb69c230947663deceb62c2a0ae4155"; - hash = "sha256-3kF6H3tP20FUfNoIRxQCnVzvyd4MFLd9oN6rhB/ePvo="; + rev = "9138ea508410e0f34da2666609f600f65e944f22"; + hash = "sha256-aoKrrDvOM4yOgE7rulGBoN1GeBBHN+dPfyNytC4oMC4="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2677,23 +2721,23 @@ }; toml = buildGrammar { language = "toml"; - version = "0.0.0+rev=8bd2056"; + version = "0.0.0+rev=16a30c8"; src = fetchFromGitHub { - owner = "ikatyang"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-toml"; - rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; - hash = "sha256-z9MWNOBxLHBd/pVs5/QiSSGtaW+DUd7y3wZXcl3hWnk="; + rev = "16a30c83ce427385b8d14939c45c137fcfca6c42"; + hash = "sha256-VYsPM0NVxegfanVaaKkSkEzJ502xkKSjZWrsJpDmack="; }; - meta.homepage = "https://github.com/ikatyang/tree-sitter-toml"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml"; }; tsv = buildGrammar { language = "tsv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "tsv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2757,12 +2801,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=13863dd"; + version = "0.0.0+rev=4610172"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "13863ddcbaa7b68ee6221cea2e3143415e64aea4"; - hash = "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU="; + rev = "4610172f312e8ce5184e6882be5ad1a1cd800fbe"; + hash = "sha256-vIDVnm89mcbEDV8u6x2HO6CgkNaGEVMRRlrT3dLIFcQ="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2790,24 +2834,24 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=a1eba0f"; + version = "0.0.0+rev=59d36a0"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"; - hash = "sha256-p0LArEOspQvpgNponLpMakEHrwHM+UzA9SU5PdwQCTU="; + rev = "59d36a09282be7e4d3374854126590f3dcebee6e"; + hash = "sha256-89vFguMlPfKzQ4nmMNdTNFcEiCYH0eSws87Llm88e+I="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; }; usd = buildGrammar { language = "usd"; - version = "0.0.0+rev=ab8c30b"; + version = "0.0.0+rev=4e0875f"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-usd"; - rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"; - hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc="; + rev = "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"; + hash = "sha256-r6Sm8FiTgxdYc5cAG5JXVtA5/2jID5H/xmKbjSYn/zI="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; }; @@ -2858,45 +2902,45 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=2dfddfc"; + version = "0.0.0+rev=075ebfc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; - rev = "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"; - hash = "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M="; + rev = "075ebfc84543675f12e79a955f79d717772dcef3"; + hash = "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=9534865"; + version = "0.0.0+rev=90028bb"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "9534865e614c95eb9418e5e73f061c32fa4d9540"; - hash = "sha256-Qf4Y1I/X5xGVZ4u2ud+XdC2dL+0sjR+0pJRJ8SUraiQ="; + rev = "90028bbadb267ead5b87830380f6a825147f0c0f"; + hash = "sha256-yxUVca44z4wtYsxQKaJQjMm0fFeKAOWFnIX+5k6+SJk="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=052279c"; + version = "0.0.0+rev=b448ca6"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "052279cd5e1d73b075640c64cef97e7bdcd32611"; - hash = "sha256-EoiMqMcBl5bC1Irs2flA2F5nHN6VTZdv6hdCrqoTAcY="; + rev = "b448ca63f972ade12c373c808acdd2bf972937db"; + hash = "sha256-wQQSeDzcSY9qNVgeDhrELS1x1UoilRa7iHML9qSgchY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=0b36856"; + version = "0.0.0+rev=b711df7"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "0b36856db88680f662cc67545c82af4ce83bf158"; - hash = "sha256-8kq1Y+WXL6qu8CyS5zmE7pe/a0K5rmiGgZMxj5O/VHY="; + rev = "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"; + hash = "sha256-+QbLL5EC3oNiwd7h7MW/mutHhGPUHhbYTQcu6x6atcI="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2924,12 +2968,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=f5980f5"; + version = "0.0.0+rev=59d5fbd"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "f5980f534ee64256b1e64b0a42e2864d91154a5d"; - hash = "sha256-LbysBXujWWDVtgyHte9RLOPu/LMk1TN/9DC0t0WWdcQ="; + rev = "59d5fbd562c0e17c45312f49485098cce467f5ac"; + hash = "sha256-4Df7UEHjoIQv4pSdxLlw9c1k0BwnVNRbZ8x/Ky0Q4DE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; @@ -2946,12 +2990,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=6f511f9"; + version = "0.0.0+rev=3d6124c"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "6f511f9c6676e597c2f0930e4d2629595319882d"; - hash = "sha256-xvMIcbeYdr/KIz0fqnARAwEKWmm4dlWhFAS/NZFU16s="; + rev = "3d6124cfe88555ecee1ba97d6d76c70d13af927a"; + hash = "sha256-a+kMWBwVDDXIcUbTqcCp3RllllScuqrJEMjFTu9SiPc="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; @@ -2968,24 +3012,24 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=96beba9"; + version = "0.0.0+rev=5910ee2"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; - hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; + rev = "5910ee285378e07ff1e63a9f5d21898f62310aed"; + hash = "sha256-X/DhTD/cNWoBxWvBBwPmGqAUtJjWkvo0PnbFK/lrTUg="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=ee09311"; + version = "0.0.0+rev=08ab1fb"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "ee093118211be521742b9866a8ed8ce6d87c7a94"; - hash = "sha256-tE39KP86JYYmj8WW1l3HAIiBZr/E4IyOgdsUm6d6pQ8="; + rev = "08ab1fbc18beac06b2938495a2c6ab17b5a6abc5"; + hash = "sha256-Xwx6UEfdOP3lakMvQB5CQjtrhSfkJ19eaT1YyUhRpss="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3013,12 +3057,12 @@ }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=09b837d"; + version = "0.0.0+rev=e9e8de0"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "09b837dc8f7445fd86e1245c23b1a7804229edd4"; - hash = "sha256-t7eBWDfn0nq1nGqSyCZmoSGVGgeTcGFfPrZl62OkD1I="; + rev = "e9e8de071ab79ed1f6e3365f05fcf890b6d85a2f"; + hash = "sha256-yQyoqRGLVSs3bcfUrQNJllWcufROgo1M+jS/ba7OIgo="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 79153066705bf..c38f517d73698 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1048,6 +1048,8 @@ mkdir $target/bin ln -s ${dbee-go}/bin/dbee $target/bin/dbee ''; + + meta.platforms = lib.platforms.linux; }); nvim-navic = super.nvim-navic.overrideAttrs { @@ -1061,7 +1063,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-UxOAIyVlJWlp5RUFVU3Ib539D5pm6Z+3edjHLerkIRU="; + cargoHash = "sha256-seBq1zJNzNVfCQckIHq7rHI/Y8MyxP88cee3NO7NYgo="; preCheck = '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index faf446c70f415..71da655f81ad1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -73,7 +73,7 @@ https://github.com/ray-x/aurora/,, https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/asiryk/auto-hlsearch.nvim/,HEAD, https://github.com/jiangmiao/auto-pairs/,, -https://github.com/pocco81/auto-save.nvim/,HEAD, +https://github.com/okuuva/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/gaoDean/autolist.nvim/,, @@ -938,7 +938,7 @@ https://github.com/xiyaowong/transparent.nvim/,HEAD, https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, -https://github.com/simonclean/triptych.nvim/,HEAD, +https://github.com/simonmclean/triptych.nvim/,HEAD, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 9b7f63edc74a2..ad8c6a9eac461 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.4.1"; - hash = "sha256-huKu6yefGXOay5Az4vksopRt8heoLxvKUrg/J1NlQFo="; + version = "2024.5.1"; + hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 3a6d84b24b8a6..b3f9d1916835a 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.6"; - hash = "sha256-qS+QY9RmJYXWRcohMcorF3SxoniBPE8SFcg0Ka1vvOE="; + version = "0.11.7"; + hash = "sha256-pL61pu8xTsjOOn4vYBwrWc6JKhrzRyNjQmJmrezUcyk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index eb24885ca1425..8250ebfe289b9 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -109,7 +110,30 @@ python.pkgs.buildPythonApplication { pyqt6 ]; + patches = [ + # aiorpcx 0.23.1 compatibility + # Note: this patches `/run_electrum`. + # In the source repo, `/electrum/electrum` + # is a symlink to `../run_electrum`, + # so that path would also be affected by the patch. + # However, in the distribution tarball used here, + # `/electrum/electrum` is simply an exact copy of + # `/run_electrum` and is thereby *not* affected. + # So we have to manually copy the patched `/run_electrum` + # over `/electrum/electrum` after the patching (see below). + # XXX remove the copy command in `postPatch` + # as soon as the patch itself is removed! + (fetchpatch { + url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch"; + hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw="; + }) + ]; + postPatch = '' + # copy the patched `/run_electrum` over `/electrum/electrum` + # so the aiorpcx compatibility patch is used + cp run_electrum electrum/electrum + # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ --replace "protobuf>=3.20,<4" "protobuf>=3.20" diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix deleted file mode 100644 index 05d1c98e56ac8..0000000000000 --- a/pkgs/applications/misc/kdbplus/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }: - -assert (stdenv.hostPlatform.system == "i686-linux"); - -let - libPath = lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc zlib ]; -in -stdenv.mkDerivation rec { - pname = "kdbplus"; - version = "3.6"; - - src = requireFile rec { - message = '' - Nix can't download kdb+ for you automatically. Go to - http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in - the directory where you saved it. Note you need version ${version}. - ''; - name = "linuxx86.zip"; - sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p"; - }; - - dontStrip = true; - nativeBuildInputs = [ unzip ]; - - phases = "unpackPhase installPhase"; - unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; - installPhase = '' - mkdir -p $out/bin $out/libexec - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath} \ - ./q/l32/q - mv ./q/l32/q $out/libexec/q - - # Shell script wrappers to make things more convenient... - - cat > $out/bin/q-install <<- EOF - #!${bash}/bin/bash - if [ -f \$HOME/q/q.k ]; then - echo "kdb has already been unpacked in \$HOME. Skipping..." - exit 0 - fi - echo -n "Unzipping ${src} into \$HOME... " - cd \$HOME && ${unzip}/bin/unzip -qq ${src} - echo "Done" - EOF - - cat > $out/bin/q <<- EOF - #!${bash}/bin/bash - if [ ! -f \$HOME/q/q.k ]; then - echo "ERROR: You need to unzip the Q sources into \$HOME before running q." - echo - echo "Try:" - echo " cd \$HOME && unzip ${src}" - echo "(or run q-install)" - exit 1 - fi - - exec ${rlwrap}/bin/rlwrap $out/libexec/q \$@ - EOF - - chmod +x $out/bin/q $out/bin/q-install - ''; - - meta = { - description = "Analytics and time-series database"; - homepage = "http://www.kx.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "i686-linux" ]; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 275e441fb55d1..1f85cd9e72312 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.11.0"; + version = "2.11.2"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-RQBSNfJQx3D07frYhKdNlRFMJYXiOC9NAT3bbqCr2Ls="; + hash = "sha256-RdBgGE/EUzb1/6PjQ34UjXjxt686s9May7npFtRocXE="; stripRoot = false; }; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 86258fa9805dc..78a122528707a 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-juFcVtHhqT6tw9YaKCDTUvX6NqqxEjqVK3Zom673IkQ="; + hash = "sha256-OxEo5fkRSdEZLyvK4Pt3EOWLO0ph6RkSD2OOeAWg72M="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-9G8GPTJRuPahNcEhAddZsUKc1fexp6IrCZlCGKW0T64="; + vendorHash = "sha256-X4pMes9hLMF8bZ6MX5cZdm4HfjnHYshGlA/lXlHr1Ow="; doCheck = false; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a2455330c2225..a754fcb33f299 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 +, curl, fuse3 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -16,22 +17,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.33"; + version = "1.4.35"; src = fetchFromGitLab { - owner = "Remmina"; - repo = "Remmina"; - rev = "v.${finalAttrs.version}"; - sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; + owner = "Remmina"; + repo = "Remmina"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ + curl fuse3 gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 - freerdp libssh libgcrypt gnutls + freerdp3 libssh libgcrypt gnutls pcre2 libvncserver libpthreadstubs libXdmcp libxkbcommon libsoup_3 spice-protocol @@ -46,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withVte [ vte ]; cmakeFlags = [ + "-DWITH_FREERDP3=ON" "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ] ++ lib.optionals stdenv.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" @@ -82,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; + changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}"; description = "Remote desktop client written in GTK"; mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 26e767ef90695..4571c91b77f20 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { description = "An unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ patka ]; mainProgram = "trayscale"; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 0ff43b584bea9..8e4b0c231f74b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.4"; + version = "24.5.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-nTRCW76UogaTOyxQ5HfWUln6Lip/LpoyPG+m+mMCb1I="; + hash = "sha256-ktf28AKNr0FcWzJ0A2s3mpU2qgmibpT0rUN9d18mE88="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 3e6ed97d11c87..91852af85528f 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-04-27"; + version = "0-unstable-2024-05-04"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "fee4de37933f60895f78f45eb192d27bcdf0640e"; - hash = "sha256-ej8Pjz7gvVP8gVsC68h60/uy+CkrcrBflhW/PjsxCvM="; + rev = "f29512886514410fa68d2debdb9389a8f81f3aaa"; + hash = "sha256-Uq8G2lSVTj1JmiLnn5FZd/WKS+wjZxoaliOyghVZg34="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index cab870c5e588f..d73dcc01a54e6 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "0.4.0-unstable-2024-02-08"; + version = "0.4.0-unstable-2024-05-03"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b"; - hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo="; + rev = "e95140ff433b805ca16df04cba501b7332a9ec95"; + hash = "sha256-UU3Ve6Yb7UK2nOLTfJasrlMX4iu1cpLBLScvhRhTUJ0="; }; buildInputs = [ glib diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 6c7157a91764c..56eb023805a3e 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -3,39 +3,20 @@ , cmake , eigen , fetchFromGitHub -, fetchpatch , libcifpp , libmcfp , zlib }: -let - libcifpp' = libcifpp.overrideAttrs (oldAttrs: { - # dssp 4.4.3 requires specific version "5.2.0" of libcifpp - version = "5.2.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo rev; - hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; - }; - patches = [ - (fetchpatch { - # https://github.com/PDB-REDO/libcifpp/issues/51 - name = "fix-build-on-darwin.patch"; - url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch"; - hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0="; - }) - ]; - }); -in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.5"; + version = "4.4.7"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M="; + hash = "sha256-qePoZYkzzWuK6j1NM+q6fPuWVRDEe4OkPmXc9Nbqobo="; }; nativeBuildInputs = [ @@ -44,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ eigen - libcifpp' + libcifpp libmcfp zlib ]; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index d463b4fe53665..af3856f041674 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0="; + sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index 90ee50c682800..0d968e0161796 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , fetchFromBitbucket , autoreconfHook + +# Reverse dependency +, sage }: stdenv.mkDerivation rec { @@ -20,6 +23,8 @@ stdenv.mkDerivation rec { autoreconfHook ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 9673d7d479d02..ab11d833f70c5 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-hlGNL7aMzxBxtATWJBqJTFEQqMv10oC3sRCdtRLHOww="; + hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 296fc5f783f38..a830c7ddd00ec 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-X7IY2yXpZiyE+T2dl0G4tWpJ5O6MVCy/sOY3v9inma0="; + hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/version-management/gitnuro/default.nix b/pkgs/applications/version-management/gitnuro/default.nix index e577cbaa6f61c..d59287db4bb95 100644 --- a/pkgs/applications/version-management/gitnuro/default.nix +++ b/pkgs/applications/version-management/gitnuro/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gitnuro"; - version = "1.1.1"; + version = "1.3.1"; src = fetchurl { - url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; - hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY="; + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar"; + hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw="; }; icon = fetchurl { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A FOSS Git multiplatform client based on Compose and JGit"; homepage = "https://gitnuro.com/"; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zendo ]; mainProgram = "gitnuro"; }; diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 94583ba93bc8d..cece41286a804 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-ZQU9AkemAMpMb2GhdfHaF6r6r6MbMXnmA0pq6Zq9Sek="; + hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ="; }; - cargoHash = "sha256-DHTo0jRZlLmw/B042uqzpMLUhBwm+sbFj9pze5l1Kpk="; + cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/applications/video/open-in-mpv/default.nix index e6f820528882e..1e1e29ba2dc0a 100644 --- a/pkgs/applications/video/open-in-mpv/default.nix +++ b/pkgs/applications/video/open-in-mpv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-+sP8/wILBkT3NnhENDYZbOwqOufkFyMJFpQxquuUBEs="; + hash = "sha256-Fa6oZMaR0ctZgYWoOXLaobc+pDRDZbDCFvRZUR+Fda4="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 1dbfaa298e345..50c5a10b5663a 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,20 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "123.0"; + version = "124.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - # This is actually one commit before release 123, because the final - # commit breaks the build and gets reverted in future releases. - rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72"; - hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY="; + rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af"; + hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys="; + cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 4d5317201ad0d..567a1b4db6eb2 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.7.1"; + version = "1.7.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng="; + hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA="; }; dontConfigure = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # https://github.com/89luca89/distrobox/issues/408 substituteInPlace ./distrobox-generate-entry \ - --replace 'icon_default="''${HOME}/.local' "icon_default=\"$out" + --replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out" ./install -P $out runHook postInstall diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/applications/virtualization/dumb-init/default.nix index 5907aacc99d47..28054be349e13 100644 --- a/pkgs/applications/virtualization/dumb-init/default.nix +++ b/pkgs/applications/virtualization/dumb-init/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Yelp/dumb-init"; license = licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "dumb-init"; }; } diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 15a753df07728..4548616c7d80e 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -185,6 +185,10 @@ stdenvNoCC.mkDerivation (args // { inherit selfContainedBuild useAppHost useDotnetFromEnv; + # propagate the runtime sandbox profile since the contents apply to published + # executables + propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile; + passthru = { inherit nuget-source; } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { @@ -316,8 +320,4 @@ stdenvNoCC.mkDerivation (args // { } // args.passthru or { }; meta = (args.meta or { }) // { inherit platforms; }; -} - # ICU tries to unconditionally load files from /usr/share/icu on Darwin, which makes builds fail - # in the sandbox, so disable ICU on Darwin. This, as far as I know, shouldn't cause any built packages - # to behave differently, just the dotnet build tool. - // lib.optionalAttrs stdenvNoCC.isDarwin { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; }) +}) diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix new file mode 100644 index 0000000000000..503e4ff2f1946 --- /dev/null +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -0,0 +1,118 @@ +{ + lib, + fetchFromGitLab, + gtksourceview5, + libspelling, + fetchFromGitHub, + python3Packages, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + libadwaita, + webkitgtk_6_0, + texliveMedium, + shared-mime-info, +}: + +let + version = "3.0"; + + src = fetchFromGitLab { + owner = "World"; + repo = "apostrophe"; + domain = "gitlab.gnome.org"; + rev = "v${version}"; + sha256 = "sha256-wKxRCU00nSk7F8IZNWoLRtGs3m6ol3UBnArtppUOz/g="; + }; + + # Patches are required by upstream. Without the patches + # typing `- aaa`, newline, `- bbb` the program crashes + gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ]; + }); + + libspelling-patched = + (libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs + (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ]; + }); + + reveal-js = fetchFromGitHub { + owner = "hakimel"; + repo = "reveal.js"; + + # keep in sync with upstream shipped version + # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json + rev = "4.6.0"; + hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; + }; +in +python3Packages.buildPythonApplication rec { + inherit version src; + pname = "apostrophe"; + pyproject = false; + + postPatch = + '' + substituteInPlace build-aux/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + + patchShebangs --build build-aux/meson_post_install.py + '' + # Should be done in postInstall, but meson checks this eagerly before build + + '' + install -d $out/share/apostrophe/libs + cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + libadwaita + gtksourceview5-patched + libspelling-patched + webkitgtk_6_0 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pypandoc + chardet + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : "${texliveMedium}/bin" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + inherit gtksourceview5-patched libspelling-patched reveal-js; + }; + + meta = { + homepage = "https://gitlab.gnome.org/World/apostrophe"; + description = "A distraction free Markdown editor for GNU/Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + sternenseemann + aleksana + ]; + mainProgram = "apostrophe"; + }; +} diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/by-name/as/assemblyscript/package.nix index b0fd15d47941a..b0fd15d47941a 100644 --- a/pkgs/development/compilers/assemblyscript/default.nix +++ b/pkgs/by-name/as/assemblyscript/package.nix diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 69ac822d84ee6..5f36c4ec356f0 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU="; + hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo="; }; - cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0="; + cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 1ee53112cff12..f16b0424031d2 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.85"; + version = "1.0.86"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-2i9FAWF9b1tNdDbTwCzQY8Mh/h85uigR5IT9kzPft00="; + hash = "sha256-wp4JYuAHtZrHer4db0vBCchf8mQIt6jXWqjqpGKws4o="; }; - cargoHash = "sha256-Vl0zC9TPhiFv2SiZtzIUV7GftB1y9K1gLy1ajisP8Y0="; + cargoHash = "sha256-QNH3G34yTEecZyVgw2a1RJnd1CMfV4aw1OJqes/cK2s="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/development/tools/rust/cargo-profiler/default.nix b/pkgs/by-name/ca/cargo-profiler/package.nix index 595bf6d8d032e..595bf6d8d032e 100644 --- a/pkgs/development/tools/rust/cargo-profiler/default.nix +++ b/pkgs/by-name/ca/cargo-profiler/package.nix diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index badd2318ff03b..d973a9662b710 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shear"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - sha256 = "sha256-7eBFDmeFOXqZhNE4RDlIq991xEoCGL6XLMmUQuLJvrE="; + sha256 = "sha256-4NnCUe4DrnSeveicxvvDF49hrc4NdRx/N10PH7Q0k8k="; }; - cargoSha256 = "sha256-DQjLW6NtUPERT82zIlrGRk3FffU/EfLBMgAeFfFdDxE="; + cargoHash = "sha256-gHXJz3Xw9vC04q001kd6AgEKKaRtAK3oGMn7JJh+Neo="; meta = with lib; { description = "Detect and remove unused dependencies from Cargo.toml"; diff --git a/pkgs/development/tools/rust/cargo-wasi/default.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index bead01fed4ed4..8e688c28cad08 100644 --- a/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -4,7 +4,7 @@ , pkg-config , stdenv , openssl -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/by-name/ca/castxml/package.nix index bceafd504dccc..2b0a255bbdc86 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libffi -, libxml2 -, zlib -, withManual ? true -, withHTML ? true -, llvmPackages -, python3 +{ + cmake, + fetchFromGitHub, + lib, + libffi, + libxml2, + llvmPackages, + python3, + stdenv, + zlib, + # Boolean flags + withHTML ? true, + withManual ? true, }: let @@ -17,19 +19,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-r9Emh2KHjANrg+oWeY8Ags3Gd8k3W68J88bAud+AH6I="; + hash = "sha256-icTos9HboZXvojQPX+pRkpBYiZ5SXSMb9XtvRnXNHuo="; }; nativeBuildInputs = [ cmake - llvm.dev - ] ++ lib.optionals (withManual || withHTML) [ + (lib.getDev llvm) + ] + ++ lib.optionals (withManual || withHTML) [ sphinx ]; @@ -45,14 +48,17 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${libclang.dev}/" - "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" - "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" + (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}") + (lib.cmakeBool "SPHINX_HTML" withHTML) + (lib.cmakeBool "SPHINX_MAN" withManual) ]; # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all doCheck = false; + + strictDeps = true; + # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 checkPhase = '' @@ -61,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/CastXML/CastXML"; description = "C-family Abstract Syntax Tree XML Output"; + license = lib.licenses.asl20; mainProgram = "castxml"; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index b262d0f7547e5..8fc885c11ad9d 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-wSpWTQ+AuDG3zKocDVatRqVW5yhrOtcbNI+jfMOaXvg="; + hash = "sha256-V6W7IJFa8UrbPWPS2tReecZ41oYvAqV4q0NBkkhUHbQ="; }; meta = old.meta // (with lib; { diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/by-name/da/dapr-cli/package.nix index a672b9637e33b..a672b9637e33b 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/by-name/do/doppler/package.nix index cdeb12f08de2c..cdeb12f08de2c 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/by-name/do/doppler/package.nix diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index eb4de12dfd2f8..a77be53cd2119 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-QJPLDqdXttUSeCm1QpQ7oFgvDmzStz9maW0c5xhOLtg="; + hash = "sha256-2ZFLQoz25q3uwjQkogSyuLxSNJQ6Gh553Yj4zl70jno="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/by-name/ec/eclint/package.nix index 3f449489743a1..3f449489743a1 100644 --- a/pkgs/development/tools/eclint/default.nix +++ b/pkgs/by-name/ec/eclint/package.nix diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 0115b1baa114b..ad72772d2d9cf 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.11.3"; + version = "2.11.5"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-kKtJvGnPncosmwjfTKa14G5jQiSkzkURBATvBmavdys="; + hash = "sha256-5Chyw4+U2n935YP/Msw8PJ+5iLMES71O+uABn6nVtiI="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 509c0fb5504a1..fe04a6586cd84 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -12,14 +12,14 @@ , withGpio ? stdenv.isLinux }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "flashprog"; - version = "1.0.1"; + version = "1.1"; src = fetchgit { url = "https://review.sourcearcade.org/flashprog"; - rev = "2ca11f9a4101ea230081d448ab2b570425b7f0bd"; - hash = "sha256-pm9g9iOJAKnzzY9couzt8RmqZFbIpKcO++zsUJ9o49U="; + rev = "v${finalAttrs.version}"; + hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM="; }; nativeBuildInputs = [ @@ -60,4 +60,4 @@ stdenv.mkDerivation { platforms = platforms.all; mainProgram = "flashprog"; }; -} +}) diff --git a/pkgs/applications/misc/flowtime/default.nix b/pkgs/by-name/fl/flowtime/package.nix index 06962d75452b6..d372d1d45379d 100644 --- a/pkgs/applications/misc/flowtime/default.nix +++ b/pkgs/by-name/fl/flowtime/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "flowtime"; - version = "6.1"; + version = "6.5"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Flowtime"; rev = "v${version}"; - hash = "sha256-wTqHTkt1O3Da2fzxf6DiQjrqOt65ZEhLOkGK5C6HzIk="; + hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-cover-treemap/package.nix b/pkgs/by-name/go/go-cover-treemap/package.nix new file mode 100644 index 0000000000000..1afb9191607a2 --- /dev/null +++ b/pkgs/by-name/go/go-cover-treemap/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-cover-treemap"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "nikolaydubina"; + repo = "go-cover-treemap"; + rev = "v${version}"; + hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA="; + }; + + vendorHash = "sha256-k/k+EGkuBnZFHrcWxnzLG8efWgb2i35Agf/sWbgTc4g="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Go code coverage to SVG treemap"; + homepage = "https://github.com/nikolaydubina/go-cover-treemap"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + mainProgram = "go-cover-treemap"; + }; +} diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix index 5c67519c4ea5f..239c10a47af57 100644 --- a/pkgs/by-name/go/go-errorlint/package.nix +++ b/pkgs/by-name/go/go-errorlint/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-errorlint"; - version = "1.4.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "polyfloyd"; repo = "go-errorlint"; rev = "v${version}"; - hash = "sha256-BU+3sLUGBCFA1JYFxTEyIan+iWB7Y7SaMFVomfNObMg="; + hash = "sha256-xO9AC1z3JNTRVEpM/FF8x+AMfmspU64kUywvpMb2yxM="; }; - vendorHash = "sha256-xn7Ou4l8vbPD44rsN0mdFjTzOvkfv6QN6i5XR1XPxTE="; + vendorHash = "sha256-pSajd2wyefHgxMvhDKs+qwre4BMRBv97v/tZOjiT3LE="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 60154ce825a94..6aff8bd6a0010 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.2"; + version = "0.77.3"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-opDuyuh7rtdFVfxKHyLUAf4ySqiSg0bAUW0dV+PHXFA="; + hash = "sha256-P6p8vuiJ8+KX1V4crHi5J8SwigW6cpF2C30BnUBAgpM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk="; + vendorHash = "sha256-GS1TfLCQTWAdjHMfVM6vu8mnR2vclH9VpVMdNwNNU6M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index eab2ca256876b..ea2057a398314 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-04-29"; + version = "0-unstable-2024-05-05"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "9fe79591c1005ce6f93084ae7f7dab0a2891440d"; - hash = "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo="; + rev = "3dfe05aa9b5646995ace887931fa60269a039777"; + hash = "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/by-name/hu/humioctl/package.nix index d9f780c0b3a21..d9f780c0b3a21 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/by-name/hu/humioctl/package.nix diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix new file mode 100644 index 0000000000000..b5fb283084b89 --- /dev/null +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -0,0 +1,78 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +, which +, acpica-tools +}: + +python3.pkgs.buildPythonApplication rec { + pname = "igvm-tooling"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "igvm-tooling"; + rev = "igvm-${version}"; + hash = "sha256-13TtiJv2w9WXSW6oPMfo+rRah+Q1wHV14aBaFGfz9CE="; + }; + + patches = [ + # drop unused libclang dependency + # remove once https://github.com/microsoft/igvm-tooling/pull/53 is merged + (fetchpatch { + name = "0001-setup.py-remove-unused-libclang-dependency.patch"; + url = "https://github.com/microsoft/igvm-tooling/commit/7182e925de9b5e9f5c8c3a3ce6e3942a92506064.patch"; + sha256 = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; + stripLen = 1; + }) + # write updated acpi files to tempdir (instead of nix store path) at runtime + # remove once https://github.com/microsoft/igvm-tooling/pull/54 is merged + (fetchpatch { + name = "0002-acpi-update-dsl-files-in-tempdir.patch"; + url = "https://github.com/microsoft/igvm-tooling/commit/20f8d123ec6531d8540074b7df2ee12de60e73b8.patch"; + sha256 = "sha256-hNfkclxaYViy66TPHqLV3mqD7wqBuBN9MnMLaDOeRNM="; + stripLen = 1; + }) + ]; + + postPatch = '' + substituteInPlace igvm/acpi.py \ + --replace-fail 'os.path.join(os.path.dirname(__file__), "acpi", "acpi.zip")' "\"$out/share/igvm-tooling/acpi/acpi.zip\"" + ''; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ acpica-tools ]; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + ecdsa + cstruct + pyelftools + pytest + cached-property + frozendict + ] ++ [ + acpica-tools + which + ]; + + postInstall = '' + mkdir -p $out/share/igvm-tooling/acpi/acpi-clh + cp -rT igvm/acpi/acpi-clh $out/share/igvm-tooling/acpi/acpi-clh + cp igvm/acpi/acpi.zip $out/share/igvm-tooling/acpi/acpi.zip + find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; + ''; + + meta = { + description = "IGVM Image Generator"; + homepage = "https://github.com/microsoft/igvm-tooling"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.malt3 ]; + changelog = "https://github.com/microsoft/igvm-tooling/releases/tag/igvm-${version}"; + mainProgram = "igvmgen"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 9db23a478b5e2..006eb004611d2 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -29,16 +29,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-SowZ3qo06x32+A02Wmq4N/rU/yxyKqkn407qHzJLU0M="; + hash = "sha256-TPbvKQdoGfZMzp+fl72vy6MtRV1yGcOG/es67VOA0xw="; }; - cargoHash = "sha256-DaF669mOnICTnUzH4mc640xIecin/UEZSk7PWDjQbr0="; + cargoHash = "sha256-+9R505xyEycv5Dav4ZCh1BiYRp3U1I9yBDqSPefo9uY="; buildInputs = [ diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index c0abeb221ec89..d1a6986274832 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.03"; + version = "24.04"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-zCu0TkB8iQq1ZpNMVnY5GFBatYwUE0tT8NHanuokLI0="; + hash = "sha256-dqb/BgiHdz8ll3tYiuUISEuxLRHLeivjMi2qnG5T8bI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix new file mode 100644 index 0000000000000..778414a5db32e --- /dev/null +++ b/pkgs/by-name/lm/lms/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + cmake, + pkg-config, + gtest, + boost, + wt, + taglib, + libconfig, + libarchive, + graphicsmagick, + ffmpeg, + zlib, + libSM, + libICE, +}: + +stdenv.mkDerivation rec { + pname = "lms"; + version = "3.51.1"; + src = fetchFromGitHub { + owner = "epoupon"; + repo = "lms"; + rev = "v${version}"; + hash = "sha256-5lEbrB218EVVHIzo1efvQYybut2OpfDKpLlRs0brhXg="; + }; + + strictDeps = true; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + buildInputs = [ + gtest + boost + wt + taglib + libconfig + libarchive + graphicsmagick + ffmpeg + zlib + libSM + libICE + ]; + + postPatch = '' + substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + postInstall = '' + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot" + substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms" + install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service + ''; + + preFixup = '' + wrapProgram $out/bin/lms \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + wrapProgram $out/bin/lms-metadata \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + wrapProgram $out/bin/lms-recommendation \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + ''; + + meta = with lib; { + homepage = "https://github.com/epoupon/lms"; + description = "Lightweight Music Server - Access your self-hosted music using a web interface"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "lms"; + maintainers = with maintainers; [ mksafavi ]; + }; +} diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix new file mode 100644 index 0000000000000..5fa30e699db4a --- /dev/null +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +, undmg +, lib +, meta +, pname +, version +}: +stdenv.mkDerivation { + inherit meta pname version; + + src = fetchurl { + url = "https://releases.lmstudio.ai/mac/arm64/${version}/b/latest/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-kb1XoTZjhCL1+CsV+r3/EN0srzIJ43H2VMZ779dVq1k="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r *.app $out/Applications + runHook postInstall + ''; +} + diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix new file mode 100644 index 0000000000000..5c52228225c8b --- /dev/null +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -0,0 +1,29 @@ +{ lib +, appimageTools +, fetchurl +, version +, pname +, meta +}: +let + src = fetchurl { + url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-hcV8wDhulFAxHDBDKicpEGovwcsn9RaIi/idUz+YzD8="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit meta pname version src; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lm-studio.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' + ''; +} + diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index f9325e5b800d9..d18c76acefd7d 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -1,38 +1,22 @@ { lib -, appimageTools -, fetchurl +, stdenv +, callPackage +, ... }: - let pname = "lmstudio"; - version = "0.2.20"; - src = fetchurl { - url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-T92ZDqGvxJfBkAWsK8EgHdQZnLefK3gDP2vCTL8X+eM="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; - - extraInstallCommands = '' - mkdir -p $out/share/applications - cp -r ${appimageContents}/usr/share/icons $out/share - install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications - substituteInPlace $out/share/applications/lm-studio.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' - ''; - + version = "0.2.22"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; - maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ drupol eeedean ]; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +in + if stdenv.isDarwin + then callPackage ./darwin.nix { inherit pname version meta; } + else callPackage ./linux.nix { inherit pname version meta; } + diff --git a/pkgs/by-name/lo/local-ai/module.nix b/pkgs/by-name/lo/local-ai/module.nix index d7b70048121f3..70f486b43b1a7 100644 --- a/pkgs/by-name/lo/local-ai/module.nix +++ b/pkgs/by-name/lo/local-ai/module.nix @@ -28,25 +28,33 @@ in type = types.either types.package types.str; default = "models"; }; + + parallelRequests = mkOption { + type = types.int; + default = 1; + }; + + logLevel = mkOption { + type = types.enum [ "error" "warn" "info" "debug" "trace" ]; + default = "warn"; + }; }; config = lib.mkIf cfg.enable { systemd.services.local-ai = { wantedBy = [ "multi-user.target" ]; + environment.LLAMACPP_PARALLEL = toString cfg.parallelRequests; serviceConfig = { DynamicUser = true; ExecStart = lib.escapeShellArgs ([ "${cfg.package}/bin/local-ai" - "--debug" - "--address" - ":${toString cfg.port}" - "--threads" - (toString cfg.threads) - "--localai-config-dir" - "." - "--models-path" - (toString cfg.models) + "--address=:${toString cfg.port}" + "--threads=${toString cfg.threads}" + "--localai-config-dir=." + "--models-path=${cfg.models}" + "--log-level=${cfg.logLevel}" ] + ++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests" ++ cfg.extraArgs); RuntimeDirectory = "local-ai"; WorkingDirectory = "%t/local-ai"; diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 061122c3f848a..c40cb70cee02f 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -100,8 +100,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "784e11dea1f5ce9638851b2b0dddb107e2a609c8"; - hash = "sha256-yAQAUo5J+a6O2kTqhFL1UH0tANxpQn3JhAd3MByaC6I="; + rev = "6ecf3189e00a1e8e737a78b6d10e1d7006e050a2"; + hash = "sha256-JS287UdCzj6Es134cbhr8y/AoejMEux0w++/pZ5NejY="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -254,8 +254,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "858452d58dba3acdc3431c9bced2bb8cfd9bf418"; - hash = "sha256-2fT3RgGpBex1mF6GJsVDo4rb0F31YqxTymsXcrpQAZk="; + rev = "8fac6455ffeb0a0950a84e790ddb74f7290d33c4"; + hash = "sha256-Dez/Q2vMvSmscS+BJwkgZ4QG+ebM/N8s1Okd5my0CWI="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -305,8 +305,8 @@ let src = fetchFromGitHub { owner = "mudler"; repo = "go-stable-diffusion"; - rev = "362df9da29f882dbf09ade61972d16a1f53c3485"; - hash = "sha256-A5KvMZOviPsIpPHxM8cacT+qE2x1iFJAbPsRs4sLijY="; + rev = "4a3cd6aeae6f66ee57eae9a0075f8c58c3a6a38f"; + hash = "sha256-KXUvMP6cDyWib4rG0RmVRm3pgrdsfKXaH3k0v5/mTe8="; fetchSubmodules = true; }; buildFlags = [ "libstablediffusion.a" ]; @@ -342,8 +342,8 @@ let src = fetchFromGitHub { owner = "M0Rf30"; repo = "go-tiny-dream"; - rev = "22a12a4bc0ac5455856f28f3b771331a551a4293"; - hash = "sha256-DAVHD6E0OKHf4C2ldoI0Mm7813DIrmWFONUhSCQPCfc="; + rev = "c04fa463ace9d9a6464313aa5f9cd0f953b6c057"; + hash = "sha256-uow3vbAI4F/fTGjYOKOLqTpKq7NgGYSZhGlEhn7h6s0="; fetchSubmodules = true; }; postUnpack = '' @@ -373,12 +373,12 @@ let stdenv; pname = "local-ai"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-jZE8Ow9FFhnx/jvsURLYlYtSuKpE4UWBezxg/mpHs9g="; + hash = "sha256-wr7sTMjGofGiZZbRJ+RfgXx9TM9Adu2NBAXeB3P5Ep0="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 7cebc6fff9387..10895bce65712 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -6,6 +6,7 @@ , writers , symlinkJoin , jq +, prom2json }: let common-config = { config, ... }: { @@ -14,6 +15,7 @@ let enable = true; package = self; threads = config.virtualisation.cores; + logLevel = "debug"; }; }; @@ -36,6 +38,10 @@ in '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + + machine.copy_from_vm("metrics.json") ''; }); @@ -80,6 +86,10 @@ in machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json") machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + + machine.copy_from_vm("metrics.json") ''; }; @@ -92,6 +102,7 @@ in # https://localai.io/advanced/#full-config-model-file-reference model-configs.${model} = rec { context_size = 8192; + backend = "llama-cpp"; parameters = { # https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF # https://ai.meta.com/blog/meta-llama-3/ @@ -157,6 +168,8 @@ in virtualisation.cores = 4; virtualisation.memorySize = 8192; services.local-ai.models = models; + # TODO: Add test case parallel requests + services.local-ai.parallelRequests = 2; }; passthru = { inherit models requests; }; testScript = @@ -180,6 +193,10 @@ in machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json") machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + + machine.copy_from_vm("metrics.json") ''; }; @@ -243,6 +260,10 @@ in machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav") machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + + machine.copy_from_vm("metrics.json") ''; }; } diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 4fcaf4636d42a..581b37dcde307 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.03"; + version = "24.04"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM="; + hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 334b5909496c7..eb6a7d2c3b981 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-04-18"; + version = "0.9.5-unstable-2024-05-05"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "ba8d547dfa81539f4e8474152d92e866ad89241b"; - hash = "sha256-va4KegM2z0GSA43goUynRPNPvQnrV2b8oNOfLKPE+Zc="; + rev = "10798c3464ca0e199087960fda918ed99acc2e21"; + hash = "sha256-5GbJKhICrbVfnfZt6Ni4uNbodH3rJY5lKoQRgiPXWCg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index ffd74761a9fea..36ee25429b817 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D -m 0755 src/nixos-anywhere.sh $out/bin/nixos-anywhere + install -D -m 0755 src/get-facts.sh $out/bin/get-facts.sh # We prefer the system's openssh over our own, since it might come with features not present in ours: # https://github.com/numtide/nixos-anywhere/issues/62 diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index c2dd4cb8e5c61..c2dd4cb8e5c61 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix new file mode 100644 index 0000000000000..152714133fa7a --- /dev/null +++ b/pkgs/by-name/op/openturns/package.nix @@ -0,0 +1,99 @@ +{ + lib, + boost, + ceres-solver, + cmake, + cminpack, + darwin, + dlib, + fetchFromGitHub, + fetchpatch, + hdf5, + hmat-oss, + ipopt, + libxml2, + nlopt, + pagmo2, + primesieve, + python3Packages, + spectra, + stdenv, + swig, + tbb, + # Boolean flags + runTests ? false, # tests take an hour to build on a 48-core machine + enablePython ? false, +}: + +let + inherit (darwin.apple_sdk.frameworks) Accelerate; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openturns"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "openturns"; + repo = "openturns"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; + }; + + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals enablePython [ python3Packages.sphinx ]; + + buildInputs = [ + (lib.getLib primesieve) + boost + ceres-solver + cminpack + dlib + hdf5 + hmat-oss + ipopt + libxml2 + nlopt + pagmo2 + spectra + swig + tbb + ] + ++ lib.optionals enablePython [ + python3Packages.dill + python3Packages.matplotlib + python3Packages.psutil + python3Packages.python + ] + ++ lib.optionals stdenv.isDarwin [ + Accelerate + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON" enablePython) + (lib.cmakeBool "CMAKE_UNITY_BUILD" true) + (lib.cmakeBool "USE_SPHINX" enablePython) + (lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32") + (lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1") + (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc") + ]; + + checkTarget = lib.concatStringsSep " " [ + "tests" + "check" + ]; + + strictDeps = true; + + doCheck = runTests; + + meta = { + homepage = "https://openturns.github.io/www/"; + description = "Multivariate probabilistic modeling and uncertainty treatment library"; + changelog = "https://github.com/openturns/openturns/raw/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; + maintainers = with lib.maintainers; [ gdinh ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 855db7c079d60..8961c70f551cc 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,6 +23,6 @@ homepage = "https://github.com/paratestphp/paratest"; license = lib.licenses.mit; mainProgram = "paratest"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patka ]; }; }) diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 7431914a48eee..6b7231ec8f8e9 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://pestphp.com"; license = lib.licenses.mit; mainProgram = "pest"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patka ]; }; }) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 6e22a98ce2ec1..80dc6f2e6f895 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://github.com/phpactor/phpactor"; license = lib.licenses.mit; mainProgram = "phpactor"; - maintainers = lib.teams.php.members; + maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members; }; }) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index ef614ce0849c9..47a29be92f1de 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -1,27 +1,30 @@ { lib , fetchFromGitHub +, nix-update-script , php }: php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.1.1"; + version = "11.1.3"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-aS2mQeE8WnEaTexl8qhhfGyi1MP48s6fjrTXkVLq1LU="; + hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA="; }; vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q="; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; description = "PHP Unit Testing framework"; homepage = "https://phpunit.de"; license = lib.licenses.bsd3; mainProgram = "phpunit"; - maintainers = [ lib.maintainers.onny ] ++ lib.teams.php.members; + maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members; }; }) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index 470b62111b3f3..b5e2da37022d7 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.1"; + version = "12.3"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78="; + hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M="; }; outputs = [ "out" "dev" "lib" "man" ]; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 94753d08d47e5..c234921c9429b 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.34.4"; + version = "0.35.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-sh4EeK9LGY1t7BDWV31pOjp6CYhOIRR/wCb6LAv68ok="; + hash = "sha256-kUoiERpkAVxow6YWEIkmF2A9oRrdqMnZLsFJOLf5Ucc="; }; - cargoHash = "sha256-PU6r6Iwv00TLhAZSt9hERWvCgpC27Cuf3rrsjN1gO5k="; + cargoHash = "sha256-3Jh5vPi/dNIVrxkibWe70eiZ54/wf6USTV+VV+H9mtk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/protoc-gen-rust/default.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix index bba32dd81a4ed..bba32dd81a4ed 100644 --- a/pkgs/development/tools/protoc-gen-rust/default.nix +++ b/pkgs/by-name/pr/protoc-gen-rust/package.nix diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/by-name/re/refinery-cli/package.nix index 609a2618f86c7..609a2618f86c7 100644 --- a/pkgs/development/tools/refinery-cli/default.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 3e5b720bafe48..9dba1fb8eacd7 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-04-16"; + version = "0-unstable-2024-04-30"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "83e2d743202684eb1f89a1b93e859c69cd736455"; - hash = "sha256-iD+59mrFNVRu6g58XXLR2Pg8oDpNIiI/+TyCdbRbjtM="; + rev = "dc2212318aec6c2aa6920795e16fab7dfcb8796e"; + hash = "sha256-XY2rQqu2CSKRImx0GmC5ggTZTyvrtX+LvqkYj0sEBuU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sispmctl/package.nix b/pkgs/by-name/si/sispmctl/package.nix index d431e1a29ffe9..7a09e9471d13b 100644 --- a/pkgs/by-name/si/sispmctl/package.nix +++ b/pkgs/by-name/si/sispmctl/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "sispmctl"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz"; - hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg="; + hash = "sha256-51eGOkg42m4cpypXrcWspvxH/73ccqaQUtir10PVcII="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 4a7979e29d581..32fc52be0d9b7 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.0.1"; + version = "1.1.0"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. @@ -9,10 +9,10 @@ rustPlatform.buildRustPackage rec { owner = "LucasPickering"; repo = "slumber"; rev = "v${version}"; - hash = "sha256-FXw3hVVY/f49leo9t+z52+Ti9XGk6UJDtd0VpQDQb/o="; + hash = "sha256-398XqowI3zEgiU1XolLj3q1m4foC6aGGL+B3Q4plbTw="; }; - cargoHash = "sha256-odLFfq3qjCQUNDauFtlOaKrsYVspAIxAc/pRSEZyIwo="; + cargoHash = "sha256-AK/+1tCdvNucIbxwyqOt/TbOaJPVDOKFEx5NqW2Yd4U="; meta = with lib; { description = "Terminal-based HTTP/REST client"; diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 1036022bc68b8..794bd2f0ea9b1 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.16"; - vendorHash = "sha256-bhlD7EgOkWjRTsw1hH0GKjtFkLbOzr28wR4JJKOJwnY="; + version = "5.8.17"; + vendorHash = "sha256-ARTKJVHgN1Y3xOUc3P2Ch7e8gN9BZbhBEZ1DiM7nEWs="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-V67RLa/Tn9ZdV+vnhFSht0wtIYYZOAGAYP9R1Lxn9aI="; + hash = "sha256-IanaxFhD0nAabr9w6ARCVie+sYW9bvgHoahsuHQYeqE="; }; ldflags = [ diff --git a/pkgs/by-name/te/termsonic/package.nix b/pkgs/by-name/te/termsonic/package.nix new file mode 100644 index 0000000000000..2dfb146775008 --- /dev/null +++ b/pkgs/by-name/te/termsonic/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchzip, + pkg-config, + alsa-lib +}: +buildGoModule rec { + name = "termsonic"; + version = "0-unstable-2024-02-02"; + + src = fetchzip { + url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip"; + hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA="; + }; + + vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsa-lib ]; + + strictDeps = true; + + meta = with lib; { + homepage = "https://git.sixfoisneuf.fr/termsonic"; + description = "A Subsonic client running in your terminal"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "termsonic"; + maintainers = with maintainers; [ mksafavi ]; + }; +} diff --git a/pkgs/development/tools/twiggy/default.nix b/pkgs/by-name/tw/twiggy/package.nix index 25d8ab244d9ef..25d8ab244d9ef 100644 --- a/pkgs/development/tools/twiggy/default.nix +++ b/pkgs/by-name/tw/twiggy/package.nix diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/by-name/up/upbound/package.nix index 92031aa6dddf0..92031aa6dddf0 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/by-name/up/upbound/package.nix diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 5427471c8229f..38ff38d5e8969 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "updatecli"; - version = "0.76.0"; + version = "0.76.1"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-UfiwagyE3w+kcPJnDDNTCGrxghnag/RPz6SSdAglyYA="; + hash = "sha256-C+PWuFjTxmD+/qUsuJDueNrhFXKqu0PZnLPlQ3KJQlE="; }; vendorHash = "sha256-STiVtzA78zeo5wywwzvA0dqmBW3REUvcpOXuWjpxReY="; diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index c6a5256fdf57e..4a5522aab7733 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.22.0"; + version = "0.22.2"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-+L1MUD9IKPnbh/yjRuF3aOszeMvkILuqHHWj949SrMo="; + hash = "sha256-g/dlo2M7TJRYAbk3HtGQlMUZhORxt+OsDgP8W7rf+NE="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/by-name/wa/wapm/package.nix index bd345ca6940d1..658aa93ce758e 100644 --- a/pkgs/tools/package-management/wapm/cli/default.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -4,9 +4,8 @@ , libiconv , openssl , rustPlatform -, Security , stdenv -, SystemConfiguration +, darwin }: rustPlatform.buildRustPackage rec { @@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; buildInputs = [ libiconv openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); doCheck = false; diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 1b6039a38f4be..cf8eb3b9b350e 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -1,71 +1,71 @@ -{ lib -, stdenv -, bash -, fetchFromGitHub -, fetchFromGitLab -, SDL2 -, alsa-lib -, catch2_3 -, fftw -, glib -, gobject-introspection -, gtk-layer-shell -, gtkmm3 -, howard-hinnant-date -, hyprland -, iniparser -, jsoncpp -, libdbusmenu-gtk3 -, libevdev -, libinotify-kqueue -, libinput -, libjack2 -, libmpdclient -, libnl -, libpulseaudio -, libsigcxx -, libxkbcommon -, meson -, ncurses -, ninja -, pipewire -, pkg-config -, playerctl -, portaudio -, python3 -, scdoc -, sndio -, spdlog -, sway -, udev -, upower -, wayland -, wayland-scanner -, wireplumber -, wrapGAppsHook3 +{ + lib, + stdenv, + bash, + fetchFromGitHub, + SDL2, + alsa-lib, + catch2_3, + fftw, + glib, + gobject-introspection, + gtk-layer-shell, + gtkmm3, + howard-hinnant-date, + hyprland, + iniparser, + jsoncpp, + libdbusmenu-gtk3, + libevdev, + libinotify-kqueue, + libinput, + libjack2, + libmpdclient, + libnl, + libpulseaudio, + libsigcxx, + libxkbcommon, + meson, + ncurses, + ninja, + pipewire, + pkg-config, + playerctl, + portaudio, + python3, + scdoc, + sndio, + spdlog, + sway, + udev, + upower, + wayland, + wayland-scanner, + wireplumber, + wrapGAppsHook3, -, cavaSupport ? true -, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -, evdevSupport ? true -, experimentalPatches ? true -, hyprlandSupport ? true -, inputSupport ? true -, jackSupport ? true -, mpdSupport ? true -, mprisSupport ? stdenv.isLinux -, nlSupport ? true -, pipewireSupport ? true -, pulseSupport ? true -, rfkillSupport ? true -, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform -, sndioSupport ? true -, swaySupport ? true -, traySupport ? true -, udevSupport ? true -, upowerSupport ? true -, wireplumberSupport ? true -, withMediaPlayer ? mprisSupport && false -, nix-update-script + cavaSupport ? true, + enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + evdevSupport ? true, + experimentalPatches ? true, + hyprlandSupport ? true, + inputSupport ? true, + jackSupport ? true, + mpdSupport ? true, + mprisSupport ? stdenv.isLinux, + nlSupport ? true, + pipewireSupport ? true, + pulseSupport ? true, + rfkillSupport ? true, + runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + sndioSupport ? true, + swaySupport ? true, + traySupport ? true, + udevSupport ? true, + upowerSupport ? true, + wireplumberSupport ? true, + withMediaPlayer ? mprisSupport && false, + nix-update-script, }: let @@ -79,13 +79,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-xinTLjZJhL4048jpAbN3i6nSxKAqnbesbK/GBX+1CkE="; + hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM="; }; postUnpack = lib.optional cavaSupport '' @@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wayland-scanner wrapGAppsHook3 - ] ++ lib.optional withMediaPlayer gobject-introspection - ++ lib.optional enableManpages scdoc; + ] ++ lib.optional withMediaPlayer gobject-introspection ++ lib.optional enableManpages scdoc; propagatedBuildInputs = lib.optionals withMediaPlayer [ glib @@ -110,63 +109,66 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.pygobject3 ]; - buildInputs = [ - gtk-layer-shell - gtkmm3 - howard-hinnant-date - jsoncpp - libsigcxx - libxkbcommon - spdlog - wayland - ] - ++ lib.optionals cavaSupport [ - SDL2 - alsa-lib - fftw - iniparser - ncurses - portaudio - ] - ++ lib.optional evdevSupport libevdev - ++ lib.optional hyprlandSupport hyprland - ++ lib.optional inputSupport libinput - ++ lib.optional jackSupport libjack2 - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional mprisSupport playerctl - ++ lib.optional nlSupport libnl - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional sndioSupport sndio - ++ lib.optional swaySupport sway - ++ lib.optional traySupport libdbusmenu-gtk3 - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber - ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; + buildInputs = + [ + gtk-layer-shell + gtkmm3 + howard-hinnant-date + jsoncpp + libsigcxx + libxkbcommon + spdlog + wayland + ] + ++ lib.optionals cavaSupport [ + SDL2 + alsa-lib + fftw + iniparser + ncurses + portaudio + ] + ++ lib.optional evdevSupport libevdev + ++ lib.optional hyprlandSupport hyprland + ++ lib.optional inputSupport libinput + ++ lib.optional jackSupport libjack2 + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional mprisSupport playerctl + ++ lib.optional nlSupport libnl + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional sndioSupport sndio + ++ lib.optional swaySupport sway + ++ lib.optional traySupport libdbusmenu-gtk3 + ++ lib.optional udevSupport udev + ++ lib.optional upowerSupport upower + ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional (cavaSupport || pipewireSupport) pipewire + ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; - mesonFlags = (lib.mapAttrsToList lib.mesonEnable { - "cava" = cavaSupport; - "dbusmenu-gtk" = traySupport; - "jack" = jackSupport; - "libinput" = inputSupport; - "libnl" = nlSupport; - "libudev" = udevSupport; - "man-pages" = enableManpages; - "mpd" = mpdSupport; - "mpris" = mprisSupport; - "pipewire" = pipewireSupport; - "pulseaudio" = pulseSupport; - "rfkill" = rfkillSupport; - "sndio" = sndioSupport; - "systemd" = false; - "tests" = runTests; - "upower_glib" = upowerSupport; - "wireplumber" = wireplumberSupport; - }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + mesonFlags = + (lib.mapAttrsToList lib.mesonEnable { + "cava" = cavaSupport; + "dbusmenu-gtk" = traySupport; + "jack" = jackSupport; + "libinput" = inputSupport; + "libnl" = nlSupport; + "libudev" = udevSupport; + "man-pages" = enableManpages; + "mpd" = mpdSupport; + "mpris" = mprisSupport; + "pipewire" = pipewireSupport; + "pulseaudio" = pulseSupport; + "rfkill" = rfkillSupport; + "sndio" = sndioSupport; + "systemd" = false; + "tests" = runTests; + "upower_glib" = upowerSupport; + "wireplumber" = wireplumberSupport; + }) + ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); postPatch = '' substituteInPlace include/util/command.hpp \ diff --git a/pkgs/by-name/wi/windows10-icons/package.nix b/pkgs/by-name/wi/windows10-icons/package.nix new file mode 100644 index 0000000000000..8609aa7508afa --- /dev/null +++ b/pkgs/by-name/wi/windows10-icons/package.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "windows10-icons"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "B00merang-Artwork"; + repo = "Windows-10"; + rev = "${finalAttrs.version}"; + hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/windows10 + find . \ + ! -path ./README.md \ + -mindepth 1 -maxdepth 1 \ + -exec cp -r {} $out/share/icons/windows10 \; + + runHook postInstall + ''; + + dontConfigure = true; + dontBuild = true; + + meta = with lib; { + description = "Windows 10 icon theme"; + homepage = "http://b00merang.weebly.com/windows-10.html"; + license = licenses.unfree; + maintainers = with maintainers; [ mib ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/by-name/wi/wizer/package.nix index 7a46d673af9c9..7a46d673af9c9 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/by-name/wi/wizer/package.nix diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix index fbce56b3e4eb2..3b31f14f8c202 100644 --- a/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wl-clip-persist"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "Linus789"; repo = "wl-clip-persist"; rev = "v${version}"; - hash = "sha256-gUi4Htui7IwldeK30C7SGTNc+0VHuzDZfJdaL8FmkGs="; + hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk="; }; - cargoHash = "sha256-Kt/XTcwclZENtw4vw2BntndqxvojEizCc2Oa0w+c1D0="; + cargoHash = "sha256-rhXVjXhRPCjt7ur7fQviGFXVtQneuFKWZcDNkhM9tkY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index c159da6c6da5d..920ddb872032f 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZitwO/XfNrlTFNepQ5Wyk1A7cwlNm6+26nPHdZ8Wh3c="; + sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs="; }; - cargoHash = "sha256-mfSVjm0s/tLjjygwu8TuKn92mFM3Ui6TEHkIzS0eEOA="; + cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index f805c07a18a11..76760368605a1 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "29.2.1"; + version = "30.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index baab3d4016a4a..4d51d9acd5e9a 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0m1ky8l0jm8sj62848grmzgpdqjj1ji51q2id7fnjy19cpb79r9p"; - IosevkaAile = "1g2z2xn59rankrq724c16bds7lcjv05b3p9w2zk2yk30p3v8ik7r"; - IosevkaCurly = "1ngybzmhfsfjj7jh3mkb6mmb0p9pai5jkrd15ck19qdyvn0m7p54"; - IosevkaCurlySlab = "1jidf96kspv0yrl2wyal7m2sz25nalx05w0x60cplmnq3zdxkbqw"; - IosevkaEtoile = "0xwzic90sq6i2cglds8j8yj9b3cxx5xxdkqwngg1l3ra1nw40mqy"; - IosevkaSlab = "1l25d3n9z1fy6ch3km3bzdcxgs2h7nsmy322pvpw5d4w3dn27g8q"; - IosevkaSS01 = "1r5c291gbjgg7zzqm75dk77z67snpxp571xgdqvq57yb0dx38rij"; - IosevkaSS02 = "0y28c4h0064vi6svgaljv3drahh8f2z0bw4vr33008ha1xn854pf"; - IosevkaSS03 = "0bz66psg47ccvkbp8c1b8ki91xw68isf1jibh5vrgi51s9cg7031"; - IosevkaSS04 = "0czfc0fcf61l6ldcq55nva50xshkkq6930kzfp5ixx5f04ng74c4"; - IosevkaSS05 = "0fwd1bb840y5173z15qczribgi60c4i3m2g047dsi4aq98ykvzmp"; - IosevkaSS06 = "1p4isvyzinxx7029pp84hzq2hj341dksl65nnflrxhz756rgg7qy"; - IosevkaSS07 = "08qdwkn4vpmybb1ivaxnnf8rwpsblgchhnk9nv3dbrpkwkqpzc6s"; - IosevkaSS08 = "0a3ddksfp83dbfy2xnvwc02mkldpby6wbbf30y43in1lac22gx6c"; - IosevkaSS09 = "0nia0ycbv2cd27g6r5gnwp22c4xsszkca88d4b909fdasw14dah2"; - IosevkaSS10 = "00vfbvx1hwmqjj9qc1zd21r7l9lgimz4dnvgwf3qkvbzk018lks6"; - IosevkaSS11 = "1pxgrg0m2x0695frxzm4yrnaagay4v9am8gz514436z0jjdzamp0"; - IosevkaSS12 = "1iqr8wplzsilcvl4mpn82c8j90c8whacif8sfl4yyvvpmy3d1863"; - IosevkaSS13 = "06n5fzby3xwdz3rpjbm0viicak3l4qmjxbrv8d10z49c83z65blh"; - IosevkaSS14 = "0akqbm4isfq9ky88sgxaadc20v58hd42n2g0f69ykfnq5m2rh2sl"; - IosevkaSS15 = "0fn1k4q59zzy6g6c2z120ixnbq781zrkrqwdrysvb5ni00pvc7v7"; - IosevkaSS16 = "1z39xq3r133hrbp0g8sjah90bbzichnijwhpxmfxirkc09gdjbnd"; - IosevkaSS17 = "1gxp12z4z8cva4ns3y7x4hvqbd8wq7g9bzzdja06zimp87g2sb9b"; - IosevkaSS18 = "1dvh4jxmw04nnw8xr47azn13hff4mq6f2sc3d62s3a41m3vg8gnq"; - SGr-Iosevka = "0q46rj8viqjiri1i8wp6w65wyfiabh3yimyvpy7p36zksmiqic4v"; - SGr-IosevkaCurly = "117qybi30a1rylxb76pbf7wqh2nb3b4q1v5ssjgva8rgirghs3hr"; - SGr-IosevkaCurlySlab = "0xwqivyclxs6pnyzscd7qvnh2lav0q28lavf2zjvbf9yfylzrp7n"; - SGr-IosevkaFixed = "1sgma0cz2mfh0nqzyg19y0s7q2rjds1xfbwz56fpljw4jpgy9m2d"; - SGr-IosevkaFixedCurly = "1xg281c5m3fbj5hwzwjkhvjbsv3dbbl1c88shwhqqll12cnfl99d"; - SGr-IosevkaFixedCurlySlab = "197qmypfcmbrlr1778zmbl26j6wmmrg6jxpk58znh040lchkkahs"; - SGr-IosevkaFixedSlab = "14qxpl47m2frgxf023aqm57ysykw6cn6ni9pn0xxfp133vzf5743"; - SGr-IosevkaFixedSS01 = "0fyys6ycihybwrjfna7byjk90jf7cl1ljnz58jgr1mbj2pyrkazg"; - SGr-IosevkaFixedSS02 = "0c06i0jdjjp0knhirkarccrn80iphakj2dz7ppaibqh65i7zk5ff"; - SGr-IosevkaFixedSS03 = "16b0sd5v68zdsjh847rl0jq4w7i8k0pk6i7qssdif0iljqf8qr2z"; - SGr-IosevkaFixedSS04 = "03wm6gvyhv4rbimqncqy9d5rjxyh9v6wvz0y7gvia7zk6aajq3ni"; - SGr-IosevkaFixedSS05 = "0z3fy17n35w52hzdlv2m9pavw8q148l4k56bydd4q8pdw0g7j0h8"; - SGr-IosevkaFixedSS06 = "0zbzc4qsc5h2rp8vwjxzw5k0rxgsinn87jqg9h80dc7nj030wdir"; - SGr-IosevkaFixedSS07 = "1xzhd8kgq86k9af9ppscfxgy3sidh7kkxr20yrb5na6083q5klyk"; - SGr-IosevkaFixedSS08 = "1f6lkigf0hrcjr5yc134f250vqvd69vq7zvh0csy2ihhlrm0fbj9"; - SGr-IosevkaFixedSS09 = "0z1mspmzhkzjm7fqxmwv6n622chbk4z1fhnqqdhq9i84lh5k7blr"; - SGr-IosevkaFixedSS10 = "1kyla4msffymn46wkmjgk38lvbx0b8d7hh211wbnrl7a37rj7yxa"; - SGr-IosevkaFixedSS11 = "09fv846hvq6dwqg0ssa8bsjdf9fsfqsj5v9pz9bmqgqrba728bpn"; - SGr-IosevkaFixedSS12 = "1pii9k7wpgxjick29aan0gaidwcsws48rvr15afqm1yimy9c6563"; - SGr-IosevkaFixedSS13 = "1s5b9w61lszv7aqyj15zp3dszmmlmbg1cwxnr0d5f826qchjj3qc"; - SGr-IosevkaFixedSS14 = "09fnlbsvjlczh4xawi33rh0w7nyq7zc732jpk38f0ibb3n72d8xs"; - SGr-IosevkaFixedSS15 = "1qwg3178vmjxhls975kigkcw7sz0dfpqqfxgjiz50cc9b6lp7vqk"; - SGr-IosevkaFixedSS16 = "0pfkr6bk5s5x9xnr0c1nd9p6wvmrk8rr84naq9hyqska683nlv3w"; - SGr-IosevkaFixedSS17 = "0b82dflnjzhs7z5sc9di9mq0xngdp8272j24adk3307067l8v5xg"; - SGr-IosevkaFixedSS18 = "1apr62rscj2v2q1yrvvk33ky2qsfx3lww316wjhyh7h6rhj85blb"; - SGr-IosevkaSlab = "1jxzb8dr1sb79gk2wh3hc3zpjpa73a1qn74kcmy0fcx3wff5d7al"; - SGr-IosevkaSS01 = "1ad6s7x9sr4gwr65pa63fv78vrdmmd46gfd363n924fvq9bv2b8c"; - SGr-IosevkaSS02 = "0jj7wch9q1rdy9zdqb8amm2wc8ksw6bacwjc4ilnghnfx96a5d8l"; - SGr-IosevkaSS03 = "1r4x4i2rsmj8v4h00m5mc47y17cm0ld0qc65an2jlsgrqlinj1gj"; - SGr-IosevkaSS04 = "1vqcg9szm97f99mfzi8rz9sl9z173r3i89s4lpwig8fdx9h6pl0d"; - SGr-IosevkaSS05 = "0q31l7lnya2jiwkmvprid45klmx4qp604xhffjimkvmlciihs1b4"; - SGr-IosevkaSS06 = "03j85lk9swa02n0jyrfpwwrdld263gxq9qngd3pzdl0p752n5rwc"; - SGr-IosevkaSS07 = "17r91ykc35bd5j53zj1mmhq0w2ndwx8sk7l3vagq2i8hpw6gjp35"; - SGr-IosevkaSS08 = "1myq7mxpffc589rmmixsfnh8ixnklzk69yqwbl3n1a7y33wbdqg8"; - SGr-IosevkaSS09 = "1g5rrsqqkiq94yjvm82mfa4hxqlnzg0ggn50phn87qxh2qkd9b17"; - SGr-IosevkaSS10 = "1rxi057zjjg7nrrwh5jgzxbfsdrr9g1h6kldm9m3ddx1mbc4iyqc"; - SGr-IosevkaSS11 = "0mjpsz8mjw38j1nd2aj0kslzjk1gyyy82zkdbnviip69pq138aj7"; - SGr-IosevkaSS12 = "0haqrynqmkvswdc4k2br6v13dxjwb7qq4vyf9jwr50j2jsxg25zv"; - SGr-IosevkaSS13 = "0jpv0iniwz0vm726d3bi8zxhn9363r82ygjp3hhg1f8zfcx69fli"; - SGr-IosevkaSS14 = "17rvpb5dw3rksgwd000aykch8zy1lyfi5i7bk4xqy68rfy9hgwh4"; - SGr-IosevkaSS15 = "0z4hm3wklndvqp36h22m11qd14rrikbbh6bq837bz8akr2zqbshs"; - SGr-IosevkaSS16 = "0y20k8apax7rkbrj8mygqp11zgz3jqqyj7kzm646i0wpskdigrnv"; - SGr-IosevkaSS17 = "0ikkiqq56hf8gmx3xavli9q2hdkv10rj0vlw37as6463y4bpsc8g"; - SGr-IosevkaSS18 = "0ywvk8nj342sa7dgj0nwjyvglrd5qgq57dj0f6vw574g2k7q2r01"; - SGr-IosevkaTerm = "1x13lbq2viibqmvk0a2xh4r2h7dmiz6s62sliaj1hwv15p0iarwq"; - SGr-IosevkaTermCurly = "0z56lbsbck3g5z7f2bdyzhxy1bygx9jybd1f3v73zz7lp75a07pi"; - SGr-IosevkaTermCurlySlab = "0ddkq5xl6aqk7i093wdibi68xzbd2x4k64x462rml593n6mj3kqv"; - SGr-IosevkaTermSlab = "1gcq5x23736qq00hg0acb9638qh06px4pq0kw3i1hybqw568dcyc"; - SGr-IosevkaTermSS01 = "1d2bd218cbr0ivjmw4kbg8bhwhna45pl43h3zhmqpaq6ghhr18gs"; - SGr-IosevkaTermSS02 = "0xhhzdy2hr3sagqj1ys30rhckj0pl2mpmk016j5ccz9afvmb4id2"; - SGr-IosevkaTermSS03 = "1kjaq20pjknlv4yqak8r9ixmiibxp9dx770aq24riclqvfk96j6r"; - SGr-IosevkaTermSS04 = "1cwxm9qy4n2lcbrk7h9h6gawmzhkwbcfix5d9l85n06jn4vp4zl3"; - SGr-IosevkaTermSS05 = "0f14gwjxbqilvfwiladymwyqa36j5scwg4ydsapgw651p5qw2nq2"; - SGr-IosevkaTermSS06 = "1jpfydg8jwwb0imzlfijk6fbkl1r8bvpb5z31s559a0zl6d8vg7k"; - SGr-IosevkaTermSS07 = "12bjapbcrijzfdcyh55yjdhyp7da1b2mrwd0j4qq3a9zkapy8scl"; - SGr-IosevkaTermSS08 = "04a8zbj8rcrx5pr9ihyf1y3ghywyaan1l7wixvzw2jcbfb48iyrz"; - SGr-IosevkaTermSS09 = "07z6fi18yvk7ggz6yl3dvsy25irnxrs4dimq9jpqisphi7vh6hmb"; - SGr-IosevkaTermSS10 = "16xyfsxqymgh7n0fhkpfvx3b02xl3ni3xwi0pdllg597b4vyai6l"; - SGr-IosevkaTermSS11 = "1qkv8jbb9c8bnyd5513yxg9xznm3gqmbf9vw8n0g0hhvg0x54j0x"; - SGr-IosevkaTermSS12 = "00xvvvh4wlmlyd2mdn724x9lx0h2nlb8rg50k745lbmp5kp2wp1n"; - SGr-IosevkaTermSS13 = "115pwj15s18br1qsyziajpjzcv1xbvqk3lcvc8x4rzmwzf9jfb3x"; - SGr-IosevkaTermSS14 = "1bs17lk1bjwidnwn794f2rmqgb96p7cd2ljnq05aqar27sp9612k"; - SGr-IosevkaTermSS15 = "0wsvrnp3wdmzh2s0xq9243j79dvdz6017r3zdvbjpqj4dd4rxgbb"; - SGr-IosevkaTermSS16 = "0ih1p4jmmja776s7y79xmc4awd1amr4w5856d7fac13wprqzyvx5"; - SGr-IosevkaTermSS17 = "01z9q22n7riabwyqj0j2cnsqif8j8fdpsydhnm3fzyfqz0bcfq21"; - SGr-IosevkaTermSS18 = "0fmzjycz572qgmk6jsd9v6zxlkh6mpqhnhcbjzjy4m7p5pdks6xj"; + Iosevka = "08phw6jy5zml9gs5wvizqil9m24xx3bfiq026dqxfa7b45qwhvy9"; + IosevkaAile = "0mhfq4rn6jfxyvci5dky5a72gdsw40rvgzqrzwdhdb95ydbpv0yg"; + IosevkaCurly = "0bnwg2y1nxldx8pc4qfbdxb7z6cdqlx37fhz1a4xf7qydy8bcrwl"; + IosevkaCurlySlab = "1ik3r5nbdg9x7lm508zwlvyqvnr50r0w8wmkw8qp5x57xf9bwpgn"; + IosevkaEtoile = "13gqlsycnkf4n2zsb621dzc4s8hgb04r6r9jaz6585bnr5pjm1gs"; + IosevkaSlab = "0ww4p5qlp4anb6g80dydm730357rpr4w90z845r3z12i5x6pv4xn"; + IosevkaSS01 = "0b3yrlcxm7wxzd6zy8p2zm6a3qgj3y5sa065g3qjkybmdzl8r9j4"; + IosevkaSS02 = "0jv9b2jff2v8hqmbnx734x7ncnn83z1azcfmv819saw06wsqig05"; + IosevkaSS03 = "06sy9ml1igw0p167gjb3vwm3b33jd8yh42wjlwsx0vz88220hp78"; + IosevkaSS04 = "0r3rbdcyn3ffqxl3mk0y1r9h77nr8b31fi065p0yfdciqlhas4zn"; + IosevkaSS05 = "042n54596lqir70j19kz8vqpvr6r7kqcsg9b0q679qrsny03brrw"; + IosevkaSS06 = "0wf0b842sh7z7f3x1y6bxz9a7qp207jm4vgdzjba5fq56dzzqv1s"; + IosevkaSS07 = "1qzyvp9g0j3lj05rafll1yaki818a421kl4h2vsgfqks9h4knp3b"; + IosevkaSS08 = "1ypj0vsq94qx1fhsqkpwxwhp0bv1ks1cgg40n4kyk8icjx41c2bv"; + IosevkaSS09 = "1dw6jcmnlxpq9c7429c01nw0v3lb4p3x25vzn63xznwgnxlp3zd0"; + IosevkaSS10 = "1sjzs7hn5r3n85w9rb35v93jdaq86mga2xwfmsalhmw1k5dbdp65"; + IosevkaSS11 = "00a2wkxpqfsy9m2kxp4w91iwyxdacmh2r9gmr10ycp11v0d7q9dy"; + IosevkaSS12 = "0nvx4r7w9kdlgd2js6q6fn1dfcwmfjqln6j5l7cm9kpjxalq4xz7"; + IosevkaSS13 = "1is6qgwjds28ljsc65bnqrm40233qw4w5n6wqkmc689pqh96c5zf"; + IosevkaSS14 = "1p037map2fpn0wrx3jlv6hw84p8jpvv2gm7w9sr1rwfb0sgqj422"; + IosevkaSS15 = "1dd2i5b25a1hzmnq5pan98f4fs8nd98q50jawx3m87xczl0y25ym"; + IosevkaSS16 = "0jvf1p8k8pdakcm0ygmn8c4s1fkay0yjrnnjpz764wh9kmvif2ah"; + IosevkaSS17 = "11529msxvjqgv2m0lh0ydiapwszjhy2bb1kqqvm2k0if42jaw0aq"; + IosevkaSS18 = "1rqg15imhcwfivi0q8gxvk69xszfl3vqbik2a24kkl64ngs8j6ld"; + SGr-Iosevka = "07izlilvkf688jv06myq4iayghsggk8mlqhd52cyyj14y3705hiq"; + SGr-IosevkaCurly = "010w2qczbdjh1p6my2nvq498zwlzk6as70db1m7mphqyzf0pypdq"; + SGr-IosevkaCurlySlab = "0lhav6950vxm0x66xkdqf50gzvh4sznzfd20k2ly58pr1wjnzmgg"; + SGr-IosevkaFixed = "0c6wviqhgxvcaz8lb0f3hwnwqqcjdqxywr2vj91ac7sy5fwn29k0"; + SGr-IosevkaFixedCurly = "0a0hs7lxbgfimn0vcl9yhpsdqm9zdffly9glpbrffr6j5lfzr3hk"; + SGr-IosevkaFixedCurlySlab = "0cpsiv06gpp69c9iv3v095fk181kf1vxv9rzhjs18n7f4l1mvl0f"; + SGr-IosevkaFixedSlab = "18g7bwmiqf6hl8y3c4s9hkr4a99484c470w2j5bimvby1sajj1lh"; + SGr-IosevkaFixedSS01 = "0byi5zp92s3ib18n4jjq1rqh8si58qr853977p8s8xgpwmw0dpv1"; + SGr-IosevkaFixedSS02 = "1vi4zw117id31bmj1v6srfkbmx0a12v7zvbvqww5gq2al51c2wld"; + SGr-IosevkaFixedSS03 = "0p8gaf53qlhrgpk4ycrz0499mzcqndrndhcjim41qmn37pxragdc"; + SGr-IosevkaFixedSS04 = "0y00i5s0csw9ca7r1hajqjdn7ip0ryhrai16h9f901ckxrl8icp0"; + SGr-IosevkaFixedSS05 = "0ncyjv3bap46db2l75w3q3g6gs1z6g4gd2459qs1mh66m4avw9yy"; + SGr-IosevkaFixedSS06 = "0hpkxvybzjwjzk4ran18zhli6cp44dd9dmjsi3qr7cp057sv2nxc"; + SGr-IosevkaFixedSS07 = "17rycr4bbpskzkb134ywa409ylx0hgqy76idxpnp0nzgacrdqw63"; + SGr-IosevkaFixedSS08 = "0na7j1nwwpzigaxbndw4hsgbvr020ljjnpcmp2cw0q6gaw86gzn4"; + SGr-IosevkaFixedSS09 = "06smgacjm7csnjv6105c47mwg7i3gfg4b18hghxy6vwcf7323skk"; + SGr-IosevkaFixedSS10 = "0b053yfmx0jp10cizcdcv9hq1xdbjkzpfasw9dchywj0j4l77i3f"; + SGr-IosevkaFixedSS11 = "16ycvndlmcpasdc9c2mncm6vj221iy2y40ni6kbdz6rlhi88i1cj"; + SGr-IosevkaFixedSS12 = "03sq2i6fhlmljqfk8ji6bkq7kg0iibd7yxxdmsgfrwi9bspfynmv"; + SGr-IosevkaFixedSS13 = "0s6f35px4frf3fkzmq8nrv16h9n55nmm2jwn9h9pfds01wl6y3h3"; + SGr-IosevkaFixedSS14 = "14a92rzj1w50xczpn8gjf2vsd5ms38yg82a9hl32g522b7bmg3si"; + SGr-IosevkaFixedSS15 = "11g9y220djq6nxpzqqjmj9frcxgdxsagkf4rjpi1ldwy6v3jbvqj"; + SGr-IosevkaFixedSS16 = "1ncjmg7fwsgilivpjgfjgsh4giihqzbmf60slwcjkgxhiwq6sk6w"; + SGr-IosevkaFixedSS17 = "0fzxjrdlqxl4y617lwjc8sbvh1azz6wkyfvg3894j82r1s4myn4y"; + SGr-IosevkaFixedSS18 = "111krj392zmx6m0ikmwjcg32j5wx5a4cbjj36l3ksc7cjhpv0vn6"; + SGr-IosevkaSlab = "1z6swxvq3yhslq9sjxgvay5g3bzgip2lf9pqjkbs3pm03qv77ah0"; + SGr-IosevkaSS01 = "1gp768wzc8nxz8b7b65mdiprxwabsr4h7xcz145lw8bkxdcv8c0s"; + SGr-IosevkaSS02 = "0vdvi5fk49lwyyrkyc1qc77ia0jckp64zdqksrqh8y20iyx8z3jd"; + SGr-IosevkaSS03 = "0f2m5283cr76zwzcym4mib9dyhwzyj9ca6zp0marh30fnfyl1pi4"; + SGr-IosevkaSS04 = "1z3wc4v73dc9shzsbjnb732ihkd85m5kfmy3dns6qyqbyn5grsz4"; + SGr-IosevkaSS05 = "1glwqkjg8q6rjigi30r44zlhsg8q1209h4yj0mg0pvlqai802v0l"; + SGr-IosevkaSS06 = "1ysyl05s98g97bwqq1gra8irxxryzm32gwqp5gv6w54407s4gjyr"; + SGr-IosevkaSS07 = "00lxp584ys3ngjqk578szxrgi3pga18r64gl1i72y30c1wmvp29d"; + SGr-IosevkaSS08 = "0pck7kn82g56r245zblbbnn5k7ax5x175hlbb0ib4zd59w59bw07"; + SGr-IosevkaSS09 = "0rhb2hmp7sygwhysazwldxygzmyymrazcprf42impiw87s6z46bx"; + SGr-IosevkaSS10 = "0swy1k8arjxllcx965ln8fjpwyd6h5y5w9i4kdx9x1kac4graki6"; + SGr-IosevkaSS11 = "07c0qmrca6z0vwmfli9ipzjiv84192wq8b15lbn04fn2m1xvbdlr"; + SGr-IosevkaSS12 = "072scbxs85fwv04b77zy0sk3bmy6ql358k4z38vgfhbck1920rdp"; + SGr-IosevkaSS13 = "0cbcjgl209msq1rf5kh9gi9cx49h8wlnrkvwqcabpwg3vfh2y508"; + SGr-IosevkaSS14 = "1sj0hs6wmsngkrkjfp9ki9zpnssqd2xia4n71pwjmc63zydmbpgm"; + SGr-IosevkaSS15 = "1c79zyddjjgmly3ssz75bgn6lg7jmlc1jspq59hxcwcvv2maf4h8"; + SGr-IosevkaSS16 = "1mf7zacqsf0jfr5sn36g6cpmkwkk41lfprcxrvy3xvbmd68kj0ap"; + SGr-IosevkaSS17 = "0fvwj7v338sqh02v8pb7gzz3lw83z7ahqal15ygzjl5xk7f1z51j"; + SGr-IosevkaSS18 = "180ixkl7777v43a9h4iybp8x1iw6jcdiq9p6027ayjxd81hvbd67"; + SGr-IosevkaTerm = "142pq2h18x9mr9myvyx7mdmyw7c658c1pn1z0z6w9k3jy0cmf8cm"; + SGr-IosevkaTermCurly = "1cd0wr51d7470ifzfbk1va2q1daylkd462zag9ilxb0iqha35wfp"; + SGr-IosevkaTermCurlySlab = "0jd3jj5hbq1axn2wa0x19kf059wmac953zd6f02h878lpvcj88hi"; + SGr-IosevkaTermSlab = "07aff9wdh014fnqgl88pwfbd0a7b9qakqy4c6kscplhr4sp7q122"; + SGr-IosevkaTermSS01 = "01i707n4z798y2i7flj9x1rzsdp0fqfxw7cqxyjlczr4s1ydf6a3"; + SGr-IosevkaTermSS02 = "01nq3gxajgfx55gyn302sl44ami26kw0n4fjw8va9xcz812bg472"; + SGr-IosevkaTermSS03 = "1a6v0vvf2z38bxddsaaixyswdx6fyrvmzyhz0v1p82xlzvbpmr83"; + SGr-IosevkaTermSS04 = "1kblkagawachgb70ab4jymbnw28dznh56p8k7cmbi3ixkykfbmn5"; + SGr-IosevkaTermSS05 = "0g3mnxbly3ckwi37cvwywcj4jzp1x1nm759vykk2pkqjimdjgksr"; + SGr-IosevkaTermSS06 = "1jgxp066zns4bh4amlsn4spa5z87x3zfbbwmqx998x98yblqzf16"; + SGr-IosevkaTermSS07 = "1h85lhslc0k6l06zxxc2cgcj8fnpaq31rxkdpx18gxkniy6bqmip"; + SGr-IosevkaTermSS08 = "07q9mjjpnbkfardplx9hps4xf2b08kwrv6m4ws6zqyylvn4mvhlj"; + SGr-IosevkaTermSS09 = "0i8bcqxgw0glgin22nrl80ivvcagw2810b1c23ngjfkv2sfblmnk"; + SGr-IosevkaTermSS10 = "1h031pr83dfc2xjkzfw85k4w3001a5v0gqilwbxz05gnv582k5yf"; + SGr-IosevkaTermSS11 = "04pg8ilnbyzci8jggrzx8kw5k2zj43whl30rllnb0krvfqn82g1m"; + SGr-IosevkaTermSS12 = "18vzqv8l1iyyiq9pfzlw9b02jn73qqqy1b1dhly1qliwdgnzcliy"; + SGr-IosevkaTermSS13 = "0ya3bg29nc4ja7qflfqds00yqqpb9r7dq40hkmdi7qgjj1l681wi"; + SGr-IosevkaTermSS14 = "143mfn7dh7a9vngagq1q3zz5b57rcjznwa62jjivy30rhvnnpxx8"; + SGr-IosevkaTermSS15 = "0xqw8nsjd0wsj0mk5x2b934738fj617451hkb3cymcrhrvbrd4fq"; + SGr-IosevkaTermSS16 = "0lwq7ijc0r64wx3816d97avzrayp77avkv53cqm2ad5bdkink0z5"; + SGr-IosevkaTermSS17 = "09g2r6531g1pw3dpd4s78i8x3d4l78dd25c91hy0xry06dvb0da6"; + SGr-IosevkaTermSS18 = "1lwlc9mj7q7irjx74q3q22gzm52kjk487rsrxih9ijvpw3fdnlvy"; } diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index dc9ebf5ef25fb..50172de67f4ba 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.054"; + version = "0.055"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-DtvaFu3r2r5WmlFCbkbzqAk/Y2BNEnxR6hPDfKM+/aQ="; + hash = "sha256-bE7XjVzleSo5hjc7Azcl8R4OgJzsj1U21UOuXrBkulA="; }; installPhase = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 5ee3e5e273834..957af3062422d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -184,6 +184,10 @@ stdenv.mkDerivation rec { # g-o-a-gtk already provides its own desktop item. rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop + + # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. + # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 + rm -r $out/share/cinnamon/styles.d ''; preFixup = '' diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 7641272b0ec86..ef2c6ec4fa2c4 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240122135036/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms="; + hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index b68ffc045f646..4310ad931792e 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -3,38 +3,51 @@ , fetchFromGitHub , cmake , python3 +, curl +, libxml2 +, libffi +, xar }: llvmPackages.stdenv.mkDerivation rec { pname = "c3c"; - version = "unstable-2021-07-30"; + version = "0.5.5"; src = fetchFromGitHub { owner = "c3lang"; repo = pname; - rev = "2246b641b16e581aec9059c8358858e10a548d94"; - sha256 = "VdMKdQsedDQCnsmTxO4HnBj5GH/EThspnotvrAscSqE="; + rev = "refs/tags/${version}"; + hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; }; - nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" + ''; + + nativeBuildInputs = [ + cmake + ]; buildInputs = [ llvmPackages.llvm llvmPackages.lld + curl + libxml2 + libffi + ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ + xar ]; nativeCheckInputs = [ python3 ]; - doCheck = true; + doCheck = llvmPackages.stdenv.system == "x86_64-linux"; checkPhase = '' + runHook preCheck ( cd ../resources/testproject; ../../build/c3c build ) ( cd ../test; python src/tester.py ../build/c3c test_suite ) - ''; - - installPhase = '' - install -Dm755 c3c $out/bin/c3c - cp -r lib $out + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index f6802e62c70d1..11ece53971662 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -26,6 +26,7 @@ assert if type == "sdk" then packages != null else true; , mkNugetDeps , callPackage , dotnetCorePackages +, xmlstarlet }: let @@ -47,6 +48,9 @@ let targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + sigtool = callPackage ./sigtool.nix {}; + signAppHost = callPackage ./sign-apphost.nix {}; + in mkCommon type rec { inherit pname version; @@ -54,7 +58,11 @@ mkCommon type rec { # Some of these dependencies are `dlopen()`ed. nativeBuildInputs = [ makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + ] ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -71,6 +79,16 @@ mkCommon type rec { sourceRoot = "."; + postPatch = if type == "sdk" && stdenv.isDarwin then '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${signAppHost}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' else null; + dontPatchELF = true; noDumpEnvVars = true; @@ -108,6 +126,14 @@ mkCommon type rec { $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host ''; + # fixes: Could not load ICU data. UErrorCode: 2 + propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow file-read* (subpath "/usr/share/icu")) + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; + passthru = { inherit icu; } // lib.optionalAttrs (type == "sdk") { diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 49f3e3be4d779..e26fd0e337708 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -50,9 +50,18 @@ runtime ? finalAttrs.finalPackage, runInputs ? [], run ? null, + runAllowNetworking ? false, }: let - built = runCommand "dotnet-test-${name}" { buildInputs = [ finalAttrs.finalPackage ]; } ('' + sdk = finalAttrs.finalPackage; + built = runCommand "dotnet-test-${name}" { + buildInputs = [ sdk ]; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile + '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + } ('' HOME=$PWD/.home dotnet new nugetconfig dotnet nuget disable source nuget @@ -65,11 +74,19 @@ if run == null then built else - runCommand "${built.name}-run" { src = built; nativeBuildInputs = runInputs; } ( - lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); + runCommand "${built.name}-run" ({ + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + }) (lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + run); # Setting LANG to something other than 'C' forces the runtime to search # for ICU, which will be required in most user environments. @@ -127,6 +144,7 @@ expect <<"EOF" set status 1 spawn $env(src)/test + proc abort { } { exit 2 } expect_before default abort expect -re {Now listening on: ([^\r]+)\r} { set url $expect_out(1,string) @@ -138,11 +156,14 @@ exit 1 } send \x03 + expect_before timeout abort + expect eof catch wait result exit [lindex $result 3] EOF touch $out ''; + runAllowNetworking = true; }; } // args.passthru.tests or {}; } // args.passthru or {}; diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index e0caad3f9a674..5806a5ee6de82 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -25,8 +25,6 @@ let patchNupkgs = pkgsBuildHost.callPackage ./patch-nupkgs.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; - deps = mkNugetDeps { name = "dotnet-vmr-deps"; sourceFile = depsFile; @@ -51,12 +49,6 @@ let -s //Project -t elem -n Import \ -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ src/*/Directory.Build.targets - '' + lib.optionalString stdenv.isDarwin '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${signAppHost}" \ - src/runtime/Directory.Build.targets ''; postConfigure = old.postConfigure or "" + '' diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index d65a486476a0a..b9a295617b8c2 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,8 +5,9 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.19"; out = "0.3.3"; } + { case = range "8.10" "8.19"; out = "0.3.4"; } ] null; + release."0.3.4".sha256 = "sha256-AhEcugUiVIsgbq884Lur/bQIuGw8prk+3AlNkP1omcw="; release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io="; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 58ee0642fb380..0444a2000a46e 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -5,6 +5,7 @@ , libX11 , readline , darwin +, fetchpatch }: let @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; + patches = [ + (fetchpatch { + # Required for building on Darwin with clang >=15. + name = "pr-172-fix.patch"; + url = "https://github.com/shumatech/BOSSA/commit/6e54973c3c758674c3d04b5e2cf12e097006f6a3.patch"; + hash = "sha256-2lp6Ej3IfofztC1n/yHLjabn0MH4BA/CM3dsnAw8klA="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "-arch x86_64" "" diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index b440e56812ad2..8fd965874faed 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.3.1456"; + version = "1.11.3.1463"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-ymOkUUDSj5KzFMBY1D7gErjPAK5E/QjFDGcwDo5fzW0="; + hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 5f31e8ef29eea..8758c88b9c01e 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.6.0"; + version = "9.4.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-LaFN5BUrcf2/o1ukaHpG7xLNRldAM3tUnMH+bHwTmBM="; + hash = "sha256-8cOfgldQUwClKP+D/kch++YahVq7JePSfVLUOsl6TYA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 403c4f729b059..cf0a0bf70fc1c 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -31,9 +31,12 @@ stdenv.mkDerivation rec { "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; - # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 env = lib.optionalAttrs stdenv.isx86_32 { + # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; + } // lib.optionalAttrs (stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isAarch32) { + # Build failure caused by -Werror: https://github.com/catchorg/Catch2/issues/2808 + NIX_CFLAGS_COMPILE = "-Wno-error=cast-align"; }; doCheck = true; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 1e884b3d8a81d..0a1fd07e25081 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeShellScript , cmake , ogre , freetype @@ -13,7 +14,7 @@ stdenv.mkDerivation { pname = "cegui"; - version = "unstable-2023-03-18"; + version = "0-unstable-2023-03-18"; src = fetchFromGitHub { owner = "paroj"; @@ -47,6 +48,12 @@ stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { branch = "v0"; + # The above branch is separate from the branch with the latest tags, so the updater doesn't pick them up + # This is what would be used to handle upstream's format, if it was able to see the tags + # tagConverter = writeShellScript "cegui-tag-converter.sh" '' + # sed -e 's/^v//g' -e 's/-/./g' + # ''; + hardcodeZeroVersion = true; }; meta = with lib; { diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index e8d85ec23dd5c..2b98aca1d66d6 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "crossguid"; - version = "unstable-2019-05-29"; + version = "0.2.2-unstable-2019-05-29"; src = fetchFromGitHub { owner = "graeme-hill"; @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index fdfb203ba12b4..c0934e7d18f9b 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2023-10-10"; + version = "0-unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 3819c2043a1da..b3edf0ba48537 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2024-03-01"; + version = "3.37.1-unstable-2024-03-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/development/libraries/hax11/default.nix index 42851f0cf3004..fba0a560e9931 100644 --- a/pkgs/development/libraries/hax11/default.nix +++ b/pkgs/development/libraries/hax11/default.nix @@ -9,7 +9,7 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "unstable-2023-09-25"; + version = "0-unstable-2023-09-25"; src = fetchFromGitHub { owner = "CyberShadow"; diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index a41736004ecb3..a5dbf01492a54 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -3,20 +3,19 @@ , boost , cmake , fetchFromGitHub -, fetchpatch , eigen , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.3"; + version = "7.0.4"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM="; + hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I="; }; nativeBuildInputs = [ @@ -34,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + # cmake requires the existence of this directory when building dssp + postInstall = '' + mkdir -p $out/share/libcifpp + ''; + meta = with lib; { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index cd9e7778a80be..6cdcbe63f78c2 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2024-04-15"; + version = "4.0.10-unstable-2024-04-15"; src = fetchFromGitHub { owner = "libcxxrt"; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 34e34a7eeebf6..4e8f39c372dcb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - hash = "sha256-VhaGgtSU6+7eMY7ksQMpybmt2JBI80Nwgu7PCKrTorA="; + hash = "sha256-74P8jIeg0Pge+/U0cQsrEfE+P8upBAr8xSyLhB4zOVU="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix index 721570f330b3c..58896c3e2bc27 100644 --- a/pkgs/development/libraries/libsegfault/default.nix +++ b/pkgs/development/libraries/libsegfault/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libsegfault"; - version = "unstable-2022-11-13"; + version = "0-unstable-2022-11-13"; src = fetchFromGitHub { owner = "jonathanpoelen"; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 0f45c39e0aeb1..0b07548d073a6 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2024-04-24"; + version = "0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "ValleyBell"; diff --git a/pkgs/development/libraries/libz/default.nix b/pkgs/development/libraries/libz/default.nix index 6b3e1dacdc00e..b9ee7f96b4217 100644 --- a/pkgs/development/libraries/libz/default.nix +++ b/pkgs/development/libraries/libz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libz"; - version = "unstable-2018-03-31"; + version = "1.2.8.2015.12.26-unstable-2018-03-31"; src = fetchFromGitLab { owner = "sortix"; @@ -18,7 +18,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; outputDoc = "dev"; # single tiny man3 page - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "libz-"; + }; meta = { homepage = "https://sortix.org/libz/"; diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix index 0551993e438a2..41a422e3a2a26 100644 --- a/pkgs/development/libraries/minilibx/default.nix +++ b/pkgs/development/libraries/minilibx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "unstable-2021-10-30"; + version = "0-unstable-2021-10-30"; src = fetchFromGitHub { owner = "42Paris"; diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 60ef649ec5ad3..876ff8c13c645 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20="; + sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA="; }; patches = [ diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix deleted file mode 100644 index a2fa42caea609..0000000000000 --- a/pkgs/development/libraries/openturns/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, swig -, boost -, spectra -, libxml2 -, tbb -, hmat-oss -, nlopt -, cminpack -, ceres-solver -, dlib -, hdf5 -, primesieve -, pagmo2 -, ipopt -, Accelerate -# tests take an hour to build on a 48-core machine -, runTests ? false -, enablePython ? false -, python3Packages -}: - -stdenv.mkDerivation rec { - pname = "openturns"; - version = "1.22"; - - src = fetchFromGitHub { - owner = "openturns"; - repo = "openturns"; - rev = "v${version}"; - sha256 = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; - }; - - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; - buildInputs = [ - swig - boost - spectra - libxml2 - tbb - hmat-oss - nlopt - cminpack - ceres-solver - dlib - hdf5 - primesieve - pagmo2 - ipopt - ] ++ lib.optionals enablePython [ - python3Packages.python - python3Packages.matplotlib - python3Packages.psutil - python3Packages.dill - ] ++ lib.optional stdenv.isDarwin Accelerate; - - cmakeFlags = [ - "-DOPENTURNS_SYSCONFIG_PATH=$out/etc" - "-DCMAKE_UNITY_BUILD=ON" - "-DCMAKE_UNITY_BUILD_BATCH_SIZE=32" - "-DSWIG_COMPILE_FLAGS='-O1'" - "-DUSE_SPHINX=${if enablePython then "ON" else "OFF"}" - "-DBUILD_PYTHON=${if enablePython then "ON" else "OFF"}" - ]; - - doCheck = runTests; - - checkTarget = "tests check"; - - meta = with lib; { - description = "Multivariate probabilistic modeling and uncertainty treatment library"; - license = with licenses; [ lgpl3 gpl3 ]; - homepage = "https://openturns.github.io/www/"; - changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ gdinh ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/qmenumodel/default.nix b/pkgs/development/libraries/qmenumodel/default.nix index 7d1384df364bc..c2b5e61b9d3b5 100644 --- a/pkgs/development/libraries/qmenumodel/default.nix +++ b/pkgs/development/libraries/qmenumodel/default.nix @@ -12,6 +12,7 @@ , python3 , qtbase , qtdeclarative +, gobject-introspection }: stdenv.mkDerivation (finalAttrs: { @@ -55,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus dbus-test-runner + gobject-introspection (python3.withPackages (ps: with ps; [ dbus-python pygobject3 diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 68f2e5e096a8b..880f1706b2995 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidcheck"; - version = "unstable-2023-12-14"; + version = "0-unstable-2023-12-14"; src = fetchFromGitHub { owner = "emil-e"; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index e1518b6662f63..c584ef2976d1c 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.1.0"; + version = "9.1.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8="; + hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 01ab983e1d6e0..dd93f49f59463 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.7"; + version = "0.9.8"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0n3qDItvb7l5jwfK7e8c2WpuP8XGGJWWd04Zr6fd3tc="; + hash = "sha256-ctG1Wb46GAb3iKPZvjShsGPUKqI4spuk7mM9bv/NM70="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { + changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index d50bc73060f67..6575338e4d649 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -6,18 +6,19 @@ php.buildComposerProject (finalAttrs: { pname = "deployer"; - version = "7.3.3"; + version = "7.4.0"; src = fetchFromGitHub { owner = "deployphp"; repo = "deployer"; rev = "v${finalAttrs.version}^"; - hash = "sha256-zvK7NwIACAhWN/7D8lVY1Bv8x6xKAp/L826SovQhDYg="; + hash = "sha256-nSrW4o0Tb8H056AAjjMzbsAVvWY2z1pdWmPFZDpDr1k="; }; vendorHash = "sha256-BDq2uryNWC31AEAEZJL9zGaAPbhXZ6hmfpsnr4wlixE="; meta = { + changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}"; description = "The PHP deployment tool with support for popular frameworks out of the box"; homepage = "https://deployer.org/"; license = lib.licenses.mit; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 36b877d2413d4..21d258a85391b 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpinsights.com/"; license = lib.licenses.mit; mainProgram = "phpinsights"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patka ]; }; }) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 20fc867fd9771..a1eb649a0b2ea 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.66"; + version = "1.10.67"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-ZEQ6oP6zyi0cL69J9ck8gAht5taPkzH+iW5ALC4saAQ="; + hash = "sha256-fa/bPOwZoYmnFBBmQofsFb8VphAfcTUwroSGCdnpNq8="; }; - vendorHash = "sha256-Qp/eMhcKK32N1EMgeIspBDs28Oofwn6n2bEFKqvSx9E="; + vendorHash = "sha256-cTJWXfBjH6BiD/a2qQ60MFB/QuFaVm8vOLMQYPW+7TI="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 9fc7d0e68049d..9e84b10802f92 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-BgjfvKrVpw/cP93JCloZKq+PIyS/w7/v6+obfgDT64A="; + hash = "sha256-920Vgk8kY5NsjYrOGYoRtcdHl4KKO7ytieH8cJ0S3RE="; }; postPatch = '' @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Airthings BLE devices"; homepage = "https://github.com/vincegio/airthings-ble"; - changelog = "https://github.com/vincegio/airthings-ble/releases/tag/v${version}"; + changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index bd5c3197a0973..e7d43e5cfae3e 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,24 +11,24 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "32"; + version = "33"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rYxa+GIG+w9DSxZ0nMXMppoVqI4WykPpHlbFzKd0IfA="; + hash = "sha256-VQrevM0ynRjQLpUibQuJaYGI/TPkTwdFCULGkogZJ9g="; }; - nativeBuildInputs = [ + build-system = [ cmake ninja pybind11 scikit-build-core ] ++ scikit-build-core.optional-dependencies.pyproject; - propagatedBuildInputs = [ + dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d347b623d4077..31e92178427aa 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.3"; + version = "2.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,15 +33,15 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-zII5TZ0bzVEo5hTrLr45N7oL3lYhkCyNfZif+0vkEo4="; + hash = "sha256-hoNxNxWfoSlBg6CsKvgEknM4vd+rN/9EFD5nC2y45OA="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling ]; - propagatedBuildInputs = [ + dependencies = [ awkward-cpp fsspec importlib-metadata diff --git a/pkgs/development/python-modules/biom-format/default.nix b/pkgs/development/python-modules/biom-format/default.nix new file mode 100644 index 0000000000000..ca5ff3a83fb78 --- /dev/null +++ b/pkgs/development/python-modules/biom-format/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + setuptools, + cython, + click, + numpy, + scipy, + pandas, + h5py, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "biom-format"; + version = "2.1.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "biocore"; + repo = "biom-format"; + rev = "refs/tags/${version}"; + hash = "sha256-WRBc+C/UWme7wYogy4gH4KTIdIqU3KmBm2jWzGNxGQg="; + }; + + patches = [ + # fixes a test, can be removed in next version after 2.1.15 + (fetchpatch { + name = "fix-dataframe-comparison.patch"; + url = "https://github.com/biocore/biom-format/commit/5d1c921ca2cde5d7332508503ce990a7209d1fdc.patch"; + hash = "sha256-nyHi469ivjJSQ01yIk/6ZMXFdoo9wVuazJHnFdy2nBg="; + }) + ]; + + build-system = [ + setuptools + cython + numpy + ]; + + dependencies = [ + click + numpy + scipy + pandas + h5py + ]; + + # make pytest resolve the package from $out + # some tests don't work if we change the level of directory nesting + preCheck = '' + mkdir biom_tests + mv biom/tests biom_tests/tests + rm -r biom + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "biom_tests/tests" ]; + + pythonImportsCheck = [ "biom" ]; + + meta = { + homepage = "http://biom-format.org/"; + description = "Biological Observation Matrix (BIOM) format"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 7d6f891756088..0217979d31da2 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -1,29 +1,33 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, base58 -, ecdsa -, hidapi -, noiseprotocol -, protobuf -, semver -, typing-extensions +{ + lib, + base58, + buildPythonPackage, + ecdsa, + fetchPypi, + hidapi, + noiseprotocol, + protobuf, + pythonOlder, + semver, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "bitbox02"; - version = "6.2.0"; - format = "setuptools"; + version = "6.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zt4G45nJjtU2/tbYpCEgjaoA+Xtpe9g2OpQaxfMzCb8="; + hash = "sha256-0D+yIovlYw8dfDUeW+vcualbvmLs+IySkTpmHwk2meM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ base58 ecdsa hidapi @@ -36,9 +40,7 @@ buildPythonPackage rec { # does not contain tests doCheck = false; - pythonImportsCheck = [ - "bitbox02" - ]; + pythonImportsCheck = [ "bitbox02" ]; meta = with lib; { description = "Firmware code of the BitBox02 hardware wallet"; diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 7ecc4eda95198..6f3403d3c143f 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +25,14 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-6+ElY1F8oRCtWT4a/LIG6hYMthlq5mDx2baKAc6zIns="; + hash = "sha256-vXyxK3xALKG61YGK7fmoqQNGfOiagHFrvnU02WKZThw="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ fastprogress jax jaxlib @@ -42,7 +45,14 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist ]; - disabledTestPaths = [ "tests/test_benchmarks.py" ]; + + disabledTestPaths = [ + "tests/test_benchmarks.py" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # Assertion errors on numerical values + "tests/mcmc/test_integrators.py" + ]; + disabledTests = [ # too slow "test_adaptive_tempered_smc" diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b9ca27e563edf..c41d87173529f 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.19.1"; + version = "0.19.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-r+Ll9ODFal+I2MwrwHakPFWD3GiE/n0f/dYs69jmmpU="; + hash = "sha256-hPs6YnmndJ2Z5RotcIRIYWPdvMyX56ul84l1Cs8kqH0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index e0810d717f4f4..ee720cbb1c220 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.98"; + version = "1.34.99"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-LhkC5wBmIBa3M5wOwCqCqL+hJ3Dc2Ga1WoWY+A7nNUs="; + hash = "sha256-uOVKyGfZ9gzsIhqLtsmyljzj4pcTTxgdQp003UDWGWk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 10cd64f83e622..a065168d53c84 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -1,29 +1,30 @@ -{ lib -, buildPythonPackage -, ddt -, fetchFromGitHub -, importlib-metadata -, jsonschema -, license-expression -, lxml -, packageurl-python -, py-serializable -, pythonRelaxDepsHook -, poetry-core -, pytestCheckHook -, pythonOlder -, requirements-parser -, sortedcontainers -, setuptools -, toml -, types-setuptools -, types-toml -, xmldiff +{ + lib, + buildPythonPackage, + ddt, + fetchFromGitHub, + importlib-metadata, + jsonschema, + license-expression, + lxml, + packageurl-python, + py-serializable, + pythonRelaxDepsHook, + poetry-core, + pytestCheckHook, + pythonOlder, + requirements-parser, + sortedcontainers, + setuptools, + toml, + types-setuptools, + types-toml, + xmldiff, }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.4"; + version = "7.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,15 +33,14 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-PNacp16WZHNblFyA117hSL87IKGMrW0OYNXCSoBoO8Q="; + hash = "sha256-z+QBjMT0L7dqCJvbwok9TWQajIPzmAq3XPLWFxmhPsk="; }; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata license-expression packageurl-python @@ -61,21 +61,15 @@ buildPythonPackage rec { xmldiff ]; - pythonImportsCheck = [ - "cyclonedx" - ]; + pythonImportsCheck = [ "cyclonedx" ]; - pythonRelaxDeps = [ - "py-serializable" - ]; + pythonRelaxDeps = [ "py-serializable" ]; preCheck = '' export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; - pytestFlagsArray = [ - "tests/" - ]; + pytestFlagsArray = [ "tests/" ]; disabledTests = [ # These tests require network access diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 025692de1f740..315492e38ee33 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -7,6 +7,9 @@ , gmp , cython , cysignals + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -53,6 +56,8 @@ buildPythonPackage rec { make check ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Cython bindings for PARI"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 62cc3dd30d8af..fc53c5c9f1684 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -4,6 +4,9 @@ , buildPythonPackage , cython , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler + +# Reverse dependency +, sage }: assert pariSupport -> pari != null; @@ -46,6 +49,8 @@ buildPythonPackage rec { enableParallelBuilding = true; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Interrupt and signal handling for Cython"; mainProgram = "cysignals-CSI"; diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index e73c09f40b019..fecb9cad26ce0 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -8,6 +8,9 @@ , gdb , numpy , ncurses + +# Reverse dependency +, sage }: let @@ -57,6 +60,8 @@ in buildPythonPackage rec { doCheck = false; # doCheck = !stdenv.isDarwin; + passthru.tests = { inherit sage; }; + # force regeneration of generated code in source distributions # https://github.com/cython/cython/issues/5089 setupHook = ./setup-hook.sh; diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index fc4ba20245fce..637bbb6528692 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fetchpatch2 , pythonAtLeast , pythonOlder @@ -44,15 +44,16 @@ buildPythonPackage rec { pname = "django"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.10"; - src = fetchPypi { - pname = "Django"; - inherit version; - hash = "sha256-S9AajIMLt3qKOw59iyW4h+U2rReoG6Lc5UdhNcczEr0="; + src = fetchFromGitHub { + owner = "django"; + repo = "django"; + rev = "refs/tags/${version}"; + hash = "sha256-0/AbPmTl38E9BpHVKs0r79fISjEa1d4XO/se1pA7zxg="; }; patches = [ @@ -65,13 +66,6 @@ buildPythonPackage rec { # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch - (fetchpatch2 { - # https://github.com/django/django/pull/17979 - name = "django-mime-utf8-surrogates.patch"; - url = "https://github.com/django/django/commit/b231bcd19e57267ce1fc21d42d46f0b65fdcfcf8.patch"; - hash = "sha256-HhmRwi24VkoPoh+NygAThCoMywoMwrLijU4ZsDfVU34="; - }) - ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_5_set_geos_gdal_lib.patch; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 34f20998ef3d5..242502ab1bf65 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -69,6 +69,9 @@ buildPythonPackage rec { # tries to make http request "test_install_non_existent_extension" + # test is flaky https://github.com/duckdb/duckdb/issues/11961 + "test_fetchmany" + # https://github.com/duckdb/duckdb/issues/10702 # tests are racy and interrupt can be delivered before or after target point # causing a later test to fail with a spurious KeyboardInterrupt diff --git a/pkgs/development/python-modules/execnb/default.nix b/pkgs/development/python-modules/execnb/default.nix index 56b1bf1388ed9..bd3d91a10e513 100644 --- a/pkgs/development/python-modules/execnb/default.nix +++ b/pkgs/development/python-modules/execnb/default.nix @@ -1,34 +1,45 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fastcore -, traitlets -, ipython -, pythonOlder +{ + lib, + buildPythonPackage, + fastcore, + fetchPypi, + ipython, + pythonOlder, + setuptools, + traitlets, }: buildPythonPackage rec { pname = "execnb"; - version = "0.1.5"; - format = "setuptools"; + version = "0.1.6"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nuAp4OMAfA3u3DJyORjFw7y7ZLsLCKEfxSFIXqNh+k0="; + hash = "sha256-KJ2XEHqFY0SxbAiVPWBFO0cyC0EWgGDso8wt7lBLTgU="; }; - propagatedBuildInputs = [ fastcore traitlets ipython ]; + build-system = [ setuptools ]; + + dependencies = [ + fastcore + ipython + traitlets + ]; # no real tests doCheck = false; + pythonImportsCheck = [ "execnb" ]; meta = with lib; { - homepage = "https://github.com/fastai/execnb"; description = "Execute a jupyter notebook, fast, without needing jupyter"; - mainProgram = "exec_nb"; + homepage = "https://github.com/fastai/execnb"; + changelog = "https://github.com/fastai/execnb/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ rxiao ]; + mainProgram = "exec_nb"; }; } diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 2fe0b785cea6e..4a54757640b9b 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo="; + hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc="; }; build-system = [ @@ -62,9 +62,9 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}"; + changelog = "https://github.com/SYSTRAN/faster-whisper/releases/tag/v${version}"; description = "Faster Whisper transcription with CTranslate2"; - homepage = "https://github.com/guillaumekln/faster-whisper"; + homepage = "https://github.com/SYSTRAN/faster-whisper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 95358d5f4aaf9..2b4571b53edbf 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -15,6 +15,9 @@ , fplll , numpy +# Reverse dependency +, sage + # tests , pytestCheckHook }: @@ -72,6 +75,8 @@ buildPythonPackage rec { export PY_IGNORE_IMPORTMISMATCH=1 ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python interface for fplll"; changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 5405e570ed8dc..1cc374e63926a 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-SXUPzFDVw8+CmD/Jxm/EB70UBdOmauQs69hNr0l3l90="; + hash = "sha256-DGSHQbVfqkaHgxL2bBXSxKqshTdWqp1z2F+YA9lu20E="; }; # build C version if it exists diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 8e49a7d14b71e..df89acd2b6b71 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-cQixNLtjHPQrnNcxg0MrIdzvun2f1BqKY/2SxfcM2Nc="; + hash = "sha256-EMsaB6VDDDvXg9LKa9ms0+AfzX1rG+yeR898EK59DDs="; }; build-system = [ diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index b5a602d4f222f..e3d4118c335ba 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -5,6 +5,9 @@ , gmp , mpfr , libmpc + +# Reverse dependency +, sage }: let @@ -29,6 +32,8 @@ buildPythonPackage { pythonImportsCheck = [ "gmpy2" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; homepage = "https://github.com/aleaxit/gmpy/"; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 8e4eb71a97dc3..41028b942bd1e 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk="; + hash = "sha256-RIiJs2drXOb4irs3kTDelP+Cuv94SJ+nwBrkHbqI/Jc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index bc23ce61c1765..0da90d4ccb9e9 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -31,6 +31,12 @@ in buildPythonPackage rec { hash = "sha256-e36PeAcqLt7IfJg28l80ID/UkqRHVwmhi0F6M8+yH6k="; }; + patches = [ + # Unlock an overly strict locking of mpi4py version (seems not to be necessary). + # See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479 + ./mpi4py-requirement.patch + ]; + # avoid strict pinning of numpy postPatch = '' substituteInPlace pyproject.toml \ diff --git a/pkgs/development/python-modules/h5py/mpi4py-requirement.patch b/pkgs/development/python-modules/h5py/mpi4py-requirement.patch new file mode 100644 index 0000000000000..b32e804ebe5ff --- /dev/null +++ b/pkgs/development/python-modules/h5py/mpi4py-requirement.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index b1463422..7f0c7b10 100755 +--- a/setup.py ++++ b/setup.py +@@ -47,7 +47,7 @@ if setup_configure.mpi_enabled(): + # incompatible with newer setuptools. + RUN_REQUIRES.append('mpi4py >=3.1.1') + SETUP_REQUIRES.append("mpi4py ==3.1.1; python_version<'3.11'") +- SETUP_REQUIRES.append("mpi4py ==3.1.4; python_version>='3.11'") ++ SETUP_REQUIRES.append("mpi4py >=3.1.4; python_version>='3.11'") + + # Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip + # setup_requires for any reason. diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 82dc5a9882cfe..79e5fc8d523a6 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.47"; + version = "0.48"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-A4viSzUia4QBdD0svkqYtsCq/la7Nrf2xu/fVDZHb00="; + hash = "sha256-PKa4knEUkULeGbwjEViF2J3QyUOOvKHYxy0ChmRQf6A="; }; build-system = [ diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 511424fb19834..df3106aac4201 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -7,6 +7,9 @@ , typing-extensions , toml , zipp + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -41,6 +44,8 @@ buildPythonPackage rec { "importlib_metadata" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index a8407239cc402..1f4b01a419927 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -10,6 +10,9 @@ # dependencies , importlib-metadata +# Reverse dependency +, sage + # tests , jaraco-collections , pytestCheckHook @@ -46,6 +49,8 @@ buildPythonPackage rec { "importlib_resources" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Read resources from Python packages"; homepage = "https://importlib-resources.readthedocs.io/"; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 394974103537c..35cd3bad0aa46 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -18,6 +18,9 @@ , pyzmq , tornado , traitlets + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -63,6 +66,7 @@ buildPythonPackage rec { passthru.tests = { pytest = callPackage ./tests.nix { }; + inherit sage; }; meta = { diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 7a10725f24515..577b78804907f 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -29,6 +29,9 @@ , notebook , qtconsole +# Reverse dependency +, sage + # Test dependencies , pickleshare , pytest-asyncio @@ -106,6 +109,8 @@ buildPythonPackage rec { "test_clipboard_get" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "IPython: Productive Interactive Computing"; downloadPage = "https://github.com/ipython/ipython/"; diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix new file mode 100644 index 0000000000000..81799c7aec4fa --- /dev/null +++ b/pkgs/development/python-modules/iterable-io/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "iterable-io"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pR0Ps"; + repo = "iterable-io"; + rev = "refs/tags/v${version}"; + hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "iterableio" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Library to adapt iterables to a file-like interface"; + homepage = "https://github.com/pR0Ps/iterable-io"; + changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.mjoerg ]; + }; +} diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 1c260e37c7b0b..80b87378a6e4d 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -12,6 +12,9 @@ , setuptools , sphinxcontrib-log-cabinet , sphinx-issues + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -76,6 +79,8 @@ buildPythonPackage rec { inherit meta; }; + passthru.tests = { inherit sage; }; + meta = with lib; { changelog = "https://github.com/pallets/jinja/blob/${version}/CHANGES.rst"; description = "Very fast and expressive template engine"; diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index 2c15663502469..66ab13cdd8fc8 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -10,24 +10,24 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.0.3"; - format = "pyproject"; + version = "3.04"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jitsi"; - repo = pname; + repo = "jiwer"; rev = "refs/tags/v${version}"; - hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc="; + hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q="; }; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ rapidfuzz click ]; diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 799e098920a8e..c1faa97b1ef87 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -7,6 +7,9 @@ , traitlets , pip , pytestCheckHook + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -61,6 +64,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_core" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index af29f6068b045..90619042619c8 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.36"; + version = "0.0.37"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-l76dAM8RnJYeA+0ibgTmcPUbXUL1sF/8NRhZj6bSDHQ="; + hash = "sha256-2ytYKbsgvFsEwSa2kUPbwxqIDpSelBEMI2ssF2kGiJ8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 3c0b421564492..746d690984be5 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.48"; + version = "0.1.51"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-8KmwqPIvIZ72/YTisdkqgBToRRTAobVTNw/UApaBPBY="; + hash = "sha256-9+oRb5Ob6edMOFuvldbITNekArWcLBiT/AVL+Yq778I="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index e098db547855a..e42a344262a39 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.53"; + version = "0.1.54"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-C18a1FxDwsW/x10x3ups/9hCGn3Ku1QydDGN9DlEXBk="; + hash = "sha256-hg1xfqptjeJHxbiGfuGeka7lpClrb9nxP/RSUYr2/0k="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 73c20444860c5..de65df2055f3b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-E7DXWubBvMhru31XmNva6iPm2adJKmmt5pFqKZ8fquk="; + hash = "sha256-nFdLrzcPr0Vry2e51eonOm+h8rT9IFpZxHtoESNkuec="; }; build-system = [ diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index fc9636c351a05..d74be9e45f93e 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -3,27 +3,29 @@ , buildPythonPackage , fetchPypi , fetchpatch +, setuptools , six , attrs , twisted -, pyopenssl -, service-identity , autobahn , treq , mock , pythonOlder +, pythonAtLeast +, pytestCheckHook }: buildPythonPackage rec { pname = "magic-wormhole-mailbox-server"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + # python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; + hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs="; }; patches = [ @@ -35,6 +37,8 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ attrs six @@ -43,27 +47,24 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; + pythonImportsCheck = [ "wormhole_mailbox_server" ]; + nativeCheckInputs = [ + pytestCheckHook treq mock - twisted ]; - # Fails in Darwin's sandbox - postPatch = lib.optionalString stdenv.isDarwin '' - echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py - echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py - ''; - - checkPhase = '' - trial -j$NIX_BUILD_CORES wormhole_mailbox_server - ''; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # these tests fail in Darwin's sandbox + "src/wormhole_mailbox_server/test/test_web.py" + ]; - meta = with lib; { + meta = { description = "Securely transfer data between computers"; - homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server"; changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; }; } diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 463b3560457d2..d98080545d357 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -1,33 +1,40 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , autobahn , mock , twisted +, pythonOlder +, pythonAtLeast +, pytestCheckHook }: buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b"; + hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ autobahn twisted ]; - nativeCheckInputs = [ mock twisted ]; + pythonImportsCheck = [ "wormhole_transit_relay" ]; - checkPhase = '' - trial -j$NIX_BUILD_CORES wormhole_transit_relay - ''; + nativeCheckInputs = [ pytestCheckHook mock twisted ]; - meta = with lib; { + meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; }; } diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7b89f29b76e21..d1bf85f0530aa 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,7 +17,9 @@ , tqdm , click , humanize +, iterable-io , txtorcon +, zipstream-ng # optional-dependencies , noiseprotocol @@ -34,7 +36,7 @@ buildPythonPackage rec { pname = "magic-wormhole"; version = "0.14.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -56,7 +58,9 @@ buildPythonPackage rec { tqdm click humanize + iterable-io txtorcon + zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; @@ -111,12 +115,12 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 ''; - meta = with lib; { + meta = { changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; - license = licenses.mit; - maintainers = with maintainers; [ asymmetric ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; mainProgram = "wormhole"; }; } diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index e5ad5a283db7a..2c5f449c139fe 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; - rev = "v${version}"; - hash = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w="; + rev = "refs/tags/v${version}"; + hash = "sha256-9tjk3rhcfAYROZKwmwHzHAN7Ui0EgmxPErQyF//K0r8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index bf1e7a86323e3..a23b9540538cb 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -69,6 +69,9 @@ # required for headless detection , libX11 , wayland + +# Reverse dependency +, sage }: let @@ -183,6 +186,8 @@ buildPythonPackage rec { }; }; + passthru.tests = { inherit sage; }; + env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); # Encountering a ModuleNotFoundError, as describved and investigated at: diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 611c5b11dc0c6..9415fee83d7a0 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.0.10"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-N1VU9bOdVENIX6QsFa0jeVugmXjl3gNkVPS/m8gEB2Q="; + hash = "sha256-wx95Lsqgi7fM/1s6fSHxXOs396mIR9S9yCRebC2VFpI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/memory-allocator/default.nix b/pkgs/development/python-modules/memory-allocator/default.nix index c4ddc5d06a1b8..34dd55bb8dc60 100644 --- a/pkgs/development/python-modules/memory-allocator/default.nix +++ b/pkgs/development/python-modules/memory-allocator/default.nix @@ -2,6 +2,9 @@ , fetchPypi , buildPythonPackage , cython + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -19,6 +22,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "memory_allocator" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "An extension class to allocate memory easily with cython"; homepage = "https://github.com/sagemath/memory_allocator/"; diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index f0d0e4087e36e..1e1d3c3f67d61 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.45.0"; + version = "1.46.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PBeeohKNzAMlEdAjzB8fsVPc+ml+mcaWHoVWPeP93Bo="; + hash = "sha256-f3K+59+9NO33GO1SBZhKfqHPO9p5kivDeLNd780cZu8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 1a8e4c0309792..20e7049ac370f 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,6 +5,9 @@ , isPyPy , setuptools , pytestCheckHook + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -29,6 +32,8 @@ buildPythonPackage rec { ]; }; + passthru.tests = { inherit sage; }; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 40a6cdcf4b2ed..ac0bd456bcdac 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -19,6 +19,9 @@ # tests , pytest-xdist , pytestCheckHook + +# reverse dependency +, sage }: buildPythonPackage rec { @@ -53,6 +56,8 @@ buildPythonPackage rec { ]; }; + passthru.tests = { inherit sage; }; + nativeCheckInputs = [ pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c2d38cc31b248..f0acca333f857 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -19,6 +19,9 @@ , blas , lapack +# Reverse dependency +, sage + # tests , hypothesis , pytest-xdist @@ -177,6 +180,7 @@ in buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + tests = { inherit sage; }; }; # Disable test diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 9fc4de88fb9f2..30c4aa4eb2717 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.0"; + version = "3.5.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-MvLHi0/tMkWBARyIVm/cuMbS2euK37xvQUbkmOrUyVU="; + hash = "sha256-i/fVihl+XnY3grHG2OXJ2ZQB43o/aNOGV/buh2zUMOQ="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix index b048fc3748c1a..891b6d348561e 100644 --- a/pkgs/development/python-modules/pathlib-abc/default.nix +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pathlib-abc"; - version = "0.2.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pathlib_abc"; inherit version; - hash = "sha256-ua9rOf1RMhSFZ47DgD0KEeAqIuhp6AUsrLbo9l3nuGI="; + hash = "sha256-CE573ZGbD3d0kUqeZM2GobOYYPgfeB3XJCWGMfKRWr4="; }; build-system = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index cbc81c1a03403..0efeaffddd69a 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.9.2"; + version = "19.9.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X5JKfIE6rISXb3F2liuyLrVHm5xw3DoFeMhqhEsdEIY="; + hash = "sha256-4v+I1NXfVseKid8A5gBIvAIQfwdMMLWUNts9Ga29tWs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index e8c5efc3cba3f..f98e531c0d54f 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -3,6 +3,9 @@ , fetchPypi , setuptools , ptyprocess + +# Reverse dependency +, sage }: buildPythonPackage (rec { @@ -24,6 +27,8 @@ buildPythonPackage (rec { propagatedBuildInputs = [ ptyprocess ]; + passthru.tests = { inherit sage; }; + meta = with lib; { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 0825380a925ba..ec3a9f5ec53c6 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.10.0"; format = "setuptools"; pname = "piep"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index a576b47bda19e..f320000eecdc1 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -7,7 +7,7 @@ , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, numpy, pytestCheckHook, setuptools # for passthru.tests -, imageio, matplotlib, pilkit, pydicom, reportlab +, imageio, matplotlib, pilkit, pydicom, reportlab, sage }@args: import ./generic.nix (rec { @@ -24,7 +24,7 @@ import ./generic.nix (rec { }; passthru.tests = { - inherit imageio matplotlib pilkit pydicom reportlab; + inherit imageio matplotlib pilkit pydicom reportlab sage; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 641008be07fca..4a4d97c554cf0 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -9,6 +9,9 @@ , cysignals , gmpy2 , sphinx + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -54,6 +57,8 @@ buildPythonPackage rec { mv docs/build/html "$doc/share/doc/pplpy" ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python wrapper for ppl"; homepage = "https://gitlab.com/videlec/pplpy"; diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix index 463a0cf50be64..60ae77e7dd942 100644 --- a/pkgs/development/python-modules/primecountpy/default.nix +++ b/pkgs/development/python-modules/primecountpy/default.nix @@ -4,6 +4,9 @@ , primecount , cython , cysignals + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -25,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "primecountpy" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Cython interface for C++ primecount library"; homepage = "https://github.com/dimpase/primecountpy/"; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c7793a14a8960..4fcf9436e0715 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240502"; + version = "0.10.0.20240506"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Hy0DmawyjUXn35tTV39Mpp+Xe16hDTbkyQoBdKS/d0o="; + hash = "sha256-gg1UcELZ8+gQg4VcBsagHhtUc9i6/d03q9oanyDT6K8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 89771e7df8f7a..4aa2c104d8a01 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, unittestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, unittestCheckHook, pythonOlder }: buildPythonPackage rec { pname = "pycparser"; @@ -11,6 +11,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ unittestCheckHook ]; + disabled = pythonOlder "3.8"; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix new file mode 100644 index 0000000000000..19f933ddc3d9a --- /dev/null +++ b/pkgs/development/python-modules/pyjson5/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + pythonOlder, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "pyjson5"; + version = "1.6.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Kijewski"; + repo = "pyjson5"; + rev = "refs/tags/v${version}"; + hash = "sha256-LNcz9JEOw6HO9eIf71w4NJdPOB4yixBfBeD7B/NLbfE="; + fetchSubmodules = true; + }; + + build-system = [ + cython + setuptools + wheel + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pyjson5" ]; + + meta = with lib; { + description = "A JSON5 serializer and parser library"; + homepage = "https://github.com/Kijewski/pyjson5"; + changelog = "https://github.com/Kijewski/pyjson5/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 4d12ee0c99d7c..ad51ef12d5c9d 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -1,22 +1,29 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.17"; - format = "setuptools"; + version = "0.2.18"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-lJCbNOQJ8xmMa4V+tSFZx4QasK8ZLfsFavMP9Zge4K4="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nkgilley"; + repo = "python-ecobee-api"; + rev = "refs/tags/${version}"; + hash = "sha256-WBVHlA7cAQGCFRNSANX6PqPQYMRw74GEAlTFwSBxVQU="; }; - propagatedBuildInputs = [ - requests - ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # no tests implemented doCheck = false; @@ -26,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to Ecobee thermostats"; homepage = "https://github.com/nkgilley/python-ecobee-api"; + changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 0df16e875cf18..6c3c582b2b0e3 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, netifaces -, pyserial -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + netifaces, + pyserial, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "rns"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +20,12 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-QcYjqqeXBKx+Ef00Bw1OJMWDMdQgp/fqh3r5yhsa0Kg="; + hash = "sha256-M6iI554lv6PF5sIdOoaMIlQHP5YU8WM8YxfHMWhLSdE="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography netifaces pyserial @@ -35,9 +34,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "RNS" - ]; + pythonImportsCheck = [ "RNS" ]; meta = with lib; { description = "Cryptography-based networking stack for wide-area networks"; diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix index f40da3a301f77..956767735cb88 100644 --- a/pkgs/development/python-modules/rst2pdf/default.nix +++ b/pkgs/development/python-modules/rst2pdf/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, installShellFiles , setuptools , setuptools-scm , wheel @@ -31,6 +32,7 @@ buildPythonPackage rec { outputs = [ "out" "man" ]; nativeBuildInputs = [ + installShellFiles setuptools setuptools-scm wheel @@ -62,8 +64,8 @@ buildPythonPackage rec { doCheck = false; postInstall = '' - mkdir -p $man/share/man/man1/ - ${docutils}/bin/rst2man.py doc/rst2pdf.rst $man/share/man/man1/rst2pdf.1 + ${lib.getExe' docutils "rst2man"} doc/rst2pdf.rst rst2pdf.1 + installManPage rst2pdf.1 ''; meta = with lib; { @@ -72,6 +74,6 @@ buildPythonPackage rec { homepage = "https://rst2pdf.org/"; changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 33e0c85697c1e..213f23bf006a2 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.217.0"; + version = "2.218.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-p73M0hBVpakdXGM56ECr4D3mQCBmB7Ud/p+Rj1+/Bic="; + hash = "sha256-VDwD52mbOSNrZgUHM1fieYWW41V6Gf+paoP5nYg2cDI="; }; patches = [ diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 2f49063ae06cb..7068063a8cb5d 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,53 +1,64 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cython -, lockfile -, cachecontrol -, decorator -, h5py -, ipython -, matplotlib -, natsort -, numpy -, pandas -, scipy -, hdmedians -, scikit-learn -, coverage -, python -, isPy3k +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + oldest-supported-numpy, + requests, + decorator, + natsort, + numpy, + pandas, + scipy, + h5py, + hdmedians, + biom-format, + python, + pytestCheckHook, }: buildPythonPackage rec { - version = "0.6.0"; - format = "setuptools"; pname = "scikit-bio"; - disabled = !isPy3k; + version = "0.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-EBBafDwVrlkQJEkn8punqjUjSxnr5lE7hIRUc0OywQ8="; + src = fetchFromGitHub { + owner = "scikit-bio"; + repo = "scikit-bio"; + rev = "refs/tags/${version}"; + hash = "sha256-v8/r52pJpMi34SekPQBf7CqRbs+ZEyPR3WO5RBB7uKg="; }; - nativeBuildInputs = [ cython ]; - nativeCheckInputs = [ coverage ]; - propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy h5py hdmedians scikit-learn ]; + build-system = [ + setuptools + cython + oldest-supported-numpy + ]; + + dependencies = [ + requests + decorator + natsort + numpy + pandas + scipy + h5py + hdmedians + biom-format + ]; - # cython package not included for tests - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; - checkPhase = '' - ${python.interpreter} -m skbio.test - ''; + # only the $out dir contains the built cython extensions, so we run the tests inside there + pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; pythonImportsCheck = [ "skbio" ]; - meta = with lib; { + meta = { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 64e261c374039..57769c7f6afec 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -25,6 +25,9 @@ , xsimd , blas , lapack + +# Reverse dependency +, sage }: let @@ -193,6 +196,7 @@ in buildPythonPackage { # Pass it the names of the datasets to update their hashes ++ (builtins.attrNames datasetsHashes) ; + tests = { inherit sage; }; }; SCIPY_USE_G77_ABI_WRAPPER = 1; diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index a6e839ead5ce9..8629af8a075f5 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pytestCheckHook -, pythonOlder -, torch -, requests -, setuptools -, soundfile -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pytestCheckHook, + pythonOlder, + torch, + requests, + setuptools, + soundfile, + typing-extensions, }: buildPythonPackage rec { pname = "speechrecognition"; - version = "3.10.3"; + version = "3.10.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +23,10 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; rev = "refs/tags/${version}"; - hash = "sha256-g2DE3u2nuJHqWA2X8S6zw5nUVS1yvSqO0VI3zKoIUgg="; + hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ requests @@ -41,9 +40,7 @@ buildPythonPackage rec { soundfile ]; - pythonImportsCheck = [ - "speech_recognition" - ]; + pythonImportsCheck = [ "speech_recognition" ]; disabledTests = [ # Test files are missing in source @@ -57,7 +54,11 @@ buildPythonPackage rec { meta = with lib; { description = "Speech recognition module for Python, supporting several engines and APIs, online and offline"; homepage = "https://github.com/Uberi/speech_recognition"; - license = with licenses; [ gpl2Only bsd3 ]; + changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${version}"; + license = with licenses; [ + gpl2Only + bsd3 + ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index d2a10492153e0..1954f8bc591f6 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -3,6 +3,9 @@ , fetchPypi , glibcLocales , mpmath + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -27,6 +30,8 @@ buildPythonPackage rec { export LANG="en_US.UTF-8" ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python library for symbolic mathematics"; mainProgram = "isympy"; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 502e791ddd309..1eb92ddb0f669 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1139"; + version = "3.0.1140"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-DH+15I/kMuUbRU8jYGLaDWxO7zumJ7Bh5yze3mmrh/M="; + hash = "sha256-af0vBypBXfclCQ3BICh0hBjMCpE9F3PZE/bmk2jx+jI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix index 8625956d77546..60cc3c9c6f5e3 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -135,6 +135,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "validator_collection" ]; + disabledTests = [ + # Issues with fake filesystem /var/data + "test_writeable" + "test_executable" + "test_readable" + "test_is_readable" + ]; + meta = with lib; { description = "Python library of 60+ commonly-used validator functions"; homepage = "https://github.com/insightindustry/validator-collection/"; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 26418749c80fe..e38c815d7c7f3 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cloudpathlib" "smart-open" + "typer" ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 221346d2c76aa..02f6bc25c86a1 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,23 +1,24 @@ -{ lib -, bleak -, bleak-retry-connector -, bluetooth-data-tools -, bluetooth-sensor-state-data -, buildPythonPackage -, cryptography -, fetchFromGitHub -, home-assistant-bluetooth -, poetry-core -, pycryptodomex -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, sensor-state-data +{ + lib, + bleak, + bleak-retry-connector, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + cryptography, + fetchFromGitHub, + home-assistant-bluetooth, + poetry-core, + pycryptodomex, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + sensor-state-data, }: buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-Va/fzGDjBR/h1lUN47AixZnDYzEPNXQKTVXILKayhBc="; + hash = "sha256-+zMjnLUzI8ctucvxXts7V4lN4Gp0ZQtArhpXUCBvhF0="; }; postPatch = '' @@ -34,14 +35,11 @@ buildPythonPackage rec { --replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" ''; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pycryptodomex" - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pycryptodomex" ]; dependencies = [ bleak @@ -54,13 +52,9 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "xiaomi_ble" - ]; + pythonImportsCheck = [ "xiaomi_ble" ]; meta = with lib; { description = "Library for Xiaomi BLE devices"; diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 56bbe6bec51b3..4e912e3af2e8d 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -26,7 +26,8 @@ , maintainers ? [ ] # : passthru arguments (e.g. tests) , passthru ? { } - + # : attributes to be merged into meta +, broken ? false }: let @@ -125,7 +126,7 @@ stdenv.mkDerivation { meta = { homepage = "https://skarnet.org/software/${pname}/"; - inherit description platforms; + inherit broken description platforms; license = lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch qyliss ] ++ maintainers; diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index 80bef5feb512b..fc8dffe32fdee 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, skawarePackages, skalibs }: let - version = "2.9.4.0"; + version = "2.9.5.1"; in skawarePackages.buildPackage { inherit version; pname = "execline"; # ATTN: also check whether there is a new manpages version - sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; + sha256 = "33UANdD7IccmW/+37X4bZh3h6EKUSiJSvc3cMtDZchc="; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.3.0.5"; - sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; + version = "2.9.5.1.1"; + sha256 = "hLo0TJJ4F2UQ+NkyO9DvVHO0ec86Eps1z99HthBzoIc="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index b606595936486..761ee34e9702c 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -2,13 +2,13 @@ skawarePackages.buildPackage { pname = "s6"; - version = "2.12.0.3"; - sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; + version = "2.12.0.4"; + sha256 = "yV1ReHYC4MjI5PkqcQy9qk7nl+6IbnE0Jyfil0+VwGs="; manpages = skawarePackages.buildManPages { pname = "s6-man-pages"; - version = "2.12.0.2.1"; - sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; + version = "2.12.0.4.1"; + sha256 = "9n4oIGfgcu+Q/UcY1Edr3n09Ecrbg77AI8TRBQoFzs0="; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 342fe2749843e..8e858c858cb3e 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -1,9 +1,9 @@ -{ skawarePackages, skalibs }: +{ skawarePackages, stdenv, skalibs }: skawarePackages.buildPackage { pname = "tipidee"; - version = "0.0.3.0"; - sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; + version = "0.0.4.0"; + sha256 = "sha256-FzZRGg8IBTkzXINb9WCdVukej9KyPFQIUuXfdcLz1RQ="; description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; @@ -35,4 +35,5 @@ skawarePackages.buildPackage { mv examples $doc/share/doc/tipidee/examples ''; + broken = stdenv.isDarwin; } diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 2ce9e3d06b2f2..467f05150622c 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-Vkg3QPUvhJphmZ7Ek3tuFnSEjfSy6LfctGMA07IufUU="; + hash = "sha256-7iqS8p53Pyk2WQVkbTVA7eJNnD2KvO41S+JJBTFOToQ="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index bb9506dee19a0..7233b787fd281 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.79"; + version = "3.2.83"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-FQTRvi4HLfYavaLjfXrngnT/1nOGVXvedaUq7nG6ZAk="; + hash = "sha256-h0kvLCGVnf8OhsYN4+uIn5EKChozQ55WsD0Gnb1QL7o="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { "bc-python-hcl2" "boto3" "botocore" + "cyclonedx-python-lib" "dpath" "igraph" "license-expression" @@ -122,6 +123,8 @@ python3.pkgs.buildPythonApplication rec { "test_runner" # AssertionError: assert ['<?xml versi... "test_get_cyclonedx_report" + # Test fails on Hydra + "test_sast_js_filtered_files_by_ts" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 96f9b47d17bca..9eedade72dd9c 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cvehound"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; rev = "refs/tags/${version}"; - hash = "sha256-DnrFlDFJT74irvrNs/j7zwO76DYjTOuY0t+mu5c8gpk="; + hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ="; }; makeWrapperArgs = [ diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 580cf127b3c6a..3596f94b61de6 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.9"; + version = "1.10.0"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-xXyuYMISLKG7p3GE37TQ0l/GwYgFOUqzarYgiwwPJi8="; + hash = "sha256-FUt95sGSB8c9CjBPkByMS26tmpw6mamKnXKsGUGdJkA="; }; postPatch = '' diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 9c604d5cab4c1..ab99341c1a96a 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z2EKtSM+/wWGgwsHKDcxtc/M6UZ01AiTZaaCYCWjU7M="; + sha256 = "sha256-zcv6fYrqPp/IMg4ivqJtlJwOs2M5E8niWoIOXYiEZuA="; }; - vendorHash = "sha256-7UiQjTgcwGOTEJEaWywEdZvpkM/MoXU3d6k8oVmUiW8="; + vendorHash = "sha256-c+TZGLaUomlykIU4aN7awUp4kpIEoGOkkbvIC6ok7h4="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 70d64af371860..2db093cf018a7 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - ${stdenv.cc.targetPrefix}cc tie.c -o tie + ${stdenv.cc.targetPrefix}cc -std=c89 tie.c -o tie ''; installPhase = '' diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index ad3827bc74941..a8ea1cc9c72aa 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.22"; + version = "0.14.23"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-04CRMlH31MzYpE2pRUrbAvSojbxan4ktqX9J/zjeTkk="; + hash = "sha256-TTBsxb+rC/0SL6pCZkf9HPwzExXb3UIT08cBQ4y855o="; }; - cargoHash = "sha256-Nutx3Dvvh7qvgAtengWw0kJve4Ent9y7OXgovUZWTLE="; + cargoHash = "sha256-i1p/k+SGwdxp9RGXfxnJVq+E1pek7RSA50fMgVRJzCQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/development/tools/rust/cargo-duplicates/default.nix index d2f3b9c7a09da..a22d5239f4f58 100644 --- a/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-duplicates"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Keruspe"; repo = "cargo-duplicates"; rev = "v${version}"; - hash = "sha256-e0cegK4obUVIJyx5XKF+xicvkRvQwuObwB8tprrJnrw="; + hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k="; }; - cargoHash = "sha256-i1IyHCa/w4DOGlPWjDE4IbVm3s/40DIwjwUGIMTYH4Y="; + cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8="; nativeBuildInputs = [ curl diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 52b20dee8b153..03ae98ff52e72 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.6"; + version = "1.1.7"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ffEu37NAT/74l1Kkr+e1hAkawbSeZlTQcHbqg/7jYOQ="; + hash = "sha256-VDS01LVpTMl033tyUDk+efi0ShUyAXnZGrt33Nx2Qfg="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-qKWtazbPfPjDxLChZ0FVyV2qQhPUHwF4wpHrFdCRlYg="; + hash = "sha256-lvm3jmlY6QkLJVFtWea3h7hARU1DEkunBQniPw563H4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-a3ol9tkKyVa6MoBq5cscRLAS5o8OCcIUX43opKtePos="; + hash = "sha256-3Kn4U0iX0RfNY/j919QjzRasmvF6A3elkmvrg9mMe7A="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-IzjuIPXljt8EStcRdGj55SWIpqJdGQeVZVAS5u9sW+Y="; + hash = "sha256-J6eVZ6SVOj/9ZU3e2kEKZAnU63RKTLf7ef3V7nJqopA="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index a627e967d1993..e32801b769740 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.104.tar.xz", + "name": "factorio_alpha_x64-1.1.107.tar.xz", "needsAuth": true, - "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", + "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_alpha_x64-1.1.104.tar.xz", + "name": "factorio_alpha_x64-1.1.107.tar.xz", "needsAuth": true, - "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", + "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", + "version": "1.1.107" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.104.tar.xz", + "name": "factorio_demo_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", + "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/demo/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/demo/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_demo_x64-1.1.104.tar.xz", + "name": "factorio_demo_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", + "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/demo/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/demo/linux64", + "version": "1.1.107" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.104.tar.xz", + "name": "factorio_headless_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", + "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/headless/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/headless/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_headless_x64-1.1.104.tar.xz", + "name": "factorio_headless_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", + "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/headless/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/headless/linux64", + "version": "1.1.107" } } } diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 3acf6a8aa62de..7e1bdd1d48cee 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; + configureFlags = [ + # register keyword is removed in c++17 so stick to c++14 + "CXXFLAGS=-std=c++14" + ]; + postInstall = '' wrapProgram $out/bin/gnuchessx --set PATH "$out/bin" wrapProgram $out/bin/gnuchessu --set PATH "$out/bin" diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 535039c79f2fa..8e38f232f21e9 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -62,15 +62,17 @@ stdenv.mkDerivation rec { # it tries to run everything with relative paths, which makes it CWD dependent # also point mod, screenshot, and save directory to $XDG_DATA_HOME - # additionally, add some GC options to improve performance of the game - # and remove flags "PermSize" and "MaxPermSize" that were removed with Java 8 + # additionally, add some GC options to improve performance of the game, + # remove flags "PermSize" and "MaxPermSize" that were removed with Java 8 and + # pass-through CLI args ($@) to the JVM. postPatch = '' substituteInPlace starsector.sh \ --replace-fail "./jre_linux/bin/java" "${openjdk}/bin/java" \ --replace-fail "./native/linux" "$out/share/starsector/native/linux" \ --replace-fail "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ - --replace-warn "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" \ - --replace-quiet " -XX:PermSize=192m -XX:MaxPermSize=192m" "" + --replace-fail "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" \ + --replace-quiet " -XX:PermSize=192m -XX:MaxPermSize=192m" "" \ + --replace-fail "com.fs.starfarer.StarfarerLauncher" "\"\$@\" com.fs.starfarer.StarfarerLauncher" ''; passthru.updateScript = writeScript "starsector-update-script" '' diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix index d62c01f5eb887..6696d12912e68 100644 --- a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: +{ + lib, + stdenv, + linuxHeaders, + freebsd, + runCommandCC, + buildPackages, +}: stdenv.mkDerivation { pname = "evdev-proto"; @@ -28,7 +35,7 @@ stdenv.mkDerivation { TOUCH = "touch"; XARGS = "xargs"; - ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + ABI_FILE = runCommandCC "abifile" { } "$CC -shared -o $out"; CLEAN_FETCH_ENV = true; INSTALL_AS_USER = true; NO_CHECKSUM = true; diff --git a/pkgs/os-specific/bsd/freebsd/lib/default.nix b/pkgs/os-specific/bsd/freebsd/lib/default.nix index 30fea7e17dce6..26119a8ba1968 100644 --- a/pkgs/os-specific/bsd/freebsd/lib/default.nix +++ b/pkgs/os-specific/bsd/freebsd/lib/default.nix @@ -3,14 +3,16 @@ { inherit version; - mkBsdArch = stdenv': { - x86_64 = "amd64"; - aarch64 = "arm64"; - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; + mkBsdArch = + stdenv': + { + x86_64 = "amd64"; + aarch64 = "arm64"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; install-wrapper = builtins.readFile ./install-wrapper.sh; } diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index 609b3f45b51e6..000377c6af91e 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -1,6 +1,12 @@ -{ stdenv, lib, stdenvNoCC -, fetchzip -, sourceData, versionData, buildFreebsd, patchesRoot +{ + stdenv, + lib, + stdenvNoCC, + fetchzip, + sourceData, + versionData, + buildFreebsd, + patchesRoot, }: self: @@ -8,7 +14,8 @@ self: lib.packagesFromDirectoryRecursive { callPackage = self.callPackage; directory = ./pkgs; -} // { +} +// { inherit sourceData patchesRoot versionData; # Keep the crawled portion of Nixpkgs finite. @@ -21,11 +28,15 @@ lib.packagesFromDirectoryRecursive { compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat; freebsd-lib = import ./lib { - version = lib.concatStringsSep "." (map toString (lib.filter (x: x != null) [ - self.versionData.major - self.versionData.minor - self.versionData.patch or null - ])); + version = lib.concatStringsSep "." ( + map toString ( + lib.filter (x: x != null) [ + self.versionData.major + self.versionData.minor + self.versionData.patch or null + ] + ) + ); }; # The manual callPackages below should in principle be unnecessary, but are @@ -51,21 +62,21 @@ lib.packagesFromDirectoryRecursive { }; libc = self.callPackage ./pkgs/libc/package.nix { - inherit (buildFreebsd) makeMinimal install gencat rpcgen; + inherit (buildFreebsd) + makeMinimal + install + gencat + rpcgen + ; inherit (self) csu include; }; - libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { - inherit (buildFreebsd) makeMinimal; - }; + libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { inherit (buildFreebsd) makeMinimal; }; mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { inherit stdenv; inherit (buildFreebsd) makeMinimal install tsort; }; - makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { - inherit (self) make; - }; - + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix index 71ecef1bcae47..966489d9aef36 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix @@ -1,7 +1,10 @@ { buildPackages, freebsd-lib }: # Wrap NetBSD's install -buildPackages.writeShellScriptBin "boot-install" (freebsd-lib.install-wrapper + '' +buildPackages.writeShellScriptBin "boot-install" ( + freebsd-lib.install-wrapper + + '' - ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" -'') + ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" + '' +) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index d31e3b05427bb..be3a7a9104745 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -1,9 +1,16 @@ -{ lib, stdenv, mkDerivation, patchesRoot -, bsdSetupHook, freebsdSetupHook -, makeMinimal, boot-install -, which -, freebsd-lib -, expat, zlib, +{ + lib, + stdenv, + mkDerivation, + patchesRoot, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + boot-install, + which, + freebsd-lib, + expat, + zlib, }: let @@ -13,90 +20,95 @@ in mkDerivation rec { pname = "compat"; path = "tools/build"; - extraPaths = [ - "lib/libc/db" - "lib/libc/stdlib" # getopt - "lib/libc/gen" # getcap - "lib/libc/locale" # rpmatch - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "lib/libc/string" # strlcpy - "lib/libutil" - ] ++ [ - "contrib/libc-pwcache" - "contrib/libc-vis" - "sys/libkern" - "sys/kern/subr_capability.c" - - # Take only individual headers, or else we will clobber native libc, etc. - - "sys/rpc/types.h" - - # Listed in Makekfile as INC - "include/mpool.h" - "include/ndbm.h" - "include/err.h" - "include/stringlist.h" - "include/a.out.h" - "include/nlist.h" - "include/db.h" - "include/getopt.h" - "include/nl_types.h" - "include/elf.h" - "sys/sys/ctf.h" - - # Listed in Makekfile as SYSINC - - "sys/sys/capsicum.h" - "sys/sys/caprights.h" - "sys/sys/imgact_aout.h" - "sys/sys/nlist_aout.h" - "sys/sys/nv.h" - "sys/sys/dnv.h" - "sys/sys/cnv.h" - - "sys/sys/elf32.h" - "sys/sys/elf64.h" - "sys/sys/elf_common.h" - "sys/sys/elf_generic.h" - "sys/${mkBsdArch stdenv}/include" - ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "sys/x86/include" - ] ++ [ - - "sys/sys/queue.h" - "sys/sys/md5.h" - "sys/sys/sbuf.h" - "sys/sys/tree.h" - "sys/sys/font.h" - "sys/sys/consio.h" - "sys/sys/fnv_hash.h" - - "sys/crypto/chacha20/_chacha.h" - "sys/crypto/chacha20/chacha.h" - # included too, despite ".c" - "sys/crypto/chacha20/chacha.c" - - "sys/fs" - "sys/ufs" - "sys/sys/disk" - - "lib/libcapsicum" - "lib/libcasper" - ]; + extraPaths = + [ + "lib/libc/db" + "lib/libc/stdlib" # getopt + "lib/libc/gen" # getcap + "lib/libc/locale" # rpmatch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "lib/libc/string" # strlcpy + "lib/libutil" + ] + ++ [ + "contrib/libc-pwcache" + "contrib/libc-vis" + "sys/libkern" + "sys/kern/subr_capability.c" + + # Take only individual headers, or else we will clobber native libc, etc. + + "sys/rpc/types.h" + + # Listed in Makekfile as INC + "include/mpool.h" + "include/ndbm.h" + "include/err.h" + "include/stringlist.h" + "include/a.out.h" + "include/nlist.h" + "include/db.h" + "include/getopt.h" + "include/nl_types.h" + "include/elf.h" + "sys/sys/ctf.h" + + # Listed in Makekfile as SYSINC + + "sys/sys/capsicum.h" + "sys/sys/caprights.h" + "sys/sys/imgact_aout.h" + "sys/sys/nlist_aout.h" + "sys/sys/nv.h" + "sys/sys/dnv.h" + "sys/sys/cnv.h" + + "sys/sys/elf32.h" + "sys/sys/elf64.h" + "sys/sys/elf_common.h" + "sys/sys/elf_generic.h" + "sys/${mkBsdArch stdenv}/include" + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ "sys/x86/include" ] + ++ [ + + "sys/sys/queue.h" + "sys/sys/md5.h" + "sys/sys/sbuf.h" + "sys/sys/tree.h" + "sys/sys/font.h" + "sys/sys/consio.h" + "sys/sys/fnv_hash.h" + + "sys/crypto/chacha20/_chacha.h" + "sys/crypto/chacha20/chacha.h" + # included too, despite ".c" + "sys/crypto/chacha20/chacha.c" + + "sys/fs" + "sys/ufs" + "sys/sys/disk" + + "lib/libcapsicum" + "lib/libcasper" + ]; patches = [ /${patchesRoot}/compat-install-dirs.patch /${patchesRoot}/compat-fix-typedefs-locations.patch ]; - preBuild = '' - NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys' + preBuild = + '' + NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys' - cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys - cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys/${mkBsdArch stdenv} - '' + lib.optionalString stdenv.hostPlatform.isx86 '' - cp ../../sys/x86/include/elf.h ../../sys/x86 - ''; + cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys + cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys/${mkBsdArch stdenv} + '' + + lib.optionalString stdenv.hostPlatform.isx86 '' + cp ../../sys/x86/include/elf.h ../../sys/x86 + ''; setupHooks = [ ../../../../../build-support/setup-hooks/role.bash @@ -109,13 +121,17 @@ mkDerivation rec { ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal boot-install which ]; - buildInputs = [ expat zlib ]; + buildInputs = [ + expat + zlib + ]; makeFlags = [ "STRIP=-s" # flag to install, not command @@ -124,12 +140,15 @@ mkDerivation rec { "INSTALL=boot-install" ]; - preIncludes = '' - mkdir -p $out/{0,1}-include - cp --no-preserve=mode -r cross-build/include/common/* $out/0-include - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include - ''; + preIncludes = + '' + mkdir -p $out/{0,1}-include + cp --no-preserve=mode -r cross-build/include/common/* $out/0-include + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include + ''; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/config.nix b/pkgs/os-specific/bsd/freebsd/pkgs/config.nix index 641cfc46b4e9b..f7ba273ed5583 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/config.nix @@ -1,17 +1,35 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, flex, byacc, file2c -, compatIfNeeded, libnv, libsbuf +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + file2c, + compatIfNeeded, + libnv, + libsbuf, }: mkDerivation { path = "usr.sbin/config"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff - flex byacc file2c + flex + byacc + file2c + ]; + buildInputs = compatIfNeeded ++ [ + libnv + libsbuf ]; - buildInputs = compatIfNeeded ++ [ libnv libsbuf ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index 0b17cb1c8481d..fd62338d7f9f0 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -1,9 +1,14 @@ -{ lib, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, flex, byacc, gencat -, include +{ + lib, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + flex, + byacc, + gencat, + include, }: mkDerivation { @@ -13,11 +18,14 @@ mkDerivation { "lib/libc/include/libc_private.h" ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal install - flex byacc gencat + flex + byacc + gencat ]; buildInputs = [ include ]; MK_TESTS = "no"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix index 0aebc9b3d0b93..a85836e58b8de 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, compatIfNeeded, libelf, libdwarf, zlib, libspl +{ + lib, + stdenv, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + compatIfNeeded, + libelf, + libdwarf, + zlib, + libspl, }: mkDerivation { @@ -16,13 +27,20 @@ mkDerivation { OPENSOLARIS_USR_DISTDIR = "$(SRCTOP)/cddl/contrib/opensolaris"; OPENSOLARIS_SYS_DISTDIR = "$(SRCTOP)/sys/cddl/contrib/opensolaris"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff # flex byacc file2c ]; buildInputs = compatIfNeeded ++ [ - libelf libdwarf zlib libspl + libelf + libdwarf + zlib + libspl ]; meta.license = lib.licenses.cddl; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix index 430c4c5c43ac1..ef4a14ccf4aa9 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix @@ -1,5 +1,3 @@ { makeSetupHook }: -makeSetupHook { - name = "freebsd-setup-hook"; -} ./setup-hook.sh +makeSetupHook { name = "freebsd-setup-hook"; } ./setup-hook.sh diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix index e9ae9f27cc05b..ea701b6404ecc 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix @@ -1,5 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/gencat"; -} +mkDerivation { path = "usr.bin/gencat"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 5c6f3ac4a16b6..fd17dcbb99e0b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -1,9 +1,16 @@ -{ lib, mkDerivation, patchesRoot -, buildPackages -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, mandoc, groff, rsync /*, nbperf*/, rpcgen +{ + lib, + mkDerivation, + patchesRoot, + buildPackages, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, # , nbperf + rpcgen, }: mkDerivation { @@ -15,19 +22,21 @@ mkDerivation { "sys" ]; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook makeMinimal install - mandoc groff rsync /*nbperf*/ rpcgen + mandoc + groff + rsync # nbperf + rpcgen # HACK use NetBSD's for now buildPackages.netbsd.mtree ]; - patches = [ - /${patchesRoot}/no-perms-BSD.include.dist.patch - ]; + patches = [ /${patchesRoot}/no-perms-BSD.include.dist.patch ]; # The makefiles define INCSDIR per subdirectory, so we have to set # something else on the command line so those definitions aren't @@ -39,9 +48,7 @@ mkDerivation { {} \; ''; - makeFlags = [ - "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" - ]; + makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; # multiple header dirs, see above postConfigure = '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix index 3db6cd3633d49..0f70087618df0 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix @@ -1,31 +1,49 @@ -{ lib, stdenv, mkDerivation, writeShellScript -, freebsd-lib -, mtree -, bsdSetupHook, freebsdSetupHook -, makeMinimal, mandoc, groff -, boot-install, install -, compatIfNeeded, libmd, libnetbsd +{ + lib, + stdenv, + mkDerivation, + writeShellScript, + freebsd-lib, + mtree, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + mandoc, + groff, + boot-install, + install, + compatIfNeeded, + libmd, + libnetbsd, }: # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. let - binstall = writeShellScript "binstall" (freebsd-lib.install-wrapper + '' + binstall = writeShellScript "binstall" ( + freebsd-lib.install-wrapper + + '' - @out@/bin/xinstall "''${args[@]}" - ''); -in mkDerivation { + @out@/bin/xinstall "''${args[@]}" + '' + ); +in +mkDerivation { path = "usr.bin/xinstall"; extraPaths = [ mtree.path ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal mandoc groff - (if stdenv.hostPlatform == stdenv.buildPlatform - then boot-install - else install) + bsdSetupHook + freebsdSetupHook + makeMinimal + mandoc + groff + (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install) ]; skipIncludesPhase = true; - buildInputs = compatIfNeeded ++ [ libmd libnetbsd ]; + buildInputs = compatIfNeeded ++ [ + libmd + libnetbsd + ]; makeFlags = [ "STRIP=-s" # flag to install, not command "MK_WERROR=no" @@ -37,5 +55,9 @@ in mkDerivation { mv $out/bin/install $out/bin/xinstall ln -s ./binstall $out/bin/install ''; - outputs = [ "out" "man" "test" ]; + outputs = [ + "out" + "man" + "test" + ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 935b48cca5e72..6cf2216ba05f4 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, mkDerivation -, patchesRoot - -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, flex, byacc, gencat, rpcgen - -, csu, include +{ + lib, + stdenv, + mkDerivation, + patchesRoot, + + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + flex, + byacc, + gencat, + rpcgen, + + csu, + include, }: mkDerivation rec { @@ -63,13 +71,20 @@ mkDerivation rec { ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal install - flex byacc gencat rpcgen + flex + byacc + gencat + rpcgen + ]; + buildInputs = [ + include + csu ]; - buildInputs = [ include csu ]; env.NIX_CFLAGS_COMPILE = "-B${csu}/lib"; # Suppress lld >= 16 undefined version errors diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix index 9fc8fc5f9a624..84115b626a7af 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix @@ -1,8 +1,16 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, m4 -, compatIfNeeded, libelf +{ + lib, + stdenv, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + m4, + compatIfNeeded, + libelf, }: mkDerivation { @@ -15,13 +23,15 @@ mkDerivation { "sys/sys/elf_common.h" ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff m4 ]; - buildInputs = compatIfNeeded ++ [ - libelf - ]; + buildInputs = compatIfNeeded ++ [ libelf ]; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix index a44ce1685e57d..881cbfcd811c8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix @@ -1,7 +1,14 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, m4 +{ + lib, + stdenv, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + m4, }: mkDerivation { @@ -15,8 +22,12 @@ mkDerivation { ]; BOOTSTRAPPING = !stdenv.isFreeBSD; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff m4 ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix index 0deea8b2fb7b8..80ea685a3162f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix @@ -1,18 +1,27 @@ -{ lib, stdenv -, mkDerivation, patchesRoot -, bsdSetupHook, freebsdSetupHook, makeMinimal, mandoc, groff -, boot-install, install -, compatIfNeeded +{ + lib, + stdenv, + mkDerivation, + patchesRoot, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + mandoc, + groff, + boot-install, + install, + compatIfNeeded, }: mkDerivation { path = "lib/libnetbsd"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal mandoc groff - (if stdenv.hostPlatform == stdenv.buildPlatform - then boot-install - else install) + bsdSetupHook + freebsdSetupHook + makeMinimal + mandoc + groff + (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install) ]; patches = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ /${patchesRoot}/libnetbsd-do-install.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix index 719474dbb11ac..242492a3f2f23 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix @@ -2,8 +2,6 @@ mkDerivation { path = "lib/libsbuf"; - extraPaths = [ - "sys/kern" - ]; + extraPaths = [ "sys/kern" ]; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index c420d0daf8520..683396d140c2e 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,7 +1,11 @@ -{ mkDerivation, lib, stdenv }: +{ + mkDerivation, + lib, + stdenv, +}: mkDerivation { path = "lib/libutil"; - extraPaths = ["lib/libc/gen"]; + extraPaths = [ "lib/libc/gen" ]; clangFixup = true; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix index d1fd86ab5e463..abbe2079855ed 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix @@ -1,5 +1,7 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, }: mkDerivation rec { @@ -13,8 +15,12 @@ mkDerivation rec { mv "lorder.1" "$man/share/man" ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook + ]; + buildInputs = [ ]; + outputs = [ + "out" + "man" ]; - buildInputs = []; - outputs = [ "out" "man" ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix index fa1722cfec22c..ecf231c304145 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/make.nix @@ -1,20 +1,25 @@ -{ lib, mkDerivation, stdenv }: +{ + lib, + mkDerivation, + stdenv, +}: mkDerivation { path = "contrib/bmake"; version = "9.2"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + postPatch = + '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - ''; + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; - extraPaths = [ "share/mk" ] - ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "tools/build/mk"; + extraPaths = [ "share/mk" ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "tools/build/mk"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix index e6a8e38a4acec..c510a4da4b825 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix @@ -1,19 +1,24 @@ -{ lib, stdenv, mkDerivation -, make -, bsdSetupHook, freebsdSetupHook +{ + lib, + stdenv, + mkDerivation, + make, + bsdSetupHook, + freebsdSetupHook, }: mkDerivation rec { inherit (make) path; - buildInputs = []; + buildInputs = [ ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook ]; skipIncludesPhase = true; - makeFlags = []; + makeFlags = [ ]; postPatch = '' patchShebangs configure diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 79428626b8ec2..b5c962064fad2 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -1,78 +1,99 @@ -{ lib, stdenv, stdenvNoCC -, compatIfNeeded -, runCommand, rsync -, freebsd-lib -, source -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install, tsort, lorder, mandoc, groff +{ + lib, + stdenv, + stdenvNoCC, + compatIfNeeded, + runCommand, + rsync, + freebsd-lib, + source, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, }: -lib.makeOverridable (attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; -in stdenv'.mkDerivation (rec { - pname = "${attrs.pname or (baseNameOf attrs.path)}-freebsd"; - inherit (freebsd-lib) version; - src = runCommand "${pname}-filtered-src" { - nativeBuildInputs = [ rsync ]; - } '' - for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [])}; do - set -x - path="$out/$p" - mkdir -p "$(dirname "$path")" - src_path="${source}/$p" - if [[ -d "$src_path" ]]; then src_path+=/; fi - rsync --chmod="+w" -r "$src_path" "$path" - set +x - done - ''; +lib.makeOverridable ( + attrs: + let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in + stdenv'.mkDerivation ( + rec { + pname = "${attrs.pname or (baseNameOf attrs.path)}-freebsd"; + inherit (freebsd-lib) version; + src = runCommand "${pname}-filtered-src" { nativeBuildInputs = [ rsync ]; } '' + for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [ ])}; do + set -x + path="$out/$p" + mkdir -p "$(dirname "$path")" + src_path="${source}/$p" + if [[ -d "$src_path" ]]; then src_path+=/; fi + rsync --chmod="+w" -r "$src_path" "$path" + set +x + done + ''; - extraPaths = [ ]; + extraPaths = [ ]; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal - install tsort lorder mandoc groff #statHook - ]; - buildInputs = compatIfNeeded; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff # statHook + ]; + buildInputs = compatIfNeeded; - HOST_SH = stdenv'.shell; + HOST_SH = stdenv'.shell; - # Since STRIP below is the flag - STRIPBIN = "${stdenv.cc.bintools.targetPrefix}strip"; + # Since STRIP below is the flag + STRIPBIN = "${stdenv.cc.bintools.targetPrefix}strip"; - makeFlags = [ - "STRIP=-s" # flag to install, not command - ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + makeFlags = [ + "STRIP=-s" # flag to install, not command + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; - # amd64 not x86_64 for this on unlike NetBSD - MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv'; + # amd64 not x86_64 for this on unlike NetBSD + MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv'; - MACHINE = freebsd-lib.mkBsdArch stdenv'; + MACHINE = freebsd-lib.mkBsdArch stdenv'; - MACHINE_CPUARCH = MACHINE_ARCH; + MACHINE_CPUARCH = MACHINE_ARCH; - COMPONENT_PATH = attrs.path or null; + COMPONENT_PATH = attrs.path or null; - strictDeps = true; + strictDeps = true; - meta = with lib; { - maintainers = with maintainers; [ ericson2314 ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; -} // lib.optionalAttrs stdenv'.hasCC { - # TODO should CC wrapper set this? - CPP = "${stdenv'.cc.targetPrefix}cpp"; -} // lib.optionalAttrs stdenv'.isDarwin { - MKRELRO = "no"; -} // lib.optionalAttrs (stdenv'.cc.isClang or false) { - HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.cc.isGNU or false) { - HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.isx86_32) { - USE_SSP = "no"; -} // lib.optionalAttrs (attrs.headersOnly or false) { - installPhase = "includesPhase"; - dontBuild = true; -} // attrs)) + meta = with lib; { + maintainers = with maintainers; [ ericson2314 ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + } + // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; + } + // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } + // attrs + ) +) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix index 56dff7d606bd9..bf7d8b7db689b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix @@ -1,5 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "sbin/mknod"; -} +mkDerivation { path = "sbin/mknod"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix index c2e64cb36601f..409064f2b65dc 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix @@ -1,4 +1,9 @@ -{ lib, mkDerivation, stdenv, patchesRoot }: +{ + lib, + mkDerivation, + stdenv, + patchesRoot, +}: mkDerivation rec { path = "usr.bin/rpcgen"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix index c730f00869f8e..a801ab895441c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix @@ -1,13 +1,22 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, }: # Don't add this to nativeBuildInputs directly. Use statHook instead. mkDerivation { path = "usr.bin/stat"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix b/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix index 07129938b0953..4609c004e6f51 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix @@ -1,12 +1,16 @@ -{ makeSetupHook, writeText, stat }: +{ + makeSetupHook, + writeText, + stat, +}: # stat isn't in POSIX, and NetBSD stat supports a completely # different range of flags than GNU stat, so including it in PATH # breaks stdenv. Work around that with a hook that will point # NetBSD's build system and NetBSD stat without including it in # PATH. -makeSetupHook { - name = "netbsd-stat-hook"; -} (writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) -'') +makeSetupHook { name = "netbsd-stat-hook"; } ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' +) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index ab0edbabceab9..50fff7738919b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -1,67 +1,92 @@ -{ stdenv, mkDerivation, freebsd-lib, patchesRoot -, buildPackages -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, config, rpcgen, file2c, gawk, uudecode, xargs-j #, ctfconvert +{ + stdenv, + mkDerivation, + freebsd-lib, + patchesRoot, + buildPackages, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + config, + rpcgen, + file2c, + gawk, + uudecode, + xargs-j, # , ctfconvert }: -mkDerivation (let - cfg = "MINIMAL"; -in rec { - path = "sys"; - - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff - - config rpcgen file2c gawk uudecode xargs-j - #ctfconvert - ]; - - patches = [ - /${patchesRoot}/sys-gnu-date.patch - /${patchesRoot}/sys-no-explicit-intrinsics-dep.patch - ]; - - # --dynamic-linker /red/herring is used when building the kernel. - NIX_ENFORCE_PURITY = 0; - - AWK = "${buildPackages.gawk}/bin/awk"; - - CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; - - MK_CTF = "no"; - - KODIR = "${builtins.placeholder "out"}/kernel"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; - DTBDIR = "${builtins.placeholder"out"}/dbt"; - - KERN_DEBUGDIR = "${builtins.placeholder "out"}/debug"; - KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; - KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; - - skipIncludesPhase = true; - - configurePhase = '' - runHook preConfigure - - for f in conf/kmod.mk contrib/dev/acpica/acpica_prep.sh; do - substituteInPlace "$f" --replace 'xargs -J' 'xargs-j ' - done - - for f in conf/*.mk; do - substituteInPlace "$f" --replace 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' - done - - cd ${freebsd-lib.mkBsdArch stdenv}/conf - sed -i ${cfg} \ - -e 's/WITH_CTF=1/WITH_CTF=0/' \ - -e '/KDTRACE/d' - config ${cfg} - - runHook postConfigure - ''; - preBuild = '' - cd ../compile/${cfg} - ''; -}) +mkDerivation ( + let + cfg = "MINIMAL"; + in + rec { + path = "sys"; + + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff + + config + rpcgen + file2c + gawk + uudecode + xargs-j + #ctfconvert + ]; + + patches = [ + /${patchesRoot}/sys-gnu-date.patch + /${patchesRoot}/sys-no-explicit-intrinsics-dep.patch + ]; + + # --dynamic-linker /red/herring is used when building the kernel. + NIX_ENFORCE_PURITY = 0; + + AWK = "${buildPackages.gawk}/bin/awk"; + + CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; + + MK_CTF = "no"; + + KODIR = "${builtins.placeholder "out"}/kernel"; + KMODDIR = "${builtins.placeholder "out"}/kernel"; + DTBDIR = "${builtins.placeholder "out"}/dbt"; + + KERN_DEBUGDIR = "${builtins.placeholder "out"}/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; + + skipIncludesPhase = true; + + configurePhase = '' + runHook preConfigure + + for f in conf/kmod.mk contrib/dev/acpica/acpica_prep.sh; do + substituteInPlace "$f" --replace 'xargs -J' 'xargs-j ' + done + + for f in conf/*.mk; do + substituteInPlace "$f" --replace 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' + done + + cd ${freebsd-lib.mkBsdArch stdenv}/conf + sed -i ${cfg} \ + -e 's/WITH_CTF=1/WITH_CTF=0/' \ + -e '/KDTRACE/d' + config ${cfg} + + runHook postConfigure + ''; + preBuild = '' + cd ../compile/${cfg} + ''; + } +) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index cdc1b27ce8fed..ab0101789f491 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,12 +1,21 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, }: mkDerivation { path = "usr.bin/tsort"; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff ]; } diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index fd5e24aa7102a..e0d03108960c0 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,137 +1,187 @@ -{ stdenv, lib, stdenvNoCC -, makeScopeWithSplicing', generateSplicesForMkScope -, buildPackages -, fetchcvs +{ + stdenv, + lib, + stdenvNoCC, + makeScopeWithSplicing', + generateSplicesForMkScope, + buildPackages, + fetchcvs, }: makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "netbsd"; - f = (self: lib.packagesFromDirectoryRecursive { - callPackage = self.callPackage; - directory = ./pkgs; - } // (let inherit (self) mkDerivation; in { - - fetchNetBSD = path: version: sha256: fetchcvs { - cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; - module = "src/${path}"; - inherit sha256; - tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; - }; - - defaultMakeFlags = [ - "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" - then "yes" - else "no"}" - ]; - - compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; - - # The manual callPackages below should in principle be unnecessary because - # they're just selecting arguments that would be selected anyway. However, - # if we don't perform these manual calls, we get infinite recursion issues - # because of the splices. - - mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { - inherit stdenv stdenvNoCC; - inherit (buildPackages.netbsd) netbsdSetupHook makeMinimal install tsort lorder; - inherit (buildPackages) mandoc; - inherit (buildPackages.buildPackages) rsync; - - }; - - makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { - inherit (self) make; - }; - - compat = self.callPackage ./pkgs/compat/package.nix { - inherit (buildPackages) coreutils; - inherit (buildPackages.darwin) cctools-port; - inherit (buildPackages.buildPackages) rsync; - inherit (buildPackages.netbsd) makeMinimal; - inherit (self) install include libc libutil; - }; - - install = self.callPackage ./pkgs/install/package.nix { - inherit (self) fts mtree make compatIfNeeded; - inherit (buildPackages.buildPackages) rsync; - inherit (buildPackages.netbsd) makeMinimal; - }; - - # See note in pkgs/stat/package.nix - stat = self.callPackage ./pkgs/stat/package.nix { - inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; - }; - - # See note in pkgs/stat/hook.nix - statHook = self.callPackage ./pkgs/stat/hook.nix { - inherit (self) stat; - }; - - tsort = self.callPackage ./pkgs/tsort.nix { - inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; - }; - - lorder = self.callPackage ./pkgs/lorder.nix { - inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; - }; - - config = self.callPackage ./pkgs/config.nix { - inherit (buildPackages.netbsd) makeMinimal install; - inherit (buildPackages.buildPackages) rsync; - inherit (self) cksum; - }; - - include = self.callPackage ./pkgs/include.nix { - inherit (buildPackages.netbsd) - makeMinimal install nbperf rpcgen; - inherit (buildPackages) stdenv; - inherit (buildPackages.buildPackages) rsync; - }; - - sys-headers = self.callPackage ./pkgs/sys/headers.nix { - inherit (buildPackages.netbsd) - makeMinimal install tsort lorder statHook uudecode config genassym; - inherit (buildPackages.buildPackages) rsync; - }; - - libutil = self.callPackage ./pkgs/libutil.nix { - inherit (self) libc sys; - }; - - libpthread-headers = self.callPackage ./pkgs/libpthread/headers.nix { }; - - csu = self.callPackage ./pkgs/csu.nix { - inherit (self) headers sys ld_elf_so; - inherit (buildPackages.netbsd) - netbsdSetupHook - makeMinimal - install - genassym gencat lorder tsort statHook; - inherit (buildPackages.buildPackages) rsync; - }; - - _mainLibcExtraPaths = with self; [ - common i18n_module.src sys.src - ld_elf_so.src libpthread.src libm.src libresolv.src - librpcsvc.src libutil.src librt.src libcrypt.src - ]; - - libc = self.callPackage ./pkgs/libc.nix { - inherit (self) headers csu librt; - inherit (buildPackages.netbsd) - netbsdSetupHook - makeMinimal - install - genassym gencat lorder tsort statHook rpcgen; - inherit (buildPackages.buildPackages) rsync; - }; - - mtree = self.callPackage ./pkgs/mtree.nix { - inherit (self) mknod; - }; - - })); + f = ( + self: + lib.packagesFromDirectoryRecursive { + callPackage = self.callPackage; + directory = ./pkgs; + } + // { + + fetchNetBSD = + path: version: sha256: + fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src/${path}"; + inherit sha256; + tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; + }; + + defaultMakeFlags = [ + "MKSOFTFLOAT=${ + if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" then + "yes" + else + "no" + }" + ]; + + compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; + + # The manual callPackages below should in principle be unnecessary because + # they're just selecting arguments that would be selected anyway. However, + # if we don't perform these manual calls, we get infinite recursion issues + # because of the splices. + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { + inherit stdenv stdenvNoCC; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + tsort + lorder + ; + inherit (buildPackages) mandoc; + inherit (buildPackages.buildPackages) rsync; + }; + + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; + + compat = self.callPackage ./pkgs/compat/package.nix { + inherit (buildPackages) coreutils; + inherit (buildPackages.darwin) cctools-port; + inherit (buildPackages.buildPackages) rsync; + inherit (buildPackages.netbsd) makeMinimal; + inherit (self) + install + include + libc + libutil + ; + }; + + install = self.callPackage ./pkgs/install/package.nix { + inherit (self) + fts + mtree + make + compatIfNeeded + ; + inherit (buildPackages.buildPackages) rsync; + inherit (buildPackages.netbsd) makeMinimal; + }; + + # See note in pkgs/stat/package.nix + stat = self.callPackage ./pkgs/stat/package.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + # See note in pkgs/stat/hook.nix + statHook = self.callPackage ./pkgs/stat/hook.nix { inherit (self) stat; }; + + tsort = self.callPackage ./pkgs/tsort.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + lorder = self.callPackage ./pkgs/lorder.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + config = self.callPackage ./pkgs/config.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + inherit (self) cksum; + }; + + include = self.callPackage ./pkgs/include.nix { + inherit (buildPackages.netbsd) + makeMinimal + install + nbperf + rpcgen + ; + inherit (buildPackages) stdenv; + inherit (buildPackages.buildPackages) rsync; + }; + + sys-headers = self.callPackage ./pkgs/sys/headers.nix { + inherit (buildPackages.netbsd) + makeMinimal + install + tsort + lorder + statHook + uudecode + config + genassym + ; + inherit (buildPackages.buildPackages) rsync; + }; + + libutil = self.callPackage ./pkgs/libutil.nix { inherit (self) libc sys; }; + + libpthread-headers = self.callPackage ./pkgs/libpthread/headers.nix { }; + + csu = self.callPackage ./pkgs/csu.nix { + inherit (self) headers sys ld_elf_so; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + genassym + gencat + lorder + tsort + statHook + ; + inherit (buildPackages.buildPackages) rsync; + }; + + _mainLibcExtraPaths = with self; [ + common + i18n_module.src + sys.src + ld_elf_so.src + libpthread.src + libm.src + libresolv.src + librpcsvc.src + libutil.src + librt.src + libcrypt.src + ]; + + libc = self.callPackage ./pkgs/libc.nix { + inherit (self) headers csu librt; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + genassym + gencat + lorder + tsort + statHook + rpcgen + ; + inherit (buildPackages.buildPackages) rsync; + }; + + mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) mknod; }; + } + ); } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index a1336ad52f6dc..4c149e95c1ae6 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -1,21 +1,29 @@ -{ lib, mkDerivation, stdenv -, zlib -, defaultMakeFlags -, coreutils -, cctools-port -, include, libc, libutil -, install -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, rsync -, fetchNetBSD -, _mainLibcExtraPaths +{ + lib, + mkDerivation, + stdenv, + zlib, + defaultMakeFlags, + coreutils, + cctools-port, + include, + libc, + libutil, + install, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + rsync, + fetchNetBSD, + _mainLibcExtraPaths, }: -mkDerivation (let +mkDerivation ( + let version = "9.2"; commonDeps = [ zlib ]; - in { + in + { path = "tools/compat"; sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; inherit version; @@ -29,19 +37,23 @@ mkDerivation (let make include/.stamp configure nbtool_config.h.in defs.mk.in ''; - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--cache-file=config.cache" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - # We include this header in our musl package only for legacy - # compatibility, and compat works fine without it (and having it - # know about sys/cdefs.h breaks packages like glib when built - # statically). - "ac_cv_header_sys_cdefs_h=no" + configurePlatforms = [ + "build" + "host" ]; + configureFlags = + [ "--cache-file=config.cache" ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + # We include this header in our musl package only for legacy + # compatibility, and compat works fine without it (and having it + # know about sys/cdefs.h breaks packages like glib when built + # statically). + "ac_cv_header_sys_cdefs_h=no" + ]; nativeBuildInputs = commonDeps ++ [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal rsync ]; @@ -50,22 +62,27 @@ mkDerivation (let # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = defaultMakeFlags ++ [ - "INSTALL=${coreutils}/bin/install" - "DATADIR=$(out)/share" - # Can't sort object files yet - "LORDER=echo" - "TSORT=cat" - # Can't process man pages yet - "MKSHARE=no" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # GNU objcopy produces broken .a libs which won't link into dependers. - # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. - "OBJCOPY=${cctools-port}/bin/strip" - ]; + makeFlags = + defaultMakeFlags + ++ [ + "INSTALL=${coreutils}/bin/install" + "DATADIR=$(out)/share" + # Can't sort object files yet + "LORDER=echo" + "TSORT=cat" + # Can't process man pages yet + "MKSHARE=no" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # GNU objcopy produces broken .a libs which won't link into dependers. + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. + "OBJCOPY=${cctools-port}/bin/strip" + ]; RENAME = "-D"; - passthru.tests = { netbsd-install = install; }; + passthru.tests = { + netbsd-install = install; + }; patches = [ ./compat-cxx-safe-header.patch @@ -79,42 +96,51 @@ mkDerivation (let makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') ''; - postInstall = '' - # why aren't these installed by netbsd? - install -D compat_defs.h $out/include/compat_defs.h - install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h - install -D $BSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h - install -D $BSDSRCDIR/sys/sys/featuretest.h \ - $out/include/sys/featuretest.h - install -D $BSDSRCDIR/sys/sys/md5.h $out/include/md5.h - install -D $BSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h - install -D $BSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h - install -D $BSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h - install -D $BSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h - install -D $BSDSRCDIR/include/vis.h $out/include/vis.h - install -D $BSDSRCDIR/include/db.h $out/include/db.h - install -D $BSDSRCDIR/include/netconfig.h $out/include/netconfig.h - install -D $BSDSRCDIR/include/utmpx.h $out/include/utmpx.h - install -D $BSDSRCDIR/include/tzfile.h $out/include/tzfile.h - install -D $BSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h - install -D $BSDSRCDIR/include/nl_types.h $out/include/nl_types.h - install -D $BSDSRCDIR/include/stringlist.h $out/include/stringlist.h + postInstall = + '' + # why aren't these installed by netbsd? + install -D compat_defs.h $out/include/compat_defs.h + install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h + install -D $BSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h + install -D $BSDSRCDIR/sys/sys/featuretest.h \ + $out/include/sys/featuretest.h + install -D $BSDSRCDIR/sys/sys/md5.h $out/include/md5.h + install -D $BSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h + install -D $BSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h + install -D $BSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $BSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h + install -D $BSDSRCDIR/include/vis.h $out/include/vis.h + install -D $BSDSRCDIR/include/db.h $out/include/db.h + install -D $BSDSRCDIR/include/netconfig.h $out/include/netconfig.h + install -D $BSDSRCDIR/include/utmpx.h $out/include/utmpx.h + install -D $BSDSRCDIR/include/tzfile.h $out/include/tzfile.h + install -D $BSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h + install -D $BSDSRCDIR/include/nl_types.h $out/include/nl_types.h + install -D $BSDSRCDIR/include/stringlist.h $out/include/stringlist.h - # Collapse includes slightly to fix dangling reference - install -D $BSDSRCDIR/common/include/rpc/types.h $out/include/rpc/types.h - sed -i '1s;^;#include "nbtool_config.h"\n;' $out/include/rpc/types.h - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/include/ssp - touch $out/include/ssp/ssp.h - '' + '' - mkdir -p $out/lib/pkgconfig - substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ - --subst-var-by out $out \ - --subst-var-by version ${version} - ''; - extraPaths = [ include.src libc.src libutil.src + # Collapse includes slightly to fix dangling reference + install -D $BSDSRCDIR/common/include/rpc/types.h $out/include/rpc/types.h + sed -i '1s;^;#include "nbtool_config.h"\n;' $out/include/rpc/types.h + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/include/ssp + touch $out/include/ssp/ssp.h + '' + + '' + mkdir -p $out/lib/pkgconfig + substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ + --subst-var-by out $out \ + --subst-var-by version ${version} + ''; + extraPaths = [ + include.src + libc.src + libutil.src (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") - (fetchNetBSD "common/include/rpc/types.h" "9.2" "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a") + (fetchNetBSD "common/include/rpc/types.h" "9.2" + "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a" + ) ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; - }) + } +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix index 277d70129e6f7..c423f3ca86760 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -1,8 +1,15 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal, install, mandoc, byacc, flex, rsync -, compatIfNeeded -, cksum +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + byacc, + flex, + rsync, + compatIfNeeded, + cksum, }: mkDerivation { path = "usr.bin/config"; @@ -10,8 +17,14 @@ mkDerivation { sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook - makeMinimal install mandoc byacc flex rsync + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + byacc + flex + rsync ]; buildInputs = compatIfNeeded; extraPaths = [ cksum.src ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix index 2d13ced6d5ed5..66443331490f5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -1,11 +1,23 @@ -{ lib, mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, flex -, byacc, genassym, gencat, lorder, tsort, statHook, rsync -, headers -, sys -, ld_elf_so +{ + lib, + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + genassym, + gencat, + lorder, + tsort, + statHook, + rsync, + headers, + sys, + ld_elf_so, }: mkDerivation { @@ -14,11 +26,24 @@ mkDerivation { sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff flex - byacc genassym gencat lorder tsort statHook rsync + install + mandoc + groff + flex + byacc + genassym + gencat + lorder + tsort + statHook + rsync ]; buildInputs = [ headers ]; - extraPaths = [ sys.src ld_elf_so.src ]; + extraPaths = [ + sys.src + ld_elf_so.src + ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix index 0393d36357f6e..7c64658bf2e51 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -1,7 +1,10 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook, rsync -, compatIfNeeded -, fetchNetBSD +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + rsync, + compatIfNeeded, + fetchNetBSD, }: mkDerivation { @@ -10,12 +13,16 @@ mkDerivation { sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook rsync + bsdSetupHook + netbsdSetupHook + rsync ]; propagatedBuildInputs = compatIfNeeded; extraPaths = [ (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.2" "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc") + (fetchNetBSD "lib/libc/include/namespace.h" "9.2" + "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc" + ) (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; skipIncludesPhase = true; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix index 646e5675130bb..40615b2722d5d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix @@ -1,4 +1,10 @@ -{ lib, symlinkJoin, include, sys-headers, libpthread-headers }: +{ + lib, + symlinkJoin, + include, + sys-headers, + libpthread-headers, +}: symlinkJoin { name = "netbsd-headers-9.2"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix index 60b091ef0b718..c76ada865775e 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, libc }: +{ + lib, + mkDerivation, + libc, +}: mkDerivation { path = "lib/i18n_module"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix index 1ecdec90ae095..ec316a63174fd 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -1,10 +1,18 @@ -{ lib, mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, rsync, nbperf, rpcgen -, common -, defaultMakeFlags -, stdenv +{ + lib, + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, + nbperf, + rpcgen, + common, + defaultMakeFlags, + stdenv, }: mkDerivation { @@ -12,9 +20,15 @@ mkDerivation { version = "9.2"; sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff rsync nbperf rpcgen + install + mandoc + groff + rsync + nbperf + rpcgen ]; # The makefiles define INCSDIR per subdirectory, so we have to set diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index 991517ac2d486..69b0c073259e2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -1,10 +1,16 @@ -{ mkDerivation -, writeShellScript -, mtree, make -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, mandoc, groff, rsync -, compatIfNeeded, fts +{ + mkDerivation, + writeShellScript, + mtree, + make, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + mandoc, + groff, + rsync, + compatIfNeeded, + fts, }: @@ -18,32 +24,39 @@ let @out@/bin/xinstall "$@" ''; in - mkDerivation { - path = "usr.bin/xinstall"; - version = "9.2"; - sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; - extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook - makeMinimal - mandoc groff rsync - ]; - skipIncludesPhase = true; - buildInputs = compatIfNeeded - # fts header is needed. glibc already has this header, but musl doesn't, - # so make sure pkgsMusl.netbsd.install still builds in case you want to - # remove it! - ++ [ fts ]; - installPhase = '' - runHook preInstall +mkDerivation { + path = "usr.bin/xinstall"; + version = "9.2"; + sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; + extraPaths = [ + mtree.src + make.src + ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + mandoc + groff + rsync + ]; + skipIncludesPhase = true; + buildInputs = + compatIfNeeded + # fts header is needed. glibc already has this header, but musl doesn't, + # so make sure pkgsMusl.netbsd.install still builds in case you want to + # remove it! + ++ [ fts ]; + installPhase = '' + runHook preInstall - install -D install.1 $out/share/man/man1/install.1 - install -D xinstall $out/bin/xinstall - install -D -m 0550 ${binstall} $out/bin/binstall - substituteInPlace $out/bin/binstall --subst-var out - ln -s $out/bin/binstall $out/bin/install + install -D install.1 $out/share/man/man1/install.1 + install -D xinstall $out/bin/xinstall + install -D -m 0550 ${binstall} $out/bin/binstall + substituteInPlace $out/bin/binstall --subst-var out + ln -s $out/bin/binstall $out/bin/install - runHook postInstall - ''; - setupHook = ./install-setup-hook.sh; - } + runHook postInstall + ''; + setupHook = ./install-setup-hook.sh; +} diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix index 1496ad6a0e884..a350e81d32064 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix @@ -1,11 +1,12 @@ -{ lib -, mkDerivation -, libc -, defaultMakeFlags +{ + lib, + mkDerivation, + libc, + defaultMakeFlags, }: mkDerivation { - path = "libexec/ld.elf_so"; + path = "libexec/ld.elf_so"; version = "9.2"; sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; @@ -13,6 +14,9 @@ mkDerivation { # Hack to prevent a symlink being installed here for compatibility. SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/libexec" "CLIBOBJ=${libc}/lib" ]; + makeFlags = defaultMakeFlags ++ [ + "BINDIR=$(out)/libexec" + "CLIBOBJ=${libc}/lib" + ]; extraPaths = [ libc.src ] ++ libc.extraPaths; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index ebc01a11668a6..d755e4b6870a1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -1,14 +1,27 @@ -{ lib -, mkDerivation -, defaultMakeFlags -, _mainLibcExtraPaths -, fetchNetBSD -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, flex -, byacc, genassym, gencat, lorder, tsort, statHook, rsync, rpcgen -, csu, headers -, librt +{ + lib, + mkDerivation, + defaultMakeFlags, + _mainLibcExtraPaths, + fetchNetBSD, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + genassym, + gencat, + lorder, + tsort, + statHook, + rsync, + rpcgen, + csu, + headers, + librt, }: mkDerivation { @@ -21,18 +34,32 @@ mkDerivation { (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff flex - byacc genassym gencat lorder tsort statHook rsync rpcgen + install + mandoc + groff + flex + byacc + genassym + gencat + lorder + tsort + statHook + rsync + rpcgen + ]; + buildInputs = [ + headers + csu ]; - buildInputs = [ headers csu ]; env.NIX_CFLAGS_COMPILE = "-B${csu}/lib -fcommon"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; NLSDIR = "$(out)/share/nls"; - makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db"]; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db" ]; postInstall = '' pushd ${headers} find . -type d -exec mkdir -p $out/\{} \; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 2409879640a90..5072821db9117 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -1,7 +1,10 @@ -{ lib, mkDerivation, stdenv -, libterminfo -, compatIfNeeded -, defaultMakeFlags +{ + lib, + mkDerivation, + stdenv, + libterminfo, + compatIfNeeded, + defaultMakeFlags, }: mkDerivation { @@ -9,11 +12,14 @@ mkDerivation { version = "9.2"; sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = [ libterminfo ]; - env.NIX_CFLAGS_COMPILE = toString ([ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="); + env.NIX_CFLAGS_COMPILE = toString ( + [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] + ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=" + ); propagatedBuildInputs = compatIfNeeded; MKDOC = "no"; # missing vfontedpr makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index eb734f34c3d49..ee1e7bf79f964 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -1,26 +1,32 @@ -{ lib, mkDerivation -, libterminfo, libcurses -, compatIfNeeded -, defaultMakeFlags +{ + lib, + mkDerivation, + libterminfo, + libcurses, + compatIfNeeded, + defaultMakeFlags, }: mkDerivation { - path = "lib/libedit"; - version = "9.2"; - sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; - buildInputs = [ libterminfo libcurses ]; - propagatedBuildInputs = compatIfNeeded; - SHLIBINSTALLDIR = "$(out)/lib"; - makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; - postPatch = '' - sed -i '1i #undef bool_t' $COMPONENT_PATH/el.h - substituteInPlace $COMPONENT_PATH/config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" - ''; - env.NIX_CFLAGS_COMPILE = toString [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - } + path = "lib/libedit"; + version = "9.2"; + sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; + buildInputs = [ + libterminfo + libcurses + ]; + propagatedBuildInputs = compatIfNeeded; + SHLIBINSTALLDIR = "$(out)/lib"; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; + postPatch = '' + sed -i '1i #undef bool_t' $COMPONENT_PATH/el.h + substituteInPlace $COMPONENT_PATH/config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" + ''; + env.NIX_CFLAGS_COMPILE = toString [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; +} diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix index 86990088adf28..f36e97f8e6ae0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, sys }: +{ + lib, + mkDerivation, + sys, +}: mkDerivation { path = "lib/libm"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix index 21ca0f62fd4e4..b0be4a2da723a 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, sys }: +{ + lib, + mkDerivation, + sys, +}: mkDerivation { pname = "libpci"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix index 485a12837bcb4..d8ea7c553eba3 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix @@ -3,4 +3,3 @@ version = "9.2"; sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; } - diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix index 3896562501fc5..c3cc899017eee 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix @@ -1,9 +1,12 @@ { lib, mkDerivation }: -mkDerivation (import ./base.nix // { - pname = "libpthread-headers"; - installPhase = "includesPhase"; - dontBuild = true; - noCC = true; - meta.platforms = lib.platforms.netbsd; -}) +mkDerivation ( + import ./base.nix + // { + pname = "libpthread-headers"; + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + meta.platforms = lib.platforms.netbsd; + } +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix index c2a0d407718e9..88d392e20b4a8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -1,15 +1,28 @@ -{ lib, mkDerivation -, headers -, common, libc, librt, sys +{ + lib, + mkDerivation, + headers, + common, + libc, + librt, + sys, }: -mkDerivation (import ./base.nix // { - pname = "libpthread"; - installPhase = null; - noCC = false; - dontBuild = false; - buildInputs = [ headers ]; - SHLIBINSTALLDIR = "$(out)/lib"; - extraPaths = [ common libc.src librt.src sys.src ]; - meta.platforms = lib.platforms.netbsd; -}) +mkDerivation ( + import ./base.nix + // { + pname = "libpthread"; + installPhase = null; + noCC = false; + dontBuild = false; + buildInputs = [ headers ]; + SHLIBINSTALLDIR = "$(out)/lib"; + extraPaths = [ + common + libc.src + librt.src + sys.src + ]; + meta.platforms = lib.platforms.netbsd; + } +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix index 2427592e4aa9a..24bc4f2f9e002 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, libc }: +{ + lib, + mkDerivation, + libc, +}: mkDerivation { path = "lib/libresolv"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix index 87524339e268f..8d757a8a84304 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix @@ -1,9 +1,15 @@ -{ lib -, mkDerivation -, defaultMakeFlags -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, tsort, lorder, rpcgen, statHook +{ + lib, + mkDerivation, + defaultMakeFlags, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + rpcgen, + statHook, }: mkDerivation { @@ -13,9 +19,13 @@ mkDerivation { makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install tsort lorder rpcgen statHook + install + tsort + lorder + rpcgen + statHook ]; } - diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix index 2ffe0787004a5..fa0229953b66b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix @@ -1,4 +1,9 @@ -{ lib, mkDerivation, libc, headers }: +{ + lib, + mkDerivation, + libc, + headers, +}: mkDerivation { path = "lib/librt"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix index b9268cc7ba333..6ac573d865b1a 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -1,8 +1,18 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal, install, tsort, lorder, mandoc, statHook, nbperf, tic, rsync -, compatIfNeeded -, fetchNetBSD +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + statHook, + nbperf, + tic, + rsync, + compatIfNeeded, + fetchNetBSD, }: mkDerivation { @@ -10,8 +20,17 @@ mkDerivation { version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook - makeMinimal install tsort lorder mandoc statHook nbperf tic rsync + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + statHook + nbperf + tic + rsync ]; buildInputs = compatIfNeeded; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index 4aaf8f0e7ab63..fdc57df9c231e 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -1,20 +1,41 @@ -{ mkDerivation -, common, libc, sys -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, byacc, install, tsort, lorder, mandoc, statHook, rsync -, headers +{ + mkDerivation, + common, + libc, + sys, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + byacc, + install, + tsort, + lorder, + mandoc, + statHook, + rsync, + headers, }: mkDerivation { path = "lib/libutil"; version = "9.2"; sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; - extraPaths = [ common libc.src sys.src ]; + extraPaths = [ + common + libc.src + sys.src + ]; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - byacc install tsort lorder mandoc statHook rsync + byacc + install + tsort + lorder + mandoc + statHook + rsync ]; buildInputs = [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix index d3109601382a0..0b99a794b07a0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -1,7 +1,12 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, rsync +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, }: mkDerivation { @@ -9,8 +14,12 @@ mkDerivation { version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff rsync + install + mandoc + groff + rsync ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index dcd80ef004678..381e30916407b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,56 +1,63 @@ -{ lib, mkDerivation, fetchNetBSD, stdenv }: +{ + lib, + mkDerivation, + fetchNetBSD, + stdenv, +}: mkDerivation { path = "usr.bin/make"; sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; version = "9.2"; - postPatch = '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ - --replace '-o ''${DOCOWN}' "" \ - --replace '-g ''${DOCGRP}' "" - for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do - substituteInPlace $mk \ - --replace '-o ''${BINOWN}' "" \ - --replace '-g ''${BINGRP}' "" - done - substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ - --replace '-o ''${KMODULEOWN}' "" \ - --replace '-g ''${KMODULEGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-o ''${LIBOWN}' "" \ - --replace '-g ''${LIBGRP}' "" \ - --replace '-o ''${DEBUGOWN}' "" \ - --replace '-g ''${DEBUGGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ - --replace '-o ''${LIBOWN}' "" \ - --replace '-g ''${LIBGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ - --replace '-o ''${MANOWN}' "" \ - --replace '-g ''${MANGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ - --replace '-o ''${NLSOWN}' "" \ - --replace '-g ''${NLSGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-o ''${BINOWN}' "" \ - --replace '-g ''${BINGRP}' "" \ - --replace '-o ''${RUMPBINOWN}' "" \ - --replace '-g ''${RUMPBINGRP}' "" \ - --replace '-o ''${DEBUGOWN}' "" \ - --replace '-g ''${DEBUGGRP}' "" + postPatch = + '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ + --replace '-o ''${DOCOWN}' "" \ + --replace '-g ''${DOCGRP}' "" + for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do + substituteInPlace $mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" + done + substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ + --replace '-o ''${KMODULEOWN}' "" \ + --replace '-g ''${KMODULEGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ + --replace '-o ''${MANOWN}' "" \ + --replace '-g ''${MANGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ + --replace '-o ''${NLSOWN}' "" \ + --replace '-g ''${NLSGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" \ + --replace '-o ''${RUMPBINOWN}' "" \ + --replace '-g ''${RUMPBINGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - ''; + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix index 18655b3bf863e..585c72bd17987 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -1,6 +1,9 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook, rsync -, make +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + rsync, + make, }: mkDerivation { @@ -8,9 +11,11 @@ mkDerivation { sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; version = "9.2"; - buildInputs = []; + buildInputs = [ ]; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook rsync + bsdSetupHook + netbsdSetupHook + rsync ]; skipIncludesPhase = true; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index 82e8889f6cf4d..849d2b1da3fbf 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -1,82 +1,113 @@ -{ lib -, stdenvNoCC, stdenv -, fetchNetBSD -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, tsort, lorder -, mandoc, groff, statHook, rsync -, compatIfNeeded -, defaultMakeFlags +{ + lib, + stdenvNoCC, + stdenv, + fetchNetBSD, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + statHook, + rsync, + compatIfNeeded, + defaultMakeFlags, }: -lib.makeOverridable (attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; -in stdenv'.mkDerivation ({ - pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; - inherit (attrs) version; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; +lib.makeOverridable ( + attrs: + let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in + stdenv'.mkDerivation ( + { + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; + src = fetchNetBSD attrs.path attrs.version attrs.sha256; - extraPaths = [ ]; + extraPaths = [ ]; - nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook - makeMinimal - install tsort lorder mandoc groff statHook rsync - ]; - buildInputs = compatIfNeeded; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + statHook + rsync + ]; + buildInputs = compatIfNeeded; - HOST_SH = stdenv'.shell; + HOST_SH = stdenv'.shell; - MACHINE_ARCH = { - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; + MACHINE_ARCH = + { + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; - MACHINE = { - x86_64 = "amd64"; - aarch64 = "evbarm64"; - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; + MACHINE = + { + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; - COMPONENT_PATH = attrs.path; + COMPONENT_PATH = attrs.path; - makeFlags = defaultMakeFlags; + makeFlags = defaultMakeFlags; - strictDeps = true; + strictDeps = true; - meta = with lib; { - maintainers = with maintainers; [ matthewbauer qyliss ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; - -} // lib.optionalAttrs stdenv'.hasCC { - # TODO should CC wrapper set this? - CPP = "${stdenv'.cc.targetPrefix}cpp"; -} // lib.optionalAttrs stdenv'.isDarwin { - MKRELRO = "no"; -} // lib.optionalAttrs (stdenv'.cc.isClang or false) { - HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.cc.isGNU or false) { - HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.isx86_32) { - USE_SSP = "no"; -} // lib.optionalAttrs (attrs.headersOnly or false) { - installPhase = "includesPhase"; - dontBuild = true; -} // attrs // { - # Files that use NetBSD-specific macros need to have nbtool_config.h - # included ahead of them on non-NetBSD platforms. - postPatch = lib.optionalString (!stdenv'.hostPlatform.isNetBSD) '' - set +e - grep -Zlr "^__RCSID - ^__BEGIN_DECLS" $COMPONENT_PATH | xargs -0r grep -FLZ nbtool_config.h | - xargs -0tr sed -i '0,/^#/s//#include <nbtool_config.h>\n\0/' - set -e - '' + attrs.postPatch or ""; -})) + meta = with lib; { + maintainers = with maintainers; [ + matthewbauer + qyliss + ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + } + // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; + } + // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } + // attrs + // { + # Files that use NetBSD-specific macros need to have nbtool_config.h + # included ahead of them on non-NetBSD platforms. + postPatch = + lib.optionalString (!stdenv'.hostPlatform.isNetBSD) '' + set +e + grep -Zlr "^__RCSID + ^__BEGIN_DECLS" $COMPONENT_PATH | xargs -0r grep -FLZ nbtool_config.h | + xargs -0tr sed -i '0,/^#/s//#include <nbtool_config.h>\n\0/' + set -e + '' + + attrs.postPatch or ""; + } + ) +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix index 02ce7cf6ce5eb..a23c5dddfc9f8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix @@ -5,4 +5,3 @@ mkDerivation { version = "9.2"; sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; } - diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix index e80571f2bf9a2..31368523ee6fc 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix @@ -1,5 +1,3 @@ { makeSetupHook }: -makeSetupHook { - name = "netbsd-setup-hook"; - } ./setup-hook.sh +makeSetupHook { name = "netbsd-setup-hook"; } ./setup-hook.sh diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix index 78186f55cd455..e38c53a3aac57 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix @@ -1,4 +1,8 @@ -{ makeSetupHook, writeText, stat }: +{ + makeSetupHook, + writeText, + stat, +}: # stat isn't in POSIX, and NetBSD stat supports a completely # different range of flags than GNU stat, so including it in PATH @@ -6,9 +10,8 @@ # NetBSD's build system and NetBSD stat without including it in # PATH. -makeSetupHook { - name = "netbsd-stat-hook"; -} (writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) -'') - +makeSetupHook { name = "netbsd-stat-hook"; } ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix index fa4d5cb3e21f6..397b1f5303c15 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -1,7 +1,12 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, rsync +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, }: # Don't add this to nativeBuildInputs directly. @@ -12,8 +17,12 @@ mkDerivation { version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff rsync + install + mandoc + groff + rsync ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index ba458ef5c712f..4c140fa3bdef7 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -1,9 +1,20 @@ -{ lib, mkDerivation -, include -, bsdSetupHook, netbsdSetupHook -, makeMinimal, install, tsort, lorder, statHook, rsync, uudecode, config, genassym -, defaultMakeFlags -, common +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, }: { path = "sys"; @@ -29,23 +40,34 @@ '' substituteInPlace sys/arch/i386/stand/efiboot/Makefile.efiboot \ --replace "-nocombreloc" "-z nocombreloc" - '' + - # multiple header dirs, see above - include.postPatch; + '' + + + # multiple header dirs, see above + include.postPatch; CONFIG = "GENERIC"; propagatedBuildInputs = [ include ]; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook - makeMinimal install tsort lorder statHook rsync uudecode config genassym + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym ]; - postConfigure = '' - pushd arch/$MACHINE/conf - config $CONFIG - popd - '' + postConfigure = + '' + pushd arch/$MACHINE/conf + config $CONFIG + popd + '' # multiple header dirs, see above + include.postConfigure; @@ -68,5 +90,4 @@ meta.platforms = lib.platforms.netbsd; extraPaths = [ common ]; - } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix index a3f20d772a3e7..2df35efc199ad 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -1,21 +1,49 @@ -{ lib, mkDerivation -, include -, bsdSetupHook, netbsdSetupHook -, makeMinimal, install, tsort, lorder, statHook, rsync, uudecode, config, genassym -, defaultMakeFlags -, common +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, }: let base = import ./base.nix { inherit - lib mkDerivation include bsdSetupHook netbsdSetupHook makeMinimal install - tsort lorder statHook rsync uudecode config genassym defaultMakeFlags - common; + lib + mkDerivation + include + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym + defaultMakeFlags + common + ; }; in - mkDerivation (base // { +mkDerivation ( + base + // { pname = "sys-headers"; installPhase = "includesPhase"; dontBuild = true; noCC = true; - }) + } +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix index 87031a50346ea..c8e6edab5f48f 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -1,21 +1,49 @@ -{ lib, mkDerivation -, include -, bsdSetupHook, netbsdSetupHook -, makeMinimal, install, tsort, lorder, statHook, rsync, uudecode, config, genassym -, defaultMakeFlags -, common +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, }: let base = import ./base.nix { inherit - lib mkDerivation include bsdSetupHook netbsdSetupHook makeMinimal install - tsort lorder statHook rsync uudecode config genassym defaultMakeFlags - common; + lib + mkDerivation + include + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym + defaultMakeFlags + common + ; }; in - mkDerivation (base // { +mkDerivation ( + base + // { pname = "sys"; installPhase = null; noCC = false; dontBuild = false; - }) + } +) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix index 2a7e3644b6be9..e0900652108fd 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -1,11 +1,17 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, nbperf, rsync -, compatIfNeeded -, defaultMakeFlags -, libterminfo -, fetchNetBSD +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + nbperf, + rsync, + compatIfNeeded, + defaultMakeFlags, + libterminfo, + fetchNetBSD, }: mkDerivation { @@ -15,9 +21,14 @@ mkDerivation { HOSTPROG = "tic"; buildInputs = compatIfNeeded; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff nbperf rsync + install + mandoc + groff + nbperf + rsync ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix index 334eccc64c551..9200bc57a73e0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -1,7 +1,12 @@ -{ mkDerivation -, bsdSetupHook, netbsdSetupHook -, makeMinimal -, install, mandoc, groff, rsync +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, }: mkDerivation { @@ -9,8 +14,12 @@ mkDerivation { version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = [ - bsdSetupHook netbsdSetupHook + bsdSetupHook + netbsdSetupHook makeMinimal - install mandoc groff rsync + install + mandoc + groff + rsync ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index dac9674f9d6f3..7592db3eaf180 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, stdenv }: +{ + lib, + mkDerivation, + stdenv, +}: mkDerivation { path = "usr.bin/uudecode"; @@ -7,4 +11,3 @@ mkDerivation { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; } - diff --git a/pkgs/os-specific/linux/nftables/python.nix b/pkgs/os-specific/linux/nftables/python.nix index 5c5770ebed4a5..7980b8ff6de68 100644 --- a/pkgs/os-specific/linux/nftables/python.nix +++ b/pkgs/os-specific/linux/nftables/python.nix @@ -10,7 +10,7 @@ buildPythonPackage { pyproject = true; postPatch = '' - substituteInPlace "py/src/nftables.py" \ + substituteInPlace "src/nftables.py" \ --replace-fail "libnftables.so.1" "${nftables}/lib/libnftables.so.1" ''; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ef9b4762dd147..6e48b7665ad84 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.5.1"; + version = "2024.5.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c7097843a6cf3..eab18d3b2dcd3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -476,7 +476,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.5.1"; + hassVersion = "2024.5.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -494,13 +494,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-/JuKN0V2wMZW56l2nt4T3cpDnQiHeC27+QVBi3j3aDI="; + hash = "sha256-OdtkkZ8Yl6H2dUBILrT/02ML3MnptdBydVzKhxoKjAY="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-3Tqs+69e1ESOcEMCx3LTt1c04pG5pK/RGX30x8WRegQ="; + hash = "sha256-5ASuTREkAUCS94Ur5yNHU8ISrASGl90scyYWBHiKlKI="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c6e3c210e41da..4724eb834d841 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240501.0"; + version = "20240501.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-W3EiDkm/Se63/Ph4HUSRj2pY+y/pyCqecs4azYcxsaw="; + hash = "sha256-d/mlZfMri0E4lgMrIt3cRqpF3F12Xr7YuHqTogFON9E="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 71d08a9364eb3..82fc547b5da9d 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -39,12 +39,12 @@ let in { tomcat9 = common { - version = "9.0.87"; - hash = "sha256-2kgvuSIAhtvzceGAqgnGQCr48EhYZzTN7dSgjEjUzgI="; + version = "9.0.88"; + hash = "sha256-vvgcyqT318ieqG61b2NDxRzXkzdMjswgOLen9eJ9Zig="; }; tomcat10 = common { - version = "10.1.20"; - hash = "sha256-hCfFUJ8U5IKUCgFfP2DeIDQtPXLI3qmYKk1xEstxpu4="; + version = "10.1.23"; + hash = "sha256-pVcsnpD/geoWaB35cXa7ap9Texw/vg/7pSl/7lnDmKo="; }; } diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index ad8e3f44a8090..260f69b8052f2 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-EoYyLmz6MfLkLY0WbHfFvKwrcWApty6/+UCslm8P0Q0="; + sha256 = "sha256-WQvXrG82hcPd4viA1cyIsTd5HbR0KD1b5r2me8MKoR8="; }; vendorHash = null; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 78662d4b18cf4..6a2aedc4cbaf0 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { # See https://docs.mattermost.com/upgrade/extended-support-release.html # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # the version regex in passthru.updateScript as well. - version = "9.5.3"; + version = "9.5.4"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-kqwRwo7eL9xfOyP54oS800L6bisVwJf9FpgTnwfmjAo="; + hash = "sha256-iuUTAdgJJDSvUwVmcggJ4ZMVbQ19ymuIaB0PDIgEIdg="; }; # Needed because buildGoModule does not support go workspaces yet. @@ -34,7 +34,7 @@ buildGoModule rec { webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-f2Zap/15TOyzCP97BGGmXimwAa1mTP42w37RToNkAsQ="; + hash = "sha256-OVq+puaXPJGOmW9pcgX24LXBfYLzuczRY7KG2tQBY3Q="; }; vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; @@ -69,7 +69,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version-regex" "^v(9\.5\.([0-9.]+))" ]; + extraArgs = [ "--version-regex" "v(9\.5\.[0-9]+)" ]; }; tests.mattermost = nixosTests.mattermost; }; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 4e6c94d3dd3e7..847523a171f50 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -14,16 +14,16 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-IIm+ZJYHGEfT+mvyq84L5hnkUPX784gjJUMzkE5kbaE="; + hash = "sha256-4ypAM1dW13qKaCEXGET1Xe2+kDBEwJHaOQ1ZghFymFM="; }; - vendorHash = "sha256-GGyacAN9Vs0SsLO7ZfyfOXznTJZg1V13DJucfzUGA/Q="; + vendorHash = "sha256-+K772WVLRaLXZgpULwv8/pL5zbHpvhbMikSqMF9MOs4="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index e39ae107217e6..621ad70184a6c 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -1,22 +1,24 @@ { lib , buildNpmPackage , fetchFromGitHub +, pkg-config +, vips }: let pname = "psitransfer"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; rev = "v${version}"; - hash = "sha256-dBAieXIwCEstR9m+6+2/OLPKo2qHynZ1t372Il0mkXk="; + hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA="; }; app = buildNpmPackage { pname = "${pname}-app"; inherit version src; - npmDepsHash = "sha256-iCd+I/aTMwQqAMRHan3T191XNz4S3Cy6CDxSLIYY7IA="; + npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY="; postPatch = '' # https://github.com/psi-4ward/psitransfer/pull/284 @@ -31,7 +33,12 @@ let in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-H22T5IU8bjbsWhwhchDqppvYfcatbXSWqp6gdoek1Z8="; + npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + vips # for 'sharp' dependency + ]; postPatch = '' rm -r public/app diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index bbcd4e9165aeb..14fb54f52c8c0 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1392"; + version = "2.0-1407"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-S6p2xlWa1Xgp+umRx1KCs4g1u7JZTByNBNUSJBQweUs="; + hash = "sha256-PW28Rw0prHS/q879GYVKaiXe0i2w6BVwgcTWOUhAhOk="; }; dontConfigure = true; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 23c165ab545f5..abf1ecbac0539 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,24 +6,17 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "2.1.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cBkiBrty/6A3rIv9A1oh8GvPjwxhHwYEKuDIsNzHw1g="; + sha256 = "sha256-gOjjE++hf3GOimvCxBR0jqqi3JNpbejLcWbLHpz2H4Q="; }; - # cdiff renamed to ydiff; remove when patroni source reflects this. - postPatch = '' - for i in requirements.txt patroni/ctl.py tests/test_ctl.py; do - substituteInPlace $i --replace cdiff ydiff - done - ''; - propagatedBuildInputs = with pythonPackages; [ - boto + boto3 click consul dnspython diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index dd8c10bb51cb3..b12f6a782e243 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.203"; + version = "3.0.204"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-S+go4uMUjzZNvzI5e/h7b2YFNdkzmZbVf7pIXOJeUX0="; + sha256 = "sha256-Wi35FcuDaTgGG7KgCcU/m6UIKzUuAaMF8J96YvjWgJc="; }; vendorHash = "sha256-AvlDqaJ5w9oDV1slwArr12KA1d3FKVU9H5WK4s3ePtU="; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 09910f125bc48..f229c89993604 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "botocore" "colorama" "docutils" "rsa" diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 13070ea70513b..859cc9dd6df97 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mpris-scrobbler"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "mariusor"; repo = "mpris-scrobbler"; rev = "v${version}"; - sha256 = "sha256-Gpgiu3wdxP4XjHzl1S4/wpTh2ZJjqowsD8wpbZuaySs="; + sha256 = "sha256-eeOhFkLyx+smZmKPTbVB1OiYkHdWk5v2rnOb9yCIuYE="; }; postPatch = '' diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index 6bebfd5bd6308..563f2ce4562d6 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -21,6 +21,7 @@ python3Packages.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "faster-whisper" "wyoming" ]; diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index 9c503be790d98..765d0d0789464 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "sigtop"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; rev = "v${version}"; - sha256 = "sha256-I1gZpzs7GtoS+EQIHXTc9laHMO68uNnIm7eVja3b8BE="; + sha256 = "sha256-EQWi+3n3Srsa3MHQym7IIFxxyATnb/79bgy8eqOB46k="; }; - vendorHash = "sha256-9IhUGbcDeStFfQV+VEvPCwJUEvrsoiHdWxO0UHxQzqc="; + vendorHash = "sha256-IFF7zTrHHoEmPoHGOkTHrb7o+9D5PC8Q+MWHSR2EXog="; makeFlags = [ "PREFIX=\${out}" diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 670d2108f8209..633adf5286519 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.8.2"; + version = "1.3.8.3"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-0Yyk7o5RSo1pzo1+oCi0TqEf62CLBURvZWgwELXDKKA="; + hash = "sha256-+xmbPezWTEwjxX+o2b7FjQcsoWxWe0RTSaTJOrXSIhc="; }; prePatch = '' diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index d8dfdd6faaf6e..a71a900b21ed4 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -25,8 +25,8 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "ce80453dadeea7b1a6409434f3358ef1e46e4ae7"; - hash = "sha256-zgHMaUA7rdLbmkX8lr4p2TW9g1RDyBmUs5rK++wmUjE="; + rev = "6821adf11eb4f84a2168264b954c170d03237699"; + hash = "sha256-prshOzxUHLYi64Pbyytsp+XvmtIIyhx/3n5IVimYH64="; }; spirv-headers = fetchFromGitHub { diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 7d9103e7b3508..874c57ccaa89f 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -2,22 +2,16 @@ buildGoModule rec { pname = "ets"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { - owner = "zmwangx"; - repo = pname; + owner = "gdubicki"; + repo = "ets"; rev = "v${version}"; - sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; + hash = "sha256-PowJ3ig8TfGx9P/PJPVBL8GsMh+gGZVt9l4Rf7Mqk00="; }; - # https://github.com/zmwangx/ets/pull/18/ - patches = [ (fetchpatch { - url = "https://github.com/zmwangx/ets/commit/600ec17a9c86ca63cd022d00439cdc4978e2afa9.patch"; - sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE="; - }) ]; - - vendorHash = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + vendorHash = "sha256-XHgdiXdp9aNEAc/Apvb64ExnpywjddWOw1scNKy+ico="; ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; @@ -35,7 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Command output timestamper"; - homepage = "https://github.com/zmwangx/ets/"; + homepage = "https://github.com/gdubicki/ets/"; license = licenses.mit; maintainers = with maintainers; [ cameronfyfe ]; mainProgram = "ets"; diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 6ba928a29d08e..afa75fca0cd21 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Klv1VIJv4/R7HvvB6H+WxTeJxQYFqAFU3HC6oafD/90="; + sha256 = "sha256-3RFiVDXjPFBMK+f/9s9t3cdIH+R/88Fp5uKbo5p2X+g="; }; - cargoHash = "sha256-Aos/QP8tLiKFmAZss19jn5h/murZR2jgTYRYalUONHw="; + cargoHash = "sha256-MC0Ch9ai4XmhhRz/9nFYEA3A7kgBv2x9q4yc5IJ7CZ8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/tools/misc/maker-panel/default.nix index 12a5d46547a2c..7fc5ec9f3c774 100644 --- a/pkgs/tools/misc/maker-panel/default.nix +++ b/pkgs/tools/misc/maker-panel/default.nix @@ -16,7 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; }; - cargoSha256 = "1ar62dn0khlbm47chakrsrxd1y76gpq0sql4g9j7dqqrvkavgd7w"; + cargoHash = "sha256-Ygya/9keRyIQyjrO6medtcXww9LMG3ne6I/8q35lJPo="; + + cargoPatches = [ ./update-gerber-types-to-0.3.patch ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch b/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch new file mode 100644 index 0000000000000..60b22d7d69e18 --- /dev/null +++ b/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch @@ -0,0 +1,109 @@ +From e616648213b75f60703bd68e028f0af78199a565 Mon Sep 17 00:00:00 2001 +From: Leah Amelia Chen <hi@pluie.me> +Date: Mon, 6 May 2024 10:43:56 +0200 +Subject: [PATCH] Update gerber-types to 0.3.0 + +Required to update num-bigint to ^0.3.3, in order to compile on modern +Rust versions with a native `div_ceil` on unsigned integers. +--- + Cargo.lock | 26 ++++++++++++++++---------- + Cargo.toml | 2 +- + 2 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 1b15393..41cd500 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -387,7 +387,7 @@ dependencies = [ + "log", + "memmap2", + "ttf-parser", +- "uuid", ++ "uuid 0.8.2", + ] + + [[package]] +@@ -471,15 +471,15 @@ dependencies = [ + + [[package]] + name = "gerber-types" +-version = "0.2.0" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c7badd25c55b207eb6607600b73293d9627587b2dc0608031aa8de50e63810d3" ++checksum = "aecf78a269d7b4f73953f30174b18f52c1bb44f7d58f4d830a76c0ea023ad8bc" + dependencies = [ + "chrono", + "conv", + "num-rational", + "thiserror", +- "uuid", ++ "uuid 1.8.0", + ] + + [[package]] +@@ -780,9 +780,9 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.3.2" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" ++checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" + dependencies = [ + "autocfg", + "num-integer", +@@ -801,9 +801,9 @@ dependencies = [ + + [[package]] + name = "num-rational" +-version = "0.3.2" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" + dependencies = [ + "autocfg", + "num-bigint", +@@ -813,9 +813,9 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] +@@ -1379,6 +1379,12 @@ dependencies = [ + "getrandom 0.2.2", + ] + ++[[package]] ++name = "uuid" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" ++ + [[package]] + name = "vec_map" + version = "0.8.2" +diff --git a/Cargo.toml b/Cargo.toml +index 2f9e8ea..09f0410 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -13,7 +13,7 @@ geo-booleanop = "0.3.2" + geo = "0.16" + usvg = { version = "0.12", default-features = false } + resvg = { version = "0.12", default-features = false } +-gerber-types = "0.2" ++gerber-types = "0.3" + #{ git = "https://github.com/twitchyliquid64/gerber-types-rs", rev = "e927ed2ff68d9e8629dbc36d5f1e5626da472376" } + structopt = "0.3" + zip = { version = "0.5", default-features = false } +-- +2.44.0 + diff --git a/pkgs/tools/wayland/sirula/Cargo.lock b/pkgs/tools/wayland/sirula/Cargo.lock new file mode 100644 index 0000000000000..6bef1f83d7067 --- /dev/null +++ b/pkgs/tools/wayland/sirula/Cargo.lock @@ -0,0 +1,966 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cfg-expr" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "field-offset" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "freedesktop_entry_parser" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "347aa21b13048c0a0a4dc3118b661eb89d73ea675eca95b6a0f11e698ff66ec1" +dependencies = [ + "nom", + "thiserror", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-layer-shell" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4316ff523ae445bd6efaf253f217598dd074619fe67b9199b5b0cd5ff99144da" +dependencies = [ + "bitflags", + "gdk", + "glib", + "glib-sys", + "gtk", + "gtk-layer-shell-sys", + "libc", +] + +[[package]] +name = "gtk-layer-shell-sys" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff60230d690445577655416055dbd279d05631b03ab07f935e39f5fe81084c0a" +dependencies = [ + "gdk-sys", + "glib-sys", + "gtk-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "locale-types" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02be1c159bff06af0fdec8942a4f3a9242cc2ecebdfccb0d29d3c100ca5e7a97" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "memchr" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" + +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "osstrtools" +version = "0.2.2" +source = "git+https://github.com/Artturin/osstrtools.git?rev=6360f4f842eb542ff4e62e75851ea8ba83808471#6360f4f842eb542ff4e62e75851ea8ba83808471" +dependencies = [ + "itertools", +] + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" + +[[package]] +name = "proc-macro-crate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +dependencies = [ + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" + +[[package]] +name = "serde_derive" +version = "1.0.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sirula" +version = "1.0.1" +dependencies = [ + "freedesktop_entry_parser", + "futures", + "fuzzy-matcher", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk", + "gtk-layer-shell", + "libc", + "locale-types", + "osstrtools", + "pango", + "regex", + "serde", + "serde_derive", + "toml", + "xdg", +] + +[[package]] +name = "slab" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +dependencies = [ + "once_cell", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + +[[package]] +name = "unicode-ident" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" + +[[package]] +name = "version-compare" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + +[[package]] +name = "xdg" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" +dependencies = [ + "dirs", +] diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix index afb10c2a49bf1..40e6e5939c780 100644 --- a/pkgs/tools/wayland/sirula/default.nix +++ b/pkgs/tools/wayland/sirula/default.nix @@ -8,16 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "sirula"; - version = "1.0.0"; + version = "1.0.0-unstable-2023-09-02"; src = fetchFromGitHub { owner = "DorianRudolph"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C5mVO10+jD4TDg6R9rVJO6fdDiOD5tT+bEaI53WVdFA="; + rev = "b15efe85ef1fe50849a33e5919d53d05f4f66090"; + hash = "sha256-S0WbqY49nKaBUMWfgDKZxFLJuk7uFcnTfV8s86V0Zxs="; }; - cargoSha256 = "sha256-pxVEa3m7SWMwOAcR/jRKzEc6MH6YkNfTW0cm6Nid6Zo="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "osstrtools-0.2.2" = "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ="; + }; + }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index adcc67a8d3306..f3fa9f35b9e6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -586,6 +586,7 @@ mapAliases ({ kube3d = k3d; # Added 2022-0705 kafkacat = kcat; # Added 2021-10-07 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0069567d1fb2f..fdbd40af2b983 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -311,8 +311,6 @@ with pkgs; asn1c = callPackage ../development/compilers/asn1c { }; - assemblyscript = callPackage ../development/compilers/assemblyscript { }; - authz0 = callPackage ../tools/security/authz0 { }; auth0-cli = callPackage ../tools/admin/auth0-cli { }; @@ -422,8 +420,6 @@ with pkgs; castget = callPackage ../applications/networking/feedreaders/castget { }; - castxml = callPackage ../development/tools/castxml { }; - catatonit = callPackage ../applications/virtualization/catatonit { }; catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; @@ -769,8 +765,6 @@ with pkgs; protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; @@ -4895,8 +4889,6 @@ with pkgs; dante = callPackage ../servers/dante { }; - dapr-cli = callPackage ../development/tools/dapr/cli { }; - dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -4971,8 +4963,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; - digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -5039,8 +5029,6 @@ with pkgs; dolibarr = callPackage ../servers/web-apps/dolibarr { }; - doppler = callPackage ../tools/security/doppler { }; - dosage = callPackage ../applications/graphics/dosage { }; dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { @@ -5564,8 +5552,6 @@ with pkgs; hr = callPackage ../applications/misc/hr { }; - humioctl = callPackage ../applications/logging/humioctl { }; - huniq = callPackage ../tools/text/huniq { }; hunt = callPackage ../tools/misc/hunt { }; @@ -9595,8 +9581,6 @@ with pkgs; kdoctor = callPackage ../development/tools/kdoctor { }; - kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { }; kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; @@ -11337,8 +11321,6 @@ with pkgs; ogdf = callPackage ../development/libraries/ogdf { }; - oh-my-posh = callPackage ../development/tools/oh-my-posh { }; - oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { @@ -14087,8 +14069,6 @@ with pkgs; up = callPackage ../tools/misc/up { }; - upbound = callPackage ../development/tools/upbound { }; - upterm = callPackage ../tools/misc/upterm { }; upx = callPackage ../tools/compression/upx { }; @@ -16792,7 +16772,6 @@ with pkgs; cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16830,9 +16809,6 @@ with pkgs; cargo-vet = callPackage ../development/tools/rust/cargo-vet { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; }; @@ -17767,10 +17743,6 @@ with pkgs; waagent = callPackage ../applications/networking/cluster/waagent { }; - wapm-cli = callPackage ../tools/package-management/wapm/cli { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; @@ -18693,8 +18665,6 @@ with pkgs; easypdkprog = callPackage ../development/embedded/easypdkprog { }; - eclint = callPackage ../development/tools/eclint { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -23829,10 +23799,6 @@ with pkgs; opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; - open-wbo = callPackage ../applications/science/logic/open-wbo { }; openwsman = callPackage ../development/libraries/openwsman { }; @@ -29744,10 +29710,6 @@ with pkgs; appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; - apostrophe = callPackage ../applications/editors/apostrophe { - pythonPackages = python3Packages; - }; - ardour = callPackage ../applications/audio/ardour { }; ardour_7 = callPackage ../applications/audio/ardour/7.nix { }; @@ -30700,8 +30662,6 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; - flowtime = callPackage ../applications/misc/flowtime { }; - furnace = callPackage ../applications/audio/furnace { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -40373,8 +40333,6 @@ with pkgs; twitch-cli = callPackage ../development/tools/twitch-cli { }; - twiggy = callPackage ../development/tools/twiggy { }; - uacme = callPackage ../tools/admin/uacme { }; ufiformat = callPackage ../tools/system/ufiformat { }; @@ -40543,8 +40501,6 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e75f863bbcbce..c849ddaba0a8c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -343,7 +343,6 @@ mapAliases ({ pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 PyICU = pyicu; # Added 2022-12-22 - pyjson5 = json5; # added 2022-08-28 pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 652113ae8bd12..7f54378c13b7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1531,6 +1531,8 @@ self: super: with self; { binwalk-full = self.binwalk.override { visualizationSupport = true; }; + biom-format = callPackage ../development/python-modules/biom-format { }; + biopandas = callPackage ../development/python-modules/biopandas { }; biopython = callPackage ../development/python-modules/biopython { }; @@ -5943,6 +5945,8 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iterable-io = callPackage ../development/python-modules/iterable-io { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { }; @@ -11132,6 +11136,8 @@ self: super: with self; { pyjnius = callPackage ../development/python-modules/pyjnius { }; + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { }; |