libguestfs: move to by-name

pkgs/by-name/li/libguestfs-with-appliance/package.nix

@@ -0,0 +1,8 @@
+{
+libguestfs,
+libguestfs-appliance,
+}:
+
+libguestfs.override {
+    appliance = libguestfs-appliance;
+}

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

@@ -33,7 +33,7 @@
 , jansson
 , getopt
 , perlPackages
-, ocamlPackages
+, ocaml-ng
 , libtirpc
 , appliance ? null
 , javaSupport ? false
@@ -43,6 +43,10 @@
 
 assert appliance == null || lib.isDerivation appliance;
 
+let
+  # GetoptLong not avaible with newer ocaml
+  ocamlPackages' = ocaml-ng.ocamlPackages_4_14;
+in
 stdenv.mkDerivation rec {
   pname = "libguestfs";
   version = "1.50.1";
@@ -66,7 +70,7 @@ stdenv.mkDerivation rec {
     qemu
     zstd
   ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
-  ++ (with ocamlPackages; [ ocaml findlib ]);
+  ++ (with ocamlPackages'; [ ocaml findlib ]);
   buildInputs = [
     libxcrypt
     ncurses
@@ -91,7 +95,7 @@ stdenv.mkDerivation rec {
     libapparmor
     perlPackages.ModuleBuild
     libtirpc
-  ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ])
+  ] ++ (with ocamlPackages'; [ ocamlbuild ocaml_libvirt gettext-stub ounit ])
   ++ lib.optional javaSupport jdk;
 
   prePatch = ''
@@ -99,7 +103,7 @@ stdenv.mkDerivation rec {
     substituteInPlace run.in        --replace '#!/bin/bash' '#!${stdenv.shell}'
     substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
 
-    # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
+    # $(OCAMLLIB) is read-only "${ocamlPackages'.ocaml}/lib/ocaml"
     substituteInPlace ocaml/Makefile.am            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
     substituteInPlace ocaml/Makefile.in            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
 

pkgs/top-level/all-packages.nix

@@ -21009,17 +21009,6 @@ with pkgs;
 
   libgudev = callPackage ../development/libraries/libgudev { };
 
-  libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix { };
-  libguestfs = callPackage ../development/libraries/libguestfs {
-    autoreconfHook = buildPackages.autoreconfHook264;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-  libguestfs-with-appliance = libguestfs.override {
-    appliance = libguestfs-appliance;
-    autoreconfHook = buildPackages.autoreconfHook264;
-  };
-
-
   libhangul = callPackage ../development/libraries/libhangul { };
 
   libharu = callPackage ../development/libraries/libharu { };