Thomas Tuegel
07a0031029
melpaBuild: add unpackCmd for single-file packages
...
Emacs packages are commonly distributed as single .el files. This
unpackCmd handles them correctly and sets up sourceRoot. Other sources
are treated in the default manner.
2015-12-06 11:50:10 -06:00
Thomas Tuegel
63eb6fdd8a
fetchsvn: correctly handle trailing slashes
...
`splitString` does not split on trailing separators.
2015-12-06 11:49:51 -06:00
Peter Simons
b89514eced
fetchgit: follow up to 2cf7069b7d
...
If "fetcher" is a string, then Nix will execute it with bash already, so
the additional bash argument in that string was redundant and apparently
causes trouble on non-Linux platforms.
Hopefully fixes https://github.com/NixOS/nixpkgs/issues/11496 .
2015-12-06 15:06:02 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Peter Simons
65f3932f6e
Update list of gnupg.org mirror sites.
...
The list we had before contained a lot of junk, i.e. sites that were no
longer online or no longer in sync. The new list of sites comes from
https://gnupg.org/download/index.html .
2015-12-04 21:11:22 +01:00
Nikolay Amiantov
00f6ce133c
buildFHS{Chroot,User}Env: support extraInstallCommands
2015-12-04 00:58:47 +03:00
Peter Simons
806008a48e
Merge pull request #11362 from dezgeg/pr-buildenv-meta
...
buildEnv: Allow setting meta attributes
2015-11-30 23:21:39 +01:00
Tuomas Tynkkynen
74c09a6e64
buildEnv: Allow setting meta attributes
2015-11-29 19:13:19 +02:00
Peter Simons
2cf7069b7d
fetchgit: call in-repository script with bash explicitly
...
The script's shebang depends on /usr/bin/env, which we don't have in chroot
environments. This patch remedies the fallout from ade9f7167d
, which
fixed https://github.com/NixOS/nixpkgs/issues/11284 .
2015-11-29 15:43:56 +01:00
Peter Simons
ade9f7167d
nix-prefetch-git: make sure the script is interpreted by bash
...
Fixes https://github.com/NixOS/nixpkgs/issues/11284 .
2015-11-27 11:17:50 +01:00
Eelco Dolstra
75e41b0210
Add Fedora 23
2015-11-25 16:18:15 +01:00
Eelco Dolstra
e4eee41ad0
Add Ubuntu 15.10
2015-11-25 15:40:08 +01:00
Nikolay Amiantov
287f99bada
r-modules: use HTTPS, allow passing args from generated set, use MRAN
2015-11-25 11:39:28 +01:00
Wei-Ming Yang
3a205134fb
Update builder.sh
...
fix a incorrect name of environment variable
2015-11-25 17:14:03 +08:00
Ricardo M. Correia
799f0f1f23
buildRustPackage: fix failure due to branch names with slashes
...
Fixes #11237
2015-11-24 20:50:11 +01:00
Nikolay Amiantov
0427b21aba
chrootenv: symlink some directories instead of copying
2015-11-23 21:39:49 +03:00
Nikolay Amiantov
6d6c1d3523
chrootenv: fix include directories
2015-11-23 19:54:07 +03:00
Vladimír Čunát
13eca6f79a
Merge #11067 : SmartOS updates
...
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Jude Taylor
131e831cb9
allow networking by default and remove it from derivations
2015-11-19 11:31:06 -08:00
Jude Taylor
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
Jude Taylor
914e9baefe
start on sandbox stuff
2015-11-19 11:31:06 -08:00
Eelco Dolstra
16acdb45bd
Revert "kernel: Remove unsupported 3.10, 3.12, 3.14"
...
This reverts commit 2441e002e2
. The
motivation for removing them was not very convincing. Also, we need
3.14 on some Hydra build machines.
2015-11-19 14:25:16 +01:00
Ricardo M. Correia
2b694c237b
cargo, cargoSnapshot: add rustc runtime dependency
...
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.
This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.
The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).
That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.
Fixes #11053
2015-11-18 02:41:45 +01:00
Shea Levy
a75de3ce56
Merge branch 'replace-dependency' of https://github.com/roconnor/nixpkgs
...
When replace-dependency is given a drv that doesn't actually depend on
oldDependency, then just return back the original drv but also issue a
warning.
2015-11-17 07:09:03 -05:00
Russell O'Connor
fb683211dc
replace-dependency.nix: Remove unnecessary carriage return.
2015-11-16 17:52:12 -05:00
Russell O'Connor
94e68bf9ee
replace-dependency.nix: Give attr a slightly more meaningful name of drvHash
2015-11-16 17:44:03 -05:00
Danny Wilson
f17dea3b3d
Fix compilation of GCC 4.9 on SmartOS.
...
Fix ld-solaris-wrapper never calling ld (since gcc->cc-wrapper refactor).
2015-11-16 17:20:16 +01:00
Danny Wilson
f9134ca9df
Fix patchShebangs on SmartOS
...
Tail is very picky about the space after -c
when compiled by Nix on Illumos (no idea why).
2015-11-16 17:20:14 +01:00
Danny Wilson
6a2b723a8b
Fix build of gccgo-wrapper on Illumos.
...
When compiling GCC with NIX_ENFORCE_PURITY,
linking libgcc fails because crti.o and friends
aren't part of the nix store.
2015-11-16 17:20:12 +01:00
Danny Wilson
d50d14d55f
Use the nix provided shell.
...
This is guaranteed to be bash, SmartOS has ksh by
default and doesn't work.
2015-11-16 17:20:11 +01:00
Shea Levy
afaf712ee7
replace-dependency.nix: Use dynamic attrs now.
2015-11-16 05:42:27 -05:00
Russell O'Connor
782cfe94b0
replace-dependency.nix: new feature
...
When replace-dependency is given a drv that doesn't actually depend on oldDependency, then just return back the original drv but also issue a warning.
2015-11-15 19:52:30 -05:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Andrew Rynhard
42ff8ad780
Add help flag to nix-prefetch-git
2015-11-12 15:10:56 -08:00
obadz
972381b66a
citrix-receiver: init at 13.2.1, fixes #8458
2015-11-11 22:27:15 +01:00
Nikolay Amiantov
1b69894d74
fhs-env: symlink /usr/lib to libs for the main architecture
2015-11-11 00:01:02 +03:00
Nikolay Amiantov
d4c27381dc
Merge pull request #10460 from abbradar/remote-askpass
...
Support network in initrd and entering LUKS passphrase via SSH
2015-11-10 16:41:34 +03:00
William A. Kennington III
2441e002e2
kernel: Remove unsupported 3.10, 3.12, 3.14
...
Our base kernel headers were bumped to 3.18 so we can no longer reliably
support kernels older than 3.18
2015-11-09 11:10:42 -08:00
Vladimír Čunát
d10b9108f2
wrapGAppsHook: fix $gappsWrapperArgs as intended
...
i.e. define it even if $dontWrapGApps is set, and document the intention.
2015-11-09 15:40:20 +01:00
Vladimír Čunát
3f074b8a1e
wrapGAppsHook: avoid running multiple times
...
/cc #10351 and @lethalman.
2015-11-09 15:19:41 +01:00
William A. Kennington III
a26c8e9b83
Merge branch 'master.upstream' into staging.upstream
2015-11-07 15:51:51 -08:00
goibhniu
04d45939d0
Merge pull request #10688 from demin-dmitriy/pinta
...
pinta: 1.4 -> 1.6
2015-11-07 15:38:44 +01:00
Wout Mertens
774f74b875
Don't fail if env-vars cannot be written to
...
env-vars is a debugging aid, see
3e5dbb2433
for a rationale for this change.
2015-11-04 16:32:59 +01:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Vladimír Čunát
b4bd19762a
Revert "Don't fail if env-vars cannot be written to"
2015-11-04 07:30:02 +01:00
Wout Mertens
baba136c30
Merge pull request #10262 from wmertens/nofailnixshell
...
Don't fail if env-vars cannot be written to
2015-11-04 07:21:56 +01:00
Wout Mertens
b21a5013a0
Don't fail if env-vars cannot be written to
...
env-vars is a debugging aid, see
3e5dbb2433
for a rationale for this change.
2015-11-04 07:19:57 +01:00
Ricardo M. Correia
2389a707af
fetch-cargo-deps: add debug output
...
... so that we can find out why there are sporadic hash mismatches.
2015-11-02 15:44:43 +01:00
William A. Kennington III
1496b0f6a1
Fix buildenv
2015-10-30 18:09:45 -07:00
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