Unverified Commit 780c9899 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #214150 from jtojnar/gnome 

GNOME updates
parents 7f3a2058 781678b7

pkgs/applications/editors/gnome-builder/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ 


stdenv.mkDerivation rec {

  pname = "gnome-builder";

  version = "43.4";

  version = "43.5";



  outputs = [ "out" "devdoc" ];



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw=";

    sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o=";

  };



  patches = [

pkgs/applications/terminal-emulators/gnome-console/default.nix

+15 −37
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch

, gettext

, gnome

, libgtop

, gtk3

, libhandy

, gtk4

, libadwaita

, pcre2

, vte

, appstream-glib

, vte-gtk4

, desktop-file-utils

, git

, meson

, ninja

, pkg-config

, python3

, sassc

, wrapGAppsHook

, wrapGAppsHook4

, nixosTests

}:



stdenv.mkDerivation rec {

  pname = "gnome-console";

  # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved!

  version = "42.2";

  version = "43.0";



  src = fetchurl {

    url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";

    sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4=";

  };



  patches = [

    (fetchpatch {

      name = "fix-clang-build-issues.patch";

      url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";

      sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";

    })

  ];



  buildInputs = [

    gettext

    libgtop

    gtk3

    libhandy

    pcre2

    vte

  ];



  nativeBuildInputs = [

    appstream-glib

    desktop-file-utils

    git

    gettext

    meson

    ninja

    pkg-config

    python3

    sassc

    wrapGAppsHook

    wrapGAppsHook4

  ];



  mesonFlags = [

    "-Dnautilus=disabled"

  buildInputs = [

    libgtop

    gtk4

    libadwaita

    pcre2

    vte-gtk4

  ];



  passthru = {

    updateScript = gnome.updateScript {

      packageName = pname;

      packageName = "gnome-console";

    };

  };

pkgs/desktops/gnome/apps/gnome-maps/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 


stdenv.mkDerivation rec {

  pname = "gnome-maps";

  version = "43.3";

  version = "43.4";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE=";

    sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8=";

  };



  doCheck = true;

pkgs/desktops/gnome/core/zenity/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -15,13 +15,17 @@ 


stdenv.mkDerivation rec {

  pname = "zenity";

  version = "3.43.0";

  version = "3.44.0";



  src = fetchurl {

    url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM=";

    sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U=";

  };



  patches = [

    ./fix-icon-install.patch

  ];



  nativeBuildInputs = [

    meson

    ninja

pkgs/desktops/gnome/core/zenity/fix-icon-install.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git a/data/meson.build b/data/meson.build

index 339b3cff..aca65efd 100644

--- a/data/meson.build

+++ b/data/meson.build

@@ -9,5 +9,6 @@ install_data(

     'zenity-text.png',

     'zenity-scale.png',

     'zenity-entry.png',

-    'zenity-notification.png']

+    'zenity-notification.png'],

+  install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps',

   )