cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #162229 from jtojnar/gnome-backports

Browse source 
GNOME: Backport fixes & stable updates from 42 branch
This commit is contained in:
Jan Tojnar 2022-03-01 13:56:26 +01:00 committed by GitHub
commit f5d04780b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 107 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/clapper/default.nix
View file

@ -12,7 +12,7 @@
, desktop-file-utils
, makeWrapper
, shared-mime-info
, wrapGAppsHook
, wrapGAppsHook4
, meson
, gjs
, gtk4
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
pkg-config
python3
shared-mime-info # for update-mime-database
wrapGAppsHook # for gsettings
wrapGAppsHook4 # for gsettings
];
buildInputs = [

6
pkgs/desktops/gnome/default.nix
View file

@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gitg = callPackage ./misc/gitg { };
libgnome-games-support = callPackage ./misc/libgnome-games-support { };
gnome-applets = callPackage ./misc/gnome-applets { };
gnome-flashback = callPackage ./misc/gnome-flashback { };
@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; {
}) // lib.optionalAttrs (config.allowAliases or true) {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19
bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26
evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25
geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25
@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25
gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21
gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14
libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25
rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25
networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25

3
pkgs/desktops/gnome/games/gnome-2048/default.nix
View file

@ -9,6 +9,7 @@
, itstool
, clutter-gtk
, libgee
, libgnome-games-support
, gnome
, gtk3
}:
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [
clutter-gtk
libgee
gnome.libgnome-games-support
libgnome-games-support
gtk3
];

14
pkgs/development/libraries/accountsservice/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, substituteAll
, pkg-config
, glib
@ -20,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "accountsservice";
version = "22.07.5";
version = "22.08.8";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo=";
sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
};
patches = [
@ -45,15 +44,6 @@ stdenv.mkDerivation rec {
# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
./drop-prefix-check-extensions.patch
# Work around not being able to set profile picture in GNOME Settings.
# https://github.com/NixOS/nixpkgs/issues/85357
# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/98
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1629
(fetchpatch {
url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/1ef3add46983af875adfed5d29954cbfb184f688.patch";
sha256 = "N4siK4SWkwYBnFa0JJUFgahi9XBkB/nS5yc+PyH3/iM=";
})
];
nativeBuildInputs = [

15
pkgs/development/libraries/libgda/6.x.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, intltool
, meson
@ -37,6 +38,20 @@ stdenv.mkDerivation rec {
sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";
};
patches = [
# Fix undefined behavior
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch";
sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk=";
})
# Fix building vapi
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";
sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";
})
];
nativeBuildInputs = [
pkg-config
intltool

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

@ -45,15 +45,15 @@ stdenv.mkDerivation rec {
buildInputs = [
gcr
glib
libsoup
libxml2
openssl
p11-kit
uhttpmock
];
propagatedBuildInputs = [
glib
libsoup
libxml2
gnome-online-accounts
json-glib
];

1
pkgs/desktops/gnome/misc/libgnome-games-support/default.nix → pkgs/development/libraries/libgnome-games-support/default.nix
View file

@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
versionPolicy = "odd-unstable";
};
};

4
pkgs/development/libraries/libsigcxx/3.0.nix
View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libsigc++";
version = "3.0.7";
version = "3.2.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM=";
sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE=";
};
nativeBuildInputs = [

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libsigc++";
version = "2.10.7";
version = "2.10.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI=";
sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo=";
};
nativeBuildInputs = [ pkg-config meson ninja ];

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

@ -21,14 +21,14 @@
stdenv.mkDerivation rec {
pname = "libwnck";
version = "40.0";
version = "40.1";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM=";
sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE=";
};
nativeBuildInputs = [

72
pkgs/os-specific/linux/upower/default.nix
View file

@ -1,8 +1,13 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitLab
, pkg-config
, rsync
, libxslt
, meson
, ninja
, python3
, gtk-doc
, docbook_xsl
, udev
, libgudev
@ -15,23 +20,31 @@
, libimobiledevice
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "upower";
version = "0.99.13";
version = "0.99.15";
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz";
sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo=";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "upower";
repo = "upower";
rev = "v${version}";
sha256 = "sha256-GlLy2MPip21KOabdW8Vw6NVe3xhzsd9htxQ2xO/hZ/4=";
};
nativeBuildInputs = [
meson
ninja
python3
gtk-doc
docbook_xsl
gettext
gobject-introspection
libxslt
pkg-config
rsync
];
buildInputs = [
@ -39,29 +52,50 @@ stdenv.mkDerivation {
libusb1
udev
systemd
]
++ lib.optional useIMobileDevice libimobiledevice
;
] ++ lib.optionals useIMobileDevice [
libimobiledevice
];
propagatedBuildInputs = [
glib
];
configureFlags = [
mesonFlags = [
"--localstatedir=/var"
"--with-backend=linux"
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemdutildir=${placeholder "out"}/lib/systemd"
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
"--sysconfdir=/etc"
"-Dos_backend=linux"
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
];
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
installFlags = [
"historydir=$(TMPDIR)/foo"
"sysconfdir=${placeholder "out"}/etc"
];
postPatch = ''
patchShebangs src/linux/unittest_inspector.py
'';
postInstall = ''
# Move stuff from DESTDIR to proper location.
# We use rsync to merge the directories.
for dir in etc var; do
rsync --archive "${DESTDIR}/$dir" "$out"
rm --recursive "${DESTDIR}/$dir"
done
for o in out dev; do
rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
rm --recursive "${DESTDIR}/''${!o}"
done
# Ensure the DESTDIR is removed.
rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}"
'';
# HACK: We want to install configuration files to $out/etc
# but upower should read them from /etc on a NixOS system.
# With autotools, it was possible to override Make variables
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "${placeholder "out"}/dest";
meta = with lib; {
homepage = "https://upower.freedesktop.org/";

11
pkgs/tools/misc/colord-gtk/default.nix
View file

@ -12,6 +12,7 @@
, docbook_xml_dtd_412
, libxslt
, glib
, withGtk4 ? false
, gtk3
, gtk4
, pkg-config
@ -49,13 +50,21 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
colord
gtk3
] ++ (if withGtk4 then [
gtk4
] else [
gtk3
]);
mesonFlags = [
"-Dgtk4=${lib.boolToString withGtk4}"
"-Dgtk3=${lib.boolToString (!withGtk4)}"
];
meta = with lib; {
homepage = "https://www.freedesktop.org/software/colord/intro.html";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

5
pkgs/tools/networking/networkmanager/libnma/default.nix
View file

@ -15,6 +15,8 @@
, mobile-broadband-provider-info
, gobject-introspection
, gtk3
, withGtk4 ? false
, gtk4
, withGnome ? true
, gcr
, glib
@ -56,6 +58,8 @@ stdenv.mkDerivation rec {
networkmanager
isocodes
mobile-broadband-provider-info
] ++ lib.optionals withGtk4 [
gtk4
] ++ lib.optionals withGnome [
# advanced certificate chooser
gcr
@ -63,6 +67,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgcr=${lib.boolToString withGnome}"
"-Dlibnma_gtk4=${lib.boolToString withGtk4}"
];
postPatch = ''

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

@ -4214,6 +4214,8 @@ with pkgs;
colord-gtk = callPackage ../tools/misc/colord-gtk { };
colord-gtk4 = colord-gtk.override { withGtk4 = true; };
colordiff = callPackage ../tools/text/colordiff { };
connect = callPackage ../tools/networking/connect { };
@ -8159,6 +8161,8 @@ with pkgs;
libnma = callPackage ../tools/networking/networkmanager/libnma { };
libnma-gtk4 = libnma.override { withGtk4 = true; };
networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { };
nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };
@ -17969,6 +17973,8 @@ with pkgs;
libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { };
libgnome-keyring3 = gnome.libgnome-keyring;
libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { };
libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
libglvnd = callPackage ../development/libraries/libglvnd { };