Merge master into staging-next

lib/systems/default.nix

@@ -183,6 +183,7 @@ rec {
         else if final.isS390 && !final.isS390x then null
         else if final.isx86_64 then "x86_64"
         else if final.isx86 then "i386"
+        else if final.isMips64n32 then "mipsn32${lib.optionalString final.isLittleEndian "el"}"
         else if final.isMips64 then "mips64${lib.optionalString final.isLittleEndian "el"}"
         else final.uname.processor;
 

nixos/modules/virtualisation/google-compute-config.nix

@@ -39,7 +39,7 @@ in
   # Allow root logins only using SSH keys
   # and disable password authentication in general
   services.openssh.enable = true;
-  services.openssh.settings.PermitRootLogin = "prohibit-password";
+  services.openssh.settings.PermitRootLogin = mkDefault "prohibit-password";
   services.openssh.settings.PasswordAuthentication = mkDefault false;
 
   # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on

pkgs/applications/editors/bluej/default.nix

@@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     cp -r usr/* $out
 
+    rm -r $out/share/bluej/jdk
+    rm -r $out/share/bluej/javafx
+    rm -r $out/share/bluej/javafx-*.jar
+
     makeWrapper ${openjdk}/bin/java $out/bin/bluej \
       "''${gappsWrapperArgs[@]}" \
       --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \
@@ -49,6 +53,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.bluej.org/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.gpl2ClasspathPlus;
+    mainProgram = pname;
     maintainers = with maintainers; [ chvp ];
     platforms = platforms.linux;
   };

pkgs/build-support/php/pkgs/composer-phar.nix

@@ -14,11 +14,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "composer-phar";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchurl {
     url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";
-    hash = "sha256-iMhNSlP88cJ9Z2Lh1da3DVfG3J0uIxT9Cdv4a/YeGu8=";
+    hash = "sha256-5Yo5DKwN9FzPWj2VrpT6I57e2LeQf6LI91LwIDBPybE=";
   };
 
   dontUnpack = true;

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

@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitea
+, autoreconfHook
+, pkg-config
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libburn";
+  version = "1.5.6";
+
+  src = fetchFromGitea {
+    domain = "dev.lovelyhq.com";
+    owner = "libburnia";
+    repo = "libburn";
+    rev = "release-${finalAttrs.version}";
+    hash = "sha256-Xo45X4374FXvlrJ4Q0PahYvuWXO0k3N0ke0mbURYt54=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  outputs = [ "out" "man" ];
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://dev.lovelyhq.com/libburnia/web/wiki";
+    description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
+    changelog = "https://dev.lovelyhq.com/libburnia/libburn/src/tag/${finalAttrs.src.rev}/ChangeLog";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ abbradar AndersonTorres ];
+    mainProgram = "cdrskin";
+    platforms = lib.platforms.unix;
+  };
+})

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

@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitea
+, acl
+, attr
+, autoreconfHook
+, libburn
+, libisofs
+, pkg-config
+, zlib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libisoburn";
+  version = "1.5.6";
+
+  src = fetchFromGitea {
+    domain = "dev.lovelyhq.com";
+    owner = "libburnia";
+    repo = "libisoburn";
+    rev = "release-${finalAttrs.version}";
+    hash = "sha256-16qNVlWFVXfvbte5EgP/u193wK2GV/r22hVX0SZWr+0=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    attr
+    zlib
+    libburn
+    libisofs
+  ];
+
+  propagatedBuildInputs = [
+    acl
+  ];
+
+  outputs = [ "out" "lib" "dev" "info" "man" ];
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "http://libburnia-project.org/";
+    description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD ";
+    changelog = "https://dev.lovelyhq.com/libburnia/libisoburn/src/tag/${finalAttrs.src.rev}/ChangeLog";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "osirrox";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    inherit (libisofs.meta) platforms;
+  };
+})

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

@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitea
+, acl
+, attr
+, autoreconfHook
+, libiconv
+, zlib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libisofs";
+  version = "1.5.6.pl01";
+
+  src = fetchFromGitea {
+    domain = "dev.lovelyhq.com";
+    owner = "libburnia";
+    repo = "libisofs";
+    rev = "release-${finalAttrs.version}";
+    hash = "sha256-U5We19f/X1UKYFacCRl+XRXn67W8cYOBORb2uEjanT4=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.isLinux [
+    acl
+    attr
+  ] ++ lib.optionals stdenv.isDarwin [
+    libiconv
+  ] ++ [
+    zlib
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "https://dev.lovelyhq.com/libburnia/web/wiki";
+    description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
+    changelog = "https://dev.lovelyhq.com/libburnia/libisofs/src/tag/${finalAttrs.src.rev}/ChangeLog";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ abbradar AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/sy/symbolicator/package.nix

@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "symbolicator";
-  version = "23.8.0";
+  version = "23.9.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
     rev = version;
-    hash = "sha256-cCorFBZLLVLp+j94MyXJMPE1GcmAkK8AZq6DHuTNYtA=";
+    hash = "sha256-odlxslhSsalWbgouzq/1Gyn/5hekoW0dtgshz1vxsg8=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/xo/xorriso/package.nix

@@ -12,15 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xorriso";
-  version = "1.5.6.pl02";
+  version = "1.5.7";
 
   src = fetchurl {
-    url = "mirror://gnu/xorriso/xorriso-${finalAttrs.version}.tar.gz";
-    hash = "sha256-eG+fXfmGXMWwwf7O49LA9eBMq4yahZvRycfM1JZP2uE=";
+    url = "https://www.gnu.org/software/xorriso/xorriso-${finalAttrs.version}.tar.gz";
+    hash = "sha256-hnV3w4f2tKmjIk60Qd7Y+xY432y8Bg+NGh5dAPMY9QI=";
   };
 
-  doCheck = true;
-
   buildInputs = [
     bzip2
     libcdio
@@ -33,8 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
     attr
   ];
 
+  outputs = [ "out" "man" ];
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include unistd.h";
 
+  doCheck = true;
+
+  strictDeps = true;
+
   meta = {
     homepage = "https://www.gnu.org/software/xorriso/";
     description = "ISO 9660 Rock Ridge file system manipulator";
@@ -48,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       filesystems.
     '';
     license = lib.licenses.gpl3Plus;
+    mainProgram = "xorriso";
     maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.unix;
   };

pkgs/development/libraries/libburn/default.nix

@@ -1,20 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "libburn";
-  version = "1.5.6";
-
-  src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs=";
-  };
-
-  meta = with lib; {
-    description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
-    homepage = "http://libburnia-project.org/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ abbradar vrthra ];
-    mainProgram = "cdrskin";
-    platforms = with platforms; unix;
-  };
-}

pkgs/development/libraries/libisoburn/default.nix

@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
-
-stdenv.mkDerivation rec {
-  pname = "libisoburn";
-  version = "1.5.6";
-
-  src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs=";
-  };
-
-  buildInputs = [ attr zlib libburn libisofs ];
-  propagatedBuildInputs = [ acl ];
-
-  meta = with lib; {
-    homepage = "http://libburnia-project.org/";
-    description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD ";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ vrthra ];
-    platforms = with platforms; linux;
-  };
-}

pkgs/development/libraries/libisofs/default.nix

@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, acl, attr, libiconv, zlib }:
-
-stdenv.mkDerivation rec {
-  pname = "libisofs";
-  version = "1.5.6.pl01";
-
-  outputs = [ "out" "dev" ];
-
-  src = fetchurl {
-    url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
-    hash = "sha256-rB/TONZBdEyh+xVnkXGIt5vIwlBoMt1WiF/smGVrnyU=";
-  };
-
-  buildInputs = lib.optionals stdenv.isLinux [
-    acl
-    attr
-  ] ++ lib.optionals stdenv.isDarwin [
-    libiconv
-  ] ++ [
-    zlib
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "http://libburnia-project.org/";
-    description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ abbradar vrthra ];
-    platforms = with platforms; unix;
-  };
-}

pkgs/development/ocaml-modules/ca-certs-nss/default.nix

@@ -14,14 +14,13 @@
 
 buildDunePackage rec {
   pname = "ca-certs-nss";
-  version = "3.86";
+  version = "3.92";
 
   minimalOCamlVersion = "4.08";
-  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
-    hash = "sha256-3b20vYBP9T2uR17Vxyilfs/9C72WVUrgR7T582V++lQ=";
+    hash = "sha256-F6eF5jQO9qJACQldad8va5jXPj05o61L8Bp1SDXHBTg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix

@@ -1,4 +1,7 @@
-{ lib, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage, ocaml }:
+
+lib.throwIf (lib.versionAtLeast ocaml.version "5.1")
+  "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
 
 buildDunePackage rec {
    pname = "ocaml-migrate-parsetree";

pkgs/development/php-packages/composer/default.nix

@@ -4,13 +4,13 @@ php.buildComposerProject (finalAttrs: {
   composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };
 
   pname = "composer";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "composer";
     repo = "composer";
     rev = finalAttrs.version;
-    hash = "sha256-tNc0hP41aRk7MmeWXCd73uHxK9pk1tCWyjiSO568qbE=";
+    hash = "sha256-yzpkdtfok22yMvRdv4jYrd8x8MgNZbSDOsg+sVl/JqE=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
@@ -20,7 +20,7 @@ php.buildComposerProject (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}
   '';
 
-  vendorHash = "sha256-V6C4LxEfXNWH/pCKATv1gf8f6/a0s/xu5j5bNJUNmnA=";
+  vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A=";
 
   meta = {
     changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";

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

@@ -0,0 +1,60 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, runCommand
+, python3
+, wireshark-cli
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "manuf";
+  version = "1.1.5";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "coolbho3k";
+    repo = "manuf";
+    rev = "${version}";
+    hash = "sha256-3CFs3aqwE8rZPwU1QBqAGxNHT5jg7ymG12yBD56gTNI=";
+  };
+
+  nativeBuildInputs = [ wireshark-cli ];
+
+  patches = [
+    # Do update while building package from wireshark-cli
+    ./internal_db_update_nix.patch
+    # Fix MANUF_URL for external db update functionality (https://github.com/coolbho3k/manuf/issues/34)
+    ./fix_manuf_url.patch
+  ];
+
+  postPatch = ''
+    cat ${wireshark-cli}/share/wireshark/{manuf,wka} > manuf/manuf
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "test_update_update"
+  ];
+
+  pythonImportsCheck = [ "manuf" ];
+
+  passthru.tests = {
+    testMacAddress = runCommand "${pname}-test" {} ''
+      ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out
+      [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ]
+    '';
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/coolbho3k/manuf";
+    description = " Parser library for Wireshark's OUI database";
+    mainProgram = "manuf";
+    platforms = platforms.linux;
+    license = with licenses; [ lgpl3Plus asl20 ];
+    maintainers = with maintainers; [ dsuetin ];
+  };
+}

pkgs/development/python-modules/manuf/fix_manuf_url.patch

@@ -0,0 +1,14 @@
+diff --git a/manuf/manuf.py b/manuf/manuf.py
+index 09e9687..0ac9296 100755
+--- a/manuf/manuf.py
++++ b/manuf/manuf.py
+@@ -61,7 +61,8 @@ class MacParser(object):
+         IOError: If manuf file could not be found.
+ 
+     """
+-    MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/master/manuf"
++    # https://github.com/coolbho3k/manuf/issues/34
++    MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf"
+     WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka"
+ 
+     def  __init__(self, manuf_name=None, update=False):

pkgs/development/python-modules/manuf/internal_db_update_nix.patch

@@ -0,0 +1,31 @@
+diff --git a/manuf/manuf.py b/manuf/manuf.py
+index e5e9193..09e9687 100755
+--- a/manuf/manuf.py
++++ b/manuf/manuf.py
+@@ -65,8 +65,14 @@ class MacParser(object):
+     WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka"
+ 
+     def  __init__(self, manuf_name=None, update=False):
+-        self._manuf_name = manuf_name or self.get_packaged_manuf_file_path()
+-        if update:
++        if manuf_name is not None:
++            self._manuf_name = manuf_name
++            self.external_db = True
++        else:
++            self._manuf_name = self.get_packaged_manuf_file_path()
++            self.external_db = False
++
++        if update and self.external_db:
+             self.update()
+         else:
+             self.refresh()
+@@ -134,6 +140,9 @@ class MacParser(object):
+             URLError: If the download fails
+ 
+         """
++        if manuf_url is None and not self.external_db:
++            return
++
+         if not manuf_url:
+             manuf_url = self.MANUF_URL
+         if not manuf_name:

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

@@ -4,6 +4,7 @@
 , django
 , fetchFromGitHub
 , numpy
+, peewee
 , postgresql
 , postgresqlTestHook
 , psycopg
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pgvector";
-  version = "0.2.1";
+  version = "0.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -25,7 +26,7 @@ buildPythonPackage rec {
     owner = "pgvector";
     repo = "pgvector-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug=";
+    hash = "sha256-qvLDFnrTYibdhjSeeIFI4YdpPRsvNBnQ23uqsLCblEo=";
   };
 
   propagatedBuildInputs = [
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     asyncpg
     django
+    peewee
     (postgresql.withPackages (p: with p; [ pgvector ]))
     postgresqlTestHook
     psycopg

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

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, unittestCheckHook
+, pytz
+, pyyaml
+, argparse
+}:
+
+buildPythonPackage rec {
+  pname = "pydateinfer";
+  version = "0.3.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "wdm0006";
+    repo = "dateinfer";
+    rev = "${version},"; # yes the comma is required, this is correct name of git tag
+    hash = "sha256-0gy7wfT/uMTmpdIF2OPGVeUh+4yqJSI2Ebif0Lf/DLM=";
+  };
+
+  propagatedBuildInputs = [
+    pytz
+  ];
+
+  preCheck = "cd dateinfer";
+  nativeCheckInputs = [
+    unittestCheckHook
+    pyyaml
+    argparse
+  ];
+  pythonImportsCheck = [ "dateinfer" ];
+
+  meta = with lib; {
+    description = "Infers date format from examples";
+    homepage = "https://pypi.org/project/pydateinfer/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mbalatsko ];
+  };
+}

pkgs/servers/dns/bind/default.nix

@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.18.18";
+  version = "9.18.19";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-1zXNwSemxXCb3kdbW/FvohM/Nv26IC98PDfRNOUZIWA=";
+    hash = "sha256-EV4JwFQ5vrreHScu2gj6iOs7YBKe3vaQWIyHpNJ2Esw=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

pkgs/tools/misc/fend/default.nix

@@ -5,6 +5,9 @@
 , darwin
 , pandoc
 , installShellFiles
+, copyDesktopItems
+, makeDesktopItem
+, nix-update-script
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-mRIwmZwO/uqfUJ12ZYKZFPoefvo055Tp+DrfKsoP9q4=";
 
-  nativeBuildInputs = [ pandoc installShellFiles ];
+  nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ];
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   postBuild = ''
@@ -38,10 +41,30 @@ rustPlatform.buildRustPackage rec {
     [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]]
   '';
 
+  postInstall = ''
+    install -D -m 444 $src/icon/fend-icon-256.png $out/share/icons/hicolor/256x256/apps/fend.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "fend";
+      desktopName = "fend";
+      genericName = "Calculator";
+      comment = "Arbitrary-precision unit-aware calculator";
+      icon = "fend";
+      exec = "fend";
+      terminal = true;
+      categories = [ "Utility" "Calculator" "ConsoleOnly" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Arbitrary-precision unit-aware calculator";
     homepage = "https://github.com/printfn/fend";
     license = licenses.mit;
-    maintainers = with maintainers; [ djanatyn ];
+    maintainers = with maintainers; [ djanatyn liff ];
+    mainProgram = "fend";
   };
 }

pkgs/tools/nix/fh/default.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fh";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
     rev = "v${version}";
-    hash = "sha256-Fxwy+PagG9FYeURQxM0rV1Lx9T+SFt58d2HfiFD5XTc=";
+    hash = "sha256-DWuGtjwz3cIR1IxJV8Kwm7vn2LijGGuPX8TOcwFvWXc=";
   };
 
-  cargoHash = "sha256-WbwAW9+c9cemog5Mlb/Czc5VZwFkGLJZzSVckgomiDw=";
+  cargoHash = "sha256-vZJRDVraDMSzBpZ8W6EENySJz44dkWdejSuvaYTFs6Q=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -45,6 +45,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "The official FlakeHub CLI";
     homepage = "https://github.com/DeterminateSystems/fh";
+    changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = with maintainers; [ figsoda ];
     mainProgram = "fh";

pkgs/top-level/all-packages.nix

@@ -15047,8 +15047,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  xorriso = callPackage ../tools/cd-dvd/xorriso { };
-
   xprite-editor = callPackage ../tools/misc/xprite-editor {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
@@ -22667,8 +22665,6 @@ with pkgs;
 
   libbson = callPackage ../development/libraries/libbson { };
 
-  libburn = callPackage ../development/libraries/libburn { };
-
   libbytesize = callPackage ../development/libraries/libbytesize { };
 
   libcaca = callPackage ../development/libraries/libcaca { };
@@ -23360,10 +23356,6 @@ with pkgs;
 
   libinstpatch = callPackage ../development/libraries/audio/libinstpatch { };
 
-  libisofs = callPackage ../development/libraries/libisofs { };
-
-  libisoburn = callPackage ../development/libraries/libisoburn { };
-
   libipt = callPackage ../development/libraries/libipt { };
 
   libiptcdata = callPackage ../development/libraries/libiptcdata { };

pkgs/top-level/python-packages.nix

@@ -6429,6 +6429,8 @@ self: super: with self; {
 
   manuel = callPackage ../development/python-modules/manuel { };
 
+  manuf = callPackage ../development/python-modules/manuf { };
+
   mapbox = callPackage ../development/python-modules/mapbox { };
 
   mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { };
@@ -9053,6 +9055,8 @@ self: super: with self; {
 
   pydata-sphinx-theme = callPackage ../development/python-modules/pydata-sphinx-theme { };
 
+  pydateinfer = callPackage ../development/python-modules/pydateinfer { };
+
   pydbus = callPackage ../development/python-modules/pydbus { };
 
   pydeck = callPackage ../development/python-modules/pydeck { };