mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

Merge pull request #241586 from jtojnar/gnome

Browse source 
GNOME updates 2023-07-04
This commit is contained in:
Jan Tojnar 2023-07-11 15:29:06 +02:00 committed by GitHub
parent 170b6714ad 48ae1081eb
commit d04bbe9c81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 52 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/backup/deja-dup/default.nix
View file

@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "deja-dup";
version = "44.1";
version = "44.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
repo = "deja-dup";
rev = version;
sha256 = "sha256-+Z8o45ZJOmYN+G4viGJW+9BPL6gNitfFBu76qx+sOF0=";
hash = "sha256-TnyH2tIvzG1B2hbDPyFyaTArfuMJaP6GKw6yahwsQ1Q=";
};
patches = [

1
pkgs/applications/editors/gedit/default.nix
View file

@ -87,7 +87,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "gedit";
attrPath = "gnome.gedit";
};
};

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View file

@ -67,13 +67,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "44.2";
version = "44.3";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8=";
sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8=";
};
patches = [

4
pkgs/desktops/gnome/core/mutter/default.nix
View file

@ -66,13 +66,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "44.2";
version = "44.3";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE=";
sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE=";
};
mesonFlags = [

18
pkgs/desktops/gnome/misc/geary/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, pkg-config
, gtk3
, vala
@ -48,26 +47,13 @@
stdenv.mkDerivation rec {
pname = "geary";
version = "43.0";
version = "44.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c=";
sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0=";
};
patches = [
# Fix build with Vala 0.56.7 & 0.57+
# https://hydra.nixos.org/build/217892787
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch";
sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4=";
})
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch";
sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw=";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

6
pkgs/development/libraries/babl/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "babl";
version = "0.1.102";
version = "0.1.106";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0";
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz";
hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/gcab/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gcab";
version = "1.5";
version = "1.6";
outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww=";
url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz";
hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs=";
};
patches = [

6
pkgs/development/libraries/gvfs/default.nix
View file

@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.50.4";
version = "1.50.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0=";
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz";
hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs=";
};
patches = [

4
pkgs/development/libraries/libshumate/default.nix
View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "libshumate";
version = "1.0.3";
version = "1.0.4";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "libshumate";
rev = version;
sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y=";
sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc=";
};
nativeBuildInputs = [

23
pkgs/development/libraries/malcontent/better-separation.patch
View file

@ -1,4 +1,4 @@
commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5
Author: Jan Tojnar <jtojnar@gmail.com>
Date: Thu Jul 23 18:49:03 2020 +0200
@ -22,7 +22,7 @@ Date: Thu Jul 23 18:49:03 2020 +0200
https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
diff --git a/meson.build b/meson.build
index 6e1dfa5..196350b 100644
index 038dd35..e3c77f0 100644
--- a/meson.build
+++ b/meson.build
@@ -123,9 +123,8 @@ test_env = [
@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644
subdir('libmalcontent')
else
libmalcontent_api_version = '0'
@@ -136,11 +135,16 @@ endif
if get_option('ui').enabled()
@@ -143,14 +142,19 @@ if get_option('ui').enabled()
)
subdir('libmalcontent-ui')
endif
-subdir('malcontent-client')
@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644
if get_option('ui').enabled()
subdir('malcontent-control')
+ subdir('help')
+endif
+if not get_option('use_system_libmalcontent')
+ subdir('pam')
+ subdir('po')
gnome.post_install(
gtk_update_icon_cache: true,
update_desktop_database: true,
)
endif
-subdir('pam')
-subdir('po')
meson.add_install_script('build-aux/meson_post_install.py')
+if not get_option('use_system_libmalcontent')
+ subdir('pam')
+ subdir('po')
+endif

6
pkgs/development/libraries/malcontent/default.nix
View file

@ -19,16 +19,16 @@
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.11.0";
version = "0.11.1";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pwithnall";
repo = pname;
repo = "malcontent";
rev = version;
sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
};
patches = [

6
pkgs/development/libraries/malcontent/ui.nix
View file

@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
"-Dui=enabled"
];
postPatch = ''
# https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
substituteInPlace build-aux/meson_post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
meta = with lib; {
description = "UI components for parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";

4
pkgs/development/libraries/speechd/default.nix
View file

@ -27,11 +27,11 @@ let
inherit (python3Packages) python pyxdg wrapPython;
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
version = "0.11.2";
version = "0.11.4";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-i0ZJkl5oy+GntMCge7BBznc4s1yQamAr+CmG2xqg82Q=";
sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk=";
};
patches = [

6
pkgs/development/libraries/speechd/fix-paths.patch
View file

@ -1,9 +1,11 @@
diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in
index ab14b99d..12521b1b 100644
--- a/speech-dispatcherd.service.in
+++ b/speech-dispatcherd.service.in
@@ -19,7 +19,7 @@
@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers
[Service]
Type=forking
ExecStart=@bindir@/speech-dispatcher -d
ExecStart=@bindir@/speech-dispatcher -d -t 0
-ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=@utillinux@/bin/kill -HUP $MAINPID

22
pkgs/development/tools/misc/msitools/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, vala
@ -19,28 +18,13 @@
stdenv.mkDerivation rec {
pname = "msitools";
version = "0.101";
version = "0.102";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz";
hash = "sha256-+khaQhOX71/gLfWrk/ztkav2hXMPQPlMcVe0MNJKNJg=";
};
patches = [
# Fix executable bit on tools (regression in Meson migration).
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
})
# Fix failure on big-endian platforms.
# https://gitlab.gnome.org/GNOME/msitools/issues/31
(fetchpatch {
url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
})
];
nativeBuildInputs = [
meson
ninja

4
pkgs/tools/misc/hid-tools/default.nix
View file

@ -5,7 +5,7 @@
python3.pkgs.buildPythonPackage rec {
pname = "hid-tools";
version = "0.3.1";
version = "0.4";
format = "setuptools";
@ -14,7 +14,7 @@ python3.pkgs.buildPythonPackage rec {
owner = "libevdev";
repo = "hid-tools";
rev = version;
sha256 = "r496SKBGgHriIhriWYhhCSiChQUKhnHT/lEx9sEoT/0=";
hash = "sha256-pxU1BvB+rjc5sptafMGnWi+vWPNDyCyUv8gTWg6z5hU=";
};
propagatedBuildInputs = with python3.pkgs; [

23
pkgs/tools/security/gnome-keysign/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, fetchFromGitLab
, fetchpatch
, python3
, wrapGAppsHook
, gobject-introspection
@ -11,32 +10,16 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-keysign";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
repo = "gnome-keysign";
rev = version;
sha256 = "1sjphi1lsivg9jmc8khbcqa9w6608pkrccz4nz3rlcc54hn0k0sj";
hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
};
patches = [
# fix build failure due to missing import
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch";
sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990";
})
# stop requiring lxml (no longer used)
# https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch";
sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy";
includes = [ "setup.py" ];
})
];
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection

3
pkgs/top-level/all-packages.nix
View file

@ -23235,7 +23235,8 @@ with pkgs;
in pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${res.libxml2.version}";
paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru;
# Avoid update.nix conflicts with libxml2.
passthru = builtins.removeAttrs libxml2.passthru [ "updateScript" ];
# the hook to find catalogs is hidden by buildEnv
postBuild = ''
mkdir "$out/nix-support"