Merge master into staging-next

maintainers/maintainer-list.nix

@@ -115,6 +115,12 @@
     githubId = 7414843;
     name = "Nicholas von Klitzing";
   };
+  _360ied = {
+    name = "Brian Zhu";
+    email = "therealbarryplayer@gmail.com";
+    github = "360ied";
+    githubId = 19516527;
+  };
   _13r0ck = {
     name = "Brock Szuszczewicz";
     email = "bnr@tuta.io";
@@ -6979,12 +6985,6 @@
       fingerprint = "8992 44FC D291 5CA2 0A97  802C 156C 88A5 B0A0 4B2A";
     }];
   };
-  kiyengar = {
-    email = "hello@kiyengar.net";
-    github = "karthikiyengar";
-    githubId = 8260207;
-    name = "Karthik Iyengar";
-  };
   kjeremy = {
     email = "kjeremy@gmail.com";
     name = "Jeremy Kolb";
@@ -13964,6 +13964,15 @@
     github = "wentasah";
     githubId = 140542;
   };
+  wesnel = {
+    name = "Wesley Nelson";
+    email = "wgn@wesnel.dev";
+    github = "wesnel";
+    githubId = 43357387;
+    keys = [{
+      fingerprint = "F844 80B2 0CA9 D6CC C7F5  2479 A776 D2AD 099E 8BC0";
+    }];
+  };
   wheelsandmetal = {
     email = "jakob@schmutz.co.uk";
     github = "wheelsandmetal";

nixos/modules/security/pam.nix

@@ -521,7 +521,7 @@ let
           # Modules in this block require having the password set in PAM_AUTHTOK.
           # pam_unix is marked as 'sufficient' on NixOS which means nothing will run
           # after it succeeds. Certain modules need to run after pam_unix
-          # prompts the user for password so we run it once with 'required' at an
+          # prompts the user for password so we run it once with 'optional' at an
           # earlier point and it will run again with 'sufficient' further down.
           # We use try_first_pass the second time to avoid prompting password twice
           (optionalString (cfg.unixAuth &&
@@ -534,7 +534,7 @@ let
               || cfg.duoSecurity.enable))
             (
               ''
-                auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth
+                auth optional pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth
               '' +
               optionalString config.security.pam.enableEcryptfs ''
                 auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap

nixos/modules/services/games/terraria.nix

@@ -131,6 +131,7 @@ in
   config = mkIf cfg.enable {
     users.users.terraria = {
       description = "Terraria server service user";
+      group       = "terraria";
       home        = cfg.dataDir;
       createHome  = true;
       uid         = config.ids.uids.terraria;
@@ -138,7 +139,6 @@ in
 
     users.groups.terraria = {
       gid = config.ids.gids.terraria;
-      members = [ "terraria" ];
     };
 
     systemd.services.terraria = {

nixos/modules/services/matrix/mautrix-facebook.nix

@@ -44,6 +44,12 @@ in {
             encryption = {
               allow = true;
               default = true;
+
+              verification_levels = {
+                receive = "cross-signed-tofu";
+                send = "cross-signed-tofu";
+                share = "cross-signed-tofu";
+              };
             };
             username_template = "facebook_{userid}";
           };
@@ -116,6 +122,8 @@ in {
   };
 
   config = mkIf cfg.enable {
+    users.groups.mautrix-facebook = {};
+
     users.users.mautrix-facebook = {
       group = "mautrix-facebook";
       isSystemUser = true;

pkgs/applications/audio/spotify-qt/default.nix

@@ -30,7 +30,7 @@ mkDerivation rec {
     description = "Lightweight unofficial Spotify client using Qt";
     homepage = "https://github.com/kraxarn/spotify-qt";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ kiyengar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
    };
 }

pkgs/applications/audio/transcribe/default.nix

@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "transcribe";
-  version = "9.10";
+  version = "9.21";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip
         {
-          url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.10.0.tar.gz";
+          url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.21.0.tar.gz";
-          sha256 = "sha256-6+P2qdjyvCzwrXYgw2yeG+hu8W5t6E0RCZx6Znkvj3g=";
+          sha256 = "sha256-M0hOJOsTTRxPef8rTO+/KpiP4lr8mtplS9KITaFOFPA=";
         }
     else throw "Platform not supported";
 

pkgs/applications/editors/featherpad/default.nix

@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "featherpad";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
     rev = "V${version}";
-    sha256 = "sha256-j8nfK162JmhQLWS1qN909jjxWpzhxE6JnO5uRwtw3c4=";
+    sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI=";
   };
 
   nativeBuildInputs = [ cmake pkg-config qttools ];

pkgs/applications/editors/vim/plugins/deprecated.json

@@ -1,6 +1,6 @@
 {
     "TrueZen-nvim": {
-        "date": "2022-08-20",
+        "date": "2022-08-21",
         "new": "true-zen-nvim"
     },
     "compe-tmux": {

pkgs/applications/editors/vim/plugins/generated.nix

@@ -449,12 +449,12 @@ final: prev:
 
   YouCompleteMe = buildVimPluginFrom2Nix {
     pname = "YouCompleteMe";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "535ff847abc4f2fb2a1570bfb9b6505a141286a2";
+      rev = "0dc8989e394ce02adb1c4a0d4a7981017e212996";
-      sha256 = "0ns5jz8nk8vxd1a18g0m2hf5iyhaqiyf2cxilyrlrhkfscjfj6ky";
+      sha256 = "0jqqd9v7d0d11cxnd97magilbm7g9g9a1f4mrzhvv37xsbys5g5w";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -1194,12 +1194,12 @@ final: prev:
 
   cmp-dap = buildVimPluginFrom2Nix {
     pname = "cmp-dap";
-    version = "2022-07-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "cmp-dap";
-      rev = "e21f0e5d188ee428f8acab1af21839af391607a4";
+      rev = "3310f7daec849ba708c1dd34e3d3bc721ca35511";
-      sha256 = "19lv7671imcdcxwz6yzn8lq2gm7jgh52mmr2xk1knq744d7dfld0";
+      sha256 = "0dhyglycl4wyhzsz3j93s36q1k1ssq9866xjl6vmamvjdq31szm3";
     };
     meta.homepage = "https://github.com/rcarriga/cmp-dap/";
   };
@@ -1506,12 +1506,12 @@ final: prev:
 
   cmp-tabnine = buildVimPluginFrom2Nix {
     pname = "cmp-tabnine";
-    version = "2022-08-18";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-tabnine";
-      rev = "cdfa2b1609e1e05e9cc56ffda1438b6dbe9fa791";
+      rev = "14e287b5b1434cef322de9cc1ec6fda13b913f45";
-      sha256 = "0y0pr8vq53hixwax5jdgwqamzxpdvr96lzjzmpv1jlkd7ghynj35";
+      sha256 = "1mvydmhwx240wpbvfmm8lrb2iny08sxz18zx9z8g9bvmhi4mp1ww";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
   };
@@ -1710,12 +1710,12 @@ final: prev:
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc.nvim";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "a2f7d232d7d5e05c3aecd47074c49bce625b5a0c";
+      rev = "95aebf40aaef562d501a3755043489c1d7445ff5";
-      sha256 = "1v11gs75sv2r4czixqn9nmv8wirziyasyynglyrxslywhjw4bscy";
+      sha256 = "1qmg4539a1f4d3xxckas6cidwd291l63mrjlcbac4cfvbghiwg1f";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1795,12 +1795,12 @@ final: prev:
 
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "350bf0cb47bfb2a48ddca79475888bc333c74a37";
+      rev = "ba5903b88c0a43fdc94abe79ade2b8291ff661ed";
-      sha256 = "0z9jn3rcnsmq91k8w508w7a18ps9g19lcrk0226dypqbscswwgl6";
+      sha256 = "091lck7kycmzzbrykkfmrk78jag3zx4075pfsr301pys15cai0wm";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
   };
@@ -1975,24 +1975,24 @@ final: prev:
 
   coq-artifacts = buildVimPluginFrom2Nix {
     pname = "coq.artifacts";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "fa7eb726e42611ec43696d7faaa88ac4337ab61d";
+      rev = "434dbd29be5df1523eea8429c0cd5cb58ffdaf02";
-      sha256 = "0dp8bfrmc09pd7cnlhjiz8587d66r2nrdfg4860k61lprk0pg42g";
+      sha256 = "1v9wx2w6a9vjrbpbqaszhb7mv9rq0s1zvl4m7sqy3gwi2yllcg0y";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
   };
 
   coq-thirdparty = buildVimPluginFrom2Nix {
     pname = "coq.thirdparty";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "5695d4c6cd23e45a953ad2a183cd880941675cbf";
+      rev = "4631f1c8a6e77f143a855310b2e1e8d244bff090";
-      sha256 = "1m6xmc7sl6w52rics1qkwhgj6cndvs3jy00i3whklg3yfc32dqv0";
+      sha256 = "06pf657wzj6kyr87q2j1ymf0cgz4iyw176n32ylndjhvxm58h66p";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2011,12 +2011,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "6cbd89e1270aa84d88843b702aa33e37529fa100";
+      rev = "809c6b33710a482476f3b7a154baa9d330149019";
-      sha256 = "0j16g15x57c3wsfav8rvcailgdj74mmy1rrad9sfi1f6fg0yynhq";
+      sha256 = "1xn9mfjmp37vm004hinz0gv5rsjll7d97yjaidkg8l3ckw87v0is";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2529,12 +2529,12 @@ final: prev:
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2022-08-19";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "c244577dd425072275eff925e87739820ac5e0aa";
+      rev = "04cdfafee557c84e01724de8c6a4f24d40f7414f";
-      sha256 = "0wh2ccsizkjb92pb5b00qf6rm1vx6a08p5bd7j0f8j1x6wlrpciw";
+      sha256 = "00jklla6983hrjjarafcfwrwhz7hcd9f68cf5315bks40g5v555j";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -2589,12 +2589,12 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2022-08-16";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "b2df9d53ebd796f6304966d4bd0740d41b160538";
+      rev = "621ba621d8e6b582dda3706a2913ca618fb4e0ae";
-      sha256 = "0bag2l66fgh4hk8la4dbipprdgicmyxxjakfb49m7fal54a9qjqj";
+      sha256 = "1kkw0wwi1sc2q9nk0lr7fcrjvvkmr6w3ryfzzknjj0rcdqiyxd0r";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -2675,12 +2675,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2022-08-19";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "b89036098577d6b1b31806e67697038f78c1769d";
+      rev = "866bf1a762dfd51a980f2deb9e7c6f23b4d984e3";
-      sha256 = "01xvpp8k92d7dm3wsq7w43grx6fv7ava95wb7z9fsa1axlpy6adb";
+      sha256 = "0fndgbav6mc0k2mxbzh91r897s9dzygsarxi2vl1c1yhy8m118cg";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -3300,12 +3300,12 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2022-08-16";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "5ffcbe2d00e2200ff50533d96e97f2da06ecd39e";
+      rev = "d07b6f72ee034070958a4fcc2d90f6c8036738da";
-      sha256 = "0nddblbxxsdagaal42z3rsayvx68g9963166l1m0660v7rfn3a91";
+      sha256 = "1jsarw2xlabismfqi2ydhvjk0cj4pxbdxmgviz51159fmayni3ff";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
@@ -3455,12 +3455,12 @@ final: prev:
 
   hotpot-nvim = buildVimPluginFrom2Nix {
     pname = "hotpot.nvim";
-    version = "2022-07-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "rktjmp";
       repo = "hotpot.nvim";
-      rev = "b942e8760ea26f6ff3782f675a8d6c1323f3e7d4";
+      rev = "64b64709f9fb25b7470012caa23f008b755e6284";
-      sha256 = "1xcrv6ih5jphzlim362k23nc6l306inya0272bjzql4asvgzzmhy";
+      sha256 = "18ylzmy1043f4hz71yabcbfq9j8b1sn4ginb9l5m1dg4d5s5fynp";
     };
     meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
   };
@@ -3744,12 +3744,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPluginFrom2Nix {
     pname = "kanagawa.nvim";
-    version = "2022-08-18";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "6ee96842cbfe3b7ebf7a1c3fa9602c2a3f5fdf38";
+      rev = "97b96c6d740161cb624ee8eae466b1e35782540e";
-      sha256 = "18j6v7apbp13zz1kziisj0rwvn1ysvrrsvmvc91w4a4vxzja9q3p";
+      sha256 = "1ml1k8dssyk7fbcasxy275izfsdmcsj0z60psr8vims15r95q42x";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -3828,12 +3828,12 @@ final: prev:
 
   lean-nvim = buildVimPluginFrom2Nix {
     pname = "lean.nvim";
-    version = "2022-08-15";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "be320485b450166054d65317662b48171e63f71e";
+      rev = "05ea0a99ed9bb0c835314c8cb17e0efac2f2ccfa";
-      sha256 = "1i4dflin65b0pw8f8gw02p0pcsh9mhy4rb7hargf43pyw34aysxl";
+      sha256 = "0maf2ya264plhxxgzpssvsxf2399ji215cvrzp7fdwqi9xsrrc6j";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -4259,12 +4259,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2022-08-18";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "faa525713e1244551877a4d89646a10f3c3fa31e";
+      rev = "a82d84ae5433cf2af16124123999bff91e8f9e47";
-      sha256 = "0ynd51j4wl9q49m9cm6lic87rbq4xcsfn1w8xw40ahm8wg813ahj";
+      sha256 = "0s5xf39ccmgb3awc3jias5hby6f2bp61d0jd5qiqjx55d5sz8j81";
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
   };
@@ -4727,12 +4727,12 @@ final: prev:
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2022-08-12";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "05386ff1e9da447d4688525d64f7611c863f05ca";
+      rev = "1843330963cc0299fd453145248681f3d33862b3";
-      sha256 = "1zarnnv3qh7gq3q5vd1r68vp6h26a1jbfqvg6hjwssb1ilaxzidb";
+      sha256 = "1a6jfpy94nymvx4452jqwc0g4q6s4f8709kzs3g6q8g2h6y00fk6";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -5507,12 +5507,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2022-08-09";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "da7461b596d70fa47b50bf3a7acfaef94c47727d";
+      rev = "589d38d3cf2e711cf848c12ed1d6ba38899a2f38";
-      sha256 = "1bahbla28qx4vzkdfbncws22qf0pr4kkra0df52sca245xzgl605";
+      sha256 = "0qlnwawg6q6fcwlxb383nfxh0f5krzx968h0533kvwpv1hg5558l";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -5675,12 +5675,12 @@ final: prev:
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "67fb8939ff1f7e29659f5c4efe50a5689e3458bc";
+      rev = "81a43bfe7227eb54f05a3b5c461339844bd1f0bc";
-      sha256 = "01zd9l6085d6d9jk8c0kxy15xs48rs4iv9hfxb6f1wjxi1mwnl8q";
+      sha256 = "176qm9q7zmcknhwzzj5x3w9p40arn1g49zssm9xsj5la6x56pwj2";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -5723,12 +5723,12 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2022-08-16";
+    version = "2022-08-20";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "4234c446d14370b3cd7604bd8e2e51ae2680f5ee";
+      rev = "ed60534707c99afc5ef5884fabd8bdada2c46527";
-      sha256 = "0ifa4l0l1pl268w4w3mwhbncxi5bd7n3yb0j3vikjhz567kwqfz2";
+      sha256 = "0wydxbr9kxcqzj1ksz4a5qdybs8654pybqzcgy59c6kbzi59j43n";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
@@ -5819,12 +5819,12 @@ final: prev:
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     pname = "nvimdev.nvim";
-    version = "2022-06-23";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "4c261a74ec44dc7ca62b0ceb5106f752208b24b3";
+      rev = "bfbc1f0988321a94c068fce87b0c2b06d3aa32f7";
-      sha256 = "18a0p52c70m8d624frpp8b9hvjrcf1kd1hgxism075mb5nm5rs3s";
+      sha256 = "12w66ckdk3q2c22055lwxivrbmkwc1q00sx1pijk0vrh3v88hhxw";
     };
     meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
   };
@@ -6758,12 +6758,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2022-08-16";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "003e5798eb7f16b35ab79d93279ba484b66fd353";
+      rev = "c6826d3cdf9307b111859e2bd4e71c81c3f1a2f7";
-      sha256 = "0gfz2rgyglaxrvq7d8mg2y3fqdvf87clyrrsvkc9ladccihfvg1w";
+      sha256 = "03z506algd2qz7nw2znwn205lb04xp2z1crj7f7dj2kxk25ir2gq";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -12467,12 +12467,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2022-08-15";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "5200d077bde1abc12f0b7f6ad6a133ec3b924670";
+      rev = "574d8fa39a3433c84a6b9a0dd134e36d18aa68f2";
-      sha256 = "0h4pn38k40mkz3h2ibnphnsm7w2pdsplqyw865l801ygz7vlpwbg";
+      sha256 = "16pc3m4ryrlay3j0fbncp7lr1zhalrzjrswrazkadr6bgiphb266";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -12480,12 +12480,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2022-08-17";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "5641242ea6d5eb30428f78eaa9591c78be351b66";
+      rev = "e5de00e2e7577fca3b39d533732de259c8a0abf6";
-      sha256 = "0w5q0h3pm32bndi4hw5gzsysl2mwv11fzyphxa1nk1mf37i1nqan";
+      sha256 = "12j7j04f3s8vc99v46yhqnbfj3s4jsbih9dxk8a3kzizmdvrcid5";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -12829,12 +12829,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2022-08-20";
+    version = "2022-08-21";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "088c764c45eb0186e0860dc3db6c4baaaae0adea";
+      rev = "e33857c1857feafe35ef735a4dd61d8e851d0b12";
-      sha256 = "039v6dl2sv3dl2cgg9im463zyp0w2aimq6qmsq5qk2mz7gvgj2xk";
+      sha256 = "106sbw7n6yrh8pgnrjdmd6ac93mqr0fyh4ndkm015phzyszw8xcd";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };

pkgs/applications/emulators/libdsk/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdsk";
-  version = "1.5.18";
+  version = "1.5.19";
 
   src = fetchurl {
     url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
-    sha256 = "sha256-43HUMQ35nwOwaQP8F1vO7zFccxHrQqJhZ6D5zzYhB5A=";
+    sha256 = "sha256-W8w5o9rK/yCipQnfn4gMOwDZ+9WeV3G53q5h2XlevkE=";
   };
 
   meta = with lib; {

pkgs/applications/graphics/cloudcompare/default.nix

@@ -23,13 +23,13 @@
 
 mkDerivation rec {
   pname = "cloudcompare";
-  version = "2.12.1";
+  version = "2.12.4";
 
   src = fetchFromGitHub {
     owner = "CloudCompare";
     repo = "CloudCompare";
     rev = "v${version}";
-    sha256 = "sha256-gX07Km+DNnsz5eDAC2RueMHjmIfQvgGnNOujZ/yM/vE=";
+    sha256 = "sha256-rQ9/vS/fyRWGBL4UGPNSeeNsDtnRHEp9NCViBtu/QEs=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/ddcui/default.nix

@@ -10,13 +10,13 @@
 
 mkDerivation rec {
   pname = "ddcui";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "rockowitz";
     repo = "ddcui";
     rev = "v${version}";
-    sha256 = "sha256-a8UGdVLi+i8hvWE3M5d92vnm3VryxRR56jXeBtB2PSk=";
+    sha256 = "sha256-P8dh6k8lht1/JNILzNZEyYD8loNoJjG5869K2Hl11z8=";
   };
 
   nativeBuildInputs = [

pkgs/applications/misc/fluidd/default.nix

@@ -2,12 +2,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "fluidd";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchurl {
     name = "fluidd-v${version}.zip";
     url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
-    sha256 = "sha256-KFWjpJ7nYAvEwaI1yeBV+Zvj+uaS2Myw1Szkb/2VZe4=";
+    sha256 = "sha256-ARBi+8IAheEJ5keyiDCub6Y83hT/dU/BajPChi3f1po=";
   };
 
   nativeBuildInputs = [ unzip ];

pkgs/applications/misc/unipicker/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard";
     homepage = "https://github.com/jeremija/unipicker";
     license = licenses.mit;
-    maintainers = with maintainers; [ kiyengar ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
    };
 }

pkgs/applications/networking/asn/default.nix

@@ -0,0 +1,47 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, curl
+, whois
+, bind
+, mtr
+, jq
+, ipcalc
+, grepcidr
+, nmap
+, aha
+}:
+
+stdenv.mkDerivation rec {
+  pname = "asn";
+  version = "0.72.1";
+
+  src = fetchFromGitHub {
+    owner = "nitefood";
+    repo = "asn";
+    rev = "v${version}";
+    sha256 = "sha256-2JGc1PhvmuZFT6c6UcxHKttHqWF+NsekqnYtdGKgU2U=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -Dv asn "$out/bin/asn"
+
+    wrapProgram $out/bin/asn \
+      --prefix PATH : "${lib.makeBinPath [ curl whois bind mtr jq ipcalc grepcidr nmap aha ]}"
+  '';
+
+  meta = {
+    description = "OSINT command line tool for investigating network data";
+    longDescription = ''
+      ASN / RPKI validity / BGP stats / IPv4v6 / Prefix / URL / ASPath / Organization /
+      IP reputation / IP geolocation / IP fingerprinting / Network recon /
+      lookup API server / Web traceroute server
+    '';
+    homepage = "https://github.com/nitefood/asn";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ devhell ];
+  };
+}

pkgs/applications/networking/feedreaders/tuifeed/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, fetchCrate
+, rustPlatform
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tuifeed";
+  version = "0.2.1";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-QMjMJVr+OI/5QQTwNVpUQdnYSWpWmZMuEcg5UgPpcAk=";
+  };
+
+  cargoHash = "sha256-NPrROFV2Yx4p4CocVMY2dPAlgcdZrZQfa779beLAbcI=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A terminal feed reader with a fancy UI";
+    homepage = "https://github.com/veeso/tuifeed";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ devhell ];
+  };
+}

pkgs/applications/networking/instant-messengers/fractal-next/default.nix

@@ -23,19 +23,19 @@
 
 stdenv.mkDerivation rec {
   pname = "fractal-next";
-  version = "unstable-2022-07-10";
+  version = "unstable-2022-07-21";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "fractal";
-    rev = "837b56978474fe512469805844b8ee234587499a";
+    rev = "d076bd24419ac6172c2c1a7cc023a5dca938ef07";
-    hash = "sha256-6op/+eiDra5EFRludpkQOucBXdPl5a/oQWPwwhJEx+M=";
+    hash = "sha256-2bS6PZuMbR/VgSpMD31sQR4ZkhWNu1CLSl6MX0f/m5A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-2mE26ES+fYSWdfMr8uTsX2VVGTNMDQ9MXEk5E/L95UI=";
+    hash = "sha256-CJD9YmL06ELR3X/gIrsVCpDyJnWPbH/JF4HlXvWjiZ8=";
   };
 
   nativeBuildInputs = [

pkgs/applications/office/banana-accounting/default.nix

@@ -0,0 +1,57 @@
+{ autoPatchelfHook
+, cairo
+, config
+, e2fsprogs
+, fetchurl
+, gmp
+, gtk3
+, libGL
+, libX11
+, lib
+, stdenv
+}:
+
+stdenv.mkDerivation {
+  pname = "banana-accounting";
+  version = "10.0.12";
+
+  srcs = fetchurl {
+    url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
+    hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw=";
+  };
+
+  sourceRoot = ".";
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  buildInputs = [
+    cairo
+    e2fsprogs
+    gmp
+    gtk3
+    stdenv.cc.cc.lib
+    libGL
+    libX11
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    mv ./* $out
+    ln -s $out/usr/bin/bananaplus $out/bin/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Accounting Software for small companies, associations and individuals";
+    homepage = "https://www.banana.ch/";
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ jacg ];
+  };
+}

pkgs/applications/science/biology/igv/default.nix

@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.13.2";
+  version = "2.14.0";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
-    sha256 = "sha256-S0EoZAqjElrM/bp1p69jLuclXeUzSIuH8VsgCO6F04U=";
+    sha256 = "sha256-CwS3I3xyjCHTvYik8YAN30UxM/djO6eEl/CRLMXDfxU=";
   };
 
   installPhase = ''

pkgs/applications/science/misc/fityk/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fityk";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "wojdyr";
     repo = "fityk";
     rev = "v${version}";
-    sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi";
+    sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/applications/search/recoll/default.nix

@@ -103,6 +103,6 @@ mkDerivation rec {
     homepage = "https://www.lesbonscomptes.com/recoll/";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ jcumming kiyengar ];
+    maintainers = with maintainers; [ jcumming ];
   };
 }

pkgs/applications/video/video-trimmer/default.nix

@@ -0,0 +1,93 @@
+{ stdenv
+, lib
+, fetchFromGitLab
+, rustPlatform
+, gnome
+, pkg-config
+, meson
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+, blueprint-compiler
+, ninja
+, python3
+, gtk3-x11
+, glib
+, gobject-introspection
+, gtk4
+, libadwaita
+, gst_all_1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "video-trimmer";
+  version = "0.7.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "YaLTeR";
+    repo = "video-trimmer";
+    rev = "v${version}";
+    sha256 = "sha256-D7wjJkdqqjjwwYEUZnNr7hFQK59wfTnaCLXCy+SK8Jo=";
+  };
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-cB5dVrEbISvHrOb87uVZSkT694VKtPtyk+c1tYNCTp0=";
+  };
+
+  patches = [
+    # The metainfo.xml file has a URL to a screenshot of the application,
+    # unaccessible in the build's sandbox. We don't need the screenshot, so
+    # it's best to remove it.
+    ./remove-screenshot-metainfo.diff
+  ];
+
+  postPatch = ''
+    patchShebangs \
+      build-aux/meson/postinstall.py \
+      build-aux/cargo.sh \
+      build-aux/dist-vendor.sh
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+    blueprint-compiler
+    ninja
+    # For post-install.py
+    python3
+    gtk3-x11 # For gtk-update-icon-cache
+    glib # For glib-compile-schemas
+  ] ++ (with rustPlatform; [
+    cargoSetupHook
+    rust.cargo
+    rust.rustc
+  ]);
+
+  buildInputs = [
+    gobject-introspection
+    gtk4
+    libadwaita
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+  ];
+
+  doCheck = true;
+
+  passthru.updateScript = gnome.updateScript {
+    packageName = pname;
+  };
+
+  meta = with lib; {
+    homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer";
+    description = "Trim videos quickly";
+    maintainers = with maintainers; [ doronbehar ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff

@@ -0,0 +1,17 @@
+diff --git i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
+index 9bd25b6..c627369 100644
+--- i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
++++ w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in
+@@ -19,12 +19,6 @@
+ 			Video Trimmer cuts out a fragment of a video given the start and end timestamps. The video is never re-encoded, so the process is very fast and does not reduce the video quality.
+ 		</p>
+ 	</description>
+-	<screenshots>
+-		<screenshot type="default">
+-			<image>https://gitlab.gnome.org/YaLTeR/video-trimmer/uploads/e840fa093439348448007197d07c8033/image.png</image>
+-			<caption>Main Window</caption>
+-		</screenshot>
+-	</screenshots>
+ 	<releases>
+ 		<release version="0.7.1" date="2022-03-23">
+ 			<description>

pkgs/development/libraries/pdal/2_3.nix

@@ -1,89 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, pkg-config
-, openscenegraph
-, curl
-, gdal
-, hdf5-cpp
-, LASzip
-, libe57format
-, libgeotiff
-, libxml2
-, postgresql
-, tiledb
-, xercesc
-, zlib
-, zstd
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pdal";
-  version = "2.3.0";
-
-  src = fetchFromGitHub {
-    owner = "PDAL";
-    repo = "PDAL";
-    rev = version;
-    sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc=";
-  };
-
-  patches = [
-    # fix build with GCC 11
-    (fetchpatch {
-      url = "https://github.com/PDAL/PDAL/commit/47e1eb2dc884d1b8c5caa8e3b48ef90f4f12c68d.patch";
-      hash = "sha256-Ls2LkVpbwQAMt2Iuq0zq9D9l2eyP8m1IO3poCnbxGDU=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    openscenegraph
-    curl
-    gdal
-    hdf5-cpp
-    LASzip
-    libe57format
-    libgeotiff
-    libxml2
-    postgresql
-    tiledb
-    xercesc
-    zlib
-    zstd
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_PLUGIN_E57=ON"
-    "-DBUILD_PLUGIN_HDF=ON"
-    "-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
-    "-DBUILD_PLUGIN_TILEDB=ON"
-
-    # Plugins can probably not be made work easily:
-    "-DBUILD_PLUGIN_CPD=OFF"
-    "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs
-    "-DBUILD_PLUGIN_GEOWAVE=OFF"
-    "-DBUILD_PLUGIN_I3S=OFF"
-    "-DBUILD_PLUGIN_ICEBRIDGE=OFF"
-    "-DBUILD_PLUGIN_MATLAB=OFF"
-    "-DBUILD_PLUGIN_MBIO=OFF"
-    "-DBUILD_PLUGIN_MRSID=OFF"
-    "-DBUILD_PLUGIN_NITF=OFF"
-    "-DBUILD_PLUGIN_OCI=OFF"
-    "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
-    "-DBUILD_PLUGIN_RIVLIB=OFF"
-  ];
-
-  meta = with lib; {
-    description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
-    homepage = "https://pdal.io";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nh2 ];
-    platforms = platforms.all;
-  };
-}

pkgs/development/python-modules/aioecowitt/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioecowitt";
-  version = "2022.08.2";
+  version = "2022.08.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-y0oPEsCW3jdd7jzBelCsUnrvDpzxP+Dtb/pQRrGTYDQ=";
+    hash = "sha256-rJcSw0umUVj7kPzc8tUidEWV91wkK19rFJY+Gi/NyH0=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/bluetooth-auto-recovery/default.nix

@@ -0,0 +1,55 @@
+{ lib
+, async-timeout
+, btsocket
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pyric
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "bluetooth-auto-recovery";
+  version = "0.2.2";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "Bluetooth-Devices";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Td7LT5C7ho/fIT2gnkPA0LLXHtzDjbYAopE4ECTfFKQ=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    async-timeout
+    btsocket
+    pyric
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" ""
+  '';
+
+  pythonImportsCheck = [
+    "bluetooth_auto_recovery"
+  ];
+
+  meta = with lib; {
+    description = "Library for recovering Bluetooth adapters";
+    homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/btsocket/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "btsocket";
+  version = "0.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ukBaz";
+    repo = "python-btsocket";
+    rev = "v${version}";
+    hash = "sha256-IqlbFYbEyJPlcmT3DIQIwsjQEAGeIGRtFNx4jWwNtjE=";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "btsocket"
+  ];
+
+  meta = with lib; {
+    description = "Library to interact with the Bluez Bluetooth Management API";
+    homepage = "https://github.com/ukBaz/python-btsocket";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/ghapi/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ghapi";
-  version = "1.0.0";
+  version = "1.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "ghapi";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-yFJ7Ek2kfFvkZwjrvvx3AXKFE4vRVsLYTSHfs+nr0Rg=";
+    sha256 = "sha256-BbgI9SS5NqYCbcT3F+jximVILF2LlyeQyEdR84L6JIc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/hass-nabucasa/default.nix

@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.54.1";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "sha256-usxyONJZQOfLWtfuGUOOHL/Js2ROo7nODqgw++LgTis=";
+    sha256 = "sha256-3r955nZu/nNHnFQJy8bSswtd4N0JxGZA8RLU0CXZT7o=";
   };
 
   postPatch = ''

pkgs/development/python-modules/ipyparallel/default.nix

@@ -1,45 +1,66 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, nose
-, python-dateutil
-, ipython_genutils
 , decorator
-, pyzmq
+, entrypoints
-, ipython
+, fetchPypi
-, jupyter-client
+, hatchling
 , ipykernel
+, ipython
+, ipython_genutils
+, jupyter-client
 , packaging
 , psutil
+, python-dateutil
+, pythonOlder
+, pyzmq
 , tornado
 , tqdm
-, isPy3k
+, traitlets
-, futures ? null
 }:
 
 buildPythonPackage rec {
   pname = "ipyparallel";
   version = "8.4.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Zwu+BXVTgXQuHqARd9xCj/jz6Urx8NVkLJ0Z83yoKJs=";
+    hash = "sha256-Zwu+BXVTgXQuHqARd9xCj/jz6Urx8NVkLJ0Z83yoKJs=";
   };
 
-  buildInputs = [ nose ];
+  nativeBuildInputs = [
+    hatchling
+  ];
 
-  propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm
+  propagatedBuildInputs = [
-  ] ++ lib.optionals (!isPy3k) [ futures ];
+    decorator
+    entrypoints
+    ipykernel
+    ipython
+    ipython_genutils
+    jupyter-client
+    packaging
+    psutil
+    python-dateutil
+    pyzmq
+    tornado
+    tqdm
+    traitlets
+  ];
 
   # Requires access to cluster
   doCheck = false;
 
-  disabled = !isPy3k;
+  pythonImportsCheck = [
+    "ipyparallel"
+  ];
 
-  meta = {
+  meta = with lib;{
     description = "Interactive Parallel Computing with IPython";
-    homepage = "http://ipython.org/";
+    homepage = "https://ipyparallel.readthedocs.io/";
-    license = lib.licenses.bsd3;
+    license = licenses.bsd3;
-    maintainers = with lib.maintainers; [ fridh ];
+    maintainers = with maintainers; [ fridh ];
   };
 }

pkgs/development/python-modules/napari-npe2/default.nix

@@ -1,25 +1,27 @@
 { lib
+, appdirs
+, build
 , buildPythonPackage
 , fetchFromGitHub
-, appdirs
-, pyyaml
-, pytomlpp
-, pydantic
 , magicgui
-, typer
-, setuptools-scm
 , napari # reverse dependency, for tests
+, psygnal
+, pydantic
+, pythonOlder
+, pytomlpp
+, pyyaml
+, rich
+, setuptools-scm
+, typer
 }:
 
-let
+buildPythonPackage rec {
   pname = "napari-npe2";
   version = "0.5.1";
-in
-buildPythonPackage {
-  inherit pname version;
-
   format = "pyproject";
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "napari";
     repo = "npe2";
@@ -34,19 +36,26 @@ buildPythonPackage {
     # but then setuptools refuses to acknowledge it when building napari
     setuptools-scm
   ];
+
   propagatedBuildInputs = [
     appdirs
-    pyyaml
+    build
-    pytomlpp
-    pydantic
     magicgui
+    pydantic
+    pytomlpp
+    pyyaml
+    rich
     typer
   ];
 
+  pythonImportsCheck = [
+    "npe2"
+  ];
+
   passthru.tests = { inherit napari; };
 
   meta = with lib; {
-    description = "Yet another plugin system for napari (the image visualizer)";
+    description = "Plugin system for napari (the image visualizer)";
     homepage = "https://github.com/napari/npe2";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SomeoneSerge ];

pkgs/development/python-modules/napari/default.nix

@@ -1,42 +1,50 @@
 { lib
 , mkDerivationWith
+, appdirs
 , buildPythonPackage
+, cachey
+, dask
+, docstring-parser
 , fetchFromGitHub
+, imageio
+, jsonschema
+, magicgui
+, napari-console
+, napari-npe2
+, napari-svg
+, numpydoc
+, pint
+, psutil
+, pydantic
+, pyopengl
+, pillow
+, pythonOlder
+, pyyaml
+, scikitimage
+, scipy
 , setuptools-scm
 , superqt
-, typing-extensions
 , tifffile
-, napari-npe2
+, toolz
-, pint
-, pyyaml
-, numpydoc
-, dask
-, magicgui
-, docstring-parser
-, appdirs
-, imageio
-, pyopengl
-, cachey
-, napari-svg
-, psutil
-, napari-console
-, wrapt
-, pydantic
 , tqdm
-, jsonschema
+, typing-extensions
-, scipy
+, vispy
 , wrapQtAppsHook
-}: mkDerivationWith buildPythonPackage rec {
+, wrapt
+}:
+
+mkDerivationWith buildPythonPackage rec {
   pname = "napari";
   version = "0.4.16";
-
   format = "pyproject";
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "napari";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw=";
+    hash = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -45,38 +53,50 @@
     setuptools-scm
     wrapQtAppsHook
   ];
+
   propagatedBuildInputs = [
-    napari-npe2
-    cachey
-    napari-svg
-    napari-console
-    superqt
-    magicgui
-    typing-extensions
-    tifffile
-    pint
-    pyyaml
-    numpydoc
-    dask
-    docstring-parser
     appdirs
+    cachey
+    dask.optional-dependencies.array
+    docstring-parser
     imageio
-    pyopengl
-    psutil
-    wrapt
-    pydantic
-    tqdm
     jsonschema
+    magicgui
+    napari-console
+    napari-npe2
+    napari-svg
+    numpydoc
+    pint
+    pillow
+    psutil
+    pydantic
+    pyopengl
+    pyyaml
+    scikitimage
     scipy
+    superqt
+    tifffile
+    toolz
+    tqdm
+    typing-extensions
+    vispy
+    wrapt
   ];
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "scikit-image>=0.19.1" "scikit-image" \
+      --replace "vispy>=0.10.0,<0.11" "vispy"
+  '';
+
   dontUseSetuptoolsCheck = true;
+
   postFixup = ''
     wrapQtApp $out/bin/napari
   '';
 
   meta = with lib; {
-    description = "A fast, interactive, multi-dimensional image viewer for python";
+    description = "A fast, interactive, multi-dimensional image viewer";
     homepage = "https://github.com/napari/napari";
     license = licenses.bsd3;
     maintainers = with maintainers; [ SomeoneSerge ];

pkgs/development/python-modules/nbconvert/default.nix

@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "nbconvert";
-  version = "6.5.0";
+  version = "6.5.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";
+    hash = "sha256-EO1pPEz9PGNYPIfKXDovbth0FFEDWV84JO/Mjfy3Uiw=";
   };
 
   # Add $out/share/jupyter to the list of paths that are used to search for

pkgs/development/python-modules/pycognito/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pycognito";
-  version = "2022.05.0";
+  version = "2022.08.0";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-KPZcfTFZCPV/3tQHOGA99uAyYPkvusCwZrefKwEMAOo=";
+    sha256 = "sha256-A80iYF2zwM2YkhnwJMU/bZezsCzs389ro1fikG8vXSA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pydroid-ipcam/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pydroid-ipcam";
-  version = "1.3.1";
+  version = "2.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1";
+    rev = "refs/tags/${version}";
-    hash = "sha256-ekgYzTf8it94OYVGcJhEzVFv+9tCrdfLgyco7wq9AXE=";
+    hash = "sha256-toY3eVJdB5rbRuwkXMizpQUxUTo4Y1tWKFCZZuiYaGI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyotgw/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyotgw";
-  version = "2.0.2";
+  version = "2.0.3";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "mvn23";
     repo = pname;
     rev = version;
-    hash = "sha256-lmhFQ1HhRuiS++NsELA53YafrJ9uX2UDBQ9Kgyq0N0o=";
+    hash = "sha256-5iP+EnDrKYQN5N4EvPeWipjkJNweCvi2QBnvwF22gUY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyric/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pyric";
+  version = "0.1.6.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    pname = "PyRIC";
+    inherit version;
+    hash = "sha256-tTmwHK/r0kBsAAl/lFJeoPjs0d2S93MfQ+rA7xbCzMk=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "__version__ = '0.0.3'" "__version__ = '${version}'"
+  '';
+
+  # Tests are outdated
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pyric"
+  ];
+
+  meta = with lib; {
+    description = "Python Radio Interface Controller";
+    homepage = "https://github.com/wraith-wireless/PyRIC";
+    license = with licenses; [ gpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/pytorch-pfn-extras/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pytorch-pfn-extras";
-  version = "0.5.8";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "pfnet";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-ApXDO7VMnExYfh5nfiIaxdbvPjR7dWRAkxh3+0KxWnM=";
+    sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk=";
   };
 
   propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];

pkgs/development/python-modules/qingping-ble/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "qingping-ble";
-  version = "0.2.4";
+  version = "0.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bluetooth-devices";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ggIRUW7JC7vgdwd42aw73T2+fNaSYRlg20CxwwwcE/U=";
+    hash = "sha256-EZH6G/dvXU1sVH3pYoJeQQkJD1xMKuqb3omCVhHTS0A=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/rq/default.nix

@@ -1,29 +1,42 @@
-{ lib, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, click
+, redis
+}:
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "1.10.1";
+  version = "1.11";
-  disabled = isPy27;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "1f4fi1rvn97d2b524q45k6s10b007pr23k0mf44q7hy8q4vnjmh5";
+    hash = "sha256-fv+b5WmODaQkd8T+O8MuJ+XVC3dQ5hZwxMHtBBuqQ7Y=";
   };
 
-  # test require a running redis rerver, which is something we can't do yet
+  propagatedBuildInputs = [
+    click
+    redis
+  ];
+
+  # Tests require a running Redis rerver
   doCheck = false;
 
-  pythonImportsCheck = [ "rq" ];
+  pythonImportsCheck = [
-
+    "rq"
-  propagatedBuildInputs = [ click redis ];
+  ];
 
   meta = with lib; {
-    description = "A simple, lightweight library for creating background jobs, and processing them";
+    description = "Library for creating background jobs and processing them";
     homepage = "https://github.com/nvie/rq/";
-    maintainers = with maintainers; [ mrmebelman ];
     license = licenses.bsd2;
+    maintainers = with maintainers; [ mrmebelman ];
   };
 }
 

pkgs/development/python-modules/sumo/default.nix

@@ -13,11 +13,12 @@
 , spglib
 , castepxbin
 , pytestCheckHook
+, colormath
 }:
 
 buildPythonPackage rec {
   pname = "sumo";
-  version = "2.3.2";
+  version = "2.3.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -26,39 +27,37 @@ buildPythonPackage rec {
     owner = "SMTG-UCL";
     repo = "sumo";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-hY1rQG4s5j/lVvu5e+5e+GamKrYpviqxaWmq1qB6ejU=";
+    sha256 = "sha256-XEs4lLbVwN00UDnDC0kUNlut9RFXPfcyevBA1f1UqSU=";
   };
 
+  postPatch = ''
+    # Loosen castepxbin dependency version pinning
+    # https://github.com/SMTG-UCL/sumo/issues/173
+    substituteInPlace setup.py \
+      --replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
+  '';
+
   nativeBuildInputs = [
     cython
   ];
 
   propagatedBuildInputs = [
-    spglib
-    numpy
-    scipy
-    h5py
-    pymatgen
-    phonopy
-    matplotlib
-    seekpath
     castepxbin
+    colormath
+    h5py
+    matplotlib
+    numpy
+    phonopy
+    pymatgen
+    scipy
+    seekpath
+    spglib
   ];
 
   checkInputs = [
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # slight disagreement between caastepxbin versions
-    "test_castep_phonon_read_bands"
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
-  '';
-
   pythonImportsCheck = [
     "sumo"
   ];

pkgs/development/tools/riot-redis/default.nix

@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchzip
+, jre_headless
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  pname = "riot-redis";
+  version = "2.17.0";
+
+  src = fetchzip {
+    url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip";
+    sha256 = "sha256-Blhjss0ypHzdd3XTRzzHnIPg8+m1ke7a+8VuBB6oA/0=";
+  };
+
+  buildInputs = [ jre_headless ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp bin/riot-redis $out/bin
+    cp -R lib $out
+    chmod +x $out/bin/*
+
+    wrapProgram $out/bin/riot-redis \
+      --set JAVA_HOME "${jre_headless}"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/redis-developer/riot";
+    description = "Get data in and out of Redis";
+    license = licenses.asl20;
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    maintainers = with maintainers; [ wesnel ];
+  };
+}

pkgs/misc/uboot/default.nix

@@ -1,15 +1,18 @@
 { stdenv
 , lib
-, fetchurl
-, fetchpatch
-, fetchFromGitHub
 , bc
 , bison
 , dtc
+, fetchFromGitHub
+, fetchpatch
+, fetchurl
 , flex
+, gnutls
+, libuuid
+, meson-tools
+, ncurses
 , openssl
 , swig
-, meson-tools
 , which
 , armTrustedFirmwareAllwinner
 , armTrustedFirmwareAllwinnerH616
@@ -71,6 +74,12 @@ let
     ];
     depsBuildBuild = [ buildPackages.stdenv.cc ];
 
+    buildInputs = [
+      ncurses # tools/kwboot
+      libuuid # tools/mkeficapsule
+      gnutls # tools/mkeficapsule
+    ];
+
     hardeningDisable = [ "all" ];
 
     enableParallelBuilding = true;

pkgs/tools/admin/daemontools/default.nix

@@ -1,5 +1,11 @@
-{ fetchurl, bash, glibc, lib, stdenv }:
+{ fetchurl, bash, glibc, lib, stdenv, installShellFiles }:
 
+let
+  man-pages = fetchurl {
+    url = "https://salsa.debian.org/debian/daemontools/-/archive/debian/1%250.76-8/daemontools-debian-1%250.76-8.tar.gz?path=debian/daemontools-man";
+    sha256 = "sha256-om5r1ddUx1uObp9LR+SwCLLtm+rRuLoq28OLbhWhdzU=";
+  };
+in
 stdenv.mkDerivation rec {
   pname = "daemontools";
   version = "0.76";
@@ -11,6 +17,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-nix-usernamespace-build.patch ];
 
+  outputs = [ "out" "man" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
   configurePhase = ''
     cd daemontools-${version}
 
@@ -32,8 +42,15 @@ stdenv.mkDerivation rec {
     for cmd in $(cat package/commands); do
       install -Dm755 "command/$cmd" "$out/bin/$cmd"
     done
+
+    tar -xz --strip-components=2 -f ${man-pages}
+    installManPage daemontools-man/*.8
+    install -v -Dm644 daemontools-man/README $man/share/doc/daemontools/README.man
   '';
 
+  # Keep README.man in the man output (see _multioutDocs())
+  outputDoc = "man";
+
   meta = {
     license = lib.licenses.publicDomain;
     homepage = "https://cr.yp.to/daemontools.html";

pkgs/tools/compression/plzip/default.nix

@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchurl, lzip, lzlib, texinfo }:
+
+stdenv.mkDerivation rec {
+  pname = "plzip";
+  version = "1.10";
+  outputs = [ "out" "man" "info" ];
+
+  src = fetchurl {
+    url = "mirror://savannah/lzip/plzip/plzip-${version}.tar.lz";
+    sha256 = "62f16a67be0dabf0da7fd1cb7889fe5bfae3140cea6cafa1c39e7e35a5b3c661";
+  };
+
+  nativeBuildInputs = [ lzip texinfo ];
+  buildInputs = [ lzlib ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = "https://www.nongnu.org/lzip/plzip.html";
+    description = "A massively parallel lossless data compressor based on the lzlib compression library";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ _360ied ];
+  };
+}

pkgs/tools/filesystems/squashfuse/default.nix

@@ -6,13 +6,13 @@ with lib;
 stdenv.mkDerivation rec {
 
   pname = "squashfuse";
-  version = "0.1.103";
+  version = "0.1.105";
 
   src = fetchFromGitHub {
     owner = "vasi";
     repo = pname;
-    rev = "540204955134eee44201d50132a5f66a246bcfaf";
+    rev = version;
-    sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6";
+    sha256 = "sha256-RIhDXzpmrYUOwj5OYzjWKJw0cwE+L3t/9pIkg/hFXA0=";
   };
 
   nativeBuildInputs = [ autoreconfHook libtool pkg-config ];

pkgs/tools/filesystems/tar2ext4/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tar2ext4";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "hcsshim";
     rev = "v${version}";
-    sha256 = "sha256-Qa93MpTAMCA7vn7LefILDdAKYyRDPPq0vBwmIfegyuU=";
+    sha256 = "sha256-P2ri+9MDV6ObyAiqUguifjqkPg+8zE+Ha6jgFS5aCsQ=";
   };
 
   sourceRoot = "source/cmd/tar2ext4";

pkgs/tools/inputmethods/libinput-gestures/default.nix

@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libinput-gestures";
-  version = "2.72";
+  version = "2.73";
 
   src = fetchFromGitHub {
     owner = "bulletmark";
     repo = "libinput-gestures";
     rev = version;
-    sha256 = "sha256-si94aKyiJtRwg+JS0PazqRjGrA/zUwN8CCIKI5KLJNw=";
+    sha256 = "sha256-dtCe3//BMC+FG50qyxVz0ni6nmAPYMPOv13VQTxhls4=";
   };
   patches = [
     ./0001-hardcode-name.patch

pkgs/tools/networking/openvpn3/default.nix

@@ -4,7 +4,6 @@
 , asio
 , autoconf-archive
 , autoreconfHook
-, fetchpatch
 , glib
 , gtest
 , jsoncpp
@@ -24,31 +23,22 @@ let
   openvpn3-core = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3";
-    rev = "7765540e581c48721752bcad0b3d74b8397b1f73";
+    rev = "c4fa5a69c5d2e4ba4a86e79da8de0fc95f95edc3";
-    sha256 = "sha256-v/suF/tWfuukQO1wFiHRzC7ZW+3Gh1tav6qj0uYUP4E=";
+    sha256 = "sha256-VhQkx35JKNqXKgg4i+/aJYIg3iXPGlC57wDrjDpvTyE=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "openvpn3";
   # also update openvpn3-core
-  version = "17_beta";
+  version = "18_beta";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3-linux";
     rev = "v${version}";
-    sha256 = "sha256-ITSnC105YNYFW1M2bOASFemPZAh+HETIzX2ofABWTho=";
+    sha256 = "sha256-4TKRnHjEm6QRE2artAa0t1VC+0XPgz3VpCfQS8tnrFQ=";
   };
 
-  patches = [
-    # remove when v18_beta hits
-    (fetchpatch {
-      name = "dont-hardcode-gio.patch";
-      url = "https://github.com/OpenVPN/openvpn3-linux/commit/f7d6d3ae1d52b18b398d3d3b6e21c720c98d0e89.patch";
-      sha256 = "sha256-Bo5uaHadMTDROpwM7Y5aXhCoGUrsAAkSxeXLLhvOeEg=";
-    })
-  ];
-
   postPatch = ''
     rm -r ./vendor/googletest
     cp -r ${gtest.src} ./vendor/googletest

pkgs/tools/system/s-tui/default.nix

@@ -8,11 +8,11 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "s-tui";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "sha256-t3h8d0yc7i3UvO8CVfBd3/3h3RfGN6yE6hutymOZUdA=";
+    sha256 = "sha256-soVrmzlVy0zrqvOclR7SfPphp4xAEHv+xdr0NN19ye0=";
   };
 
   propagatedBuildInputs = with python3Packages; [

pkgs/top-level/all-packages.nix

@@ -240,6 +240,8 @@ with pkgs;
 
   aeskeyfind = callPackage ../tools/security/aeskeyfind { };
 
+  asn = callPackage ../applications/networking/asn { };
+
   astrolog = callPackage ../applications/science/astronomy/astrolog { };
 
   atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
@@ -278,6 +280,8 @@ with pkgs;
 
   bada-bib = callPackage ../applications/science/misc/bada-bib {};
 
+  banana-accounting = callPackage ../applications/office/banana-accounting {};
+
   bakelite = callPackage ../tools/backup/bakelite { };
 
   benthos = callPackage ../development/tools/benthos {};
@@ -512,6 +516,8 @@ with pkgs;
 
   resolve-march-native = callPackage ../development/tools/resolve-march-native { };
 
+  riot-redis = callPackage ../development/tools/riot-redis { };
+
   ptouch-print = callPackage ../misc/ptouch-print { };
 
   demoit = callPackage ../servers/demoit { };
@@ -8579,6 +8585,8 @@ with pkgs;
 
   lzip = callPackage ../tools/compression/lzip { };
 
+  plzip = callPackage ../tools/compression/plzip { };
+
   lziprecover = callPackage ../tools/compression/lziprecover { };
 
   luxcorerender = callPackage ../tools/graphics/luxcorerender {
@@ -11599,6 +11607,10 @@ with pkgs;
 
   tuir = callPackage ../applications/misc/tuir { };
 
+  tuifeed = callPackage ../applications/networking/feedreaders/tuifeed {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   tunnelto = callPackage ../tools/networking/tunnelto {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -11789,6 +11801,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  video-trimmer = callPackage ../applications/video/video-trimmer { };
+
   via = callPackage ../tools/misc/via {};
 
   vial = callPackage ../tools/misc/vial {};
@@ -15798,9 +15812,7 @@ with pkgs;
 
   cloud-nuke = callPackage ../development/tools/cloud-nuke { };
 
-  cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {
+  cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
-    pdal = pdal_2_3;
-  };
 
   cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };
 
@@ -20738,8 +20750,6 @@ with pkgs;
 
   pdal = callPackage ../development/libraries/pdal { } ;
 
-  pdal_2_3 = callPackage ../development/libraries/pdal/2_3.nix { } ;
-
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
   pe-parse = callPackage ../development/libraries/pe-parse { };
@@ -27535,6 +27545,16 @@ with pkgs;
 
   fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
+    libadwaita = libadwaita.overrideAttrs (finalAtts: rec {
+      version = "1.2.alpha";
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "GNOME";
+        repo = "libadwaita";
+        rev = version;
+        hash = "sha256-JMxUeIOUPp9k5pImQqWLVkQ2GHaKvopvg6ol9pvA+Bk=";
+      };
+    });
   };
 
   fragments = callPackage ../applications/networking/p2p/fragments { };

pkgs/top-level/python-packages.nix

@@ -1404,6 +1404,8 @@ in {
 
   bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { };
 
+  bluetooth-auto-recovery = callPackage ../development/python-modules/bluetooth-auto-recovery { };
+
   bluetooth-data-tools= callPackage ../development/python-modules/bluetooth-data-tools { };
 
   bluetooth-sensor-state-data = callPackage ../development/python-modules/bluetooth-sensor-state-data { };
@@ -1517,6 +1519,8 @@ in {
 
   btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; });
 
+  btsocket = callPackage ../development/python-modules/btsocket { };
+
   bucketstore = callPackage ../development/python-modules/bucketstore { };
 
   bugsnag = callPackage ../development/python-modules/bugsnag { };
@@ -8229,6 +8233,8 @@ in {
 
   pyres = callPackage ../development/python-modules/pyres { };
 
+  pyric = callPackage ../development/python-modules/pyric { };
+
   pyrisco = callPackage ../development/python-modules/pyrisco { };
 
   pyrituals = callPackage ../development/python-modules/pyrituals { };