nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11118 commits 20 branches 0 tags 68 MiB
Commit graph

137 commits

Author SHA1 Message Date
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
Maximilian Bosch 3a63fc6cd5
Allow substituting paths when building remotely using ssh-ng:// 
Until now, it was not possible to substitute missing paths from e.g.
`https://cache.nixos.org` on a remote server when building on it using
the new `ssh-ng` protocol.

This is because every store implementation except legacy `ssh://`
ignores the substitution flag passed to `Store::queryValidPaths` while
the `legacy-ssh-store` substitutes the remote store using
`cmdQueryValidPaths` when the remote store is opened with `nix-store
--serve`.

This patch slightly modifies the daemon protocol to allow passing an
integer value suggesting whether to substitute missing paths during
`wopQueryValidPaths`. To implement this on the daemon-side, the
substitution logic from `nix-store --serve` has been moved into a
protected method named `Store::substitutePaths` which gets currently
called from `LocalStore::queryValidPaths` and `Store::queryValidPaths`
if `maybeSubstitute` is `true`.

Fixes #2770
 2020-11-05 20:12:37 +01:00
John Ericson 82e4d2a82e No x86_32 static nix jobs for now 
Fixes #4175
 2020-10-28 05:13:18 +00:00
Domen Kožar e0ca98c207
Merge pull request #3996 from abathur/macos_big_sur_fixes 
Macos big sur installer fixes
 2020-10-20 12:18:23 +02:00
Travis A. Everett 3a8699ac4f restore create-darwin-volume to release tarball 
The move from release.nix to flake.nix appears to have lost some
changes from #3628 / 1c56f18a8122b605c28000e295d5e223f272cccd, leaving
create-darwin-volume.sh out of the release tarball.

Under the assumption that this was just an accident/byproduct of when
flake.nix split off and not intentional, I am restoring those edits.
 2020-10-19 12:25:52 -05:00
Eelco Dolstra c27fcd94ce Remove buildStatic from checks 
checks should be relatively fast, but buildStatic depends on a lot of
stuff that isn't in the binary cache (e.g. musl builds of Git and
Mercurial that we probably don't need since we don't link against
them...).
 2020-10-18 21:44:07 +02:00
Eelco Dolstra 62cf1d815a Switch to Nixpkgs 20.09 2020-10-18 21:31:27 +02:00
John Ericson f6ed1a96b3 build-static -> buildStatic in Nix's flake 2020-10-15 18:54:36 +00:00
John Ericson 39de73550d Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds 2020-10-09 18:26:47 +00:00
regnat 21639b2d17 Use gold as the linker on Linux 
Saves ~7s in the linking phase
 2020-09-23 16:10:31 +02:00
Eelco Dolstra d110fdd03f Disable precompiled headers in 'nix develop' 
They're still enabled in regular builds though.
 2020-09-21 13:30:05 +02:00
regnat 9aa0dafe20 Update lowdown version 
Fix #4042

According to 8aef9e9290, we shouldn't need to use a fork anymore so we can switch back to upstream
 2020-09-21 13:11:31 +02:00
John Ericson ec14465a00 Separate lowdown lib and bin to be more precise 2020-09-04 02:43:56 +00:00
John Ericson 25f7ff16fa Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds 2020-09-04 02:40:36 +00:00
John Ericson e12bcabdcb Remove duplicate buildInputs 2020-09-04 02:30:12 +00:00
Eelco Dolstra 50f46836f3
Merge remote-tracking branch 'origin/master' into markdown 2020-09-01 09:48:08 +02:00
Eelco Dolstra ebb8e076eb Restore some of the shellHook 2020-08-31 16:39:54 +02:00
Eelco Dolstra 84f5cabbea Merge remote-tracking branch 'origin/master' into markdown 2020-08-31 14:24:26 +02:00
Eelco Dolstra 3156560d41 nix develop: Set output paths to writable locations 
Currently, they're set to $(pwd)/outputs/$outputName. This allows
commands like 'make install' to work.
 2020-08-28 18:16:03 +02:00
Eelco Dolstra f5219f8d84 Fix perlBindings job 2020-08-25 10:33:41 +02:00
Eelco Dolstra b42789f013
Fix clang build 2020-08-24 21:13:39 +02:00
Eelco Dolstra b4ef3d7078
Revert "Add a separate manual job" 
This reverts commit 5e3ad1dde0. Manual
generation now depends on the 'nix' command.
 2020-08-19 21:00:57 +02:00
Eelco Dolstra 1d0a7b54fa
Enable syntax highlighting 2020-07-31 15:43:25 +02:00
Matthew Bauer 3537670fef Only enable static on linux 2020-07-30 15:53:49 -05:00
Matthew Bauer 13ef7a07b9 Fix build 2020-07-30 15:49:45 -05:00
Matthew Bauer d7ffe327ae Merge remote-tracking branch 'origin/master' into fix-and-ci-static-builds 2020-07-30 14:59:57 -05:00
Eelco Dolstra 5e3ad1dde0
Add a separate manual job 2020-07-23 18:27:20 +02:00
Eelco Dolstra e0ea3c82ca
Use mdbook 2020-07-23 18:26:48 +02:00
Eelco Dolstra 650ae14ced
Markdown test 2020-07-23 18:26:48 +02:00
Eelco Dolstra 1524752c17 Merge remote-tracking branch 'origin/master' into flakes 2020-06-17 10:26:52 +02:00
Eelco Dolstra e938add10d flake.nix: Remove edition 2020-06-09 11:23:23 +02:00
Eelco Dolstra 17ca997fc6 Merge remote-tracking branch 'origin/master' into flakes 2020-05-28 12:55:24 +02:00
Eelco Dolstra 1ad71bc62c Remove support for old lockfiles and the epoch/uri attributes 2020-05-06 17:48:18 +02:00
Eelco Dolstra e5ea01c1a8
Remove flake 'edition' field 
Future editions of flakes or the Nix language can be supported by
renaming flake.nix (e.g. flake-v2.nix). This avoids a bootstrap
problem where we don't know which grammar to use to parse
flake*.nix. It also allows a project to support multiple flake
editions, in theory.
 2020-04-10 10:24:09 +02:00
Eelco Dolstra e35d83d1fc Fix job name 2020-04-03 20:11:14 +02:00
Eelco Dolstra bf70a047a0 Publish a tarball containing the crates we depend on 
This is needed since we no longer produce a source tarball.
 2020-04-03 20:06:26 +02:00
Eelco Dolstra bb39f2bb8a Temporary backward compatibility hack 2020-04-02 19:12:14 +02:00
Eelco Dolstra ab47868639 Change lastModified to the number of seconds in the epoch 
'lastModifiedDate' is now a string representing the equivalent
date/time.
 2020-04-02 18:39:41 +02:00
Eelco Dolstra 36c34c3b1f Set version properly 2020-04-01 00:20:12 +02:00
Eelco Dolstra 5f75d56c9b flake.nix: Support Nixpkgs 19.09 2020-03-28 16:51:10 +01:00
Eelco Dolstra bc5d4843a9 Fix coverage job 2020-03-20 13:39:39 +01:00
Eelco Dolstra 1e6e673eb7 flake.nix: Switch to 20.03 2020-03-20 13:09:20 +01:00
Eelco Dolstra 7304f9f145 Merge remote-tracking branch 'origin/master' into flakes 2020-03-13 18:36:47 +01:00
Eelco Dolstra db34445c5e Build vendoredCrates in the overlay 
This makes it build on non-x86_64-linux systems (needed in GitHub
actions).
 2020-03-13 18:31:16 +01:00
Eelco Dolstra 3e1abf4f05 Merge remote-tracking branch 'origin/master' into flakes 2020-03-13 18:28:01 +01:00
Eelco Dolstra dd032f624c ggRevert "Use Nixpkgs 20.03" 
This reverts commit 5921ca89f9.
 2020-02-18 22:11:52 +01:00
Eelco Dolstra 5921ca89f9
Use Nixpkgs 20.03 2020-02-18 16:21:13 +01:00
Eelco Dolstra 6529490cc1 nix eval-hydra-jobs: Support job names as aggregate constituents 
Fixes https://github.com/NixOS/hydra/issues/715.
 2020-02-17 15:53:59 +01:00
Eelco Dolstra 144bb3ef7d Build with large config Boehm GC 2020-02-15 21:48:28 +01:00
Eelco Dolstra 7072b8649a Enable debug symbols 2020-02-15 21:30:26 +01:00
Eelco Dolstra fa467de090 Update flake.lock 2020-02-03 18:59:29 +01:00
Eelco Dolstra 9f4d8c6170 Pluggable fetchers 
Flakes are now fetched using an extensible mechanism. Also lots of
other flake cleanups.
 2020-01-21 22:56:04 +01:00
Eelco Dolstra 6fadb3fc03 Merge remote-tracking branch 'origin/master' into flakes 2020-01-21 21:18:52 +01:00
Eelco Dolstra c7866733d7 Merge remote-tracking branch 'origin/master' into flakes 2019-12-20 12:45:58 +01:00
Eelco Dolstra ad6b738ed8 Merge remote-tracking branch 'origin/master' into flakes 2019-12-16 20:17:21 +01:00
Eelco Dolstra 90d2cf6ff9 Fix evaluation 2019-12-04 01:04:40 +01:00
Eelco Dolstra c3c23a52ee Merge remote-tracking branch 'origin/master' into flakes 2019-12-04 00:31:09 +01:00
Eelco Dolstra 0bc0d35b6b
Merge remote-tracking branch 'origin/master' into flakes 2019-11-08 14:29:10 +01:00
Eelco Dolstra f730841db4
Merge remote-tracking branch 'origin/master' into flakes 2019-11-07 11:44:02 +01:00
Eelco Dolstra f01304b573
Fix build 2019-11-06 14:47:58 +01:00
Eelco Dolstra 88c452d160
Merge remote-tracking branch 'origin/master' into flakes 2019-11-06 10:56:33 +01:00
Eelco Dolstra 9cac895406 Use upstream nlohmann_json 2019-10-22 20:12:23 +02:00
Eelco Dolstra 7d38060a0d Support non-x86_64-linux system types in flakes 
A command like

  $ nix run nixpkgs#hello

will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:

  packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
    hello = ...;
  });

The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.

Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)

The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
 2019-10-15 18:16:29 +02:00
Eelco Dolstra d343c03edb
Temporary compatibility hack 2019-10-08 20:05:16 +02:00
Eelco Dolstra 21304c11f9
uri -> url for consistency 2019-10-08 17:00:55 +02:00
Eelco Dolstra ce2c755d2a
Add a "dev" output to the 'nix' package 
This is to ensure that references like 'nix.dev' in dwarffs work
regardless of whether we're using the 'nix' package from this overlay
or from Nixpkgs.
 2019-10-07 14:02:52 +02:00
Eelco Dolstra 21e2088c1b
nix-perl -> nix.perl-bindings 2019-10-04 17:25:59 +02:00
Eelco Dolstra 204291f059
Merge release.nix, shell.nix and release-common.nix into flake.nix 
Also provide a Nixpkgs overlay, memoize Nixpkgs evaluation and fit the
githubFlakes test.
 2019-10-04 10:45:33 +02:00
Eelco Dolstra 1f631ac85b
flake.nix: Remove VM tests from 'checks' 2019-09-10 17:39:34 +02:00
Eelco Dolstra 80c36d4562 Remove 'name' attribute from flakes 
This is no longer needed since flakes are given an identity in the
'inputs' attribute.
 2019-08-30 16:38:27 +02:00
Eelco Dolstra d749f5132b Update flake.{nix,lock} 2019-08-30 13:06:48 +02:00
Eelco Dolstra 13604318ad
epoch -> edition 2019-07-26 20:06:03 +02:00
Nick Van den Broeck d9a6a75ed2 Made epochs more fine-grained 
Fixes #2894
 2019-06-03 14:47:47 +02:00
Eelco Dolstra 094539ef4a
Rename requires -> inputs, provides -> outputs 
Issue #2828.
 2019-05-31 09:59:48 +02:00
Eelco Dolstra b70fc8f30c
flake.nix: Add more checks 2019-05-29 22:22:28 +02:00
Eelco Dolstra e0aaf05f4f
Add 'nix flake check' command 
This evaluates all the 'provides' of a flake and builds the 'check'
attributes.
 2019-05-29 17:25:41 +02:00
Eelco Dolstra 2919c496ea nix dev-shell: Use 'provides.devShell' by default 
Thus

  $ nix dev-shell

will now build the 'provides.devShell' attribute from the flake in the
current directory. If it doesn't exist, it falls back to
'provides.defaultPackage'.
 2019-05-02 21:10:13 +02:00
Eelco Dolstra 939bee06cd Pass a flake to itself as "self" 2019-04-16 16:29:44 +02:00
Eelco Dolstra c996e04aca Allow relative paths in flakerefs 
Also allow "." as an installable to refer to the flake in the current
directory. E.g.

  $ nix build .

will build 'provides.defaultPackage' in the flake in the current
directory.
 2019-04-08 23:52:09 +02:00
Eelco Dolstra a9ceeeb4b0 Add a flake.nix 2019-04-08 23:09:18 +02:00