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

Merge pull request #329144 from bobby285271/upd/pantheon 

Pantheon updates 2024-07-22
parents 38953c15 98190357

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

+2 −9
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, pkg-config

, meson

, ninja

, python3

, vala

, desktop-file-utils

, gtk3
@@ -21,13 +20,13 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-terminal";

  version = "6.1.2";

  version = "6.2.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "terminal";

    rev = version;

    sha256 = "sha256-k+xowr9HmOUgNkn25uj+oV7AtG9EZfgFDop0Z+H7b3Q=";

    sha256 = "sha256-o5hMrsn6OBk/2ycCDdT8n6gQUWcRuoaHqnmkODnJ6B8=";

  };



  nativeBuildInputs = [
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    python3

    vala

    wrapGAppsHook3

    xvfb-run
@@ -51,11 +49,6 @@ stdenv.mkDerivation rec { 
    vte

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

pkgs/desktops/pantheon/apps/sideload/default.nix

+2 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
, meson

, ninja

, pkg-config

, python3

, vala

, libxml2

, wrapGAppsHook4
@@ -19,13 +18,13 @@ 


stdenv.mkDerivation rec {

  pname = "sideload";

  version = "6.2.1";

  version = "6.2.2";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-BkU2lANn2KNaElL/JZ3TPVZIjh8eM3//ZiO4lFBIMm8=";

    sha256 = "sha256-7qwjZpEvB0eHIRsXv8jU7fVhbCIYI6tqJYmYvZR8oLo=";

  };



  nativeBuildInputs = [
@@ -34,7 +33,6 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    python3

    vala

    wrapGAppsHook4

  ];
@@ -47,11 +45,6 @@ stdenv.mkDerivation rec { 
    libxml2

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };