Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 9adad8612b082bcbae30c81678a04b79a44079a4
https://github.com/NixOS/nixpkgs/commit/9adad8612b082bcbae30c81678a04b79a44079a4
Author: Shea Levy <[email protected]>
Date: 2016-08-15 (Mon, 15 Aug 2016)
Changed paths:
M nixos/modules/config/zram.nix
M nixos/modules/hardware/video/bumblebee.nix
M nixos/modules/hardware/video/webcam/facetimehd.nix
M nixos/modules/services/hardware/tlp.nix
M nixos/modules/services/hardware/udev.nix
M nixos/modules/services/network-filesystems/openafs-client/default.nix
M nixos/modules/services/networking/fan.nix
M nixos/modules/services/networking/strongswan.nix
M nixos/modules/system/boot/kernel.nix
M nixos/modules/system/boot/modprobe.nix
M nixos/modules/system/boot/stage-2-init.sh
M nixos/modules/tasks/cpu-freq.nix
M nixos/modules/virtualisation/docker.nix
M nixos/modules/virtualisation/qemu-vm.nix
M pkgs/development/libraries/fftw/default.nix
M pkgs/development/libraries/libdrm/default.nix
M pkgs/development/libraries/mesa/default.nix
M pkgs/development/python-modules/generic/run_setup.py
M pkgs/development/tools/misc/lttng-tools/default.nix
M pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
M pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
M pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
M pkgs/os-specific/darwin/apple-source-releases/default.nix
M pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
M pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
R pkgs/os-specific/darwin/swift-corefoundation/default.nix
M pkgs/os-specific/linux/kernel/manual-config.nix
M pkgs/os-specific/linux/kmod/aggregator.nix
M pkgs/os-specific/linux/kmod/default.nix
M pkgs/os-specific/linux/kmod/module-dir.patch
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/tools/networking/network-manager/0.9.8/default.nix
M pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch
M pkgs/tools/networking/network-manager/default.nix
M pkgs/tools/networking/network-manager/openconnect.nix
M pkgs/tools/networking/network-manager/openvpn.nix
M pkgs/tools/networking/network-manager/vpnc.nix
M pkgs/tools/text/diffutils/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing
changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
