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
Eelco Dolstra
37e333af9a
nix: 2.2.2 -> 2.3
2019-09-04 21:36:49 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
Eelco Dolstra
4388f7709a
nixFlakes: 2.3pre20190829_ebc4dae -> 2.3pre20190830_04np4n6
2019-08-30 20:00:16 +02:00
Eelco Dolstra
ebce65658f
nix: Reduce closure size by 48 MiB
2019-08-30 19:35:04 +02:00
Edmund Wu
786804a104
nixFlakes: pre20190712_aa82f8b -> pre20190829_ebc4dae
2019-08-30 08:39:58 -04:00
Edmund Wu
ad530918a5
nixUnstable: 2.3pre6779_324a5dc9 -> 2.3pre6895_84de821
2019-08-30 08:39:49 -04:00
volth
c814d72b51
treewide: name -> pname
2019-08-17 10:54:38 +00:00
Eelco Dolstra
31c38894c9
nixFlakes: 2.3pre20190612_06010ea -> 2.3pre20190712_aa82f8b
2019-07-15 16:19:30 +02:00
Izorkin
6eee555597
nixUnstable: pre6631_e58a7144 -> pre6631_324a5dc9
2019-06-27 13:12:28 +03:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Eelco Dolstra
abd51d042c
nix: Add nixFlakes attribute for the flake branch
2019-06-12 18:23:19 +02:00
Matthew Bauer
c82bb3133c
nix: use llvm6 on clang
...
nix-2.2.2 only works with libcxx 6. We should only set the stdenv to
clang when we are already using clang. Also, nixUnstable does support
libcxx 7.
2019-04-29 21:34:24 -04:00
Matthew Bauer
c72c6a48ca
treewide: use llvm6 in some places
...
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
2019-04-26 21:55:01 -04:00
Eelco Dolstra
5399f34ad9
nix: 2.2 -> 2.2.2
2019-04-15 19:06:57 +02:00
John Ericson
4dfe9f9eb8
Merge remote-tracking branch 'upstream/master' into override-unstable-nix
2019-03-10 13:53:59 -04:00
John Ericson
bfc72142e0
nix*: Make .override work
...
Currently, .override is only on a temporary attrset that is thrown away, now it
is also on the nix derivations we use.
2019-03-10 13:52:55 -04:00
zimbatm
732cbd3be9
nixUnstable: 2.2pre6600_85488a93 -> 2.3pre6631_e58a7144
2019-02-22 19:54:36 +01:00
Maximilian Bosch
8092ca8312
nix1: fix perl-bindings
build
...
Nix 1.11 builds perl-bindings by default, `nix1.perl-bindings` fails
with the following error:
```
building
no Makefile, doing nothing
installing
install flags: install
make: *** No rule to make target 'install'. Stop.
```
This is probably due to #47316 . Previously the `perl-bindings` were
referenced to `nix1` instead of the `perl-bindings` function as Nix 1.11
built those during its build process.
2019-02-08 19:02:28 +01:00
Alyssa Ross
33036ac5d4
nix: move perl-bindings inside common function
...
It looks like originally not all Nix packages had perl bindings, but now
that they do, it seems pretty redundant to add them seperately for each
package.
2019-01-25 17:40:32 +00:00
Eelco Dolstra
c1a13108e2
nix: Add editline dependency
...
Also fix incorrect hash for nixUnstable.
2019-01-11 15:05:17 +01:00
Eelco Dolstra
94ea1c2d83
nix: 2.1.3 -> 2.2
2019-01-11 12:47:06 +01:00
Eelco Dolstra
5d09620d83
nixUnstable: 2.2pre6526_9f99d624 -> 2.2pre6600_85488a93
2019-01-10 15:05:53 +01:00
Orivej Desh
830599debe
nix1: fix build with boehmgc 7.6.8
...
It needs -lgc and -lgccpp, but boehmgc pkgconfig file specifies only -lgc.
Broken in https://hydra.nixos.org/build/82223544
2018-12-27 17:53:29 +00:00
Eelco Dolstra
81b2bfaf36
nixUnstable: 2.2pre6520_18b4c53f -> 2.2pre6526_9f99d624
2018-10-30 16:01:49 +01:00
Shea Levy
bd7e0aec71
nixUnstable: 2.1pre6377_954d1f4d -> 2.2pre6520_18b4c53f
2018-10-28 00:01:27 -04:00
Eelco Dolstra
2c9265c950
nix: 2.1.2 -> 2.1.3
2018-10-02 11:07:48 +02:00
Tuomas Tynkkynen
cdeafe7cdf
nix: Replace meta.available checks
...
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Eelco Dolstra
869f615ff4
nix: 2.1.1 -> 2.1.2
2018-09-20 00:17:45 +02:00
Eelco Dolstra
1510f324a3
nix: 2.1 -> 2.1.1
2018-09-06 01:12:03 +02:00
Jan Malakhovski
4e735835e0
nix: make AWS support optional
2018-09-05 14:35:15 +00:00
Jan Malakhovski
c9fcabcf4b
nix: fix a tiny option bug
2018-09-05 14:34:58 +00:00
Eelco Dolstra
b06ad6199f
nix.perl-bindings: Fix build
2018-09-03 17:35:39 +02:00
Eelco Dolstra
347638ccfe
nix: 2.0.4 -> 2.1
2018-09-03 01:37:55 +02:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Eelco Dolstra
4c6aa54f86
nixUnstable: Include a copy of libboost_context
...
This shaves 47 MiB off the closure size. (libboost_context.so is only
19 KiB.)
2018-08-22 13:22:19 +02:00
Eelco Dolstra
c26c7f931a
nixUnstable: 2.1pre6338_45bcf541 -> 2.1pre6377_954d1f4d
2018-08-22 13:22:18 +02:00
Maximilian Bosch
a7685f7697
nix1: don't deliver perl-bindings of nixStable (a.k.a nix2)
...
This causes collisions between the build outputs of `nix` when building
in an environment with `nix1.perl-bindings` and `nix`:
```
collision between `/nix/store/aa4rrcj7dg2xj4rfkiclcmp745ibqng0-nix-2.0.4/lib/libnixstore.so' and `/nix/store/sp0sdi4bll80h58big1iy8kkh3qqxpw2-nix-1.11.16/lib/libnixstore.so'
builder for '/nix/store/wgbccin107lhm8cv9imnnvkx1j2pgibc-hydra-perl-deps.drv' failed with exit code 25
```
2018-08-09 22:31:18 +02:00
Eelco Dolstra
7bc2778ebb
nixUnstable: 2.1pre6148_a4aac7f -> 2.1pre6338_45bcf541
2018-07-31 21:17:10 +02:00
Daiderd Jordan
77a9745d7a
nix: don't use /tmp for the tests on darwin
...
Unlike on linux these are not namespaced per user so this will cause
build failures if /tmp/nix-test was not removed by a previous build if
the nixbld user id doesn't match by accident. Nix already creates a
unique tempdir for builds so we can use that instead.
Fixes #44172
2018-07-28 16:03:17 +02:00
Matthew Bauer
76999cc40e
treewide: remove aliases in nixpkgs
...
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
2018-07-18 23:25:20 -04:00
Eelco Dolstra
47b85dc5ab
nix: 2.0.3 -> 2.0.4
2018-05-31 11:31:04 +02:00
Eelco Dolstra
0eea0209cf
nix: 2.0.2 -> 2.0.3
2018-05-30 11:47:09 +02:00
Matthew Bauer
c37b93bd52
treewide: remove lib.meta.enableIfAvailable
2018-05-09 16:21:22 -05:00
Eelco Dolstra
9d0b6b9dfc
nix: 2.0.1 -> 2.0.2
2018-05-04 13:28:36 +02:00
Will Dietz
6e8118b239
nix: fix stdenv.system check -- should be hostPlatform
...
(stdenv.system is the system running the build, apparently)
2018-04-28 22:11:30 -05:00
Eelco Dolstra
03b36522e7
nix: 2.0 -> 2.0.1
2018-04-20 23:37:18 +02:00
Shea Levy
48d9754d2b
nixUnstable: 2.0pre6137_e3cdcf89 -> 2.1pre6148_a4aac7f
2018-04-17 07:15:12 -04:00
Shea Levy
0a9f34ad27
nixUnstable: Reinit at 2.0pre6137_e3cdcf89
2018-04-11 14:52:10 -04:00
Shea Levy
26e8d58cb5
libseccomp: Disable only on RISC-V if Linux.
...
The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
2018-03-27 08:16:24 -04:00
Tuomas Tynkkynen
22df741045
nix: Fix build on ARMv6
2018-03-11 19:44:44 +02:00
Eelco Dolstra
1deb779a7a
nixUnstable: Point to Nix 2.0
2018-03-07 10:31:09 +01:00
Will Dietz
7dafa09ed9
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
...
cc https://github.com/NixOS/nix/issues/1951
2018-03-05 17:23:47 -06:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0
2018-03-03 18:02:35 +01:00
Shea Levy
3c57e770cf
Only build libseccomp on supported systems
2018-02-24 23:05:08 -05:00
Eelco Dolstra
d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0
2018-02-22 17:28:51 +01:00
Eelco Dolstra
fab12188b8
Doh
2018-02-22 17:26:52 +01:00
Eelco Dolstra
bae19ef9f6
Doh
2018-02-22 17:20:59 +01:00
Eelco Dolstra
32af695a22
nix: 1.11.16 -> 2.0
2018-02-22 17:03:27 +01:00
Will Dietz
cbae401982
nixUnstable: bump for minor fix to unbreak seccomp builds
2018-02-19 12:28:09 -06:00
Shea Levy
d1cb2ee899
nixUnstable: 2.0pre5951_690ac7c9 -> 2.0pre5967_623fcb07.
...
Important security patch for no-seccomp systems.
2018-02-19 12:10:28 -05:00
Shea Levy
765194d7ab
nixUnstable: Disable seccomp support on RISC-V.
2018-02-18 09:02:10 -05:00
Shea Levy
5a0eec1de1
nixUnstable: 2.0pre5950_3a5a241b -> 2.0pre5951_690ac7c9.
2018-02-18 09:02:10 -05:00
Vladimír Čunát
b5aaaf87a7
Merge staging and PR #35021
...
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
Shea Levy
ce35114ee4
nixUnstable: 2.0pre5943_52c777a7 -> 2.0pre5950_3a5a241b
2018-02-15 16:22:21 -05:00
Frederik Rietdijk
672bb6b4ab
Merge remote-tracking branch 'upstream/master' into HEAD
2018-02-14 21:30:08 +01:00
Shea Levy
f73b358842
nixUnstable: Bump
2018-02-13 12:18:50 -05:00
Will Dietz
5a802afb75
nix: doInstallCheck is disabled on cross already.
2018-02-13 09:44:59 -06:00
Ben Gamari
5d6e229ec0
nixUnstable: Enable cross-compilation
...
Older nix versions likely aren't feasible due to the perl dependency.
2018-02-13 09:44:58 -06:00
Will Dietz
3aa61e33be
nix: simplify bzip2 dependency, this is handled properly now
2018-02-13 09:44:30 -06:00
Will Dietz
afe517acd5
nix: 1.11 needs 'curl' on PATH so provide as nativeBuildInput.
2018-02-13 09:44:30 -06:00
Eelco Dolstra
e76849dca2
nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca
2018-02-07 19:32:12 +01:00
Will Dietz
6ec60e8c44
busybox-sandbox-shell: extract basic shell to new attribute
...
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
2018-02-05 11:26:01 -06:00