[Nix-dev] [Nix-commits] [NixOS/nixos] f09da4: wip: trackpoint.nix

[Florian Friesdorf]

Accidentally pushed a branch, deleted it again and set up a remote
tracking branch to prevent it in the future.

Florian Friesdorf <flo at chaoflow.net> writes:
>   Branch: refs/heads/rebase/personal
>   Home:   https://github.com/NixOS/nixos
>   Commit: f09da4030ae0595672cbe9215d767f403a1af285
>       https://github.com/NixOS/nixos/commit/f09da4030ae0595672cbe9215d767f403a1af285
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-04 (Tue, 04 Jun 2013)
>
>   Changed paths:
>     M modules/module-list.nix
>     A modules/tasks/trackpoint.nix
>
>   Log Message:
>   -----------
>   wip: trackpoint.nix
>
>
>   Commit: 325106af878446c78330cf144247295c58729fd9
>       https://github.com/NixOS/nixos/commit/325106af878446c78330cf144247295c58729fd9
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-04 (Tue, 04 Jun 2013)
>
>   Changed paths:
>     M modules/services/mail/postfix.nix
>
>   Log Message:
>   -----------
>   wip: postfix suid
>
>
>   Commit: 62eb9b10b3ee0c661cc72660e1598fcb44f0c330
>       https://github.com/NixOS/nixos/commit/62eb9b10b3ee0c661cc72660e1598fcb44f0c330
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-12 (Wed, 12 Jun 2013)
>
>   Changed paths:
>     M maintainers/scripts/ec2/create-ebs-amis.py
>     M maintainers/scripts/ec2/create-s3-amis.sh
>     M modules/installer/tools/nixos-rebuild.sh
>     M modules/services/networking/openvpn.nix
>     M modules/services/security/tor.nix
>     M modules/services/torrent/transmission.nix
>     M modules/system/boot/loader/grub/grub.nix
>
>   Log Message:
>   -----------
>   Merge branch 'channel-nixos' into rebase/personal
>
>
>   Commit: 388a9312a03f6abfa573742db77a076cd82444ea
>       https://github.com/NixOS/nixos/commit/388a9312a03f6abfa573742db77a076cd82444ea
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-18 (Tue, 18 Jun 2013)
>
>   Changed paths:
>     M lib/test-driver/log2html.xsl
>     M lib/testing.nix
>     M modules/installer/cd-dvd/system-tarball.nix
>     M modules/services/misc/nix-daemon.nix
>     M modules/services/monitoring/zabbix-server.nix
>     M modules/services/system/nscd.nix
>     M modules/services/ttys/agetty.nix
>     M modules/services/web-servers/apache-httpd/zabbix.nix
>     M tests/installer.nix
>
>   Log Message:
>   -----------
>   Merge branch 'channel-nixos' into rebase/personal
>
>
>   Commit: c4e8629414b5245e0cbee03d916a71b34b1b9b44
>       https://github.com/NixOS/nixos/commit/c4e8629414b5245e0cbee03d916a71b34b1b9b44
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-20 (Thu, 20 Jun 2013)
>
>   Changed paths:
>     M doc/manual/options-to-docbook.xsl
>     M modules/programs/bash/profile.sh
>     M modules/services/x11/display-managers/lightdm.nix
>     M modules/services/x11/xserver.nix
>
>   Log Message:
>   -----------
>   Merge branch 'channel-nixos' into rebase/personal
>
>
>   Commit: 1915e8d39df42cc58c74bdf37990c5e941a92c1e
>       https://github.com/NixOS/nixos/commit/1915e8d39df42cc58c74bdf37990c5e941a92c1e
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-06-27 (Thu, 27 Jun 2013)
>
>   Changed paths:
>     M modules/module-list.nix
>     A modules/services/misc/cgminer.nix
>     M modules/services/misc/synergy.nix
>     M modules/services/web-servers/lighttpd/cgit.nix
>     M modules/services/web-servers/lighttpd/default.nix
>     M modules/services/web-servers/lighttpd/gitweb.nix
>     M modules/system/boot/systemd.nix
>     M modules/tasks/filesystems.nix
>     M tests/xfce.nix
>
>   Log Message:
>   -----------
>   Merge branch 'channel-nixos' into rebase/personal
>
>
>   Commit: bb0b894f1c0bd7001ec0b39ef4578ecee86f5d0f
>       https://github.com/NixOS/nixos/commit/bb0b894f1c0bd7001ec0b39ef4578ecee86f5d0f
>   Author: Florian Friesdorf <flo at chaoflow.net>
>   Date:   2013-07-03 (Wed, 03 Jul 2013)
>
>   Changed paths:
>     R modules/config/fonts.nix
>     A modules/config/fonts/corefonts.nix
>     A modules/config/fonts/fontconfig.nix
>     A modules/config/fonts/fontdir.nix
>     A modules/config/fonts/fonts.nix
>     A modules/config/fonts/ghostscript.nix
>     M modules/config/timezone.nix
>     A modules/installer/cd-dvd/channel.nix
>     M modules/installer/cd-dvd/installation-cd-base.nix
>     M modules/module-list.nix
>     A modules/profiles/demo.nix
>     M modules/programs/ssmtp.nix
>     A modules/services/databases/memcached.nix
>     A modules/services/databases/redis.nix
>     M modules/services/misc/disnix.nix
>     M modules/services/monitoring/dd-agent.nix
>     M modules/virtualisation/qemu-vm.nix
>     A modules/virtualisation/virtualbox-config.nix
>     M modules/virtualisation/virtualbox-image.nix
>     M release.nix
>     M tests/default.nix
>     A tests/partition.nix
>     M tests/trac.nix
>
>   Log Message:
>   -----------
>   Merge branch 'channel-nixos' into rebase/personal
>
>
> Compare: https://github.com/NixOS/nixos/compare/f09da4030ae0^...bb0b894f1c0b
> _______________________________________________
> nix-commits mailing list
> nix-commits at lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-commits

-- 
Florian Friesdorf <flo at chaoflow.net>
  GPG FPR: 7A13 5EEE 1421 9FC2 108D  BAAF 38F8 99A3 0C45 F083
Jabber/XMPP: flo at chaoflow.net
IRC: chaoflow on freenode,ircnet,blafasel,OFTC
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : http://lists.science.uu.nl/pipermail/nix-dev/attachments/20130703/0bb8dcc7/attachment.bin