Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 41775167ac69a001f40c11e2ee9576887e17b8b4
      
https://github.com/NixOS/nixpkgs/commit/41775167ac69a001f40c11e2ee9576887e17b8b4
  Author: Oliver Charles <[email protected]>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M nixos/modules/system/activation/switch-to-configuration.pl
    M nixos/modules/system/activation/top-level.nix

  Log Message:
  -----------
  switch-to-configuration.pl: Interact via DBus

Currently switch-to-configuration.pl uses system() calls to interact
with DBus. This can be error prone, especially when we are parsing
output that could change. In this commit, almost all calls to the
systemctl binary have been replaced with equivalent operations via DBus.


  Commit: 42ae633445a72c4673b4abc3e214a2ddc8227724
      
https://github.com/NixOS/nixpkgs/commit/42ae633445a72c4673b4abc3e214a2ddc8227724
  Author: Oliver Charles <[email protected]>
  Date:   2014-04-20 (Sun, 20 Apr 2014)

  Changed paths:
    M .version
    A README.md
    M default.nix
    M doc/coding-conventions.xml
    M doc/language-support.xml
    M doc/meta.xml
    R doc/outline.txt
    M doc/quick-start.xml
    M doc/stdenv.xml
    M lib/licenses.nix
    M lib/lists.nix
    M lib/maintainers.nix
    M lib/meta.nix
    M lib/modules.nix
    M lib/sources.nix
    M lib/trivial.nix
    M lib/types.nix
    R maintainers/scripts/copy-tarball.sh
    A maintainers/scripts/copy-tarballs.pl
    R maintainers/scripts/copy-tarballs.sh
    A maintainers/scripts/find-tarballs.nix
    M maintainers/scripts/nixpkgs-lint.pl
    R nixos/.topmsg
    M nixos/doc/manual/configuration.xml
    A nixos/doc/manual/containers.xml
    M nixos/doc/manual/development.xml
    M nixos/doc/manual/installation.xml
    M nixos/doc/manual/manual.xml
    M nixos/doc/manual/options-to-docbook.xsl
    A nixos/doc/manual/release-notes.xml
    M nixos/doc/manual/running.xml
    M nixos/doc/manual/troubleshooting.xml
    M nixos/lib/eval-config.nix
    M nixos/lib/test-driver/Machine.pm
    M nixos/lib/test-driver/test-driver.pl
    M nixos/lib/testing.nix
    M nixos/maintainers/scripts/ec2/create-ebs-amis.py
    A nixos/maintainers/scripts/gce/create-gce.sh
    M nixos/modules/config/fonts/corefonts.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/config/fonts/fontdir.nix
    M nixos/modules/config/fonts/fonts.nix
    M nixos/modules/config/fonts/ghostscript.nix
    M nixos/modules/config/gnu.nix
    M nixos/modules/config/i18n.nix
    M nixos/modules/config/krb5.nix
    M nixos/modules/config/ldap.nix
    M nixos/modules/config/networking.nix
    M nixos/modules/config/no-x-libs.nix
    M nixos/modules/config/nsswitch.nix
    M nixos/modules/config/power-management.nix
    M nixos/modules/config/pulseaudio.nix
    M nixos/modules/config/shells-environment.nix
    M nixos/modules/config/swap.nix
    M nixos/modules/config/sysctl.nix
    M nixos/modules/config/system-path.nix
    M nixos/modules/config/timezone.nix
    M nixos/modules/config/unix-odbc-drivers.nix
    M nixos/modules/config/users-groups.nix
    M nixos/modules/hardware/all-firmware.nix
    M nixos/modules/hardware/cpu/amd-microcode.nix
    M nixos/modules/hardware/cpu/intel-microcode.nix
    M nixos/modules/hardware/network/b43.nix
    A nixos/modules/hardware/opengl.nix
    M nixos/modules/hardware/pcmcia.nix
    A nixos/modules/hardware/video/bumblebee.nix
    M nixos/modules/installer/cd-dvd/channel.nix
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix
    M nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
    M nixos/modules/installer/cd-dvd/iso-image.nix
    M nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
    M nixos/modules/installer/cd-dvd/system-tarball-pc.nix
    M nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
    M nixos/modules/installer/cd-dvd/system-tarball.nix
    M nixos/modules/installer/scan/detected.nix
    M nixos/modules/installer/scan/not-detected.nix
    M nixos/modules/installer/tools/nixos-checkout.nix
    M nixos/modules/installer/tools/nixos-generate-config.pl
    M nixos/modules/installer/tools/nixos-option.sh
    M nixos/modules/installer/tools/nixos-rebuild.sh
    M nixos/modules/installer/tools/tools.nix
    M nixos/modules/installer/virtualbox-demo.nix
    M nixos/modules/misc/assertions.nix
    M nixos/modules/misc/check-config.nix
    M nixos/modules/misc/crashdump.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/misc/locate.nix
    M nixos/modules/misc/nixpkgs.nix
    M nixos/modules/misc/version.nix
    M nixos/modules/module-list.nix
    M nixos/modules/profiles/clone-config.nix
    M nixos/modules/profiles/demo.nix
    M nixos/modules/profiles/headless.nix
    M nixos/modules/profiles/installation-device.nix
    M nixos/modules/profiles/minimal.nix
    M nixos/modules/profiles/qemu-guest.nix
    M nixos/modules/programs/atop.nix
    M nixos/modules/programs/bash/bash.nix
    M nixos/modules/programs/bash/command-not-found.nix
    M nixos/modules/programs/environment.nix
    M nixos/modules/programs/shadow.nix
    M nixos/modules/programs/shell.nix
    M nixos/modules/programs/ssh.nix
    M nixos/modules/programs/ssmtp.nix
    M nixos/modules/programs/venus.nix
    M nixos/modules/programs/virtualbox.nix
    M nixos/modules/programs/wvdial.nix
    M nixos/modules/programs/zsh/zsh.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/apparmor-suid.nix
    M nixos/modules/security/apparmor.nix
    M nixos/modules/security/ca.nix
    A nixos/modules/security/duosec.nix
    A nixos/modules/security/grsecurity.nix
    M nixos/modules/security/pam.nix
    M nixos/modules/security/pam_usb.nix
    M nixos/modules/security/polkit.nix
    M nixos/modules/security/prey.nix
    M nixos/modules/security/rngd.nix
    M nixos/modules/security/rtkit.nix
    M nixos/modules/security/setuid-wrapper.c
    M nixos/modules/security/setuid-wrappers.nix
    M nixos/modules/security/sudo.nix
    M nixos/modules/services/amqp/activemq/default.nix
    M nixos/modules/services/amqp/rabbitmq.nix
    M nixos/modules/services/audio/alsa.nix
    M nixos/modules/services/audio/fuppes.nix
    M nixos/modules/services/audio/mpd.nix
    M nixos/modules/services/backup/almir.nix
    M nixos/modules/services/backup/bacula.nix
    M nixos/modules/services/backup/mysql-backup.nix
    M nixos/modules/services/backup/postgresql-backup.nix
    M nixos/modules/services/backup/rsnapshot.nix
    M nixos/modules/services/backup/sitecopy-backup.nix
    A nixos/modules/services/backup/tarsnap.nix
    A nixos/modules/services/continuous-integration/jenkins/default.nix
    A nixos/modules/services/continuous-integration/jenkins/slave.nix
    M nixos/modules/services/databases/4store-endpoint.nix
    M nixos/modules/services/databases/4store.nix
    A nixos/modules/services/databases/couchdb.nix
    M nixos/modules/services/databases/firebird.nix
    M nixos/modules/services/databases/memcached.nix
    A nixos/modules/services/databases/monetdb.nix
    M nixos/modules/services/databases/mongodb.nix
    M nixos/modules/services/databases/mysql.nix
    R nixos/modules/services/databases/mysql55.nix
    M nixos/modules/services/databases/openldap.nix
    M nixos/modules/services/databases/postgresql.nix
    M nixos/modules/services/databases/redis.nix
    M nixos/modules/services/databases/virtuoso.nix
    A nixos/modules/services/desktops/accountservice.nix
    A nixos/modules/services/desktops/gnome3/at-spi2-core.nix
    A nixos/modules/services/desktops/gnome3/evolution-data-server.nix
    A nixos/modules/services/desktops/gnome3/gnome-keyring.nix
    A nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
    A nixos/modules/services/desktops/gnome3/gnome-user-share.nix
    A nixos/modules/services/desktops/gnome3/sushi.nix
    A nixos/modules/services/desktops/gnome3/tracker.nix
    A nixos/modules/services/desktops/telepathy.nix
    M nixos/modules/services/games/ghost-one.nix
    A nixos/modules/services/games/minecraft-server.nix
    A nixos/modules/services/hardware/80-net-name-slot.rules
    M nixos/modules/services/hardware/acpid.nix
    M nixos/modules/services/hardware/bluetooth.nix
    M nixos/modules/services/hardware/pcscd.nix
    M nixos/modules/services/hardware/pommed.nix
    M nixos/modules/services/hardware/sane.nix
    M nixos/modules/services/hardware/thinkfan.nix
    M nixos/modules/services/hardware/udev.nix
    M nixos/modules/services/hardware/udisks.nix
    M nixos/modules/services/hardware/udisks2.nix
    M nixos/modules/services/hardware/upower.nix
    M nixos/modules/services/logging/klogd.nix
    M nixos/modules/services/logging/logcheck.nix
    M nixos/modules/services/logging/logrotate.nix
    M nixos/modules/services/logging/logstash.nix
    M nixos/modules/services/logging/rsyslogd.nix
    M nixos/modules/services/logging/syslogd.nix
    M nixos/modules/services/mail/dovecot.nix
    M nixos/modules/services/mail/freepops.nix
    M nixos/modules/services/mail/mail.nix
    M nixos/modules/services/mail/opensmtpd.nix
    M nixos/modules/services/mail/postfix.nix
    M nixos/modules/services/mail/spamassassin.nix
    M nixos/modules/services/misc/autofs.nix
    M nixos/modules/services/misc/cgminer.nix
    A nixos/modules/services/misc/dictd.nix
    M nixos/modules/services/misc/disnix.nix
    M nixos/modules/services/misc/felix.nix
    M nixos/modules/services/misc/folding-at-home.nix
    M nixos/modules/services/misc/gpsd.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/misc/nix-gc.nix
    A nixos/modules/services/misc/nix-ssh-serve.nix
    M nixos/modules/services/misc/nixos-manual.nix
    A nixos/modules/services/misc/rippled.nix
    M nixos/modules/services/misc/rogue.nix
    M nixos/modules/services/misc/svnserve.nix
    M nixos/modules/services/misc/synergy.nix
    M nixos/modules/services/monitoring/apcupsd.nix
    M nixos/modules/services/monitoring/dd-agent.nix
    M nixos/modules/services/monitoring/graphite.nix
    M nixos/modules/services/monitoring/munin.nix
    M nixos/modules/services/monitoring/nagios/default.nix
    M nixos/modules/services/monitoring/smartd.nix
    M nixos/modules/services/monitoring/statsd.nix
    M nixos/modules/services/monitoring/systemhealth.nix
    M nixos/modules/services/monitoring/ups.nix
    M nixos/modules/services/monitoring/zabbix-agent.nix
    M nixos/modules/services/monitoring/zabbix-server.nix
    M nixos/modules/services/network-filesystems/drbd.nix
    M nixos/modules/services/network-filesystems/nfsd.nix
    M nixos/modules/services/network-filesystems/openafs-client/default.nix
    A nixos/modules/services/network-filesystems/rsyncd.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/networking/amuled.nix
    M nixos/modules/services/networking/avahi-daemon.nix
    M nixos/modules/services/networking/bind.nix
    M nixos/modules/services/networking/bitlbee.nix
    A nixos/modules/services/networking/btsync.nix
    M nixos/modules/services/networking/chrony.nix
    A nixos/modules/services/networking/cjdns.nix
    M nixos/modules/services/networking/cntlm.nix
    M nixos/modules/services/networking/connman.nix
    M nixos/modules/services/networking/dhcpcd.nix
    M nixos/modules/services/networking/dhcpd.nix
    M nixos/modules/services/networking/dnsmasq.nix
    M nixos/modules/services/networking/ejabberd.nix
    M nixos/modules/services/networking/firewall.nix
    M nixos/modules/services/networking/flashpolicyd.nix
    M nixos/modules/services/networking/freenet.nix
    M nixos/modules/services/networking/git-daemon.nix
    M nixos/modules/services/networking/gnunet.nix
    M nixos/modules/services/networking/gogoclient.nix
    M nixos/modules/services/networking/haproxy.nix
    M nixos/modules/services/networking/hostapd.nix
    M nixos/modules/services/networking/ifplugd.nix
    M nixos/modules/services/networking/iodined.nix
    M nixos/modules/services/networking/ircd-hybrid/default.nix
    M nixos/modules/services/networking/kippo.nix
    M nixos/modules/services/networking/minidlna.nix
    A nixos/modules/services/networking/murmur.nix
    M nixos/modules/services/networking/nat.nix
    M nixos/modules/services/networking/networkmanager.nix
    A nixos/modules/services/networking/ngircd.nix
    A nixos/modules/services/networking/notbit.nix
    M nixos/modules/services/networking/ntopng.nix
    M nixos/modules/services/networking/ntpd.nix
    M nixos/modules/services/networking/oidentd.nix
    M nixos/modules/services/networking/openfire.nix
    M nixos/modules/services/networking/openvpn.nix
    M nixos/modules/services/networking/prayer.nix
    M nixos/modules/services/networking/privoxy.nix
    M nixos/modules/services/networking/quassel.nix
    M nixos/modules/services/networking/radvd.nix
    M nixos/modules/services/networking/rdnssd.nix
    M nixos/modules/services/networking/rpcbind.nix
    M nixos/modules/services/networking/sabnzbd.nix
    A nixos/modules/services/networking/searx.nix
    A nixos/modules/services/networking/spiped.nix
    M nixos/modules/services/networking/ssh/lshd.nix
    M nixos/modules/services/networking/ssh/sshd.nix
    M nixos/modules/services/networking/supybot.nix
    A nixos/modules/services/networking/syncthing.nix
    M nixos/modules/services/networking/tcpcrypt.nix
    M nixos/modules/services/networking/tftpd.nix
    M nixos/modules/services/networking/unbound.nix
    M nixos/modules/services/networking/vsftpd.nix
    M nixos/modules/services/networking/wakeonlan.nix
    M nixos/modules/services/networking/websockify.nix
    M nixos/modules/services/networking/wicd.nix
    M nixos/modules/services/networking/wpa_supplicant.nix
    M nixos/modules/services/networking/xinetd.nix
    M nixos/modules/services/printing/cupsd.nix
    M nixos/modules/services/scheduling/atd.nix
    M nixos/modules/services/scheduling/cron.nix
    M nixos/modules/services/scheduling/fcron.nix
    M nixos/modules/services/search/elasticsearch.nix
    A nixos/modules/services/search/solr.nix
    M nixos/modules/services/security/clamav.nix
    M nixos/modules/services/security/fail2ban.nix
    M nixos/modules/services/security/fprot.nix
    M nixos/modules/services/security/haveged.nix
    M nixos/modules/services/security/tor.nix
    M nixos/modules/services/security/torify.nix
    M nixos/modules/services/security/torsocks.nix
    M nixos/modules/services/system/dbus.nix
    M nixos/modules/services/system/nscd.nix
    M nixos/modules/services/torrent/deluge.nix
    M nixos/modules/services/torrent/transmission.nix
    M nixos/modules/services/ttys/agetty.nix
    M nixos/modules/services/ttys/gpm.nix
    M nixos/modules/services/ttys/kmscon.nix
    M nixos/modules/services/web-servers/apache-httpd/default.nix
    M nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
    M nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
    M nixos/modules/services/web-servers/apache-httpd/trac.nix
    M nixos/modules/services/web-servers/apache-httpd/zabbix.nix
    M nixos/modules/services/web-servers/jboss/default.nix
    M nixos/modules/services/web-servers/lighttpd/cgit.nix
    M nixos/modules/services/web-servers/lighttpd/default.nix
    R nixos/modules/services/x11/mesa.nix

  Log Message:
  -----------
  Merge branch 'master' into dbus-switch-to-configuration

Conflicts:
        nixos/modules/system/activation/switch-to-configuration.pl


  Commit: ad80532881119b642d63c7d126e46f4e26cdb0be
      
https://github.com/NixOS/nixpkgs/commit/ad80532881119b642d63c7d126e46f4e26cdb0be
  Author: Oliver Charles <[email protected]>
  Date:   2014-04-21 (Mon, 21 Apr 2014)

  Changed paths:
    M nixos/modules/system/activation/switch-to-configuration.pl
    M nixos/modules/system/activation/top-level.nix

  Log Message:
  -----------
  Merge branch 'dbus-switch-to-configuration'


Compare: https://github.com/NixOS/nixpkgs/compare/1c5d3c78831b...ad8053288111
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to