JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,648 Commits 1 Branch 0 Tags 12 GiB
Nix 95.4%
Shell 2%
Python 1.3%
Perl 0.3%
C 0.2%
Other 0.3%
22321f2e58
Go to file
Bjørn Forsman 22321f2e58 cudatoolkit: don't move $out/include to $out/usr_include 
This effectively reverts 86c283824f
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.

As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.

In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.

[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
2015-09-10 10:35:40 +02:00
doc doc: update haskell-users-guide.xml to reflect that we've update GHC 7.10.1 to 7.10.2 2015-09-09 21:30:42 +02:00
lib devilspie2: init at 0.39 2015-09-10 05:11:56 +08:00
maintainers Merge pull request #8436 from dezgeg/pr-travis-oom 2015-06-21 09:26:25 +02:00
nixos Merge pull request #9703 from basvandijk/wordpress-upgrade 2015-09-09 12:47:38 +02:00
pkgs cudatoolkit: don't move $out/include to $out/usr_include 2015-09-10 10:35:40 +02:00
.gitignore gitignore: pkgs/development/libraries/qt-5/*/tmp/ 2015-02-21 11:39:20 -06:00
.travis.yml .travis.yml: add "sudo: required" to opt out of containers 2015-04-07 15:45:00 +02:00
.version .version: remove trailing newline 2015-08-27 00:30:42 +02:00
CONTRIBUTING.md CONTRIBUTING: link to latest hydra build of nixpkgs manual 2015-07-14 10:32:26 +02:00
COPYING * Applying an MIT-style license to Nixpkgs. 2006-04-25 16:50:34 +00:00
default.nix if we abort with too old Nix, hint docs 2015-01-21 21:41:40 +01:00
README.md Add hydra links for upcoming 15.09 release 2015-09-01 14:32:47 -07:00

README.md

logo

Build Status Issue Stats Issue Stats

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-14.12 for the latest release and nixos-unstable for the latest successful build of master:

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

For pull-requests, please rebase onto nixpkgs master.

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

Communication: