Unverified Commit ddb6fe5b authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #237774 from bobby285271/upd/gtk4 

GNOME updates 2023-06-14
parents ff1cd885 f2bfcdd2

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

+2 −31
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchurl

, fetchpatch2

, meson

, ninja

, pkg-config
@@ -16,41 +15,13 @@ 


stdenv.mkDerivation rec {

  pname = "zenity";

  version = "3.92.0";

  version = "3.99.0";



  src = fetchurl {

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

    sha256 = "bSvCP2bL2PfhlVVvDDG9ZfClx4vLGuow6XFty/qxqKk=";

    sha256 = "kOdDSnKLoD8fAkJIY8w5NV0kBxWNf5ZAPVHPVs8m7s8=";

  };



  patches = [

    # Add non-fatal deprecation warning for --attach, --icon-name, --hint

    # To reduce issues like https://github.com/BuddiesOfBudgie/budgie-desktop/issues/356

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/181ca36ad4790b425f79b20be40dd25804208463.patch";

      sha256 = "Z6XOn5XnBzJSti8tD4EGezCpHmYAsIxBf7s4W3rBc9I=";

    })

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/70abb01173562dba40916c522bd20b4ba5a55904.patch";

      sha256 = "yBm7AxJiTPh2BFb+79L4WSh8xOcM6AHuvLzIEEFY80s=";

    })

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/df445feb0c0fab6865d96fb693a32fbc26503d83.patch";

      sha256 = "DTeBCsahceNZCfNziO2taXiMEdAFgm5Bx9OrlZv0LsM=";

    })

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/54bd43cbe30fbe5c9f01e42e8f3de63405770e2a.patch";

      sha256 = "tR9CKt24w7D3EA6FLu6qroS5rTkfIsaQnuY4KzgDKMY=";

    })



    # Restore the availability of running multiple instances of zenity

    # https://gitlab.gnome.org/GNOME/zenity/-/issues/58

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/cd32ad7d3fa66dccc77d96a0fd3a61bf137250f6.patch";

      sha256 = "4XCuJgXsNIiBXv4NM1JRoiqgBqyxnro0HHapkK2fM8o=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja

pkgs/development/libraries/gtk/4.x.nix

+2 −17
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, substituteAll

, fetchurl

, fetchpatch2

, pkg-config

, gettext

, graphene
@@ -65,7 +64,7 @@ in 


stdenv.mkDerivation rec {

  pname = "gtk4";

  version = "4.10.3";

  version = "4.10.4";



  outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];

  outputBin = "dev";
@@ -77,26 +76,12 @@ stdenv.mkDerivation rec { 


  src = fetchurl {

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

    sha256 = "RUVEGteeN3624KcFAm3HpGiG5GobA020CRKQnagBzqk=";

    sha256 = "dyVABILgaF4oJl4ibGKEf05zz8qem0FqxYOCB/U3eiQ=";

  };



  patches = [

    # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486

    ./patches/4.0-fix-darwin-build.patch



    # Fix deleting in Nautilus (part of 4.10.4)

    # https://gitlab.gnome.org/GNOME/nautilus/-/issues/2945

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/4f47683710bbb4b56c286c6ee6a5c394fcf2b755.patch";

      sha256 = "fU9SX8MH37ZN6Ffk/YhYmipTC7+uT9JXnWggArWNkqA=";

    })

    # Fix border/artifact appearing in applications (part of 4.10.4)

    # https://gitlab.gnome.org/GNOME/mutter/-/issues/2805

    # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6696

    (fetchpatch2 {

      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/b686ce1cb62dba505120e0f1116c516662a06e30.patch";

      sha256 = "0zjY5s+T4CVe3WiowgWE58ruVvqBFUuY2juwBOzMRN4=";

    })

  ];



  depsBuildBuild = [

pkgs/development/libraries/libadwaita/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


stdenv.mkDerivation rec {

  pname = "libadwaita";

  version = "1.3.2";

  version = "1.3.3";



  outputs = [ "out" "dev" "devdoc" ];

  outputBin = "devdoc"; # demo app
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 
    owner = "GNOME";

    repo = "libadwaita";

    rev = version;

    hash = "sha256-9Qha8xN3lC/t5dQNYPbgMX6HAKgEk80pyycrd5MGYLo=";

    hash = "sha256-YIxGwl+/F7xkGjoi07GViSHAfCTE1RpEBhHfrlD0X/4=";

  };



  depsBuildBuild = [