Eelco Dolstra
a8fc68a5c0
Move share/{man,info,doc} to the corresponding output
2014-08-09 12:47:05 +02:00
Eelco Dolstra
9e31c66d1b
stdenv: Put moving docs to $out/share in a separate setup hook
2014-08-09 12:47:05 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Eelco Dolstra
2def8e7499
Remove addHook
...
Just use bash arrays directly. I.e.
addHook preConfigure myPreConfigure
is now
preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra
15103e5e5f
stdenv: Remove the special handling of gcc
...
Now gcc is just another build input, making it possible in the future
to have a stdenv that doesn't depend on a C compiler. This is very
useful on NixOS, since it would allow trivial builders like
writeTextFile to work without pulling in the C compiler.
2014-08-09 12:44:50 +02:00
Eelco Dolstra
1a44dbbbb9
unpackFile: Always copy directories
...
If $src refers to a directory, then always copy it. Previously, we
checked the extension first, so if the directory had an extension like
.tar, unpackPhase would fail.
2014-08-09 12:44:49 +02:00
Eelco Dolstra
5e82aab5d4
Drop redundant space
2014-08-09 12:44:49 +02:00
Eelco Dolstra
daa66b8b1c
Factor out fixup phase stuff into separate setup hooks
2014-08-09 12:44:49 +02:00
Georges Dubus
f4fbcddd44
fetchgit: make deterministic with leaveDotGit ( close #3392 )
...
There was a few files containing timestamp, so we now remove them.
It shouldn't be a problem for logs. However, index might be. Anyway,
that's better than nothing.
2014-08-08 21:51:29 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
940eb8bfc1
debBuild: Allow setting the package name and overriding the install command
2014-08-08 14:15:43 +02:00
Peter Simons
b76a7504bb
cabal: cosmetic fix to syntax highlighting in Emacs
2014-08-04 12:39:11 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Michael Raskin
c38a11316d
Filter out broken-completely links
2014-07-18 17:42:00 +04:00
Shea Levy
b969e9340b
Separate fetchgitPrivate into a separate file
2014-07-16 18:05:56 -04:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Shea Levy
b57bc220cc
Merge branch 'master' of git://github.com/ip1981/nixpkgs
...
Added quilt-0.63
2014-07-14 10:26:39 -04:00
Igor Pashev
26f47ba388
Fixed main Savannah mirror directory
2014-07-14 15:39:08 +02:00
Eelco Dolstra
1245ca3ff7
debian: Update to 7.6
2014-07-14 14:35:09 +02:00
Peter Simons
5c677f7117
cabal: cosmetic
2014-07-12 15:13:58 +02:00
Florian Friesdorf
84030ee1f0
buildEnv to support passthru
2014-07-10 16:41:02 +02:00
Justin Bedo
0a12a50b11
Removed CRAN mirror that was incorrectly handling 404 errors, causing
...
builder to abort.
2014-07-08 11:00:41 +10:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Shea Levy
90bfde59f8
Simplify php-packages.nix
2014-07-03 11:01:19 -04:00
Shea Levy
2fe4eb3df9
Make php packages available in nix-env
2014-07-03 10:19:57 -04:00
Eelco Dolstra
a4f9b9c8b5
Partially merge gcc-wrapper and clang-wrapper
...
Having a separate clang-wrapper is really unfortunate because it
means that we'll forever forget to apply changes to both (e.g.
commit 289895fe2c
). This commit
gets rid of the redundant copies of ld-wrapper.sh and utils.sh.
2014-07-02 20:10:40 +02:00
Eelco Dolstra
289895fe2c
Fix SNAFU using $NIX_LDFLAGS_AFTER
2014-07-02 14:55:44 +02:00
Eelco Dolstra
0d8014f6fc
Darwin: Search for libraries in $sdk/usr/lib
...
This required adding a new environment variable NIX_LDFLAGS_AFTER
that ensures that the -L.../usr/lib flag happens last.
2014-07-01 15:56:09 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin
8ed1aeb712
Fix default tarball mask
2014-07-01 12:08:07 +04:00
Michael Raskin
0fcee20522
Allow pure-meta updates to specify tarball regexp
2014-07-01 11:54:09 +04:00
Michael Raskin
2e12709a26
Allow update-walker to run directly from meta attributes
2014-07-01 11:54:09 +04:00
Eelco Dolstra
7fe89be146
gcc: Fix purity
...
Somewhere the no-sys-dirs.patch got disabled, so gcc was looking in
/usr/local/include and /usr/lib. Since I can't fix the patch easily,
I've borrowed the --sysroot trick from clang-wrapper. This causes
builtin paths to be prefixed with /var/empty
(e.g. /var/empty/usr/lib), which don't exist.
2014-06-30 16:43:02 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Michael Raskin
d41a7bd9e2
Merge pull request #2871 from auntieNeo/kochi-substitute
...
Added Kochi substitute Japanese font package
2014-06-30 10:14:14 +04:00
Alexander Kjeldaas
81172a77e6
Document paths-from-graph.pl somewhat.
2014-06-28 20:44:22 -05:00
Austin Seipp
4f933af158
Merge pull request #3116 from bennofs/cabal-hackage-mirror
...
cabal-builder: Use hackage mirror
2014-06-28 20:35:12 -05:00
Benno Fünfstück
e10001042d
fetchbzr, fetchdarcs, fetchhg: use rev
attr
...
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Benno Fünfstück
c052d7297b
cabal-builder: Use hackage mirror
...
It's now possible to use the mirror system for the cabal builder.
2014-06-28 20:01:40 +02:00
Michael Raskin
1b0b0c4257
Allow selection of named SF dirs
2014-06-27 16:33:45 +04:00
John Wiegley
f41b446e49
Merge pull request #3073 from tailhook/git-describe-in-prefetch
...
Print output of `git describe` in `nix-prefetch-git`
2014-06-24 15:18:48 -07:00
John Wiegley
29a6f1cc78
Merge pull request #3037 from cstrahan/extra-fetchers
...
add nix-prefetch-zip
2014-06-24 15:17:49 -07:00
Paul Colomiets
c1e24abfef
Print output of git describe
in nix-prefetch-git
...
I hope it will help make git-packages' versions much nicer
It's usually only useful in --deepClone is also specified.
2014-06-25 01:12:10 +03:00
Charles Strahan
9bd8dffd77
require gnused for all prefetch scripts
2014-06-23 01:25:40 -04:00
Austin Seipp
0399c5ee24
grsecurity: update stable/testing kernels, refactoring
...
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.
This also removes the vserver kernel, since it's probably not nearly as
used.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 22:29:10 -05:00
Benno Fünfstück
7ac13c40ab
Add hackage mirror to mirrors.nix
2014-06-21 20:15:45 +02:00
Michael Raskin
258040a939
Add a function to overwrite just the version and sha256 by grepping them
2014-06-13 13:37:12 +04:00
Michael Raskin
c5f019e9a0
Merge pull request #2063 from redbaron/libmsgpack
...
Proper separation between build and runtime outputs
2014-06-12 13:05:40 +04:00
Benno Fünfstück
063efadd69
nix-prefetch-{bzr,hg,svn}: print fetched revision
2014-06-11 14:42:39 +02:00
Benno Fünfstück
be25ce8f58
nix-prefetch-git: fix printing of revision
...
If the user explictly gives a ref such as "refs/heads/master", `git
rev-parse` failed because we only checked out the `fetchgit`
branch. Now, we also try `git rev-parse fetchgit` if the first call
fails, which fixes the issue.
2014-06-11 14:09:58 +02:00