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

Merge pull request #246783 from bobby285271/upd/pantheon 

Pantheon updates 2023-08-02
parents 8fe010b2 0d1cc078

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

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

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, appstream

, desktop-file-utils
@@ -9,7 +8,6 @@ 
, ninja

, pkg-config

, polkit

, python3

, vala

, wrapGAppsHook

, editorconfig-core-c
@@ -28,24 +26,15 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-code";

  version = "7.0.0";

  version = "7.1.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "code";

    rev = version;

    sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc=";

    sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo=";

  };



  patches = [

    # Fix global search action disabled at startup

    # https://github.com/elementary/code/pull/1254

    (fetchpatch {

      url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch";

      sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM=";

    })

  ];



  nativeBuildInputs = [

    appstream

    desktop-file-utils
@@ -53,7 +42,6 @@ stdenv.mkDerivation rec { 
    ninja

    pkg-config

    polkit # needed for ITS rules

    python3

    vala

    wrapGAppsHook

  ];
@@ -79,11 +67,6 @@ stdenv.mkDerivation rec { 
    )

  '';



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

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

+16 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ 
, gtk3

, libxml2

, libhandy

, libportal-gtk3

, webkitgtk_4_1

, elementary-gtk-theme

, elementary-icon-theme

, folks

, glib-networking

, granite
@@ -21,13 +24,13 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-mail";

  version = "7.1.0";

  version = "7.2.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "mail";

    rev = version;

    sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw=";

    sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0=";

  };



  nativeBuildInputs = [
@@ -41,6 +44,7 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    elementary-icon-theme

    evolution-data-server

    folks

    glib-networking
@@ -48,6 +52,7 @@ stdenv.mkDerivation rec { 
    gtk3

    libgee

    libhandy

    libportal-gtk3

    webkitgtk_4_1

  ];
@@ -56,6 +61,15 @@ stdenv.mkDerivation rec { 
    patchShebangs meson/post_install.py

  '';



  preFixup = ''

    gappsWrapperArgs+=(

      # The GTK theme is hardcoded.

      --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"

      # The icon theme is hardcoded.

      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"

    )

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix

+2 −9
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
, fetchFromGitHub

, nix-update-script

, meson

, python3

, ninja

, pkg-config

, vala
@@ -21,20 +20,19 @@ 


stdenv.mkDerivation rec {

  pname = "switchboard-plug-security-privacy";

  version = "7.0.0";

  version = "7.1.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4=";

    sha256 = "sha256-2eQ89FpEMF85UmqVu9FJUvSlaVGmsrRBnhAW7oUiUqg=";

  };



  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    python3

    vala

  ];
@@ -51,11 +49,6 @@ stdenv.mkDerivation rec { 
    zeitgeist

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };