Merge pull request #213091 from bobby285271/upd/gnome

GNOME updates
This commit is contained in:
Jan Tojnar 2023-01-28 10:51:12 +01:00 committed by GitHub
commit 67e3a88fa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 17 deletions

View file

@ -20,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "gnome-firmware";
version = "42.2";
version = "43.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gnome-firmware";
rev = version;
sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0=";
sha256 = "9QS6X1Cm9/wToQ8hnGNn3VytSCpZI8StZ3+vf0/wbAw=";
};
nativeBuildInputs = [

View file

@ -34,13 +34,13 @@
buildPythonApplication rec {
pname = "orca";
version = "43.0";
version = "43.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA=";
sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA=";
};
patches = [

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sudoku";
version = "43.0";
version = "43.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk=";
sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8=";
};
nativeBuildInputs = [

View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, appstream-glib
, clutter
, gjs
@ -22,26 +21,18 @@
}:
stdenv.mkDerivation rec {
version = "43.0";
version = "43.1";
pname = "gpaste";
src = fetchFromGitHub {
owner = "Keruspe";
repo = "GPaste";
rev = "v${version}";
sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs=";
sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE=";
};
patches = [
./fix-paths.patch
# Build against GCR 4.
# Patch was temporarily reverted.
# https://github.com/Keruspe/GPaste/pull/409
(fetchpatch {
url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch";
sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8=";
})
];
# TODO: switch to substituteAll with placeholder
@ -79,6 +70,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dgcr3=false" # Build with gcr4
"-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings"
"-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services"
"-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user"