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

Merge pull request #330174 from bobby285271/upd/pantheon 

Pantheon updates 2024-07-26
parents b99083a4 759ee151

nixos/tests/pantheon.nix

+1 −2
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
        cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"

        env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"

        machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")

        machine.sleep(3)

        machine.sleep(5)

        machine.screenshot("multitasking")

        machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")



    with subtest("Check if gala has ever coredumped"):

        machine.fail("coredumpctl --json=short | grep gala")

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

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

, ninja

, pkg-config

, python3

, vala

, wrapGAppsHook3

, clutter
@@ -24,20 +23,19 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-calendar";

  version = "7.0.0";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "calendar";

    rev = version;

    sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E=";

    sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8=";

  };



  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    python3

    vala

    wrapGAppsHook3

  ];
@@ -57,11 +55,6 @@ stdenv.mkDerivation rec { 
    libportal-gtk3

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

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

+4 −9
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, meson

, ninja

, pkg-config

, python3

, vala

, wrapGAppsHook4

, elementary-gtk-theme
@@ -14,24 +13,24 @@ 
, granite7

, gst_all_1

, gtk4

, libadwaita

}:



stdenv.mkDerivation rec {

  pname = "elementary-music";

  version = "7.1.0";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "music";

    rev = version;

    sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo=";

    sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko=";

  };



  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    python3

    vala

    wrapGAppsHook4

  ];
@@ -41,6 +40,7 @@ stdenv.mkDerivation rec { 
    glib

    granite7

    gtk4

    libadwaita

  ] ++ (with gst_all_1; [

    gst-plugins-bad

    gst-plugins-base
@@ -49,11 +49,6 @@ stdenv.mkDerivation rec { 
    gstreamer

  ]);



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  preFixup = ''

    gappsWrapperArgs+=(

      # The GTK theme is hardcoded.

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

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

, ninja

, vala

, python3

, desktop-file-utils

, gtk3

, granite
@@ -18,13 +17,13 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-screenshot";

  version = "6.0.4";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "screenshot";

    rev = version;

    sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg=";

    sha256 = "sha256-z7FP+OZYF/9YLXYCQF/ElihKjKHVfeHc38RHdPb2aIE=";

  };



  nativeBuildInputs = [
@@ -32,7 +31,6 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    python3

    vala

    wrapGAppsHook3

  ];
@@ -45,11 +43,6 @@ stdenv.mkDerivation rec { 
    libhandy

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

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

+32 −29
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, nix-update-script

, pkg-config

, meson

, ninja

, vala

, gtk3

, granite

, libgee

, libhandy

, gst_all_1

, wrapGAppsHook3

{

  stdenv,

  lib,

  fetchFromGitHub,

  nix-update-script,

  meson,

  ninja,

  pkg-config,

  vala,

  wrapGAppsHook4,

  gdk-pixbuf,

  granite7,

  gst_all_1,

  gtk4,

  libadwaita,

  libgee,

}:



stdenv.mkDerivation rec {

  pname = "elementary-videos";

  version = "3.0.0";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "videos";

    rev = version;

    sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA=";

    hash = "sha256-GfTYwnNZg8/cmJMzLDfYpulG7K4SMYK2H+SXtiS3TCg=";

  };



  nativeBuildInputs = [
@@ -30,23 +32,24 @@ stdenv.mkDerivation rec { 
    ninja

    pkg-config

    vala

    wrapGAppsHook3

    wrapGAppsHook4

  ];



  buildInputs = [

    granite

    gtk3

    libgee

    libhandy

  ] ++ (with gst_all_1; [

    gst-libav

    gst-plugins-bad

    gst-plugins-base

    gdk-pixbuf

    granite7

    gst_all_1.gst-libav

    gst_all_1.gst-plugins-bad

    gst_all_1.gst-plugins-base

    # https://github.com/elementary/videos/issues/356

    (gst-plugins-good.override { gtkSupport = true; })

    gst-plugins-ugly

    gstreamer

  ]);

    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })

    gst_all_1.gst-plugins-rs # GTK 4 Sink

    gst_all_1.gst-plugins-ugly

    gst_all_1.gstreamer

    gtk4

    libadwaita

    libgee

  ];



  passthru = {

    updateScript = nix-update-script { };