Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 6602f49495c94e8533c8b482698bcf570a8d8933
https://github.com/NixOS/nixpkgs/commit/6602f49495c94e8533c8b482698bcf570a8d8933
Author: William A. Kennington III <[email protected]>
Date: 2015-11-14 (Sat, 14 Nov 2015)
Changed paths:
M doc/haskell-users-guide.md
M lib/maintainers.nix
M nixos/modules/services/mail/opensmtpd.nix
M nixos/modules/services/networking/networkmanager.nix
M nixos/modules/tasks/network-interfaces.nix
M pkgs/applications/audio/audacity/default.nix
A pkgs/applications/audio/jackmix/default.nix
M pkgs/applications/graphics/gimp/plugins/default.nix
M pkgs/applications/graphics/hugin/default.nix
M pkgs/applications/networking/ids/daq/default.nix
A pkgs/applications/networking/iptraf-ng/default.nix
M pkgs/applications/version-management/git-and-tools/git-hub/default.nix
M pkgs/applications/version-management/subversion/default.nix
M pkgs/applications/video/smplayer/default.nix
M pkgs/build-support/build-fhs-chrootenv/env.nix
M pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
M pkgs/development/libraries/glpk/default.nix
M pkgs/development/libraries/libdnet/default.nix
R pkgs/development/libraries/libunwind/native.nix
M pkgs/development/libraries/neon/default.nix
A pkgs/development/web/nodejs/default-arch.patch
M pkgs/development/web/nodejs/default.nix
M pkgs/development/web/nodejs/no-xcode.patch
A pkgs/development/web/nodejs/pkg-libpath.patch
M pkgs/development/web/nodejs/v0_10.nix
M pkgs/misc/jackaudio/jack1.nix
A pkgs/misc/urbit/default.nix
A pkgs/os-specific/linux/miraclecast/default.nix
M pkgs/os-specific/linux/nvidiabl/default.nix
A pkgs/os-specific/linux/nvidiabl/linux4compat.patch
M pkgs/os-specific/linux/syslinux/default.nix
R pkgs/os-specific/linux/syslinux/gcc5-fix.patch
M pkgs/os-specific/linux/systemd/default.nix
M pkgs/servers/mail/opensmtpd/default.nix
A pkgs/servers/mail/opensmtpd/extras.nix
A pkgs/servers/mail/opensmtpd/proc_path.diff
M pkgs/tools/filesystems/duff/default.nix
M pkgs/tools/graphics/enblend-enfuse/default.nix
A pkgs/tools/misc/heatseeker/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/go-packages.nix
M pkgs/top-level/perl-packages.nix
Log Message:
-----------
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281.
This reverts the fallout from reverting the major changes.
Commit: 4ead61ca39206de1b6f696426df6c7a33b5808fb
https://github.com/NixOS/nixpkgs/commit/4ead61ca39206de1b6f696426df6c7a33b5808fb
Author: William A. Kennington III <[email protected]>
Date: 2015-11-14 (Sat, 14 Nov 2015)
Changed paths:
M nixos/modules/services/web-servers/lighttpd/default.nix
M pkgs/os-specific/linux/pommed/default.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into master.upstream
Compare: https://github.com/NixOS/nixpkgs/compare/fb864b889839...4ead61ca3920_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
