Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4bdf8ca43e6f33a912e204ad21731381f753da5c
      
https://github.com/NixOS/nixpkgs/commit/4bdf8ca43e6f33a912e204ad21731381f753da5c
  Author: Michael Fellinger <[email protected]>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    A pkgs/applications/misc/keybase-node-client/default.nix
    A pkgs/applications/misc/keybase-node-client/package.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  keybase-node-client: 0.7.0


  Commit: b5e7e9423834689cfdaf55a0ffb3c78238cca870
      
https://github.com/NixOS/nixpkgs/commit/b5e7e9423834689cfdaf55a0ffb3c78238cca870
  Author: Michael Fellinger <[email protected]>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M pkgs/applications/misc/keybase-node-client/default.nix

  Log Message:
  -----------
  keybase-node-client: add missing gnupg runtime dependency


  Commit: 2c321bf2963074c9c60355235b4ce95592ecf855
      
https://github.com/NixOS/nixpkgs/commit/2c321bf2963074c9c60355235b4ce95592ecf855
  Author: Franz Pletz <[email protected]>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/virtualisation/lxc.nix
    M pkgs/os-specific/linux/lxc/default.nix

  Log Message:
  -----------
  Add support for global LXC config files


  Commit: 613ca23e85af2d32f190f212db3020b496ee4c8f
      
https://github.com/NixOS/nixpkgs/commit/613ca23e85af2d32f190f212db3020b496ee4c8f
  Author: Marc Weber <[email protected]>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix
    A pkgs/misc/vim-plugins/vimrc.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  experimental/vim-vam-pathogen-vimrc-support

This patch implements derving a .vimrc from vim-plugins.nix loading those
plugins by either Pathogen or VAM (VAM seems to be slightly faster and is much
more powerful).

Example:

  environment.systemPackages = [
   # default plain vim
   vim_configurable

   # vim which get's called vim-with-addon-nix
   (vim_configurable.customize {
      name = "vim-with-addon-nix";
     vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
   })
  ];

This way you can provide an "enhanced Vim" and a standard Vim.

Details about what this commit changes:
1) provide a new toplevel name vimrc which
  * provides a way to build up a .vimrc using either pathogen or VAM (knowing 
about plugin dependencies by name)
  * can enhance vim to support. vim.customize { name = "name-user"; 
vam.pluginDictionaries and/or pathogen.pluginNames = .. }
  * introduce rtp names for each vim plugin pointing to the runtimepath path
  * suggest naming to be the same as vim-pi so that VAM's dependencies work
  * derive some packages as example from vim-pi using VAM's new autoload/nix.vim
    supporting simple dependencies
  * test case for vim-addon-nix for VAM/pathogen

2) enhance vim_configurable to support .customize

3) update many plugins by using VAM's implementation not rewriting those which
  * vim-pi doesn't know about the git source yet (TODO: make vim-pi be aware of
    those)
  * have special build code

This commit partially conflicts with commits done by Bjørn Forsman starting by
37f961628b, eg the one using lower case attr and pkg names, because they don't
match vim-pi (eg YouCompleteMe). Rather than resolving the conflict this just
adds aliases so that both names can be used


  Commit: 0eede5a01f9243e0932d828122b713eb66f8d920
      
https://github.com/NixOS/nixpkgs/commit/0eede5a01f9243e0932d828122b713eb66f8d920
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages: add pyalgotrade


  Commit: 77aed3433d1cbdbb9c5b8bddb1366a443864da06
      
https://github.com/NixOS/nixpkgs/commit/77aed3433d1cbdbb9c5b8bddb1366a443864da06
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages: add scikit-learn


  Commit: c202893b8d04ed1d9504340e345e6d793cce1a11
      
https://github.com/NixOS/nixpkgs/commit/c202893b8d04ed1d9504340e345e6d793cce1a11
  Author: William A. Kennington III <[email protected]>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M pkgs/os-specific/linux/zfs/default.nix
    A pkgs/os-specific/linux/zfs/remove-lock-checks.patch

  Log Message:
  -----------
  zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds

Additionally, recognize that the contents of the nix-build.patch are
included in the upstream tree as 3cd33ff and will be released in 0.6.4.


  Commit: 216ed76821fdb92443498920da6e8d88af451f9d
      
https://github.com/NixOS/nixpkgs/commit/216ed76821fdb92443498920da6e8d88af451f9d
  Author: Joachim Fasting <[email protected]>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M lib/maintainers.nix
    A pkgs/tools/networking/dnscrypt-proxy/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  dnscrypt-proxy: new expression


  Commit: 52f0553209ad8f102eefd0d46ad336ff95f398be
      
https://github.com/NixOS/nixpkgs/commit/52f0553209ad8f102eefd0d46ad336ff95f398be
  Author: Joachim Fasting <[email protected]>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    A nixos/modules/services/networking/dnscrypt-proxy.nix

  Log Message:
  -----------
  Add dnscrypt-proxy service

The dnscrypt-proxy service relays regular DNS queries to
a DNSCrypt enabled upstream resolver.
The traffic between the client and the upstream resolver is
encrypted and authenticated, which may mitigate the risk of
MITM attacks and third-party snooping (assuming a trustworthy
upstream).

Though dnscrypt-proxy can run as a standalone DNS client,
the recommended setup is to use it as a forwarder for a
caching DNS client.
To use dnscrypt-proxy as a forwarder for dnsmasq, do

```nix
{
  # ...

  networking.nameservers = [ "127.0.0.1" ];
  networking.dhcpcd.extraConfig = "nohook resolv.conf";

  services.dnscrypt-proxy.enable = true;
  services.dnscrypt-proxy.localAddress = "127.0.0.1";
  services.dnscrypt-proxy.port = 40;

  services.dnsmasq.enable = true;
  services.dnsmasq.extraConfig = ''
    no-resolv
    server=127.0.0.1#40
    listen-address=127.0.0.1
  '';

  # ...
}
```


  Commit: 3c8fe179f6fd0ddaa7f9967e41e093c2b451fdeb
      
https://github.com/NixOS/nixpkgs/commit/3c8fe179f6fd0ddaa7f9967e41e093c2b451fdeb
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/os-specific/linux/prl-tools/autostart.desktop
    A pkgs/os-specific/linux/prl-tools/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  prl-tools: add package


  Commit: 32e18bc7225662312f8f29b35ba147d22616e11f
      
https://github.com/NixOS/nixpkgs/commit/32e18bc7225662312f8f29b35ba147d22616e11f
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/virtualisation/parallels-guest.nix

  Log Message:
  -----------
  nixos/parallels-guest: add options


  Commit: bfbb46ea92d16e65b32ee1f5c20dcdc8481d1b3f
      
https://github.com/NixOS/nixpkgs/commit/bfbb46ea92d16e65b32ee1f5c20dcdc8481d1b3f
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/science/math/ipopt/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  ipopt: add package


  Commit: 67f4e5be9a821787f04cf1a9b5f7378cc63caa3b
      
https://github.com/NixOS/nixpkgs/commit/67f4e5be9a821787f04cf1a9b5f7378cc63caa3b
  Author: Austin Seipp <[email protected]>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/science/math/ipopt/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4953 from abbradar/ipopt

ipopt: add package


  Commit: 5aede825b9e28f71876b1098e6d79f5a41d71d1f
      
https://github.com/NixOS/nixpkgs/commit/5aede825b9e28f71876b1098e6d79f5a41d71d1f
  Author: Mateusz Kowalczyk <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/games/tibia/default.nix

  Log Message:
  -----------
  tibia: update to 10.62


  Commit: 490232bd2e288fb2b129ac49df5904631a2d2541
      
https://github.com/NixOS/nixpkgs/commit/490232bd2e288fb2b129ac49df5904631a2d2541
  Author: Longrin Wischnewski <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/services/web-servers/apache-httpd/default.nix

  Log Message:
  -----------
  apache-httpd: add mod_access_compat for compatibility with old httpd-22 
configurations


  Commit: ea679bca7c56315acd829a961aaa013d87a2f999
      
https://github.com/NixOS/nixpkgs/commit/ea679bca7c56315acd829a961aaa013d87a2f999
  Author: Eelco Dolstra <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/top-level/perl-packages.nix

  Log Message:
  -----------
  Catalyst::Runtime: Require Term::Size::Any

Otherwise you get stupid warnings all the time.


  Commit: 9ce6651c8b03ffa8588f6ffd6859a557f4b97079
      
https://github.com/NixOS/nixpkgs/commit/9ce6651c8b03ffa8588f6ffd6859a557f4b97079
  Author: Jean-Philippe Bernardy <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/haskell/labeled-tree/default.nix
    M pkgs/top-level/haskell-packages.nix

  Log Message:
  -----------
  add labeled-tree


  Commit: 542f3d47bda47db8ddb7eb77eadff581cc7ff842
      
https://github.com/NixOS/nixpkgs/commit/542f3d47bda47db8ddb7eb77eadff581cc7ff842
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/haskell/labeled-tree/default.nix
    M pkgs/top-level/haskell-packages.nix

  Log Message:
  -----------
  Merge pull request #4960 from jyp/hask-pkgs

add labeled-tree


  Commit: 36c77cc55b99eb9942126f5270d6ce82cb5a7153
      
https://github.com/NixOS/nixpkgs/commit/36c77cc55b99eb9942126f5270d6ce82cb5a7153
  Author: Eelco Dolstra <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/services/web-servers/apache-httpd/default.nix

  Log Message:
  -----------
  Merge pull request #4959 from robberer/modules/httpd24

apache-httpd: add mod_access_compat


  Commit: 7ae2cca1dc14a01f0bbeaabad3a105f3b7656460
      
https://github.com/NixOS/nixpkgs/commit/7ae2cca1dc14a01f0bbeaabad3a105f3b7656460
  Author: Mateusz Kowalczyk <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/PastePipe/default.nix

  Log Message:
  -----------
  haskell-PastePipe: update to 1.7


  Commit: ce8f37430f2ccb3687a97eb9718c5bf971207467
      
https://github.com/NixOS/nixpkgs/commit/ce8f37430f2ccb3687a97eb9718c5bf971207467
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/clwrapper/setup-hook.sh

  Log Message:
  -----------
  Fix envHooks setting: don't kill previous hooks


  Commit: 084426a8eded77127134b1cc359a89f9bfd69e4c
      
https://github.com/NixOS/nixpkgs/commit/084426a8eded77127134b1cc359a89f9bfd69e4c
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M 
pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh

  Log Message:
  -----------
  Support more quicklisp upstream source types


  Commit: a54e032b2cad3896c45c39f432442acd9cd58065
      
https://github.com/NixOS/nixpkgs/commit/a54e032b2cad3896c45c39f432442acd9cd58065
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/lisp-packages.nix

  Log Message:
  -----------
  Add some lisp packages, including clx-truetype


  Commit: 433a845081e5067995dc64ceea5bb5b33c16108b
      
https://github.com/NixOS/nixpkgs/commit/433a845081e5067995dc64ceea5bb5b33c16108b
  Author: Eelco Dolstra <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix

  Log Message:
  -----------
  Disable zfs in the ISO for now

It's giving zpool-import.service errors.

http://hydra.nixos.org/build/16883184


  Commit: 111e1dbae3da6b94c9c10ace9583486153274d2a
      
https://github.com/NixOS/nixpkgs/commit/111e1dbae3da6b94c9c10ace9583486153274d2a
  Author: Bjørn Forsman <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/development/tools/pydb/default.nix

  Log Message:
  -----------
  pydb: set meta.platforms

To have prebuilt binaries and useful hint from "command-not-found".


  Commit: f6b8460aa483f33b376d332e2a0762687b44c4fb
      
https://github.com/NixOS/nixpkgs/commit/f6b8460aa483f33b376d332e2a0762687b44c4fb
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/tools/misc/youtube-dl/default.nix

  Log Message:
  -----------
  youtube-dl: update from 2014.11.04 to 2014.11.12


  Commit: c04dac7807cc07f618e8afb68ae81be6fd2026cd
      
https://github.com/NixOS/nixpkgs/commit/c04dac7807cc07f618e8afb68ae81be6fd2026cd
  Author: Vladimir Kirillov <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nix-exec: make git less heavyweight


  Commit: 1b9f756e4e258e14fb1d4be9b492423f28a1bab0
      
https://github.com/NixOS/nixpkgs/commit/1b9f756e4e258e14fb1d4be9b492423f28a1bab0
  Author: Vladimir Kirillov <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/applications/version-management/git-and-tools/git/default.nix

  Log Message:
  -----------
  git: do not do install-doc when !withManual


  Commit: 348597b9397c01b9330336aaa5343eef12488fa0
      
https://github.com/NixOS/nixpkgs/commit/348597b9397c01b9330336aaa5343eef12488fa0
  Author: Longrin Wischnewski <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/games/xsnow/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  pkgs: add xsnow


  Commit: 8c0db0fff3464cb005c7ee4785b9770927cbfe29
      
https://github.com/NixOS/nixpkgs/commit/8c0db0fff3464cb005c7ee4785b9770927cbfe29
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/games/xsnow/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4962 from robberer/pkgs/xsnow

pkgs: add xsnow


  Commit: c75502acd20ece0e41423a3ea6f750517a6d390b
      
https://github.com/NixOS/nixpkgs/commit/c75502acd20ece0e41423a3ea6f750517a6d390b
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix
    A pkgs/misc/vim-plugins/vimrc.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4897 from 
MarcWeber/submit/vim-plugins-with-vam-or-pathogen

experimental/vim-vam-pathogen-vimrc-support


  Commit: 471b532a90764707426ba3b8949ff0bdea2869fe
      
https://github.com/NixOS/nixpkgs/commit/471b532a90764707426ba3b8949ff0bdea2869fe
  Author: Cillian de Róiste <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/os-specific/linux/xf86-input-wacom/default.nix

  Log Message:
  -----------
  xf86_input_wacom: update from 0.26.99.1 to 0.27.0


  Commit: f9fddf1e78e48f1810a1ac60431adc17ffc62700
      
https://github.com/NixOS/nixpkgs/commit/f9fddf1e78e48f1810a1ac60431adc17ffc62700
  Author: Cillian de Róiste <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/applications/audio/yoshimi/default.nix

  Log Message:
  -----------
  yoshimi: update from 1.2.4 to 1.2.5


  Commit: ad2160f9b4fcc7f7bd1ffb9929c80d6bdd985ecd
      
https://github.com/NixOS/nixpkgs/commit/ad2160f9b4fcc7f7bd1ffb9929c80d6bdd985ecd
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix

  Log Message:
  -----------
  vim-plugins: fix missing deps


  Commit: 1e8e9b9398a9b03344a5160f32dce3707225d07e
      
https://github.com/NixOS/nixpkgs/commit/1e8e9b9398a9b03344a5160f32dce3707225d07e
  Author: Boris Sukholitko <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/tools/security/volatility/default.nix

  Log Message:
  -----------
  volatility: upgrade to 2.4


  Commit: 38ab111dd77290a95708ab771e2952f8d8e6f8df
      
https://github.com/NixOS/nixpkgs/commit/38ab111dd77290a95708ab771e2952f8d8e6f8df
  Author: John Wiegley <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/development/coq-modules/unimath/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  coqPackages.unimath: new expression


  Commit: 2c038410ea92e00b74c784f059d1de573e822750
      
https://github.com/NixOS/nixpkgs/commit/2c038410ea92e00b74c784f059d1de573e822750
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/os-specific/linux/zfs/default.nix
    A pkgs/os-specific/linux/zfs/remove-lock-checks.patch

  Log Message:
  -----------
  Merge pull request #4932 from wkennington/master.zfs

zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds


  Commit: efe5eb4709d75fd2e2ab2508bf107e38adbaf457
      
https://github.com/NixOS/nixpkgs/commit/efe5eb4709d75fd2e2ab2508bf107e38adbaf457
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/virtualisation/lxc.nix
    M pkgs/os-specific/linux/lxc/default.nix

  Log Message:
  -----------
  Merge pull request #4573 from fpletz/feature/lxc-configuration

Add support for global LXC config files


  Commit: f5c3ad443bf7068b09b4fec05e0c17e050f3fc16
      
https://github.com/NixOS/nixpkgs/commit/f5c3ad443bf7068b09b4fec05e0c17e050f3fc16
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #4578 from offlinehacker/pkgs/pythonPackages/scikit_algo

pythonPackages: scikit-learn and pyalgotrade


  Commit: 2399edd6335ea035873d91f2202d8773e794e03e
      
https://github.com/NixOS/nixpkgs/commit/2399edd6335ea035873d91f2202d8773e794e03e
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix

  Log Message:
  -----------
  fix travis eval and remove duplicate


  Commit: 232f6bb4d24ae4e3986ca2113edb3b9d027edc4b
      
https://github.com/NixOS/nixpkgs/commit/232f6bb4d24ae4e3986ca2113edb3b9d027edc4b
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/virtualisation/parallels-guest.nix
    A pkgs/os-specific/linux/prl-tools/autostart.desktop
    A pkgs/os-specific/linux/prl-tools/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4929 from abbradar/prl-tools

Add packages and support for Parallel Guest Tools


  Commit: 0d6306be4dadc4d423ac9eeae7d9952f9833b393
      
https://github.com/NixOS/nixpkgs/commit/0d6306be4dadc4d423ac9eeae7d9952f9833b393
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    A nixos/modules/services/networking/dnscrypt-proxy.nix
    A pkgs/tools/networking/dnscrypt-proxy/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4950 from joachifm/dnscrypt-proxy

dnscrypt-proxy service


  Commit: ace49e400c484ac3fbcdf24835f8a7cfa338f508
      
https://github.com/NixOS/nixpkgs/commit/ace49e400c484ac3fbcdf24835f8a7cfa338f508
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix

  Log Message:
  -----------
  flashplayer: Update from 11.2.202.411 -> 11.2.202.418


  Commit: 3b0fa60a9865ca4887266fcfb7e467d8b8966d38
      
https://github.com/NixOS/nixpkgs/commit/3b0fa60a9865ca4887266fcfb7e467d8b8966d38
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/tasks/filesystems/zfs.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix

  Log Message:
  -----------
  zfs: Enable systemd

Also remove custom zfs services from NixOS.  This makes NixOS more aligned with
upstream.

More importantly, it prepares the way for NixOS to use ZED (the ZFS event
daemon). This service will automatically be enabled but it is not possible to
configure it via configuration.nix yet.


  Commit: 1fea5866aea0aeed2c22dcee20e3fd3f088de3a5
      
https://github.com/NixOS/nixpkgs/commit/1fea5866aea0aeed2c22dcee20e3fd3f088de3a5
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M lib/lists.nix

  Log Message:
  -----------
  Add `unique` list function

It removes duplicate elements from a list.


  Commit: 12e77fdc3f6f223be1a4d5c88d6c79bff63ae70c
      
https://github.com/NixOS/nixpkgs/commit/12e77fdc3f6f223be1a4d5c88d6c79bff63ae70c
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/tasks/filesystems/zfs.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix

  Log Message:
  -----------
  nixos/zfs: Improve the ZFS boot process

It turns out that the upstream systemd services that import ZFS pools contain
serious bugs. The first major problem is that importing pools fails if there
are no pools to import. The second major problem is that if a pool ends up in
/etc/zfs/zpool.cache but it disappears from the system (e.g. if you
reboot but during the reboot you unplug your ZFS-formatted USB pen drive),
then the import service will always fail and it will be impossible to get rid
of the pool from the cache (unless you manually delete the cache).

Also, the upstream service would always import all available ZFS pools every
boot, which may not be what is desired in some cases.

This commit will solve these problems in the following ways:

1. Ignore /etc/zfs/zpool.cache. This seems to be a major source of
issues, and also does not play well with NixOS's philosophy of
reproducible configurations. Instead, on every boot NixOS will try to import
the set of pools that are specified in its configuration.  This is also the
direction that upstream is moving towards.

2. Instead of trying to import all ZFS pools, only import those that are
actually necessary. NixOS will automatically determine these from the
config.fileSystems.* option. Also, the user can import any additional
pools every boot by adding them to the config.boot.zfs.extraPools
option, but this is only necessary if their filesystems are not
specified in config.fileSystems.*.

3. Added options to configure if ZFS should force-import ZFS pools. This may
currently be necessary, especially if your pools have not been correctly
imported with a proper host id configuration (which is probably true for 99% of
current NixOS ZFS users). Once host id configuration becomes mandatory when
using ZFS in NixOS and we are sure that most users have updated their
configurations and rebooted at least once, we should disable force-import by
default. Probably, this shouldn't be done before the next stable release.

WARNING: This commit may change the order in which your non-ZFS vs ZFS
filesystems are mounted.  To avoid this problem (now or in the future)
it is recommended that you set the 'mountpoint' property of your ZFS
filesystems to 'legacy', and that you manage them using
config.fileSystems, just like any other non-ZFS filesystem is usually
managed in NixOS.


  Commit: e9affb4274a4d72d6aa1fde9d34862dfd93173cc
      
https://github.com/NixOS/nixpkgs/commit/e9affb4274a4d72d6aa1fde9d34862dfd93173cc
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-1.nix
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/modules/tasks/network-interfaces.nix
    M pkgs/stdenv/generic/default.nix

  Log Message:
  -----------
  nixos: Add system-wide option to set the hostid

The old boot.spl.hostid option was not working correctly due to an
upstream bug.

Instead, now we will create the /etc/hostid file so that all applications
(including the ZFS kernel modules, ZFS user-space applications and other
unrelated programs) pick-up the same system-wide host id. Note that glibc
(and by extension, the `hostid` program) also respect the host id configured in
/etc/hostid, if it exists.

The hostid option is now mandatory when using ZFS because otherwise, ZFS will
require you to force-import your ZFS pools if you want to use them, which is
undesirable because it disables some of the checks that ZFS does to make sure it
is safe to import a ZFS pool.

The /etc/hostid file must also exist when booting the initrd, before the SPL
kernel module is loaded, so that ZFS picks up the hostid correctly.

The complexity in creating the /etc/hostid file is due to having to
write the host ID as a 32-bit binary value, taking into account the
endianness of the machine, while using only shell commands and/or simple
utilities (to avoid exploding the size of the initrd).


  Commit: 7a7bf8368e25d13b1f2e915514c804728b7648ef
      
https://github.com/NixOS/nixpkgs/commit/7a7bf8368e25d13b1f2e915514c804728b7648ef
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/installer/tools/nixos-generate-config.pl

  Log Message:
  -----------
  nixos-generate-config: Configure networking.hostId by default

The host id value gets generated by reading a 32-bit value from
/dev/urandom.

This makes programs that rely on a correct host id more reliable.

It also makes using ZFS more seamless, as you don't need to configure
the hostId manually; instead, it becomes part of your config from the
moment you install NixOS.


  Commit: 6de23f5416ba59063e218022c80649a1bd90d77b
      
https://github.com/NixOS/nixpkgs/commit/6de23f5416ba59063e218022c80649a1bd90d77b
  Author: cillianderoiste <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/tools/security/volatility/default.nix

  Log Message:
  -----------
  Merge pull request #4967 from bosu/vol2.4

volatility: upgrade to 2.4


  Commit: 3ad886f824931affe5995045174a5182d8df9bd2
      
https://github.com/NixOS/nixpkgs/commit/3ad886f824931affe5995045174a5182d8df9bd2
  Author: Bjørn Forsman <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/development/tools/winpdb/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  winpdb: new package

Platform independent Python debugger.

http://winpdb.org/

Tested by debugging a Python script on Linux.


  Commit: e884dc32c5ef35d48e08552ca3668f3b9d0d4fc5
      
https://github.com/NixOS/nixpkgs/commit/e884dc32c5ef35d48e08552ca3668f3b9d0d4fc5
  Author: Moritz Ulrich <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/services/networking/minidlna.nix

  Log Message:
  -----------
  Add local-fs.target to minidlna.

Minidlna fails to start if it wants to access a filesystem which isn't
mounted (yet).


  Commit: b9c7f8dba1cf5a21166bac8c7a68e98067d18717
      
https://github.com/NixOS/nixpkgs/commit/b9c7f8dba1cf5a21166bac8c7a68e98067d18717
  Author: Gavin Rogers <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    A pkgs/servers/zmq/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  zmq: initial package


  Commit: ba7c80eefbc79c17029da20084c4e04c9bf0fb9b
      
https://github.com/NixOS/nixpkgs/commit/ba7c80eefbc79c17029da20084c4e04c9bf0fb9b
  Author: Shea Levy <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M nixos/modules/system/boot/stage-1-init.sh

  Log Message:
  -----------
  Fix init= stage 1 test


  Commit: a08fbc5ad5f3ae28a4d643e2c78b8f2498ff5b2a
      
https://github.com/NixOS/nixpkgs/commit/a08fbc5ad5f3ae28a4d643e2c78b8f2498ff5b2a
  Author: Domen Kožar <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/servers/zmq/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4969 from gavinrogers/master

zmq: initial package


  Commit: 39d1bc755eb2c4dd7bad3b7dc5dc516dfc02d5f7
      
https://github.com/NixOS/nixpkgs/commit/39d1bc755eb2c4dd7bad3b7dc5dc516dfc02d5f7
  Author: Domen Kožar <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/interpreters/pypy/2.4/default.nix
    M pkgs/development/interpreters/python/2.6/default.nix
    M pkgs/development/interpreters/python/2.7/default.nix
    M pkgs/development/interpreters/python/3.2/default.nix
    M pkgs/development/interpreters/python/3.3/default.nix
    M pkgs/development/interpreters/python/3.4/default.nix

  Log Message:
  -----------
  python: add python.interpreter attribute


  Commit: 8bc56d5d8e4ab83b656ee993fb27a71fe27dd5fb
      
https://github.com/NixOS/nixpkgs/commit/8bc56d5d8e4ab83b656ee993fb27a71fe27dd5fb
  Author: Shea Levy <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch 'nix-exec-git' of git://github.com/proger/nixpkgs


  Commit: 026d004a367826616d20c518dd4e589acab95c2c
      
https://github.com/NixOS/nixpkgs/commit/026d004a367826616d20c518dd4e589acab95c2c
  Author: Cray Elliott <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/misc/emulators/dolphin-emu/master.nix

  Log Message:
  -----------
  dolphinEmuMaster bump to bring in new HLE Audio code

Generally we only bump once per month, but due to the new
dolphin-emu.org blog post covering the subject, I couldn't
resist :)

if you'd like to read more about it, read here!
https://dolphin-emu.org/blog/2014/11/12/the-rise-of-hle-audio/#cuthere


  Commit: f1b8880a2f4d8cbce524b6fde0fb582ff29cc634
      
https://github.com/NixOS/nixpkgs/commit/f1b8880a2f4d8cbce524b6fde0fb582ff29cc634
  Author: Shea Levy <[email protected]>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M pkgs/development/interpreters/nix-exec/default.nix

  Log Message:
  -----------
  nix-exec: bump


  Commit: c13c705a7c029b24aaf503a65a47426e796c4677
      
https://github.com/NixOS/nixpkgs/commit/c13c705a7c029b24aaf503a65a47426e796c4677
  Author: Vincent Laporte <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/java/commons/logging/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Adds commons-logging

Wrapper around a variety of logging API implementations

Homepage: http://commons.apache.org/proper/commons-logging/


  Commit: 13490c946784f1b43ee3a26ddfcd53fb9c8160dd
      
https://github.com/NixOS/nixpkgs/commit/13490c946784f1b43ee3a26ddfcd53fb9c8160dd
  Author: Vincent Laporte <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/java/commons/bsf/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Adds commons-bsf

Bean Scripting Framework (BSF) is a set of Java classes which provides
scripting language support within Java applications, and access to Java
objects and methods from scripting languages.

Homepage: http://commons.apache.org/proper/commons-bsf/


  Commit: 6e737145d7ebf7bf70c25e99c0bf10486d9c316f
      
https://github.com/NixOS/nixpkgs/commit/6e737145d7ebf7bf70c25e99c0bf10486d9c316f
  Author: Vincent Laporte <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/editors/jedit/build.xml.patch
    M pkgs/applications/editors/jedit/default.nix

  Log Message:
  -----------
  jEdit: update from 4.4.2 to 5.1.0


  Commit: d541ef3ada45b1ca3373b6feb9789d6ba366677f
      
https://github.com/NixOS/nixpkgs/commit/d541ef3ada45b1ca3373b6feb9789d6ba366677f
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M 
pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh

  Log Message:
  -----------
  Allow generate update expressions and support darcs


  Commit: ed74293c013758cd4ba832a5181e44b6b1d60cb4
      
https://github.com/NixOS/nixpkgs/commit/ed74293c013758cd4ba832a5181e44b6b1d60cb4
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M 
pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh

  Log Message:
  -----------
  Some git support for common-lisp.net


  Commit: def602885595d3a24ebab9367c3247150386b82b
      
https://github.com/NixOS/nixpkgs/commit/def602885595d3a24ebab9367c3247150386b82b
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/development/lisp-modules/iterate.darcs-context
    M pkgs/development/lisp-modules/lisp-packages.nix

  Log Message:
  -----------
  Update iterate lisp package


  Commit: 4beebeb6b3ff912c1dd893dac1deb348926fda3d
      
https://github.com/NixOS/nixpkgs/commit/4beebeb6b3ff912c1dd893dac1deb348926fda3d
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh

  Log Message:
  -----------
  Make LD_LIBRARY_PATH available during build like during later usage


  Commit: da303bba588512441065f5b65c7e4f4829f0691d
      
https://github.com/NixOS/nixpkgs/commit/da303bba588512441065f5b65c7e4f4829f0691d
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/define-package.nix

  Log Message:
  -----------
  Handle propagated library inputs for FFI


  Commit: cd6bb77a9e420291c329aaff0fbe11e870621be0
      
https://github.com/NixOS/nixpkgs/commit/cd6bb77a9e420291c329aaff0fbe11e870621be0
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/lisp-packages.nix

  Log Message:
  -----------
  Add some packages


  Commit: 5c19521c6e3b79ae42ab928494490876a9c47a27
      
https://github.com/NixOS/nixpkgs/commit/5c19521c6e3b79ae42ab928494490876a9c47a27
  Author: wmertens <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M lib/lists.nix
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix
    M nixos/modules/installer/tools/nixos-generate-config.pl
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-1.nix
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/modules/tasks/network-interfaces.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    M pkgs/stdenv/generic/default.nix

  Log Message:
  -----------
  Merge pull request #4807 from wizeman/u/zfs-improvements

ZFS improvements


  Commit: dda62c451cd0723f3cda6b81cc0d60a0da803596
      
https://github.com/NixOS/nixpkgs/commit/dda62c451cd0723f3cda6b81cc0d60a0da803596
  Author: wmertens <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix

  Log Message:
  -----------
  Re-enable ZFS in installer image

Hopefully #4807 fixes http://hydra.nixos.org/build/16883184


  Commit: c978ea45a8de7a9bac1aecd4ff7ab820f0e646f1
      
https://github.com/NixOS/nixpkgs/commit/c978ea45a8de7a9bac1aecd4ff7ab820f0e646f1
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/editors/jedit/build.xml.patch
    M pkgs/applications/editors/jedit/default.nix
    A pkgs/development/libraries/java/commons/bsf/default.nix
    A pkgs/development/libraries/java/commons/logging/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4890 from vbgl/jedit

jEdit: update from 4.4.2 to 5.1.0


  Commit: 1fd3e9116b9ca17a841f102f4293ecbe7a05821b
      
https://github.com/NixOS/nixpkgs/commit/1fd3e9116b9ca17a841f102f4293ecbe7a05821b
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/sbcl/default.nix

  Log Message:
  -----------
  Fix software-version function in SBCL by changing uname location from /bin/


  Commit: 5d97886a6a545fb20495e0837cc50fa63d2a80e1
      
https://github.com/NixOS/nixpkgs/commit/5d97886a6a545fb20495e0837cc50fa63d2a80e1
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/lisp-modules/lisp-packages.nix

  Log Message:
  -----------
  Add cl-html-parse lisp package


  Commit: 184cd101fb315e3e735cb1c059d86097961ae382
      
https://github.com/NixOS/nixpkgs/commit/184cd101fb315e3e735cb1c059d86097961ae382
  Author: Jos van den Oever <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  cvxopt: fix license typo (close #4974)


  Commit: 81680a17a8972f38bef34fdbdcc8e2aff6986980
      
https://github.com/NixOS/nixpkgs/commit/81680a17a8972f38bef34fdbdcc8e2aff6986980
  Author: cillianderoiste <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/misc/keybase-node-client/default.nix
    A pkgs/applications/misc/keybase-node-client/package.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4214 from manveru/keybase

keybase-node-client: 0.7.0


  Commit: 12379b27c8e1945763268cc6e8507dbf2d7a9b95
      
https://github.com/NixOS/nixpkgs/commit/12379b27c8e1945763268cc6e8507dbf2d7a9b95
  Author: Mateusz Kowalczyk <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/mozart/binary.nix

  Log Message:
  -----------
  mozart: use longDescription field


  Commit: 9134fc29b7d2ac9b16eb57a5118831fc4dedf25b
      
https://github.com/NixOS/nixpkgs/commit/9134fc29b7d2ac9b16eb57a5118831fc4dedf25b
  Author: Julian K. Arni <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/development/libraries/haskell/hspec-core/default.nix
    A pkgs/development/libraries/haskell/hspec-discover/default.nix
    M pkgs/development/libraries/haskell/hspec/default.nix
    M pkgs/development/libraries/haskell/hspec2/default.nix
    M pkgs/top-level/haskell-packages.nix

  Log Message:
  -----------
  Matching hspec-hspec2
   Upgraded hspec2 to 0.6.
  Upgraded hspec to 2.0.1.
  This allows (recursively) depending on hspec2 and hspec to work nicely,
  since now hspec2 is just a re-export of hspec.


  Commit: f1f41e5b87831ba9f9a140a2eb119546557e1d3d
      
https://github.com/NixOS/nixpkgs/commit/f1f41e5b87831ba9f9a140a2eb119546557e1d3d
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/Unixutils/default.nix

  Log Message:
  -----------
  haskell-Unixutils: re-generate expression with cabal2nix


  Commit: d2c0c6102e7fb5686a8dfc4106aabfd33e1a87aa
      
https://github.com/NixOS/nixpkgs/commit/d2c0c6102e7fb5686a8dfc4106aabfd33e1a87aa
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/threadscope/default.nix
    M pkgs/top-level/haskell-packages.nix

  Log Message:
  -----------
  haskell-threadscope: update to version 0.2.5


  Commit: d1cec0c92df74378ecde4268c5f123405bde9ccd
      
https://github.com/NixOS/nixpkgs/commit/d1cec0c92df74378ecde4268c5f123405bde9ccd
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M 
pkgs/applications/version-management/git-and-tools/github-backup/default.nix

  Log Message:
  -----------
  haskell-github-backup: update to version 1.20141110


  Commit: 3bf08aaa6bbfc3af9a51c01f4983ac530db33d77
      
https://github.com/NixOS/nixpkgs/commit/3bf08aaa6bbfc3af9a51c01f4983ac530db33d77
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix

  Log Message:
  -----------
  haskell-HDBC-odbc: update to version 2.4.0.0


  Commit: 9f888fbeda1c5fd4cbda5c0c21094815010a7055
      
https://github.com/NixOS/nixpkgs/commit/9f888fbeda1c5fd4cbda5c0c21094815010a7055
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/HFuse/default.nix

  Log Message:
  -----------
  haskell-HFuse: update to version 0.2.4.4


  Commit: 32a6253fe326b9c46eda47c117192c8c497392be
      
https://github.com/NixOS/nixpkgs/commit/32a6253fe326b9c46eda47c117192c8c497392be
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/HandsomeSoup/default.nix

  Log Message:
  -----------
  haskell-HandsomeSoup: update to version 0.3.5


  Commit: 71e821e900e771d1a79eaf3b0a43a68f84939b69
      
https://github.com/NixOS/nixpkgs/commit/71e821e900e771d1a79eaf3b0a43a68f84939b69
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/cabal-cargs/default.nix

  Log Message:
  -----------
  haskell-cabal-cargs: update to version 0.7.4


  Commit: 245f62f815b3849bf96cb62f6f87b0e2ef87d3fb
      
https://github.com/NixOS/nixpkgs/commit/245f62f815b3849bf96cb62f6f87b0e2ef87d3fb
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/cabal-lenses/default.nix

  Log Message:
  -----------
  haskell-cabal-lenses: update to version 0.4.1


  Commit: a7e02a47f795a95cf27332cbda6de10dc6e4467a
      
https://github.com/NixOS/nixpkgs/commit/a7e02a47f795a95cf27332cbda6de10dc6e4467a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/cgrep/default.nix

  Log Message:
  -----------
  haskell-cgrep: update to version 6.4.7


  Commit: 7cb83d0b62b7672ac63f10bd2e486ef144d2d8c2
      
https://github.com/NixOS/nixpkgs/commit/7cb83d0b62b7672ac63f10bd2e486ef144d2d8c2
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/colors/default.nix

  Log Message:
  -----------
  haskell-colors: update to version 0.2


  Commit: b1b1ab3cd0e836b49eb348d08a408fbb971e34eb
      
https://github.com/NixOS/nixpkgs/commit/b1b1ab3cd0e836b49eb348d08a408fbb971e34eb
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/conduit-combinators/default.nix

  Log Message:
  -----------
  haskell-conduit-combinators: update to version 0.3.0.4


  Commit: 0addc21262b2c84edefd177ef6359866855fe6b3
      
https://github.com/NixOS/nixpkgs/commit/0addc21262b2c84edefd177ef6359866855fe6b3
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/conduit-extra/default.nix

  Log Message:
  -----------
  haskell-conduit-extra: update to version 1.1.4.2


  Commit: a4ef160593ae0a018dd5f03bfaec9fe817464bd6
      
https://github.com/NixOS/nixpkgs/commit/a4ef160593ae0a018dd5f03bfaec9fe817464bd6
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/conduit/default.nix

  Log Message:
  -----------
  haskell-conduit: update to version 1.2.2.2


  Commit: 30127baa530dad332eb3721c5ef97266f89e310a
      
https://github.com/NixOS/nixpkgs/commit/30127baa530dad332eb3721c5ef97266f89e310a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/crypto-conduit/default.nix

  Log Message:
  -----------
  haskell-crypto-conduit: update to version 0.5.5


  Commit: 4d22fd9a168a034e9b2086ed55c834d7f721e18c
      
https://github.com/NixOS/nixpkgs/commit/4d22fd9a168a034e9b2086ed55c834d7f721e18c
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/cufft/default.nix

  Log Message:
  -----------
  haskell-cufft: update to version 0.1.1.0


  Commit: 42dfd0a65a7512c96aff72c15d831b15ca91e95f
      
https://github.com/NixOS/nixpkgs/commit/42dfd0a65a7512c96aff72c15d831b15ca91e95f
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/either/default.nix

  Log Message:
  -----------
  haskell-either: update to version 4.3.2


  Commit: f67004416fd004cfc178dbbb41670582fff45c94
      
https://github.com/NixOS/nixpkgs/commit/f67004416fd004cfc178dbbb41670582fff45c94
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/entropy/default.nix

  Log Message:
  -----------
  haskell-entropy: update to version 0.3.4.1


  Commit: e089fa06587d2159a400656a2fc67498191d5692
      
https://github.com/NixOS/nixpkgs/commit/e089fa06587d2159a400656a2fc67498191d5692
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/extra/default.nix

  Log Message:
  -----------
  haskell-extra: update to version 0.8


  Commit: 6799b12ecc6dbbae41f6d90a69e45372d33b33e5
      
https://github.com/NixOS/nixpkgs/commit/6799b12ecc6dbbae41f6d90a69e45372d33b33e5
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/github/default.nix

  Log Message:
  -----------
  haskell-github: update to version 0.13


  Commit: 602f0245fd6d32380d024b6118771a5ccf8e4c65
      
https://github.com/NixOS/nixpkgs/commit/602f0245fd6d32380d024b6118771a5ccf8e4c65
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/highlighting-kate/default.nix

  Log Message:
  -----------
  haskell-highlighting-kate: update to version 0.5.11


  Commit: 84f3b6f3f2bc6391963f06c697d1214ac607efa2
      
https://github.com/NixOS/nixpkgs/commit/84f3b6f3f2bc6391963f06c697d1214ac607efa2
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/hoauth2/default.nix

  Log Message:
  -----------
  haskell-hoauth2: update to version 0.4.3


  Commit: 414e982769530e028915cabef4709f503193d2c2
      
https://github.com/NixOS/nixpkgs/commit/414e982769530e028915cabef4709f503193d2c2
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/hsimport/default.nix

  Log Message:
  -----------
  haskell-hsimport: update to version 0.6.3


  Commit: 5ebf99c2117c4802d01ce2d470b3faba3254882b
      
https://github.com/NixOS/nixpkgs/commit/5ebf99c2117c4802d01ce2d470b3faba3254882b
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/hspec-meta/default.nix

  Log Message:
  -----------
  haskell-hspec-meta: update to version 2.0.0


  Commit: 31b2b5ecb919b6b94381245207bedabddb733b1e
      
https://github.com/NixOS/nixpkgs/commit/31b2b5ecb919b6b94381245207bedabddb733b1e
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/hspec2/default.nix

  Log Message:
  -----------
  haskell-hspec2: update to version 0.6.1


  Commit: 60cb846b6a2e10c02201438e262bbd00e83ad4d9
      
https://github.com/NixOS/nixpkgs/commit/60cb846b6a2e10c02201438e262bbd00e83ad4d9
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/libjenkins/default.nix

  Log Message:
  -----------
  haskell-libjenkins: update to version 0.6.0


  Commit: d8ce7073235a0713d4aa4d5fc5534263df866df3
      
https://github.com/NixOS/nixpkgs/commit/d8ce7073235a0713d4aa4d5fc5534263df866df3
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/linear/default.nix

  Log Message:
  -----------
  haskell-linear: update to version 1.13


  Commit: ef909213973a386c405f12a876dfeb8eb7f2834e
      
https://github.com/NixOS/nixpkgs/commit/ef909213973a386c405f12a876dfeb8eb7f2834e
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/pipes-text/default.nix

  Log Message:
  -----------
  haskell-pipes-text: update to version 0.0.0.15


  Commit: 33cf917c34e97fdd84b50b49cb187f88ae39714d
      
https://github.com/NixOS/nixpkgs/commit/33cf917c34e97fdd84b50b49cb187f88ae39714d
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/rethinkdb/default.nix

  Log Message:
  -----------
  haskell-rethinkdb: update to version 1.15.2.1


  Commit: bb843697fff0a00462c74ae66a589405e7a77480
      
https://github.com/NixOS/nixpkgs/commit/bb843697fff0a00462c74ae66a589405e7a77480
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/sdl2/default.nix

  Log Message:
  -----------
  haskell-sdl2: update to version 1.3.0


  Commit: f435bf48635ca9cb3f5a0161773f89b18b9385bc
      
https://github.com/NixOS/nixpkgs/commit/f435bf48635ca9cb3f5a0161773f89b18b9385bc
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix

  Log Message:
  -----------
  haskell-snaplet-postgresql-simple: update to version 0.6


  Commit: 4c6a25569d1e814d0efd80b5eb523c52be5c5d42
      
https://github.com/NixOS/nixpkgs/commit/4c6a25569d1e814d0efd80b5eb523c52be5c5d42
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/system-fileio/default.nix

  Log Message:
  -----------
  haskell-system-fileio: update to version 0.3.15


  Commit: 7eae59a3fc70cb1248da4da65664b3d14ab8e2e7
      
https://github.com/NixOS/nixpkgs/commit/7eae59a3fc70cb1248da4da65664b3d14ab8e2e7
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/terminal-size/default.nix

  Log Message:
  -----------
  haskell-terminal-size: update to version 0.3.0


  Commit: a931912ede18455ccc1616b8ebe9c357a064b658
      
https://github.com/NixOS/nixpkgs/commit/a931912ede18455ccc1616b8ebe9c357a064b658
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/twitter-conduit/default.nix

  Log Message:
  -----------
  haskell-twitter-conduit: update to version 0.0.8


  Commit: f54b9ce0a8f25b354e5a2f26a01c1edf396b470a
      
https://github.com/NixOS/nixpkgs/commit/f54b9ce0a8f25b354e5a2f26a01c1edf396b470a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/yesod-bin/default.nix

  Log Message:
  -----------
  haskell-yesod-bin: update to version 1.4.0.6


  Commit: 70e56340ee1c21199d7f8a73e04048bff8cb3a07
      
https://github.com/NixOS/nixpkgs/commit/70e56340ee1c21199d7f8a73e04048bff8cb3a07
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/yesod-core/default.nix

  Log Message:
  -----------
  haskell-yesod-core: update to version 1.4.3.1


  Commit: 302222f6196ef124ade8b50b7e7fcd91ebb22d8a
      
https://github.com/NixOS/nixpkgs/commit/302222f6196ef124ade8b50b7e7fcd91ebb22d8a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/yesod-test/default.nix

  Log Message:
  -----------
  haskell-yesod-test: update to version 1.4.1


  Commit: a7748b9fc84042104cc70b1801bc295d08e965c8
      
https://github.com/NixOS/nixpkgs/commit/a7748b9fc84042104cc70b1801bc295d08e965c8
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/cabal-bounds/default.nix

  Log Message:
  -----------
  haskell-cabal-bounds: update to version 0.8.8


  Commit: 6d95d1cc29855f704aa62a711bbc989f91ed776c
      
https://github.com/NixOS/nixpkgs/commit/6d95d1cc29855f704aa62a711bbc989f91ed776c
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/ghcid/default.nix

  Log Message:
  -----------
  haskell-ghcid: update to version 0.3.2


  Commit: 7cc2c31eca744b75aef26fef6e5813e6e78b820a
      
https://github.com/NixOS/nixpkgs/commit/7cc2c31eca744b75aef26fef6e5813e6e78b820a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/hlint/default.nix

  Log Message:
  -----------
  haskell-hlint: update to version 1.9.12


  Commit: a5be2282a7a72570f69ee27da39a21139d6fc923
      
https://github.com/NixOS/nixpkgs/commit/a5be2282a7a72570f69ee27da39a21139d6fc923
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/haskell/keter/default.nix

  Log Message:
  -----------
  haskell-keter: update to version 1.3.5.3


  Commit: 2d253c24125a4ac68cebbcfe1f972606f735621e
      
https://github.com/NixOS/nixpkgs/commit/2d253c24125a4ac68cebbcfe1f972606f735621e
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/misc/ShellCheck/default.nix

  Log Message:
  -----------
  haskell-ShellCheck: update to version 0.3.5


  Commit: 5c18fa216ee1fda622c7c72b56925861c8757e9d
      
https://github.com/NixOS/nixpkgs/commit/5c18fa216ee1fda622c7c72b56925861c8757e9d
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/shakespeare/default.nix

  Log Message:
  -----------
  haskell-shakespeare: disable test suite to fix build with hspec 2.x

https://github.com/yesodweb/shakespeare/issues/143


  Commit: e475e851c687a5d45babbf7f6f326a46a4a6072f
      
https://github.com/NixOS/nixpkgs/commit/e475e851c687a5d45babbf7f6f326a46a4a6072f
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/shakespeare/default.nix

  Log Message:
  -----------
  haskell-shakespeare: update to version 2.0.2


  Commit: 6026a695e48cf9b651b59344fba64c424563012a
      
https://github.com/NixOS/nixpkgs/commit/6026a695e48cf9b651b59344fba64c424563012a
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/ReadArgs/default.nix

  Log Message:
  -----------
  haskell-ReadArgs: jailbreak to fix build with hspec 2.x

https://github.com/rampion/ReadArgs/issues/6


  Commit: 48d910fb323a7aafb665cf7ebf893a61d3009dc0
      
https://github.com/NixOS/nixpkgs/commit/48d910fb323a7aafb665cf7ebf893a61d3009dc0
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/gitlib-test/default.nix

  Log Message:
  -----------
  haskell-gitlib-test: doesn't work with hspec 2.x


  Commit: f33c89d23f6ac82789df401b8ddc9f65afc13a0b
      
https://github.com/NixOS/nixpkgs/commit/f33c89d23f6ac82789df401b8ddc9f65afc13a0b
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/sdl2/default.nix

  Log Message:
  -----------
  haskell-sdl2: disable Haddock phase to fix the build

https://github.com/haskell-game/sdl2/issues/31


  Commit: 65ef7d534df37938c76e73173deeba6a3a3703cc
      
https://github.com/NixOS/nixpkgs/commit/65ef7d534df37938c76e73173deeba6a3a3703cc
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/gitlib-libgit2/default.nix

  Log Message:
  -----------
  haskell-gitlib-libgit2: disable this build until 'gitlib-test' is fixed


  Commit: 9eb29a601c87af6abfba149eefe650c64f82b29a
      
https://github.com/NixOS/nixpkgs/commit/9eb29a601c87af6abfba149eefe650c64f82b29a
  Author: Mateusz Kowalczyk <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/colors/default.nix

  Log Message:
  -----------
  haskell-colors: adopt package


  Commit: bae3b106ca1e608388391c5f25f5ca31dafa6bea
      
https://github.com/NixOS/nixpkgs/commit/bae3b106ca1e608388391c5f25f5ca31dafa6bea
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/colors/default.nix

  Log Message:
  -----------
  colors: fix haskell package


  Commit: fbd2330aff51c74a215259b9669ebe065bbc8e19
      
https://github.com/NixOS/nixpkgs/commit/fbd2330aff51c74a215259b9669ebe065bbc8e19
  Author: BlackEdder <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/dmd/default.nix

  Log Message:
  -----------
  dmd: update to 2.066.1


  Commit: 095516a30b1ed879e5377ad1796b5d5ab58a8fa6
      
https://github.com/NixOS/nixpkgs/commit/095516a30b1ed879e5377ad1796b5d5ab58a8fa6
  Author: Mateusz Kowalczyk <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/haskell/colors/default.nix

  Log Message:
  -----------
  Merge pull request #4975 from abbradar/strange-fix

colors: fix haskell package


  Commit: d925fcf3842064b22e9ba7f98934802fcf83b326
      
https://github.com/NixOS/nixpkgs/commit/d925fcf3842064b22e9ba7f98934802fcf83b326
  Author: Emery Hemingway <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/applications/misc/qtbitcointrader/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  QtBitcoinTrader: 1.07.98 -> 1.08.02


  Commit: 8bc9e80d942585a0e7b47c3368e16ed1bc45764c
      
https://github.com/NixOS/nixpkgs/commit/8bc9e80d942585a0e7b47c3368e16ed1bc45764c
  Author: Boris Sukholitko <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/applications/editors/vim/configurable.nix

  Log Message:
  -----------
  vim_configurable: add cscope support by default


  Commit: 76ed5698756de1074a48532ebed98ccbb8d30867
      
https://github.com/NixOS/nixpkgs/commit/76ed5698756de1074a48532ebed98ccbb8d30867
  Author: Peter Simons <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    R pkgs/development/libraries/haskell/cairo/0.12.5.3.nix
    R pkgs/development/libraries/haskell/cairo/0.13.0.4.nix
    A pkgs/development/libraries/haskell/cairo/default.nix
    R pkgs/development/libraries/haskell/glib/0.12.5.4.nix
    R pkgs/development/libraries/haskell/glib/0.13.0.5.nix
    A pkgs/development/libraries/haskell/glib/default.nix
    R pkgs/development/libraries/haskell/glib/gtk2hs.patch
    R pkgs/development/libraries/haskell/gtk/0.12.5.7.nix
    R pkgs/development/libraries/haskell/gtk/0.13.0.3.nix
    A pkgs/development/libraries/haskell/gtk/default.nix
    R pkgs/development/libraries/haskell/gtk/gtk.patch
    R pkgs/development/libraries/haskell/pango/0.12.5.3.nix
    R pkgs/development/libraries/haskell/pango/0.13.0.3.nix
    A pkgs/development/libraries/haskell/pango/default.nix
    R pkgs/development/libraries/haskell/pango/pango.patch
    R pkgs/development/tools/haskell/threadscope/threadscope.patch
    M pkgs/top-level/haskell-packages.nix

  Log Message:
  -----------
  Drop obsolete versions of Haskell cairo, glib, gtk, pango, threadscope, and 
some other patches.


  Commit: e2bfd4008311b4a9fb48604105df87ddb62d2c4c
      
https://github.com/NixOS/nixpkgs/commit/e2bfd4008311b4a9fb48604105df87ddb62d2c4c
  Author: _1126 <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/audio/caudec/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  caudec: adds new package


  Commit: 221a78739e3953c5eaa86b29cbe5e7e810b388e0
      
https://github.com/NixOS/nixpkgs/commit/221a78739e3953c5eaa86b29cbe5e7e810b388e0
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/applications/misc/qtbitcointrader/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4964 from ehmry/qtbitcointrader

QtBitcoinTrader: 1.07.98 -> 1.08.02


  Commit: c56bbf60119440a0563464fef03dc7043cc3c7af
      
https://github.com/NixOS/nixpkgs/commit/c56bbf60119440a0563464fef03dc7043cc3c7af
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/cminpack/default.nix

  Log Message:
  -----------
  cminpack: update from 1.3.2 to 1.3.4


  Commit: 38022c9938f347b9f85ff33d55e72dcf5df0a291
      
https://github.com/NixOS/nixpkgs/commit/38022c9938f347b9f85ff33d55e72dcf5df0a291
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/development/tools/build-managers/icmake/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  add icmake, a program maintenance utility


  Commit: cb70b5a620d20998be8f3c1e296dcae1395f7fef
      
https://github.com/NixOS/nixpkgs/commit/cb70b5a620d20998be8f3c1e296dcae1395f7fef
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/misc/yodl/default.nix

  Log Message:
  -----------
  yodl: update from 2.14.3 to 3.03.0


  Commit: 2126714a84c6886e2d75135ba80800aa4a2c93ae
      
https://github.com/NixOS/nixpkgs/commit/2126714a84c6886e2d75135ba80800aa4a2c93ae
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/applications/editors/vim/configurable.nix

  Log Message:
  -----------
  Merge pull request #4979 from bosu/vim-cscope

vim_configurable: add cscope support by default


  Commit: 4d59ac9e67ab6b57495677a1e738a96b7f011e3a
      
https://github.com/NixOS/nixpkgs/commit/4d59ac9e67ab6b57495677a1e738a96b7f011e3a
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/audio/caudec/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4977 from 23a1a74/caudec

Caudec


  Commit: 7a5090d794a09c83191750a7ec975fa5ffa671a9
      
https://github.com/NixOS/nixpkgs/commit/7a5090d794a09c83191750a7ec975fa5ffa671a9
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/applications/misc/bitcoin/default.nix

  Log Message:
  -----------
  bitcoin(d): fix builing on hydra and with boost 1.56


  Commit: 67ee94b2371397ec8a3254b91d66a243cc923fff
      
https://github.com/NixOS/nixpkgs/commit/67ee94b2371397ec8a3254b91d66a243cc923fff
  Author: Henry Till <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/interpreters/racket/default.nix

  Log Message:
  -----------
  racket: update to 6.1.1


  Commit: 9b2cff2fc7e0d210753ae23bda2bdb915fe2a362
      
https://github.com/NixOS/nixpkgs/commit/9b2cff2fc7e0d210753ae23bda2bdb915fe2a362
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix

  Log Message:
  -----------
  fix missing sha and rev


  Commit: 7361406e209f53fd7d3a467e47e9d764d19865f0
      
https://github.com/NixOS/nixpkgs/commit/7361406e209f53fd7d3a467e47e9d764d19865f0
  Author: Vincent Laporte <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/applications/editors/bluefish/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Adds bluefish

Bluefish is a powerful editor targeted towards programmers and
webdevelopers, with many options to write websites, scripts and
programming code.

Homepage: http://bluefish.openoffice.nl/


  Commit: ab423e636777c558854da61e284703b2ddc9999e
      
https://github.com/NixOS/nixpkgs/commit/ab423e636777c558854da61e284703b2ddc9999e
  Author: Domen Kožar <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/python-modules/generic/default.nix

  Log Message:
  -----------
  buildPythonPackage: add python to propagatedBuildInputs

Doing:

$ nix-shell -p pythonPackage.pyramid

now also sets $PYTHONPATH. Previously you'd have to do:

$ nix-shell -p pythonPackage.pyramid python


  Commit: 07b6d3d2c6f8833d01ebfc2706afa50347078ac4
      
https://github.com/NixOS/nixpkgs/commit/07b6d3d2c6f8833d01ebfc2706afa50347078ac4
  Author: Domen Kožar <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M doc/language-support.xml
    M doc/stdenv.xml

  Log Message:
  -----------
  Initial documentation for Python packaging. Feedback welcome.

cc @chaoflow @offlinehacker @garbas @goodwillcoding @brodul
@cillianderoiste @matejc

Fixes #64


  Commit: 419e96a5ceb9a9d6875a4907cd05d95e2d2cde54
      
https://github.com/NixOS/nixpkgs/commit/419e96a5ceb9a9d6875a4907cd05d95e2d2cde54
  Author: Domen Kožar <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M doc/language-support.xml
    M doc/stdenv.xml
    M pkgs/development/interpreters/pypy/2.4/default.nix
    M pkgs/development/interpreters/python/2.6/default.nix
    M pkgs/development/interpreters/python/2.7/default.nix
    M pkgs/development/interpreters/python/3.2/default.nix
    M pkgs/development/interpreters/python/3.3/default.nix
    M pkgs/development/interpreters/python/3.4/default.nix
    M pkgs/development/python-modules/generic/default.nix

  Log Message:
  -----------
  Merge branch 'python/docs'


  Commit: a6d991ea07ac93392199be56b0c2a7527d29d181
      
https://github.com/NixOS/nixpkgs/commit/a6d991ea07ac93392199be56b0c2a7527d29d181
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/interpreters/racket/default.nix

  Log Message:
  -----------
  Merge pull request #4980 from henrytill/racket

racket: update to 6.1.1


  Commit: 959f706acec79ac314663b3faa7b0c75b6cf15a2
      
https://github.com/NixOS/nixpkgs/commit/959f706acec79ac314663b3faa7b0c75b6cf15a2
  Author: BlackEdder <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/rdmd/default.nix

  Log Message:
  -----------
  rdmd: update to new version

Source of old version was not available anymore. Update also depends on
newer version of dmd.


  Commit: 113961c68170a86ee2b2348436cb3616a1573254
      
https://github.com/NixOS/nixpkgs/commit/113961c68170a86ee2b2348436cb3616a1573254
  Author: Michael Raskin <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/applications/misc/bitcoin/default.nix

  Log Message:
  -----------
  Merge pull request #4978 from abbradar/bitcoin-fix

bitcoin(d): fix builing on hydra and with boost 1.56


  Commit: c8c7cc1f09fb306d9b0a6bb1aa68df64f0b889ef
      
https://github.com/NixOS/nixpkgs/commit/c8c7cc1f09fb306d9b0a6bb1aa68df64f0b889ef
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/dmd/default.nix
    M pkgs/development/compilers/rdmd/default.nix

  Log Message:
  -----------
  Merge pull request #4976 from BlackEdder/pr-dmd

dmd: update to 2.066.1


  Commit: aa14fb638994bb9dac6437e849b6c93f0353c2f7
      
https://github.com/NixOS/nixpkgs/commit/aa14fb638994bb9dac6437e849b6c93f0353c2f7
  Author: Nikolay Amiantov <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/top-level/release-lib.nix

  Log Message:
  -----------
  release-lib: add option to use another package set


  Commit: 25859fae742fecfeee62151369d1662815c540fe
      
https://github.com/NixOS/nixpkgs/commit/25859fae742fecfeee62151369d1662815c540fe
  Author: Alexander Flatter <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/libusb/default.nix

  Log Message:
  -----------
  Use libusb-compat instead of unmaintained libusb

Close #4945.


  Commit: 90172ba07967efd075ea86b6a0d62de2e7a228ce
      
https://github.com/NixOS/nixpkgs/commit/90172ba07967efd075ea86b6a0d62de2e7a228ce
  Author: Ricardo M. Correia <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/development/tools/analysis/valgrind/default.nix

  Log Message:
  -----------
  valgrind: Fix running under grsecurity


  Commit: ec3e96683a970bc2cdd0d8b06d7a9a858005d819
      
https://github.com/NixOS/nixpkgs/commit/ec3e96683a970bc2cdd0d8b06d7a9a858005d819
  Author: Gavin Rogers <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    A pkgs/servers/zeromq/default.nix
    R pkgs/servers/zmq/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  zeromq: renamed package from zmq


  Commit: f6978167dacf2c46f2fb52da9fcb27653f23e857
      
https://github.com/NixOS/nixpkgs/commit/f6978167dacf2c46f2fb52da9fcb27653f23e857
  Author: Arseniy Seroka <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    A pkgs/servers/zeromq/default.nix
    R pkgs/servers/zmq/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4982 from gavinrogers/master

zeromq: renamed package from zmq


  Commit: 557a3c92e3cb5f81e9d1a72ab9cfc1964a3dadd6
      
https://github.com/NixOS/nixpkgs/commit/557a3c92e3cb5f81e9d1a72ab9cfc1964a3dadd6
  Author: William A. Kennington III <[email protected]>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M pkgs/os-specific/linux/kernel/common-config.nix

  Log Message:
  -----------
  kernel: Don't enable the iommu by default as this breaks for some hardware


  Commit: 5d56bda1fba06293d9337117295cc03406af1aa9
      
https://github.com/NixOS/nixpkgs/commit/5d56bda1fba06293d9337117295cc03406af1aa9
  Author: Daniel Austin <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M lib/maintainers.nix
    A pkgs/development/tools/atom-shell/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Development tools: added atom-shell


  Commit: 53b24d0c957a1ed1ea2896bfeaaa63e5b6c81344
      
https://github.com/NixOS/nixpkgs/commit/53b24d0c957a1ed1ea2896bfeaaa63e5b6c81344
  Author: Boris Sukholitko <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M nixos/modules/services/networking/firewall.nix

  Log Message:
  -----------
  firewall: clear rpfilter on stop


  Commit: d0e15cc5755ccb0ab88e327d9482004950004bfa
      
https://github.com/NixOS/nixpkgs/commit/d0e15cc5755ccb0ab88e327d9482004950004bfa
  Author: William A. Kennington III <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M nixos/modules/services/networking/firewall.nix

  Log Message:
  -----------
  Merge pull request #4983 from bosu/fw-stop-fix

firewall: clear rpfilter on stop


  Commit: c6ba65cd8d97be10194b877850519a0ae1cd977f
      
https://github.com/NixOS/nixpkgs/commit/c6ba65cd8d97be10194b877850519a0ae1cd977f
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M lib/maintainers.nix
    A pkgs/development/tools/atom-shell/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #4970 from fluffynukeit/master

Development tools: added atom-shell


  Commit: 1e7709b68dc102076ed5fded1471ef4963669e74
      
https://github.com/NixOS/nixpkgs/commit/1e7709b68dc102076ed5fded1471ef4963669e74
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/libgphoto2/default.nix

  Log Message:
  -----------
  libgphoto2: use libusb1 version (fixes build)

Also, it's not mentioned in *.pc (anymore).
CC maint. @jcumming.


  Commit: 3d8e94bc8e5c6c4b564f9e8f4cb7986e447a2288
      
https://github.com/NixOS/nixpkgs/commit/3d8e94bc8e5c6c4b564f9e8f4cb7986e447a2288
  Author: Peter Simons <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/top-level/release-lib.nix

  Log Message:
  -----------
  Merge pull request #4869 from abbradar/release-packageset

release-lib: add option to use another package set


  Commit: 18ffe551e833ef4a391127f2b7c97b6cbb2ac187
      
https://github.com/NixOS/nixpkgs/commit/18ffe551e833ef4a391127f2b7c97b6cbb2ac187
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/tools/system/acct/default.nix

  Log Message:
  -----------
  acct: update from 6.6.1 to 6.6.2 and adopt it


  Commit: 6e1cbd6473050aa1956820e5cd30ff0852627d28
      
https://github.com/NixOS/nixpkgs/commit/6e1cbd6473050aa1956820e5cd30ff0852627d28
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/libraries/clearsilver/default.nix

  Log Message:
  -----------
  clearsilver: update from 0.10.3 to 0.10.5


  Commit: 16c30d7d70b0612ed4de8cc47382a82d0c9c8f69
      
https://github.com/NixOS/nixpkgs/commit/16c30d7d70b0612ed4de8cc47382a82d0c9c8f69
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/applications/networking/sniffers/ettercap/default.nix

  Log Message:
  -----------
  ettercap: update from 0.8.0 to 0.8.1 and adopt it


  Commit: 3d7a2ccf555198aa88789fc15cddbd0525c528cd
      
https://github.com/NixOS/nixpkgs/commit/3d7a2ccf555198aa88789fc15cddbd0525c528cd
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/tools/misc/yodl/default.nix

  Log Message:
  -----------
  yodl: update from 3.03.0 to 3.04.00


  Commit: 5d7c5d4686326bd1b710b09ae3271b1a622cf1c8
      
https://github.com/NixOS/nixpkgs/commit/5d7c5d4686326bd1b710b09ae3271b1a622cf1c8
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/tools/analysis/checkstyle/default.nix

  Log Message:
  -----------
  checkstyle: update from 6.0 to 6.1


  Commit: ea05587309cfd27f112da523af8fcac67733d9a3
      
https://github.com/NixOS/nixpkgs/commit/ea05587309cfd27f112da523af8fcac67733d9a3
  Author: Pascal Wittmann <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/applications/misc/calibre/default.nix

  Log Message:
  -----------
  calibre: update from 2.9.0 to 2.10.0


  Commit: 961ed7c8b41bb80cdf5f4f0f5e49093ad171393b
      
https://github.com/NixOS/nixpkgs/commit/961ed7c8b41bb80cdf5f4f0f5e49093ad171393b
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M pkgs/development/compilers/dmd/default.nix

  Log Message:
  -----------
  dmd: fix 32-bit build and some nitpicks

CC #4976.


  Commit: b4af993c3f2a2e9808b582eb6dd4500a2847fb2b
      
https://github.com/NixOS/nixpkgs/commit/b4af993c3f2a2e9808b582eb6dd4500a2847fb2b
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M doc/language-support.xml
    M doc/stdenv.xml
    M lib/lists.nix
    M lib/maintainers.nix
    M nixos/modules/installer/cd-dvd/installation-cd-base.nix
    M nixos/modules/installer/tools/nixos-generate-config.pl
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    A nixos/modules/services/networking/dnscrypt-proxy.nix
    M nixos/modules/services/networking/firewall.nix
    M nixos/modules/services/networking/minidlna.nix
    M nixos/modules/services/web-servers/apache-httpd/default.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-1.nix
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/modules/tasks/network-interfaces.nix
    A nixos/modules/virtualisation/lxc.nix
    A nixos/modules/virtualisation/parallels-guest.nix
    A pkgs/applications/audio/caudec/default.nix
    M pkgs/applications/audio/yoshimi/default.nix
    A pkgs/applications/editors/bluefish/default.nix
    A pkgs/applications/editors/jedit/build.xml.patch
    M pkgs/applications/editors/jedit/default.nix
    M pkgs/applications/editors/vim/configurable.nix
    M pkgs/applications/misc/bitcoin/default.nix
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/keybase-node-client/default.nix
    A pkgs/applications/misc/keybase-node-client/package.nix
    M pkgs/applications/misc/qtbitcointrader/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
    M pkgs/applications/networking/sniffers/ettercap/default.nix
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M 
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
    M pkgs/development/compilers/dmd/default.nix
    M pkgs/development/compilers/mozart/binary.nix
    M pkgs/development/compilers/rdmd/default.nix
    M pkgs/development/compilers/sbcl/default.nix
    A pkgs/development/coq-modules/unimath/default.nix
    M pkgs/development/interpreters/nix-exec/default.nix
    M pkgs/development/interpreters/pypy/2.4/default.nix
    M pkgs/development/interpreters/python/2.6/default.nix
    M pkgs/development/interpreters/python/2.7/default.nix
    M pkgs/development/interpreters/python/3.2/default.nix
    M pkgs/development/interpreters/python/3.3/default.nix
    M pkgs/development/interpreters/python/3.4/default.nix
    M pkgs/development/interpreters/racket/default.nix
    M pkgs/development/libraries/clearsilver/default.nix
    M pkgs/development/libraries/cminpack/default.nix
    M pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
    M pkgs/development/libraries/haskell/HFuse/default.nix
    M pkgs/development/libraries/haskell/HandsomeSoup/default.nix
    M pkgs/development/libraries/haskell/ReadArgs/default.nix
    M pkgs/development/libraries/haskell/Unixutils/default.nix
    M pkgs/development/libraries/haskell/cabal-cargs/default.nix
    M pkgs/development/libraries/haskell/cabal-lenses/default.nix
    R pkgs/development/libraries/haskell/cairo/0.12.5.3.nix
    R pkgs/development/libraries/haskell/cairo/0.13.0.4.nix
    A pkgs/development/libraries/haskell/cairo/default.nix
    M pkgs/development/libraries/haskell/cgrep/default.nix
    M pkgs/development/libraries/haskell/colors/default.nix
    M pkgs/development/libraries/haskell/conduit-combinators/default.nix
    M pkgs/development/libraries/haskell/conduit-extra/default.nix
    M pkgs/development/libraries/haskell/conduit/default.nix
    M pkgs/development/libraries/haskell/crypto-conduit/default.nix
    M pkgs/development/libraries/haskell/cufft/default.nix
    M pkgs/development/libraries/haskell/either/default.nix
    M pkgs/development/libraries/haskell/entropy/default.nix
    M pkgs/development/libraries/haskell/extra/default.nix
    M pkgs/development/libraries/haskell/github/default.nix
    M pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
    M pkgs/development/libraries/haskell/gitlib-test/default.nix
    R pkgs/development/libraries/haskell/glib/0.12.5.4.nix
    R pkgs/development/libraries/haskell/glib/0.13.0.5.nix
    A pkgs/development/libraries/haskell/glib/default.nix
    R pkgs/development/libraries/haskell/glib/gtk2hs.patch
    R pkgs/development/libraries/haskell/gtk/0.12.5.7.nix
    R pkgs/development/libraries/haskell/gtk/0.13.0.3.nix
    A pkgs/development/libraries/haskell/gtk/default.nix
    R pkgs/development/libraries/haskell/gtk/gtk.patch
    M pkgs/development/libraries/haskell/highlighting-kate/default.nix
    M pkgs/development/libraries/haskell/hoauth2/default.nix
    M pkgs/development/libraries/haskell/hsimport/default.nix
    A pkgs/development/libraries/haskell/hspec-core/default.nix
    A pkgs/development/libraries/haskell/hspec-discover/default.nix
    M pkgs/development/libraries/haskell/hspec-meta/default.nix
    M pkgs/development/libraries/haskell/hspec/default.nix
    M pkgs/development/libraries/haskell/hspec2/default.nix
    A pkgs/development/libraries/haskell/labeled-tree/default.nix
    M pkgs/development/libraries/haskell/libjenkins/default.nix
    M pkgs/development/libraries/haskell/linear/default.nix
    R pkgs/development/libraries/haskell/pango/0.12.5.3.nix
    R pkgs/development/libraries/haskell/pango/0.13.0.3.nix
    A pkgs/development/libraries/haskell/pango/default.nix
    R pkgs/development/libraries/haskell/pango/pango.patch
    M pkgs/development/libraries/haskell/pipes-text/default.nix
    M pkgs/development/libraries/haskell/rethinkdb/default.nix
    M pkgs/development/libraries/haskell/sdl2/default.nix
    M pkgs/development/libraries/haskell/shakespeare/default.nix
    M pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
    M pkgs/development/libraries/haskell/system-fileio/default.nix
    M pkgs/development/libraries/haskell/terminal-size/default.nix
    M pkgs/development/libraries/haskell/twitter-conduit/default.nix
    M pkgs/development/libraries/haskell/yesod-bin/default.nix
    M pkgs/development/libraries/haskell/yesod-core/default.nix
    M pkgs/development/libraries/haskell/yesod-test/default.nix
    A pkgs/development/libraries/java/commons/bsf/default.nix
    A pkgs/development/libraries/java/commons/logging/default.nix
    M pkgs/development/libraries/libgphoto2/default.nix
    M pkgs/development/libraries/libusb/default.nix
    A pkgs/development/libraries/science/math/ipopt/default.nix
    M pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
    M pkgs/development/lisp-modules/define-package.nix
    M 
pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
    A pkgs/development/lisp-modules/iterate.darcs-context
    M pkgs/development/lisp-modules/lisp-packages.nix
    M pkgs/development/python-modules/generic/default.nix
    M pkgs/development/tools/analysis/checkstyle/default.nix
    M pkgs/development/tools/analysis/valgrind/default.nix
    A pkgs/development/tools/atom-shell/default.nix
    A pkgs/development/tools/build-managers/icmake/default.nix
    M pkgs/development/tools/haskell/PastePipe/default.nix
    M pkgs/development/tools/haskell/cabal-bounds/default.nix
    M pkgs/development/tools/haskell/ghcid/default.nix
    M pkgs/development/tools/haskell/hlint/default.nix
    M pkgs/development/tools/haskell/keter/default.nix
    M pkgs/development/tools/haskell/threadscope/default.nix
    R pkgs/development/tools/haskell/threadscope/threadscope.patch
    M pkgs/development/tools/misc/ShellCheck/default.nix
    M pkgs/development/tools/misc/yodl/default.nix
    M pkgs/development/tools/pydb/default.nix
    A pkgs/development/tools/winpdb/default.nix
    M pkgs/games/tibia/default.nix
    A pkgs/games/xsnow/default.nix
    M pkgs/misc/emulators/dolphin-emu/master.nix
    M pkgs/misc/vim-plugins/default.nix
    A pkgs/misc/vim-plugins/vimrc.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/os-specific/linux/lxc/default.nix
    A pkgs/os-specific/linux/prl-tools/autostart.desktop
    A pkgs/os-specific/linux/prl-tools/default.nix
    M pkgs/os-specific/linux/xf86-input-wacom/default.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/linux/zfs/git.nix
    A pkgs/os-specific/linux/zfs/remove-lock-checks.patch
    A pkgs/servers/zeromq/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    A pkgs/tools/networking/dnscrypt-proxy/default.nix
    M pkgs/tools/security/volatility/default.nix
    M pkgs/tools/system/acct/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/haskell-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

Conflicts (simple):
        pkgs/development/lisp-modules/clwrapper/setup-hook.sh


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

Reply via email to