Unverified Commit 09c8582d authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #197969 from jtojnar/gnome 

More GNOME updates
parents d71a6414 29da163d

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

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


stdenv.mkDerivation rec {

  pname = "gnome-boxes";

  version = "43.0";

  version = "43.1";



  src = fetchurl {

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

    sha256 = "V0UFCWQUyCC4COzQ9x4tGakzI1HhKj3YJvdi5DK/ayY=";

    sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE=";

  };



  patches = [

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

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


stdenv.mkDerivation rec {

  pname = "evince";

  version = "43.0";

  version = "43.1";



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



  src = fetchurl {

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

    sha256 = "Zr4N5LR7ETBIYQOYjMFSwErqlZULo+8W3CDC72toHUc=";

    sha256 = "bXXKYrc7+7YA9xigmBA9xrgT+QULlZS+kp4ptFidIzU=";

  };



  nativeBuildInputs = [

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

+5 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
, runCommand

, symlinkJoin

, gobject-introspection

, nix-update-script

, gitUpdater

}:



let
@@ -45,16 +45,16 @@ let 
  };

in stdenv.mkDerivation rec {

  pname = "gucharmap";

  version = "15.0.0";

  version = "15.0.1";



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



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "GNOME";

    repo = pname;

    repo = "gucharmap";

    rev = version;

    sha256 = "sha256-ymEtiOKdmQ1XWrGk40csX5O5BiwxH3aCPboVekcUukQ=";

    sha256 = "sha256-uVXWgnNpPcky9N3FXkDu5oaqaEALECooFnf43Ed+zTY=";

  };



  nativeBuildInputs = [
@@ -94,8 +94,7 @@ in stdenv.mkDerivation rec { 
  '';



  passthru = {

    updateScript = nix-update-script {

      attrPath = "gnome.gucharmap";

    updateScript = gitUpdater {

    };

  };

pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix

+11 −8
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitLab

, fetchurl

, meson

, ninja

, python3
@@ -14,16 +14,13 @@ let 
in

buildPythonApplication rec {

  pname = "gnome-browser-connector";

  version = "42.0";

  version = "42.1";



  format = "other";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "nE0sIghT";

    repo = "gnome-browser-connector";

    rev = "v${version}";

    sha256 = "pYbV/qCmSrM2nrrKxbxHnJYMDOiW0aeNbFlsm5kKWdk=";

  src = fetchurl {

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

    sha256 = "vZcCzhwWNgbKMrjBPR87pugrJHz4eqxgYQtBHfFVYhI=";

  };



  nativeBuildInputs = [
@@ -53,6 +50,12 @@ buildPythonApplication rec { 
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-browser-connector";

    };

  };



  meta = with lib; {

    description = "Native host connector for the GNOME Shell browser extension";

    homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration";

pkgs/desktops/gnome/games/aisleriot/default.nix

+5 −6
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitLab

, nix-update-script

, gitUpdater

, pkg-config

, itstool

, gtk3
@@ -19,14 +19,14 @@ 


stdenv.mkDerivation rec {

  pname = "aisleriot";

  version = "3.22.25";

  version = "3.22.26";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "GNOME";

    repo = pname;

    repo = "aisleriot";

    rev = version;

    sha256 = "sha256-ur29fKSYRGzQBv14L5efN+UuAdTE8e8ooop6DGvO+Rg=";

    sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY=";

  };



  nativeBuildInputs = [
@@ -60,8 +60,7 @@ stdenv.mkDerivation rec { 
  ];



  passthru = {

    updateScript = nix-update-script {

      attrPath = "gnome.${pname}";

    updateScript = gitUpdater {

    };

  };