Unverified Commit f0dae4e8 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #257432 from bobby285271/upd/pantheon 

Pantheon updates 2023-09-26
parents a1f529bf c2b69028

pkgs/desktops/pantheon/apps/elementary-files/default.nix

+2 −14
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, pkg-config

, meson
@@ -14,7 +13,6 @@ 
, libgee

, libhandy

, granite

, libnotify

, pango

, elementary-dock

, bamf
@@ -28,7 +26,7 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-files";

  version = "6.5.0";

  version = "6.5.2";



  outputs = [ "out" "dev" ];
@@ -36,18 +34,9 @@ stdenv.mkDerivation rec { 
    owner = "elementary";

    repo = "files";

    rev = version;

    sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc=";

    sha256 = "sha256-YwXyqZ0exwQ3Qx+VWWyTTmhqCVr6be8tqzS1k3Luo8o=";

  };



  patches = [

    # meson: Don't run gtk-update-icon-cache

    # https://github.com/elementary/files/pull/2294

    (fetchpatch {

      url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch";

      hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0=";

    })

  ];



  nativeBuildInputs = [

    desktop-file-utils

    meson
@@ -68,7 +57,6 @@ stdenv.mkDerivation rec { 
    libgee

    libgit2-glib

    libhandy

    libnotify

    pango

    sqlite

    systemd

pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix

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

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, substituteAll

, pkg-config
@@ -18,24 +17,15 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-network";

  version = "7.0.1";

  version = "7.0.2";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I=";

    sha256 = "sha256-PqTnopacT1/Ctx8VH6b35tiVI+3ZlrdFcRsDpAWm4a0=";

  };



  patches = [

    # PopoverWidget: fix flowbox child focus

    # https://github.com/elementary/wingpanel-indicator-network/pull/288

    (fetchpatch {

      url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch";

      sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja