Merge pull request #333917 from jtojnar/gnome-top-level

gnome: Move more packages to top-level
This commit is contained in:
Jan Tojnar
2024-08-24 01:43:31 +02:00
committed by GitHub
78 changed files with 1379 additions and 1440 deletions
@@ -64,13 +64,13 @@ in
config = lib.mkIf config.services.gnome.gnome-initial-setup.enable {
environment.systemPackages = [
pkgs.gnome.gnome-initial-setup
pkgs.gnome-initial-setup
]
++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
;
systemd.packages = [
pkgs.gnome.gnome-initial-setup
pkgs.gnome-initial-setup
];
systemd.user.targets."gnome-session".wants = [
@@ -84,7 +84,7 @@ in
];
programs.dconf.profiles.gnome-initial-setup.databases = [
"${pkgs.gnome.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
"${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
];
};
@@ -1,41 +1,9 @@
# GNOME Online Miners daemon.
{ config, pkgs, lib, ... }:
{ lib, ... }:
{
meta = {
maintainers = lib.teams.gnome.members;
};
###### interface
options = {
services.gnome.gnome-online-miners = {
enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to enable GNOME Online Miners, a service that
crawls through your online content.
'';
};
};
};
###### implementation
config = lib.mkIf config.services.gnome.gnome-online-miners.enable {
environment.systemPackages = [ pkgs.gnome.gnome-online-miners ];
services.dbus.packages = [ pkgs.gnome.gnome-online-miners ];
};
imports = [
(lib.mkRemovedOptionModule [ "services" "gnome" "gnome-online-miners" ] "It was broken for a while now.")
];
}
@@ -16,12 +16,12 @@
###### implementation
config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable {
services.pipewire.enable = true;
services.dbus.packages = [ pkgs.gnome.gnome-remote-desktop ];
services.dbus.packages = [ pkgs.gnome-remote-desktop ];
environment.systemPackages = [ pkgs.gnome.gnome-remote-desktop ];
environment.systemPackages = [ pkgs.gnome-remote-desktop ];
systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];
systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ];
systemd.packages = [ pkgs.gnome-remote-desktop ];
systemd.tmpfiles.packages = [ pkgs.gnome-remote-desktop ];
# TODO: if possible, switch to using provided g-r-d sysusers.d
users = {
@@ -222,7 +222,6 @@ in {
# For BCC's Online Accounts panel.
services.gnome.gnome-online-accounts.enable = mkDefault true;
services.gnome.gnome-online-miners.enable = true;
# For BCC's Printers panel.
services.printing.enable = mkDefault true;
@@ -52,9 +52,9 @@ let
flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0;
flashbackWms = lib.optional cfg.flashback.enableMetacity {
wmName = "metacity";
wmName = "pkgs.metacity";
wmLabel = "Metacity";
wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
wmCommand = "${pkgs.metacity}/bin/metacity";
enableGnomePanel = true;
} ++ cfg.flashback.customSessions;
@@ -266,7 +266,6 @@ in
services.gnome.evolution-data-server.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-online-accounts.enable = mkDefault true;
services.gnome.gnome-online-miners.enable = true;
services.gnome.tracker-miners.enable = mkDefault true;
services.gnome.tracker.enable = mkDefault true;
services.hardware.bolt.enable = mkDefault true;
@@ -313,7 +312,7 @@ in
pkgs.gnome.gnome-shell
];
optionalPackages = [
pkgs.gnome.gnome-shell-extensions
pkgs.gnome-shell-extensions
];
in
mandatoryPackages
@@ -375,11 +374,11 @@ in
optionalPackages = with pkgs.gnome; [
pkgs.adwaita-icon-theme
nixos-background-info
gnome-backgrounds
pkgs.gnome-backgrounds
gnome-bluetooth
gnome-color-manager
pkgs.gnome-color-manager
gnome-control-center
gnome-shell-extensions
pkgs.gnome-shell-extensions
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs
pkgs.orca
@@ -396,7 +395,6 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst
(lib.mkIf serviceCfg.core-utilities.enable {
environment.systemPackages =
with pkgs.gnome;
utils.removePackagesByName
([
pkgs.baobab
@@ -404,16 +402,16 @@ in
pkgs.gnome-text-editor
pkgs.gnome-calculator
pkgs.gnome-calendar
gnome-characters
gnome-clocks
pkgs.gnome-characters
pkgs.gnome-clocks
pkgs.gnome-console
gnome-contacts
pkgs.gnome-contacts
pkgs.gnome-font-viewer
gnome-logs
gnome-maps
gnome-music
pkgs.gnome-logs
pkgs.gnome-maps
pkgs.gnome-music
pkgs.gnome-system-monitor
gnome-weather
pkgs.gnome-weather
pkgs.loupe
pkgs.nautilus
pkgs.gnome-connections
@@ -424,7 +422,7 @@ in
] ++ lib.optionals config.services.flatpak.enable [
# Since PackageKit Nix support is not there yet,
# only install gnome-software if flatpak is enabled.
gnome-software
pkgs.gnome-software
])
config.environment.gnome.excludePackages;
@@ -456,27 +454,27 @@ in
})
(lib.mkIf serviceCfg.games.enable {
environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
aisleriot
atomix
five-or-more
four-in-a-row
environment.systemPackages = utils.removePackagesByName [
pkgs.aisleriot
pkgs.atomix
pkgs.five-or-more
pkgs.four-in-a-row
pkgs.gnome-2048
gnome-chess
gnome-klotski
gnome-mahjongg
gnome-mines
gnome-nibbles
gnome-robots
gnome-sudoku
gnome-taquin
gnome-tetravex
hitori
iagno
lightsoff
quadrapassel
swell-foop
tali
pkgs.gnome-chess
pkgs.gnome-klotski
pkgs.gnome-mahjongg
pkgs.gnome-mines
pkgs.gnome-nibbles
pkgs.gnome-robots
pkgs.gnome-sudoku
pkgs.gnome-taquin
pkgs.gnome-tetravex
pkgs.hitori
pkgs.iagno
pkgs.lightsoff
pkgs.quadrapassel
pkgs.swell-foop
pkgs.tali
] config.environment.gnome.excludePackages;
})
@@ -490,7 +488,7 @@ in
# it doesn't function well enough to be included
# in default configurations.
# https://github.com/NixOS/nixpkgs/issues/60908
/* gnome-boxes */
/* pkgs.gnome-boxes */
] config.environment.gnome.excludePackages;
services.sysprof.enable = notExcluded pkgs.sysprof;
@@ -1,11 +1,9 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome.gdm;
gdm = pkgs.gdm;
pamCfg = config.security.pam.services;
settingsFormat = pkgs.formats.ini { };
configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings;
@@ -40,24 +38,24 @@ in
{
imports = [
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "enable" ] [
(lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "enable" ] [
"services"
"displayManager"
"autoLogin"
"enable"
])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "user" ] [
(lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "user" ] [
"services"
"displayManager"
"autoLogin"
"user"
])
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.")
(lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.")
];
meta = {
maintainers = teams.gnome.members;
maintainers = lib.teams.gnome.members;
};
###### interface
@@ -66,38 +64,38 @@ in
services.xserver.displayManager.gdm = {
enable = mkEnableOption "GDM, the GNOME Display Manager";
enable = lib.mkEnableOption "GDM, the GNOME Display Manager";
debug = mkEnableOption "debugging messages in GDM";
debug = lib.mkEnableOption "debugging messages in GDM";
# Auto login options specific to GDM
autoLogin.delay = mkOption {
type = types.int;
autoLogin.delay = lib.mkOption {
type = lib.types.int;
default = 0;
description = ''
Seconds of inactivity after which the autologin will be performed.
'';
};
wayland = mkOption {
type = types.bool;
wayland = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Allow GDM to run on Wayland instead of Xserver.
'';
};
autoSuspend = mkOption {
autoSuspend = lib.mkOption {
default = true;
description = ''
On the GNOME Display Manager login screen, suspend the machine after inactivity.
(Does not affect automatic suspend while logged in, or at lock screen.)
'';
type = types.bool;
type = lib.types.bool;
};
banner = mkOption {
type = types.nullOr types.lines;
banner = lib.mkOption {
type = lib.types.nullOr lib.types.lines;
default = null;
example = ''
foo
@@ -109,7 +107,7 @@ in
'';
};
settings = mkOption {
settings = lib.mkOption {
type = settingsFormat.type;
default = { };
example = {
@@ -128,7 +126,7 @@ in
###### implementation
config = mkIf cfg.gdm.enable {
config = lib.mkIf cfg.gdm.enable {
services.xserver.displayManager.lightdm.enable = false;
@@ -151,7 +149,7 @@ in
{
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
(lib.filter (arg: arg != "-terminate") cfg.xserverArgs);
XDG_DATA_DIRS = lib.makeSearchPath "share" [
gdm # for gnome-login.session
config.services.displayManager.sessionData.desktops
@@ -159,14 +157,14 @@ in
pkgs.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base
];
} // optionalAttrs (xSessionWrapper != null) {
} // lib.optionalAttrs (xSessionWrapper != null) {
# Make GDM use this wrapper before running the session, which runs the
# configured setupCommands. This relies on a patched GDM which supports
# this environment variable.
GDM_X_SESSION_WRAPPER = "${xSessionWrapper}";
};
execCmd = "exec ${gdm}/bin/gdm";
preStart = optionalString (defaultSessionName != null) ''
preStart = lib.optionalString (defaultSessionName != null) ''
# Set default session in session chooser to a specified values basically ignore session history.
${setSessionScript}/bin/set-session ${config.services.displayManager.sessionData.autologinSession}
'';
@@ -174,10 +172,10 @@ in
systemd.tmpfiles.rules = [
"d /run/gdm/.config 0711 gdm gdm"
] ++ optionals config.hardware.pulseaudio.enable [
] ++ lib.optionals config.hardware.pulseaudio.enable [
"d /run/gdm/.config/pulse 0711 gdm gdm"
"L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
] ++ optionals config.services.gnome.gnome-initial-setup.enable [
] ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
];
@@ -219,7 +217,7 @@ in
# conflicts display-manager.service, then when nixos-rebuild
# switch starts multi-user.target, display-manager.service is
# stopped so plymouth-quit.service can be started.)
systemd.services.plymouth-quit = mkIf config.boot.plymouth.enable {
systemd.services.plymouth-quit = lib.mkIf config.boot.plymouth.enable {
wantedBy = lib.mkForce [];
};
@@ -261,20 +259,20 @@ in
# Otherwise with TimedLogin with zero seconds the prompt is still
# presented and there's a little delay.
services.xserver.displayManager.gdm.settings = {
daemon = mkMerge [
daemon = lib.mkMerge [
{ WaylandEnable = cfg.gdm.wayland; }
# nested if else didn't work
(mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0 ) {
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0 ) {
TimedLoginEnable = true;
TimedLogin = config.services.displayManager.autoLogin.user;
TimedLoginDelay = cfg.gdm.autoLogin.delay;
})
(mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0 ) {
(lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0 ) {
AutomaticLoginEnable = true;
AutomaticLogin = config.services.displayManager.autoLogin.user;
})
];
debug = mkIf cfg.gdm.debug {
debug = lib.mkIf cfg.gdm.debug {
Enable = true;
};
};
@@ -312,7 +310,7 @@ in
auth requisite pam_nologin.so
auth required pam_succeed_if.so uid >= 1000 quiet
${lib.optionalString pamCfg.login.enableGnomeKeyring ''
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
''}
auth required pam_permit.so
@@ -327,16 +325,16 @@ in
# This would block password prompt when included by gdm-password.
# GDM will instead run gdm-fingerprint in parallel.
login.fprintAuth = mkIf config.services.fprintd.enable false;
login.fprintAuth = lib.mkIf config.services.fprintd.enable false;
gdm-fingerprint.text = mkIf config.services.fprintd.enable ''
gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth required pam_env.so
${lib.optionalString pamCfg.login.enableGnomeKeyring ''
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
''}
@@ -1,29 +1,27 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.metacity;
inherit (pkgs) gnome;
inherit (pkgs) metacity;
in
{
options = {
services.xserver.windowManager.metacity.enable = mkEnableOption "metacity";
services.xserver.windowManager.metacity.enable = lib.mkEnableOption "metacity";
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.xserver.windowManager.session = singleton
services.xserver.windowManager.session = lib.singleton
{ name = "metacity";
start = ''
${gnome.metacity}/bin/metacity &
${metacity}/bin/metacity &
waitPID=$!
'';
};
environment.systemPackages = [ gnome.metacity ];
environment.systemPackages = [ metacity ];
};
@@ -1,19 +1,20 @@
{ stdenv
, lib
, fetchFromGitLab
, gitUpdater
, pkg-config
, itstool
, gtk3
, wrapGAppsHook3
, meson
, librsvg
, libxml2
, desktop-file-utils
, guile
, libcanberra-gtk3
, ninja
, yelp-tools
{
stdenv,
lib,
fetchFromGitLab,
gitUpdater,
pkg-config,
itstool,
gtk3,
wrapGAppsHook3,
meson,
librsvg,
libxml2,
desktop-file-utils,
guile,
libcanberra-gtk3,
ninja,
yelp-tools,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -53,13 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs src/lib/meson_compileschemas.py
'';
mesonFlags = [
"-Dtheme_kde=false"
];
mesonFlags = [ "-Dtheme_kde=false" ];
passthru = {
updateScript = gitUpdater {
};
updateScript = gitUpdater { };
};
meta = with lib; {
@@ -1,17 +1,18 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, wrapGAppsHook3
, python3
, gettext
, gnome
, glib
, gtk3
, libgnome-games-support
, gdk-pixbuf
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
wrapGAppsHook3,
python3,
gettext,
gnome,
glib,
gtk3,
libgnome-games-support,
gdk-pixbuf,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "atomix";
attrPath = "gnome.atomix";
};
updateScript = gnome.updateScript { packageName = "atomix"; };
};
meta = with lib; {
@@ -21,7 +21,9 @@
glib-networking,
glibc,
gnome,
gnome-color-manager,
gnome-desktop,
gnome-remote-desktop,
gnome-user-share,
gsettings-desktop-schemas,
gsound,
@@ -78,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
(substituteAll {
src = ./paths.patch;
budgie_desktop = budgie-desktop;
gcm = gnome.gnome-color-manager;
gcm = gnome-color-manager;
inherit
cups
glibc
@@ -115,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
adwaita-icon-theme
cheese
gnome.gnome-bluetooth_1_0
gnome.gnome-remote-desktop
gnome-remote-desktop
gnome.gnome-settings-daemon
gnome-user-share
gnome.mutter
@@ -1,16 +1,37 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook3, libgee, vala }:
{
fetchurl,
lib,
stdenv,
pkg-config,
gnome,
glib,
gtk3,
clutter,
dbus,
python3,
libxml2,
libxklavier,
libXtst,
gtk2,
intltool,
libxslt,
at-spi2-core,
autoreconfHook,
wrapGAppsHook3,
libgee,
vala,
}:
let
pname = "caribou";
version = "0.4.21";
pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]);
in
stdenv.mkDerivation rec {
name = "caribou-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/caribou/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};
@@ -38,14 +59,32 @@ in stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook3 vala ];
buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3
libXtst gtk2
nativeBuildInputs = [
pkg-config
intltool
libxslt
libxml2
autoreconfHook
wrapGAppsHook3
vala
];
propagatedBuildInputs = [ libgee libxklavier ];
buildInputs = [
glib
gtk3
clutter
at-spi2-core
dbus
pythonEnv
python3.pkgs.pygobject3
libXtst
gtk2
];
propagatedBuildInputs = [
libgee
libxklavier
];
postPatch = ''
patchShebangs .
@@ -53,10 +92,7 @@ in stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "caribou"; };
};
meta = with lib; {
+3 -3
View File
@@ -32,7 +32,7 @@
, wrapGAppsHook3
, libxml2
, gtk-doc
, gnome
, caribou
, python3
, keybinder3
, cairo
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
# bindings
cairo
gnome.caribou
caribou
keybinder3
upower
xapp
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
preFixup = ''
# https://github.com/NixOS/nixpkgs/issues/101881
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
--prefix XDG_DATA_DIRS : "${caribou}/share"
)
buildPythonPath "$out ${python3.pkgs.python-xapp}"
@@ -13,7 +13,7 @@
, libxslt
, gtk3
, libgnomekbd
, gnome
, caribou
, libtool
, wrapGAppsHook3
, gobject-introspection
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
cinnamon-desktop
cinnamon-common
libgnomekbd
gnome.caribou
caribou
];
postPatch = ''
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
preFixup = ''
# https://github.com/NixOS/nixpkgs/issues/101881
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
--prefix XDG_DATA_DIRS : "${caribou}/share"
)
'';
@@ -1,19 +1,20 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, gnome
, gtk3
, wrapGAppsHook3
, librsvg
, libgnome-games-support
, gettext
, itstool
, libxml2
, python3
, vala
{
stdenv,
lib,
fetchurl,
meson,
ninja,
pkg-config,
gnome,
gtk3,
wrapGAppsHook3,
librsvg,
libgnome-games-support,
gettext,
itstool,
libxml2,
python3,
vala,
}:
stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
version = "3.32.3";
src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/five-or-more-${version}.tar.xz";
sha256 = "LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ=";
};
@@ -49,10 +50,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "five-or-more";
attrPath = "gnome.five-or-more";
};
updateScript = gnome.updateScript { packageName = "five-or-more"; };
};
meta = with lib; {
@@ -1,21 +1,50 @@
{ lib, stdenv, fetchurl, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3
, gettext, meson, gsound, librsvg, itstool, vala
, python3, ninja, desktop-file-utils }:
{
lib,
stdenv,
fetchurl,
pkg-config,
gnome,
adwaita-icon-theme,
gtk3,
wrapGAppsHook3,
gettext,
meson,
gsound,
librsvg,
itstool,
vala,
python3,
ninja,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
pname = "four-in-a-row";
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/four-in-a-row-${version}.tar.xz";
sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1";
};
nativeBuildInputs = [
pkg-config wrapGAppsHook3 gettext meson itstool vala
ninja python3 desktop-file-utils
pkg-config
wrapGAppsHook3
gettext
meson
itstool
vala
ninja
python3
desktop-file-utils
];
buildInputs = [
gtk3
gsound
librsvg
adwaita-icon-theme
];
buildInputs = [ gtk3 gsound librsvg adwaita-icon-theme ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
@@ -23,10 +52,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "four-in-a-row";
attrPath = "gnome.four-in-a-row";
};
updateScript = gnome.updateScript { packageName = "four-in-a-row"; };
};
meta = with lib; {
@@ -1,35 +1,36 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, substituteAll
, meson
, ninja
, pkg-config
, glib
, json-glib
, itstool
, xorg
, accountsservice
, libX11
, gnome
, systemd
, dconf
, gtk3
, libcanberra-gtk3
, pam
, libgudev
, libselinux
, keyutils
, audit
, gobject-introspection
, plymouth
, coreutils
, xorgserver
, xwayland
, dbus
, nixos-icons
, runCommand
{
lib,
stdenv,
fetchurl,
fetchpatch,
substituteAll,
meson,
ninja,
pkg-config,
glib,
json-glib,
itstool,
xorg,
accountsservice,
libX11,
gnome,
systemd,
dconf,
gtk3,
libcanberra-gtk3,
pam,
libgudev,
libselinux,
keyutils,
audit,
gobject-introspection,
plymouth,
coreutils,
xorgserver,
xwayland,
dbus,
nixos-icons,
runCommand,
}:
let
@@ -45,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
pname = "gdm";
version = "46.2";
outputs = [ "out" "dev" ];
outputs = [
"out"
"dev"
];
src = fetchurl {
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
@@ -103,7 +107,13 @@ stdenv.mkDerivation (finalAttrs: {
# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
inherit coreutils plymouth xorgserver xwayland dbus;
inherit
coreutils
plymouth
xorgserver
xwayland
dbus
;
})
# The following patches implement certain environment variables in GDM which are set by
@@ -165,10 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
separateDebugInfo = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gdm";
attrPath = "gnome.gdm";
};
updateScript = gnome.updateScript { packageName = "gdm"; };
# Used in GDM NixOS module
# Don't remove.
@@ -1,9 +1,10 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, gnome
{
stdenv,
lib,
fetchurl,
meson,
ninja,
gnome,
}:
stdenv.mkDerivation rec {
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4=";
};
@@ -28,10 +29,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-backgrounds";
attrPath = "gnome.gnome-backgrounds";
};
updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; };
};
meta = with lib; {
@@ -1,50 +1,51 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, wrapGAppsHook3
, pkg-config
, gettext
, itstool
, libvirt-glib
, glib
, gobject-introspection
, libxml2
, gtk3
, libvirt
, spice-gtk
, spice-protocol
, libhandy
, libsoup_3
, libosinfo
, systemd
, vala
, libcap
, yajl
, gmp
, gdbm
, cyrus_sasl
, gnome
, adwaita-icon-theme
, librsvg
, desktop-file-utils
, mtools
, cdrkit
, libcdio
, libusb1
, libarchive
, acl
, libgudev
, libcap_ng
, numactl
, libapparmor
, json-glib
, webkitgtk_4_1
, vte
, glib-networking
, qemu-utils
, libportal-gtk3
{
stdenv,
lib,
fetchurl,
meson,
ninja,
wrapGAppsHook3,
pkg-config,
gettext,
itstool,
libvirt-glib,
glib,
gobject-introspection,
libxml2,
gtk3,
libvirt,
spice-gtk,
spice-protocol,
libhandy,
libsoup_3,
libosinfo,
systemd,
vala,
libcap,
yajl,
gmp,
gdbm,
cyrus_sasl,
gnome,
adwaita-icon-theme,
librsvg,
desktop-file-utils,
mtools,
cdrkit,
libcdio,
libusb1,
libarchive,
acl,
libgudev,
libcap_ng,
numactl,
libapparmor,
json-glib,
webkitgtk_4_1,
vte,
glib-networking,
qemu-utils,
libportal-gtk3,
}:
stdenv.mkDerivation rec {
@@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
version = "46.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz";
hash = "sha256-kAwXf2diZANwpmNM+efTzYIH5Jg2eopmemtzGwQRYDY=";
};
@@ -80,9 +81,7 @@ stdenv.mkDerivation rec {
];
# Required for USB redirection PolicyKit rules file
propagatedUserEnvPkgs = [
spice-gtk
];
propagatedUserEnvPkgs = [ spice-gtk ];
buildInputs = [
acl
@@ -118,14 +117,18 @@ stdenv.mkDerivation rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}")
gappsWrapperArgs+=(--prefix PATH : "${
lib.makeBinPath [
mtools
cdrkit
libcdio
qemu-utils
]
}")
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-boxes"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, gettext
, gnome
, glib
, gtk4
, pango
, wrapGAppsHook4
, desktop-file-utils
, gobject-introspection
, gjs
, libunistring
, libadwaita
, gsettings-desktop-schemas
, gnome-desktop
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
gettext,
gnome,
glib,
gtk4,
pango,
wrapGAppsHook4,
desktop-file-utils,
gobject-introspection,
gjs,
libunistring,
libadwaita,
gsettings-desktop-schemas,
gnome-desktop,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz";
hash = "sha256-pOjixRC/SCBLmZSk581TeEQkbnTIqYb52+BOIj9dgnw=";
};
@@ -38,7 +39,6 @@ stdenv.mkDerivation rec {
wrapGAppsHook4
];
buildInputs = [
gjs
glib
@@ -61,10 +61,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-characters"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, vala
, pkg-config
, desktop-file-utils
, wrapGAppsHook4
, gobject-introspection
, gettext
, itstool
, libxml2
, gnome
, glib
, gtk4
, libadwaita
, librsvg
, pango
{
lib,
stdenv,
fetchurl,
meson,
ninja,
vala,
pkg-config,
desktop-file-utils,
wrapGAppsHook4,
gobject-introspection,
gettext,
itstool,
libxml2,
gnome,
glib,
gtk4,
libadwaita,
librsvg,
pango,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz";
hash = "sha256-oryQ4KdUMSxXibkZi0knMDd1tiWDqOlnbSxqlztG/ec=";
};
@@ -50,10 +51,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-chess";
attrPath = "gnome.gnome-chess";
};
updateScript = gnome.updateScript { packageName = "gnome-chess"; };
};
meta = with lib; {
@@ -67,10 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-clocks";
attrPath = "gnome.gnome-clocks";
};
updateScript = gnome.updateScript { packageName = "gnome-clocks"; };
};
meta = {
@@ -1,22 +1,24 @@
{ lib, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, gettext
, itstool
, desktop-file-utils
, gnome
, glib
, gtk3
, libexif
, libtiff
, colord
, colord-gtk
, libcanberra-gtk3
, lcms2
, vte
, exiv2
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
gettext,
itstool,
desktop-file-utils,
gnome,
glib,
gtk3,
libexif,
libtiff,
colord,
colord-gtk,
libcanberra-gtk3,
lcms2,
vte,
exiv2,
}:
stdenv.mkDerivation rec {
@@ -24,13 +26,11 @@ stdenv.mkDerivation rec {
version = "3.32.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor version}/gnome-color-manager-${version}.tar.xz";
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
};
patches = [
./0001-Fix-build-with-Exiv2-0.28.patch
];
patches = [ ./0001-Fix-build-with-Exiv2-0.28.patch ];
nativeBuildInputs = [
meson
@@ -59,8 +59,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "gnome-color-manager";
freeze = true;
};
};
@@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, vala
, gettext
, itstool
, desktop-file-utils
, wrapGAppsHook3
, glib
, gtk3
, libhandy
, libsecret
, libxml2
, gtk-vnc
, gtk-frdp
, gnome
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
vala,
gettext,
itstool,
desktop-file-utils,
wrapGAppsHook3,
glib,
gtk3,
libhandy,
libsecret,
libxml2,
gtk-vnc,
gtk-frdp,
gnome,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-connections/${lib.versions.major version}/gnome-connections-${version}.tar.xz";
hash = "sha256-+xzqaOeTC73B2yi3zQqaN80xDUtOeHL+gU9QoWqNJdM=";
};
@@ -51,9 +52,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
};
updateScript = gnome.updateScript { packageName = "gnome-connections"; };
};
meta = with lib; {
@@ -1,27 +1,28 @@
{ lib
, stdenv
, gettext
, fetchurl
, evolution-data-server-gtk4
, pkg-config
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
, desktop-file-utils
, gtk4
, glib
, libportal-gtk4
, gnome-online-accounts
, qrencode
, wrapGAppsHook4
, folks
, libxml2
, gnome
, vala
, meson
, ninja
, libadwaita
, gsettings-desktop-schemas
{
lib,
stdenv,
gettext,
fetchurl,
evolution-data-server-gtk4,
pkg-config,
libxslt,
docbook-xsl-nons,
docbook_xml_dtd_42,
desktop-file-utils,
gtk4,
glib,
libportal-gtk4,
gnome-online-accounts,
qrencode,
wrapGAppsHook4,
folks,
libxml2,
gnome,
vala,
meson,
ninja,
libadwaita,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz";
hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8=";
};
@@ -62,10 +63,7 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-contacts";
attrPath = "gnome.gnome-contacts";
};
updateScript = gnome.updateScript { packageName = "gnome-contacts"; };
};
meta = with lib; {
@@ -1,37 +1,38 @@
{ stdenv
, lib
, fetchurl
, substituteAll
, dconf
, gettext
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, gnome
, accountsservice
, fontconfig
, gdm
, geoclue2
, geocode-glib_2
, glib
, gnome-desktop
, gtk4
, libgweather
, json-glib
, krb5
, libpwquality
, libsecret
, networkmanager
, pango
, polkit
, webkitgtk_6_0
, systemd
, libadwaita
, libnma-gtk4
, tzdata
, gnome-tecla
, gsettings-desktop-schemas
{
stdenv,
lib,
fetchurl,
substituteAll,
dconf,
gettext,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
gnome,
accountsservice,
fontconfig,
gdm,
geoclue2,
geocode-glib_2,
glib,
gnome-desktop,
gtk4,
libgweather,
json-glib,
krb5,
libpwquality,
libsecret,
networkmanager,
pango,
polkit,
webkitgtk_6_0,
systemd,
libadwaita,
libnma-gtk4,
tzdata,
gnome-tecla,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -91,10 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-initial-setup";
attrPath = "gnome.gnome-initial-setup";
};
updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; };
};
meta = with lib; {
@@ -1,6 +1,25 @@
{ lib, stdenv, fetchurl, pkg-config, vala, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils
, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support
, meson, ninja, python3
{
lib,
stdenv,
fetchurl,
pkg-config,
vala,
gnome,
adwaita-icon-theme,
gtk3,
wrapGAppsHook3,
appstream-glib,
desktop-file-utils,
glib,
librsvg,
libxml2,
gettext,
itstool,
libgee,
libgnome-games-support,
meson,
ninja,
python3,
}:
stdenv.mkDerivation rec {
@@ -13,11 +32,27 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkg-config vala meson ninja python3 wrapGAppsHook3
gettext itstool libxml2 appstream-glib desktop-file-utils
pkg-config
vala
meson
ninja
python3
wrapGAppsHook3
gettext
itstool
libxml2
appstream-glib
desktop-file-utils
adwaita-icon-theme
];
buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ];
buildInputs = [
glib
gtk3
librsvg
libgee
libgnome-games-support
];
postPatch = ''
chmod +x build-aux/meson_post_install.py
@@ -25,10 +60,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-klotski"; };
};
meta = with lib; {
@@ -1,23 +1,24 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, gnome
, glib
, gtk4
, desktop-file-utils
, wrapGAppsHook4
, gettext
, itstool
, libadwaita
, libxml2
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_43
, systemd
, gsettings-desktop-schemas
{
stdenv,
lib,
fetchurl,
meson,
ninja,
pkg-config,
gnome,
glib,
gtk4,
desktop-file-utils,
wrapGAppsHook4,
gettext,
itstool,
libadwaita,
libxml2,
libxslt,
docbook-xsl-nons,
docbook_xml_dtd_43,
systemd,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
version = "45.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz";
hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI=";
};
@@ -53,17 +54,12 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
];
mesonFlags = [
"-Dman=true"
];
mesonFlags = [ "-Dman=true" ];
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-logs";
attrPath = "gnome.gnome-logs";
};
updateScript = gnome.updateScript { packageName = "gnome-logs"; };
};
meta = with lib; {
@@ -1,20 +1,21 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, gnome
, gtk4
, wrapGAppsHook4
, libadwaita
, librsvg
, gettext
, itstool
, libxml2
, meson
, ninja
, glib
, vala
, desktop-file-utils
{
stdenv,
lib,
fetchurl,
pkg-config,
gnome,
gtk4,
wrapGAppsHook4,
libadwaita,
librsvg,
gettext,
itstool,
libxml2,
meson,
ninja,
glib,
vala,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.40.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/gnome-mahjongg-${version}.tar.xz";
hash = "sha256-jtVO7K3jawgzaQb9jmyQKg1ve7u7Z2U8I5Vqa2MSI/Y=";
};
@@ -47,10 +48,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-mahjongg"; };
};
meta = with lib; {
@@ -1,30 +1,31 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, gettext
, python3
, pkg-config
, gnome
, glib
, gtk4
, gobject-introspection
, gdk-pixbuf
, librest_1_0
, libgweather
, geoclue2
, wrapGAppsHook4
, desktop-file-utils
, libportal
, libshumate
, libsecret
, libsoup_3
, gsettings-desktop-schemas
, gjs
, libadwaita
, geocode-glib_2
, tzdata
{
stdenv,
lib,
fetchurl,
meson,
ninja,
gettext,
python3,
pkg-config,
gnome,
glib,
gtk4,
gobject-introspection,
gdk-pixbuf,
librest_1_0,
libgweather,
geoclue2,
wrapGAppsHook4,
desktop-file-utils,
libportal,
libshumate,
libsecret,
libsoup_3,
gsettings-desktop-schemas,
gjs,
libadwaita,
geocode-glib_2,
tzdata,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -97,10 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-maps";
attrPath = "gnome.gnome-maps";
};
updateScript = gnome.updateScript { packageName = "gnome-maps"; };
};
meta = with lib; {
+70
View File
@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchurl,
meson,
ninja,
vala,
pkg-config,
gnome,
adwaita-icon-theme,
gtk3,
wrapGAppsHook3,
librsvg,
gettext,
itstool,
python3,
libxml2,
libgnome-games-support,
libgee,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
pname = "gnome-mines";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${lib.versions.major version}/gnome-mines-${version}.tar.xz";
sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI=";
};
nativeBuildInputs = [
meson
ninja
vala
pkg-config
gettext
itstool
python3
libxml2
wrapGAppsHook3
desktop-file-utils
];
buildInputs = [
gtk3
librsvg
adwaita-icon-theme
libgnome-games-support
libgee
];
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-mines"; };
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-mines";
description = "Clear hidden mines from a minefield";
mainProgram = "gnome-mines";
maintainers = teams.gnome.members;
license = licenses.gpl3;
platforms = platforms.unix;
};
}
@@ -1,31 +1,32 @@
{ lib
, meson
, ninja
, gettext
, fetchurl
, gdk-pixbuf
, tracker
, libxml2
, python3
, libnotify
, wrapGAppsHook4
, libmediaart
, gobject-introspection
, gnome-online-accounts
, grilo
, grilo-plugins
, pkg-config
, gtk4
, pango
, glib
, desktop-file-utils
, appstream-glib
, itstool
, gnome
, gst_all_1
, libsoup_3
, libadwaita
, gsettings-desktop-schemas
{
lib,
meson,
ninja,
gettext,
fetchurl,
gdk-pixbuf,
tracker,
libxml2,
python3,
libnotify,
wrapGAppsHook4,
libmediaart,
gobject-introspection,
gnome-online-accounts,
grilo,
grilo-plugins,
pkg-config,
gtk4,
pango,
glib,
desktop-file-utils,
appstream-glib,
itstool,
gnome,
gst_all_1,
libsoup_3,
libadwaita,
gsettings-desktop-schemas,
}:
python3.pkgs.buildPythonApplication rec {
@@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
hash = "sha256-Eb4tbCib5NxDOwxPtZo9rDvtAcf1oorualRBl6NTv/0=";
};
@@ -52,29 +53,31 @@ python3.pkgs.buildPythonApplication rec {
gobject-introspection
];
buildInputs = [
gtk4
pango
glib
libmediaart
gnome-online-accounts
gdk-pixbuf
python3
grilo
grilo-plugins
libnotify
libsoup_3
libadwaita
gsettings-desktop-schemas
tracker
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
]);
buildInputs =
[
gtk4
pango
glib
libmediaart
gnome-online-accounts
gdk-pixbuf
python3
grilo
grilo-plugins
libnotify
libsoup_3
libadwaita
gsettings-desktop-schemas
tracker
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
]);
pythonPath = with python3.pkgs; [
pycairo
@@ -95,10 +98,7 @@ python3.pkgs.buildPythonApplication rec {
strictDeps = false;
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-music"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, desktop-file-utils
, itstool
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook3
, glib
, gtk3
, libgtop
, dnsutils
, iputils
, nmap
, inetutils
, gnome
{
stdenv,
lib,
fetchurl,
fetchpatch,
desktop-file-utils,
itstool,
meson,
ninja,
pkg-config,
python3,
wrapGAppsHook3,
glib,
gtk3,
libgtop,
dnsutils,
iputils,
nmap,
inetutils,
gnome,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "42.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-nettool/${lib.versions.major version}/gnome-nettool-${version}.tar.xz";
sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8=";
};
@@ -60,20 +61,19 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [
dnsutils # for dig
iputils # for ping
nmap # for nmap
inetutils # for ping6, traceroute, whois
]}"
--prefix PATH : "${
lib.makeBinPath [
dnsutils # for dig
iputils # for ping
nmap # for nmap
inetutils # for ping6, traceroute, whois
]
}"
)
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-nettool"; };
};
meta = with lib; {
@@ -1,21 +1,22 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, gnome
, gtk4
, wrapGAppsHook4
, librsvg
, gsound
, gettext
, itstool
, vala
, libxml2
, libgee
, libgnome-games-support_2_0
, meson
, ninja
, desktop-file-utils
{
lib,
stdenv,
fetchurl,
pkg-config,
gnome,
gtk4,
wrapGAppsHook4,
librsvg,
gsound,
gettext,
itstool,
vala,
libxml2,
libgee,
libgnome-games-support_2_0,
meson,
ninja,
desktop-file-utils,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -48,10 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-nibbles";
attrPath = "gnome.gnome-nibbles";
};
updateScript = gnome.updateScript { packageName = "gnome-nibbles"; };
};
meta = with lib; {
@@ -1,29 +1,30 @@
{ stdenv
, lib
, meson
, ninja
, gettext
, fetchurl
, fetchpatch
, pkg-config
, wrapGAppsHook3
, itstool
, desktop-file-utils
, python3
, glib
, gtk3
, evolution-data-server
, gnome-online-accounts
, json-glib
, libuuid
, curl
, libhandy
, webkitgtk
, gnome
, adwaita-icon-theme
, libxml2
, gsettings-desktop-schemas
, tracker
{
stdenv,
lib,
meson,
ninja,
gettext,
fetchurl,
fetchpatch,
pkg-config,
wrapGAppsHook3,
itstool,
desktop-file-utils,
python3,
glib,
gtk3,
evolution-data-server,
gnome-online-accounts,
json-glib,
libuuid,
curl,
libhandy,
webkitgtk,
gnome,
adwaita-icon-theme,
libxml2,
gsettings-desktop-schemas,
tracker,
}:
stdenv.mkDerivation rec {
@@ -78,15 +79,10 @@ stdenv.mkDerivation rec {
adwaita-icon-theme
];
mesonFlags = [
"-Dupdate_mimedb=false"
];
mesonFlags = [ "-Dupdate_mimedb=false" ];
passthru = {
updateScript = gnome.updateScript {
packageName = "bijiben";
attrPath = "gnome.gnome-notes";
};
updateScript = gnome.updateScript { packageName = "bijiben"; };
};
meta = with lib; {
@@ -1,17 +1,18 @@
{ stdenv
, lib
, gettext
, fetchurl
, pkg-config
, gtk3
, glib
, meson
, ninja
, upower
, python3
, desktop-file-utils
, wrapGAppsHook3
, gnome
{
stdenv,
lib,
gettext,
fetchurl,
pkg-config,
gtk3,
glib,
meson,
ninja,
upower,
python3,
desktop-file-utils,
wrapGAppsHook3,
gnome,
}:
stdenv.mkDerivation rec {
@@ -43,10 +44,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-power-manager";
attrPath = "gnome.gnome-power-manager";
};
updateScript = gnome.updateScript { packageName = "gnome-power-manager"; };
};
meta = with lib; {
@@ -1,31 +1,32 @@
{ stdenv
, lib
, fetchurl
, cairo
, meson
, ninja
, pkg-config
, python3
, asciidoc
, wrapGAppsHook3
, glib
, libei
, libepoxy
, libdrm
, nv-codec-headers-11
, pipewire
, systemd
, libsecret
, libnotify
, libopus
, libxkbcommon
, gdk-pixbuf
, freerdp3
, fdk_aac
, tpm2-tss
, fuse3
, gnome
, polkit
{
stdenv,
lib,
fetchurl,
cairo,
meson,
ninja,
pkg-config,
python3,
asciidoc,
wrapGAppsHook3,
glib,
libei,
libepoxy,
libdrm,
nv-codec-headers-11,
pipewire,
systemd,
libsecret,
libnotify,
libopus,
libxkbcommon,
gdk-pixbuf,
freerdp3,
fdk_aac,
tpm2-tss,
fuse3,
gnome,
polkit,
}:
stdenv.mkDerivation rec {
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
hash = "sha256-KLwH6W2qFJy45NCldN8KLObsbOZHutyGFUzmEoIsxR4=";
};
@@ -79,10 +80,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-remote-desktop"; };
};
meta = with lib; {
@@ -1,23 +1,24 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, gnome
, gtk3
, wrapGAppsHook3
, librsvg
, gsound
, gettext
, itstool
, libxml2
, libgnome-games-support
, libgee
, meson
, ninja
, vala
, python3
, desktop-file-utils
, adwaita-icon-theme
{
lib,
stdenv,
fetchurl,
pkg-config,
gnome,
gtk3,
wrapGAppsHook3,
librsvg,
gsound,
gettext,
itstool,
libxml2,
libgnome-games-support,
libgee,
meson,
ninja,
vala,
python3,
desktop-file-utils,
adwaita-icon-theme,
}:
stdenv.mkDerivation rec {
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
version = "40.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz";
sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg";
};
@@ -57,10 +58,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-robots";
attrPath = "gnome.gnome-robots";
};
updateScript = gnome.updateScript { packageName = "gnome-robots"; };
};
meta = with lib; {
@@ -66,10 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-shell-extensions";
attrPath = "gnome.gnome-shell-extensions";
};
updateScript = gnome.updateScript { packageName = "gnome-shell-extensions"; };
};
meta = with lib; {
@@ -1,43 +1,44 @@
{ lib
, stdenv
, fetchurl
, substituteAll
, pkg-config
, meson
, ninja
, gettext
, gnome
, wrapGAppsHook4
, packagekit
, ostree
, glib
, appstream
, libsoup_3
, libadwaita
, polkit
, isocodes
, gspell
, libxslt
, gobject-introspection
, flatpak
, fwupd
, gtk4
, gsettings-desktop-schemas
, gnome-desktop
, libgudev
, libxmlb
, malcontent
, json-glib
, glib-networking
, libsecret
, valgrind-light
, docbook-xsl-nons
, docbook_xml_dtd_42
, docbook_xml_dtd_43
, gtk-doc
, desktop-file-utils
, libsysprof-capture
, gst_all_1
{
lib,
stdenv,
fetchurl,
substituteAll,
pkg-config,
meson,
ninja,
gettext,
gnome,
wrapGAppsHook4,
packagekit,
ostree,
glib,
appstream,
libsoup_3,
libadwaita,
polkit,
isocodes,
gspell,
libxslt,
gobject-introspection,
flatpak,
fwupd,
gtk4,
gsettings-desktop-schemas,
gnome-desktop,
libgudev,
libxmlb,
malcontent,
json-glib,
glib-networking,
libsecret,
valgrind-light,
docbook-xsl-nons,
docbook_xml_dtd_42,
docbook_xml_dtd_43,
gtk-doc,
desktop-file-utils,
libsysprof-capture,
gst_all_1,
}:
let
@@ -99,22 +100,15 @@ stdenv.mkDerivation (finalAttrs: {
# For video screenshots
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
] ++ lib.optionals withFwupd [
fwupd
];
] ++ lib.optionals withFwupd [ fwupd ];
mesonFlags = [
# Requires /etc/machine-id, D-Bus system bus, etc.
"-Dtests=false"
] ++ lib.optionals (!withFwupd) [
"-Dfwupd=false"
];
] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-software";
attrPath = "gnome.gnome-software";
};
updateScript = gnome.updateScript { packageName = "gnome-software"; };
};
meta = with lib; {
@@ -1,21 +1,22 @@
{ stdenv
, lib
, fetchurl
, pkg-config
, gettext
, gobject-introspection
, wrapGAppsHook4
, gjs
, glib
, gtk4
, gdk-pixbuf
, gst_all_1
, gnome
, meson
, ninja
, python3
, desktop-file-utils
, libadwaita
{
stdenv,
lib,
fetchurl,
pkg-config,
gettext,
gobject-introspection,
wrapGAppsHook4,
gjs,
glib,
gtk4,
gdk-pixbuf,
gst_all_1,
gnome,
meson,
ninja,
python3,
desktop-file-utils,
libadwaita,
}:
stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
version = "43.beta";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-sound-recorder/${lib.versions.major version}/gnome-sound-recorder-${version}.tar.xz";
sha256 = "bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY=";
};
@@ -38,18 +39,20 @@ stdenv.mkDerivation rec {
desktop-file-utils
];
buildInputs = [
gjs
glib
gtk4
gdk-pixbuf
libadwaita
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad # for gstreamer-player-1.0
]);
buildInputs =
[
gjs
glib
gtk4
gdk-pixbuf
libadwaita
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad # for gstreamer-player-1.0
]);
postPatch = ''
chmod +x build-aux/meson_post_install.py
@@ -59,10 +62,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "gnome-sound-recorder"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, vala
, pkg-config
, gobject-introspection
, gettext
, gtk4
, gnome
, wrapGAppsHook4
, libadwaita
, libgee
, json-glib
, qqwing
, itstool
, libxml2
, desktop-file-utils
{
stdenv,
lib,
fetchurl,
meson,
ninja,
vala,
pkg-config,
gobject-introspection,
gettext,
gtk4,
gnome,
wrapGAppsHook4,
libadwaita,
libgee,
json-glib,
qqwing,
itstool,
libxml2,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
hash = "sha256-SmsMRQbolRIlOxyZO3P2QOjv2awfHrUqAkgZCHYjpKI=";
};
@@ -50,10 +51,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-sudoku";
attrPath = "gnome.gnome-sudoku";
};
updateScript = gnome.updateScript { packageName = "gnome-sudoku"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gnome
, adwaita-icon-theme
, gtk3
, wrapGAppsHook3
, librsvg
, gsound
, gettext
, itstool
, libxml2
, meson
, ninja
, vala
, python3
, desktop-file-utils
{
lib,
stdenv,
fetchurl,
fetchpatch,
pkg-config,
gnome,
adwaita-icon-theme,
gtk3,
wrapGAppsHook3,
librsvg,
gsound,
gettext,
itstool,
libxml2,
meson,
ninja,
vala,
python3,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/gnome-taquin-${version}.tar.xz";
sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn";
};
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
vala
desktop-file-utils
];
buildInputs = [
gtk3
librsvg
@@ -60,10 +62,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-taquin";
attrPath = "gnome.gnome-taquin";
};
updateScript = gnome.updateScript { packageName = "gnome-taquin"; };
};
meta = with lib; {
@@ -1,20 +1,21 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, gnome
, adwaita-icon-theme
, gtk3
, wrapGAppsHook3
, libxml2
, gettext
, itstool
, meson
, ninja
, python3
, vala
, desktop-file-utils
{
stdenv,
lib,
fetchurl,
fetchpatch,
pkg-config,
gnome,
adwaita-icon-theme,
gtk3,
wrapGAppsHook3,
libxml2,
gettext,
itstool,
meson,
ninja,
python3,
vala,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz";
sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
};
@@ -51,9 +52,7 @@ stdenv.mkDerivation rec {
desktop-file-utils
];
buildInputs = [
gtk3
];
buildInputs = [ gtk3 ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
@@ -61,10 +60,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-tetravex";
attrPath = "gnome.gnome-tetravex";
};
updateScript = gnome.updateScript { packageName = "gnome-tetravex"; };
};
meta = with lib; {
+2 -1
View File
@@ -8,6 +8,7 @@
, glib
, gnome
, gnome-desktop
, gnome-shell-extensions
, gobject-introspection
, gsettings-desktop-schemas
, gtk4
@@ -50,7 +51,7 @@ python3Packages.buildPythonApplication rec {
gnome.gnome-settings-daemon
gnome.gnome-shell
# Makes it possible to select user themes through the `user-theme` extension
gnome.gnome-shell-extensions
gnome-shell-extensions
gnome.mutter
gsettings-desktop-schemas
gtk4
@@ -1,21 +1,22 @@
{ lib
, stdenv
, fetchurl
, desktop-file-utils
, pkg-config
, gnome
, adwaita-icon-theme
, gtk4
, libadwaita
, wrapGAppsHook4
, gjs
, gobject-introspection
, libgweather
, meson
, ninja
, geoclue2
, python3
, gsettings-desktop-schemas
{
lib,
stdenv,
fetchurl,
desktop-file-utils,
pkg-config,
gnome,
adwaita-icon-theme,
gtk4,
libadwaita,
wrapGAppsHook4,
gjs,
gobject-introspection,
libgweather,
meson,
ninja,
geoclue2,
python3,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz";
hash = "sha256-FTgmcFzPZy4U8v5N/Hgvjom3xMvkqv6VpVMvveej1J0=";
};
@@ -62,10 +63,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-weather";
attrPath = "gnome.gnome-weather";
};
updateScript = gnome.updateScript { packageName = "gnome-weather"; };
};
meta = with lib; {
@@ -1,12 +1,25 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool
, gnome, adwaita-icon-theme, enchant, isocodes, gsettings-desktop-schemas }:
{
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
pkg-config,
gtk3,
intltool,
gnome,
adwaita-icon-theme,
enchant,
isocodes,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
pname = "gtkhtml";
version = "4.10.0";
src = fetchurl {
url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.xz";
sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
};
@@ -14,7 +27,7 @@ stdenv.mkDerivation rec {
# Enables enchant2 support.
# Upstream is dead, no further releases are coming.
(fetchpatch {
name ="enchant-2.patch";
name = "enchant-2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
extraPrefix = "";
@@ -22,17 +35,28 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; };
updateScript = gnome.updateScript { packageName = "gtkhtml"; };
};
nativeBuildInputs = [ autoreconfHook pkg-config intltool ];
buildInputs = [ gtk3 adwaita-icon-theme
gsettings-desktop-schemas ];
nativeBuildInputs = [
autoreconfHook
pkg-config
intltool
];
propagatedBuildInputs = [ enchant isocodes ];
buildInputs = [
gtk3
adwaita-icon-theme
gsettings-desktop-schemas
];
propagatedBuildInputs = [
enchant
isocodes
];
meta = with lib; {
platforms = platforms.linux;
maintainers = teams.gnome.members;
maintainers = [ ];
};
}
@@ -1,19 +1,20 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, gnome
, glib
, gtk3
, cairo
, wrapGAppsHook3
, libxml2
, python3
, gettext
, itstool
, desktop-file-utils
{
stdenv,
lib,
fetchurl,
meson,
ninja,
pkg-config,
gnome,
glib,
gtk3,
cairo,
wrapGAppsHook3,
libxml2,
python3,
gettext,
itstool,
desktop-file-utils,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,10 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "hitori";
attrPath = "gnome.hitori";
};
updateScript = gnome.updateScript { packageName = "hitori"; };
};
meta = with lib; {
@@ -1,21 +1,23 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gtk3
, gnome
, adwaita-icon-theme
, gdk-pixbuf
, librsvg
, wrapGAppsHook3
, itstool
, gsound
, libxml2
, meson
, ninja
, python3
, vala
, desktop-file-utils
{
lib,
stdenv,
fetchurl,
fetchpatch,
pkg-config,
gtk3,
gnome,
adwaita-icon-theme,
gdk-pixbuf,
librsvg,
wrapGAppsHook3,
itstool,
gsound,
libxml2,
meson,
ninja,
python3,
vala,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/iagno-${version}.tar.xz";
sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
};
@@ -62,10 +64,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = "iagno";
attrPath = "gnome.iagno";
};
updateScript = gnome.updateScript { packageName = "iagno"; };
};
meta = with lib; {
@@ -1,21 +1,56 @@
{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3
, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib
, meson, ninja, python3 }:
{
lib,
stdenv,
fetchurl,
vala,
pkg-config,
gtk3,
gnome,
adwaita-icon-theme,
gdk-pixbuf,
librsvg,
wrapGAppsHook3,
gettext,
itstool,
clutter,
clutter-gtk,
libxml2,
appstream-glib,
meson,
ninja,
python3,
}:
stdenv.mkDerivation rec {
pname = "lightsoff";
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/lightsoff-${version}.tar.xz";
hash = "sha256-ZysVMuBkX64C8oN6ltU57c/Uw7pPcuWR3HP+R567i5I=";
};
nativeBuildInputs = [
vala pkg-config wrapGAppsHook3 itstool gettext appstream-glib libxml2
meson ninja python3
vala
pkg-config
wrapGAppsHook3
itstool
gettext
appstream-glib
libxml2
meson
ninja
python3
];
buildInputs = [
gtk3
adwaita-icon-theme
gdk-pixbuf
librsvg
clutter
clutter-gtk
];
buildInputs = [ gtk3 adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
@@ -23,10 +58,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "lightsoff";
attrPath = "gnome.lightsoff";
};
updateScript = gnome.updateScript { packageName = "lightsoff"; };
};
meta = with lib; {
@@ -1,19 +1,21 @@
{ lib, stdenv
, fetchurl
, gettext
, glib
, gnome
, gsettings-desktop-schemas
, gtk3
, xorg
, libcanberra-gtk3
, libgtop
, libstartup_notification
, libxml2
, pkg-config
, substituteAll
, wrapGAppsHook3
, zenity
{
lib,
stdenv,
fetchurl,
gettext,
glib,
gnome,
gsettings-desktop-schemas,
gtk3,
xorg,
libcanberra-gtk3,
libgtop,
libstartup_notification,
libxml2,
pkg-config,
substituteAll,
wrapGAppsHook3,
zenity,
}:
stdenv.mkDerivation rec {
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.52.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz";
hash = "sha256-pyQ4rObVkDrnkzjGCYsbNauRyKl8QyNwHTvvHz7rGRw=";
};
@@ -56,8 +58,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "metacity";
versionPolicy = "odd-unstable";
};
};
@@ -1,30 +1,31 @@
{ stdenv
, lib
, itstool
, fetchurl
, gdk-pixbuf
, telepathy-glib
, gjs
, meson
, ninja
, gettext
, telepathy-idle
, libxml2
, desktop-file-utils
, pkg-config
, gtk4
, tracker
, libadwaita
, gtk3
, glib
, libsecret
, libsoup_3
, webkitgtk_4_1
, gobject-introspection
, gnome
, wrapGAppsHook4
, gspell
, gsettings-desktop-schemas
{
stdenv,
lib,
itstool,
fetchurl,
gdk-pixbuf,
telepathy-glib,
gjs,
meson,
ninja,
gettext,
telepathy-idle,
libxml2,
desktop-file-utils,
pkg-config,
gtk4,
tracker,
libadwaita,
gtk3,
glib,
libsecret,
libsoup_3,
webkitgtk_4_1,
gobject-introspection,
gnome,
wrapGAppsHook4,
gspell,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/polari/${lib.versions.major version}/polari-${version}.tar.xz";
hash = "sha256-0rFwnjeRiSlPU9TvFfA/i8u76MUvD0FeYvfV8Aw2CjE=";
};
@@ -43,9 +44,7 @@ stdenv.mkDerivation rec {
./make-thumbnailer-wrappable.patch
];
propagatedUserEnvPkgs = [
telepathy-idle
];
propagatedUserEnvPkgs = [ telepathy-idle ];
nativeBuildInputs = [
meson
@@ -80,10 +79,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "polari"; };
};
meta = with lib; {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz";
sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo=";
};
@@ -58,10 +58,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "quadrapassel"; };
};
meta = with lib; {
@@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, vala
, glib
, gtk4
, libgee
, libgnome-games-support_2_0
, pango
, gnome
, desktop-file-utils
, gettext
, itstool
, libxml2
, wrapGAppsHook4
, python3
{
lib,
stdenv,
fetchurl,
meson,
ninja,
pkg-config,
vala,
glib,
gtk4,
libgee,
libgnome-games-support_2_0,
pango,
gnome,
desktop-file-utils,
gettext,
itstool,
libxml2,
wrapGAppsHook4,
python3,
}:
stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/swell-foop/${lib.versions.major version}/swell-foop-${version}.tar.xz";
hash = "sha256-BvireAfXHOyUi4aDcfR/ut7vzLXDV+E9HvPISBiR/KM=";
};
@@ -50,10 +51,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "swell-foop"; };
};
meta = with lib; {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
version = "40.9";
src = fetchurl {
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/tali/${lib.versions.major version}/tali-${version}.tar.xz";
sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M=";
};
@@ -54,10 +54,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
updateScript = gnome.updateScript { packageName = "tali"; };
};
meta = with lib; {
@@ -1,12 +1,28 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, adwaita-icon-theme, vte, libxml2, gtk-vnc, intltool
, libsecret, itstool, wrapGAppsHook3, librsvg }:
{
lib,
stdenv,
fetchurl,
fetchpatch,
pkg-config,
gtk3,
gnome,
adwaita-icon-theme,
vte,
libxml2,
gtk-vnc,
intltool,
libsecret,
itstool,
wrapGAppsHook3,
librsvg,
}:
stdenv.mkDerivation rec {
pname = "vinagre";
version = "3.22.0";
src = fetchurl {
url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/vinagre-${version}.tar.xz";
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
@@ -20,18 +36,27 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook3 ];
nativeBuildInputs = [
pkg-config
intltool
itstool
wrapGAppsHook3
];
buildInputs = [
gtk3 vte libxml2 gtk-vnc libsecret adwaita-icon-theme librsvg
gtk3
vte
libxml2
gtk-vnc
libsecret
adwaita-icon-theme
librsvg
];
env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
passthru = {
updateScript = gnome.updateScript {
packageName = "vinagre";
attrPath = "gnome.vinagre";
};
updateScript = gnome.updateScript { packageName = "vinagre"; };
};
meta = with lib; {
@@ -1,28 +1,29 @@
{ lib
, stdenv
, fetchurl
, gnome
, meson
, mesonEmulatorHook
, ninja
, pkg-config
, gtk4
, libadwaita
, gettext
, glib
, udev
, upower
, itstool
, libxml2
, wrapGAppsHook4
, libnotify
, gsound
, gobject-introspection
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, python3
, gsettings-desktop-schemas
{
lib,
stdenv,
fetchurl,
gnome,
meson,
mesonEmulatorHook,
ninja,
pkg-config,
gtk4,
libadwaita,
gettext,
glib,
udev,
upower,
itstool,
libxml2,
wrapGAppsHook4,
libnotify,
gsound,
gobject-introspection,
gtk-doc,
docbook-xsl-nons,
docbook_xml_dtd_43,
python3,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation rec {
@@ -30,10 +31,15 @@ stdenv.mkDerivation rec {
version = "46.1";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
outputs = [
"out"
"dev"
"devdoc"
"man"
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz";
hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw=";
};
@@ -50,9 +56,7 @@ stdenv.mkDerivation rec {
docbook-xsl-nons
docbook_xml_dtd_43
python3
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
mesonEmulatorHook
];
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
buildInputs = [
glib
@@ -65,14 +69,12 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
];
mesonFlags = [
"-Dgtk_doc=true"
];
mesonFlags = [ "-Dgtk_doc=true" ];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "gnome-bluetooth";
attrPath = "gnome.gnome-bluetooth";
};
};
@@ -1,116 +0,0 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, autoconf-archive
, autoreconfHook
, pkg-config
, glib
, gnome
, libxml2
, libgdata
, grilo
, libzapojit
, grilo-plugins
, gnome-online-accounts
, libmediaart
, tracker
, gfbgraph
, librest
, libsoup
, json-glib
, gmp
, openssl
, dleyna-server
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
pname = "gnome-online-miners";
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
};
patches = [
# Fix use after free
# https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch";
sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA=";
})
# Port to Tracker 3
# https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch";
sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch";
sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch";
sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch";
sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch";
sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0=";
})
];
nativeBuildInputs = [
# patch changes configure.ac
autoconf-archive
autoreconfHook
pkg-config
wrapGAppsHook3
];
buildInputs = [
glib
libgdata
libxml2
libsoup
gmp
openssl
grilo
libzapojit
grilo-plugins
gnome-online-accounts
libmediaart
tracker
gfbgraph
json-glib
librest
dleyna-server
];
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-online-miners";
attrPath = "gnome.gnome-online-miners";
};
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/Archive/gnome-online-miners";
description = "Set of crawlers that go through your online content and index them locally in Tracker";
maintainers = teams.gnome.members;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
+46 -94
View File
@@ -12,51 +12,28 @@ in
# This will go away, do not use outside Nixpkgs.
_gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { };
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { inherit (self) libsoup; };
# ISO installer
# installerIso = callPackage ./installer.nix {};
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
caribou = callPackage ./core/caribou { };
gdm = callPackage ./core/gdm { };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
gnome-color-manager = callPackage ./core/gnome-color-manager { };
gnome-contacts = callPackage ./core/gnome-contacts { };
gnome-control-center = callPackage ./core/gnome-control-center { };
gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
gnome-online-miners = callPackage ./core/gnome-online-miners { };
gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
gnome-session = callPackage ./core/gnome-session { };
gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
gnome-shell = callPackage ./core/gnome-shell { };
gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
# Using 43 to match Mutter used in Pantheon
gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { };
gnome-software = callPackage ./core/gnome-software { };
gvfs = pkgs.gvfs.override { gnomeSupport = true; };
mutter = callPackage ./core/mutter { };
@@ -90,74 +67,6 @@ in
nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
gnome-boxes = callPackage ./apps/gnome-boxes { };
gnome-characters = callPackage ./apps/gnome-characters { };
gnome-clocks = callPackage ./apps/gnome-clocks { };
gnome-logs = callPackage ./apps/gnome-logs { };
gnome-maps = callPackage ./apps/gnome-maps { };
gnome-music = callPackage ./apps/gnome-music { };
gnome-nettool = callPackage ./apps/gnome-nettool { };
gnome-notes = callPackage ./apps/gnome-notes { };
gnome-power-manager = callPackage ./apps/gnome-power-manager { };
gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { };
gnome-weather = callPackage ./apps/gnome-weather { };
polari = callPackage ./apps/polari { };
vinagre = callPackage ./apps/vinagre { };
#### Games
aisleriot = callPackage ./games/aisleriot { };
atomix = callPackage ./games/atomix { };
five-or-more = callPackage ./games/five-or-more { };
four-in-a-row = callPackage ./games/four-in-a-row { };
gnome-chess = callPackage ./games/gnome-chess { };
gnome-klotski = callPackage ./games/gnome-klotski { };
gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
gnome-mines = callPackage ./games/gnome-mines { };
gnome-nibbles = callPackage ./games/gnome-nibbles { };
gnome-robots = callPackage ./games/gnome-robots { };
gnome-sudoku = callPackage ./games/gnome-sudoku { };
gnome-taquin = callPackage ./games/gnome-taquin { };
gnome-tetravex = callPackage ./games/gnome-tetravex { };
hitori = callPackage ./games/hitori { };
iagno = callPackage ./games/iagno { };
lightsoff = callPackage ./games/lightsoff { };
swell-foop = callPackage ./games/swell-foop { };
tali = callPackage ./games/tali { };
quadrapassel = callPackage ./games/quadrapassel { };
#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
gnome-applets = callPackage ./misc/gnome-applets { };
@@ -168,19 +77,22 @@ in
gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };
metacity = callPackage ./misc/metacity { };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; };
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
libgnome-keyring = lib.warn "The gnome.libgnome-keyring was moved to top-level. Please use pkgs.libgnome-keyring directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
libchamplain = lib.warn "The gnome.libchamplain was removed as unused. Please use pkgs.libchamplain directly." pkgs.libchamplain; # Added on 2024-08-11.
libsoup = lib.warn "The gnome.libsoup was removed as unused. Please use pkgs.libsoup." pkgs.libsoup; # Added on 2024-08-11.
gedit = throw "The gnome.gedit alias was removed. Please use pkgs.gedit directly."; # converted to throw on 2023-12-27
gnome-todo = throw "The gnome.gnome-todo alias was removed. Please use pkgs.endeavour directly."; # converted to throw on 2023-12-27
gnome-online-miners = throw "The gnome.gnome-online-miners was removed, it was broken and abandoned."; # added on 2024-08-11.
accerciser = lib.warn "The gnome.accerciser was moved to top-level. Please use pkgs.accerciser directly." pkgs.accerciser; # Added on 2024-06-22.
adwaita-icon-theme = lib.warn "The gnome.adwaita-icon-theme was moved to top-level. Please use pkgs.adwaita-icon-theme directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22.
aisleriot = lib.warn "The gnome.aisleriot was moved to top-level. Please use pkgs.aisleriot directly." pkgs.aisleriot; # Added on 2024-08-11.
atomix = lib.warn "The gnome.atomix was moved to top-level. Please use pkgs.atomix directly." pkgs.atomix; # Added on 2024-08-11.
baobab = lib.warn "The gnome.baobab was moved to top-level. Please use pkgs.baobab directly." pkgs.baobab; # Added on 2024-06-22.
caribou = lib.warn "The gnome.caribou was moved to top-level. Please use pkgs.caribou directly." pkgs.caribou; # Added on 2024-08-11.
cheese = lib.warn "The gnome.cheese was moved to top-level. Please use pkgs.cheese directly." pkgs.cheese; # Added on 2024-06-22.
dconf-editor = lib.warn "The gnome.dconf-editor was moved to top-level. Please use pkgs.dconf-editor directly." pkgs.dconf-editor; # Added on 2024-06-22.
devhelp = lib.warn "The gnome.devhelp was moved to top-level. Please use pkgs.devhelp directly." pkgs.devhelp; # Added on 2024-06-22.
@@ -189,34 +101,74 @@ in
evince = lib.warn "The gnome.evince was moved to top-level. Please use pkgs.evince directly." pkgs.evince; # Added on 2024-06-13.
evolution-data-server = lib.warn "The gnome.evolution-data-server was moved to top-level. Please use pkgs.evolution-data-server directly." pkgs.evolution-data-server; # Added on 2024-06-13.
file-roller = lib.warn "The gnome.file-roller was moved to top-level. Please use pkgs.file-roller directly." pkgs.file-roller; # Added on 2024-06-13.
five-or-more = lib.warn "The gnome.five-or-more was moved to top-level. Please use pkgs.five-or-more directly." pkgs.five-or-more; # Added on 2024-08-11.
four-in-a-row = lib.warn "The gnome.four-in-a-row was moved to top-level. Please use pkgs.four-in-a-row directly." pkgs.four-in-a-row; # Added on 2024-08-11.
gdm = lib.warn "The gnome.gdm was moved to top-level. Please use pkgs.gdm directly." pkgs.gdm; # Added on 2024-08-11.
geary = lib.warn "The gnome.geary was moved to top-level. Please use pkgs.geary directly." pkgs.geary; # Added on 2024-06-22.
ghex = lib.warn "The gnome.ghex was moved to top-level. Please use pkgs.ghex directly." pkgs.ghex; # Added on 2024-06-22.
gitg = lib.warn "The gnome.gitg was moved to top-level. Please use pkgs.gitg directly." pkgs.gitg; # Added on 2024-06-22.
gnome-autoar = lib.warn "The gnome.gnome-autoar was moved to top-level. Please use pkgs.gnome-autoar directly." pkgs.gnome-autoar; # Added on 2024-06-13.
gnome-backgrounds = lib.warn "The gnome.gnome-backgrounds was moved to top-level. Please use pkgs.gnome-backgrounds directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
gnome-boxes = lib.warn "The gnome.gnome-boxes was moved to top-level. Please use pkgs.gnome-boxes directly." pkgs.gnome-boxes; # Added on 2024-08-11.
gnome-characters = lib.warn "The gnome.gnome-characters was moved to top-level. Please use pkgs.gnome-characters directly." pkgs.gnome-characters; # Added on 2024-08-11.
gnome-chess = lib.warn "The gnome.gnome-chess was moved to top-level. Please use pkgs.gnome-chess directly." pkgs.gnome-chess; # Added on 2024-08-11.
gnome-clocks = lib.warn "The gnome.gnome-clocks was moved to top-level. Please use pkgs.gnome-clocks directly." pkgs.gnome-clocks; # Added on 2024-08-11.
gnome-color-manager = lib.warn "The gnome.gnome-color-manager was moved to top-level. Please use pkgs.gnome-color-manager directly." pkgs.gnome-color-manager; # Added on 2024-08-11.
gnome-common = lib.warn "The gnome.gnome-common was moved to top-level. Please use pkgs.gnome-common directly." pkgs.gnome-common; # Added on 2024-06-22.
gnome-calculator = lib.warn "The gnome.gnome-calculator was moved to top-level. Please use pkgs.gnome-calculator directly." pkgs.gnome-calculator; # Added on 2024-06-22.
gnome-calendar = lib.warn "The gnome.gnome-calendar was moved to top-level. Please use pkgs.gnome-calendar directly." pkgs.gnome-calendar; # Added on 2024-06-22.
gnome-contacts = lib.warn "The gnome.gnome-contacts was moved to top-level. Please use pkgs.gnome-contacts directly." pkgs.gnome-contacts; # Added on 2024-08-11.
gnome-dictionary = lib.warn "The gnome.gnome-dictionary was moved to top-level. Please use pkgs.gnome-dictionary directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
gnome-disk-utility = lib.warn "The gnome.gnome-disk-utility was moved to top-level. Please use pkgs.gnome-disk-utility directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
gnome-font-viewer = lib.warn "The gnome.gnome-font-viewer was moved to top-level. Please use pkgs.gnome-font-viewer directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.
gnome-initial-setup = lib.warn "The gnome.gnome-initial-setup was moved to top-level. Please use pkgs.gnome-initial-setup directly." pkgs.gnome-initial-setup; # Added on 2024-08-11.
gnome-keyring = lib.warn "The gnome.gnome-keyring was moved to top-level. Please use pkgs.gnome-keyring directly." pkgs.gnome-keyring; # Added on 2024-06-22.
gnome-klotski = lib.warn "The gnome.gnome-klotski was moved to top-level. Please use pkgs.gnome-klotski directly." pkgs.gnome-klotski; # Added on 2024-08-11.
gnome-logs = lib.warn "The gnome.gnome-logs was moved to top-level. Please use pkgs.gnome-logs directly." pkgs.gnome-logs; # Added on 2024-08-11.
gnome-mahjongg = lib.warn "The gnome.gnome-mahjongg was moved to top-level. Please use pkgs.gnome-mahjongg directly." pkgs.gnome-mahjongg; # Added on 2024-08-11.
gnome-maps = lib.warn "The gnome.gnome-maps was moved to top-level. Please use pkgs.gnome-maps directly." pkgs.gnome-maps; # Added on 2024-08-11.
gnome-mines = lib.warn "The gnome.gnome-mines was moved to top-level. Please use pkgs.gnome-mines directly." pkgs.gnome-mines; # Added on 2024-08-11.
gnome-music = lib.warn "The gnome.gnome-music was moved to top-level. Please use pkgs.gnome-music directly." pkgs.gnome-music; # Added on 2024-08-11.
gnome-nettool = lib.warn "The gnome.gnome-nettool was moved to top-level. Please use pkgs.gnome-nettool directly." pkgs.gnome-nettool; # Added on 2024-08-11.
gnome-nibbles = lib.warn "The gnome.gnome-nibbles was moved to top-level. Please use pkgs.gnome-nibbles directly." pkgs.gnome-nibbles; # Added on 2024-08-11.
gnome-notes = lib.warn "The gnome.gnome-notes was moved to top-level. Please use pkgs.gnome-notes directly." pkgs.gnome-notes; # Added on 2024-08-11.
gnome-packagekit = lib.warn "The gnome.gnome-packagekit was moved to top-level. Please use pkgs.gnome-packagekit directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
gnome-power-manager = lib.warn "The gnome.gnome-power-manager was moved to top-level. Please use pkgs.gnome-power-manager directly." pkgs.gnome-power-manager; # Added on 2024-08-11.
gnome-remote-desktop = lib.warn "The gnome.gnome-remote-desktop was moved to top-level. Please use pkgs.gnome-remote-desktop directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
gnome-robots = lib.warn "The gnome.gnome-robots was moved to top-level. Please use pkgs.gnome-robots directly." pkgs.gnome-robots; # Added on 2024-08-11.
gnome-screenshot = lib.warn "The gnome.gnome-screenshot was moved to top-level. Please use pkgs.gnome-screenshot directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
gnome-shell-extensions = lib.warn "The gnome.gnome-shell-extensions was moved to top-level. Please use pkgs.gnome-shell-extensions directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
gnome-software = lib.warn "The gnome.gnome-software was moved to top-level. Please use pkgs.gnome-software directly." pkgs.gnome-software; # Added on 2024-08-11.
gnome-sound-recorder = lib.warn "The gnome.gnome-sound-recorder was moved to top-level. Please use pkgs.gnome-sound-recorder directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
gnome-sudoku = lib.warn "The gnome.gnome-sudoku was moved to top-level. Please use pkgs.gnome-sudoku directly." pkgs.gnome-sudoku; # Added on 2024-08-11.
gnome-system-monitor = lib.warn "The gnome.gnome-system-monitor was moved to top-level. Please use pkgs.gnome-system-monitor directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.
gnome-taquin = lib.warn "The gnome.gnome-taquin was moved to top-level. Please use pkgs.gnome-taquin directly." pkgs.gnome-taquin; # Added on 2024-08-11.
gnome-terminal = lib.warn "The gnome.gnome-terminal was moved to top-level. Please use pkgs.gnome-terminal directly." pkgs.gnome-terminal; # Added on 2024-06-13.
gnome-tetravex = lib.warn "The gnome.gnome-tetravex was moved to top-level. Please use pkgs.gnome-tetravex directly." pkgs.gnome-tetravex; # Added on 2024-08-11.
gnome-themes-extra = lib.warn "The gnome.gnome-themes-extra was moved to top-level. Please use pkgs.gnome-themes-extra directly." pkgs.gnome-themes-extra; # Added on 2024-06-22.
gnome-tweaks = lib.warn "The gnome.gnome-tweaks was moved to top-level. Please use pkgs.gnome-tweaks directly." pkgs.gnome-tweaks; # Added on 2024-06-22.
gnome-user-share = lib.warn "The gnome.gnome-user-share was moved to top-level. Please use pkgs.gnome-user-share directly." pkgs.gnome-user-share; # Added on 2024-06-13.
gnome-weather = lib.warn "The gnome.gnome-weather was moved to top-level. Please use pkgs.gnome-weather directly." pkgs.gnome-weather; # Added on 2024-08-11.
gpaste = lib.warn "The gnome.gpaste was moved to top-level. Please use pkgs.gpaste directly." pkgs.gpaste; # Added on 2024-06-22.
gtkhtml = lib.warn "The gnome.gtkhtml was moved to top-level. Please use pkgs.gtkhtml directly." pkgs.gtkhtml; # Added on 2024-08-11.
gucharmap = lib.warn "The gnome.gucharmap was moved to top-level. Please use pkgs.gucharmap directly." pkgs.gucharmap; # Added on 2024-06-22.
hitori = lib.warn "The gnome.hitori was moved to top-level. Please use pkgs.hitori directly." pkgs.hitori; # Added on 2024-08-11.
iagno = lib.warn "The gnome.iagno was moved to top-level. Please use pkgs.iagno directly." pkgs.iagno; # Added on 2024-08-11.
lightsoff = lib.warn "The gnome.lightsoff was moved to top-level. Please use pkgs.lightsoff directly." pkgs.lightsoff; # Added on 2024-08-11.
metacity = lib.warn "The gnome.metacity was moved to top-level. Please use pkgs.metacity directly." pkgs.metacity; # Added on 2024-08-11.
nautilus = lib.warn "The gnome.nautilus was moved to top-level. Please use pkgs.nautilus directly." pkgs.nautilus; # Added on 2024-06-13.
nautilus-python = lib.warn "The gnome.nautilus-python was moved to top-level. Please use pkgs.nautilus-python directly." pkgs.nautilus-python; # Added on 2024-06-13.
polari = lib.warn "The gnome.polari was moved to top-level. Please use pkgs.polari directly." pkgs.polari; # Added on 2024-08-11.
pomodoro = lib.warn "The gnome.pomodoro was moved to top-level. Please use pkgs.gnome-pomodoro directly." pkgs.gnome-pomodoro; # Added on 2024-06-22.
quadrapassel = lib.warn "The gnome.quadrapassel was moved to top-level. Please use pkgs.quadrapassel directly." pkgs.quadrapassel; # Added on 2024-08-11.
rygel = lib.warn "The gnome.rygel was moved to top-level. Please use pkgs.rygel directly." pkgs.rygel; # Added on 2024-06-22.
seahorse = lib.warn "The gnome.seahorse was moved to top-level. Please use pkgs.seahorse directly." pkgs.seahorse; # Added on 2024-06-22.
simple-scan = lib.warn "The gnome.simple-scan was moved to top-level. Please use pkgs.simple-scan directly." pkgs.simple-scan; # Added on 2024-06-22.
sushi = lib.warn "The gnome.sushi was moved to top-level. Please use pkgs.sushi directly." pkgs.sushi; # Added on 2024-06-22.
swell-foop = lib.warn "The gnome.swell-foop was moved to top-level. Please use pkgs.swell-foop directly." pkgs.swell-foop; # Added on 2024-08-11.
tali = lib.warn "The gnome.tali was moved to top-level. Please use pkgs.tali directly." pkgs.tali; # Added on 2024-08-11.
totem = lib.warn "The gnome.totem was moved to top-level. Please use pkgs.totem directly." pkgs.totem; # Added on 2024-06-22.
vinagre = lib.warn "The gnome.vinagre was moved to top-level. Please use pkgs.vinagre directly." pkgs.vinagre; # Added on 2024-08-11.
yelp = lib.warn "The gnome.yelp was moved to top-level. Please use pkgs.yelp directly." pkgs.yelp; # Added on 2024-06-22.
yelp-xsl = lib.warn "The gnome.yelp-xsl was moved to top-level. Please use pkgs.yelp-xsl directly." pkgs.yelp-xsl; # Added on 2024-06-22.
zenity = lib.warn "The gnome.zenity was moved to top-level. Please use pkgs.zenity directly." pkgs.zenity; # Added on 2024-06-22.
@@ -1,39 +0,0 @@
{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3
, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
stdenv.mkDerivation rec {
pname = "gnome-mines";
version = "40.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI=";
};
nativeBuildInputs = [
meson ninja vala pkg-config gettext itstool python3
libxml2 wrapGAppsHook3 desktop-file-utils
];
buildInputs = [ gtk3 librsvg adwaita-icon-theme libgnome-games-support libgee ];
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-mines";
attrPath = "gnome.gnome-mines";
};
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-mines";
description = "Clear hidden mines from a minefield";
mainProgram = "gnome-mines";
maintainers = teams.gnome.members;
license = licenses.gpl3;
platforms = platforms.unix;
};
}
+1 -3
View File
@@ -155,9 +155,7 @@ lib.makeScope pkgs.newScope (self: with self; {
wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { };
wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power {
inherit (gnome) gnome-power-manager;
};
wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { };
wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { };
@@ -1,4 +1,4 @@
{ cairo, fetchzip, glib, gnome, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }:
stdenv.mkDerivation rec {
pname = "osm-gps-map";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo glib
gtk3 gnome.libsoup
gtk3
libsoup
];
meta = with lib; {
+1 -5
View File
@@ -34710,9 +34710,7 @@ with pkgs;
inherit (gnome2) libglade GConf;
};
xiphos = callPackage ../applications/misc/xiphos {
gtkhtml = gnome.gtkhtml;
};
xiphos = callPackage ../applications/misc/xiphos { };
xournal = callPackage ../applications/graphics/xournal {
inherit (gnome2) libgnomecanvas;
@@ -36603,8 +36601,6 @@ with pkgs;
gnome46Extensions
;
gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };
gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { };