Commit fb822885 authored by lukts30's avatar lukts30 Committed by Bjørn Forsman
Browse files

libguestfs: format with nixfmt-rfc-style

parent 2612971b

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

+12 −5
Original line number Diff line number Diff line 
{ lib

, stdenvNoCC

, fetchurl

{

  lib,

  stdenvNoCC,

  fetchurl,

}:



stdenvNoCC.mkDerivation rec {
@@ -24,8 +25,14 @@ stdenvNoCC.mkDerivation rec { 
  meta = with lib; {

    description = "VM appliance disk image used in libguestfs package";

    homepage = "https://libguestfs.org";

    license = with licenses; [ gpl2Plus lgpl2Plus ];

    platforms = [ "i686-linux" "x86_64-linux" ];

    license = with licenses; [

      gpl2Plus

      lgpl2Plus

    ];

    platforms = [

      "i686-linux"

      "x86_64-linux"

    ];

    hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded"

  };

}

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

+2 −7
Original line number Diff line number Diff line 
{

libguestfs,

libguestfs-appliance,

}:

{ libguestfs, libguestfs-appliance }:



libguestfs.override {

    appliance = libguestfs-appliance;

}
 
 No newline at end of file
 
libguestfs.override { appliance = libguestfs-appliance; }

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

+104 −85
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, pkg-config

, autoreconfHook

, makeWrapper

, libxcrypt

, ncurses

, cpio

, gperf

, cdrkit

, flex

, bison

, qemu

, pcre2

, augeas

, libxml2

, acl

, libcap

, libcap_ng

, libconfig

, systemd

, fuse

, yajl

, libvirt

, hivex

, db

, gmp

, readline

, file

, numactl

, libapparmor

, jansson

, getopt

, perlPackages

, ocaml-ng

, libtirpc

, appliance ? null

, javaSupport ? false

, jdk

, zstd

{

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  autoreconfHook,

  makeWrapper,

  libxcrypt,

  ncurses,

  cpio,

  gperf,

  cdrkit,

  flex,

  bison,

  qemu,

  pcre2,

  augeas,

  libxml2,

  acl,

  libcap,

  libcap_ng,

  libconfig,

  systemd,

  fuse,

  yajl,

  libvirt,

  hivex,

  db,

  gmp,

  readline,

  file,

  numactl,

  libapparmor,

  jansson,

  getopt,

  perlPackages,

  ocaml-ng,

  libtirpc,

  appliance ? null,

  javaSupport ? false,

  jdk,

  zstd,

}:



assert appliance == null || lib.isDerivation appliance;
@@ -57,7 +58,8 @@ stdenv.mkDerivation rec { 
  };



  strictDeps = true;

  nativeBuildInputs = [

  nativeBuildInputs =

    [

      autoreconfHook

      bison

      cdrkit
@@ -69,9 +71,19 @@ stdenv.mkDerivation rec { 
      pkg-config

      qemu

      zstd

  ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])

  ++ (with ocamlPackages'; [ ocaml findlib ]);

  buildInputs = [

    ]

    ++ (with perlPackages; [

      perl

      libintl-perl

      GetoptLong

      ModuleBuild

    ])

    ++ (with ocamlPackages'; [

      ocaml

      findlib

    ]);

  buildInputs =

    [

      libxcrypt

      ncurses

      jansson
@@ -95,7 +107,13 @@ 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 = ''
@@ -116,9 +134,7 @@ stdenv.mkDerivation rec { 
    "--with-distro=NixOS"

    "--with-guestfs-path=${placeholder "out"}/lib/guestfs"

  ] ++ lib.optionals (!javaSupport) [ "--without-java" ];

  patches = [

    ./libguestfs-syms.patch

  ];

  patches = [ ./libguestfs-syms.patch ];



  createFindlibDestdir = true;
@@ -162,7 +178,10 @@ stdenv.mkDerivation rec { 


  meta = with lib; {

    description = "Tools for accessing and modifying virtual machine disk images";

    license = with licenses; [ gpl2Plus lgpl21Plus ];

    license = with licenses; [

      gpl2Plus

      lgpl21Plus

    ];

    homepage = "https://libguestfs.org/";

    maintainers = with maintainers; [ offline ];

    platforms = platforms.linux;