diff options
Diffstat (limited to 'pkgs')
207 files changed, 5310 insertions, 2528 deletions
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index 95f3bf9988cdc..2193447c02c70 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -2,15 +2,15 @@ with pythonPackages; buildPythonApplication rec { pname = "greg"; - version = "0.4.7"; + version = "0.4.8"; disabled = !isPy3k; src = fetchFromGitHub { owner = "manolomartinez"; repo = pname; - rev = "v" + version; - sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; }; propagatedBuildInputs = [ setuptools feedparser ]; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index ac293faee3b53..874a1bb63ccc4 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -52,6 +52,7 @@ , xkeyboard_config , zlib , makeDesktopItem +, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper }: let @@ -80,6 +81,7 @@ let --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 39bbff2565254..cfd81fdfe5a2c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }: +{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -7,6 +7,7 @@ let }; inherit (gnome2) GConf gnome_vfs; inherit buildFHSUserEnv; + inherit tiling_wm; }; stableVersion = { version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)" diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index cd5a1f9d6e509..c6ef409d637b8 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -3,7 +3,8 @@ let - inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook; + inherit (vimUtils.override {inherit vim;}) + buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook; inherit (lib) extends; @@ -24,6 +25,7 @@ let plugins = callPackage ./generated.nix { inherit buildVimPluginFrom2Nix; + inherit (vimUtils) buildNeovimPluginFrom2Nix; }; # TL;DR diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 88853f3e7d321..dcbadc30a2517 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,5 +1,5 @@ # This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: +{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: { @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-04-15"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "93fca5d307007c05722050ffa8b4e508ca6f3b81"; - sha256 = "022wv0lpz50ihvnkc38rmds0dl4g4b71yig9dc8nn8sicyv0312w"; + rev = "0b8f2408f96481a373f336b4405af03008e39a4e"; + sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -77,12 +77,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-04-17"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "c2a4c4bbd00da68d864683cd09a5d3a2b80de11d"; - sha256 = "01xscq18slsib2liqp7mbd4wil6l61m2ipihg2i6a14s9bcd1b0y"; + rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a"; + sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -149,12 +149,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-04-19"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ecd38845d65ffbe4b080cc3c2c1c7f0bfe835bb3"; - sha256 = "0cjx9v0fafm2npknr85wb37934ysdggnmiwr9cwbd5risp9ircwh"; + rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d"; + sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -173,12 +173,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-04-11"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "52225923679ec866651bb0c2e0691374131ec939"; - sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv"; + rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2"; + sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -269,12 +269,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "4112585513210a3a55e587344649a4bfb8709bdc"; - sha256 = "1sjm13vq8608xwfhc9hyfn1n4bwpgivnpw04331giwmf4j3kp422"; + rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a"; + sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -305,12 +305,12 @@ final: prev: SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; - version = "2021-11-04"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "tmhedberg"; repo = "SimpylFold"; - rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283"; - sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0"; + rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd"; + sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25"; }; meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; @@ -329,12 +329,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "a1b65988e72a091334cedfe7ed1d067819f4e1eb"; - sha256 = "096q33lrgn4i8ic6y66snb312ly3rdxm8a15mykawn1n533d04nq"; + rev = "97b010245f42bda351fd050a3c6ccf7806b9b007"; + sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "6d5246a3f0d2861eaad4121eb467bc5e6537690d"; - sha256 = "0by8s35hhvk38l79y5nm88cvwy53vx21ps1wg9niway5xrp0khcs"; + rev = "8d2ef96e44768250a652826c6586005f40eeac7f"; + sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-04-06"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "607f33a1b0f662d9809d54363e8e81a4965862ce"; - sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx"; + rev = "56399106fcf9d80d476307576bc307e67f0167e2"; + sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -546,12 +546,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-04-09"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "c55d4879935f07dbf46e86389246449d7af272b1"; - sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s"; + rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c"; + sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -654,12 +654,12 @@ final: prev: asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-04-06"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5"; - sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd"; + rev = "9cdb34314d5066b40627c83829b9d04943c9c66d"; + sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -714,12 +714,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-04-12"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "e840b844abcc19ad6e406b193a2a5ce285238458"; - sha256 = "0yx662qipzdmg28x0h454y95jrp952p51pl9h1dxjnwyswn8xrnm"; + rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a"; + sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -894,12 +894,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "f02e19bd29a27944e6bcc1e7a492fe07534b6630"; - sha256 = "10gwj4kd7kngcrfgm4jja08ss5hza7s1bzs11fjk08y489mhracp"; + rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc"; + sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1050,24 +1050,24 @@ final: prev: cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2022-04-12"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f"; - sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch"; + rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312"; + sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-02-13"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0"; - sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh"; + rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252"; + sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1110,12 +1110,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-01-15"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba"; - sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca"; + rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d"; + sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1146,12 +1146,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-04-15"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "c6ace8ca97ca7db5cca319759efd93fbf6cc0bce"; - sha256 = "0jys7fl9r6n7khacypkg643lk2aadsnniyrm7nar0k08swdwhl48"; + rev = "21f02b62deb409ce69928a23406076bd0043ddbc"; + sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -1170,12 +1170,12 @@ final: prev: cmp-pandoc-references = buildVimPluginFrom2Nix { pname = "cmp-pandoc-references"; - version = "2022-02-16"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "jc-doyle"; repo = "cmp-pandoc-references"; - rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54"; - sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs"; + rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; + sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; }; meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; @@ -1230,12 +1230,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2021-12-02"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb"; - sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa"; + rev = "c5187c31abd081ecef8b41e5eb476b7340442310"; + sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1266,12 +1266,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2022-04-01"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "b10829736542e7cc9291e60bab134df1273165c9"; - sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l"; + rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36"; + sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -1314,12 +1314,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-04-20"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "0df59c8c81acfb7b0abadd49222a769ddf0730ec"; - sha256 = "0ij2q9q96dv3rms6qdjsqvgyl0fk3w1h67fhjq7kcagci78cka9k"; + rev = "3601c8ddde380349764fc0bc016b915703c9ad86"; + sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1374,24 +1374,24 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-04-19"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6f81e3034bf04f2d8d65b82b3ac15d93b737cf0b"; - sha256 = "0hx8g0xlh0n6yqpv58s8vb2k0gdh1h13d05l1m3wn3gpvid17xi3"; + rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02"; + sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-04-16"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "d9a93193dbb23516eebb19ef5ba01b43287ea35d"; - sha256 = "0yk3jfp8r432s0kan0g6ml0yyz731yygv0zzpx75l9lfagdv0xpy"; + rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0"; + sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1435,12 +1435,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-04-19"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "ef3e6bfa41073a73c298ae90d2796f8ceda71c6a"; - sha256 = "1ki607wsam22h01gwq8a4vw3jq1yj2zmfp2laglh5cy5dgarm4vv"; + rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a"; + sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1579,12 +1579,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-04-09"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "422cadf51dd44306713f3f7965e40ec606290c49"; - sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh"; + rev = "842c81892648de759e639ad2d395757b98be06d5"; + sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1627,12 +1627,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "0502a7f14ab73b80353d076842d58730a0239a16"; - sha256 = "1s46iafdwxr20qw08si0lwbh81x9ffh2wvd4rxcyvhlxc7h686rp"; + rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3"; + sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1663,12 +1663,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "fc46bf69f0b2293f25581123b46023226d102cc1"; - sha256 = "079hraq9cjxjpqrli4y2nk9xwpvkhxmrbrhxq9by1wb1q1a39da3"; + rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383"; + sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1795,12 +1795,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-04-14"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "b636df644005bb4805cba70b238df73b302640eb"; - sha256 = "1aha5vashdiz59iy8l8kbkyvwngw5m7n131k7ar82gxi0zqsj6q8"; + rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2"; + sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1855,12 +1855,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-03-16"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "4ecffa4502a65f90397c2194ae308dac49194a65"; - sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9"; + rev = "0bdb926d328765144dd788c062161c565dc38732"; + sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2169,12 +2169,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-03-31"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217"; - sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy"; + rev = "a476efd3f372d6b5b0df431cac36911fb84c515e"; + sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2193,12 +2193,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-04-14"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "957a0f4d17f253ac23f9c870eb92d7ad2ea4b7e0"; - sha256 = "15m6b5svvcfsmiq87vhn77q5z7zg22vpnh9qbcv0y6cd04s69n2d"; + rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674"; + sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2279,12 +2279,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-04-14"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "64f486a4856bfbfd6604c700c938b34cf551561b"; - sha256 = "18yxab99d9cy45ir2dfqr8wi0s56qyrzglgcslp97wnjiq79673d"; + rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32"; + sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2460,12 +2460,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-03-29"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31"; - sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n"; + rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9"; + sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2484,12 +2484,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-04-17"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "804c3f55ec4ec46f7257451b3cd731df991b9212"; - sha256 = "0sznw2q70zac924yf0z0ic3frmmjmryjh4af46fw2zrbrq4kk9vq"; + rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938"; + sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2604,12 +2604,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-02-23"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc"; - sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685"; + rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1"; + sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2652,24 +2652,24 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-03-03"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "e60bfbc314476777a5ce200e533699691a5cdfa5"; - sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k"; + rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541"; + sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger.vim"; - version = "2021-11-13"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "2e67899355f3f631aad6845925e4c2c13546444d"; - sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp"; + rev = "6c0b55fb38d0e0633127823aab89b0676d13e509"; + sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -2710,14 +2710,14 @@ final: prev: meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; - gitsigns-nvim = buildVimPluginFrom2Nix { + gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "498abfa13dd749be963bc87a5b37da0d3e42a50e"; - sha256 = "11d2pnqgngm6546r1nr0cf1dj7qkgvdn0ld2h1jn3fm07l892sgv"; + rev = "ef153188e849bd317c00448755bc4182a2bd495d"; + sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2760,12 +2760,12 @@ final: prev: golden-ratio = buildVimPluginFrom2Nix { pname = "golden-ratio"; - version = "2020-04-03"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "roman"; repo = "golden-ratio"; - rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043"; - sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654"; + rev = "7df80253680e4755b82955425da31d8c1f8e23b6"; + sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq"; }; meta.homepage = "https://github.com/roman/golden-ratio/"; }; @@ -2844,24 +2844,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-04-14"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "45d05b6affeec1f858a13c0d8fe511db32c85afd"; - sha256 = "18sf80zgdsfb2bd9dgdww9prlhkydk695gj9wd9zah24zfc5mcv7"; + rev = "3d664943daf65bf99390a52c5dbc557f87fac552"; + sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-04-18"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "028302225e19eb203ebb6876b689cc0ce2631169"; - sha256 = "0npsh72z3xb9p1jdhz1g9jpx20c2d52mkkg4ix07bmy40ynkbsxs"; + rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123"; + sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2976,24 +2976,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-03-22"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3"; - sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2"; + rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578"; + sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-04-10"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e"; - sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf"; + rev = "f481b30f1d93df6016092623199ddc8bfe1624d0"; + sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg.vim"; - version = "2021-12-28"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c"; - sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa"; + rev = "5ac9da61e8626d1218498a35e515f36387efe454"; + sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -3277,12 +3277,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-04-14"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "acf0f5d61236b416c804d649cd76db8390de9ae6"; - sha256 = "03xmcph28q1y8n0ykga5m6biw9flpnx02sy7j2w3f1q2shknnwf3"; + rev = "0ad738e7cc43514d35388c1caca13990d688aa5c"; + sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3361,12 +3361,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-04-19"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "354630520ed3fe73c69796fb2e566a7c2125cd04"; - sha256 = "1gwgbgg0dc0fwcdz6qs6mgvg0ybxgld3wm2wprq89abpacfz29dz"; + rev = "902eb7f75d664bccd251c38d7921570b05b47cdc"; + sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3469,12 +3469,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-03-27"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff"; - sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq"; + rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab"; + sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3613,12 +3613,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-02-28"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "c9fd775aebf702c81e2077693336584a0027d496"; - sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd"; + rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff"; + sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3684,12 +3684,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-04-16"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "a351509512687293fd659ba4ee7e34412c3a8f70"; - sha256 = "00xzd8b13krysdw21zm9ms902cxm04xl1wd2l7rb04431s2v9vc0"; + rev = "6d160406f948a810c40304224a1255c8bba5a415"; + sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3699,11 +3699,11 @@ final: prev: version = "2022-04-18"; src = fetchFromGitHub { owner = "onsails"; - repo = "lspkind-nvim"; + repo = "lspkind.nvim"; rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7"; sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk"; }; - meta.homepage = "https://github.com/onsails/lspkind-nvim/"; + meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; lspsaga-nvim = buildVimPluginFrom2Nix { @@ -3744,24 +3744,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-04-17"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d"; - sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k"; + rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31"; + sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-04-15"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "6b67cb12747225a6412d8263bb97d6d2b8d9366a"; - sha256 = "08a1kk8z3mcq65dh0hi44188dxkqjfg3yilr8viamyni1kwy7gf3"; + rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e"; + sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3864,12 +3864,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-04-20"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "8134370549e73a5a72d24ffc7ea6a881cf4502ad"; - sha256 = "0llkj31jkqnm3igs2f7cw8wxbc9877jk1mc2shnh1ii2dh0kmz68"; + rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88"; + sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3912,12 +3912,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-04-08"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "a4645528e2ddedfb6350c142660c3e0468057f1c"; - sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd"; + rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7"; + sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -4176,12 +4176,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-02-02"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4b537fa01c28f2f7cf249722530561d2e477b49f"; - sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv"; + rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692"; + sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -4212,12 +4212,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-04-14"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "06920fa90ec7db3f81c6f842ebaf008c39e088cf"; - sha256 = "1f5j7aisnpvykgj7p64cbvfww05fsv47pi04ckkh0gkc49g5sjmg"; + rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a"; + sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -4284,12 +4284,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-04-18"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4a3ca2c0cb46a5320c124565fd4d9830435aa29f"; - sha256 = "15jwzz2ldxg6ql1lzn626dcfxgndqzgpamakqk0yicbidhmdird0"; + rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8"; + sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4332,24 +4332,24 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2022-01-20"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "533d311a2a9187294ea52acab32d8565d6517059"; - sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6"; + rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9"; + sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-04-19"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "dde7e6f02fbcb5860b24f616c9a07b5f9e52a361"; - sha256 = "0800qwxlj84f8ygvniwwyrcjyfwsx7kmzq8vyz9m50zd7b20al9f"; + rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac"; + sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4464,12 +4464,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "5d2581a71510c319d128a8b02a21181abc611202"; - sha256 = "118lda4cgxkbf13khyg2i36i7fcrlfz29l0wfjhg90ci3w8qvajs"; + rev = "25b3f3e46c87c51e4d8075d2e11f481628716363"; + sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4572,12 +4572,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-04-16"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f"; - sha256 = "1mifn1b83ypvaplmma1zx080vmm5nv40263lsva3z6byqyq3kfl1"; + rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9"; + sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4620,36 +4620,36 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-04-13"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "38d486a1c47ae2722a78cf569008de0a64f4b153"; - sha256 = "0qka37c8ikcqvbjq0n0kxgm8l30jy3aixs5i00a25wcwxj40kzxv"; + rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb"; + sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-03-28"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776"; - sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z"; + rev = "70fe3102158b2765d5bba46f398bd4213997936f"; + sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-04-18"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3dbd349cf75cb23c7d1575b235ee57ecbe665d9d"; - sha256 = "12nlfz0imx6i6w8jc4pw5czyfzr8m2mhlmql10i5hdncqi9ggaar"; + rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70"; + sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4680,12 +4680,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9"; - sha256 = "11f53yic8j3iqd4yb0gy2d54vscqqll4lcqqcj1rp195vdd476ak"; + rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4"; + sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4776,24 +4776,24 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-04-17"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "f136bb253f6811984369a20924251bcbfe00a5cd"; - sha256 = "00nxdgsxa3yc0ifsmbs8d1s428p37x3ax3rlxacs983f5xlgmizq"; + rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2"; + sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-04-19"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "1c3560ecfe8a865118efe7092308abe9e8b0ae68"; - sha256 = "1piz5qxymc2igqdscc3cvvympxrgmxd1ybsnqy13l7ycmknkp9hd"; + rev = "9b731b9748d243b60e61eecbe2d114c39554486e"; + sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4836,36 +4836,36 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-12-09"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608"; - sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i"; + rev = "d064ee481b2aec86133ebcd514c835a28776f9c5"; + sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-04-19"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "944ea6e7244a839452ab721515141ea9208c0536"; - sha256 = "0i3mjk9n9czpadzpwp2wx1640h5sl51cjgnggrm8rg9qxj5108g7"; + rev = "9552418fcbb9587025f4bd38364259b3888f582b"; + sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-04-18"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "e46cb5695b8457403488ad44b5379421c0c5dc17"; - sha256 = "0343pk8wylms0lnrpa0a5x2ig97an2ps64fgjpa8n85ng1z49z97"; + rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665"; + sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4896,12 +4896,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-04-14"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "ffb08466d51f717775d85e7e334ac83156c0ca98"; - sha256 = "1rlnidcn8zww6lvqx1syw2331i2gn67765cip2pz5rh8mbv4l67x"; + rev = "9010412f7de118168d2fe4ba97b578d0d76cc500"; + sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4920,12 +4920,12 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2022-02-24"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "29ca81408119ba809d1f922edc941868af97ee86"; - sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g"; + rev = "407f05c71f757f09f775229d5709a3592f1a6910"; + sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -4944,12 +4944,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-04-18"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e5416bdb27a0e61cd213850646534a18bb2ba61d"; - sha256 = "1qrjpx99pb67yccvmb66ahcaa7wk9z6s9zvaxm5fpbm1xasci1mz"; + rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba"; + sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4968,12 +4968,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-04-17"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ad9903c66bac88f344890acb6532f63f1cd4dac3"; - sha256 = "10fg52g53yk0d10rm96kw907wdkgqw762ib6530zrnw7p8fbm2ms"; + rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd"; + sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4992,24 +4992,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-04-16"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "bc6f2ba6d6b2c5ffd65b41f3df74761a90e538da"; - sha256 = "0fk41l2jmlhrylc9xbh4h9a35j106r0lr7rd0i2lp0acqai629qg"; + rev = "6bc7681b489b04feff394f832984d14510e97e47"; + sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-04-06"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e"; - sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46"; + rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11"; + sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5028,12 +5028,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-04-17"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "2c8f744de34c72a5a1fabcc66da11aa017ffab88"; - sha256 = "1yc98fv30fvkjb7d8acjqvl8kai1hz0mslp04n1d2069q0n6k08n"; + rev = "ebe78bea13b60640816658ae798a199bd5118eb1"; + sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5100,24 +5100,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-04-18"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "0f0f858348aacc94f98ba32880760c5a5440b825"; - sha256 = "1ciir7h9s0g9i62b49swa8c8cgjqg4lz6zapkj5a8gqxqa10qh23"; + rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3"; + sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-04-19"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "62fa8f77c43ed3a4ac2bbdfa4327f6b4a835bbea"; - sha256 = "0cq0zbs9a52wx84ivpna4qw67dlz7i9nw6mln8948qadnzk1960r"; + rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b"; + sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5160,24 +5160,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-04-15"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d"; - sha256 = "09bpgd0fqpcwifs2wna1lqyrfn4rmp2gfan4635lwjp4sixj52vc"; + rev = "094e8ad3cc839e825f8dcc91352837653e365a8f"; + sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-03-04"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2"; - sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1"; + rev = "044a05c4c51051326900a53ba98fddacd15fea22"; + sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -5196,24 +5196,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-04-17"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0"; - sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3"; + rev = "a7767e2a1761078abb97f6516e45c56147e0952e"; + sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-03-22"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "09e62319974d7d7ec7e53b974724f7942470ef78"; - sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq"; + rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f"; + sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5256,12 +5256,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-04-11"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7"; - sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz"; + rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9"; + sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5292,12 +5292,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-04-14"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "0beb4de71062435ad934caba5728f7f01ae8b969"; - sha256 = "01k7jl34x8wikq6ff456650wgf5f5z9z6a3ypr10a3pl8p7wfyzr"; + rev = "622ab9feaa735dc0999e567183ce357f3dff080f"; + sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5316,12 +5316,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-03-23"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6"; - sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6"; + rev = "08cde8acf181b3278dafb9c8284726104a11cc0f"; + sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -5340,12 +5340,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-04-12"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "653b5d729cb2c14c564cf5ab2145e2e24354a2ba"; - sha256 = "1xw49fliqalz18nj0pa81xsx1d9zwphdzcai503m1bn2m2nclp6h"; + rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7"; + sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5388,12 +5388,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8cd85f7afabef643db6b5d3dc01942870e71533d"; - sha256 = "16rkvz8x6rvapyq7grch77j0wd5pnhjwv932v72ai6gy940d56l2"; + rev = "1a52ca239c726d62104fad012472c28a00cdcc22"; + sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5436,12 +5436,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2022-03-24"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "afde171829b1416125bf07a81fc28e4490aa91b2"; - sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d"; + rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c"; + sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5520,17 +5520,17 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-04-08"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00"; - sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns"; + rev = "71b00a3c665298e5155ad64a9020135808d4e3e8"; + sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; - plenary-nvim = buildVimPluginFrom2Nix { + plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; version = "2022-04-17"; src = fetchFromGitHub { @@ -5617,12 +5617,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-01-19"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988"; - sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6"; + rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77"; + sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -5810,12 +5810,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-04-11"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb"; - sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w"; + rev = "fef309f654906d931f2c714a77f5182fe70ada7d"; + sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5846,12 +5846,12 @@ final: prev: rest-nvim = buildVimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-01-26"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "rest.nvim"; - rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3"; - sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8"; + rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef"; + sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0"; }; meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/"; }; @@ -5930,12 +5930,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-03-26"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44"; - sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h"; + rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac"; + sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -6147,12 +6147,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-04-14"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "4f29ac457ac759286bce3bb1a34f9517c91306c9"; - sha256 = "1yzyk78nb0xj5f2fnfvhrpgahg3mgx82bpw7nimvf0rd29dbpfqj"; + rev = "9ad83caa675cb5160760bf85dcb951946c994572"; + sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6243,12 +6243,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-04-03"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6"; - sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc"; + rev = "64f68a641084d18903769ec138b8fab45477bd92"; + sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6401,12 +6401,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-03-05"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2"; - sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd"; + rev = "15ae99c27360ab42e931be127d130611375307d5"; + sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -6510,12 +6510,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-04-07"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2"; - sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m"; + rev = "a577ee4d650476243d91698f2d1228819c5fa0a5"; + sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6558,12 +6558,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-01-24"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "3729ae43318faca94b0a1e878f9c6717b171d55e"; - sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9"; + rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad"; + sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -6642,12 +6642,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-02-19"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "8ec164b541327202e5e74f99bcc5fe5845720e18"; - sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1"; + rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f"; + sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6679,12 +6679,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-04-06"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "c66aee748d572961af0e6ad5130b994343f922a7"; - sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz"; + rev = "ee95c509901c3357679e9f2f9eaac3561c811736"; + sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6703,12 +6703,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-01-23"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "d317c3cef6917d650d9a638c627b54d3e1173031"; - sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7"; + rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae"; + sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -6727,12 +6727,12 @@ final: prev: telescope-ui-select-nvim = buildVimPluginFrom2Nix { pname = "telescope-ui-select.nvim"; - version = "2022-03-20"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939"; - sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb"; + rev = "62ea5e58c7bbe191297b983a9e7e89420f581369"; + sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -6787,12 +6787,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-04-18"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6e7ed1b9638f09661fcb3a6db68f3ad77c8036be"; - sha256 = "11p5byic4qb9cgaffnrwa4s0qdzvxl6313phz5qdll78hwjw2fmy"; + rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe"; + sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6968,12 +6968,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-04-18"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "dca8f4d9516270cb41c147ed692f3ee420c5e515"; - sha256 = "0ajypqnx9kglqh5h3vwyy9ccmazq8gjgb84hjrabr9hgvcnyj5hq"; + rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6"; + sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7088,12 +7088,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-04-19"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e1ae43e44fb6b53144a5a8703a3d6cf10492a4a0"; - sha256 = "1rzhv8dma9ijf6g9z5drbi45bngzh4ccr3h4i0b8x3w4ab97p17q"; + rev = "f5ccf0977c611ffd774ca180774959301baaffad"; + sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -7136,12 +7136,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-04-20"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "fcd59fc3a49e75993c3828c49df18bf3da51f45d"; - sha256 = "16y3hicljn9y60jzvq7xmhhp7r3y0v5v4f1i16hj65rly96wziq7"; + rev = "3b637651d5f0de185a0ceac783582692e204b053"; + sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -7184,12 +7184,12 @@ final: prev: venn-nvim = buildVimPluginFrom2Nix { pname = "venn.nvim"; - version = "2021-10-19"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f"; - sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06"; + rev = "71856b548e3206e33bad10acea294ca8b44327ee"; + sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -7688,12 +7688,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-11-07"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "bb11f30377985e45e2eecef570856d42dbabb8b0"; - sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087"; + rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9"; + sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -7880,12 +7880,12 @@ final: prev: vim-ccls = buildVimPluginFrom2Nix { pname = "vim-ccls"; - version = "2022-01-29"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "m-pilia"; repo = "vim-ccls"; - rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886"; - sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k"; + rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424"; + sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08"; }; meta.homepage = "https://github.com/m-pilia/vim-ccls/"; }; @@ -7916,12 +7916,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-04-08"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44"; - sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65"; + rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15"; + sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8204,12 +8204,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-03-06"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37"; - sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q"; + rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7"; + sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -8276,12 +8276,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-03-27"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3"; - sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq"; + rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00"; + sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -8492,24 +8492,24 @@ final: prev: vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2021-02-19"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611"; - sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0"; + rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139"; + sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-04-19"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "c1ee64a9775b4adff8d4e052b158f380682bc249"; - sha256 = "17m1632a4nwilg0d29gx7gsng8f1w82q049iynm4gy1aqczlwgxh"; + rev = "73b5e3fccfb5295e38546318c0d3139874c25efb"; + sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8588,12 +8588,12 @@ final: prev: vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2021-12-07"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087"; - sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp"; + rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b"; + sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; }; @@ -8696,12 +8696,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-04-14"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4b0f2b604562e9681ae3b80c2665f168ac637cea"; - sha256 = "0amph3kjqq0hl74akpp5czjw2gk6mh6l2zz113mrb95nri0bz73q"; + rev = "b7287bd5421da62986d9abf9131509b2c9f918e4"; + sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8792,12 +8792,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-04-15"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "d5bae104031bb1633cb5c5178dc7d4ac422b422a"; - sha256 = "1k6bn3wm9chaqhkaw382169ia5ycbbnw00hwyaabx7fbzc8zf7zw"; + rev = "988a6dbad9a9777cd94aab18ba7821a41068685b"; + sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8840,12 +8840,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-04-15"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "687eb72bb6e84012ef2b0b2474175e46243e43b0"; - sha256 = "0llf81fh166xvdvy0vj93a964hp2clb3lqdy2sp3fhzldzyv0bab"; + rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308"; + sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9538,24 +9538,24 @@ final: prev: vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-04-28"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "4b0fc48037c628f14209f30616a19287d9e54823"; - sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv"; + rev = "39ec72353c2170db2caf797072800c513647e9c5"; + sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-04-17"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "8df4aa40191717b34f5da8d3c8e90dc0f1f62e0b"; - sha256 = "0nx63rn86cjprwbvqpzarxxn1id6jndvww9n10ssdf5cfkw697b7"; + rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d"; + sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9586,12 +9586,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-08-09"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f5127b339a9d776f220cc0393783c55def9d8ce0"; - sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg"; + rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb"; + sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -9610,24 +9610,24 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2020-08-31"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; - sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; + rev = "b9b87339bca7572ffc506165069242b6c06c210b"; + sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-04-13"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "c031a3e65c50d6aa0bfc81f8be9d248f9644426d"; - sha256 = "0l8ginadb4jxnrggd1lvia8kan397x02jf3v6sgkcyxawwpgfl0x"; + rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3"; + sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9659,12 +9659,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-04-19"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "bb04f9fa64b96bd3d6c4c146c6f9c55a69587fac"; - sha256 = "1wrgxsdv3q2px0q7w6jf5dnj2abr0vf1pfq5f53zq784h08m07hq"; + rev = "1cb069f2a526682b3ce69610cf7c05511295ad37"; + sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9863,12 +9863,12 @@ final: prev: vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2021-05-28"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "63b47b39c8d481ebca3092822ca8972e08df769b"; - sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361"; + rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee"; + sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -10211,12 +10211,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2022-04-04"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe"; - sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv"; + rev = "be55ec46b5ab031805487a9c3e895db57f53010b"; + sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -10235,12 +10235,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-04-18"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "db7bb8ba22f5798bf3abe9f786bc6e6d002725f8"; - sha256 = "1fjy26ncql66fn7jdmggkndad1ib9csblvyq42sq9qcdci0lb9jx"; + rev = "38282d58387cff48ac203f6912c05e4c8686141b"; + sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -10307,12 +10307,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-04-19"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "8fb9440ad4cea6ffea8efc3efa4d8d64e7fb9785"; - sha256 = "0nlsi05r2gvmwzzrrcifvx1rq09d16mnfa3gl2qif5dgmrj7qzni"; + rev = "df1e28dba36e69288173fdcdce122d98538ae782"; + sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -10475,12 +10475,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-04-16"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "d38f1bf8575b920042153689492721b80252ae41"; - sha256 = "18c3maypsl265f3a03602mnq4lky5w786i9iaphv5x5rlnfwj8wa"; + rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed"; + sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -10547,12 +10547,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2022-03-22"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1"; - sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz"; + rev = "811d8060f390837c49e8625e29c69672cdc56ec3"; + sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -10631,12 +10631,12 @@ final: prev: vim-search-pulse = buildVimPluginFrom2Nix { pname = "vim-search-pulse"; - version = "2017-01-05"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "inside"; repo = "vim-search-pulse"; - rev = "9f8f473e3813bd76ecb66e8d6182d96bda39b6df"; - sha256 = "1xr90a8wvjfkgw1yrh0zcvpvp9ma6z0wqkl8v8pabf20vckgy2q0"; + rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445"; + sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx"; }; meta.homepage = "https://github.com/inside/vim-search-pulse/"; }; @@ -10739,12 +10739,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-04-14"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "e116c2cc2555b09aee9b18eba405b925c8b7eaf9"; - sha256 = "02ljdb3p7fp0h3nf6rxv5kgsxqdvgkwrwgb01x4xn100spkv6y6i"; + rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8"; + sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10835,12 +10835,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-04-20"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "0decc32aad4564452c2f8a5cbfe387195f1a8bba"; - sha256 = "1ycmls9xpkfzkrws2aby88zmsv1489d659sllrgmbmh04g0pq8vy"; + rev = "45c8e00d0bae9056713097ea655d76d463b66f10"; + sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10979,12 +10979,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2022-04-10"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7"; - sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i"; + rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea"; + sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -11340,12 +11340,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2022-04-10"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "80ab990c7ff7251f43262aae4b60ff6eff2ef3a4"; - sha256 = "0qmxzk0vcglyrvx2hpxm6qgr6mcc1xnf6srw77ga9g0aazjr2hxc"; + rev = "98427183e2b35acee15c7628b1cd587b98025719"; + sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -11424,12 +11424,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-02-26"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "70a1131d64d75150ece513b983b0f42939bcb03c"; - sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2"; + rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9"; + sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -11460,12 +11460,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-04-13"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "9cf2f1910d5cd7f25657176fe60b1745a310f1b3"; - sha256 = "0jxkfiq5553ad7zabxlgwzwwsgwznkn0rahfmr79r1dvvqm9m1a6"; + rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996"; + sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11520,12 +11520,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2021-12-28"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "0d810cc943a858a570a482055188b5e69c4c8724"; - sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl"; + rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c"; + sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -11748,12 +11748,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-04-13"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ebeebc121423a5ab9a31c996f9881880b658c644"; - sha256 = "0npcra2k49rz9ij4kc6dyb8dpmfi6kivpp89ggmpnd0989vn9i56"; + rev = "960f0444d21ebb20303e1796e4b478df042c3bd3"; + sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11761,12 +11761,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-04-10"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48"; - sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn"; + rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898"; + sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11869,12 +11869,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-04-17"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "a9ea0c69b37850752d5f8431b7be6bf8f1a0254c"; - sha256 = "0vd01sjj4q26a653wv9icfyd7g34rnl4whbnl3ic6pvb9cvj72wk"; + rev = "777b163e394ba658ef288292efb533b25610ef9d"; + sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -12038,12 +12038,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-03-15"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac"; - sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4"; + rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3"; + sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -12086,12 +12086,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-04-20"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d9a84322624d14c1e249e9a8a4573c9d205a9bc9"; - sha256 = "16lha28fmi463snf71w0nz6ll0yiiiz7xrh2v7irkgx214q1gh6z"; + rev = "820c1913a77a12d080e3436e60a491327664589b"; + sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12122,12 +12122,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-03-06"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0"; - sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g"; + rev = "34ad436b234c5095d46bb065c5b32780618df83f"; + sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -12158,12 +12158,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-04-19"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "758568b92e0a17c3618f71d43cce96a3a5436985"; - sha256 = "0zxyyjp1527681rrw25f8vzx1d6djqac04zcay02hxi2rcnjpan5"; + rev = "da67a549cf5d67e15618cc3001f1e07724a1597f"; + sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -12180,4 +12180,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + } diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index ad1c38cb375fa..1214e36372a62 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -26,19 +26,24 @@ from typing import List, Tuple from pathlib import Path log = logging.getLogger() -log.addHandler(logging.StreamHandler()) + +sh = logging.StreamHandler() +formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s') +sh.setFormatter(formatter) +log.addHandler(sh) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate +from pluginupdate import run_nix_expr, PluginDesc GET_PLUGINS = f"""(with import <localpkgs> {{}}; let - inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix; + inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix; generated = callPackage {ROOT}/generated.nix {{ - inherit buildVimPluginFrom2Nix; + inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix; }}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; getChecksum = name: value: @@ -50,43 +55,69 @@ let checksums = lib.mapAttrs getChecksum generated; in lib.filterAttrs (n: v: v != null) checksums)""" +GET_PLUGINS_LUA = """ +with import <localpkgs> {}; +lib.attrNames lua51Packages""" + HEADER = ( "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) +def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + ''' + Whether it's a neovim-only plugin + We can check if it's available in lua packages + ''' + global luaPlugins + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + class VimEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: + { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: - {""" + { + """ )) for pdesc, plugin in sorted_plugins: + content = self.plugin2nix(pdesc, plugin) + f.write(content) + f.write("\n}\n") + print(f"updated {outfile}") + + def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: - repo = pdesc.repo - src_nix = repo.as_nix(plugin) - f.write( - f""" - {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + repo = pdesc.repo + isNeovim = isNeovimPlugin(plugin) + + content = f" {plugin.normalized_name} = " + src_nix = repo.as_nix(plugin) + content += """{buildFn} {{ pname = "{plugin.name}"; version = "{plugin.version}"; src = {src_nix}; meta.homepage = "{repo.uri}"; }}; -""" - ) - f.write("\n}\n") - print(f"updated {outfile}") - +""".format( + buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo) + print(content) + return content def main(): + + global luaPlugins + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() args = parser.parse_args() diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 5e19d33d19d19..e685e398fc2b0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -535,6 +535,11 @@ rec { inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook; }) buildVimPlugin buildVimPluginFrom2Nix; + + # TODO placeholder to ease working on automatic plugin detection + # this should be a luarocks "flat" install with appropriate vim hooks + buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix; + # used to figure out which python dependencies etc. neovim needs requiredPlugins = { packages ? {}, diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 55895b8790a0a..242fc499b658b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,13 +20,13 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.4.28-trento"; + version = "2022.5.2-trento"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w="; + sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84="; }; postPatch = '' diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 60482a84c9b43..c82de2ae02770 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,5 @@ -{ lib +{ callPackage +, lib , stdenv , fetchurl , nixos @@ -6,12 +7,12 @@ , hello }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hello"; version = "2.12"; src = fetchurl { - url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; + url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { (nixos { environment.noXlibs = true; }).pkgs.hello; }; + passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' @@ -34,9 +37,9 @@ stdenv.mkDerivation rec { It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/misc/hello/test.nix b/pkgs/applications/misc/hello/test.nix new file mode 100644 index 0000000000000..7acded2a16f2d --- /dev/null +++ b/pkgs/applications/misc/hello/test.nix @@ -0,0 +1,8 @@ +{ runCommand, hello }: + +runCommand "hello-test-run" { + nativeBuildInputs = [ hello ]; +} '' + diff -U3 --color=auto <(hello) <(echo 'Hello, world!') + touch $out +'' diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index dfa114f446a1e..2eb329dd51119 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kiln"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI="; + hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA="; }; nativeBuildInputs = [ scdoc ]; - vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk="; + vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 273ca0245a2b8..2b825705b0066 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, pcsclite, talloc, python2, gnutls +{ lib, stdenv +, autoreconfHook +, fetchFromGitHub +, gnutls +, libmnl +, libusb1 +, lksctp-tools +, pcsclite +, pkg-config +, python3 +, talloc }: stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.2.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg"; + hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; }; propagatedBuildInputs = [ @@ -18,11 +27,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook pkg-config + autoreconfHook + pkg-config + python3 ]; buildInputs = [ - pcsclite python2 gnutls + gnutls + libmnl + libusb1 + lksctp-tools + pcsclite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 522c5739a882c..1e726f81bfb14 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,31 +1,100 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, - gettext, glib, portaudio }: +{ stdenv, lib +, alsa-utils +, at-spi2-core +, cmake +, curl +, dbus +, epoxy +, fetchFromGitHub +, flac +, gtk3 +, jasper +, libGLU +, libarchive +, libdatrie +, libelf +, libexif +, libogg +, libopus +, libselinux +, libsepol +, libsndfile +, libthai +, libunarr +, libusb +, libvorbis +, libxkbcommon +, lsb-release +, lz4 +, pcre +, pkg-config +, portaudio +, sqlite +, tinyxml +, udev +, util-linux +, wxGTK31-gtk3 +, xorg +}: stdenv.mkDerivation rec { - pname = "opencpn-unstable"; - version = "2019-11-21"; + pname = "opencpn"; + version = "5.6.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; - rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7"; - sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; + rev = "Release_${version}"; + hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext - glib portaudio ]; - - cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + nativeBuildInputs = [ cmake lsb-release pkg-config ]; + buildInputs = [ + alsa-utils + at-spi2-core + curl + dbus + epoxy + flac + gtk3 + jasper + libGLU + libarchive + libdatrie + libelf + libexif + libogg + libopus + libselinux + libsepol + libsndfile + libthai + libunarr + libusb + libvorbis + libxkbcommon + lz4 + pcre + portaudio + sqlite + tinyxml + udev + util-linux + wxGTK31-gtk3 + xorg.libXdmcp + xorg.libXtst ]; - meta = { + + cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; + + doCheck = true; + + meta = with lib; { description = "A concise ChartPlotter/Navigator"; - maintainers = [ lib.maintainers.kragniz ]; + maintainers = with maintainers; [ kragniz lovesegfault ]; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl2; + license = licenses.gpl2; homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index e8c6445d5f84d..0f331ef6e2ce4 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.2"; + version = "1.3.10"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg"; + sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec { packaging pycairo pygal + psutil + gbulb pypresence + sentry-sdk setuptools skytemple-dtef skytemple-eventserver diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index c6a79aa0e61e7..34cc97023989e 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.7"; + version = "5.6.10.13"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb"; - sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb"; + sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index db28952c31f2b..578c08b207eda 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; + sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; + cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0df1f31fb50d2..bb994f7008f4b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "101.0.4951.41", - "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", - "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq", + "version": "101.0.4951.54", + "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62", + "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y", "deps": { "gn": { "version": "2022-03-14", @@ -56,8 +56,8 @@ "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" }, "ungoogled-patches": { - "rev": "101.0.4951.41-1", - "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0" + "rev": "101.0.4951.54-1", + "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a294a87080591..f05ccab2975dd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "100.0b6"; + version = "101.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ach/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ach/firefox-101.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085"; + sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/af/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/af/firefox-101.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790"; + sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/an/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/an/firefox-101.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f"; + sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ar/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ar/firefox-101.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e"; + sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ast/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ast/firefox-101.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb"; + sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/az/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/az/firefox-101.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701"; + sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/be/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/be/firefox-101.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3"; + sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bg/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bg/firefox-101.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3"; + sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bn/firefox-101.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b"; + sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/br/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/br/firefox-101.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130"; + sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bs/firefox-101.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61"; + sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca-valencia/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca-valencia/firefox-101.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a"; + sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca/firefox-101.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4"; + sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cak/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cak/firefox-101.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a"; + sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cs/firefox-101.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35"; + sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cy/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cy/firefox-101.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2"; + sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/da/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/da/firefox-101.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25"; + sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/de/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/de/firefox-101.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee"; + sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/dsb/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/dsb/firefox-101.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a"; + sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/el/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/el/firefox-101.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac"; + sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-CA/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-CA/firefox-101.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587"; + sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-GB/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-GB/firefox-101.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab"; + sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-US/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-US/firefox-101.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e"; + sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eo/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eo/firefox-101.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5"; + sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-AR/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-AR/firefox-101.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946"; + sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-CL/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-CL/firefox-101.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff"; + sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-ES/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-ES/firefox-101.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5"; + sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-MX/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-MX/firefox-101.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026"; + sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/et/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/et/firefox-101.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322"; + sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eu/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eu/firefox-101.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9"; + sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fa/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fa/firefox-101.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d"; + sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ff/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ff/firefox-101.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234"; + sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fi/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fi/firefox-101.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4"; + sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fr/firefox-101.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c"; + sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fy-NL/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fy-NL/firefox-101.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d"; + sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ga-IE/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ga-IE/firefox-101.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc"; + sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gd/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gd/firefox-101.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c"; + sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gl/firefox-101.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2"; + sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gn/firefox-101.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634"; + sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gu-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gu-IN/firefox-101.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7"; + sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/he/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/he/firefox-101.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5"; + sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hi-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hi-IN/firefox-101.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09"; + sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hr/firefox-101.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945"; + sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hsb/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hsb/firefox-101.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c"; + sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hu/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hu/firefox-101.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03"; + sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hy-AM/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hy-AM/firefox-101.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5"; + sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ia/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ia/firefox-101.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098"; + sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/id/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/id/firefox-101.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b"; + sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/is/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/is/firefox-101.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733"; + sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/it/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/it/firefox-101.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2"; + sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ja/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ja/firefox-101.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921"; + sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ka/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ka/firefox-101.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9"; + sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kab/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kab/firefox-101.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f"; + sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kk/firefox-101.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab"; + sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/km/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/km/firefox-101.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d"; + sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kn/firefox-101.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0"; + sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ko/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ko/firefox-101.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630"; + sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lij/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lij/firefox-101.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8"; + sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lt/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lt/firefox-101.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d"; + sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lv/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lv/firefox-101.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9"; + sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mk/firefox-101.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d"; + sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mr/firefox-101.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5"; + sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ms/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ms/firefox-101.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949"; + sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/my/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/my/firefox-101.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9"; + sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nb-NO/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nb-NO/firefox-101.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284"; + sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ne-NP/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ne-NP/firefox-101.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b"; + sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nl/firefox-101.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51"; + sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nn-NO/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nn-NO/firefox-101.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd"; + sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/oc/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/oc/firefox-101.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7"; + sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pa-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pa-IN/firefox-101.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb"; + sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pl/firefox-101.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585"; + sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-BR/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-BR/firefox-101.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4"; + sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-PT/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-PT/firefox-101.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44"; + sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/rm/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/rm/firefox-101.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53"; + sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ro/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ro/firefox-101.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9"; + sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ru/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ru/firefox-101.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281"; + sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sco/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sco/firefox-101.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f"; + sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/si/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/si/firefox-101.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f"; + sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sk/firefox-101.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235"; + sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sl/firefox-101.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6"; + sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/son/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/son/firefox-101.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa"; + sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sq/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sq/firefox-101.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6"; + sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sr/firefox-101.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad"; + sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sv-SE/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sv-SE/firefox-101.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b"; + sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/szl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/szl/firefox-101.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970"; + sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ta/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ta/firefox-101.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587"; + sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/te/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/te/firefox-101.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0"; + sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/th/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/th/firefox-101.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9"; + sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tl/firefox-101.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07"; + sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tr/firefox-101.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf"; + sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/trs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/trs/firefox-101.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa"; + sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uk/firefox-101.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494"; + sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ur/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ur/firefox-101.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563"; + sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uz/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uz/firefox-101.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880"; + sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/vi/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/vi/firefox-101.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb"; + sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/xh/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/xh/firefox-101.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b"; + sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-CN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-CN/firefox-101.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172"; + sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-TW/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-TW/firefox-101.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7"; + sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ach/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ach/firefox-101.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab"; + sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/af/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/af/firefox-101.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b"; + sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/an/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/an/firefox-101.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97"; + sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ar/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ar/firefox-101.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc"; + sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ast/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ast/firefox-101.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11"; + sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/az/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/az/firefox-101.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d"; + sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/be/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/be/firefox-101.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b"; + sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bg/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bg/firefox-101.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d"; + sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bn/firefox-101.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d"; + sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/br/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/br/firefox-101.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e"; + sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bs/firefox-101.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137"; + sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca-valencia/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca-valencia/firefox-101.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e"; + sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca/firefox-101.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722"; + sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cak/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cak/firefox-101.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc"; + sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cs/firefox-101.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db"; + sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cy/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cy/firefox-101.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964"; + sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/da/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/da/firefox-101.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b"; + sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/de/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/de/firefox-101.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d"; + sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/dsb/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/dsb/firefox-101.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae"; + sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/el/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/el/firefox-101.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad"; + sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-CA/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-CA/firefox-101.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc"; + sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-GB/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-GB/firefox-101.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a"; + sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-US/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-US/firefox-101.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20"; + sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eo/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eo/firefox-101.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca"; + sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-AR/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-AR/firefox-101.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e"; + sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-CL/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-CL/firefox-101.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b"; + sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-ES/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-ES/firefox-101.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10"; + sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-MX/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-MX/firefox-101.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea"; + sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/et/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/et/firefox-101.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b"; + sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eu/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eu/firefox-101.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69"; + sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fa/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fa/firefox-101.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b"; + sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ff/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ff/firefox-101.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce"; + sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fi/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fi/firefox-101.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51"; + sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fr/firefox-101.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3"; + sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fy-NL/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fy-NL/firefox-101.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6"; + sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ga-IE/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ga-IE/firefox-101.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e"; + sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gd/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gd/firefox-101.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e"; + sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gl/firefox-101.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604"; + sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gn/firefox-101.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc"; + sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gu-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gu-IN/firefox-101.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300"; + sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/he/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/he/firefox-101.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90"; + sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hi-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hi-IN/firefox-101.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6"; + sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hr/firefox-101.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f"; + sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hsb/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hsb/firefox-101.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1"; + sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hu/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hu/firefox-101.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f"; + sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hy-AM/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hy-AM/firefox-101.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6"; + sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ia/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ia/firefox-101.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6"; + sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/id/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/id/firefox-101.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690"; + sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/is/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/is/firefox-101.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c"; + sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/it/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/it/firefox-101.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80"; + sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ja/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ja/firefox-101.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf"; + sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ka/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ka/firefox-101.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3"; + sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kab/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kab/firefox-101.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01"; + sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kk/firefox-101.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d"; + sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/km/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/km/firefox-101.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce"; + sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kn/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kn/firefox-101.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8"; + sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ko/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ko/firefox-101.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039"; + sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lij/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lij/firefox-101.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a"; + sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lt/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lt/firefox-101.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e"; + sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lv/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lv/firefox-101.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34"; + sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mk/firefox-101.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c"; + sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mr/firefox-101.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9"; + sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ms/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ms/firefox-101.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad"; + sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/my/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/my/firefox-101.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe"; + sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nb-NO/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nb-NO/firefox-101.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24"; + sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ne-NP/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ne-NP/firefox-101.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61"; + sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nl/firefox-101.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12"; + sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nn-NO/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nn-NO/firefox-101.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241"; + sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/oc/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/oc/firefox-101.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd"; + sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pa-IN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pa-IN/firefox-101.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f"; + sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pl/firefox-101.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96"; + sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-BR/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-BR/firefox-101.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c"; + sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-PT/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-PT/firefox-101.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3"; + sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/rm/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/rm/firefox-101.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d"; + sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ro/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ro/firefox-101.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f"; + sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ru/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ru/firefox-101.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4"; + sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sco/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sco/firefox-101.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510"; + sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/si/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/si/firefox-101.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732"; + sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sk/firefox-101.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0"; + sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sl/firefox-101.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9"; + sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/son/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/son/firefox-101.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16"; + sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sq/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sq/firefox-101.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756"; + sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sr/firefox-101.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153"; + sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sv-SE/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sv-SE/firefox-101.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0"; + sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/szl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/szl/firefox-101.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f"; + sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ta/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ta/firefox-101.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64"; + sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/te/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/te/firefox-101.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275"; + sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/th/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/th/firefox-101.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383"; + sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tl/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tl/firefox-101.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9"; + sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tr/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tr/firefox-101.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42"; + sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/trs/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/trs/firefox-101.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648"; + sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uk/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uk/firefox-101.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2"; + sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ur/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ur/firefox-101.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca"; + sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uz/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uz/firefox-101.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9"; + sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/vi/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/vi/firefox-101.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061"; + sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/xh/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/xh/firefox-101.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f"; + sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-CN/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-CN/firefox-101.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d"; + sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-TW/firefox-100.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-TW/firefox-101.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac"; + sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 4a561e9126ccb..d076c843fb7d9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "99.0.1"; + version = "100.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ach/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ach/firefox-100.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e2054f03b413f783f287c14fb670ee97415e89181e2ca1f9bbe05a18fb529330"; + sha256 = "3e85609f0b3e4eb15262cd8567d8973bed2195f6a19199d76a99ed361cc0d0cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/af/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/af/firefox-100.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "102c4460ae7a8242c770bda09baee07004f84d95a885c621fbe23f2fdb585398"; + sha256 = "0950ef9c6c9c386df1e2d9f85312d9f3fe0dbc1668aff6710da54f8a3cdbc5de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/an/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/an/firefox-100.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0f8aeacc3a7abbb5f571aff8a6580c9779336bccb0d30005b46d336447123b10"; + sha256 = "af97c6a4dcc34e7edd52111c6ba9480f5ecd2765ca972cb43745ecb54ba01d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ar/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ar/firefox-100.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "720c5d872243631ddf67102e6a54504912b33f6e21c666d84e73a399f10a2559"; + sha256 = "0f9947456cee9db27baffd0476e62ce529b349213ad1a0c2196bcf6d7f0e582c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ast/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ast/firefox-100.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "194345cdce1e9c6462a80423d1b97be4c757dc69b1f5a0055ac14e2624d1d145"; + sha256 = "c0da6abaaecee287732a5e00520d2bacfd61a3a7ca64a5bffe37830f53cf5d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/az/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/az/firefox-100.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9936c9d172ddd291d34679c33f28d7ec425e4835abdfb25dd0252e50ab5eca09"; + sha256 = "1d57a9d3038dff5a354f24e7ebc7d93d11dccc57be72644988dbbb20c734d243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/be/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/be/firefox-100.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "420f519aa954b708da735605e32acf9f11bfa2195e7a9bd2ebd954a58df2db10"; + sha256 = "d20e556064f10c5730f094b55b4014816df7b49840d0e9934fe3167e135bd789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bg/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bg/firefox-100.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2a7cbc2903894934024fb8ea2212e7f23a47c7db707e4c88a33656366b810dfc"; + sha256 = "2d26cdef7ee0d7c263599c38d5352268380125ccc3f901f48ed60134badae1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bn/firefox-100.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "46984d43f628ecdc1674d41f45c57177dfe24eb6dec0e5ae5e6a8efec7157791"; + sha256 = "61395cb64c519a14ef879b6b1f9444f727a6ac73074d0e67e3e68a89428c7651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/br/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/br/firefox-100.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1427aaca5903a1ecb3e17aa7e3351334b1a2183a1180c9a4942535b50f64c0db"; + sha256 = "486b59f31c0a63155d04cf0818d5c8629e846b313cd6eabcc762bb0c51adf35a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bs/firefox-100.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8377ad8c27236c5336e370acf70e901f4dbb53dd25142a74dc61f98fd2beab91"; + sha256 = "656911e5fdd030ee191f1bcab6dc9f2a66f888a6fa726007e528716df5d6667e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca-valencia/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca-valencia/firefox-100.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "78f8dd650fb9398b1cb999db887bb5764f4b015539c3aac0eee2fdd05477bf3e"; + sha256 = "f31c75df5bf3639bfa4db86cc0237f7602a725b242e6330259ca4cbb61dd715d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca/firefox-100.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "18b0acda5e75ec1412273a016d2cc36f6c65b68ebae5251ef13289cf73ef00d6"; + sha256 = "7f53e06ccec188fb5e85a33c7968ba90c88bf1d3a782aee179e3fef5010a33b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cak/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cak/firefox-100.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "505c3f2c8f39aeea7ca4f8285d59fcef995e5c6c64d318d7b143e7060982d7a7"; + sha256 = "a1b8349ffe436cce151c5358b2e1d5a928a0ef3e623ef2c98e9f55b0ce2f405b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cs/firefox-100.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d33f7f5adf068743a523f54fb2dec1edf7302993ef3684dd86cbab25b96c3247"; + sha256 = "b11f724a20c13ccec73c9058e90387a031e6a9b22e02ae4ab59357d8f191ce65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cy/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cy/firefox-100.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8a0d5e3a4ad8650d4e8e77e92c24b27da1d5c0b44878e97462ec94597020e548"; + sha256 = "71e1faa584d6c9243ab806f694e548fec92672f44d6239828fb7f3c5363850b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/da/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/da/firefox-100.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c9c8355c3cab4e189a4ba322f4a7e2a189617786e912930f0c17b217ff89c1c6"; + sha256 = "e811e13df31bf0e55904a696b69ca0fd0785c7e60f9bc79fae920cc7bb55ee39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/de/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/de/firefox-100.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "83468180a67fae5a5df8810e3b7bfdc6b01faaf60dd18a0914715ac89531c7a4"; + sha256 = "22c6c8d312db6b64dabc7d401751ce7aecd3b5889eb8e5538433bbf5aeb55d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/dsb/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/dsb/firefox-100.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "feeda2e3f021d459c98371e244d29b9e6e6fdaa6250a8a6700b34a981f3dcf13"; + sha256 = "76d7d9ba4483c6b727568dfbf497940dc38871cc18f5cf6823cdbd539d9f559d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/el/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/el/firefox-100.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4fc65f4b6d84a01c79165ee9e058c980659089e86da72b016cfc5efbe973e592"; + sha256 = "59f4fab29a3888a7b86b8f50281eff8d3c7ed512a92fbceb5ab3ebfaaa4faad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-CA/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-CA/firefox-100.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "10e324101932b7290814ea2ab747657363023a88857ca90e25d54f89115ffbcf"; + sha256 = "1c493929d5ab703f59b2e6e6ca86004725dcda7ca23c3a2b34de425e6a969cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-GB/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-GB/firefox-100.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "83ba931e4f6afd0d0c32b3bf0db55a7ff0fdfda080e906bb3ada5b4e61a4c3f1"; + sha256 = "2e48068db4bed6722568a35d7a2aaa84b68a8e18304744940c36437cf88b10d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-US/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-US/firefox-100.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7bc57f06fc9c52e16815f1a4208c33bc5819423c68da441d001f7c2200591bcd"; + sha256 = "528845df1a15acf081fdc9e1e7276f0b4601acc9df3553324e02c9c6fb9b7d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eo/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eo/firefox-100.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3fc945331b62f9998d2adb6a99d3390528975c97b6776f97a4c461eb124da462"; + sha256 = "0fa2f3f4a7cbe7e9e41d0d08ba8649efa84b727d9adb621b408cf7732312fc6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-AR/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-AR/firefox-100.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "908723c7445b92b4c4e26fc999562681e4bf3ffffee0ea1db6362aed0f615c0e"; + sha256 = "6afb61b7e361735321934a4189063cc5f424c79022b7482b0923a0204160c2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-CL/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-CL/firefox-100.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "77363cfa3c2ce655a9f6203c495f8f54700b44e0b66d021050cea59e2b0e0a3e"; + sha256 = "382ba75ab94f81ecdaeeb98b41467969b103e9feb73cbbad18b69d5f39013dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-ES/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-ES/firefox-100.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ee59faf4bd7472a14fd8e420aa7f408abccd72f31d162da0c5f9b530593722f2"; + sha256 = "1a09045c93cceb449e6f0dd9d644abcab2ec30bd39f5c9aab091fc49f32a2592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-MX/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-MX/firefox-100.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "732b1edb21462281e029de794ccdb3c20ceea0c6d5c0f1c885ef76ad57df7abf"; + sha256 = "68f0ef188418452de2efc73d3f94a5c1e515bd07b6907168b20b909f7739be84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/et/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/et/firefox-100.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b816c47c20a674256dc176a15dbeec830b47f8c3eecde31c615f003260e69668"; + sha256 = "7142bcf0d715b73f11cba9f181f3a02cfeef9e07e825dae7120df51b10697765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eu/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eu/firefox-100.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4f54fa8f7718bc55b733c6986c8ffa17517afac92383dae03fb972beed876665"; + sha256 = "563fed2bb7c6168aa9d973d1578e59c2ed1e785ca82d796de4aecebb8d6dc404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fa/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fa/firefox-100.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ee716492cc2cc0a11c98ea8e8bd7d142ec21c006e2f12a96707d9dad82bf92b5"; + sha256 = "f7ec308585ab8aa0e112057cd0af1df524e6712611b7ae93e893e681c8b117c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ff/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ff/firefox-100.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "36d1c4b3966a807c6bc90c4f6fecbef327442398a463167535dae318f286d222"; + sha256 = "d678cc64bba6370a300a64dbdc52343b7eaae73953ddec584038d70dee8f09ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fi/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fi/firefox-100.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9855e6d25d34d6df614ef2b48b4b1e60d527fe00c0da132a0609ac6262354623"; + sha256 = "998746f48e543897806e8024e8e6c6cac3dd63471b3896d83ebd80279d8f026e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fr/firefox-100.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b999d3ed98eb594335e810a4a81de86e7e3466a2c32cc6bef0bc260ae883a6d4"; + sha256 = "11bd3ad17ad680049dcb262ffa18a477d9d8285040e403b26a2f45a449a63139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fy-NL/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fy-NL/firefox-100.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "be9fce28930fb80a94cc5c6343b34ff6b05538a08cee657d995d647f3d9dec7d"; + sha256 = "508f784775df7b89e6144d9290f98e05b17b831f43f81fde5f45cadb0355bfcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ga-IE/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ga-IE/firefox-100.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92bbd149f59a6c2594d6fe1e2ba8e545bd7f9040ae35ec924414c59d06d0f4c7"; + sha256 = "3185a57d4a065ed4cc85fac6c3ee14597b25b5f3acdf9f0c9232d7b1935ad25b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gd/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gd/firefox-100.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bb2cd80e2d1c9b08363a0025b428473334596f3e34ff321e3d6c69f723fb18f0"; + sha256 = "580397f6ec486a571768f9eb4b4d1b5b7e10a9e791c90907c7b0be0eccfb355a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gl/firefox-100.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f74e552aea8622136679cfb162b2c192ccefa91705e8352830efdec3cae9a0b1"; + sha256 = "485a806aeaafda44d687fc41eab57a276cca691c01a67eae6baf10288e7aec67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gn/firefox-100.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "261cb7858277e012b8d67f890312b3fa333522542a6a7c71019f06e1340e0349"; + sha256 = "44a2699e0c3d79bfb2dbf3d4da4bcb92e7a4453daebfd57a53d9a0a6ac3e3248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gu-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gu-IN/firefox-100.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a3421aa896d08984f9d2cb38fea3e4bf93d9d0dbcb74bdf06dccb3f5039db44"; + sha256 = "5d817fdcff89b4c440580facabb01d30915962d8b076e7e79781f7209bf83023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/he/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/he/firefox-100.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f734cef92e78b3713e179959c6af917a64c4b16d00d834c776652337d42bc65e"; + sha256 = "1756cb46aa5cae3d4cdedd720441a2ef97dfc5cfb22eed734f0b649eb65a282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hi-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hi-IN/firefox-100.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e0694ff508e38ae758a96ef5023e7d7d39cabc2b7bbb56cff2854b51009a0732"; + sha256 = "27dcf3edd4b9fa67132c761dc3186d8ddbc0f63b32d5606abd43140a4f2a58b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hr/firefox-100.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "438665aa04f02cb9275c8b76ee5c0ff6d7814fc0c1439f50f714613fb902b9c6"; + sha256 = "1aa433ebcb2b0fc185efd98b8312dc1c5b5315ffb6710e3ab69ceac0d22e1871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hsb/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hsb/firefox-100.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1b17d24231fd22db70f6f7bcfe793d31390a441355275771749352221320d4cd"; + sha256 = "a0d343a341c593f6b746acb81eab4386a68cd023a5409e0182d908786243e5e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hu/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hu/firefox-100.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d2be4860a0019e9385f48b989300ad42ced0ab2c3873e8074a6863f3afc4719a"; + sha256 = "de0a800eef3f292b7157dda727878d9ed953c1ffff1c7ecdd2cf49c1024dfcf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hy-AM/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hy-AM/firefox-100.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b9decd8f427362e1070c17242a906d170122c2bcc17641a2132d87ab24e52467"; + sha256 = "44c824309b419151fcc634d4d20774fee6f514df428c6203990ffbe7cb56e6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ia/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ia/firefox-100.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "97a9ec4317bc432ed6c79f796fd0547fab0a156d9c9c959235f6b941ad4fb6fe"; + sha256 = "edf777a9904981d1b345390a7ab06c23e543f600a57d3e0ce0e41ab7dcca2ee0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/id/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/id/firefox-100.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "621add55642a28cf95ff1f0acde8881862c1d4487500e5cc0705bf3ba0055c56"; + sha256 = "458ad2e7a89dfb4c50376114f270d36220c9986bad5103ccfdb11eb5452d6f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/is/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/is/firefox-100.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9293bce28c6252e9ee561f41e54b39e6a66d916e18e34965d1fec77a2d8088de"; + sha256 = "5bf8868b2dbea3f4d08a4201864dab6682c351912a7cd3622dcda5eb0fc67e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/it/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/it/firefox-100.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "aeeface0275cdb426fe851d91bd49014aa8aadc7becf18f4763b44f0526260a4"; + sha256 = "057b3ee3698696b59b49a66a8622d281c50c35c2b900fcfc95aedf4cb06701b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ja/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ja/firefox-100.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "dc51a842e0a8aaeea874fc73e99de5978615c250afc17309e7edaf80802acb56"; + sha256 = "168207c2ed591603529d9f281f0fba5be8c775d130082fa6016ab77a06e392b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ka/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ka/firefox-100.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "85562b0af98292e923c39de4b0c15d2ea0e95cd8fcb7d86c4d941eabdf9a1827"; + sha256 = "92564e5dda8d74245d00d83ef06c29fbff798db36d665cdd69b88d4e00474299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kab/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kab/firefox-100.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c06e7fd59bcb82a989c90a2095c467eccdd1a98b4e704348befc89061ad9a6da"; + sha256 = "c6641d1b22d9fd07885e18ac4ae6d0770ff6c1f88c04d41c6e43020c774a47cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kk/firefox-100.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d041abeb5f207a234fde69fd265ec98b5bc94a29ba5d231334d74caccd7c1d16"; + sha256 = "24dce49c8e0c343f3178b0280e01c34716654fa705cfc16f22b5815f2d4c524b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/km/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/km/firefox-100.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "b02b241b7ca07732c26aad728d1d15b637d4bb032673d92b0ff1a65fefca0d80"; + sha256 = "662aabaa2dfb2d6d217f359979770cc698063816d4f2db28d959cde88931aa4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kn/firefox-100.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "0ad5133784a27dec78031db198ee762e4ee0d0514d03dc175130a64eab93d302"; + sha256 = "343213168dd6522af4e206a33c9c6f8872853207ecfa34e85189439a46be6aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ko/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ko/firefox-100.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "01adfa538c52df224c6b982cb96ed50a3f19b8e0608d323003f2264e6d1c18c1"; + sha256 = "31cfa145a16c339911b9374f70b9124fcdc94c7fd630263fd19676279f257ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lij/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lij/firefox-100.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "1cd93f13d9cc732f7b580c611f31ce8a71ba20436bc7acc996fa1d22c4c8b954"; + sha256 = "7b3cf0ac4286c6ba3dd8167349cefee9f55979651566e82e2d4e979d5f8b47ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lt/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lt/firefox-100.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fd92972d632c5c3d1822feaf2372bd6a06ea957b0c8a5663b0eda787da53e4c4"; + sha256 = "47715eb38d43b6cf2c873d7d7c9f643c3e895dc31e64b0481fe46d20ea670572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lv/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lv/firefox-100.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "cfb5112aca7d7e7af298a0c035ca2d549c849d9ef1536bcc958726df81f64665"; + sha256 = "77afd745728346eeba893bb8eb7bc2517c69f68ade939fd2273c595607f7a4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mk/firefox-100.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bd1c8a1175326fce66cd32ebf394585fe09c5a65cf72e0e0598e572583e46515"; + sha256 = "2c287aa2b2854e45b3a49df38d3aa8ded24d63a931c7f37ff320bc8d4358e0a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mr/firefox-100.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9912aff12281b1ec3b4605ae72fba291f24e193ff976658e638fdb35a9d40cd0"; + sha256 = "4212b8ddb9cd59bc692921d2ab70613ea738ca3a4a23bda0cb038707dda1262e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ms/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ms/firefox-100.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4f155ab0ce5420d272a86eb8b52cb816b90aabf34900bc5ba56d869e44408733"; + sha256 = "a0b878c3171af29ab631b734c20dac581ec7c1cd0487835bdb23db6ca72ca378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/my/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/my/firefox-100.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5b01096123e71ff94e6a44ba44edaf9453d2770f8918019e349f20f55f4fbe04"; + sha256 = "afeeea7ec03567ec058c5d77e813997f8cda6a654771da1a433a69bc27bf254a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nb-NO/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nb-NO/firefox-100.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2d4b0706d46e92438a3ec1067515ca4eaa37aa168f6c633339a7c78c1e447f62"; + sha256 = "a359e3b9a83aec399890324ab484c811a9a5f615ee8237bf1a1f58d9140432f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ne-NP/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ne-NP/firefox-100.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3f6e8d2b081bd23bc0a6425b0f956fbb8431c301b01563d43d1ec976ec5daa32"; + sha256 = "2aa43032307675ce450c2e35a2e833edddd9ab94626be008785c8226f0d62ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nl/firefox-100.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "00d8fb594fd4ced7ab5c7fe3de74bc193630547b5a537f0025a1ac11ec2adc53"; + sha256 = "ca8eaebfbbc6843f1273ff8ae8bca03209a436a3de86784049aafe52d7a3e950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nn-NO/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nn-NO/firefox-100.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "de3b36fabf65ff0d6f8f24c2dd0490214f08fe4216645c7af0a0f271f443aec5"; + sha256 = "5472b83b2e26c8ce88a959cc3e97c140f6e3efdff5f0c9208fb2d599f43081e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/oc/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/oc/firefox-100.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "df7391bdfbf21175f3e935dbdb6985b0fbd3550824d4203c93b91d52ef0841e8"; + sha256 = "19552e9822f186ec64e38ce170f0d93f433ba1d15fa25fd7388567af48925bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pa-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pa-IN/firefox-100.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "653b0bb83de0787c37985968822c1637e4707a9dd96a521450048e25d220f1fd"; + sha256 = "75f3516e0f14233bb158cde3a57be644fcd6b01256ade0a9cef21ad81d434454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pl/firefox-100.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "31e861138205a8d69503550dff92e3a530b5d4212bd2f1f905298cceb53dbf40"; + sha256 = "2cbb208a9f23b39c66c9e50be0a873d989083f0abf9ab56e48e9b7ada91718e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-BR/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-BR/firefox-100.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "20e992c16e7dc1d0c2e641a7ecac46e29fb00bcbe1ddca3a34cfe7a9344eadd1"; + sha256 = "2b9a5b1d37a000d86fb7cc41977c3ff8444047330ab0b2e10da288e418569905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-PT/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-PT/firefox-100.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5be572a2928648ba36d1e775c79967ac17810f341dc84a2c69e8d7bad07e3a21"; + sha256 = "73de91287952c4bc9dc53099ce911aab140bcda6356788e8bab5c667f1d363c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/rm/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/rm/firefox-100.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "47d11d7f4ba7fa8753845f3ab2cb4c36c2a20fa31cd9dd561d7032f3c28a9b22"; + sha256 = "39c934e5c3b08e41889ed47f63e2e9f24a08602e40d20497cc7d9edb42132aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ro/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ro/firefox-100.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c533fb1f8f845970e647a2d612c6ca23962d476b51696d12dde01e143ec50857"; + sha256 = "d23606050f9956d22efd779f09db6cb439cf8624cdc3e509f0ec6a7f0e3c9e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ru/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ru/firefox-100.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "571b016d12ec198148d52fa3e8ed25781cde49f3aaf8187ba881764b52d1c3f9"; + sha256 = "b940390f3199cba2de06ef37a48ce6d0a892c8edd6e0125be088d50fa6c2e06b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sco/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sco/firefox-100.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "b30a42bd17bd2ee8843d791a00ac29f3ac91aa3d4de7b70ae603fe6365fc7906"; + sha256 = "3a1bb5b617b7a1633c79b6d7c80e559de15e6e6c9265d574de89628cc246e2f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/si/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/si/firefox-100.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "509f987eac7b593cf24f6446ac7b78b2dc8e43dbf8b29dd82d0a107a596207f0"; + sha256 = "e90f56c11a25fd023b3fe282858d93504e49cace7c26fd542fef10565f844742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sk/firefox-100.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4f44c500b355c5100dc476a807e8b212962e12c45b058b14cc0b5f84abac81b5"; + sha256 = "a33f598ef8e2d9865cc01ef4a03a1a0e6ea96231dec4301ada4d128bb672d35f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sl/firefox-100.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6ecd0f30d8ecf6e6b63512f59363c7a4a17389f468a21ac1119a98b467ecee39"; + sha256 = "939ffbab94871eb84bf36719debfaad1f160e0b10e0481082e5a1cf534537a54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/son/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/son/firefox-100.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ddefd1ef806f3b39a51cd52d33a286f0145fc106c479e3f14a45a9e63c8ee374"; + sha256 = "ecb166da7e16c925f14cbc3fb4748a039b942f20088ff6f9ba02489f1602c0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sq/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sq/firefox-100.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b69459ef0165648ba0b13b6d4ff6b27e80ad81181bf65b415e87574b21a2a021"; + sha256 = "53b31c2c83fd1aab0b54cbbcf77459c38a8d466b4df866a49b1a0474038651d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sr/firefox-100.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8d53bd7943aa99bbea08be26cd4e5465b3889c8ee0dfb718c82f1ab65ce9e2fe"; + sha256 = "15b9b971d1ca2a7ab1422b040b813de9e984c451ea41eab8bad2939c5b9ae604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sv-SE/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sv-SE/firefox-100.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d70d78df84a39f921253c613518e0737439d1e516248b64c8b79fe29eadf4520"; + sha256 = "7f44e7cec1f32a69b173ef832501dcb38002c0b690284af21a53b4862053c596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/szl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/szl/firefox-100.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "c02e86f128049d894f1d2144bc1baa3ceac4b58745c19428f2de5def7dc8ca36"; + sha256 = "df3d1186c2472d0e42e36efedd231b6beef43c1dbf18bcb1a27f86aee47257d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ta/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ta/firefox-100.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "18754112a15bd8d25ebc8ee456e43fd7bc97b5af014a8bb6ebc481e0fc18559d"; + sha256 = "d14d94ab5bed1b3c2118d5ac1dd31caf950f287b3b40de80e136b3500bdc773c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/te/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/te/firefox-100.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "afeb892e3656d2d3c802d548bc78bada5a9a2d4f7300d5dccbb4af0b96902371"; + sha256 = "e11c66e7eae928a06f3d705ce3024cda3961c52727bed2217ac6dce444367107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/th/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/th/firefox-100.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "049baf07a0db7abecdc3477c9965119c4acb0da26a9e8a4201fc2311ae3bc966"; + sha256 = "4b29e95c96b9c8c5ff9fce146c3d85a1313c849a74694b56de177d921173956d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tl/firefox-100.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9898714292846b9ec1bd277c279d6bc3a33186ad02e1c09a995c766044d168a2"; + sha256 = "0d9c3749adc06152e7bf8a72f81e1652901a020abee1a46c9e68b1a37009f96c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tr/firefox-100.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "378a940ecc44d0016f5e1764f667abd60fa2241ac11477811eda477621085475"; + sha256 = "fea26051836eaec249373404e594329c7a0f357cf94edd93f494989a80e8b6c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/trs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/trs/firefox-100.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c338b68e0fb85bde3949abe2bb739e127453acd692e0460ffe1914ea4a5cf150"; + sha256 = "cef307d45f53e95ee954731106a66bc313a007dbaf96ec3b670acc392345cea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uk/firefox-100.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2602c70ef4e449e15f95e661e916a4f5b978158f8e2e998f552ef79c4462d319"; + sha256 = "20b1054ed238bf426ecdc511a86e1a01c946522caed30a21f8d0b470949db921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ur/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ur/firefox-100.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bc195325efa7668db62c3307d488b721843c620d804e75754d540789b0545950"; + sha256 = "3009c02b5983a89dcb331daedc49bfc6bd629161a755a5e29f28405b4706ca32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uz/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uz/firefox-100.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "14cff13fe9ba0bc91629b95cc3f2f6df5164b538be5e285acd54cb8d6656e109"; + sha256 = "2ecf4078582f805b624f6ac612ceb10c22d1c2c3fd1a855cb86704addb9f9180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/vi/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/vi/firefox-100.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5852f4eee3136058d7228c5eccc173153706d72b90c61ca632623d926aa84d7b"; + sha256 = "a73072f4a152256972a41a38ebd7dd72f1cae40bbb568bd6384bef2ffa8c7d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/xh/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xh/firefox-100.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ca10968059585ceb6bdc0902f94bb69798c9b0666e2dec1cbcf42e5979be97c3"; + sha256 = "eec036004690e9fbd1e1d6934b594787e8e269e2a2a10a818096ea5854da481f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-CN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-CN/firefox-100.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f9d5c1a1aef830b4276e0af88c783b419674219d599c52c414bc8da3eb99fd4f"; + sha256 = "b65ee16996593d88be41f19fae95f7f5826db828b3f0d7e40f1dbd9c45f43fbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-TW/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-TW/firefox-100.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6857ee348392d9cedc4f2bbe1c355bcbdaa1a886d4babc65ccfb2c95421219c5"; + sha256 = "c3e5b7119b95c3da1145cdecded90b8194b99f722d41855e5282d615ae2a86f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ach/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ach/firefox-100.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9b8a8950e770bf53cb85b0fb79f63d6aaed9a09df86421ef2ee30dab3b250ede"; + sha256 = "6ada766fccaa1e54ecbf0ee75bd807a42ecbfcedd9f218ff65443aa43f4e18e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/af/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/af/firefox-100.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fd464ccc673892932cf98fc4696146034928078de14f8c5df68a9103c20076df"; + sha256 = "6925ff4e7b2746249c526c11b65a87b95ccfaaa2e3f57dfe38fa5ed8bfde7637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/an/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/an/firefox-100.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "76837e6555079a23fc33e83bbf9e507d4eb6e896501d43ae78cf5b8536e88a62"; + sha256 = "bf146035e88c2b2c80bd3e352a251f4bf527089fd0252ef320b13752e045b0d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ar/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ar/firefox-100.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8346570bb699370f34d19ee93a705c9f81b57164ca14f7758c339be0837e9319"; + sha256 = "f891728a186e9746b46b12cdaf7a28e81152bf71a361f49b3fb9e048050b216d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ast/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ast/firefox-100.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "f14088ae65cda0b3ae518cc517d6d786fa4c7a471510ddf4d45f6c268761d324"; + sha256 = "3fe9530affb6eee7fd3c35d8f3274c0659f54ff45a51e04b02d4685b22283d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/az/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/az/firefox-100.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e15d3764842a0febc41882c9f82e607b0b4dd875d765ab4079880b1cf8d0f327"; + sha256 = "7d62e6cb2de5130e24aef684a014ae72db408cfd3227e0b67f080a8395004d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/be/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/be/firefox-100.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7336bcf602bb95697eb5c134da3ef96cdb9229233a4f135e44d7439fbc3d972"; + sha256 = "2c7c9285e61e0b74f7fec985462098459475e9932b6e2a44243bf54c649add52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bg/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bg/firefox-100.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a5c9d5cb091f4a643293879f7f0f0e2afa4a2e53efe08a97eca1fc8f5c77cb41"; + sha256 = "31ba288d27f7b045cc7c685e83f49ec8b9b6579745f7c1ab373a18c8e8264aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bn/firefox-100.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2edcbeebb3a7afdb1322c55ad1ac1a8cd4f2dae7e45a009d113cfee4d159ef2e"; + sha256 = "927749fadf833f84120c36996e1364e714bf353de6cff38cc68f78af6143390e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/br/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/br/firefox-100.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "dc78c6a0a71856b42c6654b3f3d2f93bd30808878a90c49dfecf2b724f42532c"; + sha256 = "82f398c8b1ae36706b8d5e0e1bd12a568de584d342141eab4d35a40abcf14fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bs/firefox-100.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f9ba0d138252aff3abbd8f8447680b59f24f1a9b7a40d6ec753fccb74344a853"; + sha256 = "01609251ed3198064326e99c9e97b2c9128f1216581971896ccbd692ea9aaefa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca-valencia/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca-valencia/firefox-100.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "68a8522e03191f286514b648d1cc7d6c9b7d1683638bb7a88d2ba33c3c8031c1"; + sha256 = "c35d207480e63f3b2538290e74fe6859e1de3061eeebddc10de4e44d040080b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca/firefox-100.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "71b29981fe6da252296c9669e3b05bcfa8914282b982455f6c21e1e47fc6c452"; + sha256 = "3419b0ce1e30db92646c4675701eb6a7201c0c65b722b3f86bbd90c4cc236ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cak/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cak/firefox-100.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "0964328bc005e028371852ecfeefed0b1bb4334840dd9e343ed15b3e0add3cfa"; + sha256 = "3f19b7d4a9ab541b12f2a2156039d38af9c13b10ff2f80a22dc365e41d307d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cs/firefox-100.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b72dbc0d7bc48884fb55d1e419680d753175e2d2d7fc91b362337e5963c59339"; + sha256 = "2df78b68ddf8771f5e0bb2b24d024a04972a75b2b4aacfb85ac5d1b122cfc47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cy/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cy/firefox-100.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "553ba01218ca17602bf67fc4cd7940d6259fd1cedf1d70665d06053b7336311f"; + sha256 = "263fc246ede739f74cdb5d266a871cfc063fc162c42ace9cd111c2522bd7044a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/da/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/da/firefox-100.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "41c01f3979fdec4823e18031497fcccba3380393a3b5e142ab8b1e59e247c87a"; + sha256 = "225a09327f2d8bdcd2084eeb5cba8995b899150fe5a42f97efd34e39ca9b9693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/de/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/de/firefox-100.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "7d88786442c856c8502019d494d8c3b5bd09ad9aa0ce1e5a45216594ac915b5b"; + sha256 = "e636784c7a794d8a18741aa4915c8028dfb8259381c1a0dcccd8a17796a9e340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/dsb/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/dsb/firefox-100.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4b94ebf19d6fdd64e7fd1181bb47f1b89d68f04a5e9b3c29a3cd8e43c36ac898"; + sha256 = "f9bad69c8fda65665c556f736401a4ce522fcc90592aedc7576076fa530a3599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/el/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/el/firefox-100.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "12f61d5b97c906a9532028b14c7d86ef8ee04398460ecdb08496922f4c6abe34"; + sha256 = "b825735e8461779f3dab037360e67fe4fa8d849881f811a179f8db33d49f44f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-CA/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-CA/firefox-100.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b5804a8edc39eca3b04ec76fd87f5fc228a3df02b47094ca1a9d2020de0c1c29"; + sha256 = "e944d750a11e9ab1ee653402e058cb3f65b46eadf551a29d31919ee1640b1272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-GB/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-GB/firefox-100.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "211b7adde34ffc0ef075cc4d34fb5bbc50d00543920747db7e434268c0948e74"; + sha256 = "0039ab82d3eb22e9c8d1036f2d3ada46d37faeb192209b447d3e20dbe0450163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-US/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-US/firefox-100.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "da446e05101a645ebc51cb9fb60bb33e68b8570448072c56baea4561b638338a"; + sha256 = "5013a7a3d601c4f532becf4efad8090e73fab442a1bc8599f4195c65d5813dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eo/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eo/firefox-100.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e217817389a32bfd05272210b7bef6c80547c58e51d7df69b26e2931b2e89ec9"; + sha256 = "b05d2600e407bf47c1eeeda8a5154495dfee6f0aa7044f089d5fad558134ff3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-AR/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-AR/firefox-100.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5f5c35e50809f33b769344c986fe468a404dad2b5c0a933f5dccf9481bad32c3"; + sha256 = "27e30ab50cf1be112c8dcc625d98de5a14495bdc639de9b0e5d8795eab90f4c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-CL/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-CL/firefox-100.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "12434003ff87d5269cbe751adc53ce5396f98f36c8df7ab5535236cf778deb26"; + sha256 = "c82b39f32baf5a63bed4ddd4bd97e7c45ba213957d114559506039986cc78c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-ES/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-ES/firefox-100.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "eef66f4f53ef38baf4b664b0428528117e376fbc57a743cade265adebe451d62"; + sha256 = "1ca07d869f0f36cfb79b00cc24f374f546f8e8ed9061caeba9ccd82ea1890b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-MX/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-MX/firefox-100.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e56dfa4f160d60b70d905c4acde1b78d4598dadaa63a0833f638cdadcc850e35"; + sha256 = "8775da0ec29b758d82e2c33defe858c45a50eaeb824c34c1e31f97a07c9a9f48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/et/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/et/firefox-100.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ab7b3244b55e3d663a89e46f7cf1ee211ab643c6f92112cf921b05343ded25e7"; + sha256 = "29655eefbcbb0975f4d73124881c13ce465d0422088d33ea2c62bcc23a94a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eu/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eu/firefox-100.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b626fa244d85a9c266e2c11f311133e6704adfcfcaa0ebd00a7dbf487e0d7a8b"; + sha256 = "47394c402cbb327335d7ed47670cc3f0c16a875581637d171d3c714d03e859c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fa/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fa/firefox-100.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "743f58643846d3a769da6ba2fec2ba50f7c00a7f4a4447b684ef08f64d8be16d"; + sha256 = "133433694832d6b4d0a03ff93f1a51a52543e67da3b58d171ee9ddf8caf10d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ff/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ff/firefox-100.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3cd80abe0d157427d17cc502cdfb67fb4f48f237de97c7ba9e9d4af5f8ee1fc7"; + sha256 = "16078dcca2ef7dff68d20f29cdf941f08df9ca2b3c247be26e0386e88fc1b16e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fi/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fi/firefox-100.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d7ddda88e29c89e34c56e7467aabd3262430267fda1814933b2b03e1201b549d"; + sha256 = "2c2a44c45a3f4e449f270b8eabfbf279c922eaa0596794c0fa80b06d2f17db19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fr/firefox-100.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b442b7cd5b1dafe98fb04ef68ef3d21fdb6a6beeacda3537c0fb2ff26a5d0a67"; + sha256 = "59b0f88988d896144cbf6c9f4ed607fc318e8357b2d96c6df6ad3488f73fc9e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fy-NL/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fy-NL/firefox-100.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "fbbe401d602c88cec32ea608eab714ebfa873ccf70d07102bfd3b8c59bcc39e4"; + sha256 = "97a98a714e543c101e159d7f3ca052a970421a1f74e2bcbbfdb9b9755388caa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ga-IE/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ga-IE/firefox-100.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fe6c9544bf67a30bd8266fafa92c56e1825c0e155d6e30225b5587719a683fe1"; + sha256 = "3221dda3f7d232f986e1e111a6cfb945bc1c1768464cc18d0a345ba140eef706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gd/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gd/firefox-100.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d62bad0b209df9b74173e894af3a5e6c48b8d9321a2bbc3ef05e40f24db972e2"; + sha256 = "c61156527cfe9966916573cfd7005a16313b134e353258b05e2362414ef0d9f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gl/firefox-100.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "caa93a08ac9fe456f6f1480b514492ba884814dada450845a86cfb486463ef90"; + sha256 = "16f762ba8291f190b165b05f9980c22d93a1612ed2251d6ec1ec18fa465044b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gn/firefox-100.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "eb44f048ae40e1c5693bcb31f7c2b50644b55c7f7229fb087b3757ad7c232fc3"; + sha256 = "c1d51a4e5629a0f04187d76edd1dd94bb5d55ff2e0757932aa218eec3a50027c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gu-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gu-IN/firefox-100.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5a536e35bb8734541b9a8266def5418c8b4eae66a60323c40dca7e0bc11e2ecd"; + sha256 = "a3f92bc8d213b0cdd4df2a853951a5f446786ae5d08bebef2799e866fcde06bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/he/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/he/firefox-100.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b045e3b0a9789804775fdb9f28cf7c8a1293b12adb06f105afc4001648f22dd9"; + sha256 = "ea432d8c4cb390f92d42c27101b7b1b3c331d7b1f18a88f6acfbd3ef1b2c1544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hi-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hi-IN/firefox-100.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "955ba8c9936da6b12f1422b0de5a696a849a72a352b994d62818477b07af5890"; + sha256 = "a6aa3110e9b792398860bbb2ceed29d6fa619a8ac73af96b858813d2d388855e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hr/firefox-100.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "bbbc1d1bd23b49197861fe389d2ab92580def84ce97f1643e50f4cd8de748e8c"; + sha256 = "ea1e36606ac218db3dd39891fb17ce2ac398381ab41102a3dd3170ccc37fd329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hsb/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hsb/firefox-100.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "23afed3429959fee426a2e5fc08cb0cba058e2544b5f8c742fbcbdd51ac31afe"; + sha256 = "ec80f48bcc37a517bacc258411da614c472a5179743717cb47561f8968c395e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hu/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hu/firefox-100.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2a42af969db30183a5fc547f4cdc75db99a8405550a2791de4303e5604a24133"; + sha256 = "d8622685ea6132887d8f9657d2e09d5dbcf6b9571cc7c64a85646219e5c972b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hy-AM/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hy-AM/firefox-100.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "79d134d0c95fb3be213ded965d02ec898891efe2c07dd82046e02adeb24641e4"; + sha256 = "dd3eb9c5db97fe3e6c6dd0705406eed897e955423a96e773eb842d2e4d65f845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ia/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ia/firefox-100.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "3e9f078057e53822a59509f1658f64b8d5563ffc69528193aa1473668e390f62"; + sha256 = "7e94b98322ad8cbcbe5ee4bebd84f2ac82a4b78673ed357bbb02a4f0b2c63c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/id/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/id/firefox-100.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "5133875012d3165d3941740b80addfa3adcd0eec015dc21a6b1261b4d48b824c"; + sha256 = "b4bc9b6384b44b392a70144cb71fbd9e6d5afc3cccec4e7c86ad023bcc52dd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/is/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/is/firefox-100.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d59c86f8c71468cbbb7d8d4641e8baa8672fae0ee38a232782a63f29d1ad4d10"; + sha256 = "951d6273c916a84e9139f74f916a9db4b4a976f83900d3e5506356b8817943ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/it/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/it/firefox-100.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d583c577d73623e06aec514635c4191a9dbfc14a8cfd88880bc50abb0f5ae308"; + sha256 = "ac5c51fb5e42544696d975d769edf81c07e2a42bd5279eddb016e434c1945f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ja/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ja/firefox-100.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "31fd6b653338050651b8432a84278ae26bccdd7cdf0d4c2674a6208f5a3ad9a0"; + sha256 = "99c6b533a3e3ddab8dfd9b4a66f6e403bc79ab214027d604671d9f27ae897041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ka/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ka/firefox-100.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "09e6a905151bcf7d373c6b9ec3bb00043361a4e06e08752834d581f6f211a595"; + sha256 = "73eb8f1c4f22fda48ba752982265363730e23d4695fe2296b30cd74191da3c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kab/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kab/firefox-100.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "117bd25831806d7d8774907a49288ea91c8160add23d0decce9d1dd95bd3c918"; + sha256 = "a3ee102058a90cc02c745434178fe519aead9ed4552d3923eaddfaed8fbea207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kk/firefox-100.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6511f3a53cea4f210b52d37e7298427382c7a5738e1a055b38a4d41b6eb9fe3d"; + sha256 = "0858af4f79d5b8592ce18701968331a19ac0d35d50117dc95096bb9f7d3cbca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/km/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/km/firefox-100.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "af231614cea8b247215d79c101bd59a135ff86965b6aaab2226016215164d240"; + sha256 = "b4509b98696f18d19850320f6b9e3d97dbcc0f5f55019cf3e0e62581ebd5d747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kn/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kn/firefox-100.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "abe0ba12cad7eb53f8592476efe3fbd93a1cf3d1108828db7eb3d9d6d3b639a5"; + sha256 = "8b9e139b3e0e98f266a77cba5d5a7deb3ee714176cffd5cb2b8f9e8ae85189e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ko/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ko/firefox-100.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6415de365af3c132afacaf114a804446d4df566693254e6659551d95016ed830"; + sha256 = "a43471bf0cb5e36f8e8db03e6d9e8be46bf4cb3209f66c6d721cd8ddcaf1b560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lij/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lij/firefox-100.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d882562d34ea5e49cd035cda2aa2489bc75db90b1e777be1a74dedc394d02e8f"; + sha256 = "8dadda12fef18c64ed1331eac980c87772a45b821f524f48d73384758a003357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lt/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lt/firefox-100.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "59add081878210ffbb9445dacf12f999ea6995fddec1444fb11b9c93c615abb5"; + sha256 = "93dbe1924d766b5dce326597c7a5557b26bf1137bae68bed6a319ce5caf63ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lv/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lv/firefox-100.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d11227308bb407aedc6d2559256d92fe931e5ea34498b511f5e23b8091e91766"; + sha256 = "a161963a911846e93e64beff2eda2db9bf449f266697214a4483dafa97d1a2fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mk/firefox-100.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "34e1a97d0944d241d12b8a5d2f64ff34f7bc7a3c43b23ac05d13d794bf36e960"; + sha256 = "77db19a56be146f189436ca7d6c71defa6006ba3e34f2e10a8d1d362526dad71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mr/firefox-100.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "98746bc7f75898bbd5ca5c38b47f311d09d43a2264da85b0303ea4bd01d7a0fb"; + sha256 = "fbdf4862658eb780d499f089c1fa89b4374945e1990ed8892b2fdbaeffb28ed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ms/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ms/firefox-100.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "48a1a0892ad1ef2ab03e3e66f05401c1d6e231801d5f03ac63a7984225624818"; + sha256 = "16e5dcdba19020f498c767732f3426915cb5f9b8f5b2be3adb2825d0db52a1d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/my/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/my/firefox-100.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "745a7e7c73d3161aff4bcaba915ed9939970d8e4478cbaebbb32f47380f1c029"; + sha256 = "c19ed3d409233f055ac633b4baa40de0e2be99d731f3091f0cccf772eaa39f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nb-NO/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nb-NO/firefox-100.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c67804a726c68c534fc763893f0e7cc94ab55b9fd4844113ffffb467cefb63ed"; + sha256 = "c36dd328395d5fe3e7907d990e1f8185144e93961da9d8aaf81a1bbede55eed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ne-NP/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ne-NP/firefox-100.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "69073cf042a8e78184f7f01db3ca88bd3b3d59960a3e51124cb9908150452115"; + sha256 = "6672d29f0fb08645f7cd4b7b7de2edff850da86e29f078fe7e49c10dbf4c35ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nl/firefox-100.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "24d30ce7f9cc2ad445c9aca32616a2efb9a3d392e62f855bbf5709d8160823bd"; + sha256 = "71f9339624aa2014238c35c78142a1fda6762c61f5b199becc0682532c9c8de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nn-NO/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nn-NO/firefox-100.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d3a5034cb8ce135ec245c2ef94e799a31744a8592e6c5ba3935b19a77c087d53"; + sha256 = "5f9f59d3ef36aaa01d3b058adb9a08f09e184ed408d1b5b25ec415c3e83b404a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/oc/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/oc/firefox-100.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "dbe0dfd961a543017ca8dcca6fae7168ca4d85a637f4d2dae7b02b6ea671b28f"; + sha256 = "76d7b330ba2f5c7df4df6bdddda7a887a5222f0ba3caa13f77d6ea956ec7e685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pa-IN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pa-IN/firefox-100.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1bcfb488ec1f3934415ee4af684e7dd40966265be65f43488d3d670d14790124"; + sha256 = "569b151ad53b47338ad8f78d4266247e7e7fa4ef207ee58b3606dc299b0f16af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pl/firefox-100.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "484a8ee788ab6edce6b66f31c94f7fd0e671269ae470569129662ed4b7e9294b"; + sha256 = "af4ca741d8eb82e40775b0a2cc9338c2e81854df5107815bab8f4b6188c7189a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-BR/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-BR/firefox-100.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d764f17b9eb2c8ac61c92490a20bcb4dd83810635b89a6405c4a0389ab15104f"; + sha256 = "16ed593e6c116418ca5969a07fbcbd9f93af3972edc2227271256d269066b61d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-PT/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-PT/firefox-100.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1a9b64665abf305dd38c6441e22448fa0cd5d142a69de96220b2f8683230a341"; + sha256 = "2a5b5a26185ff4560691d5f32fbb29ecd9123df63020492aa2829e0088aa6b1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/rm/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/rm/firefox-100.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8870c35cf68d654db389cea3df9951660d371c53804cb2d9fb5d8006155cb82c"; + sha256 = "e80cf9ebb3010c97acd5d2f6cc672aa6ce4fdca930974238a148c2683f8a8dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ro/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ro/firefox-100.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cb72b5316bc807095a64d8767822732ad18a2cec28c7a23bd603dcafbfd08f1a"; + sha256 = "4db1842a3ead551700c83be677aacdd00e1957ecb6534f2b8933a19a6eedb38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ru/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ru/firefox-100.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a5456041bc8cfc22d3f7a96a610c6d37b77bcba32b630fdab7fdb2753e46b40c"; + sha256 = "6f821c7186343dc0bc5860bce1ae24f45c3de253223a0e99d05e582f037e7447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sco/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sco/firefox-100.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "539014a44ac79130666c6c4f5205ababf3bbb17d357632a0ba584a73c63bda93"; + sha256 = "e213b13f3ffc309feb993239308053d029f200fa58cb35f27a52e540e544e83c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/si/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/si/firefox-100.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5f231e14acf1c896fdb9778d7821dfda13a756d4f861e74076b8fb02848dd08d"; + sha256 = "a59e9a00f0e1b054e08706abb823ec7c6a87ca0975b97444f6cfd265e0c25b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sk/firefox-100.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "17c32fb881566fa09759d1374e957023c5fc6123b24791d4e8c94d4c2e971405"; + sha256 = "b6602ad437d41c679d43cbe7e705bb5ed31909591a8ef51ef4b5604b3a4c884e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sl/firefox-100.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d6121d2dcf47504111e924150cdf8360b039a5d7c4cef2a42b80ddb876a47127"; + sha256 = "b82f1f2745235271d7a99ad0c36f664b67826276a447285165100678f4de3030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/son/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/son/firefox-100.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e83f6e4da3820c91cdb3125d49a71e4417cb37c0e7598fcf1bf138f21d94f485"; + sha256 = "508c90bede375fe243f39a6ee26b972e0ec86bfa2978f3d01d0e83784731cafb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sq/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sq/firefox-100.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "dcf6ed239eb78e370db2a60b9fc0eed96f71e741be66f9ac2a537357648304b2"; + sha256 = "db2799e56ade9c1b691d41803255a5fd1ddc08c69e199f5c1b253df11249cf67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sr/firefox-100.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d724ad02d8153aa15bfeba33e476bbbc937c5a5210a3747a5ba253ab3605b725"; + sha256 = "d3502cba898ee0009292f942c2e3fc2ca0225cdd2470667bd943103fa7770201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sv-SE/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sv-SE/firefox-100.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6c6ce7c4a7bf73b3cc26af264e4d6dfabcf75d88226903ffb11142657cfbf94e"; + sha256 = "eca5f29ebd1e756206dde952980c03b8d4fb19c544bdf814bdab5ed05ce5fef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/szl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/szl/firefox-100.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d9996d12531225e5d181a2304326ca8de19cd6c0f02efedc890f90e4d5d1b72e"; + sha256 = "fbc098de33187fde99bbf3d205882d281e404140619d624961d0b8d1af7e3fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ta/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ta/firefox-100.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "d4b3776a8728da72a233db501eed0014cb60e87dd0c3b76cb4e5fd834dc323da"; + sha256 = "a3f3f3472932be60c4f8296a13538bd12b898057a977dd7c33edc12016438dbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/te/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/te/firefox-100.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8246cfb157b68d09a7e57f910ae33d522495120112a6debc3cfeb60a3e238d92"; + sha256 = "d0b562f554afa76bcc034eca7a167151a7ee38c6e82005d9a47273df08e6c0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/th/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/th/firefox-100.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "80c37b977ae6eaf6da2647800584a6ff9c430d6fd368ad89713a1ed7166cb197"; + sha256 = "c362a365677131af77786b0f6390b62bd224ba26b7f79e69ad1826a6a15800db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tl/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tl/firefox-100.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f7757f0e751989854f240bf5eb13b8c660a587bdb7f44616ee8e7a41bb71b2d3"; + sha256 = "8249e0d3bb2aaf5c0be9def1842874af417bae275ba224c912371049de62a43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tr/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tr/firefox-100.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "533a04e78947202d86dbd79b170495e9027c81bd2db8be3d5f281d665e3505d6"; + sha256 = "82a3a504ba862849c4574ed96bdc5a737479a06a21f011f6cd74b2001bb192ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/trs/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/trs/firefox-100.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "eda683d0df13db0de392bd136ed86c3abbaf41a0617d559ee1d308e28f519487"; + sha256 = "da6f0d69580df77ae2b1d091aecfbeda640440d3a15348ac38221209c6674079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uk/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uk/firefox-100.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4c1cce01a785b8fa7c31fd5394337231db614cd96dacfa7963bb612996fc287c"; + sha256 = "c04848cd11abb05635e33977c98f76b4acda3a6807c8f5bc8b5d2a9b49208f1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ur/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ur/firefox-100.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "628baa7d2e0f200ba2b623aada71bd0e69856b903a92d98c46f0552df8acca4c"; + sha256 = "ba779105d6a9dfe3138f4b73ba60078ec66ad9fe8468f2d72f57dd19161fa09c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uz/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uz/firefox-100.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "626cc29fd753802c3a57d2521553d5957f985b925561eee6c2046464ded084f4"; + sha256 = "190691fd5777153daa29d56542f6792356aa916073d5e842845fe1c9444e632b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/vi/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/vi/firefox-100.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "963ea1b4758b64b67fe05a25d6775a1f8601a438d639bdda0d3ed740fe9ad8a5"; + sha256 = "b5ea01ae5980892d6379eac4ba7d0f3d2643c54ade18452d39be84e44c676c01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/xh/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/xh/firefox-100.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "030f5a08c37ecaae8ef9c59f58e007b3c3484b9eabba33dbae91d89710390d85"; + sha256 = "6c2f218caa8effa6fd6d9553088f7eb9a8ccf6297e3a9cd8c57d0ec5902c4c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-CN/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-CN/firefox-100.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "097b3e3912b1b024d7cb615ed400ea244af47ef90cdb0c89d7223915a040108d"; + sha256 = "61838f9c25bec8dbb0d386ae8412f34be8701e0d6f593503eab51c2009c5e069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-TW/firefox-99.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-TW/firefox-100.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ca10fd6cafa25cdbd12b4e087d80a8212c947099a848b0b9f754ec6dbe8c6be9"; + sha256 = "48ea7e4ae524dbb9ef83aada60b597524091be85a1dfc3665d1fdc9dba16498b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5950f5d9845a1..e1506239f457e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,7 +19,6 @@ { lib , stdenv -, fetchpatch # build time , autoconf @@ -178,14 +177,6 @@ buildStdenv.mkDerivation ({ ]; patches = [ - (fetchpatch { - # RDD Sandbox paths for NixOS, remove with Firefox>=100 - # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692 - name = "mozbz-1761692-rdd-sandbox-paths.patch"; - url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14"; - hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y="; - }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index 3503f9d65bbf9..f46736d0672aa 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "99.0.1-4", + "packageVersion": "100.0-1", "source": { - "rev": "99.0.1-4", - "sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni" + "rev": "100.0-1", + "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla" }, "firefox": { - "version": "99.0.1", - "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f" + "version": "100.0", + "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa" } } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d52ec29abcf89..e34120de9c005 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "99.0.1"; + version = "100.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"; + sha512 = "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.8.0esr"; + version = "91.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3"; + sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133"; }; meta = { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 87be80bda8ce5..6e496c30ecf6a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.2.2623.39-1"; + version = "5.2.2623.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk"; + sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 3d8eed801ec38..3889082ec0c94 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.29.5"; - sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm"; - manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0"; + version = "0.30.2"; + sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl"; + manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw="; + vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,6 +65,6 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 89bfbdc535e01..2d25eee6f347e 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then fi # `git` flag here is to be used by local maintainers to speed up the bump process - if [ "$1" = "git" ]; then + if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" git add "$FLUXCD_PATH"/default.nix git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 2caa0dc228081..1fd71cb8e9914 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let - ver = "1.2.54.0"; + ver = "1.2.312.0"; source = if stdenv.isDarwin then { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg="; + sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9"; } else { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM="; + sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7"; }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix new file mode 100644 index 0000000000000..b937c35a3f969 --- /dev/null +++ b/pkgs/applications/networking/firewalld/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bash +, docbook_xml_dtd_42 +, docbook-xsl-nons +, glib +, gobject-introspection +, gtk3 +, intltool +, libnotify +, libxml2 +, libxslt +, networkmanagerapplet +, pkg-config +, python3 +, wrapGAppsNoGuiHook +, withGui ? false +}: + +let + pythonPath = python3.withPackages (ps: with ps; [ + dbus-python + nftables + pygobject3 + ] ++ lib.optionals withGui [ + pyqt5 + pyqt5_sip + ]); +in +stdenv.mkDerivation rec { + pname = "firewalld"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "firewalld"; + repo = "firewalld"; + rev = "v${version}"; + sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q="; + }; + + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + + postPatch = '' + substituteInPlace src/firewall/config/__init__.py.in \ + --replace "/usr/share" "$out/share" + + for file in config/firewall-{applet,config}.desktop.in; do + substituteInPlace $file \ + --replace "/usr/bin/" "$out/bin/" + done + '' + lib.optionalString withGui '' + substituteInPlace src/firewall-applet.in \ + --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor" + ''; + + nativeBuildInputs = [ + autoreconfHook + docbook_xml_dtd_42 + docbook-xsl-nons + glib + intltool + libxml2 + libxslt + pkg-config + python3 + python3.pkgs.wrapPython + ] ++ lib.optionals withGui [ + gobject-introspection + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + bash + glib + ] ++ lib.optionals withGui [ + gtk3 + libnotify + pythonPath + ]; + + dontWrapGApps = true; + + preFixup = lib.optionalString withGui '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite + patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py + wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}" + wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}" + ''; + + meta = with lib; { + description = "Firewall daemon with D-Bus interface"; + homepage = "https://github.com/firewalld/firewalld"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch new file mode 100644 index 0000000000000..03a10121c6be1 --- /dev/null +++ b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch @@ -0,0 +1,13 @@ +--- a/m4/jh_path_xml_catalog.m4 ++++ b/m4/jh_path_xml_catalog.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index f4d79d00d8b1c..adda284a6b8c0 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -9,7 +9,9 @@ mkDerivation rec { src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; + # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state + # that fails to link properly + rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"; sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj"; }; diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index 56d5274751fce..ca55085d8085f 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { # relax version constraints of some dependencies substituteInPlace setup.cfg \ --replace "clize==4.1.1" "clize" \ - --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \ + --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \ --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \ --replace "Paste==3.4.3" "Paste>=3.4.3,<4" ''; diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop new file mode 100644 index 0000000000000..4adb91284a955 --- /dev/null +++ b/pkgs/applications/office/libreoffice/soffice-template.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LibreOffice @app@... +Comment=Enter LibreOffice @app@ filename: +Type=Link +URL=.source/soffice.@ext@ +Icon=libreoffice-oasis-@type@ diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 08b01a4a051bd..fd9ef63dc73fd 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -1,19 +1,32 @@ -{ libreoffice, runCommand, dbus, bash }: -let - jdk = libreoffice.jdk; -in -(runCommand libreoffice.name { - inherit dbus libreoffice jdk bash; -} '' +{ lib, runCommand +, libreoffice, dbus, bash, substituteAll +, dolphinTemplates ? true +}: +runCommand libreoffice.name { + inherit (libreoffice) jdk meta; + inherit dbus libreoffice bash; +} ('' mkdir -p "$out/bin" - ln -s "${libreoffice}/share" "$out/share" substituteAll "${./wrapper.sh}" "$out/bin/soffice" chmod a+x "$out/bin/soffice" for i in $(ls "${libreoffice}/bin/"); do test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" done -'') // { - inherit libreoffice dbus; - meta = libreoffice.meta; -} + + mkdir -p "$out/share" + ln -s "${libreoffice}/share"/* $out/share +'' + lib.optionalString dolphinTemplates '' + # Add templates to dolphin "Create new" menu - taken from debian + + # We need to unpack the core source since the necessary files aren't available in the libreoffice output + unpackFile "${libreoffice.src}" + + install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" + + cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop +'') + diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 5bfc8ebc97039..f23e88a323c23 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -21,7 +21,8 @@ let }; in appimageTools.wrapType2 rec { - name = "${pname}-v${version}"; + inherit pname version; + src = fetchurl { url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky"; @@ -36,7 +37,7 @@ in appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" ''; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 41154cc1034fc..abcea5f69a066 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.11.0"; + version = "1.12.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn"; + sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk"; }; depsBuildBuild = [ @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options + # TODO(@sternenseemann): install systemd user units mesonFlags = [ # Use lto "-Db_lto=true" diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index b6318dae7bb6b..c1302ac2de492 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA="; + sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix new file mode 100755 index 0000000000000..58cd4092a95d5 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -0,0 +1,341 @@ +{ stdenv +, buildFHSUserEnv +, fetchurl +, lib +, zlib +, gdbm +, bzip2 +, libxslt +, libxml2 +, libuuid +, readline +, xz +, cups +, glibc +, libaio +, vulkan-loader +, alsa-lib +, libpulseaudio +, libGL +, numactl +, libX11 +, libXi +, kmod +, python3 +, autoPatchelfHook +, makeWrapper +, sqlite +, enableInstaller ? false +}: + +let + vmware-unpack-env = buildFHSUserEnv rec { + name = "vmware-unpack-env"; + targetPkgs = pkgs: [ zlib ]; + }; + gdbm3 = gdbm.overrideAttrs (old: rec { + version = "1.8.3"; + + src = fetchurl { + url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz"; + sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck="; + }; + + installPhase = '' + mkdir -p $out/lib + cp .libs/libgdbm*.so* $out/lib/ + ''; + }); +in +stdenv.mkDerivation rec { + pname = "vmware-workstation"; + version = "16.2.3"; + build = "19376536"; + + buildInputs = [ + libxslt + libxml2 + libuuid + gdbm3 + readline + xz + cups + glibc + libaio + vulkan-loader + alsa-lib + libpulseaudio + libGL + numactl + libX11 + libXi + kmod + ]; + + nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] + ++ lib.optionals enableInstaller [ sqlite bzip2 ]; + + src = fetchurl { + url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; + sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM="; + }; + + unpackPhase = '' + ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" + ''; + + installPhase = '' + mkdir -p \ + $out/bin \ + $out/etc/vmware \ + $out/etc/init.d \ + $out/lib/vmware \ + $out/share/doc + + #### Replicate vmware-installer's order but VMX first because of appLoader + ${lib.optionalString enableInstaller '' + ## VMware installer + echo "Installing VMware Installer" + unpacked="unpacked/vmware-installer" + vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=<version>)[^<]+") + dest="$out/lib/vmware-installer/$vmware_installer_version" + + mkdir -p $dest + cp -r $unpacked/vmis* $dest/ + cp -r $unpacked/sopython $dest/ + cp -r $unpacked/python $dest/ + cp -r $unpacked/cdsHelper $dest/ + cp -r $unpacked/vmware* $dest/ + cp -r $unpacked/bin $dest/ + cp -r $unpacked/lib $dest/ + + chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-* + ln -s $dest/vmware-installer $out/bin/vmware-installer + + mkdir -p $out/etc/vmware-installer + cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap + + # create database of vmware guest tools (avoids vmware fetching them later) + mkdir -p $out/etc/vmware-installer/components + database_filename=$out/etc/vmware-installer/database + touch $database_filename + sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);" + sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');" + sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);" + for folder in unpacked/**/.installer ; do + component="$(basename $(dirname $folder))" + component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=<version>)[^<]+") + component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1") + type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1") + sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);" + mkdir -p $out/etc/vmware-installer/components/$component + cp -r $folder/* $out/etc/vmware-installer/components/$component + done + ''} + + ## VMware Bootstrap + echo "Installing VMware Bootstrap" + cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap + + ## VMware Config + echo "Installing VMware Config" + cp ${./vmware-config} $out/etc/vmware/config + sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config + + ## VMware VMX + echo "Installing VMware VMX" + unpacked="unpacked/vmware-vmx" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/etc/modprobe.d $out/etc/ + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/roms $out/lib/vmware/ + cp -r $unpacked/sbin/* $out/bin/ + + cp -r $unpacked/lib/libconf $out/lib/vmware/ + cp -r $unpacked/lib/bin $out/lib/vmware/ + cp -r $unpacked/lib/lib $out/lib/vmware/ + cp -r $unpacked/lib/scripts $out/lib/vmware/ + cp -r $unpacked/lib/icu $out/lib/vmware/ + cp -r $unpacked/lib/share $out/lib/vmware/ + cp -r $unpacked/lib/modules $out/lib/vmware/ + cp -r $unpacked/lib/include $out/lib/vmware/ + + cp -r $unpacked/extra/checkvm $out/bin/ + cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse + ln -s $out/lib/vmware/icu $out/etc/vmware/icu + + # Replace vmware-modconfig with simple error dialog + cp ${./vmware-modconfig} $out/bin/vmware-modconfig + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig + + # Patch dynamic libs in + for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats" + do + patchelf \ + --add-needed ${libaio}/lib/libaio.so.1 \ + --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \ + --add-needed ${alsa-lib}/lib/libasound.so \ + --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ + --add-needed ${libGL}/lib/libEGL.so.1 \ + --add-needed ${numactl}/lib/libnuma.so.1 \ + --add-needed ${libX11}/lib/libX11.so.6 \ + --add-needed ${libXi}/lib/libXi.so.6 \ + --add-needed ${libGL}/lib/libGL.so.1 \ + $out/lib/vmware/bin/$binary + done + + ## VMware USB Arbitrator + echo "Installing VMware USB Arbitrator" + unpacked="unpacked/vmware-usbarbitrator" + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/bin/* $out/bin/ + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator + + ## VMware Player Setup + echo "Installing VMware Player Setup" + unpacked="unpacked/vmware-player-setup" + mkdir -p $out/lib/vmware/setup + cp $unpacked/vmware-config $out/lib/vmware/setup/ + + ## VMware Network Editor + echo "Installing VMware Network Editor" + unpacked="unpacked/vmware-network-editor" + cp -r $unpacked/lib $out/lib/vmware/ + + ## VMware Tools + Virtual Printer + echo "Installing VMware Tools + Virtual Printer" + mkdir -p $out/lib/vmware/isoimages/ + cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \ + unpacked/vmware-tools-windows/windows.iso \ + unpacked/vmware-tools-winPreVista/winPreVista.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \ + unpacked/vmware-tools-winPre2k/winPre2k.iso \ + unpacked/vmware-tools-linux/linux.iso \ + unpacked/vmware-tools-netware/netware.iso \ + unpacked/vmware-tools-solaris/solaris.iso \ + $out/lib/vmware/isoimages/ + + ## VMware Player Application + echo "Installing VMware Player Application" + unpacked="unpacked/vmware-player-app" + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/etc/* $out/etc/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/doc/* $out/share/doc/ # Licences + + mkdir -p $out/etc/thnuclnt + cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/ + + mkdir -p $out/lib/cups/filter + cp -r $unpacked/extras/thnucups $out/lib/cups/filter/ + + for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity" + do + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target + done + + ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount + ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI + ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest + + # Patch vmplayer + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer + sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop + + ## VMware OVF Tool compoment + echo "Installing VMware OVF Tool for Linux" + unpacked="unpacked/vmware-ovftool" + mkdir -p $out/lib/vmware-ovftool/ + + cp -r $unpacked/* $out/lib/vmware-ovftool/ + chmod 755 $out/lib/vmware-ovftool/ovftool* + makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool" + + ## VMware Network Editor User Interface + echo "Installing VMware Network Editor User Interface" + unpacked="unpacked/vmware-network-editor-ui" + cp -r $unpacked/share/* $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg + ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg + + # Patch network editor ui + + sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop + + ## VMware VIX Core Library + echo "Installing VMware VIX Core Library" + unpacked="unpacked/vmware-vix-core" + mkdir -p $out/lib/vmware-vix + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + cp -r $unpacked/bin/* $out/bin/ + cp $unpacked/*.txt $out/lib/vmware-vix/ + + mkdir -p $out/share/doc/vmware-vix/ + cp -r $unpacked/doc/* $out/share/doc/vmware-vix/ + + mkdir -p $out/include/ + cp -r $unpacked/include/* $out/include/ + + ## VMware VIX Workstation-16.0.0 Library + echo "Installing VMware VIX Workstation-16.0.0 Library" + unpacked="unpacked/vmware-vix-lib-Workstation1600" + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + + ## VMware VProbes component for Linux + echo "Installing VMware VProbes component for Linux" + unpacked="unpacked/vmware-vprobe" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + + ## VMware Workstation + echo "Installing VMware Workstation" + unpacked="unpacked/vmware-workstation" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/man $out/share/ + cp -r $unpacked/doc $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe + + # Patch vmware + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware + sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop + + chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* + + # Harcoded pkexec hack + for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" + do + sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" + done + + # SUID hack + wrapProgram $out/lib/vmware/bin/vmware-vmx + rm $out/lib/vmware/bin/vmware-vmx + ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + ''; + + meta = with lib; { + description = "Industry standard desktop hypervisor for x86-64 architecture"; + homepage = "https://www.vmware.com/products/workstation-pro.html"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ deinferno ]; + }; +} diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap new file mode 100644 index 0000000000000..93787870ec3cf --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap @@ -0,0 +1,11 @@ +PREFIX="@@PREFIXDIR@@" +BINDIR="@@PREFIXDIR@@/bin" +SBINDIR="@@PREFIXDIR@@/sbin" +LIBDIR="@@PREFIXDIR@@/lib" +DATADIR="@@PREFIXDIR@@/share" +SYSCONFDIR="@@PREFIXDIR@@/etc" +DOCDIR="@@PREFIXDIR@@/share/doc" +MANDIR="@@PREFIXDIR@@/share/man" +INCLUDEDIR="@@PREFIXDIR@@/include" +INITDIR="@@PREFIXDIR@@/etc" +INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/applications/virtualization/vmware-workstation/vmware-config new file mode 100644 index 0000000000000..9b3714bc3136c --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-config @@ -0,0 +1,21 @@ +.encoding = "UTF-8" +product.name = "VMware Workstation" +product.version = "@@VERSION@@" +product.buildNumber = "@@BUILD@@" +workstation.product.version = "@@VERSION@@" +player.product.version = "@@VERSION@@" +vix.config.version = "1" +bindir = "@@PREFIXDIR@@/bin" +libdir = "@@PREFIXDIR@@/lib/vmware" +vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix" +initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts" +vmware.fullpath = "@@PREFIXDIR@@/bin/vmware" +authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd" +gksu.rootMethod = "su" +NETWORKING = "yes" +installerDefaults.autoSoftwareUpdateEnabled = "no" +installerDefaults.dataCollectionEnabled = "no" +installerDefaults.componentDownloadEnabled = "no" +installerDefaults.transferVersion = "1" +acceptOVFEULA = "yes" +acceptEULA = "yes" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap new file mode 100644 index 0000000000000..4db8f7a1b458f --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap @@ -0,0 +1,5 @@ +VMWARE_INSTALLER="@@INSTALLERDIR@@" +VERSION="@@IVERSION@@" # For backwards compability +VMISVERSION="@@IVERSION@@" +VMISBUILDNUM="@@BUILD@@" +VMISPYVERSION="39" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig new file mode 100644 index 0000000000000..c93a371579667 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +ETCDIR=/etc/vmware +. $ETCDIR/bootstrap + +exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)" diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index ee43903a00a14..cc719e65dfa94 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; + sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M="; }; nativeBuildInputs = [ @@ -46,18 +45,6 @@ stdenv.mkDerivation rec { patches = [ ./plugs-path-env.patch - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard/pull/214 - (fetchpatch { - url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; - sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; - }) - # Fix build with meson 0.61 - # https://github.com/elementary/switchboard/pull/226 - (fetchpatch { - url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; - sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; - }) ]; postPatch = '' diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index c74afe1873710..83bfc1cbb7185 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -2,6 +2,38 @@ rec { inherit (pkgs) eggDerivation fetchegg; + address-info = eggDerivation { + name = "address-info-1.0.5"; + + src = fetchegg { + name = "address-info"; + version = "1.0.5"; + sha256 = "1nv87ghfv8szmi2l0rybrgrds6fs5w6jxafqslnzw0mw5sfj6jyk"; + }; + + buildInputs = [ + srfi-1 + ]; + }; + + apropos = eggDerivation { + name = "apropos-3.6.0"; + + src = fetchegg { + name = "apropos"; + version = "3.6.0"; + sha256 = "0jq5d4zijbf5dw2vsfn89smp7zjpgp82y5hs10xkysf831x7l551"; + }; + + buildInputs = [ + srfi-1 + srfi-13 + check-errors + string-utils + symbol-utils + ]; + }; + args = eggDerivation { name = "args-1.6.0"; @@ -18,6 +50,125 @@ rec { ]; }; + base64 = eggDerivation { + name = "base64-1.0"; + + src = fetchegg { + name = "base64"; + version = "1.0"; + sha256 = "01lid9wxf94nr7gmskamxlfngack1hyxig8rl9swwgnbmz9qgysi"; + }; + + buildInputs = [ + srfi-13 + ]; + }; + + check-errors = eggDerivation { + name = "check-errors-3.2.0"; + + src = fetchegg { + name = "check-errors"; + version = "3.2.0"; + sha256 = "0d0hpq1nmwyvbg162bqzgk62f70rin0pxsr5a3pgx6xin5i3ngah"; + }; + + buildInputs = [ + + ]; + }; + + defstruct = eggDerivation { + name = "defstruct-2.0"; + + src = fetchegg { + name = "defstruct"; + version = "2.0"; + sha256 = "0q1v1gdwqlpmwcsa4jnqldfqky9k7kvb83qgkhdyqym52bm5aln8"; + }; + + buildInputs = [ + srfi-1 + ]; + }; + + feature-test = eggDerivation { + name = "feature-test-0.2.0"; + + src = fetchegg { + name = "feature-test"; + version = "0.2.0"; + sha256 = "1dxdisv64d8alg6r45cwxf5gmdpcvql1hvlq808lgwphd7kvfpgr"; + }; + + buildInputs = [ + + ]; + }; + + foreigners = eggDerivation { + name = "foreigners-1.5"; + + src = fetchegg { + name = "foreigners"; + version = "1.5"; + sha256 = "1mm91y61nlawgb7iqdrkz2fi9sc3fic07f5m1ig541b2hbscfiqy"; + }; + + buildInputs = [ + matchable + ]; + }; + + intarweb = eggDerivation { + name = "intarweb-2.0.1"; + + src = fetchegg { + name = "intarweb"; + version = "2.0.1"; + sha256 = "0md226jikqhj993cw17588ipmnz0v7l34zrvylamyrs6zbvj3scm"; + }; + + buildInputs = [ + srfi-1 + srfi-13 + srfi-14 + defstruct + uri-common + base64 + ]; + }; + + iset = eggDerivation { + name = "iset-2.2"; + + src = fetchegg { + name = "iset"; + version = "2.2"; + sha256 = "0yfkcd07cw6xnnqfbbvjy81x0vc54k40vdjp2m7gwxx64is6m3rz"; + }; + + buildInputs = [ + + ]; + }; + + json = eggDerivation { + name = "json-1.6"; + + src = fetchegg { + name = "json"; + version = "1.6"; + sha256 = "0sb8285dqrm27c8zaqfzc0gixvfmvf0cq2nbza8c4z7j5snxzs2w"; + }; + + buildInputs = [ + packrat + srfi-1 + srfi-69 + ]; + }; + matchable = eggDerivation { name = "matchable-1.1"; @@ -48,6 +199,142 @@ rec { ]; }; + memory-mapped-files = eggDerivation { + name = "memory-mapped-files-0.4"; + + src = fetchegg { + name = "memory-mapped-files"; + version = "0.4"; + sha256 = "0by3r18bj9fs0bs9w5czx84vssmr58br3x7pz1m3myb4mns3mpsc"; + }; + + buildInputs = [ + + ]; + }; + + message-digest-primitive = eggDerivation { + name = "message-digest-primitive-4.3.2"; + + src = fetchegg { + name = "message-digest-primitive"; + version = "4.3.2"; + sha256 = "1wfmyyp1fv0sz70m0rgzbhkiqgzjc15ppz7fwmpnxg12rvfzdvq0"; + }; + + buildInputs = [ + check-errors + ]; + }; + + miscmacros = eggDerivation { + name = "miscmacros-1.0"; + + src = fetchegg { + name = "miscmacros"; + version = "1.0"; + sha256 = "0n2ia4ib4f18hcbkm5byph07ncyx61pcpfp2qr5zijf8ykp8nbvr"; + }; + + buildInputs = [ + + ]; + }; + + packrat = eggDerivation { + name = "packrat-1.5"; + + src = fetchegg { + name = "packrat"; + version = "1.5"; + sha256 = "0hfnh57a8yga3byrk8522al5wdj7dyz48lixvvcgnsn3vdy333hq"; + }; + + buildInputs = [ + srfi-1 + ]; + }; + + regex = eggDerivation { + name = "regex-2.0"; + + src = fetchegg { + name = "regex"; + version = "2.0"; + sha256 = "0qgqrrdr95yqggw8xyvb693nhizwqvf1fp9cjx9p3z80c4ih8j4j"; + }; + + buildInputs = [ + + ]; + }; + + sendfile = eggDerivation { + name = "sendfile-1.8.3"; + + src = fetchegg { + name = "sendfile"; + version = "1.8.3"; + sha256 = "0acmydjxlrbq7bdspmrzv9q9l3gh4xxnbpi5g1d5mz1g2mjwgm63"; + }; + + buildInputs = [ + memory-mapped-files + ]; + }; + + sha2 = eggDerivation { + name = "sha2-4.0.5"; + + src = fetchegg { + name = "sha2"; + version = "4.0.5"; + sha256 = "020yc41gkpg2s48v5n1nnq02dii340yly2y1zsi71bbfbkai2vcs"; + }; + + buildInputs = [ + message-digest-primitive + ]; + }; + + socket = eggDerivation { + name = "socket-0.3.3"; + + src = fetchegg { + name = "socket"; + version = "0.3.3"; + sha256 = "04wfxrwjizvf1jdpfqp3r7381rp9lscrm3z21ihq2dc2lfzjgrxw"; + }; + + buildInputs = [ + srfi-13 + srfi-18 + foreigners + feature-test + ]; + }; + + spiffy = eggDerivation { + name = "spiffy-6.3"; + + src = fetchegg { + name = "spiffy"; + version = "6.3"; + sha256 = "0f22gfdyysgbm3q6cjibn1z1yavks3imxi1mxcyfmms3x91k5k3c"; + }; + + buildInputs = [ + intarweb + uri-common + uri-generic + sendfile + srfi-1 + srfi-13 + srfi-14 + srfi-18 + ]; + }; + srfi-1 = eggDerivation { name = "srfi-1-0.5.1"; @@ -120,6 +407,20 @@ rec { ]; }; + srfi-18 = eggDerivation { + name = "srfi-18-0.1.6"; + + src = fetchegg { + name = "srfi-18"; + version = "0.1.6"; + sha256 = "00lykm5lqbrcxl3dab9dqwimpgm36v4ys2957k3vdlg4xdb1abfa"; + }; + + buildInputs = [ + + ]; + }; + srfi-37 = eggDerivation { name = "srfi-37-1.4"; @@ -133,5 +434,118 @@ rec { ]; }; + + srfi-69 = eggDerivation { + name = "srfi-69-0.4.1"; + + src = fetchegg { + name = "srfi-69"; + version = "0.4.1"; + sha256 = "1l102kppncz27acsr4jyi46q0r7g2lb6gdbkd6p3h1xmvwcnk2hl"; + }; + + buildInputs = [ + + ]; + }; + + string-utils = eggDerivation { + name = "string-utils-2.4.0"; + + src = fetchegg { + name = "string-utils"; + version = "2.4.0"; + sha256 = "09m3s0p199r2nmvc8qnqvbxjbq967gvwqrzp236wsw3hdcil6p8v"; + }; + + buildInputs = [ + srfi-1 + srfi-13 + srfi-69 + miscmacros + check-errors + utf8 + ]; + }; + + symbol-utils = eggDerivation { + name = "symbol-utils-2.1.0"; + + src = fetchegg { + name = "symbol-utils"; + version = "2.1.0"; + sha256 = "17nq8bj18f3bbf3mdfx1m8agy97izn1xcl8ymvgvvd5g384b2xil"; + }; + + buildInputs = [ + check-errors + ]; + }; + + tcp6 = eggDerivation { + name = "tcp6-0.2.1"; + + src = fetchegg { + name = "tcp6"; + version = "0.2.1"; + sha256 = "14dynnjgac28f46v781hi6kam326q6rh57pf0pvl0chdva4hlf3q"; + }; + + buildInputs = [ + socket + srfi-1 + ]; + }; + + uri-common = eggDerivation { + name = "uri-common-2.0"; + + src = fetchegg { + name = "uri-common"; + version = "2.0"; + sha256 = "07rq7ppkyk3i85vqspc048pnj6gmjhj236z00chslli9xybqkgrd"; + }; + + buildInputs = [ + uri-generic + defstruct + matchable + srfi-1 + srfi-13 + srfi-14 + ]; + }; + + uri-generic = eggDerivation { + name = "uri-generic-3.2"; + + src = fetchegg { + name = "uri-generic"; + version = "3.2"; + sha256 = "1lpvnk1mnhmrga149km7ygpy7fkq7z2pvw0mvpx2aql03l8gpdsj"; + }; + + buildInputs = [ + matchable + srfi-1 + srfi-14 + ]; + }; + + utf8 = eggDerivation { + name = "utf8-3.6.2"; + + src = fetchegg { + name = "utf8"; + version = "3.6.2"; + sha256 = "10wzp3qmwik4gx3hhaqm2n83wza0rllgy57363h5ccv8fga5nnm6"; + }; + + buildInputs = [ + srfi-69 + iset + regex + ]; + }; } diff --git a/pkgs/development/compilers/chicken/5/eggs.scm b/pkgs/development/compilers/chicken/5/eggs.scm index 499109470849c..6e3405b95ec90 100644 --- a/pkgs/development/compilers/chicken/5/eggs.scm +++ b/pkgs/development/compilers/chicken/5/eggs.scm @@ -1,6 +1,11 @@ ;; Eggs used by egg2nix args matchable +apropos +spiffy +json +tcp6 +sha2 ;; other eggs to include in nixpkgs srfi-189 diff --git a/pkgs/development/compilers/hare/config-template.mk b/pkgs/development/compilers/hare/config-template.mk new file mode 100644 index 0000000000000..1d0783b118d3c --- /dev/null +++ b/pkgs/development/compilers/hare/config-template.mk @@ -0,0 +1,27 @@ +## Template to generate config.mk via substitute-all + +# set PREFIX externally +BINDIR = $(PREFIX)/bin +MANDIR = $(PREFIX)/share/man +SRCDIR = $(PREFIX)/src +STDLIB = $(SRCDIR)/hare/stdlib + +HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party + +## Build configuration + +# Platform to build for +PLATFORM = @platform@ +ARCH = @arch@ + +# External tools and flags +HAREC = harec +HAREFLAGS = @hareflags@ +QBE = qbe +AS = as +LD = ld +AR = ar +SCDOC = scdoc + +# Where to store build artifacts +# set HARECACHE externally diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix new file mode 100644 index 0000000000000..4effebf0f84a3 --- /dev/null +++ b/pkgs/development/compilers/hare/hare.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchFromSourcehut +, binutils-unwrapped +, harec +, makeWrapper +, qbe +, scdoc +, substituteAll +}: + +stdenv.mkDerivation rec { + pname = "hare"; + version = "0.pre+date=2022-04-27"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0"; + hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU="; + }; + + nativeBuildInputs = [ + binutils-unwrapped + harec + makeWrapper + qbe + scdoc + ]; + + buildInputs = [ + binutils-unwrapped + harec + qbe + ]; + + strictDeps = true; + + configurePhase = + let + # https://harelang.org/platforms/ + arch = + if stdenv.isx86_64 then "x86_64" + else if stdenv.isAarch64 then "aarch64" + else if stdenv.isRiscV64 then "riscv64" + else "unsupported"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isFreeBSD then "freebsd" + else "unsupported"; + hareflags = ""; + config-file = substituteAll { + src = ./config-template.mk; + inherit arch platform hareflags; + }; + in + '' + runHook preConfigure + + export HARECACHE="$NIX_BUILD_TOP/.harecache" + cat ${config-file} > config.mk + + runHook postConfigure + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = + let + binPath = lib.makeBinPath [ + binutils-unwrapped + harec + qbe + ]; + in + '' + wrapProgram $out/bin/hare --prefix PATH : ${binPath} + ''; + + meta = with lib; { + homepage = "http://harelang.org/"; + description = + "A systems programming language designed to be simple, stable, and robust"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (harec.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec.nix new file mode 100644 index 0000000000000..a3ad53350b094 --- /dev/null +++ b/pkgs/development/compilers/hare/harec.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromSourcehut +, qbe +}: + +stdenv.mkDerivation rec { + pname = "harec"; + version = "0.pre+date=2022-04-26"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0"; + hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18="; + }; + + nativeBuildInputs = [ + qbe + ]; + + buildInputs = [ + qbe + ]; + + # TODO: report upstream + hardeningDisable = [ "fortify" ]; + + strictDeps = true; + + doCheck = true; + + meta = with lib; { + homepage = "http://harelang.org/"; + description = "Bootstrapping Hare compiler written in C for POSIX systems"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + # The upstream developers do not like proprietary operating systems; see + # https://harelang.org/platforms/ + platforms = with platforms; + lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); + badPlatforms = with platforms; darwin; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 3471e874290b9..2eea5f8c58b92 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -251,13 +251,6 @@ self: super: ({ # Otherwise impure gcc is used, which is Apple's weird wrapper c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc; - # streamly depends on Cocoa starting with 0.8.0 - streamly_0_8_1_1 = overrideCabal (drv: { - libraryFrameworkDepends = [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ (drv.libraryFrameworkDepends or []); - }) super.streamly_0_8_1_1; - http-client-tls = overrideCabal (drv: { postPatch = '' # This comment has been inserted, so the derivation hash changes, forcing diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix deleted file mode 100644 index 5b93357b26652..0000000000000 --- a/pkgs/development/interpreters/pixie/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc, - pypy, libffi, libedit, libuv, boost, zlib, - variant ? "jit", buildWithPypy ? false }: - -let - commit-count = "1364"; - common-flags = "--thread --gcrootfinder=shadowstack --continuation"; - variants = { - jit = { flags = "--opt=jit"; target = "target.py"; }; - jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; }; - no-jit = { flags = ""; target = "target.py"; }; - no-jit-preload = { flags = ""; target = "target_preload.py"; }; - }; - pixie-src = fetchFromGitHub { - owner = "pixie-lang"; - repo = "pixie"; - rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; - sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10="; - }; - pypy-tag = "91db1a9"; - pypy-src = fetchurl { - name = "pypy-src-${pypy-tag}"; - url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2"; - sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; - }; - libs = [ libffi libedit libuv boost.dev boost.out zlib ]; - include-path = lib.concatStringsSep ":" - (map (p: "${p}/include") libs); - library-path = lib.concatStringsSep ":" - (map (p: "${p}/lib") libs); - bin-path = lib.concatStringsSep ":" - (map (p: "${p}/bin") [ gcc ]); - build = {flags, target}: stdenv.mkDerivation rec { - pname = "pixie"; - version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = libs; - PYTHON = if buildWithPypy - then "${pypy}/pypy-c/pypy-c" - else python2.interpreter; - unpackPhase = '' - cp -R ${pixie-src} pixie-src - mkdir pypy-src - (cd pypy-src - tar --strip-components=1 -xjf ${pypy-src}) - chmod -R +w pypy-src pixie-src - ''; - patchPhase = '' - (cd pixie-src - patch -p1 < ${./load_paths.patch} - libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]' - export libraryPaths - substituteAllInPlace ./pixie/ffi-infer.pxi) - ''; - buildPhase = ''( - PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH"; - RPYTHON="`pwd`/pypy-src/rpython/bin/rpython"; - cd pixie-src - $PYTHON $RPYTHON ${common-flags} ${target} - find pixie -name "*.pxi" -exec ./pixie-vm -c {} \; - )''; - LD_LIBRARY_PATH = library-path; - C_INCLUDE_PATH = include-path; - LIBRARY_PATH = library-path; - PATH = bin-path; - installPhase = '' - mkdir -p $out/share $out/bin - cp pixie-src/pixie-vm $out/share/pixie-vm - cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pixie \ - --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \ - --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \ - --prefix LIBRARY_PATH : ${LIBRARY_PATH} \ - --prefix PATH : ${PATH} - ''; - doCheck = true; - checkPhase = '' - RES=$(./pixie-src/pixie-vm -e "(print :ok)") - if [ "$RES" != ":ok" ]; then - echo "ERROR Unexpected output: '$RES'" - return 1 - else - echo "$RES" - fi - ''; - meta = { - description = "A clojure-like lisp, built with the pypy vm toolkit"; - homepage = "https://github.com/pixie-lang/pixie"; - license = lib.licenses.lgpl3; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with lib.maintainers; [ bendlas ]; - }; - }; -in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix deleted file mode 100644 index 9c39b5c5ce63c..0000000000000 --- a/pkgs/development/interpreters/pixie/dust.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, pixie, rlwrap -}: - -stdenv.mkDerivation rec { - pname = "dust"; - version = "0-91"; - - src = fetchFromGitHub { - owner = "pixie-lang"; - repo = "dust"; - rev = "efe469661e749a71e86858fd006f61464810575a"; - sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc"; - }; - - buildInputs = [ pixie ]; - - patches = [ ./make-paths-configurable.patch ]; - - configurePhase = '' - pixiePath="${pixie}/bin/pixie" \ - basePath="$out/share/dust" \ - rlwrapPath="${rlwrap}/bin/rlwrap" \ - substituteAll dust.in dust - chmod +x dust - ''; - - # FIXME: AOT for dust - # buildPhase = '' - # find . -name "*.pxi" -exec pixie-vm -c {} \; - # ''; - - installPhase = '' - mkdir -p $out/bin $out/share/dust - cp -a src/ run.pxi $out/share/dust - mv dust $out/bin/dust - ''; - - meta = with lib; { - description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; - homepage = src.meta.homepage; - maintainers = with maintainers; [ ]; - license = licenses.lgpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/pkgs/development/interpreters/pixie/load_paths.patch deleted file mode 100644 index a36d280c58675..0000000000000 --- a/pkgs/development/interpreters/pixie/load_paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi -index 9f13ac7..74301c2 100644 ---- a/pixie/ffi-infer.pxi -+++ b/pixie/ffi-infer.pxi -@@ -1,15 +1,12 @@ - (ns pixie.ffi-infer - (:require [pixie.io-blocking :as io])) - -+(defn -add-library-path [p] -+ (swap! load-paths conj (str p "/include")) -+ (swap! load-paths conj (str p "/lib"))) - --(defn -add-rel-path [rel] -- (swap! load-paths conj (str (first @load-paths) "/" rel))) -- --(-add-rel-path "lib") --(-add-rel-path "include") --(-add-rel-path "../lib") --(-add-rel-path "../include") -- -+(doseq [lp @libraryPaths@] -+ (-add-library-path lp)) - - (def *config* nil) - (set-dynamic! (var *config*)) diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/pkgs/development/interpreters/pixie/make-paths-configurable.patch deleted file mode 100644 index e22e83d2ee744..0000000000000 --- a/pkgs/development/interpreters/pixie/make-paths-configurable.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner <herwig@bendlas.net> -Date: Sun, 28 Feb 2016 16:34:14 +0100 -Subject: [PATCH] make paths configurable - ---- - dust | 52 ---------------------------------------------------- - dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 52 deletions(-) - delete mode 100755 dust - create mode 100755 dust.in - -diff --git a/dust b/dust -deleted file mode 100755 -index ffced9b..0000000 ---- a/dust -+++ /dev/null -@@ -1,52 +0,0 @@ --#!/usr/bin/env bash -- --base_path=$0 --if [ -L "$base_path" ]; then -- base_path=`readlink $base_path` --fi --base_path=`dirname $base_path` -- --pixie_path=`which pixie-vm` --if [ -z "$pixie_path" ]; then -- echo "Error: 'pixie-vm' must be on your PATH" -- exit 1 --fi -- --function set_load_path() { -- load_path="" -- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then -- load_path="`cat .load-path`" -- fi --} -- --if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then -- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'." -- echo "To start you can run the following command:" -- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'" -- echo --fi -- --set_load_path --run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi" -- --case $1 in -- ""|"repl") -- rlwrap_cmd="" -- if [ -n "`which rlwrap`" ]; then -- rlwrap_cmd="rlwrap -aignored -n" -- fi -- $rlwrap_cmd $pixie_path $load_path -- ;; -- "run") -- shift -- file=$1 -- shift -- $pixie_path $load_path $file $@ -- ;; -- -h|--help) -- $run_dust help -- ;; -- *) -- $run_dust $@ -- ;; --esac -diff --git a/dust.in b/dust.in -new file mode 100755 -index 0000000..44a7fbd ---- /dev/null -+++ b/dust.in -@@ -0,0 +1,40 @@ -+#!/usr/bin/env bash -+ -+base_path=@basePath@ -+pixie_path=@pixiePath@ -+rlwrap_cmd=@rlwrapPath@ -+ -+function set_load_path() { -+ load_path="" -+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then -+ load_path="`cat .load-path`" -+ fi -+} -+ -+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then -+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'." -+ echo "To start you can run the following command:" -+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'" -+ echo -+fi -+ -+set_load_path -+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi" -+ -+case $1 in -+ ""|"repl") -+ $rlwrap_cmd -aignored -n $pixie_path $load_path -+ ;; -+ "run") -+ shift -+ file=$1 -+ shift -+ $pixie_path $load_path $file $@ -+ ;; -+ -h|--help) -+ $run_dust help -+ ;; -+ *) -+ $run_dust $@ -+ ;; -+esac --- -2.7.1 - diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 1a0618225a37f..cb5ef87826a9c 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -169,4 +169,10 @@ in rec { name = "wheel-unpack-hook.sh"; deps = [ wheel ]; } ./wheel-unpack-hook.sh) {}; + + sphinxHook = callPackage ({ sphinx }: + makeSetupHook { + name = "python${python.pythonVersion}-sphinx-hook"; + deps = [ sphinx ]; + } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh new file mode 100644 index 0000000000000..0140958b23169 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -0,0 +1,57 @@ +# This hook automatically finds Sphinx documentation, builds it in html format +# and installs it. +# +# This hook knows about several popular locations in which subdirectory +# documentation may be, but in very unusual cases $sphinxRoot directory can be +# set explicitly. +# +# Name of the directory relative to ${doc:-$out}/share/doc is normally also +# deduced automatically, but can be overridden with $sphinxOutdir variable. +# +# Sphinx build system can depend on arbitrary amount of python modules, client +# code is responsible for ensuring that all dependencies are present. + +buildSphinxPhase() { + local __sphinxRoot="" o + + runHook preBuildSphinx + if [[ -n "${sphinxRoot:-}" ]] ; then # explicit root + if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then + echo 2>&1 "$sphinxRoot/conf.py: no such file" + exit 1 + fi + __sphinxRoot=$sphinxRoot + else + for o in doc docs doc/source docs/source ; do + if [[ -f "$o/conf.py" ]] ; then + echo "Sphinx documentation found in $o" + __sphinxRoot=$o + break + fi + done + fi + + if [[ -z "${__sphinxRoot}" ]] ; then + echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable" + exit 1 + fi + sphinx-build -M html "${__sphinxRoot}" ".sphinx/html" -v + + runHook postBuildSphinx +} + +installSphinxPhase() { + local docdir="" + runHook preInstallSphinx + + docdir="${doc:-$out}/share/doc/${sphinxOutdir:-$name}" + mkdir -p "$docdir" + + cp -r .sphinx/html/html "$docdir/" + rm -fr "${docdir}/html/_sources" "${docdir}/html/.buildinfo" + + runHook postInstallSphinx +} + +preBuildPhases+=" buildSphinxPhase" +postPhases+=" installSphinxPhase" diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 3de84b684e525..4fae1db9ba3c3 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -11,7 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; }; - nativeBuildInputs = [ cmake python2 ]; + patches = [ + (fetchpatch { + name = "python3-for-tests"; + url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch"; + hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o="; + }) + ]; + + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = ["-DWITH_TESTS=ON"]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 11a2906b5c0f1..360c643f52336 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { - owner = "onqtam"; + owner = "doctest"; repo = "doctest"; - rev = version; - sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0="; + rev = "v${version}"; + sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "https://github.com/onqtam/doctest"; + homepage = "https://github.com/doctest/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 31e9e2fbbbd75..f03c24e28cbff 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx"; + sha256 = "1b43sqp5hah374ns62pcrmbiriqsdisb60hp1nwqz3ny3rfjvn15"; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 1f2966695d864..f59198a5528e9 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; - nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ]; + nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ]; buildInputs = [ gtk3 cairo glib gobject-introspection ]; configureFlags = [ diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/development/libraries/htmlcxx/c++17.patch new file mode 100644 index 0000000000000..53fa9fbfc8c1c --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/c++17.patch @@ -0,0 +1,24 @@ +diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc +--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100 +@@ -7,7 +7,7 @@ + using namespace std; + using namespace htmlcxx; + +-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception) ++CharsetConverter::CharsetConverter(const string &from, const string &to) + { + mIconvDescriptor = iconv_open(to.c_str(), from.c_str()); + if (mIconvDescriptor == (iconv_t)(-1)) +diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h +--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000 ++++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100 +@@ -17,7 +17,7 @@ + : std::runtime_error(arg) {} + }; + +- CharsetConverter(const std::string &from, const std::string &to) throw (Exception); ++ CharsetConverter(const std::string &from, const std::string &to); + ~CharsetConverter(); + + std::string convert(const std::string &input); diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index d9072e46e4070..221ec7622ff4a 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { pname = "htmlcxx"; - version = "0.86"; + version = "0.87"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; - sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; + url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; }; buildInputs = [ libiconv ]; - patches = [ ./ptrdiff.patch ]; + patches = [ + ./ptrdiff.patch + ./c++17.patch + ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index c3621d375870f..81109194356c4 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules +{ stdenv, lib, fetchurl, extra-cmake-modules , qca-qt5, kauth, kio, polkit-qt, qtbase , util-linux }: @@ -6,25 +6,14 @@ stdenv.mkDerivation rec { pname = "kpmcore"; # NOTE: When changing this version, also change the version of `partition-manager`. - version = "4.2.0"; + version = "22.04.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54="; + url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-sO8WUJL6072H1ghMZd7j0xNMwEn4bJF5PXMhfEb2jbs="; }; - patches = [ - # Fix build with `kcoreaddons` >= 5.77.0 - (fetchpatch { - url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch"; - sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s="; - }) - # Fix crash when `fstab` omits mount options. - (fetchpatch { - url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch"; - sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0="; - }) - ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qca-qt5 @@ -35,10 +24,13 @@ stdenv.mkDerivation rec { util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) ]; - nativeBuildInputs = [ extra-cmake-modules ]; - dontWrapQtApps = true; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + ''; + meta = with lib; { description = "KDE Partition Manager core library"; homepage = "https://invent.kde.org/system/kpmcore"; diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix index 81a1398147bae..d4193f32ccc08 100644 --- a/pkgs/development/libraries/libinjection/default.nix +++ b/pkgs/development/libraries/libinjection/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub -, python2 +{ lib, stdenv, fetchFromGitHub, fetchpatch +, python3 }: stdenv.mkDerivation rec { @@ -13,11 +13,19 @@ stdenv.mkDerivation rec { sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; }; - nativeBuildInputs = [ python2 ]; + nativeBuildInputs = [ python3 ]; strictDeps = true; - patchPhase = '' + patches = [ + (fetchpatch { + name = "support-python3-for-building"; + url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff"; + hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM="; + }) + ]; + + postPatch = '' patchShebangs src substituteInPlace src/Makefile \ --replace /usr/local $out diff --git a/pkgs/development/libraries/nss/85_security_load_3.77+.patch b/pkgs/development/libraries/nss/85_security_load_3.77+.patch new file mode 100644 index 0000000000000..bae86c9d26ade --- /dev/null +++ b/pkgs/development/libraries/nss/85_security_load_3.77+.patch @@ -0,0 +1,76 @@ +diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c +index ad8f3b84e..74676d039 100644 +--- nss/cmd/shlibsign/shlibsign.c ++++ nss/cmd/shlibsign/shlibsign.c +@@ -875,6 +875,8 @@ main(int argc, char **argv) + goto cleanup; + } + lib = PR_LoadLibrary(libname); ++ if (!lib) ++ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); + assert(lib != NULL); + if (!lib) { + PR_fprintf(PR_STDERR, "loading softokn3 failed"); +diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c +index 119c8c512..720d39ccc 100644 +--- nss/lib/pk11wrap/pk11load.c ++++ nss/lib/pk11wrap/pk11load.c +@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) + #else + library = PR_LoadLibrary(mod->dllName); + #endif // defined(_WIN32) ++#ifndef NSS_STATIC_SOFTOKEN ++ if ((library == NULL) && ++ !rindex(mod->dllName, PR_GetDirectorySeparator())) { ++ library = PORT_LoadLibraryFromOrigin(my_shlib_name, ++ (PRFuncPtr) &softoken_LoadDSO, ++ mod->dllName); ++ } ++#endif ++ + mod->library = (void *)library; + + if (library == NULL) { +diff --git nss/lib/util/secload.c nss/lib/util/secload.c +index 12efd2f75..8b74478f6 100644 +--- nss/lib/util/secload.c ++++ nss/lib/util/secload.c +@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + + /* Remove the trailing filename from referencePath and add the new one */ + c = strrchr(referencePath, PR_GetDirectorySeparator()); ++ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] ++ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ ++ referencePath = NIX_NSS_LIBDIR; ++ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ ++ } + if (c) { + size_t referencePathSize = 1 + c - referencePath; +- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); ++ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); + if (fullName) { + memcpy(fullName, referencePath, referencePathSize); + strcpy(fullName + referencePathSize, name); +@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + #endif + libSpec.type = PR_LibSpec_Pathname; + libSpec.value.pathname = fullName; ++ if ((referencePathSize >= 4) && ++ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { ++ memcpy(fullName + referencePathSize -4, "lib", 3); ++ } ++ strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL + #ifdef PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) + | PR_LD_ALT_SEARCH_PATH + #endif + ); ++ if (! dlh) { ++ strcpy(fullName + referencePathSize, name); ++ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); ++ } + PORT_Free(fullName); + } + } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 3d109b9679053..3affffda0820c 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - ./85_security_load.patch + (if (lib.versionOlder version "3.77") then + ./85_security_load.patch + else + ./85_security_load_3.77+.patch + ) ./ckpem.patch ./fix-cross-compilation.patch ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index db8d0179add5f..622c9fca85863 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.76.1"; - sha256 = "0ai37ncg50n4s5243bfvsip8isqq1y6w2swg1n4xgqg2fk1h8cg1"; + version = "3.78"; + sha256 = "sha256-9FXzQeeHwRZzKOgKhPd7mlV9WVBm3aZIahh01y2miAA="; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8182a01cd52d6..6818418ad68cc 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -193,8 +193,8 @@ in { }; openssl_3_0 = common { - version = "3.0.2"; - sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M="; + version = "3.0.3"; + sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 475ebc7517e51..38b106d474b7b 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.4"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00"; + sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix new file mode 100644 index 0000000000000..49379dfd54133 --- /dev/null +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, buildPecl, php, valgrind, pcre2 }: +let + pname = "openswoole"; + version = "4.11.1"; +in +buildPecl { + inherit pname version; + + sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg="; + + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; + internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; + + meta = with lib; { + changelog = "https://pecl.php.net/package/openswoole/${version}"; + description = "Coroutine-based concurrency library and high performance programmatic server for PHP"; + homepage = "https://www.openswoole.com/"; + license = licenses.asl20; + longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process."; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/development/php-packages/pdepend/default.nix new file mode 100644 index 0000000000000..d1507040fcec5 --- /dev/null +++ b/pkgs/development/php-packages/pdepend/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, lib, php }: + +let + pname = "pdepend"; + version = "2.10.3"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar"; + sha256 = "I5+n8+a3rHRgW4OM6FbVcf3T1wu9zBrTSb5sGq7ArH4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/pdepend/pdepend.phar + makeWrapper ${php}/bin/php $out/bin/pdepend \ + --add-flags "$out/libexec/pdepend/pdepend.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "An adaptation of JDepend for PHP"; + homepage = "https://github.com/pdepend/pdepend"; + license = licenses.bsd3; + longDescription = " + PHP Depend is an adaptation of the established Java + development tool JDepend. This tool shows you the quality + of your design in terms of extensibility, reusability and + maintainability. + "; + maintainers = teams.php.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix index 3e9cc46b16b0e..728c28eddd888 100644 --- a/pkgs/development/python-modules/aiooncue/default.nix +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiooncue"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM="; + hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index beb1652b14f02..50f8ed56404bc 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aioslimproto"; - version = "1.0.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -15,11 +16,12 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E="; + hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c="; }; - # Module has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aioslimproto" diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 0aac1e71e7c45..ce5c753a4af8a 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; - rev = "v${version}"; - sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index d75351839aa20..2a59ac00f7aa8 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -6,12 +6,14 @@ , pytestCheckHook , pythonOlder , soupsieve +, sphinxHook }: buildPythonPackage rec { pname = "beautifulsoup4"; version = "4.11.1"; format = "setuptools"; + outputs = ["out" "doc"]; disabled = pythonOlder "3.6"; @@ -29,6 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ sphinxHook ]; pythonImportsCheck = [ "bs4" diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 6d3c7fffe6adc..fce105163a54f 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "4.1.0"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo="; + hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 3285f3dee9736..b66f81d032e26 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -3,10 +3,12 @@ , fetchPypi , curtsies , cwcwidth +, dataclasses , greenlet , jedi , pygments , pytestCheckHook +, pythonOlder , pyperclip , pyxdg , requests @@ -19,10 +21,13 @@ buildPythonPackage rec { pname = "bpython"; version = "0.22.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; + hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA="; }; propagatedBuildInputs = [ @@ -37,6 +42,8 @@ buildPythonPackage rec { typing-extensions urwid watchdog + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses ]; postInstall = '' @@ -48,7 +55,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "bpython" ]; + pythonImportsCheck = [ + "bpython" + ]; + + disabledTests = [ + # Check for syntax error ends with an AssertionError + "test_syntaxerror" + ]; meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 3c24d5f31924a..64774a70867a2 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -3,23 +3,36 @@ , fetchPypi , configobj , patiencediff -, six +, fastbencode , fastimport , dulwich , launchpadlib , testtools +, pythonOlder +, installShellFiles }: buildPythonPackage rec { pname = "breezy"; - version = "3.2.1"; + version = "3.2.2"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw="; + sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU="; }; - propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; + nativeBuildInputs = [ installShellFiles ]; + + propagatedBuildInputs = [ + configobj + fastbencode + patiencediff + fastimport + dulwich + launchpadlib + ]; checkInputs = [ testtools ]; @@ -29,6 +42,8 @@ buildPythonPackage rec { # symlink for bazaar compatibility postInstall = '' ln -s "$out/bin/brz" "$out/bin/bzr" + + installShellCompletion --cmd brz --bash contrib/bash/brz ''; pythonImportsCheck = [ "breezy" ]; @@ -36,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 8743c01ba2adb..d613bb9e89700 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc="; + hash = "sha256-qTZk9phVbb1Lq5w/xPs1g0zyU12h6gC2t3WNj+K7uCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index eea43d5c73937..6491749498bd7 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -1,35 +1,50 @@ { lib -, fetchFromGitHub , buildPythonPackage +, cryptography +, fetchFromGitHub , pytestCheckHook , pytest-mock -, cryptography +, pythonOlder +, six }: buildPythonPackage rec { pname = "cert-chain-resolver"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rkoopmans"; repo = "python-certificate-chain-resolver"; rev = version; - sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l"; + hash = "sha256-NLTRx6J6pjs7lyschHN5KtgrnpQpEyvZ2zz0pSd5sc4="; }; - propagatedBuildInputs = [ cryptography ]; + propagatedBuildInputs = [ + cryptography + ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + checkInputs = [ + pytestCheckHook + pytest-mock + six + ]; - # online tests disabledTests = [ + # Tests require network access "test_cert_returns_completed_chain" "test_display_flag_is_properly_formatted" ]; + pythonImportsCheck = [ + "cert_chain_resolver" + ]; + meta = with lib; { - homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; description = "Resolve / obtain the certificate intermediates of a x509 certificate"; + homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; license = licenses.mit; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index efce258451ffd..4184ddb125024 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -8,6 +8,7 @@ , mock , pytest-mock , pytestCheckHook +, sphinxHook }: buildPythonPackage rec { @@ -16,6 +17,7 @@ buildPythonPackage rec { format = "setuptools"; disabled = pythonOlder "3.7"; + outputs = ["out" "doc"]; src = fetchFromGitHub { owner = "dropbox"; @@ -46,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dropbox" ]; + nativeBuildInputs = [ sphinxHook ]; # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value. disabledTests = [ diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index 0b1e5ebc53f5f..f87bbf82b77b3 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "dungeon-eos"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl"; + sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY="; }; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 25e6d235cff35..3f095459642a2 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -1,29 +1,29 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , click +, fetchPypi , jinja2 -, terminaltables , mock , nose +, poetry-core +, pythonOlder +, terminaltables }: buildPythonPackage rec { pname = "envs"; - version = "1.3"; + version = "1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; + hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g="; }; - patches = [ - # https://github.com/capless/envs/pull/19 - (fetchpatch { - url = "https://github.com/capless/envs/commit/6947043fa9120a7b17094fd43ee0e1edf808f42b.patch"; - sha256 = "0zswg8kp2g922mkc7x34ps37qli1d1mjwna2jfrbnsq2fg4mk818"; - }) + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ @@ -45,6 +45,10 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "envs" + ]; + meta = with lib; { description = "Easy access to environment variables from Python"; homepage = "https://github.com/capless/envs"; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index ac4174b2f4554..b2a355e94d273 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0rc2"; + version = "1.0.0rc5"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM="; + hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix new file mode 100644 index 0000000000000..87072491cef45 --- /dev/null +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, python, cython }: + +buildPythonPackage rec { + pname = "fastbencode"; + version = "0.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ="; + }; + + nativeBuildInputs = [ cython ]; + + pythonImportsCheck = [ "fastbencode" ]; + + checkPhase = '' + ${python.interpreter} -m unittest fastbencode.tests.test_suite + ''; + + meta = with lib; { + description = "Fast implementation of bencode"; + homepage = "https://github.com/breezy-team/fastbencode"; + license = licenses.gpl2Only; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix new file mode 100644 index 0000000000000..a075d64406ee5 --- /dev/null +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glyphslib +, setuptools-scm +, ufo2ft +, fonttools +, fontmath +, lxml +, setuptools +}: + +buildPythonPackage rec { + pname = "fontmake"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE="; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + glyphslib + ufo2ft + fonttools + fontmath + lxml + setuptools + ]; + + pythonImportsCheck = [ "fontmake" ]; + + meta = { + description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)"; + homepage = "https://github.com/googlefonts/fontmake"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index a70dfef00541b..a667f631eb184 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -13,11 +13,12 @@ , sphinx , pytestCheckHook , glibcLocales +, setuptools-scm }: buildPythonPackage rec { pname = "fonttools"; - version = "4.30.0"; + version = "4.33.3"; disabled = pythonOlder "3.7"; @@ -25,9 +26,11 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9"; + sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM="; }; + nativeBuildInputs = [ setuptools-scm ]; + # all dependencies are optional, but # we run the checks with them @@ -51,6 +54,8 @@ buildPythonPackage rec { unicodedata2 ]; + pythonImportsCheck = [ "fontTools" ]; + preCheck = '' # tests want to execute the "fonttools" executable from $PATH export PATH="$out/bin:$PATH" @@ -72,7 +77,6 @@ buildPythonPackage rec { "Tests/ufoLib" ]; - meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix new file mode 100644 index 0000000000000..fe0c1b21d288c --- /dev/null +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygobject3 +, pytestCheckHook +, gtk3 +, gobject-introspection +}: + +buildPythonPackage rec { + pname = "gbulb"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "beeware"; + repo = "gbulb"; + rev = "v${version}"; + sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ="; + }; + + propagatedBuildInputs = [ + pygobject3 + ]; + + checkInputs = [ + pytestCheckHook + gtk3 + gobject-introspection + ]; + + disabledTests = [ + "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing + ]; + + pythonImportsCheck = [ "gbulb" ]; + + meta = with lib; { + description = "GLib implementation of PEP 3156"; + homepage = "https://github.com/beeware/gbulb"; + license = licenses.asl20; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 2c52db8ab5ffd..8394f7918324a 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o="; + sha256 = "sha256-8NWrsiiKevIMeD++C2weRdG0FPm5T4fHMUSJM4J+AOo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix new file mode 100644 index 0000000000000..2d6b19bea35d7 --- /dev/null +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, openstep-plist +, ufoLib2 +, pytestCheckHook +, unicodedata2 +, setuptools-scm +, ufonormalizer +, xmldiff +, defcon +, ufo2ft +, skia-pathops +}: + +buildPythonPackage rec { + pname = "glyphslib"; + version = "6.0.4"; + + format = "pyproject"; + + src = fetchPypi { + pname = "glyphsLib"; + inherit version; + sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "glyphsLib" ]; + + propagatedBuildInputs = [ + fonttools + openstep-plist + ufoLib2 + unicodedata2 + ufonormalizer + xmldiff + defcon + ufo2ft + skia-pathops + ]; + + disabledTestPaths = [ + "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif" + "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made + ]; + + meta = { + description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib"; + homepage = "https://github.com/googlefonts/glyphsLib"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} + diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 3c805b4eca58a..1dea4743cdb1a 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,33 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, nose, numpy -, bottle, pyyaml, redis, six -, zlib -, pytestCheckHook }: +{ lib +, bottle +, buildPythonPackage +, fetchPypi +, numpy +, pytestCheckHook +, pythonOlder +, pyyaml +, redis +}: buildPythonPackage rec { - pname = "Jug"; - version = "2.1.1"; - buildInputs = [ nose numpy ]; + pname = "jug"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "Jug"; + inherit version; + hash = "sha256-2Y9xRr5DyV9UqG6tiq9rYET2Z7LaPXfzwYKKGwR3OSs="; + }; + propagatedBuildInputs = [ bottle + ]; + + checkInputs = [ + numpy + pytestCheckHook pyyaml redis - six - - zlib ]; - src = fetchPypi { - inherit pname version; - sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1"; - }; - - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "jug" ]; + pythonImportsCheck = [ + "jug" + ]; meta = with lib; { description = "A Task-Based Parallelization Framework"; - license = licenses.mit; homepage = "https://jug.readthedocs.io/"; + license = licenses.mit; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 020506d519100..600304f48a127 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc="; + hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loopy/default.nix index d16b06a284abe..75d250ad03daa 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loopy/default.nix @@ -1,51 +1,55 @@ { lib , buildPythonPackage -, fetchPypi -, pytools -, pymbolic -, genpy +, codepy , cgen -, islpy -, six , colorama +, fetchFromGitHub +, genpy +, islpy , mako +, numpy +, pymbolic , pyopencl -, pytest +, pyrsistent +, pythonOlder +, pytools }: buildPythonPackage rec { - pname = "loo-py"; - version = "2020.2"; + pname = "loopy"; + version = "2020.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "loo.py"; - inherit version; - sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; + src = fetchFromGitHub { + owner = "inducer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g="; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ - pytools - pymbolic - genpy + codepy cgen - islpy - six colorama + genpy + islpy mako + numpy + pymbolic pyopencl + pyrsistent + pytools ]; # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR doCheck = false; - checkPhase = '' - HOME=$(mktemp -d) pytest test - ''; meta = with lib; { description = "A code generator for array-based code on CPUs and GPUs"; - homepage = "https://mathema.tician.de/software/loopy"; + homepage = "https://github.com/inducer/loopy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index 7f7225bdb92a1..e8c72a5cf4cbe 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.12"; + version = "0.3.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY="; + sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index c77dc38466369..a329d5ab9e514 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.0.post1"; + version = "1.22.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4="; + hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix index 874b1e177d279..d9b2db64f465e 100644 --- a/pkgs/development/python-modules/namedlist/default.nix +++ b/pkgs/development/python-modules/namedlist/default.nix @@ -1,33 +1,54 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, fetchpatch +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "namedlist"; version = "1.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef"; + hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8="; }; + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Deprecation warning using collections.abc, https://gitlab.com/ericvsmith/namedlist/-/merge_requests/1 + (fetchpatch { + url = "https://gitlab.com/ericvsmith/namedlist/-/commit/102d15b455e6f058b9c95fe135167be82b34c14a.patch"; + sha256 = "sha256-IfDgiObFFSOUnAlXR/+ye8uutGaFJ/AyQvCb76iNaMM="; + }) + ]; + # Test file has a `unittest.main()` at the bottom that fails the tests; # py.test can run the tests without it. postPatch = '' substituteInPlace test/test_namedlist.py --replace "unittest.main()" "" ''; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "namedlist" + ]; + + disabledTests = [ + # AttributeError: module 'collections' has no attribute 'Container' + "test_ABC" + ]; - meta = { + meta = with lib; { description = "Similar to namedtuple, but instances are mutable"; homepage = "https://gitlab.com/ericvsmith/namedlist"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ivan ]; + license = licenses.asl20; + maintainers = with maintainers; [ ivan ]; }; } diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 1b2071e7f0c58..9c96f71c2813e 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,20 +1,21 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, async_generator, traitlets, nbformat, nest-asyncio, jupyter-client, pytest, xmltodict, nbconvert, ipywidgets -, doCheck ? true }: buildPythonPackage rec { pname = "nbclient"; - version = "0.5.13"; + version = "0.6.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g="; + hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; }; - inherit doCheck; + doCheck = false; # Avoid infinite recursion checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 5a89210170fe2..69aa660f1425d 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -5,13 +5,11 @@ , glibcLocales , entrypoints , bleach -, beautifulsoup4 , mistune , nbclient , jinja2 , pygments , traitlets -, testpath , jupyter_core , jupyterlab-pygments , nbformat @@ -20,15 +18,18 @@ , tornado , jupyter-client , defusedxml +, tinycss2 +, beautifulsoup4 }: buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.5"; + version = "6.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4="; + hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -44,10 +45,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ - entrypoints bleach mistune jinja2 pygments traitlets testpath + entrypoints bleach mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml beautifulsoup4 - (nbclient.override { doCheck = false; }) # avoid infinite recursion + defusedxml tinycss2 beautifulsoup4 + nbclient jupyterlab-pygments ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index d4d9cf1811e04..bc650b7eafe1f 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.7"; + version = "2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A="; + hash = "sha256-ikpjR1fEZBsSOE20jxTyarb9Pqn3Fz+TYOzXp0g4G9c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix new file mode 100644 index 0000000000000..274294f593882 --- /dev/null +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, cython +, pythonImportsCheckHook +}: + +buildPythonPackage rec { + pname = "openstep-plist"; + version = "0.3.0"; + + src = fetchPypi { + pname = "openstep_plist"; + inherit version; + sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk="; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools-scm cython ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "openstep_plist" ]; + + meta = { + description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist"; + homepage = "https://github.com/fonttools/openstep-plist"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index e9cff7eb8243a..0c700151f694e 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -3,29 +3,18 @@ , alsa-lib, soundtouch, openal }: -let - desmume = fetchFromGitHub { - owner = "SkyTemple"; - repo = "desmume"; - rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7"; - sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842"; - }; -in buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.3.post2"; + version = "0.0.4.post2"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1"; + sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY="; + fetchSubmodules = true; }; - postPatch = '' - cp -R --no-preserve=mode ${desmume} __build_desmume - ''; - buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ]; nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ pillow pygobject3 ]; diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index a31123492d423..aa9e0983b7e36 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage -, pythonAtLeast , fetchFromGitHub +, fetchpatch +, mock , netaddr , pytestCheckHook -, mock +, pythonOlder }: buildPythonPackage rec { @@ -12,8 +13,7 @@ buildPythonPackage rec { version = "0.8.4"; format = "pyproject"; - # https://github.com/arista-eosplus/pyeapi/issues/189 - disabled = pythonAtLeast "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arista-eosplus"; @@ -22,21 +22,49 @@ buildPythonPackage rec { sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; }; - propagatedBuildInputs = [ netaddr ]; + propagatedBuildInputs = [ + netaddr + ]; checkInputs = [ mock pytestCheckHook ]; - pytestFlagsArray = [ "test/unit" ]; + patches = [ + # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 + (fetchpatch { + name = "fix-collection-usage.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; + sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; + }) + (fetchpatch { + name = "fix-collection-usage-2.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; + sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; + excludes = [ + ".github/workflows/ci.yml" + ]; + }) + (fetchpatch { + name = "fix-collection-usage-3.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; + sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; + }) + ]; - pythonImportsCheck = [ "pyeapi" ]; + pytestFlagsArray = [ + "test/unit" + ]; + + pythonImportsCheck = [ + "pyeapi" + ]; meta = with lib; { description = "Client for Arista eAPI"; homepage = "https://github.com/arista-eosplus/pyeapi"; license = licenses.bsd3; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 130486a55f171..d85a173322400 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE="; + sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 5f151aa46e23e..94ff699507e1b 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.4"; + version = "3.1.5"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 1eabc9daaee79..454c684076b5e 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.9.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08="; + sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 20450cd9effc6..105f78b5824ff 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -1,48 +1,60 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, pyutilib -, appdirs +, parameterized , ply -, six -, nose -, glpk +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyomo"; - version = "6.3.0"; - disabled = isPy27; # unable to import pyutilib.th + version = "6.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; rev = version; - sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs="; + hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8="; }; - checkInputs = [ nose glpk ]; propagatedBuildInputs = [ - pyutilib - appdirs ply - six ]; - checkPhase = '' - rm pyomo/bilevel/tests/test_blp.py \ - pyomo/version/tests/test_installer.py \ - pyomo/common/tests/test_download.py \ - pyomo/core/tests/examples/test_pyomo.py - export HOME=$TMPDIR - nosetests + checkInputs = [ + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyomo" + ]; + + preCheck = '' + export HOME=$(mktemp -d); ''; + disabledTestPaths = [ + # Don't test the documentation and the examples + "doc/" + "examples/" + # Tests don't work properly in the sandbox + "pyomo/environ/tests/test_environ.py" + ]; + + disabledTests = [ + # Test requires lsb_release + "test_get_os_version" + ]; + meta = with lib; { - description = "Pyomo: Python Optimization Modeling Objects"; + description = "Python Optimization Modeling Objects"; homepage = "http://pyomo.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 4ef9493eeaa06..6a2ce2af05e29 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.14"; + version = "2.0.16"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg="; + hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index a32dcfa5f0037..91012839d0538 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -1,18 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "python-sql"; - version = "1.3.0"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176"; + hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; }; - meta = { - homepage = "https://python-sql.tryton.org/"; - description = "A library to write SQL queries in a pythonic way"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.bsd3; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sql" + ]; + + meta = with lib; { + description = "Library to write SQL queries in a pythonic way"; + homepage = "https://pypi.org/project/python-sql/"; + license = licenses.bsd3; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 4cd80fbed8096..e764cd912a078 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.10"; + version = "1.5.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0="; + hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 8409d9702e7f8..c7604126c7a39 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,40 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , canonicaljson -, unpaddedbase64 -, pynacl -, typing-extensions -, setuptools-scm +, fetchPypi , importlib-metadata +, pynacl +, pytestCheckHook , pythonOlder +, setuptools-scm +, typing-extensions +, unpaddedbase64 }: buildPythonPackage rec { pname = "signedjson"; - version = "1.1.1"; + version = "1.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m"; + hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI="; }; - patches = [ - # Do not require importlib_metadata on python 3.8 - (fetchpatch { - url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch"; - sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1"; - }) + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + canonicaljson + unpaddedbase64 + pynacl + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + pythonImportsCheck = [ + "signedjson" + ]; meta = with lib; { - homepage = "https://pypi.org/project/signedjson/"; description = "Sign JSON with Ed25519 signatures"; + homepage = "https://github.com/matrix-org/python-signedjson"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix new file mode 100644 index 0000000000000..53d1fb1227d7f --- /dev/null +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cython +, ninja +, setuptools-scm +, setuptools +, fetchPypi +, gn +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "skia-pathops"; + version = "0.7.2"; + + src = fetchPypi { + pname = "skia-pathops"; + inherit version; + extension = "zip"; + sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ + 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' + ''; + + nativeBuildInputs = [ cython ninja setuptools-scm ]; + + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pathops" ]; + + meta = { + description = "Python access to operations on paths using the Skia library"; + homepage = "https://skia.org/dev/present/pathops"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.BarinovMaxim ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 7893cfb2e8180..42012dbd4cf5c 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.3.3"; + version = "1.3.9"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws"; + sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 793e22690e4a9..f14bf9330c486 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -2,24 +2,26 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "unstable-2021-08-11"; + version = "1.3.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; - rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd"; - sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml"; + rev = version; + sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873"; + sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + GETTEXT_SYSTEM = true; + doCheck = false; # there are no tests pythonImportsCheck = [ "skytemple_rust" ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index bb91bad3ff1d8..8ca4a45b37108 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.3.0"; + version = "1.3.8.post2"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d"; + sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow="; }; buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 09682a2a3d0ed..baba69922ebdf 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.15.2"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - rev = "v${version}"; - sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index e4b5d9ee67752..743a7e77afda0 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.6"; + version = "2.7.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs="; + sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 85a03482a323d..c979fc58b1961 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "1.5.1"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "absent1706"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HZiv7F0/UatgY3KlILgzywrK5NJE/tDe6B8/smeYwlM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 27c3f84331ad2..c49dd79679d86 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.74.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA="; + hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index af600f623423c..1386706a33179 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "napari"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc="; }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 8f700107bceb6..b1e5ea7905a01 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.26.0"; + version = "2.27.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg="; + sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE="; }; patches = [ diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index 21894203d1ad9..fab42e5169b82 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -5,6 +5,7 @@ , fonttools , pytestCheckHook , fs +, setuptools-scm }: buildPythonPackage rec { @@ -25,6 +26,8 @@ buildPythonPackage rec { fs ]; + nativeBuildInputs = [ setuptools-scm ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index f31708baef8b6..ef1e1d1198f7f 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -12,6 +12,7 @@ , jsonref , jsonschema , matplotlib +, nbconvert , nbformat , pandas , pathtools @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.15"; + version = "0.12.16"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -45,7 +46,7 @@ buildPythonPackage rec { owner = pname; repo = "client"; rev = "v${version}"; - hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo="; + hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA="; }; # setuptools is necessary since pkg_resources is required at runtime. @@ -66,6 +67,20 @@ buildPythonPackage rec { shortuuid ]; + # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf + # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to + # why we don't put it in propagatedBuildInputs. Note that this is difficult to + # test offline due to https://github.com/wandb/client/issues/3519. + postInstall = '' + mkdir -p $out/bin + ln -s ${git}/bin/git $out/bin/git + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + checkInputs = [ azure-core bokeh @@ -73,6 +88,9 @@ buildPythonPackage rec { jsonref jsonschema matplotlib + # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's + # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488. + nbconvert nbformat pandas pydantic @@ -83,16 +101,6 @@ buildPythonPackage rec { tqdm ]; - # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf - # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to - # why we don't put it in propagatedBuildInputs. Note that this is difficult to - # test offline due to https://github.com/wandb/client/issues/3519. - postInstall = '' - mkdir -p $out/bin - ln -s ${git}/bin/git $out/bin/git - ''; - disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. "tests/test_cli.py" diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index ff26a9f1711e5..db21f16f424b7 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.5.3"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; + hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index efb944c4a71d6..315ba9416d540 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.1"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-QNy/jUh/kIj6sabWnmC5L00ikBTrVmOEp6mFBya29WM="; + sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index e9eba02ac90f2..ef78dee484c27 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" + # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')] + "test_service_browser_expire_callbacks" ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" ]; diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index e70053a316bfa..c693827cd1c3c 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -11,7 +11,7 @@ , cdrtools , usbutils , util-linux -, spicy +, spice-gtk , swtpm , wget , xdg-user-dirs @@ -32,7 +32,7 @@ let cdrtools usbutils util-linux - spicy + spice-gtk swtpm wget xdg-user-dirs diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 92bcfec2790e3..1245603c53a49 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1102"; + version = "2.0.1110"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-OPYlgj8jdgCQJddy9UUXMjHJtQcoMrZbghgPUdyUV5Y="; + hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI="; }; nativeBuildInputs = with py.pkgs; [ @@ -89,6 +89,7 @@ buildPythonApplication rec { pytest-mock pytest-xdist pytestCheckHook + responses ]; postPatch = '' diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index e791d02963fe1..22bfbcae91811 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.2"; + version = "2.8.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs="; + sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 0649b0c86c6db..aa0e9adc2fc8b 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, coursier , autoPatchelfHook , installShellFiles , makeWrapper @@ -11,58 +10,34 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.13"; + version = "1.5.0"; - bloop-coursier-channel = fetchurl { - url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo="; - }; + platform = + if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" + else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + else throw "unsupported platform"; bloop-bash = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; - sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; + sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; }; bloop-fish = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; + sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4="; }; bloop-zsh = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; - sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; + sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; }; - bloop-coursier = stdenv.mkDerivation rec { - name = "${pname}-coursier-${version}"; - - platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" - else throw "unsupported platform"; - - dontUnpack = true; - installPhase = '' - runHook preInstall - - export COURSIER_CACHE=$(pwd) - export COURSIER_JVM_CACHE=$(pwd) - - mkdir channel - ln -s ${bloop-coursier-channel} channel/bloop.json - ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop - - # Only keeping the binary, we'll wrap it ourselves - # This guarantees the output of this fixed-output derivation doesn't have references to itself - install -D -m 0755 .bloop.aux $out - - runHook postInstall - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g=" - else throw "unsupported platform"; + bloop-binary = fetchurl rec { + url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; + sha256 = + if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0=" + else throw "unsupported platform"; }; dontUnpack = true; @@ -74,14 +49,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - export COURSIER_CACHE=$(pwd) - export COURSIER_JVM_CACHE=$(pwd) - - install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped + install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped - makeWrapper $out/.bloop-wrapped $out/bin/bloop \ - --set CS_NATIVE_LAUNCHER true \ - --set IS_CS_INSTALLED_LAUNCHER true + makeWrapper $out/.bloop-wrapped $out/bin/bloop #Install completions installShellCompletion --name bloop --bash ${bloop-bash} diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index abeaf0d4cf18c..40b230a72c314 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.4"; + version = "0.1.5"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy"; + sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl"; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9"; + sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v"; }; }; in diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 0d7130f7def3e..9b13ef220d3f1 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)} ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \ - liquibase.integration.commandline.Main \''${1+"\$@"} + liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"} EOF chmod +x $out/bin/liquibase ''; diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 581b0db3b35af..d6217671b0c16 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM="; - doCheck = false; - nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index ac653db1bf026..343ab9624ca62 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -20,8 +20,6 @@ buildGoModule rec { "cmd/gosec" ]; - doCheck = false; - ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index e5ad74d64c735..d9519130761da 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw="; + sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg="; }; - cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug="; + cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix new file mode 100644 index 0000000000000..90bd304c87c30 --- /dev/null +++ b/pkgs/development/tools/kdash/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, perl +, python3 +, openssl +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "kdash"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "kdash-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq"; + }; + + nativeBuildInputs = [ perl python3 pkg-config ]; + + buildInputs = [ openssl xorg.xcbutil ]; + + cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204"; + + meta = with lib; { + description = "A simple and fast dashboard for Kubernetes"; + homepage = "https://github.com/kdash-rs/kdash"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 4dc63d54f145e..4b8278f94ac71 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.04.18-00.59.32"; + version = "2022.05.03-12.35.40"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE="; + sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e"; + sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix new file mode 100644 index 0000000000000..d92b805082a22 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "protoc-gen-entgrpc"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ent"; + repo = "contrib"; + rev = "v${version}"; + sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o="; + }; + + vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw="; + + subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Generator of an implementation of the service interface for ent protobuff"; + downloadPage = "https://github.com/ent/contrib/"; + license = licenses.asl20; + homepage = "https://entgo.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 07c51c3163cbd..904404c65c30f 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sync-readme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "phaazon"; repo = pname; rev = version; - sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc"; + sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo="; }; - cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah"; + cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c="; meta = with lib; { description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; homepage = "https://github.com/phaazon/cargo-sync-readme"; + changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ b4dm4n ]; }; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index ad0e2c998e6bb..e52c38822160e 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,15 +1,14 @@ { lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: -let +appimageTools.wrapType2 rec { + pname = "unityhub"; version = "2.3.2"; + src = fetchurl { # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; - name = "unityhub"; -in appimageTools.wrapType2 rec { - inherit name src; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr alsa-lib cups libcap fontconfig freetype pango @@ -23,11 +22,11 @@ in appimageTools.wrapType2 rec { ]); extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in + let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications substituteInPlace $out/share/applications/unityhub.desktop \ - --replace 'Exec=AppRun' 'Exec=${name}' + --replace 'Exec=AppRun' 'Exec=${pname}' install -m 444 -D ${appimageContents}/unityhub.png \ $out/share/icons/hicolor/64x64/apps/unityhub.png ''; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 586aa1797bc4a..17ef58be4bcbf 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -3,7 +3,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , glslang , libffi , libX11 @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config" + "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 875ed794647df..73198af687cc8 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.34"; + version = "2.0.0-beta.36"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg="; + sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I="; } + "/v2"; - vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0="; + vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ="; proxyVendor = true; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7f8178838677c..53d24a81aec14 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -194,7 +194,7 @@ let maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; - knownVulnerabilities = optional (versionOlder version "12") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; + knownVulnerabilities = optional (versionOlder version "14") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; }; passthru.python = python; # to ensure nodeEnv uses the same version diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 562989d2fd313..6a55c20b195bc 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.0.0"; - sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU="; + version = "18.1.0"; + sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix index 2b74306cd2533..ad128d4e1270e 100644 --- a/pkgs/games/7kaa/default.nix +++ b/pkgs/games/7kaa/default.nix @@ -15,17 +15,15 @@ }: let + pname = "7kaa"; + version = "2.15.4p1"; - name = "7kaa"; - versionMajor = "2.15"; - versionMinor = "4p1"; - - music = stdenv.mkDerivation rec { - pname = "${name}-music"; - version = "${versionMajor}"; + music = stdenv.mkDerivation { + pname = "7kaa-music"; + version = lib.versions.majorMinor version; src = fetchurl { - url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; + url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2"; sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; }; @@ -41,8 +39,7 @@ let in gccStdenv.mkDerivation rec { - pname = "${name}"; - version = "v${versionMajor}.${versionMinor}"; + inherit pname version; src = fetchFromGitHub { owner = "the3dfxdude"; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2572cd60c4a45..ff77f08651a0e 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -128,15 +128,6 @@ stdenv.mkDerivation rec { rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so '' + cleanupMindustrySrc; - # Propagate glew to prevent it from being cleaned up. - # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, - # and will assume that it's not actually needed. - # This can cause issues. - # See https://github.com/NixOS/nixpkgs/issues/109798. - propagatedBuildInputs = lib.optionals enableClient [ - glew.out - ]; - buildInputs = lib.optionals enableClient [ SDL2 glew @@ -183,6 +174,17 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/mindustry \ --add-flags "-jar $out/share/mindustry.jar" \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ + + # Retain runtime depends to prevent them from being cleaned up. + # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there, + # and will assume that it's not actually needed. + # This can cause issues. + # See https://github.com/NixOS/nixpkgs/issues/109798. + echo "# Retained runtime dependencies: " >> $out/bin/mindustry + for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do + echo "# $dep" >> $out/bin/mindustry + done + install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png '' + optionalString enableServer '' install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index d251c48d38231..7d75b4cc1d8ec 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -1,63 +1,55 @@ -{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper +{ stdenv, lib, fetchFromGitHub, buildEnv, makeWrapper , SDL2, libGL, curl -, oggSupport ? true, libogg, libvorbis , openalSupport ? true, openal -, zipSupport ? true, zlib , Cocoa, OpenAL }: let - mkFlag = b: if b then "ON" else "OFF"; + mkFlag = b: if b then "yes" else "no"; - games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; }; + games = import ./games.nix { inherit stdenv lib fetchFromGitHub; }; wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.00"; + version = "8.01"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w"; + sha256 = "1dll5lx4bnls5w5f2zwjhwpcpxa97rjn6ymb2v3vrjm19jbd16yd"; }; postPatch = '' - substituteInPlace src/common/filesystem.c \ - --replace /usr/share/games/quake2 $out/share/games/quake2 + substituteInPlace src/client/curl/qcurl.c \ + --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\"" + '' + lib.optionalString (openalSupport && !stdenv.isDarwin) '' + substituteInPlace Makefile \ + --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\"" ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 libGL curl ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ] - ++ lib.optionals oggSupport [ libogg libvorbis ] - ++ lib.optional openalSupport openal - ++ lib.optional zipSupport zlib; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DOGG_SUPPORT=${mkFlag oggSupport}" - "-DOPENAL_SUPPORT=${mkFlag openalSupport}" - "-DZIP_SUPPORT=${mkFlag zipSupport}" - "-DSYSTEMWIDE_SUPPORT=ON" + ++ lib.optional openalSupport openal; + + makeFlags = [ + "WITH_OPENAL=${mkFlag openalSupport}" + "WITH_SYSTEMWIDE=yes" + "WITH_SYSTEMDIR=$\{out}/share/games/quake2" ]; - preConfigure = '' - # Since we can't expand $out in `cmakeFlags` - cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2" - ''; + enableParallelBuilding = true; installPhase = '' # Yamagi Quake II expects all binaries (executables and libs) to be in the # same directory. - mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2 + mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2/baseq2 cp -r release/* $out/lib/yquake2 ln -s $out/lib/yquake2/quake2 $out/bin/yquake2 ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded - cp $src/stuff/yq2.cfg $out/share/games/quake2 + cp $src/stuff/yq2.cfg $out/share/games/quake2/baseq2 ''; meta = with lib; { diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 0c9b24963ba7e..c78689971a63e 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub }: let games = { @@ -37,11 +37,9 @@ let rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; }; - nativeBuildInputs = [ cmake ]; - installPhase = '' mkdir -p $out/lib/yquake2/${id} - cp Release/* $out/lib/yquake2/${id} + cp release/* $out/lib/yquake2/${id} ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 721a49ed4a56b..3c6207890e236 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg="; + sha256 = "sha256-XABpC2g4/e6/2HsHzrBUs6OW1lzgGBYlFAatVcA/vD8="; }; NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 8485a868d8a59..051ca1963051b 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -8,8 +8,6 @@ , withXtables ? true , iptables }: -with lib; - stdenv.mkDerivation rec { version = "1.0.2"; pname = "nftables"; @@ -28,8 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnftnl libpcap gmp jansson libedit - ] ++ optional withXtables iptables - ++ optional withPython python3; + ] ++ lib.optional withXtables iptables + ++ lib.optional withPython python3; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -46,12 +44,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-json" "--with-cli=editline" - ] ++ optional (!withDebugSymbols) "--disable-debug" - ++ optional (!withPython) "--disable-python" - ++ optional withPython "--enable-python" - ++ optional withXtables "--with-xtables"; + ] ++ lib.optional (!withDebugSymbols) "--disable-debug" + ++ lib.optional (!withPython) "--disable-python" + ++ lib.optional withPython "--enable-python" + ++ lib.optional withXtables "--with-xtables"; - meta = { + meta = with lib; { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; homepage = "https://netfilter.org/projects/nftables/"; license = licenses.gpl2Only; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix new file mode 100644 index 0000000000000..aa77a10015e6a --- /dev/null +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }: + +stdenv.mkDerivation rec { + pname = "vmware-modules"; + version = "${vmware-workstation.version}-${kernel.version}"; + + src = fetchFromGitHub { + owner = "mkubecek"; + repo = "vmware-host-modules"; + rev = "w${vmware-workstation.version}-k5.17"; + sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0="; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace Makefile \ + --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/modinfo "${kmod}/bin/modinfo" \ + --replace 'test -z "$(DESTDIR)"' "0" + + for module in "vmmon-only" "vmnet-only"; do + substituteInPlace "./$module/Makefile" \ + --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /bin/grep "${gnugrep}/bin/grep" + done + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc" + ''; + + meta = with lib; { + description = "Kernel modules needed for VMware hypervisor"; + homepage = "https://github.com/mkubecek/vmware-host-modules"; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; + broken = kernel.kernelOlder "5.5" && kernel.isHardened; + maintainers = with maintainers; [ deinferno ]; + }; +} diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index e2b3abc6c0a60..fb6194eaab3db 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -1,6 +1,6 @@ -{ stdenv -, alsa-lib +{ stdenv, lib , addOpenGLRunpath +, alsa-lib , autoPatchelfHook , cairo , fetchurl @@ -8,26 +8,25 @@ , gcc11 , gnome , gssdp +, gupnp +, gupnp-av , lame -, lib , libgmpris +, libusb-compat-0_1 , llvmPackages_10 +, meson , mpg123 +, ninja , rpmextract , wavpack - -, gupnp -, gupnp-av -, meson -, ninja }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.30.3-87"; + version = "4.31.0-89"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A="; + hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg="; }; unpackPhase = '' @@ -47,6 +46,7 @@ stdenv.mkDerivation rec { gupnp-av lame libgmpris + libusb-compat-0_1 llvmPackages_10.openmp mpg123 wavpack @@ -58,34 +58,37 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - # main executable - mkdir -p $out/bin - cp ./usr/bin/hqplayerd $out/bin + # executables + mkdir -p $out + cp -rv ./usr/bin $out/bin + + # libs + mkdir -p $out + cp -rv ./opt/hqplayerd/lib $out - # main configuration - mkdir -p $out/etc/hqplayer - cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/ + # configuration + mkdir -p $out/etc + cp -rv ./etc/hqplayer $out/etc/ # udev rules - mkdir -p $out/etc/udev/rules.d - cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/ + mkdir -p $out/etc/udev + cp -rv ./etc/udev/rules.d $out/etc/udev/ # kernel module cfgs - mkdir -p $out/etc/modules-load.d - cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/ + mkdir -p $out/etc + cp -rv ./etc/modules-load.d $out/etc/ # systemd service file - mkdir -p $out/lib/systemd/system - cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/ + mkdir -p $out/lib/systemd + cp -rv ./usr/lib/systemd/system $out/lib/systemd/ # documentation - mkdir -p $out/share/doc/hqplayerd - cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/ + mkdir -p $out/share/doc + cp -rv ./usr/share/doc/hqplayerd $out/share/doc/ # misc service support files - mkdir -p $out/var/lib/hqplayer - cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer - + mkdir -p $out/var/lib + cp -rv ./var/lib/hqplayer $out/var/lib/ runHook postInstall ''; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index f28679f2cf5fc..95a3ade822c13 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "17.0.1"; + version = "18.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI="; + sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf"; }; nativeBuildInputs = [ makeWrapper jre ]; @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR' - substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR' + substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR' + substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR' for script in $(find $out/bin -type f -executable); do wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index f43747e185a79..075389e325a40 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8="; + sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I="; }; mastodon-gems = bundlerEnv { diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 0b841c325db00..a6deedbcb81c8 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz"; + sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh"; + sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf"; + sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w"; + sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib"; + sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi"; + sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws"; + sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195"; + sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939"; + sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph"; + sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4"; + sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm"; + sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc"; type = "gem"; }; - version = "1.558.0"; + version = "1.582.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +261,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq"; + sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; type = "gem"; }; - version = "3.127.0"; + version = "3.130.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; + sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; type = "gem"; }; - version = "1.55.0"; + version = "1.56.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i"; type = "gem"; }; - version = "1.113.0"; + version = "1.113.2"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,10 +294,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; bcrypt = { groups = ["default" "pam_authentication"]; @@ -369,20 +369,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1"; + sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; type = "gem"; }; - version = "1.10.3"; + version = "1.11.1"; }; brakeman = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy"; + sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14"; type = "gem"; }; - version = "5.2.1"; + version = "5.2.2"; }; browser = { groups = ["default"]; @@ -864,10 +864,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m"; + sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; excon = { groups = ["default"]; @@ -1102,10 +1102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka"; + sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1312,10 +1312,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0"; + sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; idn-ruby = { groups = ["default"]; @@ -1342,10 +1342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; json = { groups = ["default" "test"]; @@ -1545,10 +1545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr"; type = "gem"; }; - version = "2.16.0"; + version = "2.17.0"; }; mail = { dependencies = ["mini_mime"]; @@ -1690,10 +1690,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; + sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; @@ -1762,10 +1762,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1941,10 +1941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8"; + sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; pkg-config = { groups = ["default"]; @@ -2099,10 +2099,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.6.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -2154,10 +2154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv"; + sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2220,10 +2220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93"; + sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9"; type = "gem"; }; - version = "6.1.5"; + version = "6.1.5.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2293,10 +2293,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; request_store = { dependencies = ["rack"]; @@ -2399,10 +2399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2410,10 +2410,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; rspec-sidekiq = { dependencies = ["rspec-core" "sidekiq"]; @@ -2453,10 +2453,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl"; + sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; type = "gem"; }; - version = "1.26.1"; + version = "1.27.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2464,10 +2464,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -2603,10 +2603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx"; + sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.0"; }; sidekiq-unique-jobs = { dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"]; @@ -2614,10 +2614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y"; + sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq"; type = "gem"; }; - version = "7.1.16"; + version = "7.1.21"; }; simple-navigation = { dependencies = ["activesupport"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index aa915395e31d6..6d4dc034ff650 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v3.5.1"; - sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0"; + rev = "v3.5.2"; + sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 7714a397576a6..843ef5820f926 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.5.1" +"3.5.2" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 235d1895e152a..c81800a356174 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.57.0"; + version = "1.58.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s="; + sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix index f9a1999f36d73..a038d882e7feb 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix index 92885cee8775d..2e74ced5fb2a0 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: @@ -3128,13 +3128,13 @@ let sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A=="; }; }; - "matrix-org-irc-1.2.0" = { + "matrix-org-irc-1.2.1" = { name = "matrix-org-irc"; packageName = "matrix-org-irc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz"; - sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ=="; + url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.1.tgz"; + sha512 = "x7SoeIOP+Z6R2s8PJqhM89OZNsS2RO4srx7c3JGa/VN6rtJ1AMLEyW4EPCVh09tGiTvmbit9KJysjLvFQPx9KA=="; }; }; "media-typer-0.3.0" = { @@ -5031,7 +5031,7 @@ let args = { name = "matrix-appservice-irc"; packageName = "matrix-appservice-irc"; - version = "0.33.1"; + version = "0.34.0"; src = ./.; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -5475,7 +5475,7 @@ let sources."qs-6.10.3" ]; }) - sources."matrix-org-irc-1.2.0" + sources."matrix-org-irc-1.2.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json index f94cfc996ba75..f0a1b6fc60c06 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-irc", - "version": "0.33.1", + "version": "0.34.0", "description": "An IRC Bridge for Matrix", "main": "app.js", "bin": "./bin/matrix-appservice-irc", @@ -34,7 +34,7 @@ "he": "^1.2.0", "logform": "^2.4.0", "matrix-appservice-bridge": "^3.2.0", - "matrix-org-irc": "^1.2.0", + "matrix-org-irc": "^1.2.1", "matrix-bot-sdk": "0.5.19", "nopt": "^3.0.1", "p-queue": "^6.6.2", diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json index 35bea461b9fd8..ca4ea39455090 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/matrix-org/matrix-appservice-irc", - "rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc", - "date": "2022-03-30T14:29:04+01:00", - "path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc", - "sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi", + "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161", + "date": "2022-05-04T09:06:31+02:00", + "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc", + "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 6af1dbffbc884..f4c64d225e90e 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "haproxy_exporter"; - version = "0.12.0"; - - goPackagePath = "github.com/prometheus/haproxy_exporter"; + version = "0.13.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn"; + rev = "v${version}"; + sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA="; }; + vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/haproxy_exporter"; diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix deleted file mode 100644 index 8585df3349ccb..0000000000000 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) -{ fetchbower, buildEnv }: -buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.7.0" "1.7.0" "1qn09j3a1ngqn36rhz7a2dj00szr0r6fjb40lfbmq3drkzppgbm1") - (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") - (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") - (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") - (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") - (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") - (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0") - (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai") - (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3") - (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") - (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") - (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") - (fetchbower "bootstrap" "3.1.1" "3.1.1" "1a06mx1rw5h4wq89kqpa8g2pbiddm3p21dxq50jyi29sywd01ny4") - (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "1k6hhvsd75hdfrz8qcjzmb12c17fdn0h3l3l5k9wgd0rfhhfkyvd") - (fetchbower "fontawesome" "4.4.0" "~4.4.0" "09mrbik8i3skjwchn7ns2020bqmb51kbd3mqi59vh444s4az2sc7") - (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") - (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") - (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.20" "~0.7.12" "18r0islba6cwkvx4s2gna7skhsn2vqjcf1xyap5pcmycjnq93j8s") - (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") - (fetchbower "jquery" "3.4.1" ">= 1.9.0" "1vk25pbc55m2c82mqf26rfhxhnliq18isi4vbm4p98a1b9vp8fq7") -]; } diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix deleted file mode 100644 index a871bf87db2d4..0000000000000 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }: - -let - inherit (import ./src.nix) version sha256; - owner = "sensu"; - repo = "uchiwa"; - - src = fetchFromGitHub { - inherit owner repo sha256; - rev = version; - }; - - backend = buildGoPackage { - pname = "uchiwa-backend"; - inherit version; - goPackagePath = "github.com/${owner}/${repo}"; - inherit src; - postInstall = '' - mkdir -p $out - cp go/src/github.com/sensu/uchiwa/public/index.html $out/ - ''; - }; - - frontend = buildBowerComponents { - name = "uchiwa-frontend-${version}"; - generated = ./bower-packages.nix; - inherit src; - }; - -in stdenv.mkDerivation { - pname = "uchiwa"; - inherit version; - - inherit src; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin $out/public - makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \ - --add-flags "-p $out/public" - ln -s ${backend.out}/index.html $out/public/index.html - ln -s ${frontend.out}/bower_components $out/public/bower_components - ''; - - meta = with lib; { - description = "A Dashboard for the sensu monitoring framework"; - homepage = "http://sensuapp.org/"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix deleted file mode 100644 index 36e46ea083ef1..0000000000000 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - version = "1.7.0-1"; - sha256 = "0fa3zzh6d8v1lfn828s0x65pcknycwyv0d1mndi0gvdfbfg463nf"; -} diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh deleted file mode 100755 index 10da7f8adbf93..0000000000000 --- a/pkgs/servers/monitoring/uchiwa/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix - -set -euo pipefail -IFS=$'\n\t' - -# set -x - -REPO=sensu/uchiwa -VERSION=0.0.1 -SHA="1111111111111111111111111111111111111111111111111111" -DIR=$(pwd) - -write_src() { - cat <<_EOF > $DIR/src.nix -{ - version = "${VERSION}"; - sha256 = "${SHA}"; -} -_EOF -} - -LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) -echo "Latest version: ${LATEST_VERSION}" - -VERSION=${1:-${LATEST_VERSION}} -echo "Updating to: ${VERSION}" - -TOP=$(git rev-parse --show-toplevel) - -cd $(dirname $0) - -write_src -pushd $TOP >/dev/null -SHA=$(nix-prefetch-url -A uchiwa.src) -popd >/dev/null -write_src - -curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > bower.json -rm -f bower-packages.nix -bower2nix bower.json $DIR/bower-packages.nix -rm -f bower.json diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index a9166985ead2a..9e8c0254fca92 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-933"; + version = "1.8-935"; src = let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE="; + hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg="; }; dontConfigure = true; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index db4ec8b891d67..6c0a505d523ed 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -65,7 +65,7 @@ in rec { }; unifi7 = generic { - version = "7.0.25"; - sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg="; + version = "7.1.61"; + sha256 = "sha256-7Ac8BjlBLCslSU6IZK0EtheKz4CtH7tcmR8J2rUGYbs="; }; } diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 6730608f70741..c288df7a11b74 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -4,8 +4,10 @@ }: # Point the environment variable $WALLABAG_DATA to a data directory -# that contains the folder `app/config` which must be a clone of +# that contains the folder `app` which must be a clone of # wallabag's configuration files with your customized `parameters.yml`. +# In practice you need to copy `${pkgs.wallabag}/app` and the +# customizzed `parameters.yml` to $WALLABAG_DATA. # These need to be updated every package upgrade. # # After a package upgrade, empty the `var/cache` folder or unexpected diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index e0ead55d1a786..1da098dabbee1 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -7,6 +7,10 @@ let # If we're in hydra, we can dispense with the more verbose error # messages and make problems easier to spot. inHydra = config.inHydra or false; + # Allow the user to opt-into additional warnings, e.g. + # import <nixpkgs> { config = { showDerivationWarnings = [ "maintainerless" ]; }; } + showWarnings = config.showDerivationWarnings; + getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}"); # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 @@ -46,6 +50,9 @@ let hasLicense attrs && isUnfree (lib.lists.toList attrs.meta.license); + hasNoMaintainers = attrs: + attrs ? meta.maintainers && (lib.length attrs.meta.maintainers) == 0; + isMarkedBroken = attrs: attrs.meta.broken or false; hasUnsupportedPlatform = attrs: @@ -91,6 +98,7 @@ let insecure = remediate_insecure; broken-outputs = remediateOutputsToInstall; unknown-meta = x: ""; + maintainerless = x: ""; }; remediation_env_var = allow_attr: { Unfree = "NIXPKGS_ALLOW_UNFREE"; @@ -199,6 +207,14 @@ let else throw; in handler msg; + handleEvalWarning = { meta, attrs }: { reason , errormsg ? "" }: + let + remediationMsg = (builtins.getAttr reason remediation) attrs; + msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}" + else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway." + + (if remediationMsg != "" then "\n${remediationMsg}" else ""); + isEnabled = lib.findFirst (x: x == reason) null showWarnings; + in if isEnabled != null then builtins.trace msg true else true; metaTypes = with lib.types; rec { # These keys are documented @@ -277,28 +293,37 @@ let insecure = isMarkedInsecure attrs; } // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then - { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } + { valid = "no"; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlocklistedLicense attrs then - { valid = false; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; } + { valid = "no"; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then - { valid = false; reason = "broken"; errormsg = "is marked as broken"; } + { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; } else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then - { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } + { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then - { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } + { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; } else if checkOutputsToInstall attrs then - { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } + { valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then - { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }); + { valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } + # --- warnings --- + # Please also update the type in /pkgs/top-level/config.nix alongside this. + else if hasNoMaintainers attrs then + { valid = "warn"; reason = "maintainerless"; errormsg = "has no maintainers"; } + # ----- + else { valid = "yes"; }); assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { - # Throw an error if trying to evaluate an non-valid derivation - handled = if !validity.valid - then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; } - else true; + # Throw an error if trying to evaluate a non-valid derivation + # or, alternatively, just output a warning message. + handled = + { + no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }; + warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; }; + yes = true; + }.${validity.valid}; }; in assertValidity diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index d1b93874a25a3..11c0a29ce4f98 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -9,8 +9,72 @@ let # to build it. This is a bit confusing for cross compilation. inherit (stdenv) hostPlatform; }; + + makeOverlayable = mkDerivationSimple: + fnOrAttrs: + if builtins.isFunction fnOrAttrs + then makeDerivationExtensible mkDerivationSimple fnOrAttrs + else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs; + + # Based off lib.makeExtensible, with modifications: + makeDerivationExtensible = mkDerivationSimple: rattrs: + let + # NOTE: The following is a hint that will be printed by the Nix cli when + # encountering an infinite recursion. It must not be formatted into + # separate lines, because Nix would only show the last line of the comment. + + # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`. + args = rattrs (args // { inherit finalPackage; }); + # ^^^^ + + finalPackage = + mkDerivationSimple + (f0: + let + f = self: super: + # Convert f0 to an overlay. Legacy is: + # overrideAttrs (super: {}) + # We want to introduce self. We follow the convention of overlays: + # overrideAttrs (self: super: {}) + # Which means the first parameter can be either self or super. + # This is surprising, but far better than the confusion that would + # arise from flipping an overlay's parameters in some cases. + let x = f0 super; + in + if builtins.isFunction x + then + # Can't reuse `x`, because `self` comes first. + # Looks inefficient, but `f0 super` was a cheap thunk. + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple + (self: let super = rattrs self; in super // f self super)) + args; + in finalPackage; + + # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), + # but pre-evaluated for a slight improvement in performance. + makeDerivationExtensibleConst = mkDerivationSimple: attrs: + mkDerivationSimple + (f0: + let + f = self: super: + let x = f0 super; + in + if builtins.isFunction x + then + f0 self super + else x; + in + makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs)) + attrs; + in +makeOverlayable (overrideAttrs: + + # `mkDerivation` wraps the builtin `derivation` function to # produce derivations that use this stdenv and its shell. # @@ -70,6 +134,7 @@ in , # TODO(@Ericson2314): Make always true and remove strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform + , meta ? {} , passthru ? {} , pos ? # position used in error messages and for meta.position @@ -370,7 +435,7 @@ else let } // { # Expose the result of the checks for everyone to see. inherit (validity) unfree broken unsupported insecure; - available = validity.valid + available = validity.valid != "no" && (if config.checkMetaRecursively or false then lib.all (d: d.meta.available or true) references else true); @@ -381,8 +446,6 @@ in lib.extendDerivation validity.handled ({ - overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs)); - # A derivation that always builds successfully and whose runtime # dependencies are the original derivations build time dependencies # This allows easy building and distributing of all derivations @@ -408,10 +471,12 @@ lib.extendDerivation args = [ "-c" "export > $out" ]; }); - inherit meta passthru; + inherit meta passthru overrideAttrs; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) (derivation derivationArg) + +) diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index 9330291014d16..aa1c77ef68e47 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -20,15 +20,15 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.37"; + version = "0.0.38"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 src = fetchFromGitHub { owner = "cevoaustralia"; repo = "aws-google-auth"; - rev = version; - sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd"; + rev = "refs/tags/${version}"; + sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 84781688ec1ab..d917acd656c82 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -1,21 +1,21 @@ -{ stdenv -, lib +{ lib , python3 , fetchurl , zlib , mkYarnModules , sphinx , nixosTests +, pkgs }: let pname = "pgadmin"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d"; + sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw="; }; yarnDeps = mkYarnModules { @@ -25,9 +25,78 @@ let yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; }; + + # move buildDeps here to easily pass to test suite + buildDeps = with pythonPackages; [ + flask + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + ]; + + # override necessary on pgadmin4 6.8 + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + }; + disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ + "test_aborting" + ]; + }); + flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { + # tests fail due to downgrades here + doCheck = false; + }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); + }); + in -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { inherit pname version src; # from Dockerfile @@ -43,19 +112,19 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) - substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true" + substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" patchShebangs . # relax dependencies substituteInPlace requirements.txt \ - --replace "Pillow==8.3.*" "Pillow>=8.3.0" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ --replace "boto3==1.20.*" "boto3>=1.20" \ --replace "botocore==1.23.*" "botocore>=1.23" \ - --replace "pytz==2021.*" "pytz" + --replace "pytz==2021.*" "pytz" \ + --replace "Werkzeug==2.0.3" "werkzeug>=2.*" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ @@ -101,10 +170,10 @@ python3.pkgs.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + nativeBuildInputs = with pythonPackages; [ cython pip ]; buildInputs = [ zlib - python3.pkgs.wheel + pythonPackages.wheel ]; # tests need an own data, log directory @@ -112,57 +181,21 @@ python3.pkgs.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ - flask - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - speaklater3 - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - ]; + # speaklater3 is seperate because when passing buildDeps + # to the test, it fails there due to a collision with speaklater + propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; - passthru = { - tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; }; + passthru.tests = { + standalone = nixosTests.pgadmin4-standalone; + # regression and function tests of the package itself + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); }; meta = with lib; { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; maintainers = with maintainers; [ gador ]; }; } diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index e4a27bd10d7ba..d708b05e4883e 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -8,8 +8,8 @@ "license": "PostgreSQL", "devDependencies": { "@babel/core": "^7.10.2", - "@babel/eslint-parser": "^7.12.13", - "@babel/eslint-plugin": "^7.12.13", + "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-plugin": "^7.17.7", "@babel/plugin-proposal-object-rest-spread": "^7.10.1", "@babel/plugin-syntax-jsx": "^7.16.0", "@babel/preset-env": "^7.10.2", @@ -82,11 +82,12 @@ "@date-io/core": "^1.3.6", "@date-io/date-fns": "1.x", "@emotion/sheet": "^1.0.1", - "@fortawesome/fontawesome-free": "^5.14.0", "@material-ui/core": "4.11.0", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.2.10", + "@mui/icons-material": "^5.4.2", + "@mui/material": "^5.4.3", "@projectstorm/react-diagrams": "^6.6.1", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^2.2.0", @@ -145,7 +146,7 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", @@ -154,6 +155,8 @@ "react-checkbox-tree": "^1.7.2", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-rnd": "^10.3.5", + "react-router-dom": "^6.2.2", "react-select": "^4.2.1", "react-table": "^7.6.3", "react-timer-hook": "^3.0.5", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 7dc709ab5add9..bfb47913f8fbf 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -91,19 +91,19 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/eslint-parser@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687" - integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw== +"@babel/eslint-parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: - eslint-scope "5.1.0" - eslint-visitor-keys "^1.3.0" + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/eslint-plugin@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b" - integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w== +"@babel/eslint-plugin@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8" + integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw== dependencies: eslint-rule-composer "^0.3.0" @@ -1741,6 +1741,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.13", "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -1849,6 +1856,17 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.3" +"@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + "@emotion/core@^10.0.14": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" @@ -1882,6 +1900,13 @@ dependencies: "@emotion/memoize" "0.7.4" +"@emotion/is-prop-valid@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/memoize@0.7.4": version "0.7.4" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" @@ -1937,6 +1962,11 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/styled-base@^10.0.27": version "10.0.31" resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a" @@ -2117,6 +2147,93 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@mui/base@5.0.0-alpha.74": + version "5.0.0-alpha.74" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750" + integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/is-prop-valid" "^1.1.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@popperjs/core" "^2.11.4" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/icons-material@^5.4.2": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb" + integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA== + dependencies: + "@babel/runtime" "^7.17.2" + +"@mui/material@^5.4.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc" + integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/base" "5.0.0-alpha.74" + "@mui/system" "^5.5.3" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@types/react-transition-group" "^4.4.4" + clsx "^1.1.1" + csstype "^3.0.11" + hoist-non-react-statics "^3.3.2" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.2" + +"@mui/private-theming@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab" + integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/utils" "^5.5.3" + prop-types "^15.7.2" + +"@mui/styled-engine@^5.5.2": + version "5.5.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6" + integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/cache" "^11.7.1" + prop-types "^15.7.2" + +"@mui/system@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5" + integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/private-theming" "^5.5.3" + "@mui/styled-engine" "^5.5.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + clsx "^1.1.1" + csstype "^3.0.11" + prop-types "^15.7.2" + +"@mui/types@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a" + integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA== + +"@mui/utils@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65" + integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag== + dependencies: + "@babel/runtime" "^7.17.2" + "@types/prop-types" "^15.7.4" + "@types/react-is" "^16.7.1 || ^17.0.0" + prop-types "^15.7.2" + react-is "^17.0.2" + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -2159,6 +2276,11 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@popperjs/core@^2.11.4": + version "2.11.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== + "@popperjs/core@^2.8.3": version "2.9.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546" @@ -2436,6 +2558,11 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== +"@types/prop-types@^15.7.4": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -2448,6 +2575,13 @@ dependencies: "@types/react" "^16" +"@types/react-is@^16.7.1 || ^17.0.0": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" + integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.2.0": version "4.4.1" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" @@ -2455,6 +2589,13 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== + dependencies: + "@types/react" "*" + "@types/react@*", "@types/react@^16": version "16.14.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" @@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== +csstype@^3.0.11: + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== + csstype@^3.0.2: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" @@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -eslint-scope@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -5320,7 +5458,7 @@ esquery@^1.4.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-memoize@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" + integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== + fast-safe-stringify@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" @@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +history@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== + dependencies: + "@babel/runtime" "^7.7.6" + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -8351,9 +8501,9 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18" @@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0 react-is "^16.12.0" shallowequal "^1.1.0" +re-resizable@6.9.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c" + integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ== + dependencies: + fast-memoize "^2.5.1" + react-aspen@^1.1.0, react-aspen@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038" @@ -9063,6 +9220,14 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" +react-draggable@4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" + integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w== + dependencies: + classnames "^2.2.5" + prop-types "^15.6.0" + react-draggable@^4.4.4: version "4.4.4" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" @@ -9093,6 +9258,30 @@ react-property@1.0.1: resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6" integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ== +react-rnd@^10.3.5: + version "10.3.5" + resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139" + integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw== + dependencies: + re-resizable "6.9.1" + react-draggable "4.4.3" + tslib "2.3.0" + +react-router-dom@^6.2.2: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + dependencies: + history "^5.2.0" + react-router "6.3.0" + +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== + dependencies: + history "^5.2.0" + react-select@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81" @@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g loose-envify "^1.4.0" prop-types "^15.6.2" +react-transition-group@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-transition-state@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f" @@ -10161,6 +10360,11 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + stylis@^4.0.3, stylis@^4.0.7: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -10511,6 +10715,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index eca056bc92183..9e2ed892fcd2d 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -74,19 +74,19 @@ }; } { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; path = fetchurl { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz"; - sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw=="; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; + sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; }; } { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; path = fetchurl { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz"; - sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w=="; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz"; + sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw=="; }; } { @@ -1578,6 +1578,14 @@ }; } { + name = "_babel_runtime___runtime_7.17.8.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + }; + } + { name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { name = "_babel_template___template_7.14.5.tgz"; @@ -1674,6 +1682,14 @@ }; } { + name = "_emotion_cache___cache_11.7.1.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_11.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz"; + sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A=="; + }; + } + { name = "_emotion_core___core_10.1.1.tgz"; path = fetchurl { name = "_emotion_core___core_10.1.1.tgz"; @@ -1706,6 +1722,14 @@ }; } { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; + sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; + }; + } + { name = "_emotion_memoize___memoize_0.7.4.tgz"; path = fetchurl { name = "_emotion_memoize___memoize_0.7.4.tgz"; @@ -1762,6 +1786,14 @@ }; } { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz"; + sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="; + }; + } + { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; path = fetchurl { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; @@ -1930,6 +1962,70 @@ }; } { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + path = fetchurl { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz"; + sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ=="; + }; + } + { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + path = fetchurl { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz"; + sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA=="; + }; + } + { + name = "_mui_material___material_5.5.3.tgz"; + path = fetchurl { + name = "_mui_material___material_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz"; + sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A=="; + }; + } + { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + path = fetchurl { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz"; + sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A=="; + }; + } + { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + path = fetchurl { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz"; + sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA=="; + }; + } + { + name = "_mui_system___system_5.5.3.tgz"; + path = fetchurl { + name = "_mui_system___system_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz"; + sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw=="; + }; + } + { + name = "_mui_types___types_7.1.3.tgz"; + path = fetchurl { + name = "_mui_types___types_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz"; + sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA=="; + }; + } + { + name = "_mui_utils___utils_5.5.3.tgz"; + path = fetchurl { + name = "_mui_utils___utils_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz"; + sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag=="; + }; + } + { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; @@ -1978,6 +2074,14 @@ }; } { + name = "_popperjs_core___core_2.11.4.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz"; + sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="; + }; + } + { name = "_popperjs_core___core_2.9.0.tgz"; path = fetchurl { name = "_popperjs_core___core_2.9.0.tgz"; @@ -2314,6 +2418,14 @@ }; } { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; + }; + } + { name = "_types_q___q_1.5.4.tgz"; path = fetchurl { name = "_types_q___q_1.5.4.tgz"; @@ -2330,6 +2442,14 @@ }; } { + name = "_types_react_is___react_is_17.0.3.tgz"; + path = fetchurl { + name = "_types_react_is___react_is_17.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz"; + sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw=="; + }; + } + { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; @@ -2338,6 +2458,14 @@ }; } { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + path = fetchurl { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; + sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug=="; + }; + } + { name = "_types_react___react_16.14.10.tgz"; path = fetchurl { name = "_types_react___react_16.14.10.tgz"; @@ -4474,6 +4602,14 @@ }; } { + name = "csstype___csstype_3.0.11.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; + }; + } + { name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { name = "csstype___csstype_3.0.8.tgz"; @@ -5186,14 +5322,6 @@ }; } { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; - }; - } - { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { name = "eslint_scope___eslint_scope_5.1.1.tgz"; @@ -5442,6 +5570,14 @@ }; } { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + path = fetchurl { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + } + { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; path = fetchurl { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; @@ -6082,6 +6218,14 @@ }; } { + name = "history___history_5.3.0.tgz"; + path = fetchurl { + name = "history___history_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz"; + sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; + }; + } + { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; @@ -8823,8 +8967,8 @@ let repo = fetchgit { url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "bf7ac7be65898883e3e05c9733426152a1da6422"; - sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63"; + rev = "c966febebcdffaa46f1ccf0769fe5308f179d613"; + sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081"; }; in runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' @@ -9554,6 +9698,14 @@ }; } { + name = "re_resizable___re_resizable_6.9.1.tgz"; + path = fetchurl { + name = "re_resizable___re_resizable_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz"; + sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ=="; + }; + } + { name = "react_aspen___react_aspen_1.1.1.tgz"; path = fetchurl { name = "react_aspen___react_aspen_1.1.1.tgz"; @@ -9586,6 +9738,14 @@ }; } { + name = "react_draggable___react_draggable_4.4.3.tgz"; + path = fetchurl { + name = "react_draggable___react_draggable_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz"; + sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w=="; + }; + } + { name = "react_draggable___react_draggable_4.4.4.tgz"; path = fetchurl { name = "react_draggable___react_draggable_4.4.4.tgz"; @@ -9626,6 +9786,30 @@ }; } { + name = "react_rnd___react_rnd_10.3.5.tgz"; + path = fetchurl { + name = "react_rnd___react_rnd_10.3.5.tgz"; + url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz"; + sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw=="; + }; + } + { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz"; + sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; + }; + } + { + name = "react_router___react_router_6.3.0.tgz"; + path = fetchurl { + name = "react_router___react_router_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz"; + sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; + }; + } + { name = "react_select___react_select_4.3.1.tgz"; path = fetchurl { name = "react_select___react_select_4.3.1.tgz"; @@ -9674,6 +9858,14 @@ }; } { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="; + }; + } + { name = "react_transition_state___react_transition_state_1.1.3.tgz"; path = fetchurl { name = "react_transition_state___react_transition_state_1.1.3.tgz"; @@ -10866,6 +11058,14 @@ }; } { + name = "stylis___stylis_4.0.13.tgz"; + path = fetchurl { + name = "stylis___stylis_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz"; + sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="; + }; + } + { name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { name = "stylis___stylis_4.0.10.tgz"; @@ -11234,6 +11434,14 @@ }; } { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + }; + } + { name = "tslib___tslib_2.2.0.tgz"; path = fetchurl { name = "tslib___tslib_2.2.0.tgz"; diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index c845d890ce505..ae55eb4ed69e9 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -70,7 +70,7 @@ symlinkJoin { homepage = "https://mikrotik.com"; downloadPage = "https://mikrotik.com/download"; changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog"; - license = licenses.gpl3Plus; + license = licenses.unfree; maintainers = with maintainers; [ yrd ]; }; } diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 5aeaffdb50406..926c2247e2de9 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -24,7 +24,7 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { pname = "ventoy-bin"; - version = "1.0.72"; + version = "1.0.74"; nativeBuildInputs = [ autoPatchelfHook makeWrapper ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - sha256 = "sha256-1mfe6ZnqkeBNGNjI7Qx7jG5FLgfn6rVwr0VQvSOG7Ow="; + sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo="; }; patches = [ (fetchpatch { name = "sanitize.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8"; - sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=057f2d1eb496c7a3aaa8229e99a7f709428fa4c5"; + sha256 = "sha256-iAtLtM+Q4OsXDK83eCnPNomeNSEqdRLFfK2x7ybPSpk="; }) ./fix-for-read-only-file-system.patch ./add-mips64.patch @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};; mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};; esac - rm README tool/VentoyWorker.sh.orig + rm README rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el. # Copy from "$src" to "$out". @@ -106,10 +106,15 @@ in stdenv.mkDerivation rec { makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \ --prefix PATH : "${lib.makeBinPath buildInputs}" \ --chdir "$VENTOY_PATH" + mkdir "$out"/share/{applications,pixmaps} + ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/ + cp ${./ventoy-gui.desktop} "$out"/share/applications/ '' + lib.optionalString (!withGtk3) '' - rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3" + rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade} '' + lib.optionalString (!withQt5) '' rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5" + '' + lib.optionalString (!withGtk3 && !withQt5) '' + rm "$VENTOY_PATH"/VentoyGUI.* ''; meta = with lib; { diff --git a/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop b/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop new file mode 100644 index 0000000000000..a132f3bbf5a4d --- /dev/null +++ b/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Categories=Utility; +Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files +Exec=ventoy-gui +Hidden=false +Icon=VentoyLogo +Name=Ventoy +StartupNotify=true +Terminal=false +Type=Application diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 77d23df4923f5..9cc83e1976910 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , glslang , libffi , libX11 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" - "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config" + "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix new file mode 100644 index 0000000000000..793f341a07310 --- /dev/null +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "calamares-nixos-extensions"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "calamares-nixos-extensions"; + rev = version; + sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/{lib,share}/calamares + cp -r modules $out/lib/calamares/ + cp -r config/* $out/share/calamares/ + cp -r branding $out/share/calamares/ + runHook postInstall + ''; + + meta = with lib; { + description = "Calamares modules for NixOS"; + homepage = "https://github.com/NixOS/calamares-nixos-extensions"; + license = with licenses; [ gpl3Plus bsd2 cc-by-40 cc-by-sa-40 cc0 ]; + maintainers = with maintainers; [ vlinkz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 9112041502127..8afb103e9d497 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,24 +1,48 @@ -{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore -, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata +{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2 +, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python +, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation +, nixos-extensions ? false }: mkDerivation rec { pname = "calamares"; - version = "3.2.55"; + version = "3.2.56"; # release including submodule src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI="; + url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03"; }; + patches = lib.optionals nixos-extensions [ + # Modifies the users module to only set passwords of user and root + # as the users will have already been created in the configuration.nix file + ./userjob.patch + # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files + # as by default it only searches /usr/share/calamares/ and /nix/store/<hash>-calamares-<version>/share/calamares/ + # but calamares-nixos-extensions is not in either of these locations + ./nixos-extensions-paths.patch + # Uses pkexec within modules in order to run calamares without root permissions as a whole + # Also fixes storage check in the welcome module + ./nonroot.patch + # Adds unfree qml to packagechooserq + ./unfreeq.patch + # Adds config to change name of packagechooserq + # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932 + ./packagechooserq.patch + # Modifies finished module to add some NixOS resources + # Modifies packagechooser module to change the UI + ./uimod.patch + # Remove options for unsupported partition types + ./partitions.patch + ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - boost kparts.dev kpmcore.out kservice.dev - libatasmart libxcb libyamlcpp parted polkit-qt python qtbase - qtquickcontrols qtsvg qttools qtwebengine.dev util-linux + boost kparts.dev kpmcore.out kservice.dev kirigami2 + libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python + qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; cmakeFlags = [ @@ -32,15 +56,28 @@ mkDerivation rec { POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; postPatch = '' + # Run calamares without root. Other patches make it functional as a normal user + sed -e "s,pkexec calamares,calamares," \ + -i calamares.desktop + + sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \ + -i calamares.desktop + + # Fix desktop reference with wayland + mv calamares.desktop io.calamares.calamares.desktop + + sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \ + -i CMakeLists.txt + sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ - -i calamares.desktop \ -i com.github.calamares.calamares.policy sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/SetTimezoneJob.cpp + -i src/modules/locale/SetTimezoneJob.cpp \ + -i src/libcalamares/locale/TimeZone.cpp sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ - -i src/modules/keyboard/keyboardwidget/keyboardglobal.h + -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \ -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp @@ -51,8 +88,9 @@ mkDerivation rec { meta = with lib; { description = "Distribution-independent installer framework"; - license = with licenses; [ gpl3Plus bsd2 ]; - maintainers = with maintainers; [ manveru ]; + homepage = "https://calamares.io/"; + license = with licenses; [ gpl3Plus bsd2 cc0 ]; + maintainers = with maintainers; [ manveru vlinkz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch new file mode 100644 index 0000000000000..4e0012160e9fb --- /dev/null +++ b/pkgs/tools/misc/calamares/nixos-extensions-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp +index de709156f..a0b6c5faf 100644 +--- a/src/calamares/main.cpp ++++ b/src/calamares/main.cpp +@@ -131,6 +132,8 @@ main( int argc, char* argv[] ) + // TODO: umount anything in /tmp/calamares-... as an emergency save function + #endif + ++ CalamaresUtils::setNixosDirs(); ++ + bool is_debug = handle_args( a ); + + #ifdef WITH_KF5DBus +diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp +index f333d6e64..6118fb412 100644 +--- a/src/libcalamares/utils/Dirs.cpp ++++ b/src/libcalamares/utils/Dirs.cpp +@@ -115,6 +116,14 @@ setXdgDirs() + s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); + } + ++void ++setNixosDirs() ++{ ++ s_extraConfigDirs << "/run/current-system/sw/share/calamares/"; ++ s_extraDataDirs << "/run/current-system/sw/share/calamares/"; ++ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); ++} ++ + QStringList + extraConfigDirs() + { +diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h +index 445cbe1f1..da869d446 100644 +--- a/src/libcalamares/utils/Dirs.h ++++ b/src/libcalamares/utils/Dirs.h +@@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden(); + /** @brief Setup extra config and data dirs from the XDG variables. + */ + DLLEXPORT void setXdgDirs(); ++/** @brief Setup extra config and data dirs fir NixOS. ++ */ ++DLLEXPORT void setNixosDirs(); + /** @brief Are any extra directories configured? */ + DLLEXPORT bool haveExtraDirs(); + /** @brief XDG_CONFIG_DIRS, each guaranteed to end with / */ diff --git a/pkgs/tools/misc/calamares/nonroot.patch b/pkgs/tools/misc/calamares/nonroot.patch new file mode 100644 index 0000000000000..7843f45f284ce --- /dev/null +++ b/pkgs/tools/misc/calamares/nonroot.patch @@ -0,0 +1,105 @@ +diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp +index c7146c2d7..e165d9a8f 100644 +--- a/src/libcalamares/utils/Runner.cpp ++++ b/src/libcalamares/utils/Runner.cpp +@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run() + } + if ( m_location == RunLocation::RunInTarget ) + { +- process.setProgram( "chroot" ); +- process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command ); ++ process.setProgram( "pkexec" ); ++ process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command ); + } + else + { +- process.setProgram( "env" ); +- process.setArguments( m_command ); ++ process.setProgram( "pkexec" ); ++ process.setArguments( QStringList { "env" } + m_command ); + } + + if ( m_output ) +diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py +index a3318d1a0..5fbe202fd 100644 +--- a/src/modules/mount/main.py ++++ b/src/modules/mount/main.py +@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions): + + # Ensure that the created directory has the correct SELinux context on + # SELinux-enabled systems. +- os.makedirs(mount_point, exist_ok=True) ++ subprocess.check_call(["pkexec", "mkdir", "-p", mount_point]) ++ + try: + subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point]) + except FileNotFoundError as e: +@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions): + for s in btrfs_subvolumes: + if not s["subvolume"]: + continue +- os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True) +- subprocess.check_call(["btrfs", "subvolume", "create", ++ subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])]) ++ subprocess.check_call(["pkexec", "btrfs", "subvolume", "create", + root_mount_point + s["subvolume"]]) + if s["mountPoint"] == "/": + # insert the root subvolume into global storage + libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"]) +- subprocess.check_call(["umount", "-v", root_mount_point]) ++ subprocess.check_call(["pkexec", "umount", "-v", root_mount_point]) + + device = partition["device"] + +diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp +index ca7219ca4..6ac682ba4 100644 +--- a/src/modules/welcome/checker/GeneralRequirements.cpp ++++ b/src/modules/welcome/checker/GeneralRequirements.cpp +@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) + cWarning() << "GeneralRequirements is configured without libparted."; + return false; + #else +- return check_big_enough( requiredSpace ); ++ return big_enough( requiredSpace ); + #endif + } + ++bool ++GeneralRequirements::big_enough( qint64 requiredSpace ) ++{ ++ FILE *fpipe; ++ char command[128]; ++ snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace); ++ char c = 0; ++ ++ if (0 == (fpipe = (FILE*)popen(command, "r"))) ++ { ++ cWarning() << "Failed to check storage size."; ++ return false; ++ } ++ ++ while (fread(&c, sizeof c, 1, fpipe)) ++ { ++ pclose(fpipe); ++ return true; ++ } ++ ++ pclose(fpipe); ++ ++ return false; ++} + + bool + GeneralRequirements::checkEnoughRam( qint64 requiredRam ) +diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h +index b6646da11..ea27324fa 100644 +--- a/src/modules/welcome/checker/GeneralRequirements.h ++++ b/src/modules/welcome/checker/GeneralRequirements.h +@@ -36,6 +36,7 @@ private: + bool checkHasPower(); + bool checkHasInternet(); + bool checkIsRoot(); ++ bool big_enough( qint64 requiredSpace ); + + qreal m_requiredStorageGiB; + qreal m_requiredRamGiB; diff --git a/pkgs/tools/misc/calamares/packagechooserq.patch b/pkgs/tools/misc/calamares/packagechooserq.patch new file mode 100644 index 0000000000000..90a7b22de8b54 --- /dev/null +++ b/pkgs/tools/misc/calamares/packagechooserq.patch @@ -0,0 +1,136 @@ +diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp +index 491fe5c25..667621597 100644 +--- a/src/modules/packagechooser/Config.cpp ++++ b/src/modules/packagechooser/Config.cpp +@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice ) + emit packageChoiceChanged( m_packageChoice.value_or( QString() ) ); + } + ++QString ++Config::prettyName() const ++{ ++ return m_stepName ? m_stepName->get() : tr( "Packages" ); ++} ++ + QString + Config::prettyStatus() const + { +@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) + cWarning() << "Single-selection QML module must use 'Legacy' method."; + } + } ++ ++ bool labels_ok = false; ++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); ++ if ( labels_ok ) ++ { ++ if ( labels.contains( "step" ) ) ++ { ++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); ++ } ++ } + } +diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h +index b04b1c30b..d1b783a8d 100644 +--- a/src/modules/packagechooser/Config.h ++++ b/src/modules/packagechooser/Config.h +@@ -98,6 +98,7 @@ public: + QString packageChoice() const { return m_packageChoice.value_or( QString() ); } + void setPackageChoice( const QString& packageChoice ); + ++ QString prettyName() const; + QString prettyStatus() const; + + signals: +@@ -120,6 +121,7 @@ private: + * Reading the property will return an empty QString. + */ + std::optional< QString > m_packageChoice; ++ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar + }; + + +diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp +index 9057004de..8eacf82ec 100644 +--- a/src/modules/packagechooser/PackageChooserViewStep.cpp ++++ b/src/modules/packagechooser/PackageChooserViewStep.cpp +@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) + : Calamares::ViewStep( parent ) + , m_config( new Config( this ) ) + , m_widget( nullptr ) +- , m_stepName( nullptr ) + { + emit nextStatusChanged( false ); + } +@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep() + { + m_widget->deleteLater(); + } +- delete m_stepName; + } + +- + QString + PackageChooserViewStep::prettyName() const + { +- return m_stepName ? m_stepName->get() : tr( "Packages" ); ++ return m_config->prettyName(); + } + + +@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap + m_config->setDefaultId( moduleInstanceKey() ); + m_config->setConfigurationMap( configurationMap ); + +- bool labels_ok = false; +- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); +- if ( labels_ok ) +- { +- if ( labels.contains( "step" ) ) +- { +- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); +- } +- } +- + if ( m_widget ) + { + hookupModel(); +diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h +index 7561f2bd7..76b35aed8 100644 +--- a/src/modules/packagechooser/PackageChooserViewStep.h ++++ b/src/modules/packagechooser/PackageChooserViewStep.h +@@ -50,7 +50,6 @@ private: + + Config* m_config; + PackageChooserPage* m_widget; +- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar + }; + + CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory ) +diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +index 543c9771d..7c4d5fda7 100644 +--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp ++++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent ) + QString + PackageChooserQmlViewStep::prettyName() const + { +- return tr( "Packages" ); ++ return m_config->prettyName(); + } + + QString +@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration + m_config->setDefaultId( moduleInstanceKey() ); + m_config->setConfigurationMap( configurationMap ); + Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last ++ /*bool labels_ok = false; ++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); ++ if ( labels_ok ) ++ { ++ if ( labels.contains( "step" ) ) ++ { ++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); ++ } ++ }*/ + } diff --git a/pkgs/tools/misc/calamares/partitions.patch b/pkgs/tools/misc/calamares/partitions.patch new file mode 100644 index 0000000000000..ae3c7961ae644 --- /dev/null +++ b/pkgs/tools/misc/calamares/partitions.patch @@ -0,0 +1,28 @@ +diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp +index c5b17c69e..353b6f964 100644 +--- a/src/modules/partition/gui/CreatePartitionDialog.cpp ++++ b/src/modules/partition/gui/CreatePartitionDialog.cpp +@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, + { + // We need to ensure zfs is added to the list if the zfs module is enabled + if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) +- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) ) ++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) ) + { + fsNames << userVisibleFS( fs ); // This is put into the combobox + if ( fs->type() == defaultFSType ) +diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp +index 0bc35cabe..3cf8a7fa2 100644 +--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp ++++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp +@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, + { + // We need to ensure zfs is added to the list if the zfs module is enabled + if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) +- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) ) ++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) ) + { + fsNames << userVisibleFS( fs ); // For the combo box + } diff --git a/pkgs/tools/misc/calamares/uimod.patch b/pkgs/tools/misc/calamares/uimod.patch new file mode 100644 index 0000000000000..5a6ec6cdeea2e --- /dev/null +++ b/pkgs/tools/misc/calamares/uimod.patch @@ -0,0 +1,85 @@ +diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp +index 6c5f9ad16..24d75e07b 100644 +--- a/src/modules/finished/FinishedPage.cpp ++++ b/src/modules/finished/FinishedPage.cpp +@@ -71,7 +71,10 @@ FinishedPage::retranslate() + { + ui->mainText->setText( tr( "<h1>All done.</h1><br/>" + "%1 has been set up on your computer.<br/>" +- "You may now start using your new system." ) ++ "You may now start using your new system.<br/>" ++ "You can change every setting later except the bootloader.<br/>" ++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") + .arg( branding->versionedName() ) ); + ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" + "<p>When this box is checked, your system will " +@@ -84,7 +87,10 @@ FinishedPage::retranslate() + ui->mainText->setText( tr( "<h1>All done.</h1><br/>" + "%1 has been installed on your computer.<br/>" + "You may now restart into your new system, or continue " +- "using the %2 Live environment." ) ++ "using the %2 Live environment.<br/>" ++ "You can change every setting later except the bootloader.<br/>" ++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>" ++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>") + .arg( branding->versionedName(), branding->productName() ) ); + ui->restartCheckBox->setToolTip( tr( "<html><head/><body>" + "<p>When this box is checked, your system will " +diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp +index 721329c1b..164b9945e 100644 +--- a/src/modules/packagechooser/PackageChooserPage.cpp ++++ b/src/modules/packagechooser/PackageChooserPage.cpp +@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index ) + if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() ) + { + ui->productName->setText( m_introduction.name.get() ); ++ ui->productName->setStyleSheet("font-weight: bold"); + ui->productScreenshot->setPixmap( m_introduction.screenshot ); + ui->productDescription->setText( m_introduction.description.get() ); + } +diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui +index d021b08b3..fecfa3060 100644 +--- a/src/modules/packagechooser/page_package.ui ++++ b/src/modules/packagechooser/page_package.ui +@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later + </item> + <item> +- <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1"> ++ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1"> +- <item> +- <widget class="QLabel" name="productName"> +- <property name="sizePolicy"> +- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="text"> +- <string>Product Name</string> +- </property> +- </widget> +- </item> + <item> + <widget class="FixedAspectRatioLabel" name="productScreenshot"> + <property name="sizePolicy"> +@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later + </property> + </widget> + </item> ++ <item> ++ <widget class="QLabel" name="productName"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="text"> ++ <string>Product Name</string> ++ </property> ++ </widget> ++ </item> + <item> + <widget class="QLabel" name="productDescription"> + <property name="sizePolicy"> diff --git a/pkgs/tools/misc/calamares/unfreeq.patch b/pkgs/tools/misc/calamares/unfreeq.patch new file mode 100644 index 0000000000000..a234113a726ee --- /dev/null +++ b/pkgs/tools/misc/calamares/unfreeq.patch @@ -0,0 +1,109 @@ +diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc +index 1b892dce1..ee80a934b 100644 +--- a/src/modules/packagechooserq/packagechooserq.qrc ++++ b/src/modules/packagechooserq/packagechooserq.qrc +@@ -4,5 +4,6 @@ + <file>images/libreoffice.jpg</file> + <file>images/no-selection.png</file> + <file>images/plasma.png</file> ++ <file>packagechooserq@unfree.qml</file> + </qresource> + </RCC> +diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml +new file mode 100644 +index 000000000..cb87d864a +--- /dev/null ++++ b/src/modules/packagechooserq/packagechooserq@unfree.qml +@@ -0,0 +1,75 @@ ++/* === This file is part of Calamares - <https://calamares.io> === ++ * ++ * SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us> ++ * SPDX-License-Identifier: GPL-3.0-or-later ++ * ++ * Calamares is Free Software: see the License-Identifier above. ++ * ++ */ ++ ++import io.calamares.core 1.0 ++import io.calamares.ui 1.0 ++ ++import QtQuick 2.15 ++import QtQuick.Controls 2.15 ++import QtQuick.Layouts 1.3 ++ ++Item { ++ ++ SystemPalette { ++ id: palette ++ colorGroup: SystemPalette.Active ++ } ++ ++ width: parent.width ++ height: parent.height ++ ++ Rectangle { ++ anchors.fill: parent ++ color: palette.window ++ ++ ButtonGroup { ++ id: switchGroup ++ } ++ ++ Column { ++ id: column ++ anchors.centerIn: parent ++ spacing: 5 ++ ++ Rectangle { ++ width: 700 ++ height: 200 ++ color: palette.base ++ radius: 10 ++ border.width: 0 ++ Text { ++ color: palette.text ++ width: 600 ++ height: 150 ++ anchors.centerIn: parent ++ text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>") ++ font.pointSize: 12 ++ wrapMode: Text.WordWrap ++ } ++ ++ CheckBox { ++ id: element2 ++ anchors.horizontalCenter: parent.horizontalCenter ++ y: 145 ++ text: qsTr("Allow unfree software") ++ checked: false ++ ++ onCheckedChanged: { ++ if ( checked ) { ++ config.packageChoice = "unfree" ++ } else { ++ config.packageChoice = "free" ++ } ++ } ++ } ++ } ++ } ++ } ++ ++} +diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf +new file mode 100644 +index 000000000..da79a8eac +--- /dev/null ++++ b/src/modules/packagechooserq/unfree.conf +@@ -0,0 +1,11 @@ ++# SPDX-FileCopyrightText: no ++# SPDX-License-Identifier: CC0-1.0 ++# ++--- ++qmlLabel: ++ label: "Unfree Software" ++method: legacy ++mode: required ++labels: ++ step: "Unfree Software" ++packageChoice: free diff --git a/pkgs/tools/misc/calamares/userjob.patch b/pkgs/tools/misc/calamares/userjob.patch new file mode 100644 index 0000000000000..a0bfea9bb05aa --- /dev/null +++ b/pkgs/tools/misc/calamares/userjob.patch @@ -0,0 +1,31 @@ +diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp +index eedfd274d..0f3e78848 100644 +--- a/src/modules/users/Config.cpp ++++ b/src/modules/users/Config.cpp +@@ -972,26 +972,11 @@ Config::createJobs() const + + Calamares::Job* j; + +- if ( !m_sudoersGroup.isEmpty() ) +- { +- j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle ); +- jobs.append( Calamares::job_ptr( j ) ); +- } +- +- j = new SetupGroupsJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- +- j = new CreateUserJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- + j = new SetPasswordJob( loginName(), userPassword() ); + jobs.append( Calamares::job_ptr( j ) ); + + j = new SetPasswordJob( "root", rootPassword() ); + jobs.append( Calamares::job_ptr( j ) ); + +- j = new SetHostNameJob( this ); +- jobs.append( Calamares::job_ptr( j ) ); +- + return jobs; + } diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 0364065be24c6..b34b1ee4d5170 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-04-17"; + version = "unstable-2022-04-18"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "7f769d6f3697541e55fd3ea9b71f190296529e48"; - sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo="; + rev = "571377f2f79422398a701cb1864487124ec3dcc6"; + sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index e4e77ba90e256..874e3525f691e 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY="; + sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI="; }; - cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo="; + cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 064590ef979b7..c1abe01be5659 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, lib, makeWrapper , extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook -, kconfig, kcrash, kinit, kpmcore +, kconfig, kcrash, kinit, kpmcore, polkit-qt , cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux , btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs , jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs @@ -41,16 +41,16 @@ let in mkDerivation rec { pname = "partitionmanager"; # NOTE: When changing this version, also change the version of `kpmcore`. - version = "4.2.0"; + version = "22.04.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg="; + url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ]; - propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; + propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; postFixup = '' wrapProgram $out/bin/partitionmanager \ diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 76df2a6882738..518547e183784 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "v${version}"; - sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh"; + sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index cdc3dbdae1016..bfd4db8ff8829 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -9,21 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "rust-motd"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "rust-motd"; repo = pname; rev = "v${version}"; - sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m"; + sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4="; }; - cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY="; + cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + OPENSSL_NO_VENDOR = 1; + meta = with lib; { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index 1d7d006f537a3..69236a690968f 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, python2Packages, openssh, rsync }: +{ lib, fetchFromGitHub, python3Packages, openssh, rsync }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pssh"; - version = "2.3.1"; + version = "2.3.4"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "pssh"; rev = "v${version}"; - sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; + hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg="; }; postPatch = '' @@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec { done ''; + # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126 + doCheck = false; + meta = with lib; { description = "Parallel SSH Tools"; longDescription = '' diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 46093f2c5b945..472c699a3d8c7 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; + hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index dfadd360ed3e6..cf9b26a5603ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,12 +89,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220428_${lib.substring 0 7 src.rev}"; + suffix = "pre20220503_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab"; - sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw="; + rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e"; + sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4="; }; }); }) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 57e420f866995..76b5f5216636c 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U="; + sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc="; + outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak="; doCheck = false; }; diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 2aadf1fb7b27d..1358d9f3198ef 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE="; + hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w="; + outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index be6514630f56a..9a3c03d6d2bc3 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 -, gcc, python3Packages, perl, perlPackages, makeWrapper +{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 +, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch }: with lib; @@ -8,11 +8,21 @@ stdenv.mkDerivation rec { pname = "john"; version = "1.9.0-jumbo-1"; - src = fetchurl { - url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz"; - sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; + src = fetchFromGitHub { + owner = "openwall"; + repo = pname; + rev = "1.9.0-Jumbo-1"; + sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs="; }; + patches = [ + (fetchpatch { + name = "fix-gcc-11-struct-allignment-incompatibility.patch"; + url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch"; + sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A="; + }) + ]; + postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! @@ -69,8 +79,8 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; - license = licenses.gpl2; - homepage = "https://github.com/magnumripper/JohnTheRipper/"; + license = licenses.gpl2Plus; + homepage = "https://github.com/openwall/john/"; maintainers = with maintainers; [ offline matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 98b297fe83185..20c172fc5017d 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r"; + sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59"; }; - cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs"; + cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 14e0be73f01ea..90485ae817ed3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.10"; + version = "0.4.7.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw="; + sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q="; }; outputs = [ "out" "geoip" ]; @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; - # cross compiles correctly but needs the following - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--disable-tool-name-check"; + configureFlags = + # cross compiles correctly but needs the following + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] + ++ + # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 09b7b31279940..0820869fb0d11 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: +{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: stdenv.mkDerivation rec { version = "1.6.9"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ libgcrypt readline libgpg-error ]; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) + [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ]; + doCheck = true; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 94cf34a7d2797..2ae688dc1b8f2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -324,6 +324,7 @@ mapAliases ({ double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 + dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07 @@ -1001,6 +1002,7 @@ mapAliases ({ pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19 ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 + pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 @@ -1311,6 +1313,7 @@ mapAliases ({ uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47d3dd1d701c5..b025c14caaa48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,6 +406,8 @@ with pkgs; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { }; + protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { }; + protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; @@ -2376,6 +2378,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pdepend = callPackage ../development/php-packages/pdepend/default.nix { }; + platformsh = callPackage ../misc/platformsh { }; inherd-quake = callPackage ../applications/misc/inherd-quake { @@ -2867,6 +2871,8 @@ with pkgs; python = python3; boost = boost.override { enablePython = true; python = python3; }; }; + calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; }); + calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {}; calendar-cli = callPackage ../tools/networking/calendar-cli { }; @@ -6828,6 +6834,9 @@ with pkgs; llvmPackages = llvmPackages_9; }; + harec = callPackage ../development/compilers/hare/harec.nix { }; + hare = callPackage ../development/compilers/hare/hare.nix { }; + ham = pkgs.perlPackages.ham; hardinfo = callPackage ../tools/system/hardinfo { }; @@ -7373,6 +7382,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + kdash = callPackage ../development/tools/kdash { }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; @@ -12692,7 +12703,7 @@ with pkgs; gcc_latest = gcc11; # Use the same GCC version as the one from stdenv by default - gfortran = wrapCC (gccStdenv.cc.cc.override { + gfortran = wrapCC (gcc.cc.override { name = "gfortran"; langFortran = true; langCC = false; @@ -14486,9 +14497,6 @@ with pkgs; inherit (ocamlPackages) reason; - pixie = callPackage ../development/interpreters/pixie { }; - dust = callPackage ../development/interpreters/pixie/dust.nix { }; - buildRubyGem = callPackage ../development/ruby-modules/gem { }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { inherit (darwin) DarwinTools cctools; @@ -22535,8 +22543,6 @@ with pkgs; check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { }; - uchiwa = callPackage ../servers/monitoring/uchiwa { }; - shishi = callPackage ../servers/shishi { pam = if stdenv.isLinux then pam else null; # see also openssl, which has/had this same trick @@ -26105,6 +26111,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + firewalld = callPackage ../applications/networking/firewalld { }; + + firewalld-gui = firewalld.override { withGui = true; }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -30332,6 +30342,8 @@ with pkgs; vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; + vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { }; + vocproc = callPackage ../applications/audio/vocproc { }; vnstat = callPackage ../applications/networking/vnstat { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 7665815d4125d..d553b624039e9 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -94,6 +94,21 @@ let ''; }; + showDerivationWarnings = mkOption { + type = types.listOf (types.enum [ "maintainerless" ]); + default = []; + description = '' + Which warnings to display for potentially dangerous + or deprecated values passed into `stdenv.mkDerivation`. + + A list of warnings can be found in + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix">/pkgs/stdenv/generic/check-meta.nix</link>. + + This is not a stable interface; warnings may be added, changed + or removed without prior notice. + ''; + }; + }; in { diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9544047355f49..9743acce4b6d8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -464,6 +464,8 @@ in { vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; + vmware = callPackage ../os-specific/linux/vmware { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a5d553ac629a0..3fa17b3585375 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -209,6 +209,8 @@ lib.makeScope pkgs.newScope (self: with self; { sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; }); + openswoole = callPackage ../development/php-packages/openswoole { }; + pdlib = callPackage ../development/php-packages/pdlib { }; pcov = callPackage ../development/php-packages/pcov { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9a54a773edc19..0dcb33f79658a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 net2grid = gridnet; # add 2022-04-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223fb..032349a2d49ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -106,6 +106,7 @@ in { inherit buildSetupcfg; inherit (callPackage ../development/interpreters/python/hooks { }) + sphinxHook condaInstallHook condaUnpackHook eggUnpackHook @@ -2839,6 +2840,8 @@ in { fastavro = callPackage ../development/python-modules/fastavro { }; + fastbencode = callPackage ../development/python-modules/fastbencode { }; + fastcache = callPackage ../development/python-modules/fastcache { }; fastcore = callPackage ../development/python-modules/fastcore { }; @@ -3139,6 +3142,14 @@ in { fonttools = callPackage ../development/python-modules/fonttools { }; + fontmake = callPackage ../development/python-modules/fontmake { }; + + skia-pathops = callPackage ../development/python-modules/skia-pathops { }; + + openstep-plist = callPackage ../development/python-modules/openstep-plist { }; + + glyphslib = callPackage ../development/python-modules/glyphslib { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; foolscap = callPackage ../development/python-modules/foolscap { }; @@ -3255,6 +3266,8 @@ in { gbinder-python = callPackage ../development/python-modules/gbinder-python { }; + gbulb = callPackage ../development/python-modules/gbulb { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; @@ -4944,7 +4957,7 @@ in { lomond = callPackage ../development/python-modules/lomond { }; - loo-py = callPackage ../development/python-modules/loo-py { }; + loopy = callPackage ../development/python-modules/loopy { }; losant-rest = callPackage ../development/python-modules/losant-rest { }; @@ -5611,6 +5624,11 @@ in { nextcord = callPackage ../development/python-modules/nextcord { }; + nftables = toPythonModule (pkgs.nftables.override { + python3 = python; + withPython = true; + }); + nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; |