Linus Heckemann
33962a4420
stdenv: fix "grep: invalid range"
2017-05-04 16:54:01 +01:00
Frederik Rietdijk
c520e79842
Merge remote-tracking branch 'upstream/master' into HEAD
2017-05-03 09:59:49 +02:00
Vladimír Čunát
1bcd56b6e6
Merge branch 'master' into staging
...
There's been a very large rebuild on master, unfortunately.
pytestcov conflict: I'm not really sure what should be propagated.
2017-05-02 16:01:48 +02:00
Utku Demir
5a78bed2bb
Fix documentation of emacsWithPackages
...
After [this change](901a778c77
), it should be `overrideScope` instead of `override`.
2017-05-02 09:52:04 +12:00
Michael Raskin
f3b45f83b5
Merge pull request #25205 from orivej/rsp
...
Fix parsing @args.rsp compiler arguments
2017-05-01 18:48:11 +02:00
Shea Levy
8a1707ad0d
nixBufferBuilders: Add haskellMonoRepo builder
2017-05-01 11:44:21 -04:00
rht
5628cebcf0
/bin/sh -> ${stdenv.shell}
2017-04-30 17:01:07 +02:00
Thomas Tuegel
4e0d21edd1
Merge pull request #25285 from ttuegel/qt--fix-plugin-paths
...
Qt: purify plugin paths, unify Linux and Darwin builders
2017-04-30 07:33:50 -05:00
Joachim Fasting
ab4fa1cce4
tree-wide: prune some dead grsec leaves
...
The beginning of pruning grsecurity/PaX from the tree.
2017-04-30 12:05:41 +02:00
Peter Simons
d1008a9a5f
Merge pull request #25299 from ahmedtd/fix-wrap-gapps-hook
...
wrapGAppsHook: Correct `wrapProgram` invocations
2017-04-29 10:33:52 +02:00
Taahir Ahmed
2cd342cfb3
wrapGAppsHook: Correct wrapProgram
invocations
...
This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.
Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files. In addition, it failed to wrap files in subdirectories.
Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
2017-04-28 15:24:50 -05:00
Peter Simons
5c25c33a05
wrapGAppsHook: Revert "Correct wrapProgram
invocations"
...
This reverts commit 8b9f153bb9
of
https://github.com/NixOS/nixpkgs/pull/25183 because it breaks builds of
packages that don't install both a "bin" and a "libexec" directory. See
https://github.com/NixOS/nixpkgs/pull/25183#issuecomment-298064769 for more
details.
2017-04-28 20:01:33 +02:00
Thomas Tuegel
394885daec
kdeWrapper: prefix Qt search paths
2017-04-28 05:54:20 -05:00
Peter Simons
edcff000d4
Merge pull request #25183 from ahmedtd/fix-wrap-gapps-hook
...
wrapGAppsHook: Correct `wrapProgram` invocations
2017-04-28 11:13:12 +02:00
Renzo Carbonara
d3bf2afc54
fetchdarcs: add SSL_CERT_FILE environment variable
2017-04-26 22:23:00 +02:00
Dan Peebles
9e764af72f
fetchs3: init simple S3 downloader
2017-04-25 22:01:32 -04:00
Orivej Desh
e9adf383e6
Fix parsing @args.rsp compiler arguments
2017-04-25 13:29:43 +00:00
Taahir Ahmed
8b9f153bb9
wrapGAppsHook: Correct wrapProgram
invocations
...
This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.
Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files. In addition, it failed to wrap files in subdirectories.
Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
2017-04-24 10:56:53 -05:00
Frederik Rietdijk
4fc9b1852a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-04-23 11:26:47 +02:00
Benno Fünfstück
bd78749d33
rust: improve fetch-cargo-deps determinism for non-sandboxed builds
...
When not using sandboxing, /usr/share/git-core/templates may leak into the
nix build through the libgit2 hardcoded default template search path. We now
explictly set the templatedir to avoid this problem.
See https://github.com/bennofs/nix-index/issues/2#issuecomment-296268983 for
an example case of nondeterminism.
2017-04-21 23:26:46 +02:00
Sven Slootweg
fa8adf2c47
fetchurl: fixed typo in error message
...
This typo was likely introduced by copy-pasting the error message from elsewhere and forgetting to change the text, during the MD5 deprecation process (#4491 ).
2017-04-21 16:41:09 +02:00
Frederik Rietdijk
e0abe74baf
Merge remote-tracking branch 'upstream/master' into HEAD
2017-04-18 11:25:43 +02:00
Tim Stewart
5ca1646bb0
docker: improve reproducibility of layers
...
This patch fixes file modification times to $SOURCE_DATE_EPOCH, and
ensures that files originating from the store are owned by root:root.
Both changes improve reproducibility, and the latter allows proper
building on a host where the store is owned by a non-root user.
2017-04-16 22:46:24 -04:00
Jörg Thalheim
e8d5af0bd8
buildRustPackage: only copy executables to bin
...
in newer rust versions also *.rlib files are put into this directory
2017-04-15 13:26:51 +02:00
Jörg Thalheim
be70c02461
buildRustPackage: add standard package hooks
...
when overriding build phases also the standard hooks should be called
2017-04-15 13:26:51 +02:00
Jörg Thalheim
33cfee8177
buildRustPackage: add cargoBuildFlags
2017-04-15 13:26:50 +02:00
John Ericson
3bff114d95
Merge pull request #24871 from elitak/cross-staging
...
Various small crossDrv fixes
2017-04-15 01:27:05 -04:00
Vladimír Čunát
f7a4f146c9
Merge branch 'master' into staging
...
This includes a fix for a bad merge.
2017-04-14 19:22:02 +02:00
Vladimír Čunát
aeb0560959
Merge #24858 : Smart wrapProgram
2017-04-14 12:24:33 +02:00
Eric Litak
bd45ec6416
buildEnv: use buildPackages.perl so crossDrv works
2017-04-14 02:00:08 -07:00
Nikolay Amiantov
e7c76d3c25
makeWrapper: search for free unwrapped file name
2017-04-12 18:12:16 +03:00
Nikolay Amiantov
54bbf91479
buildFHSEnv: add ACLOCAL_PATH
...
Fixes #24620 .
2017-04-12 14:43:08 +03:00
Christian Kauhaus
09f24f628b
buildRustPackage: Fix "warning: file ... may be generated" ( #24471 )
...
Every Rust derivation used to emit a warning like the following:
```
setting SOURCE_DATE_EPOCH to timestamp 1490877042 of file cargo-6e0c18c/Cargo.lock
warning: file cargo-6e0c18c/Cargo.lock may be generated; SOURCE_DATE_EPOCH may be non-deterministic
```
The reason is that the dependencies are copied without preserving
timestamps. Changing the build script to timestamp-preserving copy
removes the warning.
2017-03-30 15:15:49 +02:00
Michael Raskin
8a919af23b
Merge pull request #24347 from spacekitteh/fetchGitRepo
...
fetchRepoProject: fixes; more options
2017-03-28 02:33:35 +02:00
Nikolay Amiantov
50adc53207
buildDotnetPackage: don't depend on invalid quoting in makeWrapper
...
Fixes #24387 .
2017-03-27 18:24:08 +03:00
Sophie Taylor
50d964d105
fetchRepoProject: typo
2017-03-27 15:04:02 +10:00
Sophie Taylor
69055ecb51
fetchRepoProject: fixup
2017-03-26 21:55:41 +10:00
Sophie Taylor
f3b6a0b14c
fetchRepoProject: typo
2017-03-26 21:50:46 +10:00
Sophie Taylor
62e115af5b
Merge branch 'master' into fetchGitRepo
2017-03-26 20:17:03 +10:00
Sophie Taylor
1f545f01bb
fetchRepoProject: fixes; more options
2017-03-26 20:05:59 +10:00
Shea Levy
f087b75941
nix-buffer support: Make process-environment changes actually local
2017-03-25 11:13:25 -04:00
Daiderd Jordan
7dc489d95a
Merge pull request #24275 from spacekitteh/fetchFromGitRepo
...
fetchRepoProject: Fix buildCommand
2017-03-25 09:45:11 +01:00
Daiderd Jordan
00f472a563
fetchrepoproject: cleanup extra flags
2017-03-25 00:35:20 +01:00
Sophie Taylor
2078c34dad
fetchRepoProject: Fix buildCommand
2017-03-25 00:24:43 +01:00
Shea Levy
9a777013d1
Add setupSystemdUnits function.
...
Allows setting up and managing a set of systemd units on any systemd distribution.
2017-03-24 15:47:51 -04:00
Daiderd Jordan
f6669da3cf
fetchrepoproject: fix evaluation
2017-03-24 08:40:16 +01:00
Daniel Peebles
a9644fb1f0
Merge pull request #24239 from spacekitteh/fetchFromGitRepo
...
Added fetchRepoProject
2017-03-23 23:30:07 -04:00
Sophie Taylor
76e095c6c5
fetchRepoProject: init.
...
Added to grab projects added by git-repo.
Contains some problems still reguarding purity and clone.bundle,
but good enough for now.
2017-03-24 13:28:23 +10:00
Nikolay Amiantov
a40b7d07e9
makeQtWrapper, kdeWrapper: add GTK3 dependencies
2017-03-22 20:15:32 +03:00
HeeL
cd2627da0d
Fix mkdir for fetchgx to not throw an exception
2017-03-21 16:04:00 +01:00