jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
Show Stats 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-screensaver
nemo
xapps
xapp
];
services.cinnamon.apps.enable = mkDefault true;
services.gnome.glib-networking.enable = true;
@ -202,7 +202,7 @@ in
bulky
warpinator
# cinnamon xapps
# cinnamon xapp
xviewer
xreader
xed-editor

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

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

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

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

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

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

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

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

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

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

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

@ -35,7 +35,7 @@
, python3
, keybinder3
, cairo
, xapps
, xapp
, upower
, nemo
, libnotify
@ -68,7 +68,20 @@ stdenv.mkDerivation rec {
];
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
cacert
cinnamon-control-center
@ -99,7 +112,7 @@ stdenv.mkDerivation rec {
gnome.caribou
keybinder3
upower
xapps
xapp
timezonemap
nemo
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/bin/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|${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|${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
# this one really IS optional

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

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

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

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

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

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

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

@ -8,7 +8,7 @@
, python3
, cairo
, gnome
, xapps
, xapp
, keybinder3
, upower
, callPackage
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
gnome.caribou
keybinder3
upower
xapps
xapp
];
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; {
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 { };
muffin = callPackage ./muffin { };
pix = callPackage ./pix { };
xapps = callPackage ./xapps { };
xapp = callPackage ./xapp { };
warpinator = callPackage ./warpinator { };
xreader = callPackage ./xreader { };
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
, gvfs
, cinnamon-desktop
, xapps
, xapp
, libexif
, exempi
, intltool
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
gtk3
cinnamon-desktop
libxml2
xapps
xapp
libexif
exempi
gvfs

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -30637,7 +30637,7 @@ with pkgs;
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; };
@ -31383,7 +31383,7 @@ with pkgs;
xdotool = callPackage ../tools/X11/xdotool { };
xed-editor = callPackage ../applications/editors/xed-editor {
xapps = cinnamon.xapps;
xapp = cinnamon.xapp;
};
xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
@ -31493,7 +31493,7 @@ with pkgs;
xplayer = callPackage ../applications/video/xplayer {
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 { };

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

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