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
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