Merge master into haskell-updates

doc/hooks/cernlib.section.md

@@ -0,0 +1,3 @@
+# CERNLIB {#cernlib-hook}
+
+This hook sets the `CERN`, `CERN_LEVEL`, and `CERN_ROOT` environment variables. They are part of [CERNLIB's build system](https://cernlib.web.cern.ch/install/install.html), and are are needed for some programs to compile correctly.

doc/hooks/index.md

@@ -10,6 +10,7 @@ automake.section.md
 autopatchelf.section.md
 bmake.section.md
 breakpoint.section.md
+cernlib.section.md
 cmake.section.md
 gdk-pixbuf.section.md
 ghc.section.md

doc/packages/geant4.section.md

@@ -0,0 +1,15 @@
+# Geant4 {#geant4}
+
+[Geant4](https://www.geant4.org/) is a toolkit for simulating how particles pass through matter. It is available through the `geant4` package.
+
+## Setup hook {#geant4-hook}
+
+The setup hook included in the package applies the environment variables set by the [`geant4.sh` script](https://github.com/Geant4/geant4/blob/master/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake#L4-L55), which is typically necessary for compiling `make`-based programs that depend on Geant4.
+
+## Datasets {#geant4-datasets}
+
+All of [the Geant4 datasets provided by CERN](https://geant4.web.cern.ch/support/download) are available through the `geant4.data` attrset.
+
+### Setup hook {#geant4-datasets-hook}
+
+The hook provided by the packages in `geant4.data` will set an appropriate environment variable in the form of `G4[...]DATA`. For example, for the `G4RadioactiveDecay` dataset, the `G4RADIOACTIVEDATA` environment variable is set to the value expected by Geant4.

doc/packages/index.md

@@ -12,10 +12,12 @@ emacs.section.md
 firefox.section.md
 fish.section.md
 fuse.section.md
+geant4.section.md
 ibus.section.md
 kakoune.section.md
 krita.section.md
 linux.section.md
+lhapdf.section.md
 locales.section.md
 etc-files.section.md
 nginx.section.md

doc/packages/lhapdf.section.md

@@ -0,0 +1,11 @@
+# LHAPDF {#lhapdf}
+
+[LHAPDF](https://lhapdf.hepforge.org/) is a tool for evaluating parton distribution functions (PDFs) in high-energy physics. LHAPDF is available in the `lhapdf` package.
+
+## PDF sets {#lhapdf-sets}
+
+All of [the PDF sets made available by the LHAPDF project](https://lhapdf.hepforge.org/pdfsets.html) are available through the `lhapdf.pdf_sets` attrset.
+
+### Setup hook {#lhapdf-sets-hook}
+
+Each package provided in the `lhapdf.pdf_sets` attrset contains a setup hook which adds itself to [the `LHAPDF_DATA_PATH` environment variable](https://lhapdf.hepforge.org/#sets).

maintainers/maintainer-list.nix

@@ -742,6 +742,12 @@
     githubId = 45179933;
     name = "Alex Jackson";
   };
+  ajgon = {
+    email = "igor@rzegocki.pl";
+    github = "ajgon";
+    githubId = 150545;
+    name = "Igor Rzegocki";
+  };
   ajgrf = {
     email = "a@ajgrf.com";
     github = "ajgrf";
@@ -2249,6 +2255,12 @@
     github = "Baitinq";
     githubId = 30861839;
   };
+  baksa = {
+    email = "baksa@pm.me";
+    name = "Kryštof Baksa";
+    github = "Golbinex";
+    githubId = 62813600;
+  };
   balodja = {
     email = "balodja@gmail.com";
     github = "balodja";
@@ -11295,6 +11307,12 @@
     githubId = 4032;
     name = "Kristoffer Thømt Ravneberg";
   };
+  kristianan = {
+    email = "kristian@krined.no";
+    github = "KristianAN";
+    githubId = 80984519;
+    name = "Kristian Alvestad Nedevold-Hansen";
+  };
   kristian-brucaj = {
     email = "kbrucaj@gmail.com";
     github = "Flameslice";

maintainers/scripts/luarocks-packages.csv

@@ -105,6 +105,7 @@ luv,,,,1.48.0-2,,
 lush.nvim,,,https://luarocks.org/dev,,,teto
 lyaml,,,,,,lblasc
 lz.n,,,,,,mrcjkb
+lze,,,,,,birdee
 lzn-auto-require,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,

nixos/modules/installer/cd-dvd/installation-cd-minimal.nix

@@ -9,9 +9,6 @@
     ./installation-cd-base.nix
   ];
 
-  # Causes a lot of uncached builds for a negligible decrease in size.
-  environment.noXlibs = lib.mkOverride 500 false;
-
   documentation.man.enable = lib.mkOverride 500 true;
 
   # Although we don't really need HTML documentation in the minimal installer,

nixos/modules/profiles/minimal.nix

@@ -6,8 +6,6 @@
 with lib;
 
 {
-  environment.noXlibs = mkDefault true;
-
   documentation.enable = mkDefault false;
 
   documentation.doc.enable = mkDefault false;

nixos/modules/services/misc/paperless.nix

@@ -40,8 +40,9 @@ let
     exec ${cfg.package}/bin/paperless-ngx "$@"
   '';
 
-  # Secure the services
   defaultServiceConfig = {
+    Slice = "system-paperless.slice";
+    # Secure the services
     ReadWritePaths = [
       cfg.consumptionDir
       cfg.dataDir
@@ -232,6 +233,11 @@ in
   config = mkIf cfg.enable {
     services.redis.servers.paperless.enable = mkIf enableRedis true;
 
+    systemd.slices.system-paperless = {
+      description = "Paperless slice";
+      documentation = [ "https://docs.paperless-ngx.com" ];
+    };
+
     systemd.tmpfiles.settings."10-paperless" = let
       defaultRule = {
         inherit (cfg) user;

nixos/modules/services/network-filesystems/samba.nix

@@ -5,7 +5,9 @@ with lib;
 let
   cfg = config.services.samba;
 
-  settingsFormat = pkgs.formats.ini { };
+  settingsFormat = pkgs.formats.ini {
+    listToValue = lib.concatMapStringsSep " " (generators.mkValueStringDefault { });
+  };
   # Ensure the global section is always first
   globalConfigFile = settingsFormat.generate "smb-global.conf" { global = cfg.settings.global; };
   sharesConfigFile = settingsFormat.generate "smb-shares.conf" (lib.removeAttrs cfg.settings [ "global" ]);
@@ -122,7 +124,6 @@ in
               type = lib.types.listOf lib.types.str;
               default = [ "root" ];
               description = "List of users who are denied to login via Samba.";
-              apply = x: lib.concatStringsSep " " x;
             };
             global."passwd program" = lib.mkOption {
               type = lib.types.str;

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

@@ -24,6 +24,8 @@ let
   systemdBootBuilder = pkgs.substituteAll rec {
     name = "systemd-boot";
 
+    dir = "bin";
+
     src = checkedSource;
 
     isExecutable = true;
@@ -86,7 +88,7 @@ let
 
   finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
     #!${pkgs.runtimeShell}
-    ${systemdBootBuilder} "$@"
+    ${systemdBootBuilder}/bin/systemd-boot "$@"
     ${cfg.extraInstallCommands}
   '';
 in {

nixos/modules/virtualisation/lxc-instance-common.nix

@@ -27,7 +27,6 @@
   services.openssh.startWhenNeeded = lib.mkDefault true;
 
   # As this is intended as a standalone image, undo some of the minimal profile stuff
-  environment.noXlibs = false;
   documentation.enable = true;
   documentation.nixos.enable = true;
   services.logrotate.enable = true;

nixos/tests/curl-impersonate.nix

@@ -97,6 +97,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let
       pyyaml
       pytest-asyncio
       dpkt
+      ts1-signatures
     ]}"
 
     # Prepare test root prefix

nixos/tests/libreswan.nix

@@ -37,6 +37,8 @@ let
     useDHCP = false;
     interfaces.eth1.ipv4.addresses = lib.mkVMOverride [];
     interfaces.eth2.ipv4.addresses = lib.mkVMOverride [];
+    interfaces.eth1.ipv6.addresses = lib.mkVMOverride [];
+    interfaces.eth2.ipv6.addresses = lib.mkVMOverride [];
     # open a port for testing
     firewall.allowedUDPPorts = [ 1234 ];
   };

nixos/tests/tandoor-recipes-script-name.nix

@@ -78,7 +78,7 @@ import ./make-test-python.nix (
                         elif value.startswith("/"):
                             self.urls.append(f"{origin_url}{value}")
                         else:
-                            print("Ignoring external URL: {value}")
+                            print(f"Ignoring non-path URL: {value}")
 
                         break
 

pkgs/applications/audio/fmit/default.nix

@@ -36,17 +36,6 @@ mkDerivation rec {
       PREFIXSHORTCUT=$out"
   '';
 
-  postInstall = ''
-    mkdir -p $out/share/applications
-    ln -s $out/fmit.desktop $out/share/applications/fmit.desktop
-
-    mkdir -p $out/share/icons/hicolor/128x128/apps
-    ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png
-
-    mkdir -p $out/share/icons/hicolor/scalable/apps
-    ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg
-  '';
-
   meta = with lib; {
     description = "Free Musical Instrument Tuner";
     longDescription = ''
@@ -55,6 +44,7 @@ mkDerivation rec {
     '';
     homepage = "http://gillesdegottex.github.io/fmit/";
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/audio/ft2-clone/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.85";
+  version = "1.86";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    hash = "sha256-1iIwfZVRumlZn67xEhlef6Gm2Hb52CHFAq9RPU4M13M=";
+    hash = "sha256-/sdMBRCZvuKTp8ygCrLmIy0DiWJC6lLWdsY+ZxRY+pY=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix

@@ -0,0 +1,55 @@
+pkgs:
+
+self: super:
+
+let
+  libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
+in
+{
+  # TODO delete this when we get upstream fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73241
+  eglot = super.eglot.overrideAttrs (old: {
+    postInstall =
+      old.postInstall or ""
+      + ''
+        local info_file=eglot.info
+        pushd $out/share/emacs/site-lisp/elpa/eglot-*
+        # specify output info file to override the one defined in eglot.texi
+        makeinfo --output=$info_file eglot.texi
+        install-info $info_file dir
+        popd
+      '';
+  });
+
+  # native compilation for tests/seq-tests.el never ends
+  # delete tests/seq-tests.el to workaround this
+  seq = super.seq.overrideAttrs (old: {
+    dontUnpack = false;
+    postUnpack =
+      old.postUnpack or ""
+      + "\n"
+      + ''
+        local content_directory=$(echo seq-*)
+        rm --verbose $content_directory/tests/seq-tests.el
+        src=$PWD/$content_directory.tar
+        tar --create --verbose --file=$src $content_directory
+      '';
+  });
+
+  xeft = super.xeft.overrideAttrs (old: {
+    dontUnpack = false;
+    buildInputs = old.buildInputs or [ ] ++ [ pkgs.xapian ];
+    buildPhase =
+      old.buildPhase or ""
+      + ''
+        $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian
+      '';
+    postInstall =
+      old.postInstall or ""
+      + "\n"
+      + ''
+        outd=$out/share/emacs/site-lisp/elpa/xeft-*
+        install -m444 -t $outd xapian-lite${libExt}
+        rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile
+      '';
+  });
+}

pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix

@@ -45,54 +45,18 @@ self: let
       });
     };
 
-    super = removeAttrs imported [ "dash" ];
+    super = imported;
 
-    overrides = {
-      eglot = super.eglot.overrideAttrs (old: {
-        postInstall = (old.postInstall or "") + ''
-          local info_file=eglot.info
-          pushd $out/share/emacs/site-lisp/elpa/eglot-*
-          # specify output info file to override the one defined in eglot.texi
-          makeinfo --output=$info_file eglot.texi
-          install-info $info_file dir
-          popd
-        '';
-      });
+    commonOverrides = import ./elpa-common-overrides.nix pkgs;
 
+    overrides = self: super: {
       pq = super.pq.overrideAttrs (old: {
         buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
       });
-
-      xeft = super.xeft.overrideAttrs (old: let
-        libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
-      in {
-        dontUnpack = false;
-
-        buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ];
-        buildPhase = (old.buildPhase or "") + ''
-          $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian
-        '';
-        postInstall = (old.postInstall or "") + "\n" + ''
-          outd=$out/share/emacs/site-lisp/elpa/xeft-*
-          install -m444 -t $outd xapian-lite${libExt}
-          rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile
-        '';
-      });
-
-      # native compilation for tests/seq-tests.el never ends
-      # delete tests/seq-tests.el to workaround this
-      seq = super.seq.overrideAttrs (old: {
-        dontUnpack = false;
-        postUnpack = (old.postUnpack or "") + "\n" + ''
-          local content_directory=$(echo seq-*)
-          rm --verbose $content_directory/tests/seq-tests.el
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-        '';
-      });
     };
 
-    elpaDevelPackages = super // overrides;
+    elpaDevelPackages =
+      let super' = super // (commonOverrides self super); in super' // (overrides self super');
 
   in elpaDevelPackages);
 

pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix

@@ -45,9 +45,11 @@ self: let
       });
     };
 
-    super = removeAttrs imported [ "dash" ];
+    super = imported;
 
-    overrides = {
+    commonOverrides = import ./elpa-common-overrides.nix pkgs;
+
+    overrides = self: super: {
       # upstream issue: Wrong type argument: arrayp, nil
       org-transclusion =
         if super.org-transclusion.version == "1.2.0"
@@ -98,17 +100,6 @@ self: let
         };
       });
 
-      eglot = super.eglot.overrideAttrs (old: {
-        postInstall = (old.postInstall or "") + ''
-          local info_file=eglot.info
-          pushd $out/share/emacs/site-lisp/elpa/eglot-*
-          # specify output info file to override the one defined in eglot.texi
-          makeinfo --output=$info_file eglot.texi
-          install-info $info_file dir
-          popd
-        '';
-      });
-
       jinx = super.jinx.overrideAttrs (old: let
         libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
       in {
@@ -150,38 +141,11 @@ self: let
         }
       );
 
-      xeft = super.xeft.overrideAttrs (old: let
-        libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
-      in {
-        dontUnpack = false;
-
-        buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ];
-        buildPhase = (old.buildPhase or "") + ''
-          $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian
-        '';
-        postInstall = (old.postInstall or "") + "\n" + ''
-          outd=$out/share/emacs/site-lisp/elpa/xeft-*
-          install -m444 -t $outd xapian-lite${libExt}
-          rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile
-        '';
-      });
-
-      # native compilation for tests/seq-tests.el never ends
-      # delete tests/seq-tests.el to workaround this
-      seq = super.seq.overrideAttrs (old: {
-        dontUnpack = false;
-        postUnpack = (old.postUnpack or "") + "\n" + ''
-          local content_directory=$(echo seq-*)
-          rm --verbose $content_directory/tests/seq-tests.el
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-        '';
-      });
-
 
     };
 
-    elpaPackages = super // overrides;
+    elpaPackages =
+      let super' = super // (commonOverrides self super); in super' // (overrides self super');
 
   in elpaPackages);
 

pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix

@@ -0,0 +1,21 @@
+pkgs:
+
+self: super:
+
+{
+  p4-16-mode = super.p4-16-mode.overrideAttrs {
+    # workaround https://github.com/NixOS/nixpkgs/issues/301795
+    prePatch = ''
+      mkdir tmp-untar-dir
+      pushd tmp-untar-dir
+
+      tar --extract --verbose --file=$src
+      content_directory=$(echo p4-16-mode-*)
+      cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
+      src=$PWD/$content_directory.tar
+      tar --create --verbose --file=$src $content_directory
+
+      popd
+    '';
+  };
+}

pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix

@@ -10,7 +10,11 @@
   3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix`
 */
 
-{ lib, buildPackages }:
+{
+  lib,
+  pkgs,
+  buildPackages,
+}:
 
 self:
 let
@@ -35,26 +39,15 @@ let
 
       super = imported;
 
-      overrides = {
-        p4-16-mode = super.p4-16-mode.overrideAttrs {
-          # workaround https://github.com/NixOS/nixpkgs/issues/301795
-          prePatch = ''
-            mkdir tmp-untar-dir
-            pushd tmp-untar-dir
+      commonOverrides = import ./nongnu-common-overrides.nix pkgs;
 
-            tar --extract --verbose --file=$src
-            content_directory=$(echo p4-16-mode-*)
-            cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
-            src=$PWD/$content_directory.tar
-            tar --create --verbose --file=$src $content_directory
-
-            popd
-          '';
-        };
-      };
+      overrides = self: super: { };
 
     in
-    super // overrides
+    let
+      super' = super // (commonOverrides self super);
+    in
+    super' // (overrides self super')
   );
 
 in

pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix

@@ -12,7 +12,7 @@ To update the list of packages from nongnu (ELPA),
 
 */
 
-{ lib, buildPackages }:
+{ lib, pkgs, buildPackages }:
 
 self: let
 
@@ -29,24 +29,11 @@ self: let
 
     super = imported;
 
-    overrides = {
-      p4-16-mode = super.p4-16-mode.overrideAttrs {
-        # workaround https://github.com/NixOS/nixpkgs/issues/301795
-        prePatch = ''
-          mkdir tmp-untar-dir
-          pushd tmp-untar-dir
+    commonOverrides = import ./nongnu-common-overrides.nix pkgs;
 
-          tar --extract --verbose --file=$src
-          content_directory=$(echo p4-16-mode-*)
-          cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
+    overrides = self: super: { };
 
-          popd
-        '';
-      };
-    };
-
-  in super // overrides);
+  in
+  let super' = super // (commonOverrides self super); in super' // (overrides self super'));
 
 in generateNongnu { }

pkgs/applications/editors/mg/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mg";
-  version = "7.3";
+  version = "7.3-unstable-2024-06-04";
 
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "mg";
-    rev = "mg-${version}";
-    sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ=";
+    rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33";
+    hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs=";
   };
 
   postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''

pkgs/applications/editors/thiefmd/default.nix

@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     mainProgram = "com.github.kmwallio.thiefmd";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
   };
 }

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

@@ -1056,6 +1056,8 @@
 
   lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; };
 
+  lze = neovimUtils.buildNeovimPlugin { luaAttr = "lze"; };
+
   lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; };
 
   magma-nvim-goose = buildVimPlugin {

pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix

@@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2024.15.2024091001";
-    hash = "sha256-CtPOLKaTIp4uMIaGVo3h6XxP/BYilgU6GBSA5wZMW8o=";
+    version = "2024.15.2024091301";
+    hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ=";
   };
 
   buildInputs = [ icu ];

pkgs/applications/editors/vscode/vscodium.nix

@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1qddnqjq61c8m9klzkf4ic2zjgcwzpa0mjmraqfyga8njqham8z5";
-    x86_64-darwin = "1fkpijnm1z84x1bv9w4qvwrydcv9i2jsldvp96gby7f3gp69asaw";
-    aarch64-linux = "1k8whwqk0di2knld4gxyjwngh5kfa4pa4fr1scg7pfwfx9dnkljd";
-    aarch64-darwin = "0wgag225ji108zdrfbmp3iviyl3ha6gblcxp5ilc39pi50dms4gv";
-    armv7l-linux = "00w4238av273qznbnxdw4vvjj0iv8rrzb15aazvirb22d2slk9hr";
+    x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf";
+    x86_64-darwin = "10k4qgck48xh12xq80y8x3jf9qp5fn15n995mn8gbid39907ars0";
+    aarch64-linux = "0jk33jw5rj98qr6fhi4r3vz5f1673m5v1g28jdyn3prs20hp0msg";
+    aarch64-darwin = "1sw39iyz5m0hdy875b3ygzvpl7vz9j3d1w6fpmf30a3iyl3ndh66";
+    armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj";
   }.${system} or throwSystem;
 
   sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.92.2.24228";
+    version = "1.93.1.24256";
     pname = "vscodium";
 
     executableName = "codium";

pkgs/applications/editors/zile/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   # fiddle with the terminal.
   doCheck = false;
 
-  env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
 
   # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
   gl_cv_func_fstatat_zero_flag="yes";

pkgs/applications/emulators/ruffle/default.nix

@@ -23,7 +23,7 @@
 }:
 
 let
-  version = "nightly-2024-05-01";
+  version = "nightly-2024-09-12";
 in
 rustPlatform.buildRustPackage {
   pname = "ruffle";
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
     owner = "ruffle-rs";
     repo = "ruffle";
     rev = version;
-    hash = "sha256-WfoYQku1NFhvWyqeSVKtsMMEyUA97YFD7cvdn4XYIPI=";
+    hash = "sha256-wvgx6581vvUPb9evvJl328oTP/F8+LhpeHX3vCsHXCc=";
   };
 
   nativeBuildInputs =
@@ -98,11 +98,13 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo=";
-      "h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ=";
-      "jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA=";
+      "ecolor-0.28.1" = "sha256-X1prQIc3jzmWyEmpfQMgowW2qM1r+2T12Nd7HCsPtpc=";
+      "flash-lso-0.6.0" = "sha256-X9XYj88GmkPRy+RxvGM6vFdBxif2XYesKtqwwW2DTw4=";
+      "h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik=";
+      "jpegxr-0.3.1" = "sha256-03gbXA5T02ofgfRaanaixqfrFpxw/UOOftgKZ7hPHY4=";
       "nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04=";
       "nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
+      "rfd-0.14.1" = "sha256-eq4OONgYrtWCogIpjws/1uRxmv3oyIdrimDVaLJ9IMo=";
     };
   };
 

pkgs/applications/graphics/curtail/default.nix

@@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "curtail";
     homepage = "https://github.com/Huluti/Curtail";
     license = licenses.gpl3Only;
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
   };
 }

pkgs/applications/graphics/lazpaint/default.nix

@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
     downloadPage = "https://github.com/bgrabitmap/lazpaint/";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     mainProgram = "lazpaint";
   };
 }

pkgs/applications/misc/calibre/default.nix

@@ -200,6 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
       $ETN 'test_zstd'  # we don't include zstd support
       $ETN 'test_qt'  # we don't include svg or webp support
       $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused
+      $ETN 'test_websocket_basic'  # flakey
       ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
     )
 

pkgs/applications/misc/cotp/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cotp";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "replydev";
     repo = "cotp";
     rev = "v${version}";
-    hash = "sha256-Of4stKrk3zQX2gxXaM9YrZf1SVjzIVUU+7JraKHk180=";
+    hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U=";
   };
 
-  cargoHash = "sha256-DLq8w65UlfAdPsJ96mNZ+dJtm/VMPzlIYqsEJtkLKzI=";
+  cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug=";
 
   buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
     ++ lib.optionals stdenv.isDarwin [ AppKit ];

pkgs/applications/misc/wofi/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Launcher/menu program for wlroots based wayland compositors such as sway";
     homepage = "https://hg.sr.ht/~scoopta/wofi";
     license = licenses.gpl3Only;
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     platforms = with platforms; linux;
     mainProgram = "wofi";
   };

pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix

@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "cloudfoundry-cli";
-  version = "8.8.0";
+  version = "8.8.1";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-H969ZL+b62YidZ14TfGmwBVjSF/JRu64nOMUtIdFWKc=";
+    sha256 = "sha256-0SVz97XjFeXaj56ssqFK2jTUQfL0rSc72HAdK9mikUc=";
   };
-  vendorHash = "sha256-2vUS7oENbUENaEnSzJ4gfQr3lKZ3jKH4QAO9KP0rQGs=";
+  vendorHash = "sha256-WI4yg+r8zGLZI10/kNFkdbzXk0hZ6CCXvXLOd8l7AWo=";
 
   subPackages = [ "." ];
 

pkgs/applications/networking/geph/default.nix

@@ -1,26 +1,24 @@
-{ lib
-, stdenvNoCC
-, rustPlatform
-, fetchFromGitHub
-, buildGoModule
-, makeWrapper
-, nodejs
-, pnpm
-, cacert
-, esbuild
-, jq
-, moreutils
-, perl
-, pkg-config
-, glib
-, webkitgtk
-, libayatana-appindicator
-, cairo
-, openssl
+{
+  lib,
+  stdenvNoCC,
+  rustPlatform,
+  fetchFromGitHub,
+  buildGoModule,
+  makeWrapper,
+  nodejs,
+  pnpm,
+  esbuild,
+  perl,
+  pkg-config,
+  glib,
+  webkitgtk,
+  libayatana-appindicator,
+  cairo,
+  openssl,
 }:
 
 let
-  version = "4.11.0";
+  version = "4.99.2";
   geph-meta = with lib; {
     description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
     homepage = "https://geph.io";
@@ -37,10 +35,10 @@ in
       owner = "geph-official";
       repo = pname;
       rev = "v${version}";
-      hash = "sha256-6zii8WxJp++yqTkxejNDta7IW+SG0uPgmnWqX5Oa9PU=";
+      hash = "sha256-aZFm4+oUQungCPbxs7j1J8hLcCYoIodIEQEiQfjoLUw=";
     };
 
-    cargoHash = "sha256-WI525ufJxuepRZHyx8tO4K+7WZuM/NlTVNqVMJH6avg=";
+    cargoHash = "sha256-ypnjVoscGqVifkjzFh2KE+3EVFWIiyahTNTil3nu/+s=";
 
     nativeBuildInputs = [ perl ];
 
@@ -56,8 +54,8 @@ in
     src = fetchFromGitHub {
       owner = "geph-official";
       repo = "gephgui-pkg";
-      rev = "3a6d2fa85603e9ac3d5d6286685d8a8ca792a508";
-      hash = "sha256-SE1TwYvR3+zwdPxlanq4hovmJsOdCJQzWfSJ6sSyJ5k=";
+      rev = "3b045e21b8c587c26f9d5f0f2b4bdf0a34bfee80";
+      hash = "sha256-p+AxAOznUsG45Ibm1kczapfmbK+aeex2js463eqZ8gY=";
       fetchSubmodules = true;
     };
 
@@ -96,18 +94,25 @@ in
         openssl
       ];
 
-      ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
-        buildGoModule = args: buildGoModule (args // rec {
-          version = "0.15.10";
-          src = fetchFromGitHub {
-            owner = "evanw";
-            repo = "esbuild";
-            rev = "v${version}";
-            hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
-          };
-          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-        });
-      })}";
+      ESBUILD_BINARY_PATH = "${lib.getExe (
+        esbuild.override {
+          buildGoModule =
+            args:
+            buildGoModule (
+              args
+              // rec {
+                version = "0.15.10";
+                src = fetchFromGitHub {
+                  owner = "evanw";
+                  repo = "esbuild";
+                  rev = "v${version}";
+                  hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk=";
+                };
+                vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+              }
+            );
+        }
+      )}";
 
       pnpmRoot = "gephgui";
 

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -5,7 +5,7 @@ let
       stable = "0.0.67";
       ptb = "0.0.103";
       canary = "0.0.483";
-      development = "0.0.27";
+      development = "0.0.28";
     } else {
       stable = "0.0.318";
       ptb = "0.0.133";
@@ -29,7 +29,7 @@ let
       };
       development = fetchurl {
         url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-0AfATkHqw5gfbQ27DvM+QoLZgspYWKG09jWWNWERnmQ=";
+        hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU=";
       };
     };
     x86_64-darwin = {

pkgs/applications/networking/netmaker/default.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.24.3";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-gZeIZTEO/5jKUEGRl91Px44tVTerIm1o4kIGj5Y9pb8=";
+    hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q=";
   };
 
-  vendorHash = "sha256-ZaHgB9nxOYOVE/kjb62f3Kyow9mpXFUc1Gtvsnu28k8=";
+  vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74=";
 
   inherit subPackages;
 

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     description = "GTK-based Usenet newsreader good at both text and binaries";
     mainProgram = "pan";
     homepage = "http://pan.rebelbase.com/";
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     platforms = platforms.linux;
     license = with licenses; [ gpl2Only fdl11Only ];
   };

pkgs/applications/office/planify/default.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.11.0";
+  version = "4.11.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-jAQXe7g+u4tHca4QL8Ae8Yvl+esvGQpCHbDlycAwFZ4=";
+    hash = "sha256-yEe8zBaczCCY5Cs9lIc2J3GYSeDwmB1vsX9cANXQIC0=";
   };
 
   nativeBuildInputs = [

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

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bcftools";
-  version = "1.20";
+  version = "1.21";
 
   src = fetchurl {
     url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA=";
+    sha256 = "sha256-UopMwdNVU2jbdacAsio8ldqJP9GCf20wRxbf1F6k4oI=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/mpv/scripts/uosc.nix

@@ -9,14 +9,14 @@
 
 buildLua (finalAttrs: {
   pname = "uosc";
-  version = "5.2.0";
+  version = "5.5.0";
   scriptPath = "src/uosc";
 
   src = fetchFromGitHub {
     owner = "tomasklaen";
     repo = "uosc";
     rev = finalAttrs.version;
-    hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo=";
+    hash = "sha256-WFsqA5kGefQmvihLUuQBfMmKoUHiO7ofxpwISRygRm4=";
   };
   passthru.updateScript = gitUpdater { };
 

pkgs/applications/video/pitivi/default.nix

@@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec {
       that can appeal to newbies and professionals alike.
     '';
     license = licenses.lgpl21Plus;
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     platforms = platforms.linux;
     mainProgram = "pitivi";
   };

pkgs/applications/video/stremio/default.nix

@@ -12,19 +12,19 @@
 
 stdenv.mkDerivation rec {
   pname = "stremio-shell";
-  version = "4.4.165";
+  version = "4.4.168";
 
   src = fetchFromGitHub {
     owner = "Stremio";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE=";
+    hash = "sha256-pz1mie0kJov06GcyitvZu5Gg0Vz3YnigjDqFujGKqZM=";
   };
 
   server = fetchurl {
     url = "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v${version}/server.js";
-    sha256 = "sha256-52Pg0PrV15arGqhD3rXYCl1J6kcoL+/BHRvgiQBO/OA=";
+    hash = "sha256-aD3niQpgq1EiZLacnEFgmqUV+bc4rvGN9IA+9T4XF10=";
   };
 
   buildInputs = [ qtwebengine mpv ];

pkgs/applications/virtualization/singularity/packages.nix

@@ -47,20 +47,20 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "singularity-ce";
-        version = "4.2.0";
+        version = "4.2.1";
         projectName = "singularity";
 
         src = fetchFromGitHub {
           owner = "sylabs";
           repo = "singularity";
           rev = "refs/tags/v${version}";
-          hash = "sha256-CxHbUke0Y9BDnyqTRZZqNtU006XGxFj3gond1BaYZO0=";
+          hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8=";
         };
 
         # Update by running
         # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
         # at the root directory of the Nixpkgs repository
-        vendorHash = "sha256-R4hMg5TX5YXtnBopl7CYYCwA540BAx98/aaNfLpExV4=";
+        vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w=";
 
         # Do not build conmon and squashfuse from the Git submodule sources,
         # Use Nixpkgs provided version

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix

@@ -14,13 +14,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.42.0";
+            version = "0.43.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               rev = "refs/tags/v${version}";
-              hash = "sha256-aPzAbDgAyxJlUjyaFPDhjcL7WnyDP5uDZKOqlQRD8eM=";
+              hash = "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=";
             };
           in
           mkHyprlandPlugin hyprland {

pkgs/build-support/writers/scripts.nix

@@ -297,25 +297,36 @@ rec {
         ln -s ${inner}/bin/${name} $out
       '';
 
-  # Like writeScript but the first line is a shebang to bash
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeBash "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeBash "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #     ''
-  #       hello
-  #     ''
+  /**
+    Like writeScript but the first line is a shebang to bash
+    Can be called with or without extra arguments.
+
+    # Examples
+    :::{.example}
+
+    ## Without arguments
+
+    ```nix
+    writeBash "example" ''
+    echo hello world
+    ''
+    ```
+
+    ## With arguments
+
+    ```nix
+    writeBash "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeBash =
     name: argsOrScript:
     if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
@@ -323,46 +334,72 @@ rec {
     else
       makeScriptWriter { interpreter = "${lib.getExe pkgs.bash}"; } name argsOrScript;
 
-  # Like writeScriptBin but the first line is a shebang to bash
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeBashBin "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #  writeBashBin "example"
-  #    {
-  #      makeWrapperArgs = [
-  #        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #      ];
-  #    }
-  #    ''
-  #      hello
-  #    ''
+  /**
+    Like writeScriptBin but the first line is a shebang to bash
+
+    Can be called with or without extra arguments.
+
+    ## Examples
+    :::{.example}
+    ## `pkgs.writers.writeBashBin` example without arguments
+
+    ```nix
+    writeBashBin "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeBashBin` example with arguments
+
+    ```nix
+    writeBashBin "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeBashBin = name: writeBash "/bin/${name}";
 
-  # Like writeScript but the first line is a shebang to dash
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeDash "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeDash "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #     ''
-  #       hello
-  #     ''
+  /**
+    Like writeScript but the first line is a shebang to dash
+
+    Can be called with or without extra arguments.
+
+    # Example
+    :::{.example}
+    ## `pkgs.writers.writeDash` example without arguments
+
+    ```nix
+    writeDash "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeDash` example with arguments
+
+    ```nix
+    writeDash "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeDash =
     name: argsOrScript:
     if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
@@ -370,46 +407,71 @@ rec {
     else
       makeScriptWriter { interpreter = "${lib.getExe pkgs.dash}"; } name argsOrScript;
 
-  # Like writeScriptBin but the first line is a shebang to dash
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeDashBin "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #  writeDashBin "example"
-  #    {
-  #      makeWrapperArgs = [
-  #        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #      ];
-  #    }
-  #    ''
-  #      hello
-  #    ''
+  /**
+    Like writeScriptBin but the first line is a shebang to dash
+
+    Can be called with or without extra arguments.
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeDashBin` without arguments
+
+    ```nix
+    writeDashBin "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeDashBin` with arguments
+
+    ```nix
+    writeDashBin "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeDashBin = name: writeDash "/bin/${name}";
 
-  # Like writeScript but the first line is a shebang to fish
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeFish "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeFish "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #     ''
-  #       hello
-  #     ''
+  /**
+    Like writeScript but the first line is a shebang to fish
+
+    Can be called with or without extra arguments.
+
+    :::{.example}
+    ## `pkgs.writers.writeFish` without arguments
+
+    ```nix
+    writeFish "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeFish` with arguments
+
+    ```nix
+    writeFish "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeFish =
     name: argsOrScript:
     if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
@@ -426,36 +488,57 @@ rec {
         check = "${lib.getExe pkgs.fish} --no-config --no-execute"; # syntax check only
       } name argsOrScript;
 
-  # Like writeScriptBin but the first line is a shebang to fish
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeFishBin "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeFishBin "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #     ''
-  #       hello
-  #     ''
+  /**
+    Like writeScriptBin but the first line is a shebang to fish
+
+    Can be called with or without extra arguments.
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeFishBin` without arguments
+
+    ```nix
+    writeFishBin "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeFishBin` with arguments
+
+    ```nix
+    writeFishBin "example"
+    {
+      makeWrapperArgs = [
+        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+      ];
+    }
+    ''
+      hello
+    ''
+    ```
+    :::
+  */
   writeFishBin = name: writeFish "/bin/${name}";
 
-  # writeHaskell takes a name, an attrset with libraries and haskell version (both optional)
-  # and some haskell source code and returns an executable.
-  #
-  # Example:
-  #   writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
-  #     import Acme.Missiles
-  #
-  #     main = launchMissiles
-  #   '';
+  /**
+    writeHaskell takes a name, an attrset with libraries and haskell version (both optional)
+    and some haskell source code and returns an executable.
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeHaskell` usage example
+
+    ```nix
+    writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
+      import Acme.Missiles
+
+      main = launchMissiles
+    '';
+    ```
+    :::
+  */
   writeHaskell =
     name:
     {
@@ -480,28 +563,43 @@ rec {
       inherit makeWrapperArgs strip;
     } name;
 
-  # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin)
+  /**
+    writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin)
+  */
   writeHaskellBin = name: writeHaskell "/bin/${name}";
 
-  # Like writeScript but the first line is a shebang to nu
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeNu "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeNu "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #     ''
-  #       hello
-  #     ''
+  /**
+    Like writeScript but the first line is a shebang to nu
+
+    Can be called with or without extra arguments.
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeNu` without arguments
+
+    ```nix
+    writeNu "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeNu` with arguments
+
+    ```nix
+    writeNu "example"
+      {
+        makeWrapperArgs = [
+          "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+        ];
+      }
+      ''
+        hello
+      ''
+    ```
+    :::
+  */
   writeNu =
     name: argsOrScript:
     if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
@@ -511,29 +609,44 @@ rec {
     else
       makeScriptWriter { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; } name argsOrScript;
 
-  # Like writeScriptBin but the first line is a shebang to nu
-  #
-  # Can be called with or without extra arguments.
-  #
-  # Example without arguments:
-  #   writeNuBin "example" ''
-  #     echo hello world
-  #   ''
-  #
-  # Example with arguments:
-  #   writeNuBin "example"
-  #     {
-  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
-  #       ];
-  #     }
-  #    ''
-  #      hello
-  #    ''
+  /**
+    Like writeScriptBin but the first line is a shebang to nu
+
+    Can be called with or without extra arguments.
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeNuBin` without arguments
+
+    ```nix
+    writeNuBin "example" ''
+      echo hello world
+    ''
+    ```
+    :::
+
+    :::{.example}
+    ## `pkgs.writers.writeNuBin` with arguments
+
+    ```nix
+    writeNuBin "example"
+      {
+        makeWrapperArgs = [
+          "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
+        ];
+      }
+      ''
+        hello
+      ''
+    ```
+    :::
+  */
   writeNuBin = name: writeNu "/bin/${name}";
 
-  # makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer,
-  # If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used.
+  /**
+    makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer,
+    If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used.
+  */
   makeRubyWriter =
     ruby: rubyPackages: buildRubyPackages: name:
     {
@@ -552,19 +665,30 @@ rec {
       }
     ) name;
 
-  # Like writeScript but the first line is a shebang to ruby
-  #
-  # Example:
-  #   writeRuby "example" { libraries = [ pkgs.rubyPackages.git ]; } ''
-  #    puts "hello world"
-  #   ''
+  /**
+    Like writeScript but the first line is a shebang to ruby
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeRuby` usage example
+
+    ```nix
+    writeRuby "example" { libraries = [ pkgs.rubyPackages.git ]; } ''
+     puts "hello world"
+    ''
+    ```
+
+    :::
+  */
   writeRuby = makeRubyWriter pkgs.ruby pkgs.rubyPackages buildPackages.rubyPackages;
 
   writeRubyBin = name: writeRuby "/bin/${name}";
 
-  # makeLuaWriter takes lua and compatible luaPackages and produces lua script writer,
-  # which validates the script with luacheck at build time. If any libraries are specified,
-  # lua.withPackages is used as interpreter, otherwise the "bare" lua is used.
+  /**
+    makeLuaWriter takes lua and compatible luaPackages and produces lua script writer,
+    which validates the script with luacheck at build time. If any libraries are specified,
+    lua.withPackages is used as interpreter, otherwise the "bare" lua is used.
+  */
   makeLuaWriter =
     lua: luaPackages: buildLuaPackages: name:
     {
@@ -587,26 +711,35 @@ rec {
       }
     ) name;
 
-  # writeLua takes a name an attributeset with libraries and some lua source code and
-  # returns an executable (should also work with luajit)
-  #
-  # Example:
-  # writeLua "test_lua" { libraries = [ pkgs.luaPackages.say ]; } ''
-  #   s = require("say")
-  #   s:set_namespace("en")
-  #
-  #   s:set('money', 'I have %s dollars')
-  #   s:set('wow', 'So much money!')
-  #
-  #   print(s('money', {1000})) -- I have 1000 dollars
-  #
-  #   s:set_namespace("fr") -- switch to french!
-  #   s:set('wow', "Tant d'argent!")
-  #
-  #   print(s('wow')) -- Tant d'argent!
-  #   s:set_namespace("en")  -- switch back to english!
-  #   print(s('wow')) -- So much money!
-  # ''
+  /**
+    writeLua takes a name an attributeset with libraries and some lua source code and
+    returns an executable (should also work with luajit)
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeLua` usage example
+
+    ```nix
+    writeLua "test_lua" { libraries = [ pkgs.luaPackages.say ]; } ''
+      s = require("say")
+      s:set_namespace("en")
+
+      s:set('money', 'I have %s dollars')
+      s:set('wow', 'So much money!')
+
+      print(s('money', {1000})) -- I have 1000 dollars
+
+      s:set_namespace("fr") -- switch to french!
+      s:set('wow', "Tant d'argent!")
+
+      print(s('wow')) -- Tant d'argent!
+      s:set_namespace("en")  -- switch back to english!
+      print(s('wow')) -- So much money!
+    ''
+    ```
+
+    :::
+  */
   writeLua = makeLuaWriter pkgs.lua pkgs.luaPackages buildPackages.luaPackages;
 
   writeLuaBin = name: writeLua "/bin/${name}";
@@ -632,16 +765,39 @@ rec {
 
   writeRustBin = name: writeRust "/bin/${name}";
 
-  # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and
-  # returns an executable
-  #
-  # Example:
-  #   writeJS "example" { libraries = [ pkgs.uglify-js ]; } ''
-  #     var UglifyJS = require("uglify-js");
-  #     var code = "function add(first, second) { return first + second; }";
-  #     var result = UglifyJS.minify(code);
-  #     console.log(result.code);
-  #   ''
+  /**
+    writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and
+    returns an executable
+
+    # Inputs
+
+    `name`
+
+    : 1\. Function argument
+
+    `attrs`
+
+    : 2\. Function argument
+
+    `content`
+
+    : 3\. Function argument
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writeJS` usage example
+
+    ```nix
+    writeJS "example" { libraries = [ pkgs.uglify-js ]; } ''
+      var UglifyJS = require("uglify-js");
+      var code = "function add(first, second) { return first + second; }";
+      var result = UglifyJS.minify(code);
+      console.log(result.code);
+    ''
+    ```
+
+    :::
+  */
   writeJS =
     name:
     {
@@ -660,7 +816,9 @@ rec {
       exec ${lib.getExe pkgs.nodejs} ${pkgs.writeText "js" content} "$@"
     '';
 
-  # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
+  /**
+    writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
+  */
   writeJSBin = name: writeJS "/bin/${name}";
 
   awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
@@ -685,14 +843,23 @@ rec {
         gixy $out
       '';
 
-  # writePerl takes a name an attributeset with libraries and some perl sourcecode and
-  # returns an executable
-  #
-  # Example:
-  #   writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } ''
-  #     use boolean;
-  #     print "Howdy!\n" if true;
-  #   ''
+  /**
+    writePerl takes a name an attributeset with libraries and some perl sourcecode and
+    returns an executable
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writePerl` usage example
+
+    ```nix
+    writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } ''
+      use boolean;
+      print "Howdy!\n" if true;
+    ''
+    ```
+
+    :::
+  */
   writePerl =
     name:
     {
@@ -706,12 +873,38 @@ rec {
       }
     ) name;
 
-  # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin)
+  /**
+    writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin)
+  */
   writePerlBin = name: writePerl "/bin/${name}";
 
-  # makePythonWriter takes python and compatible pythonPackages and produces python script writer,
-  # which validates the script with flake8 at build time. If any libraries are specified,
-  # python.withPackages is used as interpreter, otherwise the "bare" python is used.
+  /**
+    makePythonWriter takes python and compatible pythonPackages and produces python script writer,
+    which validates the script with flake8 at build time. If any libraries are specified,
+    python.withPackages is used as interpreter, otherwise the "bare" python is used.
+
+    # Inputs
+
+    `python`
+
+    : 1\. Function argument
+
+    `pythonPackages`
+
+    : 2\. Function argument
+
+    `buildPythonPackages`
+
+    : 3\. Function argument
+
+    `name`
+
+    : 4\. Function argument
+
+    `attrs`
+
+    : 5\. Function argument
+  */
   makePythonWriter =
     python: pythonPackages: buildPythonPackages: name:
     {
@@ -745,55 +938,86 @@ rec {
       }
     ) name;
 
-  # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and
-  # returns an executable
-  #
-  # Example:
-  # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } ''
-  #   from enum import Enum
-  #
-  #   class Test(Enum):
-  #       a = "success"
-  #
-  #   print Test.a
-  # ''
+  /**
+    writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and
+    returns an executable
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writePyPy2` usage example
+
+    ```nix
+    writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } ''
+      from enum import Enum
+
+      class Test(Enum):
+          a = "success"
+
+      print Test.a
+    ''
+    ```
+
+    :::
+  */
   writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages;
 
-  # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin)
+  /**
+    writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin)
+  */
   writePyPy2Bin = name: writePyPy2 "/bin/${name}";
 
-  # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and
-  # returns an executable
-  #
-  # Example:
-  # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } ''
-  #   import yaml
-  #
-  #   y = yaml.safe_load("""
-  #     - test: success
-  #   """)
-  #   print(y[0]['test'])
-  # ''
+  /**
+    writePython3 takes a name an attributeset with libraries and some python3 sourcecode and
+    returns an executable
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writePython3` usage example
+
+    ```nix
+    writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } ''
+      import yaml
+
+      y = yaml.safe_load("""
+        - test: success
+      """)
+      print(y[0]['test'])
+    ''
+    ```
+
+    :::
+  */
   writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages;
 
   # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin)
   writePython3Bin = name: writePython3 "/bin/${name}";
 
-  # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and
-  # returns an executable
-  #
-  # Example:
-  # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } ''
-  #   import yaml
-  #
-  #   y = yaml.safe_load("""
-  #     - test: success
-  #   """)
-  #   print(y[0]['test'])
-  # ''
+  /**
+    writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and
+    returns an executable
+
+    # Examples
+    :::{.example}
+    ## `pkgs.writers.writePyPy3` usage example
+
+    ```nix
+    writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } ''
+      import yaml
+
+      y = yaml.safe_load("""
+        - test: success
+      """)
+      print(y[0]['test'])
+    ''
+    ```
+
+    :::
+  */
   writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages;
 
-  # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin)
+  /**
+    writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin)
+  */
   writePyPy3Bin = name: writePyPy3 "/bin/${name}";
 
   makeFSharpWriter =

pkgs/by-name/ai/aider-chat/package.nix

@@ -51,9 +51,11 @@ python3.pkgs.buildPythonApplication {
       numpy
       packaging
       pathspec
+      pexpect
       pillow
       playwright
       prompt-toolkit
+      ptyprocess
       pypager
       pypandoc
       pyperclip

pkgs/by-name/ba/bant/package.nix

@@ -34,8 +34,8 @@ in buildBazelPackage rec {
 
   fetchAttrs = {
     sha256 = {
-      aarch64-linux = "sha256-38O9HPKMjqpNCO+kC8hUlsJAclONVCj3oj/iVRwOEDo=";
-      x86_64-linux = "sha256-OUVjgVIBNh0j10dgk/l42bqmsGuBC56uf4Ei/IRXxBI=";
+      aarch64-linux = "sha256-UI+Vz/gU6ki0yulcDbA1lkKJg0MZWYMIpfIHHmIjVLo=";
+      x86_64-linux = "sha256-9ryJUrmLkhuH6wRuHkAXIvOC+xGJ+jHL6vlAkRuXcUI=";
     }.${system} or (throw "No hash for system: ${system}");
   };
 

pkgs/by-name/bi/binary/package.nix

@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
-  version = "4.0";
+  version = "5.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
     rev = "refs/tags/${version}";
-    hash = "sha256-sIW20yHNPBeGSV9Rx7GMpuWpSkVgk5YMJoeYEq7Ag6s=";
+    hash = "sha256-T/gFXYcUJBN1NWMQaFco1bqqZTz3JHQpM8C2Y5yz7SI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/bl/bleep/package.nix

@@ -0,0 +1,75 @@
+{
+  stdenvNoCC,
+  fetchzip,
+  autoPatchelfHook,
+  installShellFiles,
+  makeWrapper,
+  lib,
+  zlib,
+}:
+let
+  platform =
+    {
+      x86_64-linux = "x86_64-pc-linux";
+      x86_64-darwin = "x86_64-apple-darwin";
+      aarch64-darwin = "arm64-apple-darwin";
+    }
+    ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
+
+  hash =
+    {
+      x86_64-linux = "sha256-dB8reN5rTlY5czFH7BaRya7qBa6czAIH2NkFWZh81ek=";
+      x86_64-darwin = "sha256-tpUcduCPCbVVaYZZOhWdPlN6SW3LGZPWSO9bDStVDms=";
+      aarch64-darwin = "sha256-V8QGF3Dpuy9I6CqKsJRHBHRdaLhc4XKZkv/rI7zs+qQ=";
+    }
+    ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "bleep";
+  version = "0.0.7";
+
+  src = fetchzip {
+    url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz";
+    hash = hash;
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ] ++ lib.optional stdenvNoCC.isLinux autoPatchelfHook;
+
+  buildInputs = [ zlib ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bleep -t $out/bin/
+    runHook postInstall
+  '';
+
+  dontAutoPatchelf = true;
+
+  postFixup =
+    lib.optionalString stdenvNoCC.isLinux ''
+      autoPatchelf $out
+    ''
+    + ''
+      export PATH=$PATH:$out/bin
+      installShellCompletion --cmd bleep \
+        --bash <(bleep install-tab-completions-bash --stdout) \
+        --zsh <(bleep install-tab-completions-zsh --stdout) \
+    '';
+
+  meta = {
+    homepage = "https://bleep.build/";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.mit;
+    description = "Bleeping fast scala build tool";
+    mainProgram = "bleep";
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [ kristianan ];
+  };
+})

pkgs/by-name/bm/bmake/package.nix

@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
-  version = "20240722";
+  version = "20240808";
 
   src = fetchurl {
     url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-FlS9DK0oQ2CElmmh6amTGB/tE3iWqsJpS4LqmjX3CeQ=";
+    hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg=";
   };
 
   patches = [
@@ -29,7 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = [ getopt ];
+  nativeBuildInputs = [
+    getopt
+  ];
 
   nativeCheckInputs = [
     bc

pkgs/by-name/bm/bmake/setup-hook.sh

@@ -17,7 +17,7 @@ bmakeBuildPhase() {
     )
     concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
-    echoCmd 'build flags' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     runHook postBuild
@@ -36,7 +36,7 @@ bmakeCheckPhase() {
     fi
 
     if [ -z "${checkTarget:-}" ]; then
-        echo "no test target found in bmake, doing nothing"
+        nixInfoLog "${FUNCNAME[0]}: no test target found in bmake, doing nothing"
     else
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
@@ -44,7 +44,7 @@ bmakeCheckPhase() {
         )
         concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget
 
-        echoCmd 'check flags' "${flagsArray[@]}"
+        nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
         bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
     fi
 
@@ -64,7 +64,7 @@ bmakeInstallPhase() {
     )
     concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install
 
-    echoCmd 'install flags' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     runHook postInstall
@@ -80,7 +80,7 @@ bmakeDistPhase() {
     local flagsArray=()
     concatTo flagsArray distFlags distFlagsArray distTarget=dist
 
-    echo 'dist flags: %q' "${flagsArray[@]}"
+    nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"
     bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
 
     if [ "${dontCopyDist:-0}" != 1 ]; then
@@ -98,16 +98,20 @@ preConfigureHooks+=(addMakeFlags)
 
 if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then
     buildPhase=bmakeBuildPhase
+    nixInfoLog "${FUNCNAME[0]}: set buildPhase to bmakeBuildPhase"
 fi
 
 if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then
     checkPhase=bmakeCheckPhase
+    nixInfoLog "${FUNCNAME[0]}: set checkPhase to bmakeCheckPhase"
 fi
 
 if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then
     installPhase=bmakeInstallPhase
+    nixInfoLog "${FUNCNAME[0]}: set installPhase to bmakeInstallPhase"
 fi
 
 if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then
     distPhase=bmakeDistPhase
+    nixInfoLog "${FUNCNAME[0]}: set distPhase to bmakeDistPhase"
 fi

pkgs/by-name/bn/bngblaster/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-fJDoKGYal/wDpe2FALWDm0cVngP2ybWlrDIJLSEBIGY=";
+    hash = "sha256-VPzlORjLcsHY/rSYFlzKb5dh9D7j302dcRFULVjQSa0=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/bo/bozohttpd/package.nix

@@ -0,0 +1,107 @@
+{
+  lib,
+  bmake,
+  fetchurl,
+  groff,
+  inetutils,
+  libxcrypt,
+  lua,
+  openssl,
+  stdenv,
+  wget,
+  # Boolean flags
+  minimal ? false,
+  userSupport ? !minimal,
+  cgiSupport ? !minimal,
+  dirIndexSupport ? !minimal,
+  dynamicContentSupport ? !minimal,
+  sslSupport ? !minimal,
+  luaSupport ? !minimal,
+  htpasswdSupport ? !minimal,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bozohttpd";
+  version = "20240126";
+
+  # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:
+  # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo
+  src = fetchurl {
+    url = "http://eterna23.net/bozohttpd/bozohttpd-${finalAttrs.version}.tar.bz2";
+    hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg==";
+  };
+
+  buildInputs = [
+    libxcrypt
+    openssl
+  ] ++ lib.optionals (luaSupport) [ lua ];
+
+  nativeBuildInputs = [
+    bmake
+    groff
+  ];
+
+  nativeCheckInputs = [
+    inetutils
+    wget
+  ];
+
+  env = {
+    COPTS = lib.concatStringsSep " " (
+      [
+        "-D_DEFAULT_SOURCE"
+        "-D_GNU_SOURCE"
+
+        # ensure that we can serve >2GB files even on 32-bit systems.
+        "-D_LARGEFILE_SOURCE"
+        "-D_FILE_OFFSET_BITS=64"
+
+        # unpackaged dependency: https://man.netbsd.org/blocklist.3
+        "-DNO_BLOCKLIST_SUPPORT"
+      ]
+      ++ lib.optionals (htpasswdSupport) [ "-DDO_HTPASSWD" ]
+      ++ lib.optionals (!cgiSupport) [ "-DNO_CGIBIN_SUPPORT" ]
+      ++ lib.optionals (!dirIndexSupport) [ "-DNO_DIRINDEX_SUPPORT" ]
+      ++ lib.optionals (!dynamicContentSupport) [ "-DNO_DYNAMIC_CONTENT" ]
+      ++ lib.optionals (!luaSupport) [ "-DNO_LUA_SUPPORT" ]
+      ++ lib.optionals (!sslSupport) [ "-DNO_SSL_SUPPORT" ]
+      ++ lib.optionals (!userSupport) [ "-DNO_USER_SUPPORT" ]
+    );
+
+    _LDADD = lib.concatStringsSep " " (
+      [ "-lm" ]
+      ++ lib.optionals (stdenv.hostPlatform.libc != "libSystem") [ "-lcrypt" ]
+      ++ lib.optionals (luaSupport) [ "-llua" ]
+      ++ lib.optionals (sslSupport) [
+        "-lcrypto"
+        "-lssl"
+      ]
+    );
+  };
+
+  makeFlags = [ "LDADD=$(_LDADD)" ];
+
+  checkFlags = lib.optionals (!cgiSupport) [ "CGITESTS=" ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://www.eterna23.net/bozohttpd/";
+    description = "Bozotic HTTP server; small and secure";
+    longDescription = ''
+      bozohttpd is a small and secure HTTP version 1.1 server. Its main
+      feature is the lack of features, reducing the code size and improving
+      verifiability.
+
+      It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations,
+      virtual hosting support, as well as multiple IP-based servers on a
+      single machine. It is capable of servicing pages via the IPv6 protocol.
+      It has SSL support. It has no configuration file by design.
+    '';
+    changelog = "http://www.eterna23.net/bozohttpd/CHANGES";
+    license = lib.licenses.bsd2;
+    mainProgram = "bozohttpd";
+    maintainers = [ lib.maintainers.embr ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/bs/bs2b-lv2/package.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  python3,
+  wafHook,
+  libbs2b,
+  lv2,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bs2b-lv2";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "nilninull";
+    repo = "bs2b-lv2";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-dOcDPtiKN9Kfs2cdaeDO/GkWrh5tfJSHfiHPBtxJXvc=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    python3
+    wafHook
+  ];
+
+  buildInputs = [
+    libbs2b
+    lv2
+  ];
+
+  meta = with lib; {
+    description = "LV2 plugin for using Bauer stereophonic-to-binaural DSP library";
+    homepage = "https://github.com/nilninull/bs2b-lv2";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}

pkgs/by-name/ce/ceph-csi/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ceph-csi";
-  version = "3.11.0";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
     rev = "v${version}";
-    hash = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A=";
+    hash = "sha256-ujshfbqOyyOZUYuR5edLPGOKlteu1gxmn0xo+QzZLVM=";
   };
 
   preConfigure = ''

pkgs/by-name/ch/cheese/package.nix

@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/cheese";
     description = "Take photos and videos with your webcam, with fun graphical effects";
     mainProgram = "cheese";
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };

pkgs/by-name/co/concord/package.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "concord";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Cogmasters";
     repo = "concord";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-8k/W6007U1/s3vx03i1929a5RKZtpW/jOr4JDwmzwp8=";
+    hash = "sha256-yTFGRnhDzxU+dPeZbCWlm52gsmEgD2el+46c8XQBQng=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

pkgs/by-name/co/containerlab/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "containerlab";
-  version = "0.57.0";
+  version = "0.57.1";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     rev = "v${version}";
-    hash = "sha256-dqREbTDRhSEQg8swZ5ljhAtu3Yv421/QNmpkWopPWbk=";
+    hash = "sha256-b7Y65DCBDTyScGvYrz83ZN2oWN64ydoVXnssdnuZjQw=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-3ESz1wnbm6KfXSO5Fw4c7uUxL3K8Lsib5KAYoRD6vrw=";
+  vendorHash = "sha256-mI5w7hUfQZPWv5JPbBodHxonLxtZfnHRw2K7Nl6sDOE=";
 
   ldflags = [
     "-s"

pkgs/by-name/cr/crystal-dock/package.nix

@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-c5Kae2cZ/DoJ972VT4kQWNUr2cF6Noy3nPIChWok/BA=";
+    hash = "sha256-lqj2C4WrpJd1WMtm8JvGTEWeEUh17DR6J5TqxKt5hWM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/do/dorion/package.nix

@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tiny alternative Discord client";
     license = lib.licenses.gpl3Only;
     mainProgram = "dorion";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64);
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };

pkgs/by-name/en/en-croissant/package.nix

@@ -0,0 +1,121 @@
+{
+  lib,
+  stdenv,
+  overrideSDK,
+  rustPlatform,
+  fetchFromGitHub,
+
+  pnpm_9,
+  nodejs,
+  cargo-tauri,
+  pkg-config,
+  wrapGAppsHook3,
+  makeBinaryWrapper,
+
+  openssl,
+  libsoup,
+  webkitgtk,
+  gst_all_1,
+  darwin,
+}:
+
+let
+  buildRustPackage = rustPlatform.buildRustPackage.override {
+    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+  };
+in
+buildRustPackage rec {
+  pname = "en-croissant";
+  version = "0.11.1";
+
+  src = fetchFromGitHub {
+    owner = "franciscoBSalgueiro";
+    repo = "en-croissant";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ=";
+  };
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-hjSioKpvrGyo5UKvBrwln0S3aIpnJZ2PUdzBfbT7IC4=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "tauri-plugin-log-0.0.0" = "sha256-t+zmMMSnD9ASZZvqlhu1ah2OjCUtRXdk/xaI37uI49c=";
+      "vampirc-uci-0.11.1" = "sha256-g2JjHZoAmmZ7xsw4YnkUPRXJxsYmBqflWxCFkFEvMXQ=";
+    };
+  };
+
+  cargoRoot = "src-tauri";
+
+  buildAndTestSubdir = cargoRoot;
+
+  nativeBuildInputs =
+    [
+      pnpm_9.configHook
+      nodejs
+      cargo-tauri
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ]
+    ++ lib.optionals stdenv.isDarwin [ makeBinaryWrapper ];
+
+  buildInputs =
+    lib.optionals stdenv.isLinux [
+      openssl
+      libsoup
+      webkitgtk
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gst-plugins-good
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.Cocoa
+      darwin.apple_sdk_11_0.frameworks.WebKit
+    ];
+
+  # remove once cargo-tauri.hook becomes available
+  # https://github.com/NixOS/nixpkgs/pull/335751
+  buildPhase = ''
+    runHook preBuild
+
+    cargo tauri build --bundles ${if stdenv.isDarwin then "app" else "deb"}
+
+    runHook postBuild
+  '';
+
+  doCheck = false; # many scoring tests fail
+
+  # remove once cargo-tauri.hook becomes available
+  installPhase = ''
+    runHook preInstall
+
+    ${lib.optionalString stdenv.isDarwin ''
+      mkdir -p "$out"/Applications
+      cp -r src-tauri/target/release/bundle/macos/* "$out"/Applications
+    ''}
+
+    ${lib.optionalString stdenv.isLinux ''
+      mkdir -p "$out"
+      cp -r src-tauri/target/release/bundle/deb/*/data/usr/* "$out"
+    ''}
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant
+  '';
+
+  meta = {
+    description = "Ultimate Chess Toolkit";
+    homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "en-croissant";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}

pkgs/by-name/fc/fcitx5-fluent/package.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  jdupes,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "fcitx5-fluent";
+  version = "0.4.0-unstable-2024-03-30";
+
+  src = fetchFromGitHub {
+    owner = "Reverier-Xu";
+    repo = "Fluent-fcitx5";
+    rev = "dc98bc13e8eadabed7530a68706f0a2a0a07340e";
+    hash = "sha256-d1Y0MUOofBxwyeoXxUzQHrngL1qnL3TMa5DhDki7Pk8=";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fcitx5/themes
+    cp -r FluentDark FluentDark-solid FluentLight FluentLight-solid $out/share/fcitx5/themes
+    jdupes --quiet --link-soft --recurse $out/share
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A fluent-design theme with blur effect and shadow";
+    homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ oo-infty ];
+  };
+}

pkgs/by-name/fd/fdroidserver/package.nix

@@ -1,37 +1,17 @@
 {
   lib,
   fetchFromGitLab,
+  python3Packages,
+  python3,
   fetchPypi,
   apksigner,
-  appdirs,
-  buildPythonApplication,
-  python3,
   installShellFiles,
-  androguard,
-  babel,
-  clint,
-  defusedxml,
-  gitpython,
-  libcloud,
-  mwclient,
-  oscrypto,
-  paramiko,
-  pillow,
-  pyasn1,
-  pyasn1-modules,
-  python-vagrant,
-  pyyaml,
-  qrcode,
-  requests,
-  ruamel-yaml,
-  sdkmanager,
-  yamllint,
 }:
 
 let
-  version = "2.3a1";
+  version = "2.3a2";
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "fdroidserver";
   inherit version;
 
@@ -40,8 +20,8 @@ buildPythonApplication {
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
-    rev = "2.3a1";
-    hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA=";
+    rev = version;
+    hash = "sha256-nsAFBZqxo4XVWU6nBjo2T6VhU8U4I8h/FRXd1L240rk=";
   };
 
   pythonRelaxDeps = [
@@ -68,11 +48,11 @@ buildPythonApplication {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = [ babel ];
+  build-system = with python3Packages; [ babel ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     androguard
-    appdirs
+    platformdirs
     clint
     defusedxml
     gitpython
@@ -83,6 +63,7 @@ buildPythonApplication {
     pillow
     pyasn1
     pyasn1-modules
+    pycountry
     python-vagrant
     pyyaml
     qrcode

pkgs/by-name/fl/flarectl/package.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "flarectl";
-  version = "0.103.0";
+  version = "0.104.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
     rev = "v${version}";
-    hash = "sha256-mYdZgHJz2Ajrk/JRbaDeghm39PWidnAIZvjJTvl8lpM=";
+    hash = "sha256-XHvWdSqkVEM/0FWkvSZDLEh8W2h8f+12ROrZSgmZS1k=";
   };
 
-  vendorHash = "sha256-R3By8/cR4pZQgUSyNGDnnvWwcpZqraqk5GRZ8Om9JOU=";
+  vendorHash = "sha256-KMCwbbDpj4QAgvKLlOPDKSlrDyf+K/tGTMM/GBlvyuc=";
 
   subPackages = [ "cmd/flarectl" ];
 

pkgs/by-name/ga/gate/package.nix

@@ -5,7 +5,7 @@
 
 let
   pname = "gate";
-  version = "0.39.3";
+  version = "0.40.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-K2xpRljlKO9DAlXqnmlWsY67ysv449o2vb+OuSXcvnY=";
+    hash = "sha256-zEbkt38/K4LVLVXXqaLU83mX94vI/dbZ+JqOjn2u0/c=";
   };
 
-  vendorHash = "sha256-GatbReuW6azrxHnGuW1omR3HRntLBp0J8in4sRc7sJc=";
+  vendorHash = "sha256-W3YBIbxblxO5Rirso+b20h4cwUzfj8rG/Owh1KyJ0mM=";
 
   ldflags = [ "-s" "-w" ];
 

pkgs/by-name/gi/git-spice/package.nix

@@ -1,23 +1,32 @@
 {
   lib,
-  buildGoModule,
+  fetchpatch,
+  buildGo123Module,
   fetchFromGitHub,
   git,
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "git-spice";
-  version = "0.4.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D+kwH7fBRvi+H0/L7Gezn1FMBk3AkL9MbLULAwvrzrg=";
+    hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k=";
   };
 
-  vendorHash = "sha256-24jtlvp8xSMzNejyzqt+MiQHRKprps132Q+rP9wlA30=";
+  vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs=";
+
+  # Fixes flaky test. Remove next release.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch";
+      hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k=";
+    })
+  ];
 
   subPackages = [ "." ];
 

pkgs/by-name/gn/gnome-pomodoro/package.nix

@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       This GNOME utility helps to manage time according to Pomodoro Technique.
       It intends to improve productivity and focus by taking short breaks.
     '';
-    maintainers = [ ];
+    maintainers = with maintainers; [ aleksana ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };

pkgs/by-name/ig/ignite-cli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ignite-cli";
-  version = "28.5.1";
+  version = "28.5.2";
 
   src = fetchFromGitHub {
     repo = "cli";
     owner = "ignite";
     rev = "v${version}";
-    hash = "sha256-JgcLW+CoxLaz9WKGkSDpUEZJtEeP35LveW0B3arnNw0=";
+    hash = "sha256-RaK8NooOYYuk8RhxeeU9mB9PNSgWJ9nOxxcpi87YQQ0=";
   };
 
-  vendorHash = "sha256-NEjva9KDPz7rykqcKcTOwSKBR3n4oFSYARX/BQzhgqY=";
+  vendorHash = "sha256-u/EwT43K7Tu7ns0NIWkRl7OiQuP37zz4ERUwCLXY1TE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/by-name/ku/kulala-fmt/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kulala-fmt";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "mistweaverco";
     repo = "kulala-fmt";
     rev = "v${version}";
-    hash = "sha256-5MilRr5ictLVZtkB2boSoPktkDA0oOXRPkfREX5b448=";
+    hash = "sha256-VWd+lUPRgDVaM8nnwah/dXjQeHsLD3OM2D8coEJDCu4=";
   };
 
   vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";

pkgs/by-name/la/lacus/package.nix

@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -16,6 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   pythonRelaxDeps = [
+    "gunicorn"
     "psutil"
     "redis"
   ];

pkgs/by-name/ld/ldid-procursus/package.nix

@@ -1,10 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, installShellFiles
-, pkg-config
-, libplist
-, openssl
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+  fetchpatch,
+  pkg-config,
+  libplist,
+  openssl,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,15 +20,32 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ=";
   };
 
-  nativeBuildInputs = [ pkg-config installShellFiles ];
-  buildInputs = [ libplist openssl ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+
+  buildInputs = [
+    libplist
+    openssl
+  ];
 
   stripDebugFlags = [ "--strip-unneeded" ];
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
+  dontConfigure = true;
+
+  patches = [
+    (fetchpatch {
+      name = "fix-memory-issues-with-various-entitlements.patch";
+      url = "https://github.com/ProcursusTeam/ldid/commit/f38a095aa0cc721c40050cb074116c153608a11b.patch";
+      hash = "sha256-D5o/E2tCbuNOv2D9UVaLEx8ZiwSB/wT0hf7XaTGzxE0=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "pkg-config" "$PKG_CONFIG"
+      --replace-fail "pkg-config" "$PKG_CONFIG"
   '';
 
   postInstall = ''

pkgs/by-name/li/libresplit/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gtk3,
+  jansson,
+  luajit,
+  pkg-config,
+  unstableGitUpdater,
+  wrapGAppsHook3,
+  xxd,
+}:
+
+stdenv.mkDerivation {
+  pname = "libresplit";
+  version = "0-unstable-2024-06-05";
+
+  src = fetchFromGitHub {
+    owner = "wins1ey";
+    repo = "LibreSplit";
+    rev = "ba10e054e2cd3a96034e3a8d5758f4ad32759ff0";
+    hash = "sha256-imKzBXwyJQeChT36FuY7ihZw+IcGbjp7LoMGRy3hM/0=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+    xxd
+  ];
+
+  buildInputs = [
+    gtk3
+    jansson
+    luajit
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    homepage = "https://github.com/wins1ey/LibreSplit";
+    description = "Speedrun timer with auto splitting and load removal for Linux";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ fgaz ];
+    mainProgram = "libresplit";
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/lx/lxgw-neoxihei/package.nix

@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.202";
+  version = "1.205";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-J0dCbgpI3bQwuA/fM5m1Rh43ZaihGSjsTTyFvp8TAEM=";
+    hash = "sha256-86EengjzmhmEVm7yOovRF/oG7i8nlhzLL44N8j/nf9w=";
   };
 
   dontUnpack = true;

pkgs/by-name/ma/materialgram/package.nix

@@ -6,14 +6,14 @@
 telegram-desktop.overrideAttrs (
   finalAttrs: previousAttrs: {
     pname = "materialgram";
-    version = "5.4.1.1";
+    version = "5.5.4.1";
 
     src = fetchFromGitHub {
       owner = "kukuruzka165";
       repo = "materialgram";
       rev = "refs/tags/v${finalAttrs.version}";
       fetchSubmodules = true;
-      hash = "sha256-enA/8mIXcRTPGyZFgZ5Wg4fWq4fD4rtjH7bm/32FZaE";
+      hash = "sha256-LfeIhnCQ/b3Z7F3jUEdutlbZjSQoGr+zXP3oBiqe3XY=";
     };
 
     meta = previousAttrs.meta // {

pkgs/by-name/me/media-downloader/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "media-downloader";
-  version = "5.0.1";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
     rev = finalAttrs.version;
-    hash = "sha256-yAG9F9helGM8/TjJiqMDUviHK6uEUvHGny2QklwB2JY=";
+    hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mo/mods/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "mods";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "mods";
     rev = "v${version}";
-    hash = "sha256-Niap2qsIJwlDRITkPD2Z7NCiJubkyy8/pvagj5Beq84=";
+    hash = "sha256-1Qx3P1q7zmrzNqmiivri0BxdEsRYgS1cOp17S44jRPI=";
   };
 
-  vendorHash = "sha256-DaSbmu1P/umOAhG901aC+TKa3xXSvUbpYsaiYTr2RJs=";
+  vendorHash = "sha256-LarOXYkyhSCMXkD2G3/XYHnj5bDcL6nwWxlMAYy+9d8=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/mo/mountpoint-s3/package.nix

@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mountpoint-s3";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "mountpoint-s3";
     rev = "v${version}";
-    hash = "sha256-0SygSRp2HXgLhW0BscRhH3H/WUstAf6VbQPJ35ffrRM=";
+    hash = "sha256-uzTnkspTS3WvJUOmp8z7L/L1ut6NvnSlnsRa5yvaTRI=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-nkTvVfbpi5yvWpRd1Tm6INi3PrR6mP8VkBpIVeCEkw0=";
+  cargoHash = "sha256-kru8CBN9Mqm8Og7SKICjqSvds7z58RRqI4W2txLvWXo=";
 
   # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
   # cargo metadata failure: error: none of the selected packages contains these features: libfuse3

pkgs/by-name/ni/niri/package.nix

@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
+, libdisplay-info
 , libxkbcommon
 , pango
 , pipewire
@@ -20,19 +21,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "niri";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     rev = "v${version}";
-    hash = "sha256-13xynDWoOqogUKZTf6lz267hEQGdCE+BE6acs2G3j8k=";
+    hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "smithay-0.3.0" = "sha256-4lmCbdW+fOnPWEDAbKk4LFcr9KK+akjUJqiwm0pK8Uw=";
+      "smithay-0.3.0" = "sha256-/3BO66yVoo63+5rwrZzoxhSTncvLyHdvtSaApFj3fBg=";
       "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
     };
   };
@@ -48,6 +49,7 @@ rustPlatform.buildRustPackage rec {
     wayland
     systemd # For libudev
     seatd # For libseat
+    libdisplay-info
     libxkbcommon
     libinput
     mesa # For libgbm

pkgs/by-name/ni/nixos-facter/package.nix

@@ -0,0 +1,71 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  hwinfo,
+  libusb1,
+  gcc,
+  pkg-config,
+  util-linux,
+  pciutils,
+  stdenv,
+}:
+let
+  # We are waiting on some changes to be merged upstream: https://github.com/openSUSE/hwinfo/pulls
+  hwinfoOverride = hwinfo.overrideAttrs {
+    src = fetchFromGitHub {
+      owner = "numtide";
+      repo = "hwinfo";
+      rev = "42b014495b2de8735eeec950bc2d3afbefc65ec4";
+      hash = "sha256-OXbGF8M1r8GSgqeY4TqfjF+IO0SXXB/dX2jE2JtkPUk=";
+    };
+  };
+in
+buildGoModule rec {
+  pname = "nixos-facter";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "numtide";
+    repo = "nixos-facter";
+    rev = "v${version}";
+    hash = "sha256-TBSzIaOuD/IEObgwSx0UwFFAkqF1pAAWhDrNDtQShdY=";
+  };
+
+  vendorHash = "sha256-8yQO7topYvXL6bP0oSVN1rApiPjse4Q2bjFNM5jVl8c=";
+
+  CGO_ENABLED = 1;
+
+  buildInputs = [
+    libusb1
+    hwinfoOverride
+  ];
+
+  nativeBuildInputs = [
+    gcc
+    pkg-config
+  ];
+
+  runtimeInputs = [
+    libusb1
+    util-linux
+    pciutils
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X git.numtide.com/numtide/nixos-facter/build.Name=nixos-facter"
+    "-X git.numtide.com/numtide/nixos-facter/build.Version=v${version}"
+    "-X github.com/numtide/nixos-facter/pkg/build.System=${stdenv.hostPlatform.system}"
+  ];
+
+  meta = {
+    description = "Declarative hardware configuration for NixOS";
+    homepage = "https://github.com/numtide/nixos-facter";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.brianmcgee ];
+    mainProgram = "nixos-facter";
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/nu/nuclei-templates/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "9.9.4";
+  version = "10.0.0";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1o9FvE8wuvswTXbVncTr77p7oWg0c2bVQQZvOxsgxFw=";
+    hash = "sha256-FGhq1KgHvHkyBXAWdG3OBuNJHj+epLeRw+T241bUSeY=";
   };
 
   installPhase = ''

pkgs/by-name/ob/obs-cmd/package.nix

@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "obs-cmd";
-  version = "0.17.7";
+  version = "0.17.8";
 
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
     rev = "v${version}";
-    hash = "sha256-+rsX86PrTlswi7uItyfOqYWziJ0kLl9X86TMtcmMCKo=";
+    hash = "sha256-IOGdy3X0/r/kuEXAvLeJk2HXtcGI+vbh4Dn1/yOpkmM=";
   };
 
-  cargoHash = "sha256-u+IHQiKEX0KUkwz4KsqwIgdo3KAxarPZgrmJWA1qQ50=";
+  cargoHash = "sha256-oCu/ygjZxEqxE+5Vca3l1mZP3hd+r+5gi2iogQMnEcU=";
 
   meta = with lib; {
     description = "Minimal CLI to control OBS Studio via obs-websocket";

pkgs/by-name/pa/parinfer-rust-emacs/package.nix

@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "parinfer-rust-emacs";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "justinbarclay";
     repo = "parinfer-rust-emacs";
     rev = "v${version}";
-    hash = "sha256-SNs/75beomxvexfE4+3v/l9Xl5w5SY0EWcORHvRitOw=";
+    hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0=";
   };
 
-  cargoHash = "sha256-LmfcY9iR7BGh3dF/raSZTIwburtaQRI3I3XvOZG343M=";
+  cargoHash = "sha256-E3x/Jy21qP1onABRmbrq51ZKrlqwiWIwSaqOCh28lKw=";
 
   meta = with lib; {
     description = "Emacs centric fork of parinfer-rust";

pkgs/by-name/pd/pdns-recursor/package.nix

@@ -8,17 +8,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.0.6";
+  version = "5.1.1";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-2QiF0qu33f6XQc2Pv1ubppAilsd7L1Ekh3kGZZHvPzI=";
+    hash = "sha256-W3q3k6zoIilKPzgJL+cu5kdI/wy7ilKD3Hf0B4BgWuk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) src;
     sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust";
-    hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA=";
+    hash = "sha256-1CHhnW8s4AA06HAgW+A/mx1jGTynj4CvIc/I7n0h+VY";
   };
 
   cargoRoot = "settings/rust";

pkgs/by-name/pi/picocrypt/package.nix

@@ -15,18 +15,18 @@
 
 buildGoModule rec {
   pname = "picocrypt";
-  version = "1.42";
+  version = "1.43";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ehsjt3zCtJFBJ0l707uRtEfDC3M99mb9HFcNlH1btVE=";
+    hash = "sha256-xxlmerEGujBvghC+OpMW0gkDl7zPOW4r6cM7T6qOc6A=";
   };
 
   sourceRoot = "${src.name}/src";
 
-  vendorHash = "sha256-S5iR0eeR+nqxNzE3+KDN1Yw7nmycN0IhhMZjIdVb6WQ=";
+  vendorHash = "sha256-QeNFXmWeA/hkYdFzJoHj61bo/DmGWakdhFRLtSYG7+Y=";
 
   ldflags = [
     "-s"

pkgs/by-name/py/pyright/package.nix

@@ -1,13 +1,13 @@
 { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
 
 let
-  version = "1.1.378";
+  version = "1.1.380";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     rev = "${version}";
-    hash = "sha256-GFrVnMGYR57IKUybAuVyriwgOLfPBwf7H9NjJNvsTNE=";
+    hash = "sha256-Z73g4Fjj23rRTa2yIA3bjcZd2VHgXfDuHM6D77tHnZI=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -37,7 +37,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-Osz5c0HeJG1CgGiLuNUfIc5jvpY35a+y496JMt3FD+I=";
+    npmDepsHash = "sha256-YlhoMvqS7pOBmRBT4mrKPggBpT1DV9xn4OdlPCR9vv8=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -51,7 +51,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-XvswAKYGRoydha+areiXfGN6nXQObQmOWKp49Rhmbv0=";
+  npmDepsHash = "sha256-Bs9GHjjSKqiu6EmeAVgyEj6QylDxK7majrlIMZgLGqU=";
 
   postPatch = ''
     chmod +w ../../

pkgs/by-name/ra/railway/package.nix

@@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-uCgL08HADAtSt4OGqvHNGq95RG23QRYXHt0vIqCtjno=";
+    hash = "sha256-W9p987yn04Ije6JXFndHXB4rENGBTIiRmCh6fDhXJ4I=";
   };
 
-  cargoHash = "sha256-UblS3jhn5yJTog/qblnoHVaJbXZKYRnw+ZgabZ+pPcI=";
+  cargoHash = "sha256-/Lot/Cxg/BUp4MFp6VkJHR7jy7mUe7qwJDhPS8kOeUk=";
 
   nativeBuildInputs = [ pkg-config ];