commit 76672dd9e31e43a269c4ce20a950f9e49f408c8e · pyrox.dev/nixpkgs

+1 -1

nixos/modules/module-list.nix

···

       101
       101
        
         ./services/databases/virtuoso.nix

     

       102
       102
        
         ./services/databases/monetdb.nix

     

       103
       103
        
         ./services/databases/influxdb.nix

     

       104
       104
       -
         ./services/desktops/accountservice.nix

     

       104
       104
       +
         ./services/desktops/accountsservice.nix

     

       105
       105
        
         ./services/desktops/geoclue2.nix

     

       106
       106
        
         ./services/desktops/gnome3/at-spi2-core.nix

     

       107
       107
        
         ./services/desktops/gnome3/evolution-data-server.nix

+3 -3

nixos/modules/services/desktops/accountservice.nix nixos/modules/services/desktops/accountsservice.nix

···

       30
       30
        
       

     

       31
       31
        
         config = mkIf config.services.accounts-daemon.enable {

     

       32
       32
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.accountservice ];

     

       33
       33
       +
           environment.systemPackages = [ pkgs.accountsservice ];

     

       34
       34
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.accountservice ];

     

       35
       35
       +
           services.dbus.packages = [ pkgs.accountsservice ];

     

       36
       36
        
       

     

       37
       37
       -
           systemd.packages = [ pkgs.accountservice ];

     

       37
       37
       +
           systemd.packages = [ pkgs.accountsservice ];

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
       }

+2 -2

pkgs/desktops/gnome-3/3.10/core/gdm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11

     

       2
       2
        
       , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       9
       9
        
           sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice

     

       12
       12
       +
         buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice

     

       13
       13
        
                         gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper

     

       2
       2
       -
       , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig

     

       2
       2
       +
       , libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig

     

       3
       3
        
       , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify

     

       4
       4
        
       , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk

     

       5
       5
        
       , cracklib, python, krb5, networkmanagerapplet, networkmanager

     
···

       27
       27
        
           [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas

     

       28
       28
        
             libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus

     

       29
       29
        
             gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality

     

       30
       30
       -
             accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       30
       30
       +
             accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       31
       31
        
             shared_mime_info icu libtool docbook_xsl docbook_xsl_ns 

     

       32
       32
        
             networkmanager modemmanager makeWrapper  ];

     

       33
       33

+3 -3

pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix

···

       2
       2
        
       , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns

     

       3
       3
        
       , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip

     

       4
       4
        
       , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper

     

       5
       5
       -
       , accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

     

       5
       5
       +
       , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

     

       6
       6
        
       

     

       7
       7
        
       # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup

     

       8
       8
        
       

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = with gnome3;

     

       18
       18
       -
           [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice

     

       18
       18
       +
           [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice

     

       19
       19
        
             libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg

     

       20
       20
        
             clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns

     

       21
       21
        
             libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server

     
···

       31
       31
        
           wrapProgram "$out/bin/gnome-shell" \

     

       32
       32
        
             --prefix PATH : "${unzip}/bin" \

     

       33
       33
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       34
       34
       -
             --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \

     

       34
       34
       +
             --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \

     

       35
       35
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       36
       36
        
             --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

     

       37
       37

+2 -2

pkgs/desktops/gnome-3/3.12/core/gdm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11

     

       2
       2
        
       , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       9
       9
        
           sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice dconf

     

       12
       12
       +
         buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice dconf

     

       13
       13
        
                         gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];

     

       14
       14
        
       

     

       15
       15
        
         meta = with stdenv.lib; {

+2 -2

pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix

···

       1
       1
        
       { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper

     

       2
       2
       -
       , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig

     

       2
       2
       +
       , libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig

     

       3
       3
        
       , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify

     

       4
       4
        
       , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk

     

       5
       5
        
       , cracklib, python, krb5, networkmanagerapplet, networkmanager

     
···

       25
       25
        
           [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas

     

       26
       26
        
             libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus

     

       27
       27
        
             gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality

     

       28
       28
       -
             accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       28
       28
       +
             accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile

     

       29
       29
        
             shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo

     

       30
       30
        
             gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk

     

       31
       31
        
             hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino

+3 -3

pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix

···

       2
       2
        
       , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns

     

       3
       3
        
       , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip

     

       4
       4
        
       , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper

     

       5
       5
       -
       , accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

     

       5
       5
       +
       , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

     

       6
       6
        
       

     

       7
       7
        
       # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup

     

       8
       8
        
       

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = with gnome3;

     

       18
       18
       -
           [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice

     

       18
       18
       +
           [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice

     

       19
       19
        
             libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg

     

       20
       20
        
             clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns

     

       21
       21
        
             libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server

     
···

       33
       33
        
           wrapProgram "$out/bin/gnome-shell" \

     

       34
       34
        
             --prefix PATH : "${unzip}/bin" \

     

       35
       35
        
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       36
       36
       -
             --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \

     

       36
       36
       +
             --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \

     

       37
       37
        
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       38
       38
        
             --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

     

       39
       39

pkgs/development/libraries/accountservice/default.nix pkgs/development/libraries/accountsservice/default.nix

pkgs/development/libraries/accountservice/no-create-dirs.patch pkgs/development/libraries/accountsservice/no-create-dirs.patch

+1 -1

pkgs/top-level/all-packages.nix

···

       4163
       4163
        
       

     

       4164
       4164
        
         aalib = callPackage ../development/libraries/aalib { };

     

       4165
       4165
        
       

     

       4166
       4166
       -
         accountservice = callPackage ../development/libraries/accountservice { };

     

       4166
       4166
       +
         accountsservice = callPackage ../development/libraries/accountsservice { };

     

       4167
       4167
        
       

     

       4168
       4168
        
         acl = callPackage ../development/libraries/acl { };

     

       4169
       4169