3
0
Fork 0
forked from mirrors/nixpkgs
Nix Packages collection
Go to file
aszlig 09d3493282
buildLinux/linuxManualConfig: Allow .override
Regression introduced by da36847d92.

The kernelPackages NixOS module option now uses .override to add kernel
patches defined in boot.kernelPatches into the kernel within the
kernelPackages set.

For generic kernels, we already have an .override which comes with
callPackage, but pkgs.linuxManualConfig is a function where we want to
override the attributes passed to it.

The callPackage to manual-config.nix only allows us to override its
internal attributes but not the attributes of the function returned.

Simplified it looks like this:

                                      .----- .override provided by
                                    __|__    callPackage
                                   |     |
(callPackage .../manual-config.nix { ... }) { ... }
                                            |_____|
                                               |
                                  the one -----'
                                  we actually want to override

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-10-12 23:52:23 +02:00
.github Merge pull request #18972 from ericsagnes/doc/reviewing-contributions 2016-10-01 15:09:12 +01:00
doc manual: switch an example from md5 to sha256. 2016-10-07 10:08:22 +02:00
lib Merge pull request #19362 from davorb/purple-facebook 2016-10-12 13:38:34 +02:00
maintainers vanity.sh: tolerate the fact that github login adder is too long 2016-09-26 19:24:22 +02:00
nixos Merge pull request #19490 from regnat/taskserver 2016-10-12 18:24:43 +02:00
pkgs buildLinux/linuxManualConfig: Allow .override 2016-10-12 23:52:23 +02:00
.editorconfig add .editorconfig 2016-10-02 22:10:43 +02:00
.gitignore kde5: consolidate packages into desktops/kde-5 2016-03-01 10:36:00 -06:00
.mention-bot mention-bot: notify me when darwin stdenv stuff changes 2016-09-12 01:01:14 -04:00
.travis.yml Revert "travis: only fetch top commit" 2016-09-07 17:14:38 +02:00
.version unstable is now 17.03 2016-09-02 08:47:21 +02:00
COPYING COPYING: Update year range to 2016 (close #12621) 2016-01-26 10:10:45 +01:00
default.nix Separate fix-point from config importing hacks and other impurities 2016-07-14 14:33:23 -07:00
README.md README: Update to 16.09 2016-10-04 17:45:24 +02:00

logo

Build Status Code Triagers Badge

Nixpkgs is a collection of packages for the Nix package manager. It is periodically built and tested by the hydra build daemon as so-called channels. To get channel information via git, add nixpkgs-channels as a remote:

% git remote add channels git://github.com/NixOS/nixpkgs-channels.git

For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. nixos-16.09 for the latest release and nixos-unstable for the latest successful build of master:

% git remote update channels
% git rebase channels/nixos-16.09

For pull-requests, please rebase onto nixpkgs master.

NixOS linux distribution source code is located inside nixos/ folder.

Communication: