movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

treewide: rename cinnamon.xapps to cinnamon.xapp

Browse source 
https://github.com/linuxmint/xapps redirects to https://github.com/linuxmint/xapp, and the meson project name is xapp.
This commit is contained in:
Bobby Rong 2022-07-27 12:05:17 +08:00
parent 4a50454cfe
commit be91726358
No known key found for this signature in database
GPG key ID: ED07364437C91161
21 changed files with 65 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -92,7 +92,7 @@ in
cinnamon-common cinnamon-common
cinnamon-screensaver cinnamon-screensaver
nemo nemo
xapps xapp
]; ];
services.cinnamon.apps.enable = mkDefault true; services.cinnamon.apps.enable = mkDefault true;
services.gnome.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
@ -202,7 +202,7 @@ in
bulky bulky
warpinator warpinator
# cinnamon xapps # cinnamon xapp
xviewer xviewer
xreader xreader
xed-editor xed-editor

4
pkgs/applications/backup/timeshift/unwrapped.nix
View file

@ -10,7 +10,7 @@
, libgee , libgee
, util-linux , util-linux
, vte , vte
, xapps , xapp
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
json-glib json-glib
libgee libgee
vte vte
xapps xapp
]; ];
preBuild = '' preBuild = ''

4
pkgs/applications/editors/xed-editor/default.nix
View file

@ -7,7 +7,7 @@
, gtk3 , gtk3
, gtksourceview4 , gtksourceview4
, gspell , gspell
, xapps , xapp
, pkg-config , pkg-config
, python3 , python3
, meson , meson
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
gtksourceview4 gtksourceview4
libpeas libpeas
gspell gspell
xapps xapp
]; ];
doInstallCheck = true; doInstallCheck = true;

2
pkgs/applications/misc/sticky/default.nix
View file

@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
glib glib
gobject-introspection gobject-introspection
cinnamon.xapps cinnamon.xapp
gspell gspell
]; ];

2
pkgs/applications/video/hypnotix/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; dontWrapGApps = true;
buildInputs = [ buildInputs = [
cinnamon.xapps cinnamon.xapp
]; ];
pythonPath = with python3.pkgs; [ pythonPath = with python3.pkgs; [

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

@ -22,7 +22,7 @@
, pkg-config , pkg-config
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, xapps , xapp
, yelp-tools }: , yelp-tools }:
let let
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
libxplayer-plparser libxplayer-plparser
pythonenv pythonenv
xapps xapp
# to satisfy configure script # to satisfy configure script
pythonenv.pkgs.pygobject3 pythonenv.pkgs.pygobject3
]; ];

23
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -35,7 +35,7 @@
, python3 , python3
, keybinder3 , keybinder3
, cairo , cairo
, xapps , xapp
, upower , upower
, nemo , nemo
, libnotify , libnotify
@ -68,7 +68,20 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
(python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) (python3.withPackages (pp: with pp; [
dbus-python
setproctitle
pygobject3
pycairo
python3.pkgs.xapp # The scope prefix is required
pillow
pytz
tinycss2
python-pam
pexpect
distro
requests
]))
atk atk
cacert cacert
cinnamon-control-center cinnamon-control-center
@ -99,7 +112,7 @@ stdenv.mkDerivation rec {
gnome.caribou gnome.caribou
keybinder3 keybinder3
upower upower
xapps xapp
timezonemap timezonemap
nemo nemo
libnotify libnotify
@ -134,8 +147,8 @@ stdenv.mkDerivation rec {
sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings
# this one really IS optional # this one really IS optional

4
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
View file

@ -10,7 +10,7 @@
, muffin , muffin
, nemo , nemo
, xapps , xapp
, cinnamon-desktop , cinnamon-desktop
, cinnamon-session , cinnamon-session
, cinnamon-settings-daemon , cinnamon-settings-daemon
@ -28,7 +28,7 @@ let
bulky bulky
muffin muffin
nemo nemo
xapps xapp
cinnamon-desktop cinnamon-desktop
cinnamon-session cinnamon-session
cinnamon-settings-daemon cinnamon-settings-daemon

11
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View file

@ -22,7 +22,7 @@
, pam , pam
, accountsservice , accountsservice
, cairo , cairo
, xapps , xapp
, xdotool , xdotool
, xorg , xorg
, iso-flags-png-320x420 , iso-flags-png-320x420
@ -71,8 +71,13 @@ stdenv.mkDerivation rec {
xorg.libX11 xorg.libX11
xorg.libXrandr xorg.libXrandr
(python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) (python3.withPackages (pp: with pp; [
xapps pygobject3
setproctitle
python3.pkgs.xapp # The scope prefix is required
pycairo
]))
xapp
xdotool xdotool
pam pam
accountsservice accountsservice

4
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View file

@ -17,7 +17,7 @@
, stdenv , stdenv
, systemd , systemd
, wrapGAppsHook , wrapGAppsHook
, xapps , xapp
, xorg , xorg
, libexecinfo , libexecinfo
, pango , pango
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
pango pango
xorg.libX11 xorg.libX11
xorg.libXext xorg.libXext
xapps xapp
xorg.libXau xorg.libXau
xorg.libXcomposite xorg.libXcomposite

4
pkgs/desktops/cinnamon/cjs/default.nix
View file

@ -8,7 +8,7 @@
, python3 , python3
, cairo , cairo
, gnome , gnome
, xapps , xapp
, keybinder3 , keybinder3
, upower , upower
, callPackage , callPackage
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
gnome.caribou gnome.caribou
keybinder3 keybinder3
upower upower
xapps xapp
]; ];
mesonFlags = [ mesonFlags = [

9
pkgs/desktops/cinnamon/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib }: { config, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self: with self; {
iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // {
@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; {
mint-y-icons = callPackage ./mint-y-icons { }; mint-y-icons = callPackage ./mint-y-icons { };
muffin = callPackage ./muffin { }; muffin = callPackage ./muffin { };
pix = callPackage ./pix { }; pix = callPackage ./pix { };
xapps = callPackage ./xapps { }; xapp = callPackage ./xapp { };
warpinator = callPackage ./warpinator { }; warpinator = callPackage ./warpinator { };
xreader = callPackage ./xreader { }; xreader = callPackage ./xreader { };
xviewer = callPackage ./xviewer { }; xviewer = callPackage ./xviewer { };
}) }) // lib.optionalAttrs config.allowAliases {
# Aliases need to be outside the scope or they will shadow the attributes from parent scope.
xapps = pkgs.cinnamon.xapp; # added 2022-07-27
}

4
pkgs/desktops/cinnamon/nemo/default.nix
View file

@ -12,7 +12,7 @@
, gtk3 , gtk3
, gvfs , gvfs
, cinnamon-desktop , cinnamon-desktop
, xapps , xapp
, libexif , libexif
, exempi , exempi
, intltool , intltool
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
cinnamon-desktop cinnamon-desktop
libxml2 libxml2
xapps xapp
libexif libexif
exempi exempi
gvfs gvfs

4
pkgs/desktops/cinnamon/pix/default.nix
View file

@ -16,7 +16,7 @@
, pkg-config , pkg-config
, shared-mime-info , shared-mime-info
, wrapGAppsHook , wrapGAppsHook
, xapps , xapp
, yelp-tools , yelp-tools
, libsecret , libsecret
, webkitgtk , webkitgtk
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
xapps xapp
libsecret libsecret
webkitgtk webkitgtk
libwebp libwebp

4
pkgs/desktops/cinnamon/xapps/default.nix → pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -22,7 +22,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xapps"; pname = "xapp";
version = "2.2.14"; version = "2.2.14";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/linuxmint/xapps"; homepage = "https://github.com/linuxmint/xapp";
description = "Cross-desktop libraries and common resources"; description = "Cross-desktop libraries and common resources";
license = licenses.lgpl3; license = licenses.lgpl3;
platforms = platforms.linux; platforms = platforms.linux;

4
pkgs/desktops/cinnamon/xreader/default.nix
View file

@ -8,7 +8,7 @@
, gtk3 , gtk3
, wrapGAppsHook , wrapGAppsHook
, libxml2 , libxml2
, xapps , xapp
, meson , meson
, pkg-config , pkg-config
, cairo , cairo
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
xapps xapp
cairo cairo
libxml2 libxml2
libsecret libsecret

4
pkgs/desktops/cinnamon/xviewer/default.nix
View file

@ -21,7 +21,7 @@
, pkg-config , pkg-config
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, xapps , xapp
, yelp-tools , yelp-tools
}: }:
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
libpeas libpeas
librsvg librsvg
libxml2 libxml2
xapps xapp
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/xapp/default.nix
View file

@ -5,7 +5,7 @@
, pygobject3 , pygobject3
, gtk3 , gtk3
, gobject-introspection , gobject-introspection
, xapps , xapp
, polkit , polkit
}: }:
@ -25,7 +25,7 @@ buildPythonPackage rec {
pygobject3 pygobject3
gtk3 gtk3
gobject-introspection gobject-introspection
xapps xapp
polkit polkit
]; ];

2
pkgs/tools/bluetooth/blueberry/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bluez-tools bluez-tools
cinnamon.xapps cinnamon.xapp
gnome.gnome-bluetooth_1_0 gnome.gnome-bluetooth_1_0
python3Packages.python python3Packages.python
util-linux util-linux

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

@ -30637,7 +30637,7 @@ with pkgs;
timelimit = callPackage ../tools/misc/timelimit { }; timelimit = callPackage ../tools/misc/timelimit { };
timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapps; }; timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; };
timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; };
@ -31383,7 +31383,7 @@ with pkgs;
xdotool = callPackage ../tools/X11/xdotool { }; xdotool = callPackage ../tools/X11/xdotool { };
xed-editor = callPackage ../applications/editors/xed-editor { xed-editor = callPackage ../applications/editors/xed-editor {
xapps = cinnamon.xapps; xapp = cinnamon.xapp;
}; };
xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
@ -31493,7 +31493,7 @@ with pkgs;
xplayer = callPackage ../applications/video/xplayer { xplayer = callPackage ../applications/video/xplayer {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
inherit (cinnamon) xapps; inherit (cinnamon) xapp;
}; };
libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { };

2
pkgs/top-level/python-packages.nix
View file

@ -11448,7 +11448,7 @@ in {
xapp = callPackage ../development/python-modules/xapp { xapp = callPackage ../development/python-modules/xapp {
inherit (pkgs) gtk3 gobject-introspection polkit; inherit (pkgs) gtk3 gobject-introspection polkit;
inherit (pkgs.cinnamon) xapps; inherit (pkgs.cinnamon) xapp;
}; };
xarray = callPackage ../development/python-modules/xarray { }; xarray = callPackage ../development/python-modules/xarray { };