Unverified Commit f43dfc2e authored by Ramses's avatar Ramses Committed by GitHub
Browse files

fwupd: 2.0.9 -> 2.0.12 (#409742)

parents e769aa43 151d38f8

pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch

+0 −5
Original line number Diff line number Diff line
@@ -207,8 +207,3 @@ index 2dfc4d2f0..e5ac73edd 100644 
   )

 endif

 
@@ -146,4 +146,3 @@ summary({

   'capsule splash': get_option('plugin_uefi_capsule_splash'),

 }, section:'uefi capsule options')

 endif

-

pkgs/by-name/fw/fwupd/package.nix

+19 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
  gobject-introspection,

  meson,

  ninja,

  protobuf,

  protobufc,

  shared-mime-info,

  vala,
@@ -49,6 +50,7 @@ 
  libqmi,

  libuuid,

  libxmlb,

  libxml2,

  modemmanager,

  pango,

  polkit,
@@ -74,6 +76,8 @@ 
  efibootmgr,

  tpm2-tools,



  fetchpatch2,



  # passthru

  nixosTests,

  nix-update-script,
@@ -131,7 +135,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "fwupd";

  version = "2.0.9";

  version = "2.0.12";



  # libfwupd goes to lib

  # daemon, plug-ins and libfwupdplugin go to out
@@ -149,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "fwupd";

    repo = "fwupd";

    tag = finalAttrs.version;

    hash = "sha256-Izh6PHMgUsOeez9uWSLoA2GhvawYQlEZo480vovxn38=";

    hash = "sha256-AYPrQzk28CS4Yhj2+KARt3b1SC02YifEftsSF+fKJ+Y=";

  };



  patches = [
@@ -170,14 +174,21 @@ stdenv.mkDerivation (finalAttrs: { 


    # EFI capsule is located in fwupd-efi now.

    ./efi-app-path.patch



    (fetchpatch2 {

      url = "https://github.com/fwupd/fwupd/pull/8959.diff?full_index=1";

      hash = "sha256-w4uf1CXSyy1pqqM4lzMZoOFhDxadcU3Tdnz0dJgLW7w=";

    })

  ];



  postPatch =

    ''

      patchShebangs \

        contrib/generate-version-script.py \

        contrib/generate-man.py \

        po/test-deps

        generate-build/generate-version-script.py \

        generate-build/generate-man.py \

        po/test-deps \

        plugins/uefi-capsule/tests/grub2-mkconfig \

        plugins/uefi-capsule/tests/grub2-reboot

    ''

    # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf

    + ''
@@ -202,10 +213,12 @@ stdenv.mkDerivation (finalAttrs: { 
      gettext

      gi-docgen

      gobject-introspection

      libxml2

      meson

      ninja

      pkg-config

      protobufc # for protoc

      protobuf # for protoc

      protobufc # for protoc-gen-c

      shared-mime-info

      vala

      wrapGAppsNoGuiHook