mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-18 13:50:04 +00:00
gcr*: add explicit version suffix to attr, enable structuredAttrs (#559662)
This commit is contained in:
@@ -209,7 +209,7 @@ in
|
||||
};
|
||||
|
||||
services.dbus.packages = mkIf (lib.elem "gnome3" (cfg.agent.pinentryPackage.flavors or [ ])) [
|
||||
pkgs.gcr
|
||||
pkgs.gcr_3
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
@@ -39,6 +39,6 @@ in
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/nm-applet ${lib.optionalString cfg.indicator "--indicator"}";
|
||||
};
|
||||
|
||||
services.dbus.packages = [ pkgs.gcr ];
|
||||
services.dbus.packages = [ pkgs.gcr_3 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ in
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.gnome-keyring
|
||||
pkgs.gcr
|
||||
pkgs.gcr_3
|
||||
];
|
||||
|
||||
xdg.portal.extraPortals = [ pkgs.gnome-keyring ];
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
gnome-desktop,
|
||||
gnome-session,
|
||||
gnome-shell,
|
||||
gcr,
|
||||
gcr_3,
|
||||
pam,
|
||||
systemd,
|
||||
upower,
|
||||
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
evolution-data-server
|
||||
pulseaudio
|
||||
modemmanager
|
||||
gcr
|
||||
gcr_3
|
||||
networkmanager
|
||||
polkit
|
||||
gmobile
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
cups,
|
||||
docbook-xsl-nons,
|
||||
fontconfig,
|
||||
gcr,
|
||||
gcr_3,
|
||||
gdk-pixbuf,
|
||||
gettext,
|
||||
glib,
|
||||
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
colord
|
||||
colord-gtk
|
||||
fontconfig
|
||||
gcr
|
||||
gcr_3
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
evolution-data-server,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gcr,
|
||||
gcr_3,
|
||||
gdk-pixbuf,
|
||||
gettext,
|
||||
libgnomekbd,
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cjs
|
||||
dbus
|
||||
evolution-data-server # for calendar-server
|
||||
gcr
|
||||
gcr_3
|
||||
gdk-pixbuf
|
||||
glib
|
||||
graphene
|
||||
|
||||
@@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcr";
|
||||
version = "3.41.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
@@ -107,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
attrPath = "gcr_3";
|
||||
packageName = "gcr";
|
||||
freeze = true;
|
||||
};
|
||||
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcr";
|
||||
version = "4.4.0.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"bin"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
libxml2,
|
||||
gettext,
|
||||
sqlite,
|
||||
gcr,
|
||||
gcr_3,
|
||||
json-glib,
|
||||
itstool,
|
||||
libgee,
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
adwaita-icon-theme
|
||||
enchant
|
||||
folks
|
||||
gcr
|
||||
gcr_3
|
||||
glib-networking
|
||||
gmime3
|
||||
gnome-online-accounts
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
glib,
|
||||
libxslt,
|
||||
gettext,
|
||||
gcr,
|
||||
gcr_3,
|
||||
libcap_ng,
|
||||
libselinux,
|
||||
p11-kit,
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pam
|
||||
libcap_ng
|
||||
libselinux
|
||||
gcr
|
||||
gcr_3
|
||||
p11-kit
|
||||
];
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
gnupg,
|
||||
gpgme,
|
||||
dbus-glib,
|
||||
gcr,
|
||||
gcr_3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gnupg
|
||||
gpgme
|
||||
dbus-glib
|
||||
gcr
|
||||
gcr_3
|
||||
];
|
||||
propagatedBuildInputs = [ dbus-glib ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
nemo,
|
||||
dbus-glib,
|
||||
libcryptui,
|
||||
gcr,
|
||||
gcr_3,
|
||||
libnotify,
|
||||
gnupg,
|
||||
gpgme,
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gpgme
|
||||
dbus-glib
|
||||
libcryptui
|
||||
gcr
|
||||
gcr_3
|
||||
libnotify
|
||||
gnupg
|
||||
];
|
||||
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
services.desktopManager.gnome.extraGSettingsOverridePackages = with pkgs; [
|
||||
nemo
|
||||
gcr
|
||||
gcr_3
|
||||
libcryptui
|
||||
nemo-seahorse
|
||||
];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
intltool,
|
||||
pkg-config,
|
||||
networkmanager,
|
||||
gcr,
|
||||
gcr_3,
|
||||
libsecret,
|
||||
file,
|
||||
gtk3,
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
libnma
|
||||
libnma-gtk4
|
||||
gtk4
|
||||
gcr
|
||||
gcr_3
|
||||
libsecret
|
||||
];
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
spellChecking ? true,
|
||||
gnomeSupport ? true,
|
||||
libsecret,
|
||||
gcr,
|
||||
gcr_3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals spellChecking [ gspell ]
|
||||
++ lib.optionals gnomeSupport [
|
||||
libsecret
|
||||
gcr
|
||||
gcr_3
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
gpgme,
|
||||
python3,
|
||||
openldap,
|
||||
gcr,
|
||||
gcr_3,
|
||||
libsecret,
|
||||
avahi,
|
||||
p11-kit,
|
||||
@@ -59,14 +59,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openssh
|
||||
gnupg
|
||||
desktop-file-utils
|
||||
gcr
|
||||
gcr_3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
glib
|
||||
glib-networking
|
||||
gcr
|
||||
gcr_3
|
||||
gsettings-desktop-schemas
|
||||
gpgme
|
||||
libsecret
|
||||
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Add “org.gnome.crypto.pgp” GSettings schema to path
|
||||
# to make it available for “gpgme-backend” test.
|
||||
# It is used by Seahorse’s internal “common” library.
|
||||
addToSearchPath XDG_DATA_DIRS "${glib.getSchemaDataDirPath gcr}"
|
||||
addToSearchPath XDG_DATA_DIRS "${glib.getSchemaDataDirPath gcr_3}"
|
||||
# The same test also requires home directory so that it can store settings.
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Pick up icons from Gcr
|
||||
--prefix XDG_DATA_DIRS : "${gcr}/share"
|
||||
--prefix XDG_DATA_DIRS : "${gcr_3}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
glib,
|
||||
glib-networking,
|
||||
json-glib,
|
||||
gcr,
|
||||
gcr_3,
|
||||
libgee,
|
||||
gexiv2_0_16,
|
||||
gettext,
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib-networking
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
gcr
|
||||
gcr_3
|
||||
adwaita-icon-theme
|
||||
libsecret
|
||||
libportal-gtk3
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
glib,
|
||||
gcr,
|
||||
gcr_3,
|
||||
glib-networking,
|
||||
gsettings-desktop-schemas,
|
||||
gtk3,
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
gcr
|
||||
gcr_3
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
libsoup_3
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
libsForQt5,
|
||||
qt6,
|
||||
ncurses,
|
||||
gcr,
|
||||
gcr_3,
|
||||
withLibsecret ? true,
|
||||
libsecret,
|
||||
}:
|
||||
@@ -28,7 +28,7 @@ let
|
||||
};
|
||||
gnome3 = {
|
||||
flag = "gnome3";
|
||||
buildInputs = [ gcr ];
|
||||
buildInputs = [ gcr_3 ];
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
};
|
||||
qt5 = {
|
||||
|
||||
@@ -959,6 +959,7 @@ mapAliases {
|
||||
gcc12 = throw "gcc12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
|
||||
gcc12Stdenv = throw "gcc12Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
|
||||
gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
|
||||
gcr = throw "'gcr' attribute has been removed from nixpkgs. Use a 'gcr_*' attribute with an explicit ABI version instead."; # Added 2026-09-03
|
||||
gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
|
||||
gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
|
||||
gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
|
||||
|
||||
Reference in New Issue
Block a user