Graham Christensen
1f0a09fd59
Merge pull request #31801 from bhipple/centos-7.3-vmtools-image
...
Init Centos 7.3 vmTools diskImage
2017-11-22 20:19:51 -05:00
Eelco Dolstra
3d5828ebed
releaseTools.sourceTarball: Clean up temporary files
2017-11-21 19:45:20 +01:00
Eelco Dolstra
9f74cf3e12
vm: Create /dev/full
...
https://hydra.nixos.org/build/64519371
2017-11-21 18:25:50 +01:00
Benjamin Hipple
368432e17f
Init Centos 7.3 vmTools diskImage
...
This commit adds the CentOS 7.3 base image from the CentOS vault, for use with
building RPMs or evaluating Nix expressions.
2017-11-18 16:05:49 -05:00
Frederik Rietdijk
4508a17da7
Merge pull request #31356 from FRidh/fetchgitPrivate
...
fetchgitPrivate: put our custom ssh on PATH
2017-11-10 10:57:50 +01:00
John Ericson
0101856765
Merge pull request #30549 from obsidiansystems/bintools
...
treewide: Introduce stdenv.cc.bintools
2017-11-08 14:20:48 -05:00
Frederik Rietdijk
f8eed5f7a5
fetchgitPrivate: put our custom ssh on PATH
...
Currently we wrap ssh so it can find the config file passed in by
<ssh-config-file>. If one however uses ProxyCommand ssh, then ssh that
is on PATH is taken (which is also unavailable when using nix-shell
--pure), which is the plain ${openssh}/bin/ssh.
This commit makes sure our wrapped ssh is available on PATH.
2017-11-07 14:07:52 +01:00
Vladimír Čunát
9aa37b159b
Merge branch 'master' into staging
2017-11-07 06:41:23 +01:00
Frederik Rietdijk
13cc4f513e
Merge pull request #31271 from FRidh/fetchurl
...
fetchurl: add passthru
2017-11-06 20:41:22 +01:00
Vladimír Čunát
1d9a8e2289
Merge branch 'master' into staging
2017-11-06 13:24:06 +01:00
Vladimír Čunát
c8c6a1edb5
Merge #31209 : cc-wrapper: Fix if dynamicLinker not found
2017-11-06 13:07:43 +01:00
Bojan Nikolic
3a63fc1258
Remove trailing line
2017-11-05 23:00:24 +00:00
Bojan Nikolic
2ed054885b
Remove the unnecessary second conditional
2017-11-05 22:57:44 +00:00
John Ericson
70d91badf5
treewide: Depend on stdenv.cc.bintools instead of binutils directly
...
One should do this when needed executables at build time. It is more
honest and cross-friendly than refering to binutils directly.
2017-11-05 17:10:53 -05:00
Tuomas Tynkkynen
0d9f2f0bb4
platforms.nix: Clean up more 'uboot' legacy
...
For a while now, the only thing the 'uboot' attribute does is to tell
whether to add ubootTools to kernel/initrd builds. That can be
determined with platform.kernelTarget == "uImage" just as well.
2017-11-05 17:06:59 +02:00
Tuomas Tynkkynen
b50693d16c
kernel, initrd: Remove legacy ubootChooser
2017-11-05 15:11:12 +02:00
Nikolay Amiantov
5f3b84e979
cc-wrapper: disable POSIX compatibility
2017-11-05 12:19:37 +02:00
Frederik Rietdijk
ef21b240c8
fetchurl: add passthru
...
so that we could add e.g. the `version` attribute.
2017-11-05 10:12:19 +01:00
knupfer
d71833ee36
fetchipfs: init
...
Fixes #18296
2017-11-04 23:01:27 +01:00
Bojan Nikolic
3e9daece1d
nixos/cc-wrapper: Fix bug if dynamicLinker not found
...
If a dynamic linker for target is not found the generated script fails
due to unbound variable error (due to "set -u"). Correct by specifying
default value with dynamicLinker:- and not generating ldflagsBefore if
no linker is found.
This problem was found when cross compiling to mingw32 targets
2017-11-03 21:36:43 +00:00
Piotr Bogdan
eb33f5bc04
build-pecl: honour nativeBuildInputs
...
Otherwise certain extensions are unable to locate pkgconfig.
2017-11-02 16:28:06 +00:00
Vladimír Čunát
c4be15a83b
closure-info: another half-blind attempt to fix on Hydra
...
The previous one was very bad and worsened the situation.
But even running with some nix-1.12 I'm unable to reproduce
the original failure. Let's unblock channels for now.
2017-11-01 08:07:15 +01:00
Vladimír Čunát
7320572387
closure-info: half-blind attempt to fix on Hydra
...
I'm not sure why these started to block channel several days ago.
I've been unable to reproduce the failures locally.
2017-11-01 07:40:49 +01:00
Vladimír Čunát
447802a683
Merge branch 'master' into staging
2017-10-31 23:47:34 +01:00
Joerg Thalheim
cdf059f797
fetchbzr: do not write logs to non-existing home
2017-10-30 21:51:22 +00:00
Vladimír Čunát
687943763c
Merge branch 'master' into staging
2017-10-30 22:30:14 +01:00
Falco Peijnenburg
3004b6f150
fetchgitrevision: removed
...
It doesn't work and was last referred to in 5553546c21
2017-10-30 18:37:20 +01:00
Rodney Lorrimar
9b0d50e3d0
fetchbower: clean common uri characters from version string
...
Some bower.json files have URL dependencies missing a version.
Fixes rvl/bower2nix#18
2017-10-30 18:23:45 +01:00
Eelco Dolstra
c3255fe8ec
fetchzip and friends: Set "name" to "source" by default
...
This makes them produce the same store paths as builtins.fetchgit,
builtins.fetchTarball etc. See
65b5f177b5
.
2017-10-30 17:17:07 +01:00
Falco Peijnenburg
febe376f13
fetchadc: removed
...
It's not being used
2017-10-30 16:48:26 +01:00
Vaibhav Sagar
376f7aa761
Update nix-prefetch-git
...
s/understand/understood/
2017-10-29 12:02:26 +08:00
zimbatm
daf53c9a10
buildRustPackage: allow passthru overrides
...
Don't ignore the passthru that could be passed to the derivation
2017-10-26 17:44:52 +01:00
Eelco Dolstra
8f349a3bf3
Add function closureInfo to replace pathsFromGraph
...
Unlike pathsFromGraph, on Nix 1.12, this function produces a
registration file containing correct NAR hash/size information.
https://hydra.nixos.org/build/62832723
2017-10-25 15:38:14 +02:00
Eelco Dolstra
5939af52b3
pathsFromGraph: Remove obsolete printManifest feature
2017-10-25 15:38:11 +02:00
Kevin Cox
5f8cf0048e
rust: update cargo builder to fetch registry dynamically
...
The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.
Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.
This also uses the new --frozen and --locked flags which is nice.
Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).
This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.
Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
2017-10-23 00:30:47 +01:00
Nikolay Amiantov
2a036ca1a5
buildFHSEnv: fix NIX_* compiler flags
...
This is needed now after #27672 .
2017-10-17 00:39:39 +03:00
Daniel Peebles
416979f3f7
Merge pull request #30150 from copumpkin/no-rpath-nonsense
...
Get rid of most @rpath nonsense on Darwin
2017-10-08 16:21:27 -04:00
Dan Peebles
b426c85ce2
Get rid of most @rpath nonsense on Darwin
...
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
...
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Nikita Uvarov
cb593780f3
trivial-builders.nix: fix writeShellScriptBin
...
The check should be performed on the target shell script, not on the output directory.
2017-10-06 10:55:36 +02:00
Orivej Desh
66d4941afe
Merge branch 'master' into staging
...
* master: (48 commits)
Mathematica: 11.0.1 -> 11.2.0
kbfs: 20170922.f76290 -> 20171004.40555d
packer: 1.0.3 -> 1.1.0
libxdg-basedir: 1.0.2 -> 1.2.0
fscrypt: 0.2.1 -> 0.2.2
devtodo: init at 0.1.20
keybase: 1.0.30 -> 1.0.33
elixir: Fix locale problem on NixOS
keybase-gui: 1.0.25 -> 1.0.33
terraform: 0.10.2 -> 0.10.7 (#30055 )
emby: 3.2.32.0 -> 3.2.33.0
sbcl: 1.3.21 -> 1.4.0
ardour: 5.11 -> 5.12
axoloti: fix evaluation
axoloti: init at 1.0.12-1
melpa-packages: Add new lean packages
fastlane: init at 2.60.1
nixos/traefik: guard example path
go-ethereum: 1.7.0 -> 1.7.1
xzgv: 0.9.1 -> 0.9.2
...
2017-10-05 07:41:39 +00:00
Dan Peebles
dd8a42a224
fetchpatch: allow callers to specify postFetch sensibly
...
Before this fix, it seemed to be trying to merge our postFetch with the
patch normalization logic, but accidentally clobbering the whole thing
with the passed-in value.
2017-10-03 12:48:30 -04:00
Eelco Dolstra
3c3d8710b5
Merge pull request #29568 from obsidiansystems/cc-wrapper-32
...
cc-wrapper: Clean up dynamic linking with x86 multilib
2017-10-02 17:57:30 +02:00
Orivej Desh
fda26c8476
Merge branch 'master' into staging
...
* master: (271 commits)
pysmbc: clarify license
pysmbc: fix license
bazel: 0.5.4 -> 0.6.0 (#29990 )
googler: init at 3.3
go: declare support for aarch64
firefox-beta-bin: 56.0b5 -> 57.0b4
spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
gogs: 0.11.19 -> 0.11.29
grafana: 4.5.1 -> 4.5.2
mopidy-iris: 3.4.1 -> 3.4.9
nextcloud: 12.0.2 -> 12.0.3
haskell-json-autotype: jailbreak to fix build within LTS 9.x
kore: fix up
kore: init at 2.0.0
glusterfs service: fix issues with useRpcbind
tig: 2.2.2 -> 2.3.0
haskell-hspec-core: enable test suite again
hackage-packages.nix: automatic Haskell package set update
librsvg: fix thumbnailer path
awscli: 1.11.108 -> 1.11.162
...
2017-10-02 00:22:12 +00:00
John Ericson
fdbda216b1
cc-wrapper: Clean up dynamic linking with x86 multilib
...
It's better layering to do everything in ld-wrapper. Also, use numeric
comparisons for `relocatable`.
2017-09-28 20:05:26 -04:00
John Ericson
2cb098b7b4
Merge branch 'cc-wrapper-stdenvNoCC' into ericson2314-cross-base
2017-09-28 19:12:31 -04:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
Robin Gloster
20677fca59
dockerTools: fix hash to accomodate the pullImage revert
2017-09-28 14:09:49 +02:00
Robin Gloster
5c6dc717a6
Revert "dockerTools.pullImage: use skopeo to pull the image"
...
This reverts commit 01174c5f4d
.
See https://github.com/NixOS/nixpkgs/pull/29302#issuecomment-332809092
for more information. This broke image format compatibility and
therefore amongst others mesos.
2017-09-28 14:09:49 +02:00
Robin Gloster
dabb296c76
Revert "dockerTools.buildImage: Switch to the format image generated by Skopeo"
...
This reverts commit 35f205a4b6
.
This does not use a standard format and by that breaks mesos
2017-09-28 13:01:34 +02:00