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

Pantheon updates 2025-10-01 (#447636)

parents 2c3e48fb 843fa0fa

nixos/modules/services/desktop-managers/pantheon.nix

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ in 
            elementary-code

            elementary-files

            elementary-mail

            elementary-maps

            elementary-music

            elementary-photos

            elementary-screenshot

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

0 → 100644
+64 −0
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchFromGitHub,

  glib,

  meson,

  ninja,

  pkg-config,

  vala,

  wrapGAppsHook4,

  geoclue2,

  geocode-glib_2,

  granite7,

  gtk4,

  libadwaita,

  libshumate,

  nix-update-script,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "elementary-maps";

  version = "8.1.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "maps";

    tag = finalAttrs.version;

    hash = "sha256-tS8UnW/oNjLaUZ1XgGuAmeMrHEa2jbtBc0xMcTKki1k=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    glib

    meson

    ninja

    pkg-config

    vala

    wrapGAppsHook4

  ];



  buildInputs = [

    geoclue2

    geocode-glib_2

    glib

    granite7

    gtk4

    libadwaita

    libshumate

  ];



  passthru = {

    updateScript = nix-update-script { };

  };



  meta = {

    homepage = "https://github.com/elementary/maps";

    description = "Map viewer designed for elementary OS";

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    teams = [ lib.teams.pantheon ];

    mainProgram = "io.elementary.maps";

  };

})

pkgs/desktops/pantheon/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ lib.makeScope pkgs.newScope ( 


    elementary-mail = callPackage ./apps/elementary-mail { };



    elementary-maps = callPackage ./apps/elementary-maps { };



    elementary-music = callPackage ./apps/elementary-music { };



    elementary-photos = callPackage ./apps/elementary-photos { };

pkgs/desktops/pantheon/libraries/granite/7/default.nix

+7 −12
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  nix-update-script,

  meson,

  ninja,
@@ -10,6 +9,7 @@ 
  vala,

  pkg-config,

  libgee,

  libshumate,

  gtk4,

  glib,

  gettext,
@@ -20,7 +20,7 @@ 


stdenv.mkDerivation rec {

  pname = "granite";

  version = "7.6.0";

  version = "7.7.0";



  outputs = [

    "out"
@@ -31,18 +31,9 @@ stdenv.mkDerivation rec { 
    owner = "elementary";

    repo = "granite";

    rev = version;

    sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs=";

    sha256 = "sha256-ypSkzz9BaVweR1C0OkkfwDl8tehMK1S5iExL14LuKmI=";

  };



  patches = [

    # Init: Avoid crash with Gtk >= 4.17

    # https://github.com/elementary/granite/pull/893

    (fetchpatch {

      url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch";

      hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc=";

    })

  ];



  nativeBuildInputs = [

    gettext

    gobject-introspection
@@ -54,6 +45,10 @@ stdenv.mkDerivation rec { 
    wrapGAppsHook4

  ];



  buildInputs = [

    libshumate # demo

  ];



  propagatedBuildInputs = [

    glib

    gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format"