Merge staging-next into staging

doc/contributing/coding-conventions.chapter.md

@@ -454,7 +454,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these
     owner = "NixOS";
     repo = "nix";
     rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
-    hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=;
+    hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";
   }
   ```
 

maintainers/maintainer-list.nix

@@ -5005,6 +5005,13 @@
     keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25  ACA9 C7A7 4616 F302 5DF4"; }];
     matrix = "@felipeqq2:pub.solar";
   };
+  felixalbrigtsen = {
+    email = "felixalbrigtsen@gmail.com";
+    github = "felixalbrigtsen";
+    githubId = 64613093;
+    name = "Felix Albrigtsen";
+    matrix = "@felixalb:pvv.ntnu.no";
+  };
   felixscheinost = {
     name = "Felix Scheinost";
     email = "felix.scheinost@posteo.de";

nixos/modules/services/backup/borgbackup.nix

@@ -66,6 +66,7 @@ let
       ${mkKeepArgs cfg} \
       ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \
       $extraPruneArgs
+    borg compact $extraArgs $extraCompactArgs
     ${cfg.postPrune}
   '');
 
@@ -638,6 +639,15 @@ in {
             example = "--save-space";
           };
 
+          extraCompactArgs = mkOption {
+            type = types.str;
+            description = lib.mdDoc ''
+              Additional arguments for {command}`borg compact`.
+              Can also be set at runtime using `$extraCompactArgs`.
+            '';
+            default = "";
+            example = "--cleanup-commits";
+          };
         };
       }
     ));

nixos/modules/services/continuous-integration/buildbot/master.nix

@@ -8,7 +8,8 @@ let
   cfg = config.services.buildbot-master;
   opt = options.services.buildbot-master;
 
-  python = cfg.package.pythonModule;
+  package = pkgs.python3.pkgs.toPythonModule cfg.package;
+  python = package.pythonModule;
 
   escapeStr = escape [ "'" ];
 
@@ -212,10 +213,10 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.python3Packages.buildbot-full;
-        defaultText = literalExpression "pkgs.python3Packages.buildbot-full";
+        default = pkgs.buildbot-full;
+        defaultText = literalExpression "pkgs.buildbot-full";
         description = lib.mdDoc "Package to use for buildbot.";
-        example = literalExpression "pkgs.python3Packages.buildbot";
+        example = literalExpression "pkgs.buildbot";
       };
 
       packages = mkOption {
@@ -255,7 +256,7 @@ in {
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       path = cfg.packages ++ cfg.pythonPackages python.pkgs;
-      environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}";
+      environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ package ])}/${python.sitePackages}";
 
       preStart = ''
         mkdir -vp "${cfg.buildbotDir}"

nixos/modules/services/continuous-integration/buildbot/worker.nix

@@ -8,7 +8,8 @@ let
   cfg = config.services.buildbot-worker;
   opt = options.services.buildbot-worker;
 
-  python = cfg.package.pythonModule;
+  package = pkgs.python3.pkgs.toPythonModule cfg.package;
+  python = package.pythonModule;
 
   tacFile = pkgs.writeText "aur-buildbot-worker.tac" ''
     import os
@@ -129,7 +130,7 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.python3Packages.buildbot-worker;
+        default = pkgs.buildbot-worker;
         defaultText = literalExpression "pkgs.python3Packages.buildbot-worker";
         description = lib.mdDoc "Package to use for buildbot worker.";
         example = literalExpression "pkgs.python2Packages.buildbot-worker";
@@ -168,7 +169,7 @@ in {
       after = [ "network.target" "buildbot-master.service" ];
       wantedBy = [ "multi-user.target" ];
       path = cfg.packages;
-      environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}";
+      environment.PYTHONPATH = "${python.withPackages (p: [ package ])}/${python.sitePackages}";
 
       preStart = ''
         mkdir -vp "${cfg.buildbotDir}/info"

nixos/modules/services/networking/dhcpd.nix

@@ -218,6 +218,13 @@ in
 
     systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6;
 
+    warnings = [
+      ''
+        The dhcpd4 and dhcpd6 modules will be removed from NixOS 23.11, because ISC DHCP reached its end of life.
+        See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
+        Please switch to a different implementation like kea, systemd-networkd or dnsmasq.
+      ''
+    ];
   };
 
 }

nixos/tests/buildbot.nix

@@ -23,7 +23,7 @@ import ./make-test-python.nix {
         ];
       };
       networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
-      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ];
+      environment.systemPackages = with pkgs; [ git buildbot-full ];
     };
 
     bbworker = { pkgs, ... }: {
@@ -31,7 +31,7 @@ import ./make-test-python.nix {
         enable = true;
         masterUrl = "bbmaster:9989";
       };
-      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ];
+      environment.systemPackages = with pkgs; [ git buildbot-worker ];
     };
 
     gitrepo = { pkgs, ... }: {

pkgs/applications/blockchains/stellar-core/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stellar-core";
-  version = "19.8.0";
+  version = "19.9.0";
 
   src = fetchFromGitHub {
     owner = "stellar";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-OaJztBOl5rDiCq+s1sXwuX+Yh+LSJtcnGIQeuMANLdU=";
+    sha256 = "sha256-00bTqc3YDl/o03Y7NBsgGFwUzb2zYe/A3ccpHPIann8=";
     fetchSubmodules = true;
   };
 

pkgs/applications/editors/neovim/default.nix

@@ -35,13 +35,13 @@ let
 in
   stdenv.mkDerivation rec {
     pname = "neovim-unwrapped";
-    version = "0.8.3";
+    version = "0.9.0";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      hash = "sha256-ItJ8aX/WUfcAovxRsXXyWKBAI92hFloYIZiv7viPIdQ=";
+      hash = "sha256-4uCPWnjSMU7ac6Q3LT+Em8lVk1MuSegxHMLGQRtFqAs=";
     };
 
     patches = [
@@ -49,13 +49,6 @@ in
       # necessary so that nix can handle `UpdateRemotePlugins` for the plugins
       # it installs. See https://github.com/neovim/neovim/issues/9413.
       ./system_rplugin_manifest.patch
-      # make the build reproducible, rebased version of
-      # https://github.com/neovim/neovim/pull/21586
-      (fetchpatch {
-        name = "neovim-build-make-generated-source-files-reproducible.patch";
-        url = "https://github.com/raboof/neovim/commit/485dd2af3efbfd174163583c46e0bb2a01ff04f1.patch";
-        hash = "sha256-9aRVK4lDkL/W4RVjeKptrZFY7rYYBx6/RGR4bQSbCsM=";
-      })
     ];
 
     dontFixCmake = true;

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

@@ -852,18 +852,18 @@ self: super: {
 
   sniprun =
     let
-      version = "1.2.13";
+      version = "1.3.0";
       src = fetchFromGitHub {
         owner = "michaelb";
         repo = "sniprun";
         rev = "v${version}";
-        hash = "sha256-VDLBktZChRgorJt/V/wuFQn/SL4yOZIElmntEQEi8Tc=";
+        hash = "sha256-6UDjrrEtOuB+lrCZVBO4BcZm78qwq8YbQcXAdjNbicY=";
       };
       sniprun-bin = rustPlatform.buildRustPackage {
         pname = "sniprun-bin";
         inherit version src;
 
-        cargoSha256 = "sha256-cJwmuwsC81fSH36TRU7xGzlR4pVdjsw73uRaH1uWY+0=";
+        cargoSha256 = "sha256-ghXYUgXqXvK9RySG/hQR5zpLsyk6L9Htb/UYgMPyWUk=";
 
         nativeBuildInputs = [ makeWrapper ];
 
@@ -884,6 +884,11 @@ self: super: {
         substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin}
       '';
 
+      postInstall = ''
+        mkdir $out/doc
+        ln -s $out/docs/sniprun.txt $out/doc/sniprun.txt
+      '';
+
       propagatedBuildInputs = [ sniprun-bin ];
     };
 

pkgs/applications/file-managers/doublecmd/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doublecmd";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "doublecmd";
     repo = "doublecmd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S30/exZsw9Rs/l5Sml/q7dqUIcS55ZxbLFYv+M9Jr6o=";
+    hash = "sha256-UV5LooVkCBzUk9E7dYje6t19HOuMCO8jY+fNGTES0KA=";
   };
 
   nativeBuildInputs = [

pkgs/applications/file-managers/tuifimanager/default.nix

@@ -0,0 +1,38 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "tuifimanager";
+  version = "2.3.4";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "GiorgosXou";
+    rev = "v.${version}";
+    hash = "sha256-KJYPpeBALyg6Gd1GQgJbvGdJbAT47qO9FnSH7GhO4oQ=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "Send2Trash == 1.8.0" "Send2Trash >= 1.8.0"
+  '';
+
+  propagatedBuildInputs = with python3Packages; [ unicurses send2trash ];
+  pythonImportsCheck = [ "TUIFIManager" ];
+
+  # Tests currently cause build to fail
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A cross-platform terminal-based termux-oriented file manager";
+    longDescription = ''
+      A cross-platform terminal-based termux-oriented file manager (and component),
+      meant to be used with a Uni-Curses project or as is. This project is mainly an
+      attempt to get more attention to the Uni-Curses project.
+    '';
+    homepage = "https://github.com/GiorgosXou/TUIFIManager";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ michaelBelsanti ];
+    mainProgram = "tuifi";
+  };
+}

pkgs/applications/graphics/image_optim/Gemfile.lock

@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    exifr (1.3.9)
+    exifr (1.3.10)
     fspath (3.1.2)
-    image_optim (0.31.1)
+    image_optim (0.31.3)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 4)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_size (3.0.2)
+    image_size (3.2.0)
     in_threads (1.6.0)
     progress (3.6.0)
 
@@ -20,4 +20,4 @@ DEPENDENCIES
   image_optim
 
 BUNDLED WITH
-   2.3.9
+   2.4.6

pkgs/applications/graphics/image_optim/default.nix

@@ -1,9 +1,10 @@
 { lib, bundlerApp, bundlerUpdateScript, makeWrapper,
   withPngcrush ? true,       pngcrush,
-  withPngout ? true,         pngout,
+  withPngout ? false,        pngout, # disabled by default because it's unfree
   withAdvpng ? true,         advancecomp,
   withOptipng ? true,        optipng,
   withPngquant ? true,       pngquant,
+  withOxipng ? true,         oxipng,
   withJhead ? true,          jhead,
   withJpegoptim ? true,      jpegoptim,
   withJpegrecompress ? true, jpeg-archive,
@@ -15,18 +16,31 @@
 with lib;
 
 let
-  optionalDepsPath = []
-    ++ optional withPngcrush pngcrush
+  optionalDepsPath = optional withPngcrush pngcrush
     ++ optional withPngout pngout
     ++ optional withAdvpng advancecomp
     ++ optional withOptipng optipng
     ++ optional withPngquant pngquant
+    ++ optional withOxipng oxipng
     ++ optional withJhead jhead
     ++ optional withJpegoptim jpegoptim
     ++ optional withJpegrecompress jpeg-archive
     ++ optional withJpegtran libjpeg
     ++ optional withGifsicle gifsicle
     ++ optional withSvgo svgo;
+
+  disabledWorkersFlags = optional (!withPngcrush) "--no-pngcrush"
+    ++ optional (!withPngout) "--no-pngout"
+    ++ optional (!withAdvpng) "--no-advpng"
+    ++ optional (!withOptipng) "--no-optipng"
+    ++ optional (!withPngquant) "--no-pngquant"
+    ++ optional (!withOxipng) "--no-oxipng"
+    ++ optional (!withJhead) "--no-jhead"
+    ++ optional (!withJpegoptim) "--no-jpegoptim"
+    ++ optional (!withJpegrecompress) "--no-jpegrecompress"
+    ++ optional (!withJpegtran) "--no-jpegtran"
+    ++ optional (!withGifsicle) "--no-gifsicle"
+    ++ optional (!withSvgo) "--no-svgo";
 in
 
 bundlerApp {
@@ -39,16 +53,23 @@ bundlerApp {
 
   postBuild = ''
     wrapProgram $out/bin/image_optim \
-      --prefix PATH : ${lib.escapeShellArg (makeBinPath optionalDepsPath)}
+      --prefix PATH : ${lib.escapeShellArg (makeBinPath optionalDepsPath)} \
+      --add-flags "${lib.concatStringsSep " " disabledWorkersFlags}"
   '';
 
   passthru.updateScript = bundlerUpdateScript "image_optim";
 
   meta = with lib; {
-    description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)";
-    homepage    = "https://github.com/toy/image_optim";
-    license     = licenses.mit;
+    description = "Optimize images using multiple utilities";
+    longDescription = ''
+      Command line tool and ruby interface to optimize (lossless compress,
+      optionally lossy) jpeg, png, gif and svg images using external utilities
+      (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan,
+      jpegtran, optipng, oxipng, pngcrush, pngout, pngquant, svgo)
+    '';
+    homepage = "https://github.com/toy/image_optim";
+    license = licenses.mit;
     maintainers = with maintainers; [ srghma nicknovitski ];
-    platforms   = platforms.all;
+    platforms = platforms.all;
   };
 }

pkgs/applications/graphics/image_optim/gemset.nix

@@ -4,10 +4,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mylhwmh6n4xihxr9s3zj0lc286f5maxbqd4dgk3paqnd7afz88s";
+      sha256 = "08fmmswa9fwymwsa2gzlm856ak3y9kjxdzm4zdrcrfyxs2p8yqwc";
       type = "gem";
     };
-    version = "1.3.9";
+    version = "1.3.10";
   };
   fspath = {
     groups = ["default"];
@@ -25,20 +25,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l3n59w1cbvfg2srfa14g3jdqwbkf7l86g4qrgfz3qps7zi0drg7";
+      sha256 = "02iw1plldayr1l8bdw2gshq0h083h0fxwji1m1nfhzikz917c07p";
       type = "gem";
     };
-    version = "0.31.1";
+    version = "0.31.3";
   };
   image_size = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3";
+      sha256 = "10slvvyam8gkdjzlhb3wb21hp46ay18miyh1advwvyny660rmdsb";
       type = "gem";
     };
-    version = "3.0.2";
+    version = "3.2.0";
   };
   in_threads = {
     groups = ["default"];

pkgs/applications/misc/transifex-cli/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "transifex-cli";
+  version = "1.6.7";
+
+  src = fetchFromGitHub {
+    owner = "transifex";
+    repo = "cli";
+    rev = "v${version}";
+    sha256 = "sha256-5166P44HSRKQ0pCh1BCPd1ZUryh/IBDumcnLYA+CSBY=";
+  };
+
+  vendorSha256 = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
+
+  ldflags = [
+    "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'"
+  ];
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/tx
+  '';
+
+  # Tests contain network calls
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The Transifex command-line client";
+    homepage = "https://github.com/transifex/transifex-cli";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ thornycrackers ];
+  };
+}

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -3,10 +3,10 @@
 rec {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "111.0.1";
+    version = "112.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f";
+      sha512 = "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39";
     };
 
     meta = {
@@ -85,11 +85,11 @@ rec {
 
   firefox-esr-102 = buildMozillaMach rec {
     pname = "firefox-esr-102";
-    version = "102.9.0esr";
+    version = "102.10.0esr";
     applicationName = "Mozilla Firefox ESR";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685";
+      sha512 = "f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b";
     };
 
     meta = {

pkgs/applications/networking/cluster/kubectl-gadget/default.nix

@@ -2,21 +2,27 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     rev = "v${version}";
-    hash = "sha256:16i9biyvzkpgxyfb41afaarnlm59vy02nspln5zq69prg6mp8rwa";
+    hash = "sha256:1gn09kpkw8q2lxc8nic7hd1lhp0z4vscs8yvvxjzp1i9mw8s35xh";
   };
 
-  vendorHash = "sha256-Kj8gP5393++nPeX38TX6duB9OO/ql7hpRA5gTTtTl+M=";
+  vendorHash = "sha256-Y76Y3KR80dCx8+f6M0h5J6glGQGhXYE2KQM4jdJcDEM=";
 
   CGO_ENABLED = 0;
 
   ldflags = [
+    "-s" "-w"
     "-X main.version=v${version}"
+    "-extldflags=-static"
+  ];
+
+  tags = [
+    "withoutebpf"
   ];
 
   subPackages = [ "cmd/kubectl-gadget" ];

pkgs/applications/networking/gopher/phetch/default.nix

@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, installShellFiles
+, rustPlatform
+, pkg-config
+, openssl
+, scdoc
+, Security
+, which
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "phetch";
+  version = "1.2.0";
+
+  outputs = [ "out" "man" ];
+
+  src = fetchFromGitHub {
+    owner = "xvxx";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
+  };
+
+  cargoSha256 = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
+
+  nativeBuildInputs = [ installShellFiles pkg-config scdoc which ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+
+  postInstall = ''
+    make manual
+    installManPage doc/phetch.1
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "A quick lil gopher client for your terminal, written in rust";
+    longDescription = ''
+      phetch is a terminal client designed to help you quickly navigate the gophersphere.
+      - <1MB executable for Linux, Mac, and NetBSD
+      - Technicolor design (based on GILD)
+      - No-nonsense keyboard navigation
+      - Supports Gopher searches, text and menu pages, and downloads
+      - Save your favorite Gopher sites with bookmarks
+      - Opt-in history tracking
+      - Secure Gopher support (TLS)
+      - Tor support
+    '';
+    changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}";
+    homepage = "https://github.com/xvxx/phetch";
+    license = licenses.mit;
+    maintainers = with maintainers; [ felixalbrigtsen ];
+  };
+}

pkgs/applications/networking/remote/waypipe/default.nix

@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "waypipe";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mstoeckl";
     repo = "waypipe";
     rev = "v${version}";
-    sha256 = "sha256-uf2+PSqgZ+RShuVYlR42xMV38tuYbGV+bW1tdXgiZYU=";
+    hash = "sha256-1VLPnP4BmF9Zha0uVsPjA/WbF/oLfZmdDX57SzqrV5A=";
   };
 
   strictDeps = true;

pkgs/applications/science/math/primecount/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "primecount";
-  version = "7.7";
+  version = "7.8";
 
   src = fetchFromGitHub {
     owner = "kimwalisch";
     repo = "primecount";
     rev = "v${version}";
-    hash = "sha256-6Q9DPnlGKb31QYEGpm78ISfbj90MeLD0/2k2fDZm7cM=";
+    hash = "sha256-yKk+zXvA/MI7y9gCMwJNYHRYIYgeWyJHjyPi1uNWVnM=";
   };
 
   nativeBuildInputs = [

pkgs/applications/version-management/gitsign/default.nix

@@ -1,27 +1,39 @@
-{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal }:
+{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal, testers, gitsign }:
 
 buildGoModule rec {
   pname = "gitsign";
-  version = "0.4.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-lSE4BLwtxicngvnDCcMa6F6c3+Okn9NKAOnT2FGi7kU=";
+    hash = "sha256-VgkTFYnHKpqZOack5SabOFu2BRespVRhgrsepo0V1mI=";
   };
-  vendorSha256 = "sha256-WrVunAxOXXGSbs9OyKydeg4N/s871mt2O3t2e5DxXQo=";
+  vendorHash = "sha256-zalysp+90+QM5hX7yUudJW61h+3tQOab7ZpcF5kZSB0=";
+
+  subPackages = [
+    "."
+    "cmd/gitsign-credential-cache"
+  ];
 
   nativeBuildInputs = [ makeWrapper ];
 
   ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ];
 
+  preCheck = ''
+    # test all paths
+    unset subPackages
+  '';
+
   postInstall = ''
     for f in $out/bin/*; do
       wrapProgram $f --prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
     done
   '';
 
+  passthru.tests.version = testers.testVersion { package = gitsign; };
+
   meta = {
     homepage = "https://github.com/sigstore/gitsign";
     changelog = "https://github.com/sigstore/gitsign/releases/tag/v${version}";

pkgs/applications/video/gnomecast/default.nix

@@ -1,19 +1,28 @@
-{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
+{ stdenv, lib, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "gnomecast";
-  version = "1.9.11";
+  version = "unstable-2022-04-23";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4d8cd7a71f352137252c5a9ee13475bd67fb99594560ecff1efb0f718d8bbaac";
+  src = fetchFromGitHub {
+    owner = "keredson";
+    repo = "gnomecast";
+    rev = "d42d8915838b01c5cadacb322909e08ffa455d4f";
+    sha256 = "sha256-CJpbBuRzEjWb8hsh3HMW4bZA7nyDAwjrERCS5uGdwn8=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
   propagatedBuildInputs = [
-    pychromecast bottle pycaption paste html5lib pygobject3 dbus-python
-    gtk3 gobject-introspection
+    pychromecast
+    bottle
+    pycaption
+    paste
+    html5lib
+    pygobject3
+    dbus-python
+    gtk3
+    gobject-introspection
   ];
 
   # NOTE: gdk-pixbuf setup hook does not run with strictDeps

pkgs/applications/virtualization/firecracker/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv }:
 
 let
-  version = "1.1.3";
+  version = "1.3.1";
   # nixpkgs-update: no auto update
 
   suffix = {
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
   src = dlbin {
-    x86_64-linux = "sha256-3+CqVBOb2haknQIMzE9kl99pDWm9wZPUX92FlVov3No=";
-    aarch64-linux = "sha256-ii+x4YEZIZJuM+1Njvxe1dz6WOvAK1SWqfuodC7a4yo=";
+    x86_64-linux = "sha256-VfTo3TaTqqBYT2/CZW0F5tGXaT4CyBcKBnP5Xqc1BLI=";
+    aarch64-linux = "sha256-ODIBa482X8bNhRyvdmIGGi/6BZYif02cf8tAWYRcI2k=";
   };
 
   dontConfigure = true;

pkgs/data/fonts/noto-fonts/default.nix

@@ -24,48 +24,53 @@ let
     Google’s answer to tofu. The name noto is to convey the idea that
     Google’s goal is to see “no more tofu”.  Noto has multiple styles and
     weights, and freely available to all.
-
-    This package also includes the Arimo, Cousine, and Tinos fonts.
   '';
 in
 rec {
   mkNoto =
     { pname
-    , weights
     , variants ? [ ]
     , longDescription ? notoLongDescription
     }:
     stdenvNoCC.mkDerivation rec {
       inherit pname;
-      version = "20201206-phase3";
+      version = "23.4.1";
 
       src = fetchFromGitHub {
-        owner = "googlefonts";
-        repo = "noto-fonts";
-        rev = "v${version}";
-        hash = "sha256-x60RvCRFLoGe0CNvswROnDkIsUFbWH+/laN8q2qkUPk=";
+        owner = "notofonts";
+        repo = "notofonts.github.io";
+        rev = "noto-monthly-release-${version}";
+        hash = "sha256-hiBbhcwktacuoYJnZcsh7Aej5QIrBNkqrel2NhjNjCU=";
       };
 
       _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
 
       installPhase = ''
-        # We copy in reverse preference order -- unhinted first, then
-        # hinted -- to get the "best" version of each font while
+        # We check availability in order of variable -> otf -> ttf
+        # unhinted -- the hinted versions use autohint
         # maintaining maximum coverage.
         #
-        # TODO: install OpenType, variable versions?
-        local out_ttf=$out/share/fonts/truetype/noto
+        # We have a mix of otf and ttf fonts
+        local out_font=$out/share/fonts/noto
       '' + (if _variants == [ ] then ''
-        install -m444 -Dt $out_ttf archive/unhinted/*/*-${weights}.ttf
-        install -m444 -Dt $out_ttf archive/hinted/*/*-${weights}.ttf
-        install -m444 -Dt $out_ttf unhinted/*/*/*-${weights}.ttf
-        install -m444 -Dt $out_ttf hinted/*/*/*-${weights}.ttf
+        for folder in $(ls -d fonts/*/); do
+          if [[ -d "$folder"unhinted/variable-ttf ]]; then
+            install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf
+          elif [[ -d "$folder"unhinted/otf ]]; then
+            install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf
+          else
+            install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf
+          fi
+        done
       '' else ''
         for variant in $_variants; do
-          install -m444 -Dt $out_ttf archive/unhinted/$variant/*-${weights}.ttf
-          install -m444 -Dt $out_ttf archive/hinted/$variant/*-${weights}.ttf
-          install -m444 -Dt $out_ttf unhinted/*/$variant/*-${weights}.ttf
-          install -m444 -Dt $out_ttf hinted/*/$variant/*-${weights}.ttf
+          if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
+          elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf
+          else
+            install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf
+          fi
         done
       '');
 
@@ -75,7 +80,7 @@ rec {
         inherit longDescription;
         license = licenses.ofl;
         platforms = platforms.all;
-        maintainers = with maintainers; [ mathnerd314 emily ];
+        maintainers = with maintainers; [ mathnerd314 emily jopejoe1 ];
       };
     };
 
@@ -120,17 +125,13 @@ rec {
 
   noto-fonts = mkNoto {
     pname = "noto-fonts";
-    weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
   };
 
   noto-fonts-lgc-plus = mkNoto {
     pname = "noto-fonts-lgc-plus";
-    weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
     variants = [
       "Noto Sans"
       "Noto Serif"
-      "Noto Sans Display"
-      "Noto Serif Display"
       "Noto Sans Mono"
       "Noto Music"
       "Noto Sans Symbols"
@@ -145,11 +146,6 @@ rec {
     '';
   };
 
-  noto-fonts-extra = mkNoto {
-    pname = "noto-fonts-extra";
-    weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
-  };
-
   noto-fonts-cjk-sans = mkNotoCJK {
     typeface = "Sans";
     version = "2.004";

pkgs/development/compilers/jwasm/default.nix

@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jwasm";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "Baron-von-Riedesel";
     repo  = "JWasm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X2qqS4ev0+PeA1Gcsi8nivKAGZv7jxThxmQL/Jf5oB0=";
+    hash = "sha256-22eNtHXF+RQT4UbXIVjn1JP/s6igp5O1oQT7sVl7c1U=";
   };
 
   outputs = [ "out" "doc" ];

pkgs/development/libraries/pupnp/default.nix

@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libupnp";
-  version = "1.14.15";
+  version = "1.14.16";
 
   outputs = [ "out" "dev" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "pupnp";
     repo = "pupnp";
     rev = "release-${version}";
-    sha256 = "sha256-Yrd5sRvFsqBzVHODutK5JHCgoqzh26s/sGmsU2Db+bI=";
+    sha256 = "sha256-JsissTWnF8GuHSWeCmWOusDYV32Xu0LDRqZCm7yz6YY=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/google-auth/default.nix

@@ -1,41 +1,40 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , buildPythonPackage
-, fetchPypi
-, cachetools
-, pyasn1-modules
-, rsa
-, six
 , aiohttp
-, cryptography
-, pyopenssl
-, pyu2f
-, requests
-, pythonOlder
 , aioresponses
-, asynctest
+, cachetools
+, cryptography
+, fetchPypi
 , flask
 , freezegun
 , grpcio
 , mock
 , oauth2client
+, pyasn1-modules
+, pyopenssl
 , pytest-asyncio
 , pytest-localserver
 , pytestCheckHook
+, pythonOlder
+, pyu2f
+, requests
 , responses
+, rsa
+, six
 , urllib3
 }:
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.16.1";
+  version = "2.17.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X9FwmGvOa/17tchFxLg2LtseDLqQHgYhlug/i7XV0yw=";
+    hash = "sha256-jzebRrrTga0qC5id+wwTrSjTwqefJzSCE/iUah0V1Vo=";
   };
 
   propagatedBuildInputs = [
@@ -67,7 +66,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aioresponses
-    asynctest
     flask
     freezegun
     grpcio

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

@@ -42,7 +42,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "rich" ];
+  pythonImportsCheck = [
+    "rich"
+  ];
 
   passthru.tests = {
     inherit enrich httpie rich-rst textual;

pkgs/development/python-modules/sphinx-intl/default.nix

@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, transifex-cli
+, babel
+, click
+, setuptools
+, sphinx
+, pytestCheckHook
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-intl";
+  version = "2.1.0";
+  format = "setuptools";
+
+ src = fetchFromGitHub {
+    owner = "sphinx-doc";
+    repo = pname;
+    rev = version;
+    hash = "sha256-U/YCviGrsZNruVzfP0P2dGcB0K0Afh+XUZtp71OeP6c=";
+  };
+
+  propagatedBuildInputs = [
+    babel
+    click
+    setuptools
+    sphinx
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+    transifex-cli
+  ];
+
+  pythonImportsCheck = [ "sphinx_intl" ];
+
+  meta = with lib; {
+    description = "Sphinx utility that make it easy to translate and to apply translation";
+    homepage = "https://github.com/sphinx-doc/sphinx-intl";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ thornycrackers ];
+  };
+}

pkgs/development/python-modules/time-machine/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "time-machine";
-  version = "2.8.2";
+  version = "2.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "adamchainz";
     repo = pname;
     rev = version;
-    hash = "sha256-EFlvO9QlOP351kZAFQ+hwghL+7m+Cin/OyLV3NX+y8E=";
+    hash = "sha256-mE9unzVh0QXSl93hHH43o8AshDEzrl2NXsBJ2fph5is=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/types-pyopenssl/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "types-pyopenssl";
+  version = "23.0.0.4";
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "types-pyOpenSSL";
+    inherit version;
+    hash = "sha256-izVQtuGdUc54qr1ySw2OvZYggaX86V5/haWS3828Fr8=";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
+  # Module doesn't have tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "OpenSSL-stubs"
+  ];
+
+  meta = with lib; {
+    description = "Typing stubs for pyopenssl";
+    homepage = "https://github.com/python/typeshed";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ gador ];
+  };
+}

pkgs/development/python-modules/types-redis/default.nix

@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, cryptography
+, types-pyopenssl
 }:
 
 buildPythonPackage rec {
@@ -13,6 +15,11 @@ buildPythonPackage rec {
     hash = "sha256-dmAXh1TWCkz6z1sz7gY6oGJTEXkcYgdc2TYTZiej978=";
   };
 
+  propagatedBuildInputs = [
+    cryptography
+    types-pyopenssl
+  ];
+
   # Module doesn't have tests
   doCheck = false;
 

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

@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, ncurses, x256 }:
+
+buildPythonPackage rec {
+  pname = "unicurses";
+  version = "2.1.3";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "Uni-Curses";
+    hash = "sha256-uzSiF0jAZzI0iZngM/GuJ60o+UbLQ5XQzycTPito34w=";
+  };
+
+  propagatedBuildInputs = [ x256 ];
+
+  # Necessary because ctypes.util.find_library does not find the ncurses libraries
+  postPatch = ''
+    substituteInPlace './unicurses/__init__.py' \
+      --replace "find_library('ncursesw')" '"${ncurses}/lib/libncursesw.so.6"' \
+      --replace "find_library('panelw')" '"${ncurses}/lib/libpanelw.so.6"'
+  '';
+
+  pythonImportsCheck = [ "unicurses" ];
+
+  meta = with lib; {
+    description = "Unified Curses Wrapper for Python";
+    homepage = "https://github.com/unicurses/unicurses";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ michaelBelsanti ];
+  };
+}

pkgs/development/tools/continuous-integration/buildbot/default.nix

@@ -0,0 +1,42 @@
+{ python3
+, recurseIntoAttrs
+, callPackage
+}:
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+      sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
+        version = "1.4.40";
+        src = super.fetchPypi {
+          pname = "SQLAlchemy";
+          inherit version;
+          hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU=";
+        };
+      });
+      moto = super.moto.overridePythonAttrs (oldAttrs: rec {
+        # a lot of tests -> very slow, we already build them when building python packages
+        doCheck = false;
+      });
+    };
+  };
+
+  buildbot-pkg = python.pkgs.callPackage ./pkg.nix {
+    inherit buildbot;
+  };
+  buildbot-worker = python3.pkgs.callPackage ./worker.nix {
+    inherit buildbot;
+  };
+  buildbot = python.pkgs.callPackage ./master.nix {
+    inherit buildbot-pkg buildbot-worker buildbot-plugins;
+  };
+  buildbot-plugins = recurseIntoAttrs (callPackage ./plugins.nix {
+    inherit buildbot-pkg;
+  });
+in
+{
+  inherit buildbot buildbot-plugins buildbot-worker;
+  buildbot-ui = buildbot.withPlugins (with buildbot-plugins; [ www ]);
+  buildbot-full = buildbot.withPlugins (with buildbot-plugins; [
+    www console-view waterfall-view grid-view wsgi-dashboards badges
+  ]);
+}

pkgs/development/tools/continuous-integration/buildbot/master.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
+, buildPythonApplication
 , fetchPypi
 , makeWrapper
 , pythonOlder
@@ -25,17 +26,18 @@
 , lz4
 , setuptoolsTrial
 , buildbot-worker
-, buildbot-pkg
 , buildbot-plugins
+, buildbot-pkg
 , parameterized
 , git
 , openssh
 , glibcLocales
 , nixosTests
+, callPackage
 }:
 
 let
-  withPlugins = plugins: buildPythonPackage {
+  withPlugins = plugins: buildPythonApplication {
     pname = "${package.pname}-with-plugins";
     inherit (package) version;
     format = "other";
@@ -61,7 +63,7 @@ let
     };
   };
 
-  package = buildPythonPackage rec {
+  package = buildPythonApplication rec {
     pname = "buildbot";
     version = "3.7.0";
     format = "setuptools";

pkgs/development/tools/continuous-integration/buildbot/plugins.nix

@@ -1,5 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock, cairosvg, klein, jinja2 }:
-
+{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }:
 {
   www = buildPythonPackage rec {
     pname = "buildbot-www";

pkgs/development/tools/lv_img_conv/default.nix

@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, pkg-config
+, python3
+, pixman
+, libpng
+, libjpeg
+, librsvg
+, giflib
+, cairo
+, pango
+, nodePackages
+, makeWrapper
+, CoreText
+, nix-update-script
+}:
+
+buildNpmPackage rec {
+  pname = "lv_img_conv";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "lvgl";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LB7NZKwrpvps1cKzRoARHL4S48gBHadvxwA6JMmm/ME=";
+  };
+
+  npmDepsHash = "sha256-uDF22wlL3BlMQ/+Wmtgyjp4CVN6sDnjqjEPB4SeQuPk=";
+
+  nativeBuildInputs = [
+    pkg-config
+    python3
+    makeWrapper
+  ];
+
+  buildInputs = [
+    pixman
+    libpng
+    libjpeg
+    librsvg
+    giflib
+    cairo
+    pango
+  ] ++ lib.optionals stdenv.isDarwin [
+    CoreText
+  ];
+
+  postInstall = ''
+    makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts
+  '';
+
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
+  meta = with lib; {
+    changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}";
+    description = "Image converter for LVGL";
+    homepage = "https://github.com/lvgl/lv_img_conv";
+    license = licenses.mit;
+    maintainers = with maintainers; [ stargate01 ];
+  };
+}

pkgs/games/anki/default.nix

@@ -1,188 +1,258 @@
-{ stdenv
-, buildPythonApplication
-, lib
-, python
-, fetchurl
+{ lib
+, stdenv
+, buildEnv
 , fetchFromGitHub
-, fetchpatch
+, fetchYarnDeps
+, fixup_yarn_lock
+, installShellFiles
 , lame
 , mpv-unwrapped
-, libpulseaudio
-, pyqtwebengine
-, decorator
-, beautifulsoup4
-, sqlalchemy
-, pyaudio
-, requests
-, markdown
-, matplotlib
-, mock
-, pytest
-, glibcLocales
-, nose
-, jsonschema
-, setuptools
-, send2trash
+, ninja
+, nodejs
+, nodejs-slim
+, protobuf
+, python3
+, qt6
+, rsync
+, rustPlatform
+, writeShellScriptBin
+, yarn
 , CoreAudio
-  # This little flag adds a huge number of dependencies, but we assume that
-  # everyone wants Anki to draw plots with statistics by default.
-, plotsSupport ? true
-  # manual
-, asciidoc
 }:
 
 let
-  # when updating, also update rev-manual to a recent version of
-  # https://github.com/ankitects/anki-docs
-  # The manual is distributed independently of the software.
-  version = "2.1.15";
-  sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss";
-  rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139";
-  sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
+  pname = "anki";
+  version = "2.1.60";
+  rev = "76d8807315fcc2675e7fa44d9ddf3d4608efc487";
 
-  manual = stdenv.mkDerivation {
-    pname = "anki-manual";
-    inherit version;
-    src = fetchFromGitHub {
-      owner = "ankitects";
-      repo = "anki-docs";
-      rev = rev-manual;
-      sha256 = sha256-manual;
+  src = fetchFromGitHub {
+    owner = "ankitects";
+    repo = "anki";
+    rev = version;
+    hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA=";
+    fetchSubmodules = true;
+  };
+
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg=";
+      "linkcheck-0.4.1-alpha.0" = "sha256-Fiom8oHW9y7vV2RLXW0ClzHOdIlBq3Z9jLP+p6Sk4GI=";
     };
-    dontInstall = true;
-    nativeBuildInputs = [ asciidoc ];
-    patchPhase = ''
-      # rsync isnt needed
-      # WEB is the PREFIX
-      # We remove any special ankiweb output generation
-      # and rename every .mako to .html
-      sed -e 's/rsync -a/cp -a/g' \
-          -e "s|\$(WEB)/docs|$out/share/doc/anki/html|" \
-          -e '/echo asciidoc/,/mv $@.tmp $@/c \\tasciidoc -b html5 -o $@ $<' \
-          -e 's/\.mako/.html/g' \
-          -i Makefile
-      # patch absolute links to the other language manuals
-      sed -e 's|https://apps.ankiweb.net/docs/|link:./|g' \
-          -i {manual.txt,manual.*.txt}
-      # there’s an artifact in most input files
-      sed -e '/<%def.*title.*/d' \
-          -i *.txt
-      mkdir -p $out/share/doc/anki/html
+  };
+
+  anki-build-python = python3.withPackages (ps: with ps; [
+    pip
+    mypy-protobuf
+  ]);
+
+  # anki shells out to git to check its revision, and also to update submodules
+  # We don't actually need the submodules, so we stub that out
+  fakeGit = writeShellScriptBin "git" ''
+    case "$*" in
+      "rev-parse --short=8 HEAD")
+        echo ${builtins.substring 0 8 rev}
+      ;;
+      *"submodule update "*)
+        exit 0
+      ;;
+      *)
+        echo "Unrecognized git: $@"
+        exit 1
+      ;;
+    esac
+  '';
+
+  # We don't want to run pip-sync, it does network-io
+  fakePipSync = writeShellScriptBin "pip-sync" ''
+    exit 0
+  '';
+
+  offlineYarn = writeShellScriptBin "yarn" ''
+    [[ "$1" == "install" ]] && exit 0
+    exec ${yarn}/bin/yarn --offline "$@"
+  '';
+
+  pyEnv = buildEnv {
+    name = "anki-pyenv-${version}";
+    paths = with python3.pkgs; [
+      pip
+      fakePipSync
+      anki-build-python
+    ];
+    pathsToLink = [ "/bin" ];
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-bAtmMGWi5ETIidFFnG3jzJg2mSBnH5ONO2/Lr9A3PpQ=";
+  };
+
+  # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3
+  anki-nodemodules = stdenv.mkDerivation {
+    pname = "anki-nodemodules";
+    inherit version src yarnOfflineCache;
+
+    nativeBuildInputs = [
+      fixup_yarn_lock
+      yarn
+      nodejs-slim
+    ];
+
+    configurePhase = ''
+      export HOME=$NIX_BUILD_TOP
+      yarn config --offline set yarn-offline-mirror $yarnOfflineCache
+      fixup_yarn_lock yarn.lock
+      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
+      patchShebangs node_modules/
+      yarn run postinstall --offline
+    '';
+
+    installPhase = ''
+      mv node_modules $out
     '';
   };
-
 in
-buildPythonApplication rec {
-  pname = "anki";
-  inherit version;
-  format = "other";
-
-  src = fetchurl {
-    urls = [
-      "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
-      # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
-      # "http://ankisrs.net/download/mirror/${name}.tgz"
-      # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
-    ];
-    sha256 = sha256-pkg;
-  };
+python3.pkgs.buildPythonApplication {
+  inherit pname version src;
 
   outputs = [ "out" "doc" "man" ];
 
-  propagatedBuildInputs = [
-    pyqtwebengine
-    sqlalchemy
-    beautifulsoup4
-    send2trash
-    pyaudio
-    requests
-    decorator
-    markdown
-    jsonschema
-    setuptools
-  ]
-  ++ lib.optional plotsSupport matplotlib
-  ++ lib.optionals stdenv.isDarwin [ CoreAudio ]
-  ;
-
-  nativeCheckInputs = [ pytest glibcLocales mock nose ];
-
-  nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
-  buildInputs = [ lame mpv-unwrapped libpulseaudio ];
-
   patches = [
-    # Disable updated version check.
-    ./no-version-check.patch
-    (fetchpatch {
-      name = "fix-mpv-args.patch";
-      url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch";
-      sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2";
-    })
-    (fetchpatch {
-      name = "anki-2.1.15-unescape.patch";
-      url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200";
-      sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6";
-    })
+    ./patches/gl-fixup.patch
+    ./patches/no-update-check.patch
+    # Upstreamed in https://github.com/ankitects/anki/pull/2446
+    # We can drop these once we update to an anki version that includes them
+    # already
+    ./patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch
+    ./patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch
+    # Not upstreamed
+    ./patches/0003-Skip-formatting-python-code.patch
   ];
 
-  # Anki does not use setup.py
-  dontBuild = true;
+  inherit cargoDeps;
 
-  postPatch = ''
-    # Remove QT translation files. We'll use the standard QT ones.
-    rm "locale/"*.qm
+  nativeBuildInputs = [
+    fakeGit
+    fixup_yarn_lock
+    offlineYarn
 
-    # hitting F1 should open the local manual
-    substituteInPlace anki/consts.py \
-      --replace 'HELP_SITE="http://ankisrs.net/docs/manual.html"' \
-                'HELP_SITE="${manual}/share/doc/anki/html/manual.html"'
+    installShellFiles
+    rustPlatform.rust.cargo
+    rustPlatform.cargoSetupHook
+    ninja
+    qt6.wrapQtAppsHook
+    rsync
+  ];
+  nativeCheckInputs = with python3.pkgs; [ pytest mock astroid  ];
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+  propagatedBuildInputs = with python3.pkgs; [
+    # This rather long list came from running:
+    #    grep --no-filename -oE "^[^ =]*" python/{requirements.base.txt,requirements.bundle.txt,requirements.qt6_4.txt} | \
+    #      sort | uniq | grep -v "^#$"
+    # in their repo at the git tag for this version
+    # There's probably a more elegant way, but the above extracted all the
+    # names, without version numbers, of their python dependencies. The hope is
+    # that nixpkgs versions are "close enough"
+    # I then removed the ones the check phase failed on (pythonCatchConflictsPhase)
+    beautifulsoup4
+    certifi
+    charset-normalizer
+    click
+    colorama
+    decorator
+    distro
+    flask
+    flask-cors
+    idna
+    importlib-metadata
+    itsdangerous
+    jinja2
+    jsonschema
+    markdown
+    markupsafe
+    orjson
+    pep517
+    python3.pkgs.protobuf
+    pyparsing
+    pyqt6
+    pyqt6-sip
+    pyqt6-webengine
+    pyrsistent
+    pysocks
+    requests
+    send2trash
+    six
+    soupsieve
+    urllib3
+    waitress
+    werkzeug
+    zipp
+  ] ++ lib.optionals stdenv.isDarwin [ CoreAudio ];
+
+  # Activate optimizations
+  RELEASE = true;
+
+  PROTOC_BINARY = lib.getExe protobuf;
+  NODE_BINARY = lib.getExe nodejs;
+  YARN_BINARY = lib.getExe offlineYarn;
+  PYTHON_BINARY = lib.getExe python3;
+
+  inherit yarnOfflineCache;
+  dontUseNinjaInstall = false;
+
+  buildPhase = ''
+    export RUST_BACKTRACE=1
+    export RUST_LOG=debug
+
+    mkdir -p out/pylib/anki \
+             .git
+
+    echo ${builtins.substring 0 8 rev} > out/buildhash
+    touch out/env
+    touch .git/HEAD
+
+    ln -vsf ${pyEnv} ./out/pyenv
+    rsync --chmod +w -avP ${anki-nodemodules}/ out/node_modules/
+    ln -vsf out/node_modules node_modules
+
+    export HOME=$NIX_BUILD_TOP
+    yarn config --offline set yarn-offline-mirror $yarnOfflineCache
+    fixup_yarn_lock yarn.lock
+
+    patchShebangs ./ninja
+    PIP_USER=1 ./ninja build wheels
   '';
 
-  # UTF-8 locale needed for testing
-  LC_ALL = "en_US.UTF-8";
-
   # tests fail with to many open files
+  # TODO: verify if this is still true (I can't, no mac)
   doCheck = !stdenv.isDarwin;
-
-  # - Anki writes some files to $HOME during tests
-  # - Skip tests using network
+  # mimic https://github.com/ankitects/anki/blob/76d8807315fcc2675e7fa44d9ddf3d4608efc487/build/ninja_gen/src/python.rs#L232-L250
   checkPhase = ''
-    HOME=$TMP pytest --ignore tests/test_sync.py
+    HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib \
+      pytest -p no:cacheprovider pylib/tests
+    HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib:$PWD/pylib:$PWD/out/qt \
+      pytest -p no:cacheprovider qt/tests
   '';
 
-  installPhase = ''
-    pp=$out/lib/${python.libPrefix}/site-packages
-
-    mkdir -p $out/bin
-    mkdir -p $out/share/applications
-    mkdir -p $doc/share/doc/anki
-    mkdir -p $man/share/man/man1
-    mkdir -p $out/share/mime/packages
-    mkdir -p $out/share/pixmaps
-    mkdir -p $pp
-
-    cat > $out/bin/anki <<EOF
-    #!${python}/bin/python
-    import aqt
-    aqt.run()
-    EOF
-    chmod 755 $out/bin/anki
-
-    cp -v anki.desktop $out/share/applications/
-    cp -v README* LICENSE* $doc/share/doc/anki/
-    cp -v anki.1 $man/share/man/man1/
-    cp -v anki.xml $out/share/mime/packages/
-    cp -v anki.{png,xpm} $out/share/pixmaps/
-    cp -rv locale $out/share/
-    cp -rv anki aqt web $pp/
-
-    # copy the manual into $doc
-    cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
+  preInstall = ''
+    mkdir dist
+    mv out/wheels/* dist
+  '';
+
+  postInstall = ''
+    install -D -t $out/share/applications qt/bundle/lin/anki.desktop
+    install -D -t $doc/share/doc/anki README* LICENSE*
+    install -D -t $out/share/mime/packages qt/bundle/lin/anki.xml
+    install -D -t $out/share/pixmaps qt/bundle/lin/anki.{png,xpm}
+    installManPage qt/bundle/lin/anki.1
   '';
 
-  # now wrapPythonPrograms from postFixup will add both python and qt env variables
   dontWrapQtApps = true;
-
   preFixup = ''
     makeWrapperArgs+=(
       "''${qtWrapperArgs[@]}"
@@ -190,10 +260,6 @@ buildPythonApplication rec {
     )
   '';
 
-  passthru = {
-    inherit manual;
-  };
-
   meta = with lib; {
     homepage = "https://apps.ankiweb.net/";
     description = "Spaced repetition flashcard program";
@@ -211,6 +277,6 @@ buildPythonApplication rec {
     '';
     license = licenses.agpl3Plus;
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ oxij Profpatsch ];
+    maintainers = with maintainers; [ oxij Profpatsch euank ];
   };
 }

pkgs/games/anki/no-version-check.patch

@@ -1,13 +0,0 @@
-diff -Nurp anki-2.0.33.orig/aqt/main.py anki-2.0.33/aqt/main.py
---- anki-2.0.33.orig/aqt/main.py	2016-01-05 21:37:53.904533750 +0100
-+++ anki-2.0.33/aqt/main.py	2016-01-05 21:39:11.469175976 +0100
-@@ -820,6 +820,9 @@ title="%s">%s</button>''' % (
-     ##########################################################################
- 
-     def setupAutoUpdate(self):
-+        # Don't check for latest version since the versions are
-+        # managed in Nixpkgs.
-+        return
-         import aqt.update
-         self.autoUpdate = aqt.update.LatestVersionFinder(self)
-         self.connect(self.autoUpdate, SIGNAL("newVerAvail"), self.newVerAvail)

pkgs/games/anki/patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch

@@ -0,0 +1,53 @@
+From 53740ca75d167fab5c403a462e21ecd717b1dafa Mon Sep 17 00:00:00 2001
+From: Euan Kemp <euank@euank.com>
+Date: Fri, 17 Mar 2023 22:38:04 +0900
+Subject: [PATCH 1/2] Don't download nodejs if NODE_BINARY is set
+
+Some build environments, such as nixpkgs, restrict network access and
+thus would prefer to not download anything at all. Setting PROTOC_BINARY
+and friends makes the build system not download stuff, and the same
+should be true for nodejs
+---
+ build/ninja_gen/src/node.rs | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
+index df05e149d..d08c7011e 100644
+--- a/build/ninja_gen/src/node.rs
++++ b/build/ninja_gen/src/node.rs
+@@ -105,16 +105,6 @@ pub fn setup_node(
+     binary_exports: &[&'static str],
+     mut data_exports: HashMap<&str, Vec<Cow<str>>>,
+ ) -> Result<()> {
+-    download_and_extract(
+-        build,
+-        "node",
+-        archive,
+-        hashmap! {
+-            "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
+-            "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
+-        },
+-    )?;
+-
+     let node_binary = match std::env::var("NODE_BINARY") {
+         Ok(path) => {
+             assert!(
+@@ -124,6 +114,15 @@ pub fn setup_node(
+             path.into()
+         }
+         Err(_) => {
++            download_and_extract(
++                build,
++                "node",
++                archive,
++                hashmap! {
++                    "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
++                    "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
++                },
++            )?;
+             inputs![":extract:node:bin"]
+         }
+     };
+-- 
+2.39.2
+

pkgs/games/anki/patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch

@@ -0,0 +1,36 @@
+From 16af7d4cabcf10797bd110c905a9d7694bde0fb4 Mon Sep 17 00:00:00 2001
+From: Euan Kemp <euank@euank.com>
+Date: Fri, 17 Mar 2023 23:07:05 +0900
+Subject: [PATCH 2/2] Allow setting YARN_BINARY for the build system
+
+---
+ build/ninja_gen/src/node.rs | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
+index d08c7011e..c1e2ce1b3 100644
+--- a/build/ninja_gen/src/node.rs
++++ b/build/ninja_gen/src/node.rs
+@@ -129,7 +129,18 @@ pub fn setup_node(
+     let node_binary = build.expand_inputs(node_binary);
+     build.variable("node_binary", &node_binary[0]);
+ 
+-    build.add("yarn", YarnSetup {})?;
++    match std::env::var("YARN_BINARY") {
++        Ok(path) => {
++            assert!(
++                Utf8Path::new(&path).is_absolute(),
++                "YARN_BINARY must be absolute"
++            );
++            build.add_resolved_files_to_group("yarn:bin", &vec![path]);
++        },
++        Err(_) => {
++            build.add("yarn", YarnSetup {})?;
++        },
++    };
+ 
+     for binary in binary_exports {
+         data_exports.insert(
+-- 
+2.39.2
+

pkgs/games/anki/patches/0003-Skip-formatting-python-code.patch

@@ -0,0 +1,31 @@
+From ed5090b237bca768dbf7dfc3b4414b955879f15e Mon Sep 17 00:00:00 2001
+From: Euan Kemp <euank@euank.com>
+Date: Fri, 7 Apr 2023 20:22:34 +0900
+Subject: [PATCH 3/3] Skip formatting python code
+
+---
+ pylib/tools/hookslib.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pylib/tools/hookslib.py b/pylib/tools/hookslib.py
+index 6361c633e..95ecb64a2 100644
+--- a/pylib/tools/hookslib.py
++++ b/pylib/tools/hookslib.py
+@@ -82,7 +82,7 @@ class Hook:
+         code = f"""\
+ class {self.classname()}:
+ {classdoc}{self.list_code()}
+-    
++
+     def append(self, callback: {self.callable()}) -> None:
+         '''{appenddoc}'''
+         self._hooks.append(callback)
+@@ -208,4 +208,4 @@ def write_file(path: str, hooks: list[Hook], prefix: str, suffix: str):
+         os.environ["USERPROFILE"] = os.environ["HOME"]
+     with open(path, "wb") as file:
+         file.write(code.encode("utf8"))
+-    subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
++    # subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
+-- 
+2.39.2
+

pkgs/games/anki/patches/gl-fixup.patch

@@ -0,0 +1,17 @@
+diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py
+index 352848cfd..3fd5d0769 100644
+--- a/qt/aqt/__init__.py
++++ b/qt/aqt/__init__.py
+@@ -402,12 +402,6 @@ def parseArgs(argv: list[str]) -> tuple[argparse.Namespace, list[str]]:
+ def setupGL(pm: aqt.profiles.ProfileManager) -> None:
+     driver = pm.video_driver()
+
+-    # work around pyqt loading wrong GL library
+-    if is_lin:
+-        import ctypes
+-
+-        ctypes.CDLL("libGL.so.1", ctypes.RTLD_GLOBAL)
+-
+     # catch opengl errors
+     def msgHandler(category: Any, ctx: Any, msg: Any) -> None:
+         if category == QtMsgType.QtDebugMsg:

pkgs/games/anki/patches/no-update-check.patch

@@ -0,0 +1,13 @@
+diff --git a/qt/aqt/main.py b/qt/aqt/main.py
+index 0f2764f66..c42a88402 100644
+--- a/qt/aqt/main.py
++++ b/qt/aqt/main.py
+@@ -1395,6 +1395,8 @@ title="{}" {}>{}</button>""".format(
+     ##########################################################################
+
+     def setupAutoUpdate(self) -> None:
++        # nixpkgs patch; updates are managed by nix
++        return
+         import aqt.update
+
+         self.autoUpdate = aqt.update.LatestVersionFinder(self)

pkgs/misc/rich-cli/default.nix

@@ -4,31 +4,38 @@
 }:
 
 let
-  python = python3.override {
-    packageOverrides = self: super: {
-      rich = super.rich.overrideAttrs (old: rec {
+  py = python3.override {
+    packageOverrides = final: prev: {
+      rich = prev.rich.overridePythonAttrs (old: rec {
         version = "12.4.0";
         src = fetchFromGitHub {
           owner = "Textualize";
           repo = "rich";
-          rev = "refs/tags/v${version}";
+          rev = "refs/tags/v12.4.0";
           hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ=";
         };
+        propagatedBuildInputs = with py.pkgs; [
+          commonmark
+          pygments
+        ];
+        doCheck = false;
       });
-      textual = super.textual.overrideAttrs (old: rec {
+
+      textual = prev.textual.overridePythonAttrs (old: rec {
         version = "0.1.18";
         src = fetchFromGitHub {
           owner = "Textualize";
           repo = "textual";
-          rev = "refs/tags/v${version}";
+          rev = "refs/tags/v0.1.18";
           hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
         };
+        doCheck = false;
       });
     };
   };
 in
 
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "rich-cli";
   version = "1.8.0";
   format = "pyproject";
@@ -36,28 +43,28 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
   };
 
-  nativeBuildInputs = with python.pkgs; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python.pkgs; [
-    rich
-    click
-    requests
-    textual
-    rich-rst
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace 'rich = "^12.4.0"' 'rich = "*"' \
       --replace 'textual = "^0.1.18"' 'textual = "*"'
   '';
 
+  nativeBuildInputs = with py.pkgs; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with py.pkgs; [
+    rich
+    click
+    requests
+    textual
+    rich-rst
+  ];
+
   pythonImportsCheck = [
     "rich_cli"
   ];
@@ -65,6 +72,7 @@ python.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Command Line Interface to Rich";
     homepage = "https://github.com/Textualize/rich-cli";
+    changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ joelkoen ];
   };

pkgs/os-specific/linux/hd-idle/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hd-idle";
-  version = "1.17";
+  version = "1.20";
 
   src = fetchFromGitHub {
     owner = "adelolmo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BHUjKvhUDeD/Xm0KKbkLH2XWn1W77E7Pm3OSPARF6Xw=";
+    sha256 = "sha256-7EXfI3E83ltpjq2M/qZX2P/bNtQQBWZRBCD7i5uit0I=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/servers/ankisyncd/default.nix

@@ -1,7 +1,6 @@
 { lib
 , fetchFromGitHub
 , python3
-, anki
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -11,7 +10,8 @@ python3.pkgs.buildPythonApplication rec {
     owner = "ankicommunity";
     repo = "anki-sync-server";
     rev = version;
-    sha256 = "196xhd6vzp1ncr3ahz0bv0gp1ap2s37j8v48dwmvaywzayakqdab";
+    hash = "sha256-RXrdJGJ+HMSpDGQBuVPPqsh3+uwAgE6f7ZJ0yFRMI8I=";
+    fetchSubmodules = true;
   };
   format = "other";
 
@@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec {
     mkdir -p $out/${python3.sitePackages}
 
     cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages}
+    cp -r anki-bundled/anki $out/${python3.sitePackages}
     mkdir $out/share
     cp ankisyncctl.py $out/share/
 
@@ -28,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
   '';
 
   fixupPhase = ''
-    PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}:${anki}"
+    PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}"
 
     makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \
           --set PYTHONPATH $PYTHONPATH \
@@ -46,14 +47,14 @@ python3.pkgs.buildPythonApplication rec {
 
   buildInputs = [ ];
 
-  propagatedBuildInputs = [ anki ];
+  propagatedBuildInputs = with python3.pkgs; [
+    decorator
+    requests
+  ];
 
   checkPhase = ''
-    # Exclude tests that require sqlite's sqldiff command, since
-    # it isn't yet packaged for NixOS, although 2 PRs exist:
-    # - https://github.com/NixOS/nixpkgs/pull/69112
-    # - https://github.com/NixOS/nixpkgs/pull/75784
-    # Once this is merged, these tests can be run as well.
+    # skip these tests, our files are too young:
+    # tests/test_web_media.py::SyncAppFunctionalMediaTest::test_sync_mediaChanges ValueError: ZIP does not support timestamps before 1980
     pytest --ignore tests/test_web_media.py tests/
   '';
 

pkgs/servers/nosql/ferretdb/default.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "ferretdb";
-  version = "0.9.4";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "FerretDB";
     repo = "FerretDB";
     rev = "v${version}";
-    sha256 = "sha256-DdOZIK1y7WhKigd5u4JGErP53FCQSe3QCZMXIa4ah3I=";
+    sha256 = "sha256-WFGVQWEYQBUzZAc8yHvD3C3bYbH0hVGoz28nVMV1IP8=";
   };
 
   postPatch = ''
@@ -19,7 +19,7 @@ buildGoModule rec {
     echo nixpkgs     > build/version/package.txt
   '';
 
-  vendorSha256 = "sha256-Kmc/xWNrx62Ua87K5tif4s3jpWLbzTqNpw8j/3bYXr4=";
+  vendorSha256 = "sha256-jxo8QXw9Ca27VPjC7GYIm8SVxvhSZBQLnW2Kuthu5Rk=";
 
   CGO_ENABLED = 0;
 

pkgs/servers/web-apps/plausible/default.nix

@@ -49,12 +49,16 @@ beamPackages.mixRelease {
 
   nativeBuildInputs = [ nodejs ];
 
+  # https://github.com/whitfin/cachex/issues/205
+  stripDebug = false;
+
   passthru = {
     tests = { inherit (nixosTests) plausible; };
     updateScript = ./update.sh;
   };
 
   postBuild = ''
+    export HOME=$TMPDIR
     export NODE_OPTIONS=--openssl-legacy-provider # required for webpack compatibility with OpenSSL 3 (https://github.com/webpack/webpack/issues/14532)
     ln -sf ${yarnDeps}/node_modules assets/node_modules
     npm run deploy --prefix ./assets

pkgs/stdenv/adapters.nix

@@ -176,7 +176,7 @@ rec {
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
         dontStrip = true;
-        env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og";
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
       });
     });
 
@@ -219,7 +219,8 @@ rec {
   impureUseNativeOptimizations = stdenv:
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
-        env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native";
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
+
         NIX_ENFORCE_NO_NATIVE = false;
 
         preferLocalBuild = true;
@@ -244,7 +245,7 @@ rec {
   withCFlags = compilerFlags: stdenv:
     stdenv.override (old: {
       mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
-        env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}";
+        env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
       });
     });
 }

pkgs/tools/misc/cc2538-bsl/default.nix

@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "cc2538-bsl";
+  version = "unstable-2022-08-03";
+
+  src = fetchFromGitHub rec {
+    owner = "JelmerT";
+    repo = pname;
+    rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970";
+    hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE=";
+  };
+
+  nativeBuildInputs = [ python3Packages.setuptools-scm ];
+
+  propagatedBuildInputs = with python3Packages; [
+    intelhex
+    pyserial
+    python-magic
+  ];
+
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev0+g${lib.substring 0 7 src.rev}";
+
+  postInstall = ''
+    # Remove .py from binary
+    mv $out/bin/cc2538-bsl.py $out/bin/cc2538-bsl
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/JelmerT/cc2538-bsl";
+    description = "Flash TI SimpleLink chips (CC2538, CC13xx, CC26xx) over serial";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ lorenz ];
+  };
+}
+

pkgs/tools/misc/timer/default.nix

@@ -2,22 +2,20 @@
 
 buildGoModule rec {
   pname = "timer";
-  version = "unstable-2023-02-01";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "timer";
-    rev = "1f437baceb1ca76b341fdc229fe45938b282f2aa";
-    hash = "sha256-u+naemEiKufKYROuJB55u8QgiIgg4nLsB+FerUImtXs=";
+    rev = "v${version}";
+    hash = "sha256-9p/L3Hj3VqlNiyY3lfUAhCjwTl1iSTegWxaVEGB4qHM=";
   };
 
-  vendorHash = "sha256-n4AjaojcDAYbgOIuaAJ4faVJqV+/0uby5OHRMsyL9Dg=";
+  vendorHash = "sha256-j7Xik0te6GdjfhXHT7DRf+MwM+aKjfgTGvroxnlD3MM=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = timer;
-  };
+  passthru.tests.version = testers.testVersion { package = timer; };
 
   meta = with lib; {
     description = "A `sleep` with progress";

pkgs/top-level/aliases.nix

@@ -1114,6 +1114,7 @@ mapAliases ({
   nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
   nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
   noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16
+  noto-fonts-extra = noto-fonts; # Added 2023-04-08
   nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15
   now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05
   ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21

pkgs/top-level/all-packages.nix

@@ -2495,6 +2495,8 @@ with pkgs;
 
   spaceFM = callPackage ../applications/file-managers/spacefm { };
 
+  tuifimanager = callPackage ../applications/file-managers/tuifimanager { };
+
   vifm = callPackage ../applications/file-managers/vifm { };
 
   vifm-full = vifm.override {
@@ -3080,10 +3082,8 @@ with pkgs;
   bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
   bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
 
-  buildbot = with python3Packages; toPythonApplication buildbot;
-  buildbot-ui = with python3Packages; toPythonApplication buildbot-ui;
-  buildbot-full = with python3Packages; toPythonApplication buildbot-full;
-  buildbot-worker = with python3Packages; toPythonApplication buildbot-worker;
+  inherit (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot {})
+    buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker;
 
   bunyan-rs = callPackage ../development/tools/bunyan-rs { };
 
@@ -3574,7 +3574,7 @@ with pkgs;
 
   play-with-mpv = callPackage ../tools/video/play-with-mpv { };
 
-  plausible = callPackage ../servers/web-apps/plausible { };
+  plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; };
 
   pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
 
@@ -6374,6 +6374,8 @@ with pkgs;
 
   cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };
 
+  cc2538-bsl = callPackage ../tools/misc/cc2538-bsl { };
+
   code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };
   code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
   code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
@@ -9740,6 +9742,10 @@ with pkgs;
 
   lv = callPackage ../tools/text/lv { };
 
+  lv_img_conv = callPackage ../development/tools/lv_img_conv  {
+    inherit (darwin.apple_sdk.frameworks) CoreText;
+  };
+
   lxc = callPackage ../os-specific/linux/lxc {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -12963,6 +12969,8 @@ with pkgs;
 
   transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { };
 
+  transifex-cli = callPackage ../applications/misc/transifex-cli { };
+
   translate-shell = callPackage ../applications/misc/translate-shell { };
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;
@@ -23038,6 +23046,10 @@ with pkgs;
 
   pe-parse = callPackage ../development/libraries/pe-parse { };
 
+  phetch = callPackage ../applications/networking/gopher/phetch {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   inherit (callPackage ../development/libraries/physfs {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   })
@@ -28184,8 +28196,7 @@ with pkgs;
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
     noto-fonts-emoji
-    noto-fonts-emoji-blob-bin
-    noto-fonts-extra;
+    noto-fonts-emoji-blob-bin;
 
   nuclear = callPackage ../applications/audio/nuclear { };
 
@@ -35640,7 +35651,7 @@ with pkgs;
 
   angband = callPackage ../games/angband { };
 
-  anki = python39Packages.callPackage ../games/anki {
+  anki = callPackage ../games/anki {
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
   };
   anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };

pkgs/top-level/python-aliases.nix

@@ -48,6 +48,12 @@ mapAliases ({
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
   bsblan = python-bsblan; # added 2022-11-04
   btchip = btchip-python; # added 2023-03-03
+  buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
+  buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07
+  buildbot-full = throw "use pkgs.buildbot-full instead"; # added 2022-04-07
+  buildbot-plugins = throw "use pkgs.buildbot-plugins instead"; # added 2022-04-07
+  buildbot-worker = throw "use pkgs.buildbot-worker instead"; # added 2022-04-07
+  buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07
   bt_proximity = bt-proximity; # added 2021-07-02
   BTrees = btrees; # added 2023-02-19
   carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18

pkgs/top-level/python-packages.nix

@@ -1513,18 +1513,6 @@ self: super: with self; {
 
   buienradar = callPackage ../development/python-modules/buienradar { };
 
-  buildbot = callPackage ../development/python-modules/buildbot { };
-
-  buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
-
-  buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards badges ]);
-
-  buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { };
-
-  buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { });
-
-  buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { };
-
   build = callPackage ../development/python-modules/build { };
 
   buildcatrust = callPackage ../development/python-modules/buildcatrust { };
@@ -11114,6 +11102,8 @@ self: super: with self; {
 
   sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { };
 
+  sphinx-intl = callPackage ../development/python-modules/sphinx-intl { };
+
   sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { };
 
   sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { };
@@ -12127,6 +12117,8 @@ self: super: with self; {
 
   types-psutil = callPackage ../development/python-modules/types-psutil { };
 
+  types-pyopenssl = callPackage ../development/python-modules/types-pyopenssl { };
+
   types-python-dateutil = callPackage ../development/python-modules/types-python-dateutil { };
 
   types-pytz = callPackage ../development/python-modules/types-pytz { };
@@ -12246,6 +12238,8 @@ self: super: with self; {
     unicorn-emu = pkgs.unicorn;
   };
 
+  unicurses = callPackage ../development/python-modules/unicurses { };
+
   unicrypto = callPackage ../development/python-modules/unicrypto { };
 
   unidecode = callPackage ../development/python-modules/unidecode { };