Skip to content

Commit

Permalink
tree-wide: autorename gnome packages to use dashes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtojnar
jtojnar committed Feb 25, 2018
1 parent 20c5476 commit a31d98f
Show file tree
Hide file tree
Showing 491 changed files with 1,532 additions and 1,458 deletions.
14 changes: 7 additions & 7 deletions nixos/modules/config/no-x-libs.nix
View file
Expand Up @@ -28,13 +28,13 @@ with lib;

nixpkgs.config.packageOverrides = pkgs: {
dbus = pkgs.dbus.override { x11Support = false; };
networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };
networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };
networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };
networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses;
};
};
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View file
Expand Up @@ -69,7 +69,7 @@ with lib;
in ''
mkdir -p /root/Desktop
ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
chmod a+rx /root/Desktop/gnome-terminal.desktop
cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
chmod a+rx /root/Desktop/gparted.desktop
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/programs/dconf.nix
View file
Expand Up @@ -36,7 +36,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable
# "$(echo ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
# "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
};

}
4 changes: 2 additions & 2 deletions nixos/modules/security/pam.nix
View file
Expand Up @@ -311,7 +311,7 @@ let
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
${optionalString cfg.enableGnomeKeyring
("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")}
("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")}
${optionalString cfg.googleAuthenticator.enable
"auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"}
'') + ''
Expand Down Expand Up @@ -384,7 +384,7 @@ let
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
${optionalString (cfg.enableGnomeKeyring)
"session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"}
"session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
${optionalString (config.virtualisation.lxc.lxcfs.enable)
"session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
'');
Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View file
Expand Up @@ -30,9 +30,9 @@ with lib;

config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable {
environment.systemPackages = [ pkgs.at_spi2_core ];
services.dbus.packages = [ pkgs.at_spi2_core ];
systemd.packages = [ pkgs.at_spi2_core ];
environment.systemPackages = [ pkgs.at-spi2-core ];
services.dbus.packages = [ pkgs.at-spi2-core ];
systemd.packages = [ pkgs.at-spi2-core ];
})

(mkIf (!config.services.gnome3.at-spi2-core.enable) {
Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/desktops/gnome3/evolution-data-server.nix
View file
Expand Up @@ -30,11 +30,11 @@ with lib;

config = mkIf config.services.gnome3.evolution-data-server.enable {

environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
environment.systemPackages = [ pkgs.gnome3.evolution-data-server ];

services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];

systemd.packages = [ pkgs.gnome3.evolution_data_server ];
systemd.packages = [ pkgs.gnome3.evolution-data-server ];

};

Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/desktops/gnome3/gnome-keyring.nix
View file
Expand Up @@ -31,9 +31,9 @@ with lib;

config = mkIf config.services.gnome3.gnome-keyring.enable {

environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];

services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];

};

Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
View file
Expand Up @@ -30,9 +30,9 @@ with lib;

config = mkIf config.services.gnome3.gnome-online-accounts.enable {

environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
environment.systemPackages = [ pkgs.gnome3.gnome-online-accounts ];

services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
services.dbus.packages = [ pkgs.gnome3.gnome-online-accounts ];

};

Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
View file
Expand Up @@ -30,11 +30,11 @@ with lib;

config = mkIf config.services.gnome3.gnome-terminal-server.enable {

environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];

services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];

systemd.packages = [ pkgs.gnome3.gnome_terminal ];
systemd.packages = [ pkgs.gnome3.gnome-terminal ];

};

Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/desktops/telepathy.nix
View file
Expand Up @@ -30,9 +30,9 @@ with lib;

config = mkIf config.services.telepathy.enable {

environment.systemPackages = [ pkgs.telepathy_mission_control ];
environment.systemPackages = [ pkgs.telepathy-mission-control ];

services.dbus.packages = [ pkgs.telepathy_mission_control ];
services.dbus.packages = [ pkgs.telepathy-mission-control ];

};

Expand Down
22 changes: 11 additions & 11 deletions nixos/modules/services/networking/networkmanager.nix
View file
Expand Up @@ -133,10 +133,10 @@ in {
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_l2tp
networkmanager_iodine; };
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-l2tp
networkmanager-iodine; };
internal = true;
};

Expand Down Expand Up @@ -273,28 +273,28 @@ in {
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
{ source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
{ source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
target = "NetworkManager/VPN/nm-openvpn-service.name";
}
{ source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
{ source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
target = "NetworkManager/VPN/nm-vpnc-service.name";
}
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
{ source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
{ source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
{ source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
{ source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
{ source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
{ source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name";
}
{ source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
{ source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
{ source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
target = "NetworkManager/VPN/nm-iodine-service.name";
}
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/enlightenment.nix
View file
Expand Up @@ -33,7 +33,7 @@ in
pkgs.xorg.xauth # used by kdesu
pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme
pkgs.shared_mime_info
pkgs.shared-mime-info
pkgs.gnome2.gnomeicontheme
pkgs.xorg.xcursorthemes
];
Expand Down
18 changes: 9 additions & 9 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Expand Up @@ -27,7 +27,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
Expand Down Expand Up @@ -60,7 +60,7 @@ in {
example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart.";
apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];
};

extraGSettingsOverrides = mkOption {
Expand Down Expand Up @@ -118,7 +118,7 @@ in {
services.packagekit.enable = mkDefault true;
hardware.bluetooth.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
systemd.packages = [ pkgs.gnome3.vino ];

# If gnome3 is installed, build vim for gtk3 too.
Expand Down Expand Up @@ -164,26 +164,26 @@ in {
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};

services.xserver.updateDbusEnvironment = true;

environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
"${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
"${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);

# Use the correct gnome3 packageSet
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_iodine
networkmanager_l2tp; };
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-iodine
networkmanager-l2tp; };

# Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ];
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/mate.nix
View file
Expand Up @@ -102,7 +102,7 @@ in

services.dbus.packages = [
pkgs.gnome3.dconf
pkgs.at_spi2_core
pkgs.at-spi2-core
];

services.gnome3.gnome-keyring.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Expand Up @@ -154,7 +154,7 @@ in
print-manager

breeze-icons
pkgs.hicolor_icon_theme
pkgs.hicolor-icon-theme

kde-gtk-config breeze-gtk

Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/x11/desktop-managers/xfce.nix
View file
Expand Up @@ -61,12 +61,12 @@ in
# utilities-terminal, accessories-text-editor
gnome3.defaultIconTheme

hicolor_icon_theme
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme

desktop_file_utils
shared_mime_info
desktop-file-utils
shared-mime-info

# Needed by Xfce's xinitrc script
# TODO: replace with command -v
Expand Down
10 changes: 5 additions & 5 deletions nixos/modules/services/x11/display-managers/gdm.nix
View file
Expand Up @@ -133,7 +133,7 @@ in
StandardError = "inherit";
};

systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];

services.dbus.packages = [ gdm ];

Expand Down Expand Up @@ -193,7 +193,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
Expand All @@ -213,15 +213,15 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';

gdm-password.text = ''
auth requisite pam_nologin.so
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
Expand All @@ -240,7 +240,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';

gdm-autologin.text = ''
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View file
Expand Up @@ -68,8 +68,8 @@ in

package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome_themes_standard;
defaultText = "pkgs.gnome3.gnome_themes_standard";
default = pkgs.gnome3.gnome-themes-standard;
defaultText = "pkgs.gnome3.gnome-themes-standard";
description = ''
The package path that contains the theme given in the name option.
'';
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/ario/default.nix
View file
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify,
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
libsoup, avahi, taglib
}:

Expand All @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
];

meta = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/audacious/default.nix
View file
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
Expand All @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];

buildInputs = [
gettext glib gtk3 libmowgli dbus_glib libxml2
gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
Expand Down

0 comments on commit a31d98f

Please sign in to comment.