Commit Graph

464 Commits

Author SHA1 Message Date
github-actions[bot]
ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Florian Klink
8c657c3576 nix: remove traceVal
This slipped through review of
https://github.com/NixOS/nixpkgs/pull/108069.
2021-01-02 11:09:57 +01:00
Frederik Rietdijk
e48db707e4 Merge master into staging-next 2021-01-02 08:49:09 +01:00
Florian Klink
31999436da nix: fix closure bloat on nix
The conditional preventing closure bloat unfortunately didn't apply for
the `nix` attribute, which is at 2.3.10 (not 2.4.*, what this did check
for).

Due to the somewhat funny 2.4pre* version strings used for nixUnstable
not being understood by lib.versionOlder, we also need to explicitly add
a check for that.
2020-12-31 20:06:34 +01:00
Lucas Ransan
2cb2a5348e nixUnstable: fix build on gcc10 2020-12-28 08:43:33 +01:00
Eelco Dolstra
a8c49a97a6
nix: 2.3.9 -> 2.3.10 2020-12-18 12:33:49 +01:00
Bruno Bigras
2d1b0c3e88 nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3 2020-12-01 14:39:24 -05:00
Robert Hensing
18506b716e
Merge pull request #104289 from hercules-ci/update-nixUnstable-2020-11-19
nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
2020-11-21 13:00:55 +01:00
Robert Hensing
4dd5da0ad0 nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-11-20 13:11:05 +01:00
Eelco Dolstra
80097e57c9
nix: 2.3.8 -> 2.3.9 2020-11-20 13:03:04 +01:00
Graham Christensen
f4f9f307a4
nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f 2020-11-02 16:53:06 -05:00
Eelco Dolstra
d28565a1c6
nix: 2.3.7 -> 2.3.8 2020-10-22 14:47:55 +02:00
Eelco Dolstra
f25bb567f6 nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20201020_e0ca98c 2020-10-21 12:52:48 +02:00
Andrew Childs
85e0d375cf nix: build with default stdenv
This was required for Nix v2.2.2 which did not build with
libcxx 7. This is no longer required for any current version of Nix.
2020-10-15 16:07:01 +09:00
Konstantin Alekseev
4243ebb07e nixUnstable: pre20200721_ff314f1 -> pre20200829_f156513 2020-08-30 16:42:00 +03:00
Maximilian Bosch
85819d4bbf
nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1
Fixes errors like this for me:

```
error: --- Error ------------------------------- nix-build
Nix daemon out of memory
(use '--show-trace' to show detailed location information)
```
2020-07-22 14:29:18 +02:00
Eelco Dolstra
38880a5ec2 nixUnstable: 2.4pre7805_984e5213 -> 2.4pre20200719_a79b6dd 2020-07-20 16:06:24 +02:00
Eelco Dolstra
046427570e
nix: 2.3.6 -> 2.3.7 2020-07-08 16:58:54 +02:00
Matthew Bauer
00be3fac9f nix: gmock is a library
https://hydra.nixos.org/build/123111516
2020-07-06 01:46:43 -04:00
Matthew Bauer
01ede8c615 nix: don’t precompile headers on cross compilation
avoids this error:

  mk/precompiled-headers.mk:38: *** Don't know how to precompile headers on aarch64-unknown-linux-gnu-g++.  Stop.
2020-07-06 01:46:10 -04:00
Eelco Dolstra
b505bf202b Update nixUnstable and nixFlakes 2020-06-22 12:11:49 +02:00
Domen Kožar
c86af902f4 nix: allow static compilation 2020-06-08 17:47:44 -05:00
Eelco Dolstra
aef2bc1330
nix: 2.3.6 -> 2.3.6 2020-06-03 14:57:39 +02:00
Daiderd Jordan
b7ddbd52bd
treewide: replace SRI hashes 2020-06-01 15:24:19 +02:00
Eelco Dolstra
e8896deced
nix: 2.3.4 -> 2.3.5 2020-05-27 16:48:28 +02:00
Eelco Dolstra
fdecd9eeda nixFlakes: 2.4pre20200501_941f952 -> 2.4pre20200521_00b562c 2020-05-26 11:14:35 +02:00
Antoine Eiche
15d1011615 nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6 2020-05-12 15:23:52 +02:00
Eelco Dolstra
90b5fe2372
Merge pull request #86819 from eadwu/nixFlakes/2.4pre20200501_941f952
nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952
2020-05-06 14:15:51 +02:00
Edmund Wu
f1e3278849
nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952 2020-05-04 14:51:04 -04:00
Pavol Rusnak
7b0167204d treewide: use https for nixos.org and hydra.nixos.org
tarballs.nixos.org is omitted from the change because urls from there
are always hashed and checked
2020-05-03 22:14:21 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Eelco Dolstra
cea352d276
nix: 2.3.3 -> 2.3.4 2020-04-10 17:23:28 +02:00
Eelco Dolstra
b23f697b00 nix: 2.4pre7250_94c93437 -> 2.4pre7346_5e7ccdc9, 2.4pre20200220_4a4521f -> 2.4pre20200403_3473b19 2020-04-04 21:57:16 +02:00
Eelco Dolstra
5d583db5a2 Remove Nix 1.x 2020-04-04 21:57:15 +02:00
Edward Amsden
3b72c55fc5
nix: Drive-by cleanup: replace ifthenelse with lib.optionalString 2020-03-03 18:07:21 -05:00
Edward Amsden
f1415f633c
nix: Patch config.nix.in to reference host platform binaries 2020-03-03 18:07:09 -05:00
Eelco Dolstra
39892985b0
nixFlakes: 2.4pre20200207_d2032ed -> 2.4pre20200220_4a4521f 2020-02-24 10:52:45 +01:00
Eelco Dolstra
3c47f78e82
nix: 2.3.2 -> 2.3.3 2020-02-19 01:54:25 +01:00
Eelco Dolstra
dd7f6b0c6b nixUnstable, nixFlakes: Update to latest
Note that we need to build from a tarball now to get the vendored
crates. A bit ugly to fetch tarballs from Hydra...
2020-02-11 16:36:37 +01:00
Eelco Dolstra
0ec8c3bb12 Revert "nix: build using gcc8"
This reverts commit 7ac90533a1.
2020-01-05 20:42:44 +01:00
Eelco Dolstra
3b15451291
nix: 2.3.1 -> 2.3.2 2020-01-05 20:35:43 +01:00
Daiderd Jordan
7ac90533a1
nix: build using gcc8
Workaround for https://github.com/NixOS/nix/issues/3300.

https://hydra.nixos.org/build/109304568

    running tests
    checking Nixpkgs on i686-linux
    error: stack overflow (possible infinite recursion)
    build time elapsed:  0m0.068s 0m0.029s 0m36.549s 0m6.187s
    builder for '/nix/store/dr5kd28msqmqk3hkz0ayx10dww6s8dn9-nixpkgs-tarball-20.03pre207974.16c665911fb.drv' failed with exit code 1
2020-01-03 17:04:10 +01:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Andrew Childs
209d700da4 nix: fix build on armv5tel-linux 2019-12-30 17:21:39 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Eelco Dolstra
fc2592b2d6 nixFlakes: 2.4pre20190922_382aa05 -> 2.4pre20191022_9cac895 2019-10-23 00:24:25 +02:00
Eelco Dolstra
3ab3614e2b
nix: 2.3 -> 2.3.1 2019-10-10 16:23:33 +02:00
Eelco Dolstra
8109be4859 nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05 2019-09-22 22:01:56 +02:00
Matthew Bauer
2c32f91bfc nix: mark unix only
Nix is only known to work on unix like platforms.

https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux
2019-09-18 12:51:00 -04:00
Eelco Dolstra
b9e81b2138 nixFlakes: 2.3pre20190830_04np4n6 -> 2.4pre20190913_a25c022 2019-09-13 20:13:14 +02:00