Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: 8b9b9fad3145a5460ce390ac1c155a5073b9bf65
https://github.com/NixOS/nixpkgs/commit/8b9b9fad3145a5460ce390ac1c155a5073b9bf65
Author: Shea Levy <[email protected]>
Date: 2016-08-24 (Wed, 24 Aug 2016)
Changed paths:
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/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
A pkgs/os-specific/darwin/swift-corefoundation/default.nix
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Revert "Revert "Merge branch 'modprobe-fix' of
git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was
intentionally in staging.
Next time I'll do this right after the revert instead of so far down the line...
This reverts commit 9adad8612b082bcbae30c81678a04b79a44079a4.
Commit: e5dd89f24bc7d700244f2153ce46ed034aeefa60
https://github.com/NixOS/nixpkgs/commit/e5dd89f24bc7d700244f2153ce46ed034aeefa60
Author: Gabriel Ebner <[email protected]>
Date: 2016-08-24 (Wed, 24 Aug 2016)
Changed paths:
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/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
A pkgs/os-specific/darwin/swift-corefoundation/default.nix
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #17957 from shlevy/staging-revert-fix
Revert "Revert "Merge branch 'modprobe-fix' of
git://github.com/abbradar/nixpkgs""
Compare: https://github.com/NixOS/nixpkgs/compare/78b7529ee366...e5dd89f24bc7_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
