alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
79906 commits 217 branches 121 tags 4.5 GiB
Commit graph

1757 commits

Author SHA1 Message Date
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Eelco Dolstra 58e9440b89 Add option to link additional package outputs into system.path 
This is necessary to get stuff like separate manpages, info files,
debug symbols, etc.
 2015-10-30 15:21:02 +01:00
Ricardo M. Correia 777c9c3768 buildRustPackage: fix erroneous /bin/sh reference 
The fetch-cargo-deps script is written in bash syntax, but it
erroneously ran under the /bin/sh interpreter.

This wasn't noticed because /bin/sh is actually bash in NixOS, but on
some other systems this is not true.
 2015-10-29 15:16:51 +01:00
Demin Dmitriy dc70fcd94b build-dotnet-package: add optional makeWrapperArgs argument 
3 lines of code are shamelessly stolen from buildPythonPackage
 2015-10-29 06:02:18 +03:00
aszlig 82d88b5bcb
vmTools.commonDebPackages: Add "mawk". 
While debugging an issue with running NixOps tests, I found out that the
output from debClosureGenerator is not deterministic.

The reason behind this is the way how Provides and Replaces fields are
handled. I haven't yet found out what's the exact issue, but so far
packages "Provides" are more or less picked at random.

So, running the NixOps Hetzner tests we get either mawk, original-awk or
gawk altering on every invocation.

While for the test it isn't poisionous whether wi have mawk or gawk,
having original-awk certainly is, because live-build only works with
mawk or gawk.

The best solution would obviously be to make debClosureGenerator
deterministic, but in the case of "Provides: awk", we can safely pick
mawk by default, because the latter has a "Priority: required" in its
package description.

This also has the advantage that we can safely cherry-pick this to
release-15.09 because it's very unlikely that we'll break the
debClosureGenerator by adding a dependency to commonDebPackages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-10-26 20:56:42 +01:00
Wout Mertens 5c34563cda Merge pull request #10517 from demin-dmitriy/sublime3 
sublime3: make sublime text work with pkexec and gksudo
 2015-10-24 19:16:34 +02:00
Demin Dmitriy 0cea20a652 libredirect: add __xlib64 and posix_spawn 2015-10-24 18:04:33 +03:00
Nikolay Amiantov 489e947a51 Merge pull request #10506 from abbradar/buildenv-wip 
buildenv: support very long `paths`
 2015-10-24 11:11:08 +03:00
Nikolay Amiantov d49140f3e4 buildenv: support very long paths 2015-10-22 15:35:39 +03:00
Bjørn Forsman ad49db64da build-fhs-chrootenv: add /etc/mtab -> /proc/mounts symlink 
Needed to be able to run some programs (e.g. tune2fs) in the chroot.

AFAIK, /etc/mtab is deprecated, but programs still use it.
 2015-10-21 21:44:29 +02:00
Nikolay Amiantov da38314be6 buildFHSEnv: create /etc/profile with writeText 
This should avoid accidential expansion of variables, i.e. in
"export PATH=/some/path:$PATH"
$PATH would have been expanded in the environment builder!
 2015-10-21 16:02:08 +03:00
Nikolay Amiantov a995837606 Merge pull request #10320 from abbradar/fhs-simplify 
chroot-env: simplify, clean directories structure
 2015-10-19 11:18:49 +03:00
Nikolay Amiantov 3c7871a1c0 nuke-references: support -e option 2015-10-18 18:41:11 +03:00
William A. Kennington III 194357ad20 grsecurityUnstable: 4.1.7 -> 4.2.3 2015-10-15 10:41:04 -07:00
Nikolay Amiantov ab730370ba chroot-env: simplify, clean directories structure 2015-10-12 17:38:35 +03:00
Eelco Dolstra 7260c04266 debian: Update to 7.9, 8.2 2015-10-08 11:20:26 +02:00
Eric Seidel 9be18c4d07 Merge pull request #10176 from Ericson2314/fetchgitLocal 
Rewrite `fetchgitLocal`
 2015-10-07 18:37:35 -07:00
Nikolay Amiantov 46de04489b build-fhs-userenv: fix extraBindMounts 2015-10-07 14:58:37 +03:00
ts468 db25ece3c8 fetchurl/builder.sh: style fix, close #10260 2015-10-07 09:48:58 +02:00
Juho Östman e7a28447ea fetchhg: fixed nix-prefetch-hg interpreter 2015-10-06 22:41:46 +03:00
Eelco Dolstra 106738b196 Give more memory for the disk image builder 
http://hydra.nixos.org/build/26480662
 2015-10-06 15:03:26 +02:00
Nikolay Amiantov 5897433b31 build-fhs-userenv: add extraBindMounts support 2015-10-06 15:32:37 +03:00
Bjørn Forsman 05668fbe92 build-fhs-chrootenv: add /etc/os-release from host 
This allows software inside the chroot to identify the host OS via the
standard /etc/os-release file.
 2015-10-03 14:58:41 +02:00
Bjørn Forsman cd22214e0e build-fhs-chrootenv: add missing /usr/include 
This patch brings the include/ directories of all specified packages to
appear under /usr/include in the FHS chroot. As per spec[1].

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#USRINCLUDEDIRECTORYFORSTANDARDINCLU
 2015-10-02 19:13:41 +02:00
John Ericson 72660409f5 Rewrite fetchgitLocal 
For practical purposes, here are the changes in behavior:
 - When fetching from a subdirectory of a repo, do not rebuild because of
   changes elsewhere in the repo
 - Fetch (not-ignored) untracked files too

It does this by letting git hash and export the directory in question,
which I believes makes for a cleaner implementation than the ad-hoc copying
and hashing that was there before.
 2015-10-01 22:00:44 -07:00
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream 
This is a partial commit from staging in an attempt to make merges
smaller.
 2015-09-23 14:35:36 -07:00
Vladimír Čunát 6b0add86b9 separateDebugInfo: one more comment 2015-09-23 10:35:40 +02:00
Vladimír Čunát 22521f3b90 separateDebugInfo: fix typo in comment 2015-09-22 22:07:58 +02:00
Vladimír Čunát b3658bc01b separateDebugInfo: compress it by default 
Using zlib should be cheap enough and save lots of HDD space.
Case study (glib): 11 MB -> 4 MB.
 2015-09-22 22:05:44 +02:00
Eelco Dolstra 2a28bc6691 separateDebugInfo: Assert Linux 
Also remove some unintended setting of separateDebugInfo.
 2015-09-22 20:21:10 +02:00
William A. Kennington III 3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
Nikolay Amiantov f5deff5137 nix-prefetch-git: pull all tags from remote when checkouting by revision 
Close #9790.
This fixes checkouting for a nasty combination:

1. To be checkouted is a revision which corresponds to tag in a form "<tag>^{}".
2. This revision is not fetched by default.
 2015-09-20 18:24:34 +02:00
William A. Kennington III 6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
Vladimír Čunát 0fdb93864e Merge new texlive infrastructure, /CC #287 2015-09-18 20:52:34 +02:00
Vladimír Čunát a418096d6a Merge branch 'master' into staging 2015-09-17 20:07:20 +02:00
Vladimír Čunát fa33b083eb buildEnv: add new parameters: extraPrefix and buildInputs 2015-09-17 17:43:18 +02:00
Eelco Dolstra 276e38a1bb patchShebangs: Ignore outputs that don't exist yet 2015-09-17 16:54:07 +02:00
Eelco Dolstra ec5b66eb4a Enable separate debug info 
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
 2015-09-17 15:56:33 +02:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
William A. Kennington III 8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
宋文武 9e2df43e2e mirrors: add httpredir.debian.org as the first debian mirror 2015-09-08 20:02:59 +08:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style 
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
 2015-09-06 10:26:30 +02:00
William A. Kennington III 86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
Tobias Geerinckx-Rice 5385a0a82a cassandra: use mirrors 
Upstream likes to move "old" releases to an archive mirror as soon as a
new one is released. This is now handled for free by mirrors.nix.

(No idea why cs.utah.edu was used to begin with; it's now added to
mirrors.nix. Note that it doesn't support SSL, but that applies to
several others so I don't see the harm.)
 2015-09-02 20:04:11 +02:00
Vladimír Čunát 54c4aab662 nixos: kill services.virtualboxGuest to fix #9600 2015-09-02 04:54:31 +02:00
Thomas Tuegel 61cad61ebf makeWrapper: accept --argv0 flag (/cc #9562) 
By default `makeWrapper` will not set argv[0] (this is a reversion to
the old default behavior). Based on the breakage we have seen from
changing the default, this is what most people want. The `wrapProgram`
function will send `--argv0 '"$0"'` to `makeWrapper`, i.e. it will
continue to pass-through the argv[0] that the wrapper is called with.
 2015-09-01 13:27:12 +02:00
William A. Kennington III 5ca1c32a9d Merge branch 'master.upstream' into staging.upstream 2015-08-28 17:55:20 -07:00
Nikolay Amiantov 47ea8c097c buildFHSUserEnv: add .env support 2015-08-26 19:39:08 +03:00
Jude Taylor 80e09678f7 darwin: use system dyld 
see https://github.com/NixOS/nixpkgs/issues/9432
 2015-08-25 11:12:09 -07:00
Domen Kožar e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Eelco Dolstra e2a9541efc buildEnv: Fix handling of empty list of packages 2015-08-25 11:13:34 +02:00
Eelco Dolstra e4610f2965 buildEnv: Support package priorities like nix-env 
This gets rid of a bunch of collision warnings.
 2015-08-25 00:40:40 +02:00
Nikolay Amiantov f1187c5b14 build-fhs-userenv: move /tmp handling to bash part 2015-08-24 02:01:00 +03:00
Nikolay Amiantov ec27ba44d0 build-fhs-{chroot,user}env: expose sockets in /tmp 2015-08-24 01:47:19 +03:00
Thomas Tuegel c234f37b59 makeWrapper: child process inherits argv[0] 2015-08-23 10:30:00 -05:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Jude Taylor ef95107ddc make isClang work the way a user might expect 2015-08-12 11:27:54 -07:00
Vladimír Čunát c55e634f9a wrapGAppsHook: fix a typo 
It would only matter in (some) multiple-output derivations.
/cc @lethalman.
 2015-08-12 05:37:36 +02:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Arseniy Seroka d25014a3cd Merge pull request #9060 from oxij/emacs-cleanup 
Cleanup in emacs-packages
 2015-08-06 20:54:46 +03:00
William A. Kennington III 926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
William A. Kennington III a5d6e61c2f grsecurity: Push testing from 4.0 -> 4.1 2015-08-04 13:28:16 -07:00
Jan Malakhovski 56fbeb7a93 emacs-packages: add automatic meta.homepages to builders, cleanup other expressions 
Because we can.
 2015-07-31 02:02:04 +00:00
William A. Kennington III 7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Eelco Dolstra 068f8abaa5 releaseTools.coverageAnalysis: Emit hydra-metrics 2015-07-30 18:06:33 +02:00
Luca Bruno a8f6086708 wrapGAppsHook: populate GIO_EXTRA_MODULES 2015-07-30 10:45:04 +00:00
Vladimír Čunát 862900e42e mass-replace deprecated usage of find -perm (Fixes #9044) 
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
 2015-07-30 10:30:17 +02:00
William A. Kennington III aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Luca Bruno 2e92e7c06a Merge branch 'gwrap' 2015-07-29 11:32:01 +00:00
Luca Bruno 763fda70f0 wrapGAppsHook: build hook for wrapping GTK/GNOME apps 2015-07-29 11:14:56 +00:00
Vladimír Čunát b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Eelco Dolstra 2d9c63633e move-docs.sh: Handle share/gtk-doc 2015-07-26 13:35:49 +02:00
Ricardo M. Correia a0249ed425 buildRustPackage: Fix rust builds due to #7524 
Fixes #8966
 2015-07-24 20:47:58 +02:00
Shea Levy 745690717e build-maven: Add handling for snapshot version resolution 2015-07-20 09:19:12 -04:00
Vladimír Čunát 615f64dcbe gcc_multi: disable the hook moving lib64 to lib 
This was preventing wine from build, and we typically don't want it
anyway in multilib builds. /cc #8706.
 2015-07-20 13:43:52 +02:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
John Chee b80a497b85 mirrors: more imagemagick mirrors (close #8695) 
This is more-or-less the mirrors modifications from #8302.
 2015-07-18 10:14:30 +02:00
Vladimír Čunát 9f37e91ec5 Merge master into staging 
There are larger-rebuild changes: gnutls and samba.
 2015-07-17 06:38:04 +02:00
Rob Vermaas b715546071 Make fetchBower a bit more like a normal mkDerivation, which is easier to test. 
Also, in some cases, the result of fetchBower is different depending on the
value of $out. For now, it seems that it works best if using a local output
directory before copying to $out.

(cherry picked from commit aa4c6b027163abe0891f9ad438899f9679298a64)
 2015-07-16 14:42:16 +00:00
obadz 91a2973dc3 Add --ext option to nix-prefetch-zip 2015-07-15 16:15:41 +01:00
William A. Kennington III 25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Shea Levy 7e2082c16f Export info from build-maven 2015-07-14 05:58:54 -04:00
Eelco Dolstra dc62669335 Set ‘allowSubstitutes = false’ on various derivations 
This reduces the number of binary cache requests. See
b64988bb35.
 2015-07-09 15:10:37 +02:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Shea Levy a5a8bad0e6 buildMaven: Handle authenticated repos 2015-07-08 06:25:07 -04:00
Shea Levy e987d1c1e3 requireFile: Make more flexible 2015-07-08 06:25:07 -04:00
William A. Kennington III 7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Shea Levy 03dbba9757 build-maven: Handle very long dependency lists 2015-06-29 13:41:24 -04:00
Thomas Tuegel a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Thomas Tuegel 8862d8d9c9 autonix: JSON manifest format 2015-06-25 09:03:40 -05:00
Thomas Tuegel 0aa8e64967 kde5: JSON manifest format 2015-06-25 09:03:40 -05:00
William A. Kennington III 1e58156159 Merge branch 'master.upstream' into staging.upstream 2015-06-22 20:03:10 -07:00
aszlig d2df553da1
fetchpatch: Allow to pass a postFetch attribute. 
Comes in handy if we want to make additional modificiations to the
output file. While I wasn't sure whether to invoke the passed postFetch
directly before the patch or afterwards, I thought it would be better
afterwards because "postFetch of fetchpatch" at least to my intuition
would sound that after whatever "fetchpatch" does - it comes afterwards.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-06-23 03:35:30 +02:00
William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Shea Levy f63e764bb6 Add buildMaven 2015-06-21 22:24:03 -04:00
Vladimír Čunát 61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Vladimír Čunát c4406c585c makeDesktopItem: don't generated a deprecated key 
Fixes #4319. We even seem we never override it anywhere.
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html#deprecated-items
 2015-06-18 10:31:48 +02:00
Peter Simons bb42c215e2 R: improve support for CRAN and Bioconductor package sets 
- Update the instructions for re-generating each of the package set files.
 - Provide test-evaluation.nix expression to verify that the package sets evaluates.
 - Update list of known broken packages.
 2015-06-17 23:19:56 +02:00
Jeffrey David Johnson 93a742fd28 R: add support for Bioconductor packages 2015-06-17 23:19:56 +02:00
William A. Kennington III 8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Vladimír Čunát 6c382151fb imagemagick: remove mirrors that don't work 
/cc #8302.
 2015-06-15 11:30:28 +02:00
William A. Kennington III 954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Luca Bruno 5c8a993a42 fetchnuget: run fixupPhase to honor propagatedBuildInputs 2015-06-12 17:13:21 +02:00
Eelco Dolstra 69829dd4ff Debian: Update to 8.1 2015-06-12 11:22:59 +02:00
Pascal Wittmann 9aa07ac846 sourceforge: remove unreachable mirrors 2015-06-11 12:28:46 +02:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging 
Conflicts:
	pkgs/development/libraries/wayland/default.nix
 2015-06-11 00:23:03 +02:00
Mateusz Kowalczyk 330758e788 cran: remove bad mirror 
Gives ‘welcome to nginix’ pages
 2015-06-10 17:21:48 +01:00
Mateusz Kowalczyk 9bb5c2c488 Merge pull request #8077 from Ericson2314/agda 
Interactive `env` for developing Agda packages, and misc cleanup
 2015-06-08 14:57:38 +01:00
obadz d4681bf626 Lay down the foundation for packaging the .NET echosystem 
- fetchNuGet can fetch binaries from nuget servers
- buildDotnetPackage can build .NET packages using mono/xbuild
  - Places nuget & paket as they would clash with nix
  - Patch project files because F# targets are expected to be found in
    the mono directory (and we know that's not going to happen on nix)
  - Find DLLs that were copied from buildInputs and replace by symlink
    for sharing
  - Export produced DLL via the pkg-config mechanism
  - Create wrappers for produced EXEs
- Repackaged this new infrastructure: keepass, monodevelop
- Newly packaged: ExtCore, UnionArgParser, FSharp.Data, Paket, and a
  bunch more..

This is a combination of 73 commits.
 2015-06-06 09:06:22 -04:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Ricardo M. Correia 9176f73cee buildRustPackage: Cosmetic improvement 2015-06-05 19:18:45 +02:00
Eelco Dolstra 99d2e80d97 In VM builds, connect stdin to /dev/null 
This prevents programs from hanging while trying to read from stdin.
 2015-06-04 20:08:56 +02:00
Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
John Ericson be2cba690c agda: Remove unused/uneeded abstractions, including postprocess 2015-05-31 01:55:10 +00:00
John Ericson 9b31a07b0d agda: Just with all of the string helper functions 2015-05-31 01:54:09 +00:00
John Ericson 21b10ab44f agda: postprocess and defaults need not be in the scope of args 2015-05-30 19:22:32 +00:00
John Ericson c1f5748983 agda: Provide a .env like Haskell instead of .extras 2015-05-30 15:10:30 +00:00
William A. Kennington III 14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Ricardo M. Correia d7ebe7a4f3 buildRustPackage: Accept srcs attribute as well 
Add support for building Rust packages that have multiple sources, i.e.,
that use the `srcs` and `sourceRoot` attributes instead of just `src`.
 2015-05-29 19:46:20 +02:00
Benjamin Staffin 1db5bafc94 Typo fix! s/wheezy/jessie/ 2015-05-29 11:16:33 +02:00
Benjamin Staffin c7ac0ed3eb Add Debian 8.0 
Had to add file type logic in debClosureGenerator because Packages.bz2
is not available for Jessie - only Packages.xz is.
 2015-05-29 10:49:20 +02:00
vbgl 2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements 
Ocaml enhancements
 2015-05-26 23:52:32 +02:00
Arseniy Seroka 89810619ff Merge pull request #7973 from oxij/fetchurl-meta 
fetchurl: allow adding meta info; fetchFrom*: add meta.homepage
 2015-05-25 21:14:35 +03:00
Vladimír Čunát f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Jan Malakhovski bdf32ed2ab fetchurl: allow adding meta info; fetchFrom*: add meta.homepage 
The point of this is to be able to do `meta.homepage = src.meta.homepage;`
instead of the usual copy-paste for the packages that are hosted
on these hosting services.
 2015-05-24 14:26:39 +00:00
Mateusz Kowalczyk 177d40f582 Merge branch 'agda' of https://github.com/Ericson2314/nixpkgs into agda 2015-05-23 04:15:50 +01:00
Eric Merritt d814c50505 add an ocaml specific builder to the system 2015-05-22 10:12:21 -07:00
Eelco Dolstra 178c52e7ad Add Ubuntu 15.04 2015-05-22 13:21:02 +02:00
John Ericson 91ab6c9e89 agda: Wrapper is no longer built by default 
Instead it is provided to the user who can choose whether or not
to include it in the final derivati. Example of including would
be:

```nix
callPackage ... (self: { inherit (self.extras) extraThing; })
```

These extras are also available downstream without being built by
default. This is achieved with `passthru`.
 2015-05-20 16:01:40 +00:00
John Ericson 33c28bdc83 agda: Agda dependencies are treated seperately 
- Only they are added to the optional build path (share/agda)
 - Only they are are passed as an include dir (share/agda)
 - Only they are propigatedBuildInputs
 2015-05-20 16:01:04 +00:00
Ricardo M. Correia 9b752fd0e1 buildRustPackage: Don't hardcode registry index hash 
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
 2015-05-19 19:02:38 +02:00
John Ericson ae444ea4c4 agda: Remove extraBuildFlags 
This is unused, future users can just use override `buildFlags`
and extend/replace as needed. `includeDirs` is provided for this
purpose.

We should add `dirOf self.everythingFile` rather than `.`, but
`dirOf` breaks on relative paths so that is not an option.
 2015-05-18 12:33:00 -04:00
John Ericson 95c1c686a3 agda: Remove buildTools, it is unused 2015-05-18 04:10:37 +00:00
John Ericson 45052c02a8 agda: Replace eval with runHook 
This is what haskell-ng does, so I figure it is the right thing to
do.
 2015-05-17 20:15:09 -04:00
John Ericson 705c4d7b49 agda: Remove unnecessary env-var export 
Derivation attributes are automatically exported as environment
variables already.
 2015-05-17 20:15:09 -04:00
Thomas Tuegel 5583067fd8 emacsWithPackages: install support files 
The wrapper needs to link the desktop file, icons, info and man pages
into place so they will appear when emacsWithPackages is installed.
 2015-05-17 14:24:34 -05:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
Wout Mertens 1f400ea463 Merge pull request #6411 from NixOS/passAsFile 
writeTextFile: Use passAsFile if available
 2015-05-14 13:57:24 +02:00
Eelco Dolstra 6671bb8be4 Remove gccStdInc 
This reverts d927da8dae. Having a copy
of gcc-wrapper/setup-hook.sh is bad for maintainability - it had
already started to diverge. Also, gccStdInc gave a nix-env conflict
with the standard gcc. And it wasn't actually used in Nixpkgs.

Instead, if you really need to change "-isystem" to "-I", you can now
set ccIncludeFlag to "-I".
 2015-05-13 18:17:25 +02:00
Eelco Dolstra fef86de618 Make module loading work in VMs 
Also, execute stage 2 as PID 1.
 2015-05-13 17:36:58 +02:00
Eelco Dolstra b97362989f Provide /run in VMs 2015-05-13 17:36:29 +02:00
Ricardo M. Correia 755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust 
Add support for Rust / Cargo packaging
 2015-05-12 17:30:11 +02:00
Eric Seidel 395829686d add is{GNU,Clang} attrs to cc-wrapper. 
These will be more pleasant to use than the existing

    (cc.cc.isClang or false)

nonsense we currently do.
 2015-05-11 14:39:36 -07:00
William A. Kennington III c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
William A. Kennington III 0e4057b167 kernel: 4.0.1 -> 4.0.2 2015-05-07 20:32:24 -07:00
Eelco Dolstra c3f6c8c582 Mount /dev/shm in VMs 2015-05-07 15:31:36 +02:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons 324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Edward Tjörnhammar 655eed7a93 Merge pull request #7235 from risicle/fetchhgsubrepo 
fetchhg: add option to fetch hg subrepos
 2015-05-04 18:20:32 +02:00
Robert Scott 366da9e70f fetchhg: add option to fetch hg subrepos 2015-05-04 16:18:26 +01:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Edward Tjörnhammar 4256ab778a fetchhg: pass proxyvars to hg 2015-04-28 22:44:57 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Ricardo M. Correia d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack 
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
 2015-04-23 20:22:19 +02:00
Ricardo M. Correia b993c2113c buildRustPackage: Add a mechanism to patch registry deps 
... in a more generic way.

With this commit, if you need to patch a registry package to make it
work with Nix, you just need to add a script to patch-registry-deps
in the same style as the `pkg-config` script.
 2015-04-23 16:41:52 +02:00
Ricardo M. Correia 0cde1dc524 cargo: Remove setupHook 
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
 2015-04-23 15:26:23 +02:00
Thomas Tuegel 4887f44d02 emacsWithPackages: don't call package-initialize 
Emacs will call package-initialize itself, if required, or the user will
call it in their initialization file. There is no reason to call it in
the wrapper and doing so only increases start-up time.
 2015-04-23 08:08:22 -05:00
Ricardo M. Correia e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored 
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
 2015-04-23 02:58:07 +02:00
Nikolay Amiantov 19c497050e fhs-userenv: refactor and try to chdir to the current directory 
runScript now expects a filename instead of a Bash snippet; thus, "exec" should be
omitted.
 2015-04-22 17:50:41 +03:00
Nikolay Amiantov 508ef7e629 fhs-userenv: fix mkdirs 2015-04-22 17:50:41 +03:00
Nikolay Amiantov b66be2a549 fhs-userenv: move mounts map 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 97931361d7 fhs-userenv: refactor envvars and propagate SSL_CERT_FILE 2015-04-22 17:50:40 +03:00
Nikolay Amiantov de487c5c99 fhs-chrootenv: propagate SSL_CERT_FILE 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 68fabf295d fhs-chrootenv-env: cleanup 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 7a01374bf3 fhs-chrootenv-env: refactor /etc build and add ssl certs 2015-04-22 17:50:40 +03:00
Ricardo M. Correia d648be6724 buildRustPackage: Add check phase and enable it by default 
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
 2015-04-21 20:45:05 +02:00
Thomas Tuegel 8aa0d8f180 add emacsWithPackages 2015-04-21 13:06:24 -05:00
Georges Dubus 7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Ricardo M. Correia c55c7e1c1e fetchgit: Add support for specifying branch name 
This is useful when `leaveDotGit = true` and some other derivation
expects some branch name to exist.

Previously, `nix-prefetch-git` always created a branch with a
hard-coded name (`fetchgit`).
 2015-04-21 19:46:29 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Nikolay Amiantov 25618c3670 agda: migrate to haskell-ng, update and cleanup 
Resolves https://github.com/NixOS/nixpkgs/pull/7172.
 2015-04-06 21:24:33 +02:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome 
closes #1707
 2015-04-04 22:22:12 -07:00
Michael Raskin 6b678048cd Merge pull request #5874 from robberer/nixos/libredirectaccess 
libredirect: add access syscall
 2015-04-04 21:29:21 +03:00
Arseniy Seroka 8592c6c004 Merge pull request #7150 from joachifm/grsec-types 
grsecurity module: use types.enum
 2015-04-03 16:03:49 +03:00
Joachim Fasting ba93a75724 grsecurity module: use types.enum 
Also
- set desktop as default system
- make virtualisationSoftware nullOr
- make virtualisationConfig nullOr
 2015-04-03 13:45:45 +02:00
Eric Seidel bb363dd2f2 fetchgitlocal: use output of git show and git diff to tell nix whether the source has changed. 
this is way more hacky than i was hoping...
 2015-03-31 20:00:00 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Charles Strahan d590a0f4b6 ghcjs: support for Haskell-NG 
closes #5828
closes #6786
 2015-03-29 03:34:04 +02:00
Eric Seidel 1a68f81db4 fetchgitlocal: don't force copying the whole source directory into the store.. 2015-03-28 13:13:18 -07:00
Eric Seidel da73e45cd0 fetchgitlocal: local fetcher based on git ls-files 2015-03-28 12:59:12 -07:00
Daniel Peebles dcde8a967f Merge pull request #7038 from avnik/gccgo-wrapper 
Rename ccgo back to gccgo
 2015-03-27 21:05:22 -04:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 4631afc21e Support unraring source files 2015-03-27 15:36:26 -07:00
Alexander V. Nikolaev 3311513df6 Rename ccgo back to gccgo 
I believe this is result of typo, introduced in 48f63c2f.
 2015-03-27 12:45:32 +02:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
William A. Kennington III f2655e4fa0 makeInitrd: Support prepending other initrds 2015-03-25 14:14:46 -07:00
Thomas Tuegel 2e0775e3a8 Revert "cc-wrapper: fix missing attribute" 
This reverts commit 6454b8f9ef.
 2015-03-24 17:48:53 -05:00
Thomas Tuegel 6454b8f9ef cc-wrapper: fix missing attribute 2015-03-24 17:14:55 -05:00
Eelco Dolstra 9c579f691f fix-darwin-dylib-names: Fix all outputs 
This fixes the install names of the Boost dylibs on Darwin.
 2015-03-24 16:28:20 +01:00
Eelco Dolstra b4830add94 Revert "fix-darwin-dylib-names: Fix all outputs" 
This reverts commit 253f3d72c2.
 2015-03-24 16:27:54 +01:00
Eelco Dolstra 253f3d72c2 fix-darwin-dylib-names: Fix all outputs 
This fixes the install names of the Boost dylibs on Darwin.
 2015-03-24 15:59:05 +01:00
Vladimír Čunát e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Ricardo M. Correia 7c8247a8c5 grsecurity: Update stable and test patches 
stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203
test:   3.1-3.18.9-201503071142  -> 3.1-3.19.1-201503122205
 2015-03-15 03:49:58 +01:00
Luca Bruno b1adfeb23d fhs-userenv: Make it work on kernel < 3.19 cc @abbradar 
It may not be very secure, but I think it's better to make it work
with older kernel since 3.19 is not the default on nixos.
 2015-03-10 18:12:38 +01:00
lethalman fcfe8ecc33 Merge pull request #6737 from anderspapitto/fhs 
build-fhs-userenv passes through command line args
 2015-03-10 17:53:32 +01:00
Peter Simons 5d02f0e854 fetchgit: add 'deepClone' argument to disable shallow fetching 
This patch resolves https://github.com/NixOS/nixpkgs/issues/6395. Deep
cloning is useful in combination with 'leaveDotGit' for builds that want
to run "git describe" to obtain a proper version string, etc., like the
'haskellngPackages.cabal2nix' package does.
 2015-03-10 13:14:00 +01:00
Peter Simons 6694ef42a9 Merge branch 'master' into staging. 
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
 2015-03-10 12:09:43 +01:00
Anders Papitto 4bcc817521 build-fhs-userenv passes through command line args 
The motivation for this change is to allow things like the
following derivation, which wraps the debian-packaged
hello binary.

let nixpkgs = import <nixpkgs> {};
    stdenv = nixpkgs.stdenv;
in rec {
  dumb-hello = stdenv.mkDerivation {
    name = "dumb-hello";
    builder = ./builder.sh;
    dpkg = nixpkgs.dpkg;
    src = nixpkgs.fetchurl {
      url = "http://ftp.us.debian.org/debian/pool/main/h/hello-traditional/hello-traditional_2.9-2_amd64.deb";
      md5 = "f5f3c28b65221dae44dda6f242c23316";
    };
  };
  full-hello = nixpkgs.buildFHSUserEnv {
    name = "full-hello";
    targetPkgs = pkgs: [ dumb-hello ];
    multiPkgs = pkgs: [ pkgs.dpkg ];
    runScript = "hello";
  };
}
 2015-03-09 23:44:51 -07:00
Nikolay Amiantov 3e395b71da chroot-env: add locales, refactor environment 2015-03-09 17:29:43 +03:00
Nikolay Amiantov e3ab3df26e chroot-env: ignore collisions and fix permissions 2015-03-09 17:29:43 +03:00
Nikolay Amiantov 4aba7639c8 chroot-env: build /etc 2015-03-09 17:29:43 +03:00
Thomas Tuegel afa4c3aed2 autonix: allow one-to-many dependency resolution 2015-03-08 17:28:44 -05:00
Shea Levy f91dea4c0b cc-wrapper: Set default system include flags for non-gcc c++ on Linux 
Without this, clang can't find libstdc++. This needs to happen in the wrapper
so that the libc++ setup hook can still override it
 2015-03-06 19:04:43 +00:00
Eric Seidel 6b60f3dcad Merge pull request #6641 from oxij/emacs-ng 
Somewhat more generic emacs packages' builder and a bunch of new emacs packages and metas
 2015-03-05 13:22:45 -08:00
Eelco Dolstra 6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Jan Malakhovski e4a4e109ba refactor Emacs packages'/modes' builders 
This simplifies melpa builder by merging with it my old emacs modes builder,
adds better instructions and support for overrides in emacs-packages.nix,
and renames some emacs-related stuff in all-packages.nix for sanity reasons.

I declare this backwards compatible since direct uses of emacsPackages in
configuration.nix are very unlikely.
 2015-03-03 16:02:15 +00:00
Jan Malakhovski a444eff3f2 reorganize emacs related files 2015-03-03 05:31:38 +00:00
Eelco Dolstra 3a31043b43 fillDiskWithRPMs: Pass --extract-over-symlinks to cpio 
http://hydra.nixos.org/build/20003320
 2015-02-27 14:00:11 +01:00
Bjørn Forsman 06f5651ef5 nix-prefetch-git: print commit date (close #6522) 
The commit date can be used as a version number in packages that don't
have proper releases.
 2015-02-24 23:02:59 +01:00
Nikolay Amiantov 6b72418ee5 Merge pull request #6532 from abbradar/6486-fix 
buiildFHSEnv: check if multiPkgs is empty
 2015-02-23 14:09:07 +03:00
Nikolay Amiantov b002fdd89f buiildFHSEnv: check if multiPkgs is empty 
Fixes #6486
 2015-02-23 13:54:41 +03:00
Joel Taylor 8bfa1a2efc Patches for a lot of packages for GHC 7.10 2015-02-22 17:33:10 -08:00
Vladimír Čunát c00d36f6c1 fetchurl: fix typo from 105154afed pushed today 2015-02-22 20:27:29 +01:00
Vladimír Čunát 105154afed fetchurl: build the mirror list locally 2015-02-22 19:26:22 +01:00
Thomas Tuegel fdcfefee2c autonix: tweak manifest format 2015-02-21 11:39:18 -06:00
Bjørn Forsman c22435e70d clang-analyzer: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Nikolay Amiantov 621d1ab444 R: update mirrors 2015-02-18 15:41:46 +03:00
Wout Mertens 5c9319ddac writeTextFile: Use passAsFile if available 2015-02-18 01:08:03 +01:00
Eric Seidel 76a501acdb reorganize emacs packages and add some meta info 2015-02-17 15:08:55 -08:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
Florian Friesdorf e82e14ef60 mirrors: move more reliable postgresql mirror up 
Picked from #6101.
 2015-02-14 10:31:12 +01:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Eelco Dolstra fa47d347a4 Fix conflict between fedora-release and generic-release 
http://hydra.nixos.org/build/19594340
 2015-02-12 17:55:29 +01:00
Eelco Dolstra ff37dc6fb6 Remove tabs 2015-02-12 17:55:29 +01:00
Eelco Dolstra 28ea9050fa Remove ancient RedHat 9 / SuSE 9 images 
These are 12 years old and I don't think anybody is using them.
 2015-02-12 17:55:29 +01:00
Eelco Dolstra da73688e3d fillDiskWithRPMs: Shut up some warnings 2015-02-12 17:55:28 +01:00
Eelco Dolstra 3786f08d25 Add Fedora 21 2015-02-10 11:32:43 +01:00
Dan Peebles 7bea6aafae Some cc-wrapper changes to better support darwin and clang: 
- Add a conditional flag for the c++ std lib
- Build binaries that get linked by our own dyld (someday)
- Automatically add framework directories in the setup hook
 2015-02-08 21:15:22 -05:00
William A. Kennington III 5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls 
fetchurl: collate samba project urls into a mirror
 2015-02-08 13:38:01 -08:00
Edward Tjörnhammar 33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Thomas Tuegel 73f8aebd8d autonix: expose importManifest 2015-02-07 12:52:01 -06:00
Thomas Strobel d255d41678 Update: new features for nix-template-rpm 
- nix-template-rpm can now split the generated templates into
    a static part that goes into the nixpkgs tree
    a dynamic part that can be updated easily to track the rpm spec files
- add lookup mechanism for package names and package paths
- add mechanism to update existing nix-expression with new download files
 2015-02-06 20:12:57 +01:00
lethalman 4060b86bcf Merge pull request #6182 from monocell/php-update-5.5-5.6 
Php update 5.5/5.6
 2015-02-06 10:49:35 +01:00
Emil Rangden 8c125c0c74 fix phpPackages memcache,memcached,xdebug 
These packages, and maybe some more include unix.h for some reason.
Creating that file makes them build, and in the case of xdebug also
appear to work.
 2015-02-05 20:28:16 +01:00
Nikolay Amiantov 3500978b8f build-fhs-*: prefer local build 2015-02-05 20:39:01 +03:00
Nikolay Amiantov 4b3bb7b448 userFHSEnv: add build tool 2015-02-05 19:46:25 +03:00
Nikolay Amiantov b3ee378f50 buildFHSChrootEnv: split environment and chroot scripts 2015-02-05 19:46:00 +03:00
Domen Kožar ee74e1a055 solr: 4.10.2 -> 4.10.3, CVE-2014-3628 
(cherry picked from commit 4fa25ee93a)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-02-04 11:48:28 +01:00
Eric Seidel 6f7632a7bd update libcxx[abi] to 3.5 2015-02-03 14:02:59 -08:00
Shea Levy aea1254f96 cc-wrapper merge fixes 2015-02-02 21:30:05 -05:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Thomas Tuegel 2b933f31f6 kdeApps.kmix: remove Qt 4 dependencies 2015-02-01 10:26:55 -06:00
Shea Levy cfb29ab882 Merge branch 'gridaphobe' into staging 
fix cc-wrapper for cross-compilation
 2015-01-28 13:47:47 -05:00
Eelco Dolstra 6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Thomas Strobel f0228c6eb2 Add: nix-template-rpm: Script to generate templates of nix expressions from RPM .spec files 2015-01-27 01:18:52 -08:00
Thomas Tuegel c6f1c75472 kdeApps: update to 14.12.1 2015-01-26 21:01:06 -06:00
Thomas Tuegel 1fbecd1295 gcc-wrapper: comment on alternate setup hook 
We now have an alternate setup hook for gcc-wrapper that uses -I to add
include paths rather than -isystem. The latter flag can change the
search order specified by the build system. For KDE 5 packages, we don't
want that!
 2015-01-26 21:00:39 -06:00