Eelco Dolstra
934f317250
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-07-13 12:50:03 +02:00
Eelco Dolstra
c364e0b098
Fix buildStatic.aarch64-linux
...
Commit 925b975224
accidentally enabled
use of the gold linker on aarch64-linux, which apparently doesn't work.
https://hydra.nixos.org/build/183500621
2022-07-11 20:57:29 +02:00
Eelco Dolstra
0d14ffbcba
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-28 16:29:42 +02:00
Eelco Dolstra
749d914d10
Add reminder to remove nix-static testing hack
...
https://github.com/NixOS/nix/pull/6708#issuecomment-1165912951
2022-06-24 23:14:56 +02:00
Eelco Dolstra
04cb555aeb
Fix evaluation
2022-06-23 18:32:23 +02:00
Eelco Dolstra
03002203b7
Fix static build
2022-06-23 18:00:10 +02:00
Eelco Dolstra
f959ce3e03
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-23 17:24:44 +02:00
Eelco Dolstra
925b975224
Embed the sandbox shell into the statically linked 'nix' binary
...
With this, Nix will write a copy of the sandbox shell to /bin/sh in
the sandbox rather than bind-mounting it from the host filesystem.
This makes /bin/sh work out of the box with nix-static, i.e. you no
longer get
/nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory
2022-06-23 04:08:28 +02:00
Eelco Dolstra
8bbbb6e737
Enable/fix tests in nix-static
...
pkgsStatic is apparently considered a cross environment, so checkPhase
and installCheckPhase are disabled even when we ask for them.
2022-06-22 23:33:15 +02:00
Eelco Dolstra
dbe7fcebff
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-09 21:27:16 +02:00
Eelco Dolstra
12e86c0735
Merge pull request #6630 from edolstra/boost-dylib
...
Remove ${boost}/lib from the RPATH
2022-06-08 17:55:21 +02:00
Eelco Dolstra
4a3f217bde
Remove ${boost}/lib from the RPATH
2022-06-08 15:51:35 +02:00
Théophane Hufschmitt
694b12052a
Merge pull request #6624 from NixOS/new-flake-style
...
flake.nix: Convert to new naming convention
2022-06-08 13:34:09 +02:00
Eelco Dolstra
faf80fa920
Convert to new flake style
...
https://github.com/NixOS/nix/issues/5532
2022-06-07 14:36:23 +02:00
Eelco Dolstra
0f8754cd30
Fix 22.05 eval warnings
2022-06-07 14:27:10 +02:00
Eelco Dolstra
5a9d83aa59
Disable cross builds on platforms other than x86_64-linux
...
Needed because evaluation was broken on x86_64-darwin.
2022-06-07 14:27:06 +02:00
Cole Helbling
bd0192d0bb
flake: update to 22.05
...
The static build works now :)
2022-05-31 11:51:17 -07:00
Eelco Dolstra
98bdc18bf6
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-05-31 15:26:03 +02:00
Eelco Dolstra
403201e011
Merge pull request #6537 from cole-h/update-flake
...
flake: use github: reference to nixpkgs
2022-05-31 08:30:42 +02:00
Eelco Dolstra
452dba510d
Mark nix-perl as a Perl module
...
The call to perl.withPackages in nix-serve expects this.
2022-05-30 14:10:26 +02:00
Eelco Dolstra
948515efb7
Set meta.platforms
...
'nix-serve' in nixpkgs expects the nix package to set this.
2022-05-30 13:35:28 +02:00
Eelco Dolstra
d67a2ae52d
Merge branch 'doc-redirects' of https://github.com/jtojnar/nix
2022-05-27 11:12:41 +02:00
Jan Tojnar
3272afa17b
doc: Port anchors preprocessor to jq script
...
Python is only pulled into the build closure by Mercurial, which might end up being removed.
Let’s port the script to jq, which is more likely to stay.
2022-05-26 18:17:21 +02:00
Eelco Dolstra
5b27040203
Remove unused Perl dependency
2022-05-26 14:49:17 +02:00
Cole Helbling
685107c6c8
flake: use github: reference to nixpkgs
...
This allows flakes that don't override the Nixpkgs input and also have a
different flake registry.
2022-05-16 11:46:44 -07:00
Eelco Dolstra
30ca717558
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-05-09 11:26:39 +02:00
Eelco Dolstra
cb5361628d
Add libcxxStdenv devshell
2022-04-28 14:36:48 +02:00
Eelco Dolstra
006d862d30
GitArchiveInputScheme: Use zip files to avoid unpacking to disk
2022-03-29 11:01:14 +02:00
Gabriel Fontes
770f3af31d
add sourcehut integration test
2022-02-23 11:58:09 -03:00
Eelco Dolstra
d2f9a081b8
flake.nix: Fix indent
2022-02-11 14:45:46 +01:00
regnat
7bd85a3bf6
Use the nix
command (and flakes) in the CI
...
Apart from a slight simplification and a bit of dogfooding, this also
make the cache behavior more predictable.
For example `nix build .` and `nix build nix/$(git rev-parse HEAD)` will
yield the exact same path, while their “intuitive” non-flake equivalents
(`nix-build` and
`nix-build https://github.com/nixos/nix/archives/$ (git rev-parse HEAD).tar.gz`)
don’t.
This was a pain for example in https://github.com/NixOS/nix/pull/5059
Also, the `bar-with-logs` log format is imho nicer (even in an
non-interactive context) because prefixing each log line with the name
of the derivation that produced it makes it much easier to follow what’s
going on.
2022-01-26 16:41:37 +01:00
Eelco Dolstra
9691f86ff7
Stop vendoring nlohmann_json
2022-01-26 11:50:53 +01:00
Eelco Dolstra
0a70b37b56
flake.nix: Fix indentation
2022-01-25 01:28:44 +01:00
Eelco Dolstra
9ce2511206
Add regression / performance tests against a fixed revision of Nixpkgs
2022-01-25 00:07:30 +01:00
Rok Garbas
a078a645da
Merge remote-tracking branch 'origin/master' into push-docker-image-to-docker-hub
2022-01-21 14:31:17 +01:00
regnat
dd3aa1e515
Remove the references to boost on darwin
2022-01-15 11:34:15 +01:00
regnat
de4489a672
Forbid runtime references to boost
...
We explicitly hack around to remove them, so might as well check that
the hack is useful.
(Introduced because I feared that the changes of
https://github.com/NixOS/nix/pull/5906#discussion_r784810238 would bring
back some runtime references)
2022-01-14 15:41:14 +01:00
Rok Garbas
2267c773f0
Push docker image (only x86_64-linux right now) to hub.docker.com
2022-01-11 18:51:58 +01:00
Eelco Dolstra
0a7c1da9f3
Make bash completion for 'nix' work in a devshell
2021-12-22 13:21:45 +01:00
Eelco Dolstra
f66923efde
pkgconfig -> pkg-config
2021-12-15 19:13:06 +01:00
Eelco Dolstra
1b6adfe18f
Revert "update flake.nix to 21.11"
...
This reverts commit ad9322a48f
because
it breaks hydraJobs.buildStatic.* and the evaluation of some tests.
2021-12-15 13:49:05 +01:00
Jörg Thalheim
ad9322a48f
update flake.nix to 21.11
2021-12-03 18:46:09 +01:00
regnat
e588f4c655
Add a matrix of stdenvs to the flake
...
For a (currently hardcoded and limited) list of stdenvs,
make `.#$nix-${stdenvName}` correspond to a Nix built with the
corresponding stdenv.
For example, `.#nix-${clang11Stdenv}` is Nix built with clang11.
Likewise, `devShells.x86_64-linux.clang11StdenvPackages` is a development
shell for Nix with clang11, that can be used with
```shell
nix develop .#clang11StdenvPackages
```
Fix #4129
/cc @pamplemousse
2021-11-26 10:04:13 +01:00
Eelco Dolstra
329b18711e
flake.nix: Only have checks.*.dockerImage on supported systems
2021-11-25 14:45:47 +01:00
Rok Garbas
e7906ffd0e
Add dockerImage to the checks
2021-11-24 09:19:29 +01:00
Rok Garbas
52c84c15e5
Don't copy, to reduce store size
2021-11-24 09:18:33 +01:00
Rok Garbas
cd72a8c346
Make docker image downloadable in Hydra UI
2021-11-23 11:35:05 +01:00
Jan Tojnar
f68699963c
flake: Do not use aliases
...
gmock is not available with `nixpkgs.config.allowAliases = false`.
2021-11-22 17:57:30 +01:00
Rok Garbas
93f7fb6e74
Docker image with Nix inside
2021-11-11 16:07:01 +01:00
Eelco Dolstra
a7d4f3411e
Merge remote-tracking branch 'origin/master' into non-blocking-gc
2021-10-28 14:56:55 +02:00