puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14931 commits 19 branches 0 tags 68 MiB
Commit graph

229 commits

Author SHA1 Message Date
Eelco Dolstra e4a2a08b04 Merge remote-tracking branch 'origin/master' into nixpkgs-22.11 2022-11-30 13:09:45 +01:00
Linus Heckemann 9c90452f9d bump nixpkgs to 22.11 beta 2022-11-29 12:06:57 +01:00
Eelco Dolstra f1b5c6876b Add tests for auto-uid-allocation, uid-range and cgroups 2022-11-27 16:38:34 +01:00
Eelco Dolstra dfc3a9afc3
Merge pull request #7043 from edolstra/installer-test 
Add an installer test
 2022-09-26 17:34:23 +02:00
Théophane Hufschmitt 6a64820cb4
Merge pull request #7082 from rapenne-s/ccache 
add ccacheStdenv
 2022-09-24 12:45:27 +02:00
Solène Rapenne e04b38f789 add ccacheStdenv 
when using ccache, rebuild time has been measured
89% faster while not slowing the speed of cold builds
 2022-09-23 11:21:19 +02:00
Eelco Dolstra fae3b4fe8a
Add an installer test 
This runs the installer in a QEMU VM. Unlike the old installer test
that ran inside a declaratively built RedHat/Debian image, this uses
an image from Vagrant.
 2022-09-14 15:41:11 +02:00
Théophane Hufschmitt 3fca5f6c69 Installer: Reset the timestamps in the tarball 
Otherwise it isn't reproducible.

Fix https://github.com/NixOS/nix/issues/7001
 2022-09-05 14:44:01 +02:00
Domen Kožar 99208bb8cc curl: patch for netrc regression in Nix 2022-07-14 17:45:02 -05: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 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 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 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 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 cb5361628d Add libcxxStdenv devshell 2022-04-28 14:36:48 +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
Benoit de Chezelles ec9c1286ad Fix devShell build on non-NixOS with a different boost version 2021-10-23 15:32:48 +02:00
Eelco Dolstra be35569a6e Run installTests on Hydra 2021-10-15 12:36:29 +02:00
Arthur Gautier e33f74495b Adds a test for nss preload mechanism 
This tests for the fix implemented in #5224

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
 2021-10-07 17:25:41 +00:00
Eelco Dolstra faeab0d5d5 Make Mercurial optional for the flakes tests 2021-10-06 18:29:20 +02:00
Eelco Dolstra 4d28cf836a Disable testing against nixUnstable on macOS 
This is failing randomly at the moment which isn't very helpful.
 2021-10-06 13:17:39 +02:00
Eelco Dolstra 223ab254c2 Compatibility 2021-10-05 14:50:55 +02:00
Eelco Dolstra 08cc572f89 Revert "Shorten the test drv name" 
This reverts commit 5ec873b127.
 2021-10-05 10:41:17 +02:00
Eelco Dolstra 32669a6bc9 Use separate lowdown 
Overriding the lowdown in nixpkgs can break nixUnstable.
 2021-09-27 10:31:13 +02:00
Eelco Dolstra aedbc7b683 Use latest lowdown 
This improves list rendering
(https://github.com/kristapsdz/lowdown/issues/73).
 2021-09-24 15:22:51 +02:00
regnat 81ed6ee201 flake: Use the real nixUnstable from nixpkgs 
Don’t let it pick our overriden lowdown as that would cause it not to be
cached in cache.nixos.org
 2021-09-20 14:37:09 +02:00
Eelco Dolstra e664270c2b
Merge pull request #5246 from edolstra/faster-check 
Speed up 'nix flake check'
 2021-09-14 12:22:28 +02:00
Eelco Dolstra 2cf8110f5a flake.nix: Don't do cross builds in 'nix flake check' 
'nix flake check' should be relatively fast, so it's not the best
place to do cross-builds. We're already doing that in Hydra.
 2021-09-14 11:34:32 +02:00
Eelco Dolstra 6ff19ce137 nix-tests: Run 'make installcheck' in parallel 2021-09-14 11:34:17 +02:00
Eelco Dolstra 14205debb2 lowdown: Update to 0.8.6 2021-09-13 14:45:21 +02:00
Eelco Dolstra 307977963c nlohmann_json: Update to 3.9.1, fix use of internal copy 2021-07-15 12:25:53 +02:00
Matthew Bauer 2200f315da Disable -pie on static nix 
This should resolve the failing build.

See https://github.com/NixOS/nixpkgs/pull/128674 for a better fix.
 2021-06-29 21:48:07 -05:00
Matthew Bauer 7351656b82 Only cross compile from x86_64-linux 
This is broken on aarch64-linux / x86_64-darwin, so might as well just disable it for now.
 2021-06-29 21:47:35 -05:00
Eelco Dolstra f14c3b6f68
Merge pull request #4944 from hercules-ci/fix-gc-crash 
Fix gc crash
 2021-06-29 13:52:14 +02:00
Matthew Bauer 6c13a3f735 Support binaryTarballCross in gha 2021-06-28 15:08:17 -05:00
Matthew Bauer 580583e0b3 Build cross-compilation in gha 2021-06-26 00:14:54 -05:00
Matthew Bauer c906d6530d Support cross-compiling binaryTarball 2021-06-26 00:12:03 -05:00
Matthew Bauer c3a929349f Merge remote-tracking branch 'origin/master' into cross-jobs 2021-06-25 15:51:02 -05:00
Robert Hensing 57409244ec boehmgc: Crude support for coroutines 
Fixes the problem where a stack pointer outside the original
thread causes the collector to crash.

It could be made more accurate by recording the stack pointer
every time we switch to a coroutine. We can use this information
to update our own coroutine stacks like normal data. When the
stack pointer is on a thread, we can add a field to GC_thread
"fallback_sp" to be used when the thread sp is outside the original
thread range.
 2021-06-24 18:17:03 +02:00
Domen Kožar 9676c9f6a3
perlBindings: fix build on aarch64-darwin 2021-06-21 19:40:51 +02:00
Finn Behrens 9f1a7f9d37 Include aarch64-darwin in installer 
Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
 2021-06-01 09:48:35 +02:00
Finn Behrens 1fefe808f6 enable aarch64-darwin build 
disable lowdown sandbox on aarch64-darwin
 2021-06-01 09:45:14 +02:00
Domen Kožar 1f390922d0
Build for aarch64-darwin 2021-05-29 19:40:56 +02:00
Eelco Dolstra 788008385e Use lowdown 0.8.4 2021-04-23 14:20:32 +02:00
Eelco Dolstra 76980a1f3d Merge branch 'build-with-strictDeps' of https://github.com/hercules-ci/nix 2021-04-15 14:15:21 +02:00
Eelco Dolstra 15f4d4fd43 Drop libbz2 / zlib / lzma dependency + style fixes 2021-04-15 13:55:22 +02:00
Robert Hensing ff1a2143aa flake.nix: Make the sandbox tests work again 2021-03-31 08:31:30 +02:00
Robert Hensing f66fb5fb5b flake.nix: Build nix with strictDeps = true 2021-03-31 08:30:12 +02:00
Eelco Dolstra 3ab5e8a391
Merge pull request #4239 from tweag/test-against-old-daemon 
Add a CI check to ensure compatibility with an old daemon
 2021-03-29 16:15:36 +02:00
Eelco Dolstra ce791535f6 nixpkgs/master compatibility 2021-03-29 14:54:05 +02:00
regnat 5ec873b127 Shorten the test drv name 
To prevent the OSX build to fail because of a too long socket path
 2021-03-16 16:44:42 +01:00
regnat a0866c8ea4 Make the tests (optionnally) run in another derivation 
That way we can run them without rebuilding Nix
 2021-03-16 14:21:39 +01:00
regnat 5716345adf Add a test ensuring compatibility with an old daemon 
This requires adding `nix` to its own closure which is a bit unfortunate,
but as it is optional (the test will be disabled if `OUTER_NIX` is unset) it
shouldn't be too much of an issue.

(Ideally this should go in another derivation so that we can build Nix and run
the test independently, but as the tests are running in the same derivation
as the build it's a bit complicated to do so).
 2021-03-16 14:20:41 +01:00
Matthew Bauer d5fd0f4745
Merge branch 'master' into cross-jobs 2021-03-09 11:40:16 -06:00
Eelco Dolstra c189031e8b
Merge pull request #4549 from NixOS/installer-artifact 
Test macos/linux installer script for each push
 2021-02-25 16:08:43 +01:00
Daniël de Kok 2de232d2b3 Add x86_64 compute levels as additional system types 
When performing distributed builds of machine learning packages, it
would be nice if builders without the required SIMD instructions can
be excluded as build nodes.

Since x86_64 has accumulated a large number of different instruction
set extensions, listing all possible extensions would be unwieldy.
AMD, Intel, Red Hat, and SUSE have recently defined four different
microarchitecture levels that are now part of the x86-64 psABI
supplement and will be used in glibc 2.33:

https://gitlab.com/x86-psABIs/x86-64-ABI
https://lwn.net/Articles/844831/

This change uses libcpuid to detect CPU features and then uses them to
add the supported x86_64 levels to the additional system types. For
example on a Ryzen 3700X:

$ ~/aps/bin/nix -vv --version | grep "Additional system"
Additional system types: i686-linux, x86_64-v1-linux, x86_64-v2-linux, x86_64-v3-linux
 2021-02-22 09:11:15 +01:00
Domen Kožar ae4260f0a7
Generate installer script for each PR/push 
This works by using Cachix feature of serving a file from
a store path.
 2021-02-21 15:51:49 +00:00
sternenseemann d0e34c85f8 libcmd/markdown: handle allocation errors in lowdown_term_rndr 
We upgrade to lowdown 0.8.0 [1] which contains a fix/improvement to a
behavior mentioned in this issue thread [2] where a big part of
lowdown's API would just call exit(1) on allocation errors since that
is a satisfying behavior for the lowdown binary.

Now lowdown_term_rndr returns 0 if an allocation error occurred which we
check for in libcmd/markdown.cc.

Also the extern "C" { } wrapper around lowdown.h has been removed as it
is not necessary.

[1]: 6ca7c855a0/versions.xml (L987-L1006)
[2]: https://github.com/kristapsdz/lowdown/issues/45#issuecomment-756681153
 2021-02-06 13:14:57 +01:00
Matthew Bauer 4fefe26717 Re-enable armv6l support 
This fixes the libatomic detection.
 2021-02-05 18:22:34 -06:00
Matthew Bauer c6d878609d Merge remote-tracking branch 'origin/master' into cross-jobs 2021-02-05 18:07:48 -06:00
Eelco Dolstra 271eedb837
Merge pull request #4495 from Infinisil/perl-bindings-passthru 
Use passthru for perl-bindings, allows Nix patching for Hydra
 2021-02-05 12:22:52 +01:00
Silvan Mosberger d5acc4865c
Use passthru for perl-bindings, allows Nix patching for Hydra 
This allows patching Nix for Hydra with additional overlays, because
`.overrideAttrs` and co. will persist the passthru's
 2021-01-29 18:31:40 +01:00
Eelco Dolstra f15f0b8e83 Update to lowdown 0.7.9 2021-01-26 10:47:40 +01:00
Matthew Bauer be09af8002 Include static "nix" binary in Hydra build products 
This allows users to get Nix from Hydra via a stable url like
https://hydra.nixos.org/build/132078238/download/1/nix
 2020-12-03 18:05:18 -06:00
Jonas Chevalier 233b61d3d6
installer: simplify the per-build installation 
The goal is to allow the installation and testing of arbitrary Nix
versions. Extend the base installer to accept a `--tarball-url-prefix
<url>` to change where the Nix tarball is getting downloaded from.

Once this is merged it should allow to:
1. Pick an evaluation at https://hydra.nixos.org/jobset/nix/master that
   looks healthy
2. Select the installedScript build and find the store path.

Now equipped with all of this, use an instance of nar-serve to fetch the
install script and release tarballs:

    curl -sfL https://nar-serve.numtide.com/nix/store/rkv4yh7pym941bhj0849zqdkg2546bdv-installer-script/install \
      | sh --tarball-url-prefix https://nar-serve.numtide.com/nix/store

Or with cachix, strip the /nix/store and derivation name and then:

    curl -sfL https://mycache.cachix.org/serve/rkv4yh7pym941bhj0849zqdkg2546bdv/install \
      | sh --tarball-url-prefix https://mycache.cachix.org/serve

Fixes #4047
 2020-11-21 19:56:46 +01:00
Eelco Dolstra 3daa256728 Remove tests.binaryTarball 
This test no longer works on Hydra because import-from-derivation is
no longer allowed.
 2020-11-17 15:26:39 +01:00