Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c5e855e060029697a8b13516b5bd55b87169cf7c
      
https://github.com/NixOS/nixpkgs/commit/c5e855e060029697a8b13516b5bd55b87169cf7c
  Author: Matthias Beyer <[email protected]>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    A nixos/modules/programs/fish/fish.nix

  Log Message:
  -----------
  Add basic nixos module for fish shell


  Commit: 5e6068d9136d98b48180c064efb9e779202de68e
      
https://github.com/NixOS/nixpkgs/commit/5e6068d9136d98b48180c064efb9e779202de68e
  Author: Matthias Beyer <[email protected]>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M nixos/modules/programs/fish/fish.nix

  Log Message:
  -----------
  Put shell aliases in interactiveShellInit


  Commit: a010daa8e34fc28e9c7c7b39b234ecc1b5073f62
      
https://github.com/NixOS/nixpkgs/commit/a010daa8e34fc28e9c7c7b39b234ecc1b5073f62
  Author: Dario Bertini <[email protected]>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    A pkgs/servers/nosql/redis/3.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Add redis-3.0.0-rc2


  Commit: 687e83156cd4de46078a189b92472c7ddad33d6b
      
https://github.com/NixOS/nixpkgs/commit/687e83156cd4de46078a189b92472c7ddad33d6b
  Author: Dario Bertini <[email protected]>
  Date:   2015-01-24 (Sat, 24 Jan 2015)

  Changed paths:
    A pkgs/servers/nosql/redis/3.0.nix
    R pkgs/servers/nosql/redis/3.nix

  Log Message:
  -----------
  Rename redis3


  Commit: d02d76e3f0de10c29baac909721fab0cf0953338
      
https://github.com/NixOS/nixpkgs/commit/d02d76e3f0de10c29baac909721fab0cf0953338
  Author: Julian K. Arni <[email protected]>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M pkgs/development/libraries/haskell/servant-server/default.nix

  Log Message:
  -----------
  Upgrade servant-server to 0.2.3.


  Commit: cee0e2a352cedbc6129bac4cfdd69f3a3e3c1bed
      
https://github.com/NixOS/nixpkgs/commit/cee0e2a352cedbc6129bac4cfdd69f3a3e3c1bed
  Author: Julian K. Arni <[email protected]>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

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

  Log Message:
  -----------
  Upgrade resourcet.
   Builds were failing due to an upper bound in the version we were using.


  Commit: 31d32ab7b60cc19df34de0e1ca0efc0d865b94ed
      
https://github.com/NixOS/nixpkgs/commit/31d32ab7b60cc19df34de0e1ca0efc0d865b94ed
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M pkgs/development/libraries/haskell/resource-pool/default.nix

  Log Message:
  -----------
  haskell-resource-pool: update to version 0.2.3.2


  Commit: 05ab046db920784ef1183c3ad3a1b0a2b8f45bf0
      
https://github.com/NixOS/nixpkgs/commit/05ab046db920784ef1183c3ad3a1b0a2b8f45bf0
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M pkgs/development/libraries/haskell/monad-logger/default.nix

  Log Message:
  -----------
  haskell-monad-logger: update to version 0.3.11.1


  Commit: 559a7c8f38fdc100195a8aaf210306d22bb2ccb0
      
https://github.com/NixOS/nixpkgs/commit/559a7c8f38fdc100195a8aaf210306d22bb2ccb0
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

  Log Message:
  -----------
  haskell-persistent: update to version 2.1.1.4


  Commit: fcdcb01d02709648189d8fac0ac62f03b8ec2a9d
      
https://github.com/NixOS/nixpkgs/commit/fcdcb01d02709648189d8fac0ac62f03b8ec2a9d
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

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


  Commit: a2f6a768f2d1bdfe4b0e37b435cf41b877f89249
      
https://github.com/NixOS/nixpkgs/commit/a2f6a768f2d1bdfe4b0e37b435cf41b877f89249
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

  Log Message:
  -----------
  haskell-yesod: update to version 1.4.1.4


  Commit: 8f8258eeab0ba80b0a72ed4918455134f61ba18c
      
https://github.com/NixOS/nixpkgs/commit/8f8258eeab0ba80b0a72ed4918455134f61ba18c
  Author: Nikita Karetnikov <[email protected]>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  haskell-xml-conduit: update to version 1.2.3.1


  Commit: fff55a968ed8d67cd5d635aee1bb4c63d7c94f22
      
https://github.com/NixOS/nixpkgs/commit/fff55a968ed8d67cd5d635aee1bb4c63d7c94f22
  Author: AndersonTorres <[email protected]>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M nixos/modules/services/x11/window-managers/default.nix

  Log Message:
  -----------
  Update NixOS module files to include WindowMaker

According to a hint on NixOS mailing list[1], I updated 
nixos/modules/services/x11/window-managers/default.nix
to include windowmaker.

1 - https://github.com/NixOS/nixpkgs/pull/4066#issuecomment-72017611


  Commit: 1439e72147bf73adb862fd2d153602a5e52103d7
      
https://github.com/NixOS/nixpkgs/commit/1439e72147bf73adb862fd2d153602a5e52103d7
  Author: koral <[email protected]>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/networking/sslh.nix
    A pkgs/servers/sslh/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  New sslh module.


  Commit: 41ae4d1af9a2273a1925cfe755989ee7f76e8adb
      
https://github.com/NixOS/nixpkgs/commit/41ae4d1af9a2273a1925cfe755989ee7f76e8adb
  Author: Jaka Hudoklin <[email protected]>
  Date:   2015-02-07 (Sat, 07 Feb 2015)

  Changed paths:
    A nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
    A pkgs/servers/limesurvey/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  add limesurvey package and nixos module


  Commit: d6e9df1e1ade98ed3a404c4b37421449b6b86e2f
      
https://github.com/NixOS/nixpkgs/commit/d6e9df1e1ade98ed3a404c4b37421449b6b86e2f
  Author: devhell <^@regexmail.net>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/misc/canto-daemon.nix

  Log Message:
  -----------
  canto-daemon: Add a systemd service

This adds a systemd service for the canto-daemon.


  Commit: 37f58c4f46df41005f2e0ac91d1bb2b15de3887a
      
https://github.com/NixOS/nixpkgs/commit/37f58c4f46df41005f2e0ac91d1bb2b15de3887a
  Author: devhell <^@regexmail.net>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    A pkgs/applications/networking/feedreaders/canto-curses/default.nix
    A pkgs/applications/networking/feedreaders/canto-daemon/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  canto-{curses,daemon}: Add packages

This adds canto-daemon, a feedparser background service, and
canto-curses, a highly customizable curses-based frontend.


  Commit: a9ac564f5000de9e7bf639378efd0b429857a4ea
      
https://github.com/NixOS/nixpkgs/commit/a9ac564f5000de9e7bf639378efd0b429857a4ea
  Author: devhell <^@regexmail.net>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M nixos/modules/services/misc/canto-daemon.nix

  Log Message:
  -----------
  canto-daemon: Fix typo and remove TimeoutStopSec


  Commit: 9fa910521eeaaecb68bd23d7e4f5b91edbacb980
      
https://github.com/NixOS/nixpkgs/commit/9fa910521eeaaecb68bd23d7e4f5b91edbacb980
  Author: Tomasz Kontusz <[email protected]>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

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

  Log Message:
  -----------
  Bump TaskWarrior to 2.4.0


  Commit: dc9cdb2beb765011123f81b1390107b24fc61de4
      
https://github.com/NixOS/nixpkgs/commit/dc9cdb2beb765011123f81b1390107b24fc61de4
  Author: j-keck <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  kpcli: 2.7 -> 2.8


  Commit: ac726eb2dd8f9f5fabdd9802fee040f116be0fc8
      
https://github.com/NixOS/nixpkgs/commit/ac726eb2dd8f9f5fabdd9802fee040f116be0fc8
  Author: codyopel <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  libass: refactor & 0.11.1 -> 0.12.1


  Commit: 700f04b8da33dc7a8ea1f5c5c1a945bf003b57ec
      
https://github.com/NixOS/nixpkgs/commit/700f04b8da33dc7a8ea1f5c5c1a945bf003b57ec
  Author: codyopel <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  gsm: fix include directory


  Commit: 5478bcffae44899df9c9670dfc8a6d6933bee374
      
https://github.com/NixOS/nixpkgs/commit/5478bcffae44899df9c9670dfc8a6d6933bee374
  Author: Pascal Wittmann <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/tools/filesystems/tmsu/default.nix

  Log Message:
  -----------
  tmsu: update from 0.5.0 to 0.5.1


  Commit: 14978d867400d0062a37320b9b9039a0cd860312
      
https://github.com/NixOS/nixpkgs/commit/14978d867400d0062a37320b9b9039a0cd860312
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    A pkgs/os-specific/linux/kernel/linux-3.19.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  kernel: Add 3.19 as latest


  Commit: c14348a51d4cdc1c4934b7d8bd0c893c587e7720
      
https://github.com/NixOS/nixpkgs/commit/c14348a51d4cdc1c4934b7d8bd0c893c587e7720
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/tools/networking/tinc/pre.nix

  Log Message:
  -----------
  tinc_pre: Update git version


  Commit: 0e73d1f9a503a75f83171b65c4748895a218882d
      
https://github.com/NixOS/nixpkgs/commit/0e73d1f9a503a75f83171b65c4748895a218882d
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Mark the kernel branch; put in the reminder about grsecurity


  Commit: f03ffa8843ce6a6c05cd57ebd224c6b2fbac1b05
      
https://github.com/NixOS/nixpkgs/commit/f03ffa8843ce6a6c05cd57ebd224c6b2fbac1b05
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Fix typo in Linux 3.19 package set


  Commit: 22718678b68a2352e438a4f6db5784034bee3188
      
https://github.com/NixOS/nixpkgs/commit/22718678b68a2352e438a4f6db5784034bee3188
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6263 from codyopel/libass

libass: refactor & 0.11.1 -> 0.12.1


  Commit: 88d508ae402407ccb3799a2ceceec1e5f4ffc0a0
      
https://github.com/NixOS/nixpkgs/commit/88d508ae402407ccb3799a2ceceec1e5f4ffc0a0
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6262 from codyopel/gsm

gsm: fix include directory


  Commit: 9e60224efbb7811087471f577affced6a4056deb
      
https://github.com/NixOS/nixpkgs/commit/9e60224efbb7811087471f577affced6a4056deb
  Author: codyopel <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/fdk-aac/default.nix

  Log Message:
  -----------
  fdk-aac: disable example encoder by default


  Commit: 8f42f33c456127183703c778d9d31bc46483ebf9
      
https://github.com/NixOS/nixpkgs/commit/8f42f33c456127183703c778d9d31bc46483ebf9
  Author: Wout Mertens <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  stage-1-init: better warnings

- Suppress spurious LVM FD3 warning:
  See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432986
- Warn when device doesn't come online


  Commit: 3b65c29710fea29795620bbed5f1d5104bfd1b0e
      
https://github.com/NixOS/nixpkgs/commit/3b65c29710fea29795620bbed5f1d5104bfd1b0e
  Author: Wout Mertens <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6266 from NixOS/stage1warn

stage-1-init: better warnings


  Commit: b556983eb74c07c3168600eaa8ee5fb9f28f6bb6
      
https://github.com/NixOS/nixpkgs/commit/b556983eb74c07c3168600eaa8ee5fb9f28f6bb6
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M nixos/modules/system/boot/kernel.nix

  Log Message:
  -----------
  nixos/system: Add xhci_pci as it is needed to detect host buses in the initrd 
for usb keyboards on the xhci bus and storage devices on the iso


  Commit: 7a7572dc31990f100098ddfd2e90b8cbdbeeaaa4
      
https://github.com/NixOS/nixpkgs/commit/7a7572dc31990f100098ddfd2e90b8cbdbeeaaa4
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/misc/emulators/wine/unstable.nix

  Log Message:
  -----------
  Update Wine unstable


  Commit: 7c12355ee1e7336b95d11ab25e4b669f5b596ab6
      
https://github.com/NixOS/nixpkgs/commit/7c12355ee1e7336b95d11ab25e4b669f5b596ab6
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/tools/misc/pipelight/default.nix

  Log Message:
  -----------
  Update Wine version in Pipelight


  Commit: f6f3813b653c980b6fdbcf337d92a4c10cda6ef4
      
https://github.com/NixOS/nixpkgs/commit/f6f3813b653c980b6fdbcf337d92a4c10cda6ef4
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/tools/graphics/asymptote/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Packaging Asymptote from scratch to get rid of builderDefsPackage


  Commit: 1d2e7bd803aa347f005ebf00bb8482d8a1071769
      
https://github.com/NixOS/nixpkgs/commit/1d2e7bd803aa347f005ebf00bb8482d8a1071769
  Author: codyopel <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  sakura: 2.4.2 -> 3.2.0


  Commit: a88b2624596ce76371e5b54fed16d86cef259c74
      
https://github.com/NixOS/nixpkgs/commit/a88b2624596ce76371e5b54fed16d86cef259c74
  Author: Brendan Long <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/syncthing/default.nix

  Log Message:
  -----------
  syncthing: Update to 0.10.22


  Commit: 9ca2a22136869466827865f5ebd61108a2141d75
      
https://github.com/NixOS/nixpkgs/commit/9ca2a22136869466827865f5ebd61108a2141d75
  Author: Emery Hemingway <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  picard: 1.3 -> 1.3.2


  Commit: 650b2258f06a191409ea94ea2360644587d0e330
      
https://github.com/NixOS/nixpkgs/commit/650b2258f06a191409ea94ea2360644587d0e330
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M nixos/modules/hardware/all-firmware.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    R pkgs/os-specific/linux/firmware/iwlwifi/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nonfree-firmware: Use the new kernel.org repository for tracking nonfree 
firmware changes

remove the obsolete iwlwifi firmware which is included in the repo.


  Commit: 973b736c17f14522e98e80f3b9f0b4517b4b92b6
      
https://github.com/NixOS/nixpkgs/commit/973b736c17f14522e98e80f3b9f0b4517b4b92b6
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  ldb: 1.1.19 -> 1.1.20


  Commit: 8387fff3d6dea5cd28914ae2a570ce5f52bddfbf
      
https://github.com/NixOS/nixpkgs/commit/8387fff3d6dea5cd28914ae2a570ce5f52bddfbf
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6273 from codyopel/sakura

sakura: 2.4.2 -> 3.2.0


  Commit: 775f8c84dd2af1aa047d83119f27f65c02d037e0
      
https://github.com/NixOS/nixpkgs/commit/775f8c84dd2af1aa047d83119f27f65c02d037e0
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/syncthing/default.nix

  Log Message:
  -----------
  Merge pull request #6274 from brendanlong/syncthing-0.10.22

syncthing: Update to 0.10.22


  Commit: b1737e8c91c06ea40e862e5451710380f1bf5e42
      
https://github.com/NixOS/nixpkgs/commit/b1737e8c91c06ea40e862e5451710380f1bf5e42
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6275 from ehmry/picard

picard: 1.3 -> 1.3.2


  Commit: 376dd19a79a828d8cef1c3ebfa16d37d0997b11d
      
https://github.com/NixOS/nixpkgs/commit/376dd19a79a828d8cef1c3ebfa16d37d0997b11d
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/fdk-aac/default.nix

  Log Message:
  -----------
  Merge pull request #6270 from codyopel/fdkaac

fdk-aac: disable example encoder by default


  Commit: 1791adefb2e2bab4271ed9ca3e9bb46f3dfc0467
      
https://github.com/NixOS/nixpkgs/commit/1791adefb2e2bab4271ed9ca3e9bb46f3dfc0467
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6271 from ktosiek/taskwarrior

Bump TaskWarrior to 2.4.0


  Commit: d49405a5abf7f4c63b9f9a5836e9790824f6406c
      
https://github.com/NixOS/nixpkgs/commit/d49405a5abf7f4c63b9f9a5836e9790824f6406c
  Author: Daniel Peebles <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/servers/sql/mysql/5.5.x.nix

  Log Message:
  -----------
  Fix broken URL

Fix #6219, but no longer uses the mirrors. They probably need updating


  Commit: eeb5319a43b9a1757b2ae33a71b142ab4b45fceb
      
https://github.com/NixOS/nixpkgs/commit/eeb5319a43b9a1757b2ae33a71b142ab4b45fceb
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M pkgs/os-specific/linux/nvidia-x11/default.nix

  Log Message:
  -----------
  nvidia_x11: 343.36 -> 346.35


  Commit: 2961b83d08a18f6ac9c9d87a347cf5f2cea27690
      
https://github.com/NixOS/nixpkgs/commit/2961b83d08a18f6ac9c9d87a347cf5f2cea27690
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/hardware/cdemu.nix
    A pkgs/misc/emulators/cdemu/analyzer.nix
    A pkgs/misc/emulators/cdemu/base.nix
    A pkgs/misc/emulators/cdemu/client.nix
    A pkgs/misc/emulators/cdemu/daemon.nix
    A pkgs/misc/emulators/cdemu/gui.nix
    A pkgs/misc/emulators/cdemu/libmirage.nix
    A pkgs/misc/emulators/cdemu/vhba.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Add cdemu packages and module


  Commit: 0a2e86849aeea20504908b8d0a57a8b7d0126e6c
      
https://github.com/NixOS/nixpkgs/commit/0a2e86849aeea20504908b8d0a57a8b7d0126e6c
  Author: Michael Raskin <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/os-specific/linux/sysdig/default.nix

  Log Message:
  -----------
  Update sysdig; 0.1.96 still doesn't work with Linux 3.19


  Commit: d06122c58dad4f964417efe61c4071b2e2468785
      
https://github.com/NixOS/nixpkgs/commit/d06122c58dad4f964417efe61c4071b2e2468785
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/services/audio/mpd.nix

  Log Message:
  -----------
  Add PermissionsStartOnly to mpd service. Closes #6277


  Commit: 7614b2f9848345a5b3fef361867af6c3d1a760de
      
https://github.com/NixOS/nixpkgs/commit/7614b2f9848345a5b3fef361867af6c3d1a760de
  Author: lethalman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/misc/canto-daemon.nix
    A pkgs/applications/networking/feedreaders/canto-curses/default.nix
    A pkgs/applications/networking/feedreaders/canto-daemon/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #6229 from devhell/canto

canto-{curses,daemon}: Add packages


  Commit: 93ebaafabe1bc8bf978827437791bbe8cfc95bb5
      
https://github.com/NixOS/nixpkgs/commit/93ebaafabe1bc8bf978827437791bbe8cfc95bb5
  Author: lethalman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/networking/sslh.nix
    A pkgs/servers/sslh/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #6170 from k0ral/sslh

New sslh module


  Commit: 42722a2940bbacbd1c4eda5aedfc427ed8bad085
      
https://github.com/NixOS/nixpkgs/commit/42722a2940bbacbd1c4eda5aedfc427ed8bad085
  Author: Benno Fünfstück <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6279 from j-keck/kpcli

kpcli: 2.7 -> 2.8


  Commit: 3786f08d254a3aa7d3c8c89071e02580f7e8f88e
      
https://github.com/NixOS/nixpkgs/commit/3786f08d254a3aa7d3c8c89071e02580f7e8f88e
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/build-support/vm/default.nix

  Log Message:
  -----------
  Add Fedora 21


  Commit: b909def3e17d261df2cf1947eceb43f140113bf2
      
https://github.com/NixOS/nixpkgs/commit/b909def3e17d261df2cf1947eceb43f140113bf2
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/services/hardware/cdemu.nix
    M pkgs/misc/emulators/cdemu/gui.nix

  Log Message:
  -----------
  Whitespace cleanup


  Commit: 12834a8500619b247a52594ea94b0a1a423ad6d9
      
https://github.com/NixOS/nixpkgs/commit/12834a8500619b247a52594ea94b0a1a423ad6d9
  Author: lethalman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/services/x11/window-managers/default.nix

  Log Message:
  -----------
  Merge pull request #6072 from AndersonTorres/window-managers

Update NixOS module files to include WindowMaker


  Commit: 983fddcea892485949923f6e0c947d2bee6ba09c
      
https://github.com/NixOS/nixpkgs/commit/983fddcea892485949923f6e0c947d2bee6ba09c
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/programs/cdemu.nix
    R nixos/modules/services/hardware/cdemu.nix

  Log Message:
  -----------
  Move cdemu module into programs


  Commit: 67f9c8b0254569db56eba0c7069975d1a36fd5a7
      
https://github.com/NixOS/nixpkgs/commit/67f9c8b0254569db56eba0c7069975d1a36fd5a7
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/misc/emulators/cdemu/analyzer.nix
    M pkgs/misc/emulators/cdemu/gui.nix

  Log Message:
  -----------
  Fix cdemu ui gsettings schema paths


  Commit: 57f2d329acec8265cf5ab6fc5c3fb7752e4ac5c1
      
https://github.com/NixOS/nixpkgs/commit/57f2d329acec8265cf5ab6fc5c3fb7752e4ac5c1
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    A pkgs/os-specific/linux/kernel/crc-regression.patch
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  linux_3_{10,12,14}: fix upstream regression, fixes #6231

Some modules wouldn't load crc32c dependency due to module renaming.


  Commit: 1e5ce3f0244d439965f0a8527c423a045e6e9e75
      
https://github.com/NixOS/nixpkgs/commit/1e5ce3f0244d439965f0a8527c423a045e6e9e75
  Author: Georges Dubus <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  openfortivpn: Added expression


  Commit: 8850692609d82189669fabd2f48bc21cfe4d2321
      
https://github.com/NixOS/nixpkgs/commit/8850692609d82189669fabd2f48bc21cfe4d2321
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/development/ocaml-modules/sqlite3/default.nix

  Log Message:
  -----------
  ocaml-sqlite3: update from 2.0.7 to 2.0.8


  Commit: b73ce293fbcb5b0b7dc95f99a5f7cbffeabd972f
      
https://github.com/NixOS/nixpkgs/commit/b73ce293fbcb5b0b7dc95f99a5f7cbffeabd972f
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/development/ocaml-modules/ezjsonm/default.nix

  Log Message:
  -----------
  ocaml-ezjsonm: update from 0.3.1 to 0.4.1


  Commit: 10a84b3c6917ed70aa99f74b7ef60091810b9d26
      
https://github.com/NixOS/nixpkgs/commit/10a84b3c6917ed70aa99f74b7ef60091810b9d26
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/applications/editors/bluefish/default.nix

  Log Message:
  -----------
  bluefish: update from 2.2.6 to 2.2.7


  Commit: 1d137ebfdfe1b1ba6d08acd9a5e8256dc73ce88d
      
https://github.com/NixOS/nixpkgs/commit/1d137ebfdfe1b1ba6d08acd9a5e8256dc73ce88d
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/development/ocaml-modules/re/default.nix

  Log Message:
  -----------
  ocaml-re: update from 1.2.2 to 1.3.0


  Commit: eb03122cf6f2d0bb5db86458c31cf052f9da9d04
      
https://github.com/NixOS/nixpkgs/commit/eb03122cf6f2d0bb5db86458c31cf052f9da9d04
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/misc/emulators/cdemu/analyzer.nix
    M pkgs/misc/emulators/cdemu/gui.nix

  Log Message:
  -----------
  Use gnome3 icon theme in cdemu


  Commit: 7d24bcdbcf0c1c018900235ba8e97fe901892156
      
https://github.com/NixOS/nixpkgs/commit/7d24bcdbcf0c1c018900235ba8e97fe901892156
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/misc/emulators/cdemu/analyzer.nix
    M pkgs/misc/emulators/cdemu/gui.nix

  Log Message:
  -----------
  Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui programs


  Commit: dea3ac7783568482e3a18a1b4603702fdcff1dd9
      
https://github.com/NixOS/nixpkgs/commit/dea3ac7783568482e3a18a1b4603702fdcff1dd9
  Author: Herwig Hochleitner <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/misc/emulators/cdemu/analyzer.nix
    M pkgs/misc/emulators/cdemu/gui.nix

  Log Message:
  -----------
  Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS


  Commit: a1d11517923811807300d6b8a06b1534427b6154
      
https://github.com/NixOS/nixpkgs/commit/a1d11517923811807300d6b8a06b1534427b6154
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  pgcli: update 0.14.0 -> 0.15.4


  Commit: 80dd1aa437f6d90771c833ac19947cd4dba1fb00
      
https://github.com/NixOS/nixpkgs/commit/80dd1aa437f6d90771c833ac19947cd4dba1fb00
  Author: codyopel <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  faac: revert licensing change


  Commit: c1d22c947e5097c24b20424fefede4a53cc0f9ff
      
https://github.com/NixOS/nixpkgs/commit/c1d22c947e5097c24b20424fefede4a53cc0f9ff
  Author: lethalman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/programs/cdemu.nix
    A pkgs/misc/emulators/cdemu/analyzer.nix
    A pkgs/misc/emulators/cdemu/base.nix
    A pkgs/misc/emulators/cdemu/client.nix
    A pkgs/misc/emulators/cdemu/daemon.nix
    A pkgs/misc/emulators/cdemu/gui.nix
    A pkgs/misc/emulators/cdemu/libmirage.nix
    A pkgs/misc/emulators/cdemu/vhba.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #6278 from bendlas/cdemu

Add cdemu packages and module


  Commit: 815c2c787128c8a54c0889ec990fdd1e2d32fded
      
https://github.com/NixOS/nixpkgs/commit/815c2c787128c8a54c0889ec990fdd1e2d32fded
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6280 from codyopel/faacbr

faac: revert licensing change


  Commit: e65e8983d943425f2069dcf53221e0f2987d1ee8
      
https://github.com/NixOS/nixpkgs/commit/e65e8983d943425f2069dcf53221e0f2987d1ee8
  Author: Emery Hemingway <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  nim: initial package at 0.10.2


  Commit: e7762c55bb7c0ab43ed3c6ae5b7306bab7be6011
      
https://github.com/NixOS/nixpkgs/commit/e7762c55bb7c0ab43ed3c6ae5b7306bab7be6011
  Author: lethalman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6281 from ehmry/nim

nim: initial package at 0.10.2


  Commit: 7a6af47cca7000d766873900efc211169d83b101
      
https://github.com/NixOS/nixpkgs/commit/7a6af47cca7000d766873900efc211169d83b101
  Author: Bjørn Forsman <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M nixos/tests/jenkins.nix

  Log Message:
  -----------
  nixos/tests/jenkins: increase timeout to 6 minutes

Fixes the test failure, at least on my system.


  Commit: f5b3ca147319aeb63a8f54be4731349f6be6192e
      
https://github.com/NixOS/nixpkgs/commit/f5b3ca147319aeb63a8f54be4731349f6be6192e
  Author: Emery Hemingway <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/instant-messengers/ratox/default.nix

  Log Message:
  -----------
  ratox: bump to 0.2.1


  Commit: fd6e830aa36bfba22329be19dbe6cc5643534309
      
https://github.com/NixOS/nixpkgs/commit/fd6e830aa36bfba22329be19dbe6cc5643534309
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  gsm: compile with -fPIC to fix build in mediastreamer for ZHF


  Commit: 5e608de1ac1f116a5c6595f5a6757d21d1398d56
      
https://github.com/NixOS/nixpkgs/commit/5e608de1ac1f116a5c6595f5a6757d21d1398d56
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/tools/system/stress-ng/default.nix

  Log Message:
  -----------
  stress-ng: update 0.03.14 -> 0.03.15


  Commit: 0f18322026a3fc6db8c9659f8a77a726885792e0
      
https://github.com/NixOS/nixpkgs/commit/0f18322026a3fc6db8c9659f8a77a726885792e0
  Author: codyopel <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/libvpx/default.nix
    A pkgs/development/libraries/libvpx/git.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  libvpx: refactor & add git (close #6213)


  Commit: 26127df6cb472b9dcb1659ba57adec68feac0dd6
      
https://github.com/NixOS/nixpkgs/commit/26127df6cb472b9dcb1659ba57adec68feac0dd6
  Author: cillianderoiste <[email protected]>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/instant-messengers/ratox/default.nix

  Log Message:
  -----------
  Merge pull request #6288 from ehmry/ratox

ratox: bump to 0.2.1


  Commit: 54397283b0cee3b58cc24aaa9481719437595f88
      
https://github.com/NixOS/nixpkgs/commit/54397283b0cee3b58cc24aaa9481719437595f88
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A pkgs/development/tools/analysis/include-what-you-use/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Add include-what-you-use 3.5: static C/C++ #include analyser


  Commit: a5c072a610724762ca247b88fd0591e1e1d1a696
      
https://github.com/NixOS/nixpkgs/commit/a5c072a610724762ca247b88fd0591e1e1d1a696
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  kernel: common-config.nix: remove useless 'FTRACE n' before 'y'


  Commit: 5da0d18a0a20ad8d55d1524139a0d4c0cafe3cf7
      
https://github.com/NixOS/nixpkgs/commit/5da0d18a0a20ad8d55d1524139a0d4c0cafe3cf7
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  boto: 2.34.0 -> 2.36.0


  Commit: 4869902a70808d78bd8ff0efc3ba7d6944cb9288
      
https://github.com/NixOS/nixpkgs/commit/4869902a70808d78bd8ff0efc3ba7d6944cb9288
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  sqlalchemy9: 0.9.4 -> 0.9.8


  Commit: 2024e08564ece8ba332d52b88a44d89b525a8124
      
https://github.com/NixOS/nixpkgs/commit/2024e08564ece8ba332d52b88a44d89b525a8124
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/protobuf/2.5.nix
    M pkgs/development/libraries/protobuf/2.6.nix
    M pkgs/development/libraries/protobuf/generic.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  partially fix pythonPackages.protobuf


  Commit: a586293706834c1852e0a6b87632d93c4f79f1e4
      
https://github.com/NixOS/nixpkgs/commit/a586293706834c1852e0a6b87632d93c4f79f1e4
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  sympy: 0.7.4 -> 0.7.6


  Commit: fa51c9bfc175c1d33541237b04f387e7bb8661d2
      
https://github.com/NixOS/nixpkgs/commit/fa51c9bfc175c1d33541237b04f387e7bb8661d2
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  browserid: disable tests


  Commit: f7b26bf98ff9fcb65fdb7e609bce4a0a237e64fc
      
https://github.com/NixOS/nixpkgs/commit/f7b26bf98ff9fcb65fdb7e609bce4a0a237e64fc
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
    A pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
    R pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch

  Log Message:
  -----------
  gnome3: Set XCURSOR_PATH. Closes #6191


  Commit: 4c7adddcb7ae435cdecceeb627dca22ae581ca09
      
https://github.com/NixOS/nixpkgs/commit/4c7adddcb7ae435cdecceeb627dca22ae581ca09
  Author: Sander van der Burg <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  s3fs: Add package


  Commit: 157d199b33bee85aeeb256e84abf55523539eaa0
      
https://github.com/NixOS/nixpkgs/commit/157d199b33bee85aeeb256e84abf55523539eaa0
  Author: lethalman <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A nixos/modules/programs/fish/fish.nix

  Log Message:
  -----------
  Merge pull request #5626 from matthiasbeyer/add-fish_shell_module

Add basic nixos module for fish shell


  Commit: d7f5d00f0a7a73e3f7a837b741bae25814490e3b
      
https://github.com/NixOS/nixpkgs/commit/d7f5d00f0a7a73e3f7a837b741bae25814490e3b
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix

  Log Message:
  -----------
  Add fish to nixos module list


  Commit: 81d1422d0d13210ee7bf7c3e1ab6eb705ff8120a
      
https://github.com/NixOS/nixpkgs/commit/81d1422d0d13210ee7bf7c3e1ab6eb705ff8120a
  Author: berdario <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  Forgot to update the all-packages.nix


  Commit: ef15f769feeb1d184bf5aae8f3026907394afb7d
      
https://github.com/NixOS/nixpkgs/commit/ef15f769feeb1d184bf5aae8f3026907394afb7d
  Author: berdario <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/servers/nosql/redis/3.0.nix

  Log Message:
  -----------
  redis3.0.0-rc3


  Commit: 52879c9050c9786ea8aa018ab16a5284199d1131
      
https://github.com/NixOS/nixpkgs/commit/52879c9050c9786ea8aa018ab16a5284199d1131
  Author: Shea Levy <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  pass: fix completion installation


  Commit: 77f160e467b409f8f4b0e5870b36b4f4361d1b48
      
https://github.com/NixOS/nixpkgs/commit/77f160e467b409f8f4b0e5870b36b4f4361d1b48
  Author: lethalman <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A pkgs/servers/nosql/redis/3.0.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #5867 from berdario/redis3

Add redis-3.0.0-rc2


  Commit: 5cd15f8cc0685784ef94dbde953774efa325c681
      
https://github.com/NixOS/nixpkgs/commit/5cd15f8cc0685784ef94dbde953774efa325c681
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/development/ocaml-modules/cmdliner/default.nix

  Log Message:
  -----------
  ocaml-cmdliner: update from 0.9.6 to 0.9.7


  Commit: 3934bef1384d7e6d6a8df4afb900484101ff67fe
      
https://github.com/NixOS/nixpkgs/commit/3934bef1384d7e6d6a8df4afb900484101ff67fe
  Author: Edward Tjörnhammar <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  fetchFromGitorious: add helper


  Commit: c427b48ba699217b635e4f7ec961526d0a4a48ad
      
https://github.com/NixOS/nixpkgs/commit/c427b48ba699217b635e4f7ec961526d0a4a48ad
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M nixos/modules/module-list.nix

  Log Message:
  -----------
  Revert "Add fish to nixos module list"

This reverts commit d7f5d00f0a7a73e3f7a837b741bae25814490e3b.


  Commit: e088fd0314967855f14f01bd33c99e63ed5dfe51
      
https://github.com/NixOS/nixpkgs/commit/e088fd0314967855f14f01bd33c99e63ed5dfe51
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    R nixos/modules/programs/fish/fish.nix

  Log Message:
  -----------
  Revert "Merge pull request #5626 from matthiasbeyer/add-fish_shell_module"

This reverts commit 157d199b33bee85aeeb256e84abf55523539eaa0, reversing
changes made to 4c7adddcb7ae435cdecceeb627dca22ae581ca09.


  Commit: c42d36de1a4395acf5661da19ad2ea1a209474dc
      
https://github.com/NixOS/nixpkgs/commit/c42d36de1a4395acf5661da19ad2ea1a209474dc
  Author: Bjørn Forsman <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/tools/filesystems/genext2fs/default.nix

  Log Message:
  -----------
  genext2fs: add meta.{platforms,license,maintainers}


  Commit: 52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b
      
https://github.com/NixOS/nixpkgs/commit/52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b
  Author: Joel Taylor <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/top-level/haskell-ng.nix

  Log Message:
  -----------
  Build GHC HEAD from git checkout


  Commit: a86fd94ecce623b4d8800d28f1211cde77ba05d7
      
https://github.com/NixOS/nixpkgs/commit/a86fd94ecce623b4d8800d28f1211cde77ba05d7
  Author: Eric Seidel <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  only link libsodium against libssp when building with gcc


  Commit: 5742b242716564d9bf3b575e7ed4e8c4c3537d08
      
https://github.com/NixOS/nixpkgs/commit/5742b242716564d9bf3b575e7ed4e8c4c3537d08
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    R pkgs/os-specific/linux/zfs/3.19-compat-git.patch
    M pkgs/os-specific/linux/zfs/git.nix

  Log Message:
  -----------
  zfs_git: Update and remove obsolete patch


  Commit: 35e9d3c112202bad6b51756f2676d2e0a251abd5
      
https://github.com/NixOS/nixpkgs/commit/35e9d3c112202bad6b51756f2676d2e0a251abd5
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M nixos/modules/tasks/filesystems/zfs.nix

  Log Message:
  -----------
  nixos/zfs: Use the git version for kernels unsupported by 0.6.3


  Commit: 6b16a7fbd72194d94f53fabe8ff5aa94ebb47675
      
https://github.com/NixOS/nixpkgs/commit/6b16a7fbd72194d94f53fabe8ff5aa94ebb47675
  Author: Peter Simons <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/top-level/haskell-ng.nix

  Log Message:
  -----------
  Merge pull request #6309 from joelteon/ghc-head-git

Build GHC HEAD from git checkout


  Commit: 505ab03a1e45d265c506322bedd69ab206d7e276
      
https://github.com/NixOS/nixpkgs/commit/505ab03a1e45d265c506322bedd69ab206d7e276
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/notbit/default.nix

  Log Message:
  -----------
  notbit: Update git


  Commit: 3a17654b711620a8dbc7d8f86b54bbcea40066a3
      
https://github.com/NixOS/nixpkgs/commit/3a17654b711620a8dbc7d8f86b54bbcea40066a3
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/tools/ocaml/ocp-build/default.nix

  Log Message:
  -----------
  ocp-build: update source and website URLs


  Commit: cb153cfca314a8c1f9fd263a82e8a8a7e32aafbb
      
https://github.com/NixOS/nixpkgs/commit/cb153cfca314a8c1f9fd263a82e8a8a7e32aafbb
  Author: koral <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M nixos/modules/services/networking/sslh.nix
    M pkgs/servers/sslh/default.nix

  Log Message:
  -----------
  sslh: added libwrap support + improved nixos module.


  Commit: 3b17a2054b40d870a0b44ae4bf8d2272a2f48175
      
https://github.com/NixOS/nixpkgs/commit/3b17a2054b40d870a0b44ae4bf8d2272a2f48175
  Author: Luca Bruno <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    A pkgs/tools/networking/polygraph/default.nix
    A pkgs/tools/networking/polygraph/fix_build.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  polygraph: new package

Performance testing tool for caching proxies, origin server accelerators, L4/7 
switches, content filters, and other Web intermediaries

http://www.web-polygraph.org


  Commit: 1907ca8a2aaa51d3e6910bb086dd75efffa81a6b
      
https://github.com/NixOS/nixpkgs/commit/1907ca8a2aaa51d3e6910bb086dd75efffa81a6b
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M nixos/release-combined.nix

  Log Message:
  -----------
  Drop tests.installer.grub1 as release critical

This test sometimes fails with

  Kernel panic - not syncing: assertion "i && sym_get_cam_status(cp->cmd) == 
DID_SOFT_ERROR" failed: file 
"/tmp/nix-build-linux-3.14.32.drv-0/linux-3.14.32/drivers/scsi/sym53c8xx_2/sym_hipd.c",
 line 3399

after "sd 2:0:0:0: ABORT operation timed-out."

Since we don't care all that much about GRUB 1 anymore, don't make the
release depend on it.

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


  Commit: 91c31bcc5743089f46da3b32b4f33231ab8c1b50
      
https://github.com/NixOS/nixpkgs/commit/91c31bcc5743089f46da3b32b4f33231ab8c1b50
  Author: Matthias Beyer <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/tools/security/gnupg/21.nix

  Log Message:
  -----------
  Update gnupg21 package to gpg-2.1.2


  Commit: da73688e3d2111414b68c2a014efe5bdc1c7d5fb
      
https://github.com/NixOS/nixpkgs/commit/da73688e3d2111414b68c2a014efe5bdc1c7d5fb
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/build-support/vm/default.nix

  Log Message:
  -----------
  fillDiskWithRPMs: Shut up some warnings


  Commit: 28ea9050fa791d9c53209363d27159693b03d635
      
https://github.com/NixOS/nixpkgs/commit/28ea9050fa791d9c53209363d27159693b03d635
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/build-support/vm/default.nix
    R pkgs/build-support/vm/rpm/redhat-9-i386.list
    R pkgs/build-support/vm/rpm/redhat-9-i386.nix
    R pkgs/build-support/vm/rpm/rpm-list-to-nix.pl
    R pkgs/build-support/vm/rpm/suse-9-i386.list
    R pkgs/build-support/vm/rpm/suse-9-i386.nix

  Log Message:
  -----------
  Remove ancient RedHat 9 / SuSE 9 images

These are 12 years old and I don't think anybody is using them.


  Commit: ff37dc6fb68746d3ca9c1271e158c119989011db
      
https://github.com/NixOS/nixpkgs/commit/ff37dc6fb68746d3ca9c1271e158c119989011db
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/build-support/vm/rpm/rpm-closure.pl

  Log Message:
  -----------
  Remove tabs


  Commit: fa47d347a4b159a677f773997640b3defe20c125
      
https://github.com/NixOS/nixpkgs/commit/fa47d347a4b159a677f773997640b3defe20c125
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/build-support/vm/rpm/rpm-closure.pl

  Log Message:
  -----------
  Fix conflict between fedora-release and generic-release

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


  Commit: 6827c7d8b0ff0f74049b1a0b737f8bbaddf9bc49
      
https://github.com/NixOS/nixpkgs/commit/6827c7d8b0ff0f74049b1a0b737f8bbaddf9bc49
  Author: Peter Simons <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/tools/security/gnupg/21.nix

  Log Message:
  -----------
  Merge pull request #6315 from matthiasbeyer/update-gnupg

Update gnupg21 package to gpg-2.1.2


  Commit: 36e7a61ddea57bb0f0692b984377141fbffc270d
      
https://github.com/NixOS/nixpkgs/commit/36e7a61ddea57bb0f0692b984377141fbffc270d
  Author: Jaka Hudoklin <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    A nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
    A pkgs/servers/limesurvey/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #6222 from offlinehacker/limesurvey

add limesurvey package and nixos module


  Commit: 9060376bcde5a023b14d80c7bfdb25f5aeabb57f
      
https://github.com/NixOS/nixpkgs/commit/9060376bcde5a023b14d80c7bfdb25f5aeabb57f
  Author: Jaka Hudoklin <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/web/nodejs/build-node-package.nix

  Log Message:
  -----------
  buildNodePackage: patch shebangs only in text files


  Commit: a17f5c8c9bfa58a9bdd578971b13d2aa1b2024d1
      
https://github.com/NixOS/nixpkgs/commit/a17f5c8c9bfa58a9bdd578971b13d2aa1b2024d1
  Author: Jaka Hudoklin <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  nixos/consul: add consul-alerts service


  Commit: a43db5fa2025c998ce0d72dc7dd425152d26ad59
      
https://github.com/NixOS/nixpkgs/commit/a43db5fa2025c998ce0d72dc7dd425152d26ad59
  Author: Tobias Geerinckx-Rice <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  kernel: common-config.nix: enable FANOTIFY


  Commit: 79a5fec9c053a0b1303e121060a839d4b9ec2e55
      
https://github.com/NixOS/nixpkgs/commit/79a5fec9c053a0b1303e121060a839d4b9ec2e55
  Author: Peter Simons <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  python-generic: set meta.broken for disabled packages instead of raising an 
error during evaluation

We have tons of evaluation errors on Hydra because it tries to build
known broken packages. Re-using meta.broken makes sure these packages
aren't evaluated in the first place.


  Commit: cf1550cbbf98613a59212c3bd0a5b813a753ce77
      
https://github.com/NixOS/nixpkgs/commit/cf1550cbbf98613a59212c3bd0a5b813a753ce77
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list

  Log Message:
  -----------
  xorg-server: security+bugfix, including CVE-2015-0255

Tested briefly against 14.12.


  Commit: 15416dd2eca1bc3d214649b0f034e40a1daee2ab
      
https://github.com/NixOS/nixpkgs/commit/15416dd2eca1bc3d214649b0f034e40a1daee2ab
  Author: Peter Simons <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/top-level/haskell-ng.nix

  Log Message:
  -----------
  Revert "Build GHC HEAD from git checkout".

This reverts commit 52c8d7c4ab0b2b2c97faa848b98dfc0ae9b69d7b. The new
expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw.


  Commit: 20ab4027da00019de2c2df5fb97f6dd1ae82de17
      
https://github.com/NixOS/nixpkgs/commit/20ab4027da00019de2c2df5fb97f6dd1ae82de17
  Author: Ivan Sorokin <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    A pkgs/shells/bash-completion/bash-4.3.patch
    M pkgs/shells/bash-completion/default.nix

  Log Message:
  -----------
  bash-completion: fix bad array subscript error. Closes #6117


  Commit: 4dfafb8ff7970cebcc2ba92c38815ffb03c39ff5
      
https://github.com/NixOS/nixpkgs/commit/4dfafb8ff7970cebcc2ba92c38815ffb03c39ff5
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  lyx: maintenance update


  Commit: 0893fc1e7be1aea05830ca9b42991ced89174234
      
https://github.com/NixOS/nixpkgs/commit/0893fc1e7be1aea05830ca9b42991ced89174234
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  djvulibre: small update

I find no new build failures of depending packages.


  Commit: 3d8b3fe2533b5f5e5665506516b2508bef57530d
      
https://github.com/NixOS/nixpkgs/commit/3d8b3fe2533b5f5e5665506516b2508bef57530d
  Author: Peter Simons <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    A pkgs/shells/bash-completion/bash-4.3.patch
    M pkgs/shells/bash-completion/default.nix

  Log Message:
  -----------
  Merge pull request #6319 from sorokin/master

bash-completion: fix bad array subscript error. Closes #6117


  Commit: e2915fc5d19ae7822355c8554002868c283b00dc
      
https://github.com/NixOS/nixpkgs/commit/e2915fc5d19ae7822355c8554002868c283b00dc
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M nixos/tests/installer.nix

  Log Message:
  -----------
  nixos/tests: Fix installer test by providing a missing dependency


  Commit: 8afa77cb0729187196b8a9efb0715d66c2e00c1f
      
https://github.com/NixOS/nixpkgs/commit/8afa77cb0729187196b8a9efb0715d66c2e00c1f
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/vala/0.26.nix

  Log Message:
  -----------
  vala-0.26: minor update to fix CVE-2014-8154

@lethalman: it seems strange to me to have the 0.23.* version as
the default, as it's even an unstable release.


  Commit: d3b25752f18087868ba78f18a90220914ac1d9c5
      
https://github.com/NixOS/nixpkgs/commit/d3b25752f18087868ba78f18a90220914ac1d9c5
  Author: Vladimír Čunát <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/tools/archivers/p7zip/default.nix

  Log Message:
  -----------
  p7zip: small update to fix CVE-2015-1038


  Commit: b43fc565f16324b416bf13c6bbb14083bcf853d9
      
https://github.com/NixOS/nixpkgs/commit/b43fc565f16324b416bf13c6bbb14083bcf853d9
  Author: Joel Taylor <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  linker flags for sbcl


  Commit: 1dea4e5297e4e11b8c0bc67689ddf0dc40d11497
      
https://github.com/NixOS/nixpkgs/commit/1dea4e5297e4e11b8c0bc67689ddf0dc40d11497
  Author: John Wiegley <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6321 from joelteon/sbcl

Linker flags for sbcl on Darwin


  Commit: 25cc033426f35dd65e1c3f8044cde23f0eaf20bb
      
https://github.com/NixOS/nixpkgs/commit/25cc033426f35dd65e1c3f8044cde23f0eaf20bb
  Author: koral <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/applications/office/impressive/default.nix

  Log Message:
  -----------
  impressive: 0.10.3 -> 0.10.5 (close #6228)


  Commit: 68c6ca44e6cf2f2a28b6d409ab4df8ae1983edb5
      
https://github.com/NixOS/nixpkgs/commit/68c6ca44e6cf2f2a28b6d409ab4df8ae1983edb5
  Author: John Wiegley <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  sbcl_1_2_0: port over joelteon's change to 1.2.8


  Commit: 3269e202b1691e9df5365dee30966934dc3ab5cb
      
https://github.com/NixOS/nixpkgs/commit/3269e202b1691e9df5365dee30966934dc3ab5cb
  Author: codyopel <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/libvpx/git.nix

  Log Message:
  -----------
  libvpx-git: bump commit & disable high bitdepth builds on i686


  Commit: 2f2d638d38e8e447d832a30e3027a5da1802fe72
      
https://github.com/NixOS/nixpkgs/commit/2f2d638d38e8e447d832a30e3027a5da1802fe72
  Author: Jaka Hudoklin <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6317 from offlinehacker/nixos/consul/alerts

nixos/consul: add consul-alerts service


  Commit: 90ea935252d0aa09095c8fd7a1189d57521e2596
      
https://github.com/NixOS/nixpkgs/commit/90ea935252d0aa09095c8fd7a1189d57521e2596
  Author: codyopel <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  x265: 1.4 -> 1.5


  Commit: b60f5a004a9a1a312cbb3600e3d950671688c0d7
      
https://github.com/NixOS/nixpkgs/commit/b60f5a004a9a1a312cbb3600e3d950671688c0d7
  Author: codyopel <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/x265/hg.nix

  Log Message:
  -----------
  x265-hg: bump commit


  Commit: 3f22fdf7b0f03322a08a64c183293984f7a71388
      
https://github.com/NixOS/nixpkgs/commit/3f22fdf7b0f03322a08a64c183293984f7a71388
  Author: codyopel <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/x265/generic.nix

  Log Message:
  -----------
  x265: refactor & add optionals


  Commit: b39d5ea309ef702974b3a126f4d5dab464ee757b
      
https://github.com/NixOS/nixpkgs/commit/b39d5ea309ef702974b3a126f4d5dab464ee757b
  Author: John Wiegley <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  contacts: New expression for darwin


  Commit: 4dfd6cdfb7faa9881655f2b5ba40112cc059621f
      
https://github.com/NixOS/nixpkgs/commit/4dfd6cdfb7faa9881655f2b5ba40112cc059621f
  Author: William A. Kennington III <[email protected]>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/libvpx/git.nix

  Log Message:
  -----------
  Merge pull request #6323 from codyopel/libvpxbr

libvpx-git: bump commit & disable high bitdepth builds on i686


  Commit: b2d17156bbf84ad6fd8aeec1a2f985a3b77f1e2c
      
https://github.com/NixOS/nixpkgs/commit/b2d17156bbf84ad6fd8aeec1a2f985a3b77f1e2c
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/x265/default.nix
    M pkgs/development/libraries/x265/generic.nix
    M pkgs/development/libraries/x265/hg.nix

  Log Message:
  -----------
  Merge pull request #6324 from codyopel/x265br

X265br


  Commit: 5a4614dc1f3c71237d41562b0cb7f76cf7e2fa39
      
https://github.com/NixOS/nixpkgs/commit/5a4614dc1f3c71237d41562b0cb7f76cf7e2fa39
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M nixos/modules/system/boot/kernel.nix

  Log Message:
  -----------
  Add hid_lenovo to initrd kernel modules


  Commit: cbc58da3f08cd68b44042eaf1324859995337bbd
      
https://github.com/NixOS/nixpkgs/commit/cbc58da3f08cd68b44042eaf1324859995337bbd
  Author: Vincent Laporte <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/ocaml-modules/sqlite3/default.nix

  Log Message:
  -----------
  ocaml-sqlite3: update from 2.0.8 to 2.0.9


  Commit: 51a7277facb14b56602a39a194a0048ff5a56863
      
https://github.com/NixOS/nixpkgs/commit/51a7277facb14b56602a39a194a0048ff5a56863
  Author: lethalman <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M nixos/modules/services/networking/sslh.nix
    M pkgs/servers/sslh/default.nix

  Log Message:
  -----------
  Merge pull request #6312 from k0ral/sslh

sslh: added libwrap support + improved nixos module.


  Commit: e4037ae9133b07cf0466c1d80f0d2b23d2faa01e
      
https://github.com/NixOS/nixpkgs/commit/e4037ae9133b07cf0466c1d80f0d2b23d2faa01e
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  -----------
  hackage-packages.nix: re-generate from Hackage 2015-02-12T20:00:15+0100


  Commit: 6c3e44c040d48a09da3cf1358da7a9880f0fe849
      
https://github.com/NixOS/nixpkgs/commit/6c3e44c040d48a09da3cf1358da7a9880f0fe849
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-rasterific: the broken test suite has been removed


  Commit: 27b57469e812d4afad8a62f07ab25b94cb02757a
      
https://github.com/NixOS/nixpkgs/commit/27b57469e812d4afad8a62f07ab25b94cb02757a
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  python-generic: cosmetic


  Commit: 60cb74e6d6a29b18690a9fc5ea0794a81a755c5c
      
https://github.com/NixOS/nixpkgs/commit/60cb74e6d6a29b18690a9fc5ea0794a81a755c5c
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-CHXHtml: disable Hydra builds because of excessive build time


  Commit: 095a7f8cd6e7b65e5d10c6eadde4e4ab859a1338
      
https://github.com/NixOS/nixpkgs/commit/095a7f8cd6e7b65e5d10c6eadde4e4ab859a1338
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-blaze-markup: disable failing test suite


  Commit: 8c0d54e46ad1a4dea48d9f34fd429607aa5a3ffe
      
https://github.com/NixOS/nixpkgs/commit/8c0d54e46ad1a4dea48d9f34fd429607aa5a3ffe
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-bloomfilter: disable broken 32 bit build

Fixes https://github.com/NixOS/nixpkgs/issues/6292.


  Commit: d51a0838968346100779c4443941f5133550b71e
      
https://github.com/NixOS/nixpkgs/commit/d51a0838968346100779c4443941f5133550b71e
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  -----------
  haskell-blaze-builder: downgrade to version < 0.4

Many builds can't deal with the new version yet.


  Commit: 8b64ee52f80ec69e096b7c84c672fe462851181f
      
https://github.com/NixOS/nixpkgs/commit/8b64ee52f80ec69e096b7c84c672fe462851181f
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-file-location: test suite doesn't compile


  Commit: 5d707670a58eb906fbd4854e8b6cfd2c7024d6d0
      
https://github.com/NixOS/nixpkgs/commit/5d707670a58eb906fbd4854e8b6cfd2c7024d6d0
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  hackage-packages.nix: re-generate from Hackage 2015-02-12T23:09:28+0100


  Commit: 95814c7ef1ca578a3afe15b5b5f718a9071a0994
      
https://github.com/NixOS/nixpkgs/commit/95814c7ef1ca578a3afe15b5b5f718a9071a0994
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  -----------
  haskell-file-location: test suite is now fixed


  Commit: dcafdf47eab0249699749e8b77dd1d0b0fecd7d7
      
https://github.com/NixOS/nixpkgs/commit/dcafdf47eab0249699749e8b77dd1d0b0fecd7d7
  Author: Joel Taylor <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/top-level/haskell-ng.nix

  Log Message:
  -----------
  Revert "Revert "Build GHC HEAD from git checkout"."

This reverts commit 15416dd2eca1bc3d214649b0f034e40a1daee2ab.


  Commit: 2a5dacbf6bef9c00e042f05ebc269bcaacbf1354
      
https://github.com/NixOS/nixpkgs/commit/2a5dacbf6bef9c00e042f05ebc269bcaacbf1354
  Author: Joel Taylor <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/compilers/ghc/head.nix

  Log Message:
  -----------
  patch shebangs in boot script


  Commit: a04e2e06f979693e8c5ea247dbed977c0ae5be15
      
https://github.com/NixOS/nixpkgs/commit/a04e2e06f979693e8c5ea247dbed977c0ae5be15
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  haskell-gstreamer: fix dependencies


  Commit: 7e07916f91389d329905e460235a8a2c6a98794f
      
https://github.com/NixOS/nixpkgs/commit/7e07916f91389d329905e460235a8a2c6a98794f
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

  Log Message:
  -----------
  haskell-clac: disable builds with ghc-7.8.x


  Commit: 92f3ec3ba5761d00138a439787948c7a17935c3c
      
https://github.com/NixOS/nixpkgs/commit/92f3ec3ba5761d00138a439787948c7a17935c3c
  Author: Pascal Wittmann <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/tools/graphics/pngnq/default.nix

  Log Message:
  -----------
  pngnq: update from 1.0 to 1.1


  Commit: 0fe9d58e4ef739bc361a3d9acb3dd912dad485d2
      
https://github.com/NixOS/nixpkgs/commit/0fe9d58e4ef739bc361a3d9acb3dd912dad485d2
  Author: Harald van Dijk <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  stage-1-init: fix PID 1 shell

The PID 1 shell is executed as the last command in a sh invocation. Some
shells implicitly use exec for that, but the current busybox ash does not,
so the shell gets a wrong PID. Spell out the exec.


  Commit: 3bc7dfdf22c643b531acfbce4b0ad6b46a5bc796
      
https://github.com/NixOS/nixpkgs/commit/3bc7dfdf22c643b531acfbce4b0ad6b46a5bc796
  Author: koral <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A pkgs/development/libraries/libasr/default.nix
    M pkgs/servers/mail/opensmtpd/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  opensmtpd: 5.4.2p1 -> 5.4.4p1


  Commit: 120cc5a65ae5c12f9d778172850fbb1877ce8e0c
      
https://github.com/NixOS/nixpkgs/commit/120cc5a65ae5c12f9d778172850fbb1877ce8e0c
  Author: Damien Cassou <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/pharo/launcher/default.nix

  Log Message:
  -----------
  Pharo launcher 0.2.1 --> 0.2.4


  Commit: 1dfab1cd9b9dcca90bd0ea04f140b9790c21833c
      
https://github.com/NixOS/nixpkgs/commit/1dfab1cd9b9dcca90bd0ea04f140b9790c21833c
  Author: Damien Cassou <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Make sure vobject is not built by pypy

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


  Commit: b1e0124cd97603a0b069dc97159d5c46c87e2c40
      
https://github.com/NixOS/nixpkgs/commit/b1e0124cd97603a0b069dc97159d5c46c87e2c40
  Author: Damien Cassou <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/pharo/launcher/default.nix

  Log Message:
  -----------
  Merge pull request #6328 from DamienCassou/pharo-launcher-0.2.4

Pharo launcher 0.2.1 --> 0.2.4


  Commit: 970d57a598329d70f67b8a5dff7942fdf404741e
      
https://github.com/NixOS/nixpkgs/commit/970d57a598329d70f67b8a5dff7942fdf404741e
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6327 from hvdijk/master

stage-1-init: fix PID 1 shell


  Commit: e783edc72e6194032610b90ed169ddb2d48a093a
      
https://github.com/NixOS/nixpkgs/commit/e783edc72e6194032610b90ed169ddb2d48a093a
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6296 from nckx/add-kernel-config

Enable kernel configuration option FANOTIFY


  Commit: c6252250d88adaf4ece1b2fd7019eddd56cb2d3d
      
https://github.com/NixOS/nixpkgs/commit/c6252250d88adaf4ece1b2fd7019eddd56cb2d3d
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6329 from DamienCassou/vobject-not-compatible-with-pypy

Make sure vobject is not built by pypy


  Commit: d7b01c8526a7c7ee4cb489f124429297d19ccd04
      
https://github.com/NixOS/nixpkgs/commit/d7b01c8526a7c7ee4cb489f124429297d19ccd04
  Author: Pascal Wittmann <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A pkgs/development/libraries/libasr/default.nix
    M pkgs/servers/mail/opensmtpd/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #6325 from k0ral/opensmtpd

opensmtpd: 5.4.2p1 -> 5.4.4p1


  Commit: f3935216305452aec5fea2975de0c50348a85a82
      
https://github.com/NixOS/nixpkgs/commit/f3935216305452aec5fea2975de0c50348a85a82
  Author: Pascal Wittmann <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  libasr: fixed description


  Commit: d67a792a8398dedb923da6ee95bbeaf1c519a319
      
https://github.com/NixOS/nixpkgs/commit/d67a792a8398dedb923da6ee95bbeaf1c519a319
  Author: Domen Kožar <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  taskw: 0.8.6 -> 1.0.2


  Commit: da6abad31a0c490ab40e8efc5bd2dcf63a669dad
      
https://github.com/NixOS/nixpkgs/commit/da6abad31a0c490ab40e8efc5bd2dcf63a669dad
  Author: Rickard Nilsson <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/applications/networking/browsers/vimb/default.nix

  Log Message:
  -----------
  vimb: Update from 2.8 to 2.9


  Commit: 3f7917ed8a103d3bcc477c1477f903580e19012b
      
https://github.com/NixOS/nixpkgs/commit/3f7917ed8a103d3bcc477c1477f903580e19012b
  Author: Bob van der Linden <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/applications/office/gnumeric/default.nix

  Log Message:
  -----------
  gnumeric: make use of GIO_EXTRA_MODULES in wrapper


  Commit: afaa01c9577499e2e4c2178f68cc3e706ce3f62d
      
https://github.com/NixOS/nixpkgs/commit/afaa01c9577499e2e4c2178f68cc3e706ce3f62d
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #6009 from nkaretnikov/yesod-1.4.1.4

I'll merge blindly, assuming that those changes have been tested by the 
submitter. If these updates cause any trouble, please don't hesitate to revoke 
if necessary.


  Commit: bf279ecec2807ab0db15ff2402c3466e85eb15f5
      
https://github.com/NixOS/nixpkgs/commit/bf279ecec2807ab0db15ff2402c3466e85eb15f5
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Log Message:
  -----------
  Merge pull request #5976 from jkarni/jkarni/update-resourcet

I'll merge blindly, assuming that those changes have been tested by the 
submitter. If these updates cause any trouble, please don't hesitate to revoke 
if necessary.


  Commit: c6ed2aa2035f475680a171a596d8fc3047e0a4b6
      
https://github.com/NixOS/nixpkgs/commit/c6ed2aa2035f475680a171a596d8fc3047e0a4b6
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/development/libraries/haskell/servant-server/default.nix

  Log Message:
  -----------
  Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3

I'll merge blindly, assuming that those changes have been tested by the 
submitter. If these updates cause any trouble, please don't hesitate to revoke 
if necessary.


  Commit: 569a02b725a2fcec223ce2a32719d3fbfc60cb32
      
https://github.com/NixOS/nixpkgs/commit/569a02b725a2fcec223ce2a32719d3fbfc60cb32
  Author: Lluís Batlle i Rossell <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/applications/science/math/weka/default.nix

  Log Message:
  -----------
  Updating weka to 3.6.12.

(cherry picked from commit cd417206f93be49dd848ce1b3633e335faed941f)


  Commit: bc4ffd6ad6aa21857aadb730871610822a2d32bb
      
https://github.com/NixOS/nixpkgs/commit/bc4ffd6ad6aa21857aadb730871610822a2d32bb
  Author: vbgl <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M pkgs/applications/office/gnumeric/default.nix

  Log Message:
  -----------
  Merge pull request #6331 from bobvanderlinden/gnumeric-gio-extra-modules

gnumeric: make use of GIO_EXTRA_MODULES in wrapper


  Commit: 54ce1a1810454aa24381d6c8370e48706ee48312
      
https://github.com/NixOS/nixpkgs/commit/54ce1a1810454aa24381d6c8370e48706ee48312
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M nixos/modules/hardware/all-firmware.nix
    M nixos/modules/module-list.nix
    A nixos/modules/programs/cdemu.nix
    M nixos/modules/services/audio/mpd.nix
    A nixos/modules/services/misc/canto-daemon.nix
    M nixos/modules/services/networking/consul.nix
    A nixos/modules/services/networking/sslh.nix
    A nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M nixos/modules/services/x11/window-managers/default.nix
    M nixos/modules/system/boot/kernel.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/release-combined.nix
    M nixos/tests/installer.nix
    M nixos/tests/jenkins.nix
    M pkgs/applications/audio/picard/default.nix
    M pkgs/applications/editors/bluefish/default.nix
    M pkgs/applications/misc/djvulibre/default.nix
    M pkgs/applications/misc/lyx/default.nix
    M pkgs/applications/misc/sakura/default.nix
    M pkgs/applications/misc/taskwarrior/default.nix
    M pkgs/applications/networking/browsers/vimb/default.nix
    A pkgs/applications/networking/feedreaders/canto-curses/default.nix
    A pkgs/applications/networking/feedreaders/canto-daemon/default.nix
    M pkgs/applications/networking/instant-messengers/ratox/default.nix
    M pkgs/applications/networking/notbit/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/gnumeric/default.nix
    M pkgs/applications/office/impressive/default.nix
    M pkgs/applications/science/math/weka/default.nix
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/build-support/vm/default.nix
    R pkgs/build-support/vm/rpm/redhat-9-i386.list
    R pkgs/build-support/vm/rpm/redhat-9-i386.nix
    M pkgs/build-support/vm/rpm/rpm-closure.pl
    R pkgs/build-support/vm/rpm/rpm-list-to-nix.pl
    R pkgs/build-support/vm/rpm/suse-9-i386.list
    R pkgs/build-support/vm/rpm/suse-9-i386.nix
    M pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
    A pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
    R pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch
    M pkgs/development/compilers/ghc/head.nix
    A pkgs/development/compilers/nim/default.nix
    M pkgs/development/compilers/sbcl/1.2.0.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/compilers/vala/0.26.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/libraries/faac/default.nix
    M pkgs/development/libraries/fdk-aac/default.nix
    M pkgs/development/libraries/gsm/default.nix
    M pkgs/development/libraries/haskell/servant-server/default.nix
    M pkgs/development/libraries/haskell/xml-conduit/default.nix
    M pkgs/development/libraries/ldb/default.nix
    A pkgs/development/libraries/libasr/default.nix
    M pkgs/development/libraries/libass/default.nix
    M pkgs/development/libraries/libsodium/default.nix
    M pkgs/development/libraries/libvpx/default.nix
    A pkgs/development/libraries/libvpx/git.nix
    M pkgs/development/libraries/protobuf/2.5.nix
    M pkgs/development/libraries/protobuf/2.6.nix
    M pkgs/development/libraries/protobuf/generic.nix
    M pkgs/development/libraries/x265/default.nix
    M pkgs/development/libraries/x265/generic.nix
    M pkgs/development/libraries/x265/hg.nix
    M pkgs/development/ocaml-modules/cmdliner/default.nix
    M pkgs/development/ocaml-modules/ezjsonm/default.nix
    M pkgs/development/ocaml-modules/re/default.nix
    M pkgs/development/ocaml-modules/sqlite3/default.nix
    M pkgs/development/pharo/launcher/default.nix
    M pkgs/development/python-modules/generic/default.nix
    A pkgs/development/tools/analysis/include-what-you-use/default.nix
    M pkgs/development/tools/ocaml/ocp-build/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    A pkgs/misc/emulators/cdemu/analyzer.nix
    A pkgs/misc/emulators/cdemu/base.nix
    A pkgs/misc/emulators/cdemu/client.nix
    A pkgs/misc/emulators/cdemu/daemon.nix
    A pkgs/misc/emulators/cdemu/gui.nix
    A pkgs/misc/emulators/cdemu/libmirage.nix
    A pkgs/misc/emulators/cdemu/vhba.nix
    M pkgs/misc/emulators/wine/unstable.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    R pkgs/os-specific/linux/firmware/iwlwifi/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    A pkgs/os-specific/linux/kernel/crc-regression.patch
    A pkgs/os-specific/linux/kernel/linux-3.19.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    R pkgs/os-specific/linux/zfs/3.19-compat-git.patch
    M pkgs/os-specific/linux/zfs/git.nix
    A pkgs/servers/limesurvey/default.nix
    M pkgs/servers/mail/opensmtpd/default.nix
    A pkgs/servers/nosql/redis/3.0.nix
    M pkgs/servers/sql/mysql/5.5.x.nix
    A pkgs/servers/sslh/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    A pkgs/shells/bash-completion/bash-4.3.patch
    M pkgs/shells/bash-completion/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    M pkgs/tools/filesystems/genext2fs/default.nix
    A pkgs/tools/filesystems/s3fs/default.nix
    M pkgs/tools/filesystems/tmsu/default.nix
    M pkgs/tools/graphics/asymptote/default.nix
    M pkgs/tools/graphics/pngnq/default.nix
    A pkgs/tools/misc/contacts/default.nix
    M pkgs/tools/misc/pipelight/default.nix
    A pkgs/tools/networking/openfortivpn/default.nix
    A pkgs/tools/networking/polygraph/default.nix
    A pkgs/tools/networking/polygraph/fix_build.patch
    M pkgs/tools/networking/tinc/pre.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/kpcli/default.nix
    M pkgs/tools/security/pass/default.nix
    M pkgs/tools/system/stress-ng/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/haskell-ng.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix


  Commit: 600135bba506ae93bf418cc484b3d9953a37f9de
      
https://github.com/NixOS/nixpkgs/commit/600135bba506ae93bf418cc484b3d9953a37f9de
  Author: Peter Simons <[email protected]>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M nixos/modules/hardware/all-firmware.nix
    M nixos/modules/module-list.nix
    A nixos/modules/programs/cdemu.nix
    M nixos/modules/services/audio/mpd.nix
    A nixos/modules/services/misc/canto-daemon.nix
    M nixos/modules/services/networking/consul.nix
    A nixos/modules/services/networking/sslh.nix
    A nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
    M nixos/modules/services/x11/desktop-managers/gnome3.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M nixos/modules/services/x11/window-managers/default.nix
    M nixos/modules/system/boot/kernel.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/tasks/filesystems/zfs.nix
    M nixos/release-combined.nix
    M nixos/tests/installer.nix
    M nixos/tests/jenkins.nix
    M pkgs/applications/audio/picard/default.nix
    M pkgs/applications/editors/bluefish/default.nix
    M pkgs/applications/misc/djvulibre/default.nix
    M pkgs/applications/misc/lyx/default.nix
    M pkgs/applications/misc/sakura/default.nix
    M pkgs/applications/misc/taskwarrior/default.nix
    M pkgs/applications/networking/browsers/vimb/default.nix
    A pkgs/applications/networking/feedreaders/canto-curses/default.nix
    A pkgs/applications/networking/feedreaders/canto-daemon/default.nix
    M pkgs/applications/networking/instant-messengers/ratox/default.nix
    M pkgs/applications/networking/notbit/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/gnumeric/default.nix
    M pkgs/applications/office/impressive/default.nix
    M pkgs/applications/science/math/weka/default.nix
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/build-support/vm/default.nix
    R pkgs/build-support/vm/rpm/redhat-9-i386.list
    R pkgs/build-support/vm/rpm/redhat-9-i386.nix
    M pkgs/build-support/vm/rpm/rpm-closure.pl
    R pkgs/build-support/vm/rpm/rpm-list-to-nix.pl
    R pkgs/build-support/vm/rpm/suse-9-i386.list
    R pkgs/build-support/vm/rpm/suse-9-i386.nix
    M pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
    A pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
    R pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch
    M pkgs/development/compilers/ghc/head.nix
    A pkgs/development/compilers/nim/default.nix
    M pkgs/development/compilers/sbcl/1.2.0.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/compilers/vala/0.26.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/libraries/faac/default.nix
    M pkgs/development/libraries/fdk-aac/default.nix
    M pkgs/development/libraries/gsm/default.nix
    M pkgs/development/libraries/haskell/servant-server/default.nix
    M pkgs/development/libraries/haskell/xml-conduit/default.nix
    M pkgs/development/libraries/ldb/default.nix
    A pkgs/development/libraries/libasr/default.nix
    M pkgs/development/libraries/libass/default.nix
    M pkgs/development/libraries/libsodium/default.nix
    M pkgs/development/libraries/libvpx/default.nix
    A pkgs/development/libraries/libvpx/git.nix
    M pkgs/development/libraries/protobuf/2.5.nix
    M pkgs/development/libraries/protobuf/2.6.nix
    M pkgs/development/libraries/protobuf/generic.nix
    M pkgs/development/libraries/x265/default.nix
    M pkgs/development/libraries/x265/generic.nix
    M pkgs/development/libraries/x265/hg.nix
    M pkgs/development/ocaml-modules/cmdliner/default.nix
    M pkgs/development/ocaml-modules/ezjsonm/default.nix
    M pkgs/development/ocaml-modules/re/default.nix
    M pkgs/development/ocaml-modules/sqlite3/default.nix
    M pkgs/development/pharo/launcher/default.nix
    M pkgs/development/python-modules/generic/default.nix
    A pkgs/development/tools/analysis/include-what-you-use/default.nix
    M pkgs/development/tools/ocaml/ocp-build/default.nix
    M pkgs/development/web/nodejs/build-node-package.nix
    A pkgs/misc/emulators/cdemu/analyzer.nix
    A pkgs/misc/emulators/cdemu/base.nix
    A pkgs/misc/emulators/cdemu/client.nix
    A pkgs/misc/emulators/cdemu/daemon.nix
    A pkgs/misc/emulators/cdemu/gui.nix
    A pkgs/misc/emulators/cdemu/libmirage.nix
    A pkgs/misc/emulators/cdemu/vhba.nix
    M pkgs/misc/emulators/wine/unstable.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    R pkgs/os-specific/linux/firmware/iwlwifi/default.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    A pkgs/os-specific/linux/kernel/crc-regression.patch
    A pkgs/os-specific/linux/kernel/linux-3.19.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/nvidia-x11/default.nix
    M pkgs/os-specific/linux/sysdig/default.nix
    R pkgs/os-specific/linux/zfs/3.19-compat-git.patch
    M pkgs/os-specific/linux/zfs/git.nix
    A pkgs/servers/limesurvey/default.nix
    M pkgs/servers/mail/opensmtpd/default.nix
    A pkgs/servers/nosql/redis/3.0.nix
    M pkgs/servers/sql/mysql/5.5.x.nix
    A pkgs/servers/sslh/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    A pkgs/shells/bash-completion/bash-4.3.patch
    M pkgs/shells/bash-completion/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    M pkgs/tools/filesystems/genext2fs/default.nix
    A pkgs/tools/filesystems/s3fs/default.nix
    M pkgs/tools/filesystems/tmsu/default.nix
    M pkgs/tools/graphics/asymptote/default.nix
    M pkgs/tools/graphics/pngnq/default.nix
    A pkgs/tools/misc/contacts/default.nix
    M pkgs/tools/misc/pipelight/default.nix
    A pkgs/tools/networking/openfortivpn/default.nix
    A pkgs/tools/networking/polygraph/default.nix
    A pkgs/tools/networking/polygraph/fix_build.patch
    M pkgs/tools/networking/tinc/pre.nix
    M pkgs/tools/security/gnupg/21.nix
    M pkgs/tools/security/kpcli/default.nix
    M pkgs/tools/security/pass/default.nix
    M pkgs/tools/system/stress-ng/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/haskell-ng.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'master' into staging.


Compare: https://github.com/NixOS/nixpkgs/compare/7a1d132db950...600135bba506
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to