From a31d98f3120e0f676303b7fc3e84424e6b325290 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 25 Feb 2018 03:23:58 +0100 Subject: tree-wide: autorename gnome packages to use dashes --- nixos/modules/config/no-x-libs.nix | 14 +-- .../cd-dvd/installation-cd-graphical-gnome.nix | 2 +- nixos/modules/programs/dconf.nix | 2 +- nixos/modules/security/pam.nix | 4 +- .../services/desktops/gnome3/at-spi2-core.nix | 6 +- .../desktops/gnome3/evolution-data-server.nix | 6 +- .../services/desktops/gnome3/gnome-keyring.nix | 4 +- .../desktops/gnome3/gnome-online-accounts.nix | 4 +- .../desktops/gnome3/gnome-terminal-server.nix | 6 +- nixos/modules/services/desktops/telepathy.nix | 4 +- .../modules/services/networking/networkmanager.nix | 22 ++--- .../x11/desktop-managers/enlightenment.nix | 2 +- .../services/x11/desktop-managers/gnome3.nix | 18 ++-- .../modules/services/x11/desktop-managers/mate.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../modules/services/x11/desktop-managers/xfce.nix | 6 +- .../modules/services/x11/display-managers/gdm.nix | 10 +- .../x11/display-managers/lightdm-greeters/gtk.nix | 4 +- pkgs/applications/audio/ario/default.nix | 4 +- pkgs/applications/audio/audacious/default.nix | 4 +- pkgs/applications/audio/deadbeef/default.nix | 6 +- pkgs/applications/audio/easytag/default.nix | 4 +- pkgs/applications/audio/gjay/default.nix | 4 +- pkgs/applications/audio/gmpc/default.nix | 4 +- pkgs/applications/audio/gradio/default.nix | 12 +-- pkgs/applications/audio/gtkpod/default.nix | 8 +- pkgs/applications/audio/guitarix/default.nix | 8 +- pkgs/applications/audio/mopidy/default.nix | 4 +- pkgs/applications/audio/paprefs/default.nix | 4 +- pkgs/applications/audio/patchage/default.nix | 4 +- pkgs/applications/audio/pavucontrol/default.nix | 4 +- pkgs/applications/audio/radiotray-ng/default.nix | 4 +- pkgs/applications/audio/rhythmbox/default.nix | 4 +- pkgs/applications/audio/sonata/default.nix | 6 +- pkgs/applications/audio/sound-juicer/default.nix | 8 +- pkgs/applications/audio/tomahawk/default.nix | 6 +- pkgs/applications/backup/deja-dup/default.nix | 8 +- .../lightdm-gtk-greeter/default.nix | 4 +- pkgs/applications/editors/atom/env.nix | 4 +- .../applications/editors/eclipse/build-eclipse.nix | 4 +- pkgs/applications/editors/eclipse/default.nix | 4 +- pkgs/applications/editors/emacs/default.nix | 8 +- pkgs/applications/editors/jucipp/default.nix | 4 +- pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 +- pkgs/applications/editors/lighttable/default.nix | 4 +- pkgs/applications/editors/monodevelop/default.nix | 4 +- pkgs/applications/graphics/darktable/default.nix | 8 +- pkgs/applications/graphics/gcolor3/default.nix | 4 +- pkgs/applications/graphics/geeqie/default.nix | 4 +- pkgs/applications/graphics/giv/default.nix | 4 +- pkgs/applications/graphics/glabels/default.nix | 6 +- pkgs/applications/graphics/gthumb/default.nix | 10 +- pkgs/applications/graphics/nomacs/default.nix | 4 +- pkgs/applications/graphics/rawtherapee/default.nix | 4 +- pkgs/applications/graphics/shotwell/default.nix | 10 +- pkgs/applications/graphics/viewnior/default.nix | 4 +- pkgs/applications/graphics/vimiv/default.nix | 4 +- pkgs/applications/kde/akonadi-mime.nix | 4 +- pkgs/applications/kde/akonadi/default.nix | 4 +- pkgs/applications/kde/k3b.nix | 4 +- pkgs/applications/kde/kdenlive.nix | 4 +- pkgs/applications/kde/kdepim-runtime.nix | 4 +- pkgs/applications/kde/kio-extras.nix | 4 +- pkgs/applications/kde/kmail-account-wizard.nix | 4 +- pkgs/applications/kde/marble.nix | 4 +- pkgs/applications/kde/okteta.nix | 4 +- pkgs/applications/misc/artha/default.nix | 4 +- pkgs/applications/misc/clipit/default.nix | 4 +- pkgs/applications/misc/deepin-terminal/default.nix | 4 +- pkgs/applications/misc/finalterm/default.nix | 8 +- pkgs/applications/misc/font-manager/default.nix | 6 +- pkgs/applications/misc/gksu/default.nix | 6 +- pkgs/applications/misc/gmtp/default.nix | 4 +- pkgs/applications/misc/gpx-viewer/default.nix | 6 +- pkgs/applications/misc/gramps/default.nix | 2 +- pkgs/applications/misc/guake/default.nix | 2 +- .../misc/hamster-time-tracker/default.nix | 8 +- pkgs/applications/misc/kiwix/default.nix | 4 +- pkgs/applications/misc/kupfer/default.nix | 4 +- pkgs/applications/misc/mediainfo-gui/default.nix | 4 +- pkgs/applications/misc/mysql-workbench/default.nix | 10 +- pkgs/applications/misc/notify-osd/default.nix | 6 +- pkgs/applications/misc/onboard/default.nix | 12 +-- pkgs/applications/misc/orca/default.nix | 10 +- pkgs/applications/misc/pdfmod/default.nix | 4 +- pkgs/applications/misc/pdfshuffler/default.nix | 6 +- pkgs/applications/misc/roxterm/default.nix | 12 +-- pkgs/applications/misc/simplenote/default.nix | 4 +- pkgs/applications/misc/spacefm/default.nix | 8 +- pkgs/applications/misc/sweethome3d/default.nix | 6 +- pkgs/applications/misc/sweethome3d/editors.nix | 6 +- pkgs/applications/misc/synapse/default.nix | 6 +- pkgs/applications/misc/tilix/default.nix | 6 +- pkgs/applications/misc/tint2/default.nix | 4 +- pkgs/applications/misc/udiskie/default.nix | 4 +- pkgs/applications/misc/viking/default.nix | 4 +- pkgs/applications/misc/volnoti/default.nix | 4 +- pkgs/applications/misc/workrave/default.nix | 4 +- pkgs/applications/misc/xiphos/default.nix | 8 +- .../networking/browsers/chromium/common.nix | 8 +- .../networking/browsers/chromium/default.nix | 4 +- .../networking/browsers/dwb/default.nix | 8 +- .../networking/browsers/eolie/default.nix | 6 +- .../networking/browsers/firefox-bin/default.nix | 8 +- .../networking/browsers/firefox/common.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 8 +- .../networking/browsers/google-chrome/default.nix | 8 +- .../networking/browsers/jumanji/default.nix | 8 +- .../networking/browsers/midori/default.nix | 10 +- .../mozilla-plugins/google-talk-plugin/default.nix | 4 +- .../networking/browsers/palemoon/default.nix | 4 +- .../networking/browsers/qutebrowser/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../browsers/tor-browser-bundle-bin/default.nix | 12 +-- .../browsers/tor-browser-bundle/default.nix | 8 +- .../networking/browsers/uzbl/default.nix | 6 +- .../networking/browsers/vimb/default.nix | 8 +- .../networking/browsers/vimprobable2/default.nix | 8 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 4 +- pkgs/applications/networking/corebird/default.nix | 6 +- .../bitlbee-facebook/default.nix | 4 +- .../networking/instant-messengers/dino/default.nix | 8 +- .../instant-messengers/ekiga/default.nix | 10 +- .../pidgin-opensteamworks/default.nix | 4 +- .../pidgin-plugins/pidgin-skypeweb/default.nix | 4 +- .../pidgin-plugins/purple-facebook/default.nix | 4 +- .../pidgin-plugins/purple-hangouts/default.nix | 4 +- .../pidgin-plugins/purple-matrix/default.nix | 4 +- .../pidgin-plugins/skype4pidgin/default.nix | 4 +- .../instant-messengers/pidgin/default.nix | 4 +- .../instant-messengers/skypeforlinux/default.nix | 2 +- .../telepathy/gabble/default.nix | 4 +- .../instant-messengers/telepathy/haze/default.nix | 4 +- .../instant-messengers/telepathy/idle/default.nix | 4 +- .../telepathy/logger/default.nix | 6 +- .../telepathy/mission-control/default.nix | 4 +- .../instant-messengers/telepathy/salut/default.nix | 6 +- .../networking/irc/hexchat/default.nix | 8 +- .../networking/mailreaders/astroid/default.nix | 2 +- .../networking/mailreaders/claws-mail/default.nix | 18 ++-- .../networking/mailreaders/mailnag/default.nix | 4 +- .../mailreaders/nylas-mail-bin/default.nix | 12 +-- .../mailreaders/thunderbird-bin/default.nix | 12 +-- .../networking/mailreaders/thunderbird/default.nix | 4 +- .../networking/newsreaders/liferea/default.nix | 12 +-- .../networking/newsreaders/pan/default.nix | 4 +- .../networking/nextcloud-client/default.nix | 4 +- .../networking/p2p/retroshare/default.nix | 2 +- .../applications/networking/p2p/tixati/default.nix | 4 +- .../p2p/transmission-remote-gtk/default.nix | 6 +- .../networking/remote/citrix-receiver/default.nix | 2 +- .../networking/remote/remmina/default.nix | 16 +-- .../networking/sniffers/wireshark/default.nix | 4 +- .../networking/syncthing-gtk/default.nix | 2 +- pkgs/applications/office/calligra/default.nix | 4 +- pkgs/applications/office/gnucash/2.6.nix | 4 +- pkgs/applications/office/grisbi/default.nix | 4 +- pkgs/applications/office/homebank/default.nix | 4 +- pkgs/applications/office/jabref/default.nix | 4 +- pkgs/applications/office/libreoffice/default.nix | 4 +- pkgs/applications/office/libreoffice/still.nix | 4 +- pkgs/applications/office/mendeley/default.nix | 4 +- pkgs/applications/office/paperwork/default.nix | 4 +- pkgs/applications/office/pinpoint/default.nix | 4 +- pkgs/applications/office/planner/default.nix | 4 +- pkgs/applications/office/skrooge/default.nix | 4 +- pkgs/applications/office/spice-up/default.nix | 6 +- pkgs/applications/office/zotero/default.nix | 6 +- .../science/electronics/pcb/default.nix | 4 +- pkgs/applications/search/catfish/default.nix | 4 +- .../version-management/gitkraken/default.nix | 6 +- .../version-management/meld/default.nix | 2 +- pkgs/applications/video/byzanz/default.nix | 2 +- pkgs/applications/video/gnome-mplayer/default.nix | 4 +- pkgs/applications/video/gnome-mpv/default.nix | 4 +- pkgs/applications/video/handbrake/default.nix | 6 +- pkgs/applications/video/kazam/default.nix | 4 +- pkgs/applications/video/kodi/default.nix | 6 +- pkgs/applications/video/miro/default.nix | 6 +- pkgs/applications/video/mkcast/default.nix | 2 +- pkgs/applications/video/peek/default.nix | 4 +- pkgs/applications/video/pitivi/default.nix | 6 +- pkgs/applications/video/subtitleeditor/default.nix | 6 +- pkgs/applications/video/xine-ui/default.nix | 4 +- .../looking-glass-client/default.nix | 4 +- pkgs/applications/virtualization/qemu/default.nix | 4 +- .../virtualization/spice-vdagent/default.nix | 4 +- .../virtualization/virt-manager/default.nix | 8 +- .../virtualization/virt-manager/qt.nix | 4 +- .../virtualization/virt-viewer/default.nix | 14 +-- pkgs/applications/virtualization/xen/4.5.nix | 4 +- pkgs/applications/virtualization/xen/4.8.nix | 4 +- .../window-managers/awesome/default.nix | 4 +- pkgs/applications/window-managers/kbdd/default.nix | 4 +- .../window-managers/xmonad-log-applet/default.nix | 4 +- .../build-support/rust/default-crate-overrides.nix | 8 +- .../icons/elementary-xfce-icon-theme/default.nix | 4 +- pkgs/data/icons/numix-icon-theme/default.nix | 4 +- pkgs/desktops/gnome-2/default.nix | 22 +++-- .../desktop/gnome-control-center/default.nix | 14 +-- .../gnome-2/desktop/gnome-desktop/default.nix | 4 +- .../gnome-2/desktop/gnome-keyring/default.nix | 4 +- .../gnome-2/desktop/gnome-panel/default.nix | 14 +-- .../gnome-2/desktop/gnome-session/default.nix | 4 +- .../desktop/gnome-settings-daemon/default.nix | 6 +- .../gnome-2/desktop/gtksourceview/default.nix | 4 +- .../gnome-2/desktop/libgnomekbd/default.nix | 4 +- .../gnome-2/desktop/mail-notification/default.nix | 4 +- pkgs/desktops/gnome-2/desktop/metacity/default.nix | 10 +- pkgs/desktops/gnome-2/desktop/zenity/default.nix | 4 +- pkgs/desktops/gnome-2/platform/GConf/default.nix | 4 +- pkgs/desktops/gnome-2/platform/at-spi/default.nix | 4 +- .../gnome-2/platform/gnome-common/default.nix | 2 +- .../gnome-2/platform/gnome-vfs/default.nix | 4 +- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 +- .../gnome-2/platform/libbonobo/default.nix | 2 +- .../desktops/gnome-2/platform/libgnome/default.nix | 4 +- .../gnome-2/platform/libgnomeui/default.nix | 4 +- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 +- pkgs/desktops/gnome-3/apps/bijiben/default.nix | 18 ++-- pkgs/desktops/gnome-3/apps/cheese/default.nix | 18 ++-- pkgs/desktops/gnome-3/apps/evolution/default.nix | 20 ++-- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 +- pkgs/desktops/gnome-3/apps/glade/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 12 +-- .../gnome-3/apps/gnome-calendar/default.nix | 8 +- .../gnome-3/apps/gnome-characters/default.nix | 2 +- .../desktops/gnome-3/apps/gnome-clocks/default.nix | 8 +- .../gnome-3/apps/gnome-documents/default.nix | 12 +-- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 6 +- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 +- .../desktops/gnome-3/apps/gnome-photos/default.nix | 12 +-- .../gnome-3/apps/gnome-power-manager/default.nix | 6 +- .../gnome-3/apps/gnome-weather/default.nix | 2 +- pkgs/desktops/gnome-3/apps/polari/default.nix | 12 +-- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 10 +- .../gnome-3/core/adwaita-icon-theme/default.nix | 4 +- pkgs/desktops/gnome-3/core/caribou/default.nix | 4 +- .../desktops/gnome-3/core/dconf-editor/default.nix | 4 +- pkgs/desktops/gnome-3/core/dconf/default.nix | 4 +- pkgs/desktops/gnome-3/core/empathy/default.nix | 32 +++--- pkgs/desktops/gnome-3/core/eog/default.nix | 6 +- pkgs/desktops/gnome-3/core/epiphany/default.nix | 20 ++-- pkgs/desktops/gnome-3/core/evince/default.nix | 10 +- .../gnome-3/core/evolution-data-server/default.nix | 8 +- pkgs/desktops/gnome-3/core/folks/default.nix | 8 +- pkgs/desktops/gnome-3/core/gconf/default.nix | 4 +- pkgs/desktops/gnome-3/core/gcr/default.nix | 8 +- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 +- .../desktops/gnome-3/core/geocode-glib/default.nix | 4 +- .../gnome-3/core/gnome-bluetooth/default.nix | 6 +- .../gnome-3/core/gnome-calculator/default.nix | 4 +- .../desktops/gnome-3/core/gnome-common/default.nix | 2 +- .../gnome-3/core/gnome-contacts/default.nix | 20 ++-- .../gnome-3/core/gnome-control-center/default.nix | 22 ++--- .../gnome-3/core/gnome-desktop/default.nix | 6 +- .../gnome-3/core/gnome-dictionary/default.nix | 8 +- .../gnome-3/core/gnome-disk-utility/default.nix | 8 +- .../gnome-3/core/gnome-font-viewer/default.nix | 2 +- .../gnome-3/core/gnome-keyring/default.nix | 6 +- .../gnome-3/core/gnome-online-accounts/default.nix | 12 +-- .../gnome-3/core/gnome-online-miners/default.nix | 6 +- .../gnome-3/core/gnome-screenshot/default.nix | 8 +- .../gnome-3/core/gnome-session/default.nix | 12 +-- .../gnome-3/core/gnome-settings-daemon/default.nix | 12 +-- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 18 ++-- .../gnome-3/core/gnome-software/default.nix | 8 +- .../gnome-3/core/gnome-system-log/default.nix | 6 +- .../gnome-3/core/gnome-system-monitor/default.nix | 6 +- .../gnome-3/core/gnome-terminal/default.nix | 14 +-- .../gnome-3/core/gnome-user-share/default.nix | 4 +- .../gnome-3/core/grilo-plugins/default.nix | 8 +- .../core/gsettings-desktop-schemas/default.nix | 2 +- .../gnome-3/core/gtksourceview/default.nix | 4 +- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 8 +- pkgs/desktops/gnome-3/core/libgdata/default.nix | 8 +- pkgs/desktops/gnome-3/core/libgweather/default.nix | 2 +- pkgs/desktops/gnome-3/core/libzapojit/default.nix | 4 +- pkgs/desktops/gnome-3/core/mutter/default.nix | 10 +- pkgs/desktops/gnome-3/core/nautilus/default.nix | 14 +-- pkgs/desktops/gnome-3/core/sushi/default.nix | 4 +- pkgs/desktops/gnome-3/core/totem/default.nix | 14 +-- .../gnome-3/core/tracker-miners/default.nix | 8 +- pkgs/desktops/gnome-3/core/tracker/default.nix | 6 +- pkgs/desktops/gnome-3/core/vino/default.nix | 8 +- pkgs/desktops/gnome-3/core/vte/default.nix | 2 +- pkgs/desktops/gnome-3/core/vte/ng.nix | 4 +- pkgs/desktops/gnome-3/core/yelp-tools/default.nix | 2 +- pkgs/desktops/gnome-3/core/yelp/default.nix | 6 +- pkgs/desktops/gnome-3/core/zenity/default.nix | 4 +- pkgs/desktops/gnome-3/default.nix | 98 ++++++++++++------- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 2 +- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 +- .../extensions/chrome-gnome-shell/default.nix | 2 +- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 6 +- .../gnome-3/games/four-in-a-row/default.nix | 4 +- .../gnome-3/games/gnome-nibbles/default.nix | 4 +- .../gnome-3/games/gnome-robots/default.nix | 4 +- .../gnome-3/games/gnome-sudoku/default.nix | 4 +- .../gnome-3/games/gnome-taquin/default.nix | 4 +- pkgs/desktops/gnome-3/games/iagno/default.nix | 4 +- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 4 +- .../gnome-3/games/quadrapassel/default.nix | 8 +- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 4 +- pkgs/desktops/gnome-3/misc/california/default.nix | 8 +- pkgs/desktops/gnome-3/misc/geary/default.nix | 14 +-- pkgs/desktops/gnome-3/misc/gfbgraph/default.nix | 6 +- pkgs/desktops/gnome-3/misc/gitg/default.nix | 12 +-- .../gnome-3/misc/gnome-packagekit/default.nix | 8 +- .../gnome-3/misc/gnome-tweak-tool/default.nix | 10 +- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 2 +- .../desktops/gnome-3/misc/libgit2-glib/default.nix | 4 +- pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 8 +- pkgs/desktops/lumina/default.nix | 4 +- pkgs/desktops/lxqt/optional/obconf-qt/default.nix | 4 +- pkgs/desktops/mate/atril/default.nix | 4 +- pkgs/desktops/mate/caja-extensions/default.nix | 4 +- pkgs/desktops/mate/caja/default.nix | 4 +- pkgs/desktops/mate/engrampa/default.nix | 4 +- pkgs/desktops/mate/eom/default.nix | 8 +- pkgs/desktops/mate/marco/default.nix | 4 +- pkgs/desktops/mate/mate-applets/default.nix | 4 +- pkgs/desktops/mate/mate-control-center/default.nix | 14 +-- .../mate/mate-icon-theme-faenza/default.nix | 4 +- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 +- .../mate/mate-indicator-applet/default.nix | 4 +- pkgs/desktops/mate/mate-media/default.nix | 4 +- .../mate/mate-notification-daemon/default.nix | 6 +- pkgs/desktops/mate/mate-panel/default.nix | 6 +- pkgs/desktops/mate/mate-power-manager/default.nix | 8 +- pkgs/desktops/mate/mate-screensaver/default.nix | 4 +- pkgs/desktops/mate/mate-sensors-applet/default.nix | 6 +- .../desktops/mate/mate-session-manager/default.nix | 8 +- .../desktops/mate/mate-settings-daemon/default.nix | 6 +- pkgs/desktops/mate/mate-user-share/default.nix | 8 +- pkgs/desktops/mate/mate-utils/default.nix | 6 +- .../pantheon/apps/pantheon-terminal/default.nix | 2 +- pkgs/desktops/plasma-5/bluedevil.nix | 4 +- pkgs/desktops/plasma-5/default.nix | 4 +- pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 6 +- .../0001-mobile-broadband-provider-info-path.patch | 2 +- pkgs/desktops/plasma-5/plasma-nm/default.nix | 6 +- pkgs/desktops/plasma-5/plasma-pa.nix | 4 +- pkgs/desktops/plasma-5/sddm-kcm.nix | 4 +- pkgs/desktops/rox/rox-filer/default.nix | 4 +- pkgs/desktops/xfce/applications/mousepad.nix | 4 +- pkgs/desktops/xfce/applications/orage.nix | 4 +- pkgs/desktops/xfce/applications/parole.nix | 4 +- pkgs/desktops/xfce/applications/ristretto.nix | 10 +- pkgs/desktops/xfce/applications/terminal.nix | 4 +- .../xfce/applications/xfce4-screenshooter.nix | 4 +- pkgs/desktops/xfce/core/exo.nix | 4 +- pkgs/desktops/xfce/core/libxfce4ui.nix | 4 +- pkgs/desktops/xfce/core/libxfcegui4.nix | 4 +- pkgs/desktops/xfce/core/thunar-build.nix | 4 +- pkgs/desktops/xfce/core/tumbler.nix | 4 +- pkgs/desktops/xfce/core/xfce4-panel.nix | 8 +- pkgs/desktops/xfce/core/xfce4-power-manager.nix | 8 +- pkgs/desktops/xfce/core/xfce4-session.nix | 8 +- pkgs/desktops/xfce/core/xfconf.nix | 4 +- pkgs/desktops/xfce/core/xfdesktop.nix | 4 +- pkgs/development/compilers/boo/default.nix | 4 +- .../haskell-modules/hackage-packages.nix | 8 +- .../libraries/appstream-glib/default.nix | 8 +- pkgs/development/libraries/at-spi2-atk/default.nix | 4 +- .../development/libraries/at-spi2-core/default.nix | 4 +- pkgs/development/libraries/clutter/default.nix | 4 +- .../libraries/dleyna-renderer/default.nix | 4 +- .../libraries/dleyna-server/default.nix | 4 +- pkgs/development/libraries/farstream/default.nix | 4 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +- pkgs/development/libraries/gegl/3.0.nix | 4 +- pkgs/development/libraries/geoclue/2.0.nix | 10 +- pkgs/development/libraries/geoclue/default.nix | 8 +- .../libraries/glib-networking/default.nix | 4 +- pkgs/development/libraries/glib/default.nix | 6 +- pkgs/development/libraries/gnutls-kdh/generic.nix | 4 +- pkgs/development/libraries/gnutls/generic.nix | 4 +- .../libraries/gstreamer/validate/default.nix | 4 +- pkgs/development/libraries/gtk+/3.x.nix | 8 +- .../libraries/gtk-mac-integration/default.nix | 4 +- pkgs/development/libraries/gvfs/default.nix | 2 +- .../libraries/indicator-application/gtk2.nix | 4 +- .../libraries/indicator-application/gtk3.nix | 4 +- .../libraries/kde-frameworks/kcoreaddons.nix | 4 +- .../libraries/kde-frameworks/kservice/default.nix | 4 +- pkgs/development/libraries/keybinder/default.nix | 4 +- pkgs/development/libraries/keybinder3/default.nix | 4 +- pkgs/development/libraries/lasso/default.nix | 4 +- .../libraries/libaccounts-glib/default.nix | 4 +- .../libraries/libappindicator/default.nix | 4 +- .../development/libraries/libaudclient/default.nix | 4 +- .../development/libraries/libchamplain/default.nix | 4 +- pkgs/development/libraries/libdbusmenu/default.nix | 8 +- pkgs/development/libraries/libgksu/default.nix | 6 +- pkgs/development/libraries/libgsystem/default.nix | 4 +- .../libraries/libhttpseverywhere/default.nix | 4 +- pkgs/development/libraries/libindicate/default.nix | 8 +- pkgs/development/libraries/libmx/default.nix | 6 +- pkgs/development/libraries/libnice/default.nix | 4 +- pkgs/development/libraries/libosinfo/default.nix | 4 +- pkgs/development/libraries/libpsl/default.nix | 4 +- pkgs/development/libraries/libsecret/default.nix | 2 +- pkgs/development/libraries/libskk/default.nix | 8 +- pkgs/development/libraries/libsoup/default.nix | 8 +- pkgs/development/libraries/libunique/3.x.nix | 4 +- pkgs/development/libraries/libunique/default.nix | 4 +- pkgs/development/libraries/osm-gps-map/default.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 4 +- pkgs/development/libraries/spice-gtk/default.nix | 4 +- pkgs/development/libraries/spice/default.nix | 4 +- .../libraries/telepathy/farstream/default.nix | 4 +- .../libraries/telepathy/glib/default.nix | 4 +- .../development/libraries/telepathy/qt/default.nix | 8 +- pkgs/development/libraries/uhttpmock/default.nix | 4 +- pkgs/development/libraries/umockdev/default.nix | 4 +- pkgs/development/libraries/webkitgtk/2.18.nix | 8 +- pkgs/development/libraries/zeitgeist/default.nix | 10 +- pkgs/development/python-modules/dbus/default.nix | 4 +- .../development/python-modules/pyatspi/default.nix | 4 +- pkgs/development/python-modules/pykde4/kdelibs.nix | 4 +- .../tools/analysis/massif-visualizer/default.nix | 4 +- .../tools/documentation/gtk-doc/default.nix | 4 +- pkgs/development/tools/misc/eggdbus/default.nix | 4 +- pkgs/development/tools/misc/gtkdialog/default.nix | 4 +- pkgs/games/openclonk/default.nix | 4 +- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/misc/drivers/xboxdrv/default.nix | 4 +- pkgs/misc/emulators/desmume/default.nix | 4 +- pkgs/misc/emulators/nestopia/default.nix | 2 +- pkgs/misc/screensavers/light-locker/default.nix | 4 +- pkgs/misc/themes/adapta/default.nix | 2 +- pkgs/misc/themes/materia-theme/default.nix | 2 +- pkgs/os-specific/linux/firmware/fwupd/default.nix | 14 +-- .../os-specific/linux/iio-sensor-proxy/default.nix | 4 +- pkgs/os-specific/linux/pmount/default.nix | 2 +- pkgs/os-specific/linux/pommed/default.nix | 4 +- pkgs/os-specific/linux/prl-tools/default.nix | 4 +- pkgs/os-specific/linux/shadow/default.nix | 4 +- pkgs/os-specific/linux/udisks-glue/default.nix | 4 +- pkgs/os-specific/linux/udisks/1-default.nix | 4 +- pkgs/os-specific/linux/upower/default.nix | 4 +- pkgs/os-specific/linux/usbguard/default.nix | 4 +- pkgs/servers/gpsd/default.nix | 4 +- pkgs/servers/x11/xorg/default.nix | 2 +- .../x11/xorg/generate-expr-from-tarballs.pl | 2 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/test/openftd/default.nix | 4 +- pkgs/tools/bluetooth/blueman/default.nix | 4 +- pkgs/tools/bluetooth/obex-data-server/default.nix | 4 +- pkgs/tools/cd-dvd/brasero/default.nix | 8 +- pkgs/tools/graphics/gromit-mpx/default.nix | 4 +- .../fcitx-engines/fcitx-rime/default.nix | 4 +- pkgs/tools/inputmethods/ibus/default.nix | 8 +- pkgs/tools/inputmethods/ibus/wrapper.nix | 8 +- pkgs/tools/misc/gparted/default.nix | 4 +- pkgs/tools/misc/mdbtools/git.nix | 4 +- pkgs/tools/misc/mimeo/default.nix | 6 +- pkgs/tools/misc/ostree/default.nix | 4 +- pkgs/tools/misc/parcellite/default.nix | 4 +- pkgs/tools/misc/rmlint/default.nix | 4 +- pkgs/tools/misc/rpm-ostree/default.nix | 4 +- pkgs/tools/misc/system-config-printer/default.nix | 8 +- pkgs/tools/misc/yad/default.nix | 4 +- pkgs/tools/networking/gupnp-tools/default.nix | 6 +- pkgs/tools/networking/megatools/default.nix | 4 +- pkgs/tools/networking/modemmanager/default.nix | 4 +- .../networking/network-manager-applet/default.nix | 14 +-- .../networking/network-manager/0.9.8/default.nix | 4 +- pkgs/tools/networking/network-manager/default.nix | 4 +- .../networking/network-manager/fortisslvpn.nix | 2 +- pkgs/tools/networking/network-manager/iodine.nix | 2 +- pkgs/tools/networking/network-manager/l2tp.nix | 2 +- .../networking/network-manager/openconnect.nix | 2 +- pkgs/tools/networking/network-manager/openvpn.nix | 2 +- pkgs/tools/networking/network-manager/pptp.nix | 2 +- .../networking/network-manager/strongswan.nix | 4 +- pkgs/tools/networking/network-manager/vpnc.nix | 2 +- pkgs/tools/networking/tlspool/default.nix | 4 +- .../package-management/packagekit/default.nix | 4 +- pkgs/tools/security/fprintd/default.nix | 4 +- pkgs/tools/security/gencfsm/default.nix | 4 +- pkgs/tools/security/qdigidoc/default.nix | 8 +- pkgs/tools/security/qesteidutil/default.nix | 4 +- pkgs/tools/system/thermald/default.nix | 4 +- pkgs/top-level/aliases.nix | 41 ++++++++ pkgs/top-level/all-packages.nix | 107 ++++++++++----------- pkgs/top-level/python-packages.nix | 2 +- 491 files changed, 1532 insertions(+), 1458 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index e1c4d0d602af..d8980944adc0 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -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; }; }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 5725938465f5..4c4e69d60d9c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -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 diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 27bfdf022e7d..b7d8a345e65c 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -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-*)"; }; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index f39f64033ca7..e1cad03e66e2 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -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"} '') + '' @@ -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"} ''); diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 9e382241348b..cca98c43dc7a 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -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) { diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 86a47488d865..7e312a1b81eb 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -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 ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 2a68af5a7dd8..aa1165ab3bba 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -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 ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 0da4aca73ecb..4286251357f7 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -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 ]; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix index 3ac767bfa00d..fd14efee5f2e 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix @@ -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 ]; }; diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index 2554f3a1666f..f5401c180984 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -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 ]; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 62afbf32c2f6..e9a035d17d38 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -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; }; @@ -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 == []) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 7f3dc0d7847b..da3287aaea6e 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -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 ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 21d30df5b695..3d68f2b1c9b3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -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} @@ -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 { @@ -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. @@ -164,7 +164,7 @@ 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=$! ''; }; @@ -172,7 +172,7 @@ in { 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); @@ -180,10 +180,10 @@ in { # 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" ]; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 814503ab0bc4..0117dc9d132b 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -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; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b794e2b12d73..91d091d7d7e2 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -154,7 +154,7 @@ in print-manager breeze-icons - pkgs.hicolor_icon_theme + pkgs.hicolor-icon-theme kde-gtk-config breeze-gtk diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index c0c9d7ea47f7..489bffbee917 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -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 diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 07642a8b13db..70fc7388c2ac 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -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 ]; @@ -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"} @@ -213,7 +213,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-password.text = '' @@ -221,7 +221,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"} @@ -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 = '' diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 35b715b98fcd..2a71d2338607 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -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. ''; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index afb3c8342731..a99fb80df723 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -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 }: @@ -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 = { diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 725d0b8b4c73..6890b53f407d 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -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 @@ -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 diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ea0bce368a1a..be70443fd4df 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; +assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] + ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index f9c9dc2faef0..1ae9a0e5298e 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas +, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas , makeWrapper, gnome3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) + itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 2d63245fef63..42285ba4bf86 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 4bd57e15fe5f..c2adc58f9ce5 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook +, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor_icon_theme + libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 8c2987352fbb..d111502651ed 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig , gcc , python3 -, gsettings_desktop_schemas -, desktop_file_utils +, gsettings-desktop-schemas +, desktop-file-utils , glib , gtk3 , intltool , libsoup -, json_glib +, json-glib , wrapGAppsHook , meson , ninja @@ -44,15 +44,15 @@ in stdenv.mkDerivation rec { glib intltool libsoup - json_glib + json-glib gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - desktop_file_utils - gsettings_desktop_schemas + desktop-file-utils + gsettings-desktop-schemas ] ++ gst_plugins; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 7ebdce783527..39cd1a444fa8 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, - libvorbis, hicolor_icon_theme, gdk_pixbuf }: + libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme - hicolor_icon_theme ]; + hicolor-icon-theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gtkpod" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index dcb61119ae76..bcb301687089 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib-networking +, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + avahi bluez boost eigen fftw glib glibmm glib-networking.out + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8541ec6e2727..0018f17cac0e 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook -, gst_all_1, glib_networking, gobjectIntrospection +, gst_all_1, glib-networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib_networking gobjectIntrospection + glib-networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 58054070760b..fe9ed12390a5 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus_glib, GConf, gconfmm, intltool }: +, dbus-glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { name = "paprefs-0.9.10"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ]; + buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 91a270a698e6..8425b48166e6 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 + alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 69db9d74ee34..d113b8a49b31 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra_gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/appl