Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 9af1e2ab516ceac1d4dc100dbf561418bc3d7c13
https://github.com/NixOS/nixpkgs/commit/9af1e2ab516ceac1d4dc100dbf561418bc3d7c13
Author: Alex Berg <[email protected]>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
A nixos/modules/services/networking/znc.nix
Log Message:
-----------
Add ZNC module. Has zncConfOptions or specify full conf file.
Commit: 7b768ba2f5fc90663f444348907958abb3146f93
https://github.com/NixOS/nixpkgs/commit/7b768ba2f5fc90663f444348907958abb3146f93
Author: Alex Berg <[email protected]>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M doc/Makefile
M lib/licenses.nix
M lib/maintainers.nix
M lib/modules.nix
M nixos/lib/test-driver/log2html.xsl
M nixos/lib/testing.nix
M nixos/modules/config/ldap.nix
M nixos/modules/config/networking.nix
M nixos/modules/config/pulseaudio.nix
M nixos/modules/config/swap.nix
M nixos/modules/config/sysctl.nix
M nixos/modules/config/unix-odbc-drivers.nix
M nixos/modules/hardware/network/intel-2100bg.nix
M nixos/modules/hardware/network/intel-2200bg.nix
M nixos/modules/hardware/network/intel-3945abg.nix
M nixos/modules/hardware/network/ralink.nix
M nixos/modules/hardware/network/rtl8192c.nix
M nixos/modules/hardware/network/smc-2632w/default.nix
M nixos/modules/hardware/opengl.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/tools/nixos-rebuild.sh
M nixos/modules/installer/tools/tools.nix
M nixos/modules/misc/ids.nix
M nixos/modules/misc/lib.nix
M nixos/modules/misc/passthru.nix
M nixos/modules/module-list.nix
M nixos/modules/programs/blcr.nix
M nixos/modules/programs/screen.nix
M nixos/modules/programs/shadow.nix
M nixos/modules/programs/virtualbox.nix
M nixos/modules/security/pam.nix
M nixos/modules/services/amqp/activemq/default.nix
M nixos/modules/services/backup/sitecopy-backup.nix
M nixos/modules/services/databases/openldap.nix
M nixos/modules/services/databases/postgresql.nix
M nixos/modules/services/desktops/gnome3/gnome-documents.nix
M nixos/modules/services/desktops/gnome3/gnome-keyring.nix
M nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
M nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
M nixos/modules/services/desktops/gnome3/gnome-user-share.nix
M nixos/modules/services/desktops/gnome3/gvfs.nix
M nixos/modules/services/desktops/gnome3/seahorse.nix
M nixos/modules/services/desktops/gnome3/tracker.nix
M nixos/modules/services/hardware/acpid.nix
M nixos/modules/services/hardware/amd-hybrid-graphics.nix
M nixos/modules/services/hardware/nvidia-optimus.nix
A nixos/modules/services/misc/gitolite.nix
M nixos/modules/services/monitoring/monit.nix
M nixos/modules/services/monitoring/uptime.nix
M nixos/modules/services/network-filesystems/openafs-client/default.nix
M nixos/modules/services/network-filesystems/rsyncd.nix
M nixos/modules/services/networking/connman.nix
M nixos/modules/services/networking/ddclient.nix
M nixos/modules/services/networking/dhcpd.nix
M nixos/modules/services/networking/gvpe.nix
M nixos/modules/services/networking/networkmanager.nix
M nixos/modules/services/networking/notbit.nix
M nixos/modules/services/networking/nsd.nix
A nixos/modules/services/networking/radicale.nix
M nixos/modules/services/networking/teamspeak3.nix
M nixos/modules/services/scheduling/cron.nix
M nixos/modules/services/scheduling/fcron.nix
M nixos/modules/services/security/frandom.nix
M nixos/modules/services/system/kerberos.nix
M nixos/modules/services/system/nscd.nix
M nixos/modules/services/system/uptimed.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/mercurial.nix
M nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
M nixos/modules/services/x11/window-managers/openbox.nix
M nixos/modules/services/x11/window-managers/xmonad.nix
M nixos/modules/tasks/encrypted-devices.nix
M nixos/modules/tasks/filesystems/f2fs.nix
M nixos/modules/tasks/filesystems/unionfs-fuse.nix
M nixos/modules/testing/minimal-kernel.nix
M nixos/modules/virtualisation/virtualbox-guest.nix
M nixos/tests/avahi.nix
M nixos/tests/bittorrent.nix
M nixos/tests/check-filesystems.nix
M nixos/tests/containers.nix
M nixos/tests/firefox.nix
M nixos/tests/firewall.nix
M nixos/tests/gnome3.nix
M nixos/tests/gnome3_12.nix
M nixos/tests/influxdb.nix
M nixos/tests/installer.nix
M nixos/tests/ipv6.nix
M nixos/tests/jenkins.nix
M nixos/tests/kde4.nix
M nixos/tests/kexec.nix
M nixos/tests/login.nix
M nixos/tests/logstash.nix
M nixos/tests/misc.nix
M nixos/tests/mpich.nix
M nixos/tests/mumble.nix
M nixos/tests/munin.nix
M nixos/tests/mysql-replication.nix
M nixos/tests/mysql.nix
M nixos/tests/nat.nix
M nixos/tests/nfs.nix
M nixos/tests/openssh.nix
M nixos/tests/partition.nix
M nixos/tests/phabricator.nix
M nixos/tests/printing.nix
M nixos/tests/proxy.nix
M nixos/tests/quake3.nix
M nixos/tests/rabbitmq.nix
M nixos/tests/simple.nix
M nixos/tests/subversion.nix
M nixos/tests/tomcat.nix
M nixos/tests/trac.nix
M nixos/tests/udisks2.nix
M nixos/tests/xfce.nix
A pkgs/applications/audio/transcode/default.nix
M pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
M pkgs/applications/editors/emacs-modes/writegood/default.nix
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/editors/vim/default.nix
M pkgs/applications/graphics/photivo/default.nix
A pkgs/applications/inferno/default.nix
A pkgs/applications/inferno/inferno
M pkgs/applications/misc/kdeconnect/default.nix
M pkgs/applications/misc/makeself/default.nix
M pkgs/applications/misc/nc-indicators/default.nix
M pkgs/applications/misc/ocropus/default.nix
M pkgs/applications/misc/xmobar/default.nix
M pkgs/applications/networking/browsers/dwb/default.nix
A pkgs/applications/networking/browsers/firefox-bin/default.nix
A pkgs/applications/networking/browsers/firefox-bin/generate_nix.rb
M pkgs/applications/networking/instant-messengers/baresip/default.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
R pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch
M pkgs/applications/networking/irc/bip/default.nix
M pkgs/applications/networking/mailreaders/mutt/default.nix
A pkgs/applications/networking/mailreaders/mutt/mailpath.patch
M pkgs/applications/networking/p2p/transmission/default.nix
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
M pkgs/applications/office/libreoffice/libreoffice-srcs.nix
A pkgs/applications/office/libreoffice/ooxmlexport.diff
M pkgs/applications/science/electronics/kicad/default.nix
M pkgs/applications/science/logic/abc/default.nix
A pkgs/applications/science/logic/twelf/default.nix
M pkgs/applications/science/math/glsurf/default.nix
M pkgs/applications/version-management/git-and-tools/default.nix
A
pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
M pkgs/applications/version-management/git-and-tools/git/default.nix
A pkgs/applications/version-management/gitolite/default.nix
A pkgs/applications/version-management/vcprompt/default.nix
M pkgs/applications/window-managers/tabbed/default.nix
M pkgs/build-support/build-pecl.nix
M pkgs/build-support/cabal/default.nix
M pkgs/build-support/fetchbzr/builder.sh
M pkgs/build-support/fetchbzr/default.nix
M pkgs/build-support/fetchdarcs/builder.sh
M pkgs/build-support/fetchdarcs/default.nix
M pkgs/build-support/fetchhg/builder.sh
M pkgs/build-support/fetchhg/default.nix
M pkgs/build-support/fetchurl/mirrors.nix
M pkgs/build-support/kernel/paths-from-graph.pl
M pkgs/build-support/upstream-updater/update-walker-service-specific.sh
M pkgs/build-support/upstream-updater/update-walker.sh
M pkgs/data/fonts/anonymous-pro/default.nix
A pkgs/data/fonts/anonymous-pro/default.upstream
A pkgs/data/fonts/ipafont/default.nix
A pkgs/data/fonts/kochi-substitute-naga10/default.nix
A pkgs/data/fonts/kochi-substitute/default.nix
M pkgs/desktops/gnome-2/desktop/vte/default.nix
A pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch
M pkgs/development/compilers/compcert/default.nix
A pkgs/development/compilers/go/1_0-gcc-bug.patch
A pkgs/development/compilers/go/1_0-opt-error.patch
M pkgs/development/compilers/go/default.nix
A pkgs/development/compilers/jdk/jdk-linux-base.nix
M pkgs/development/compilers/jdk/jdk7-linux.nix
A pkgs/development/compilers/jdk/jdk8-linux.nix
M pkgs/development/compilers/nasm/default.nix
M pkgs/development/compilers/rust/default.nix
M pkgs/development/compilers/rust/hardcode_paths.patch
A pkgs/development/compilers/sbcl/bootstrap.nix
M pkgs/development/compilers/sbcl/default.nix
M pkgs/development/compilers/scala/2.9.nix
A pkgs/development/compilers/smlnj/bootstrap.nix
M pkgs/development/interpreters/angelscript/default.nix
A pkgs/development/interpreters/angelscript/default.upstream
M pkgs/development/interpreters/lua-5/5.1.nix
A pkgs/development/interpreters/lua-5/expat.nix
A pkgs/development/interpreters/lua-5/filesystem.nix
M pkgs/development/interpreters/php/5.4.nix
M pkgs/development/interpreters/python/2.7/default.nix
M pkgs/development/libraries/afflib/default.nix
A pkgs/development/libraries/allegro/5-unstable.nix
A pkgs/development/libraries/allegro/5-unstable.upstream
M pkgs/development/libraries/allegro/5.nix
A pkgs/development/libraries/allegro/5.upstream
M pkgs/development/libraries/allegro/default.nix
M pkgs/development/libraries/box2d/default.nix
M pkgs/development/libraries/glib/default.nix
A pkgs/development/libraries/gloox/default.nix
M pkgs/development/libraries/gnu-efi/default.nix
M pkgs/development/libraries/gperftools/default.nix
A pkgs/development/libraries/haskell/AES/default.nix
A pkgs/development/libraries/haskell/SHA2/default.nix
A pkgs/development/libraries/haskell/Thrift/default.nix
A pkgs/development/libraries/haskell/Yampa/default.nix
R pkgs/development/libraries/haskell/aes/default.nix
M pkgs/development/libraries/haskell/bson/default.nix
A pkgs/development/libraries/haskell/command-qq/default.nix
A pkgs/development/libraries/haskell/deepseq-generics/default.nix
M pkgs/development/libraries/haskell/extensible-effects/default.nix
A pkgs/development/libraries/haskell/folds/default.nix
M pkgs/development/libraries/haskell/ghc-mod/default.nix
M pkgs/development/libraries/haskell/hcltest/default.nix
A pkgs/development/libraries/haskell/hdaemonize/default.nix
M pkgs/development/libraries/haskell/http-kit/default.nix
A pkgs/development/libraries/haskell/ixset/default.nix
A pkgs/development/libraries/haskell/monadloc-pp/default.nix
M pkgs/development/libraries/haskell/mongoDB/default.nix
M pkgs/development/libraries/haskell/pipes-aeson/default.nix
M pkgs/development/libraries/haskell/pipes-binary/default.nix
M pkgs/development/libraries/haskell/pipes-bytestring/default.nix
A pkgs/development/libraries/haskell/pipes-csv/default.nix
A pkgs/development/libraries/haskell/pipes-http/default.nix
M pkgs/development/libraries/haskell/pipes-text/default.nix
M pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
A pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
A pkgs/development/libraries/haskell/shellmate/default.nix
M pkgs/development/libraries/haskell/simple-sendfile/default.nix
A pkgs/development/libraries/haskell/snap-web-routes/default.nix
M pkgs/development/libraries/haskell/snap/server.nix
A pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
A pkgs/development/libraries/haskell/tables/default.nix
M pkgs/development/libraries/haskell/unix-compat/default.nix
A pkgs/development/libraries/haskell/webdriver/default.nix
A pkgs/development/libraries/libatomic_ops/default.nix
A pkgs/development/libraries/libatomic_ops/default.upstream
A pkgs/development/libraries/libe-book/0.0.nix
A pkgs/development/libraries/libe-book/0.0.upstream
A pkgs/development/libraries/libe-book/default.nix
A pkgs/development/libraries/libe-book/default.upstream
A pkgs/development/libraries/libmwaw/0.2.nix
A pkgs/development/libraries/libmwaw/0.2.upstream
A pkgs/development/libraries/libmwaw/default.nix
A pkgs/development/libraries/libmwaw/default.upstream
A pkgs/development/libraries/libodfgen/default.nix
A pkgs/development/libraries/libodfgen/default.upstream
M pkgs/development/libraries/libre/default.nix
M pkgs/development/libraries/librem/default.nix
A pkgs/development/libraries/librevenge/default.nix
A pkgs/development/libraries/librevenge/default.upstream
M pkgs/development/libraries/lightning/default.nix
M pkgs/development/libraries/mdds/default.nix
A pkgs/development/libraries/mdds/default.upstream
A pkgs/development/libraries/nix-plugins/default.nix
A pkgs/development/libraries/nvidia-texture-tools/default.nix
R pkgs/development/libraries/php-apc/default.nix
R pkgs/development/libraries/php-xcache/default.nix
A pkgs/development/libraries/sqlcipher/default.nix
M pkgs/development/lisp-modules/lisp-packages.nix
A pkgs/development/ocaml-modules/easy-format/default.nix
M pkgs/development/tools/misc/arcanist/default.nix
A pkgs/development/tools/ocaml/cppo/default.nix
M pkgs/development/tools/packer/deps.nix
M pkgs/development/tools/selenium/chromedriver/default.nix
M pkgs/development/web/nodejs/default.nix
A pkgs/games/0ad/data.nix
A pkgs/games/0ad/default.nix
M pkgs/games/atanks/default.nix
A pkgs/games/atanks/default.upstream
M pkgs/games/blobby/default.nix
A pkgs/games/blobby/default.upstream
M pkgs/games/dwarf-therapist/default.nix
A pkgs/games/openspades/default.nix
M pkgs/games/opentyrian/default.nix
M pkgs/misc/my-env/loadenv.sh
M pkgs/os-specific/linux/atop/default.nix
A pkgs/os-specific/linux/iomelt/default.nix
M pkgs/os-specific/linux/kernel/common-config.nix
M pkgs/os-specific/linux/kernel/generic.nix
M pkgs/os-specific/linux/kernel/linux-3.10.nix
M pkgs/os-specific/linux/kernel/linux-3.12.nix
R pkgs/os-specific/linux/kernel/linux-3.13.nix
M pkgs/os-specific/linux/kernel/linux-3.14.nix
M pkgs/os-specific/linux/kernel/linux-3.15.nix
M pkgs/os-specific/linux/kernel/linux-3.4.nix
M pkgs/os-specific/linux/kernel/linux-testing.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/os-specific/linux/keyutils/default.nix
M pkgs/os-specific/linux/syslinux/default.nix
M pkgs/os-specific/linux/zfs/default.nix
M pkgs/os-specific/linux/zfs/git.nix
A pkgs/servers/http/nix-binary-cache/default.nix
A pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
A pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
M pkgs/servers/nsq/deps.nix
M pkgs/servers/restund/default.nix
M pkgs/servers/samba/default.nix
M pkgs/servers/serfdom/deps.nix
M pkgs/shells/fish/default.nix
A pkgs/tools/filesystems/ceph/default.nix
Log Message:
-----------
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module
Conflicts:
nixos/modules/misc/ids.nix
Commit: 789c9508c26416e425d1d07b81b9bd8ce66bbf05
https://github.com/NixOS/nixpkgs/commit/789c9508c26416e425d1d07b81b9bd8ce66bbf05
Author: lethalman <[email protected]>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
A nixos/modules/services/networking/znc.nix
Log Message:
-----------
Merge pull request #2582 from chexxor/feature/add-znc-module
Add ZNC module
Compare: https://github.com/NixOS/nixpkgs/compare/1c1747be0d2c...789c9508c264_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
