Nikolay Amiantov
47ea8c097c
buildFHSUserEnv: add .env support
2015-08-26 19:39:08 +03: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
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