max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-27 00:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16187 commits 7 branches 0 tags 64 MiB
Commit graph

16187 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson
70f50cbb2a Functional Test for builtins.storeDir and builtins.currentSystem 
These were under-tested. This tests the status quo and especially
previous commit of this PR better.
 2023-12-14 19:47:10 -05:00
Matthew Bauer
bcbdb09ccf Add eval-system option 
`eval-system` option overrides just the value of `builtins.currentSystem`.
This is more useful than overriding `system` since you can build these
derivations on remote builders which can work on the given system.

Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-12-14 19:04:00 -05:00
José Luis Lafuente
8d39c0c196
Fix clang devshell 
Issue introduced in https://github.com/NixOS/nix/pull/9535
 2023-12-14 23:14:59 +01:00
Eelco Dolstra
fc0accf3dc
Merge pull request #9567 from obsidiansystems/fix-sys-xattr-h 
Fix `sys/xattr.h` check
 2023-12-14 18:24:24 +01:00
John Ericson
e13fc0bbdb Fix sys/xattr.h check 
I wrote the `configure.ac` wrong, and so we just got no builds
supporting ACLs.

Also, it needs to be more precise because Darwin puts other stuff in
that same header, evidently.
 2023-12-14 10:03:48 -05:00
Eelco Dolstra
790cf13c26
Merge pull request #9608 from NixOS/default-lowdown 
Remove custom lowdown
 2023-12-14 13:18:32 +01:00
John Ericson
e8ebcfd665
Merge pull request #9607 from 9999years/macos-boost 
Use `--with-boost` on macOS to fix local builds
 2023-12-13 23:15:44 -05:00
Rebecca Turner
6ed803737c
Use --with-boost on macOS 
`configureFlags` only included `--with-boost` on Linux, which makes
local builds as outlined in `doc/manual/src/contributing/hacking.md`
fail when performed on macOS.
 2023-12-13 14:02:52 -08:00
Ramses
1e3d811840
worker protocol: serialise cgroup stats in BuildResult (#9598) 
By doing so, they get reported when building through the daemon via either `unix://` or `ssh-ng://`.
 2023-12-13 16:37:17 -05:00
John Ericson
7b29b44d8e Remove custom lowdown 
This was last upgraded in 788008385e, but
the version in Nixpkgs is a now a lot newer. I think the custom was
added to get ahead of Nixpkgs before, and so now that we are in fact
behind, it is no longer needed.
 2023-12-13 16:25:18 -05:00
John Ericson
e6515bd47b
Merge pull request #9535 from tfc/package-nix 
Simplify flake.nix by creating generic callPackage-able package.nix
 2023-12-13 16:22:03 -05:00
John Ericson
2d24875fe4 package.nix: Avoid ${..} for conditional strings 
Using `+` is Nixpkgs standard ideom for this, and helps avoid needless
rebuilds somewhat.
 2023-12-13 20:49:31 +00:00
John Ericson
ed93e51f4b
Merge pull request #9604 from obsidiansystems/test-substitute-on-destination 
Test `nix copy --substitute-on-destination`
 2023-12-13 15:47:56 -05:00
John Ericson
28f2f3136d Delete stray install_name_tool call 2023-12-13 20:47:36 +00:00
John Ericson
bf5804d46a flake.nix: Delete uneeded attrs0 binding 2023-12-13 20:41:41 +00:00
John Ericson
f10f0f1b50 Move lowdown.nix to misc/ 2023-12-13 20:41:32 +00:00
John Ericson
19573f1b05 Restore comment 2023-12-13 15:33:15 -05:00
John Ericson
d904f6483c Merge remote-tracking branch 'upstream/master' into package-nix 2023-12-13 15:30:59 -05:00
John Ericson
e76df87814 Test nix copy --substitute-on-destination 
It works with both `ssh://` and `ssh-ng://` now since #9600 (and
`ssh-ng:// didn't work before that).

Also, by making the two tests share code, we nudge ourselves towards
making sure there is feature parity.
 2023-12-13 15:22:19 -05:00
Eelco Dolstra
1b7968ed86
Merge pull request #9547 from hercules-ci/allowed-scheme-without-slash 
`allowed-uris`: match whole schemes without slashes
 2023-12-13 20:23:33 +01:00
Théophane Hufschmitt
b1c633c6bb
Merge pull request #9600 from SharzyL/fix_nix_copy 
fix: nix copy ssh-ng:// not respecting --substitute-on-destination
 2023-12-13 18:08:38 +01:00
Eelco Dolstra
9dbfd186b1
Merge pull request #9602 from edolstra/unsafeGetAttrPos-test 
Improve the unsafeGetAttrPos test
 2023-12-13 15:52:43 +01:00
Eelco Dolstra
19ec1c9fd4 Improve the unsafeGetAttrPos test 
We can use corepkgsFS->addFile() now to create a "real" position.
 2023-12-13 15:15:30 +01:00
Eelco Dolstra
1f93fa2ed2
Merge pull request #9601 from edolstra/lazy-trees-backports 
Lazy trees backports
 2023-12-13 13:56:28 +01:00
Eelco Dolstra
faa4cae9ae LibExprTest: Ignore $NIX_PATH 
Otherwise a broken $NIX_PATH can cause the test suite to fail.
 2023-12-13 13:27:39 +01:00
Eelco Dolstra
103ca0bde5 Improve SourcePath display 2023-12-13 13:27:29 +01:00
Eelco Dolstra
cc3913e458 Remove unused variable 2023-12-13 13:27:23 +01:00
SharzyL
04f454f2a0
fix: nix copy ssh-ng:// not respecting --substitute-on-destination 2023-12-13 10:30:28 +08:00
tomberek
7026abfdde
Merge pull request #9523 from fricklerhandwerk/conf-reword-always-allow-substitutes 
reword documentation on settings and attributes related to substitution
 2023-12-12 20:09:48 -05:00
tomberek
09041071bf
Merge pull request #9525 from fricklerhandwerk/conf-reword-builders-use-substitutes 
reword description of the `builders-use-substitutes` setting
 2023-12-12 20:08:00 -05:00
Robert Hensing
0b87ba50c0 Revert "Add nix::isASCII*, locale-independent" 
This reverts commit 79eb2920bb.

Not used at this time.
 2023-12-12 17:46:34 +01:00
Robert Hensing
4eaeda6604 isValidSchemeName: Use regex 
As requested by Eelco Dolstra. I think it used to be simpler.
 2023-12-12 17:46:34 +01:00
Robert Hensing
2e451a663e schemeRegex -> schemeNameRegex 
Scheme could be understood to include the typical `:` separator.
 2023-12-12 17:25:20 +01:00
Théophane Hufschmitt
0dfa66d120
Merge pull request #9593 from B4dM4n/fix-path-like-flake-query 
Fix query parsing for path-like flakes
 2023-12-12 17:15:30 +01:00
John Ericson
e687e86754
Merge pull request #9597 from tweag/fix-vm-tests 
Fix the VM tests
 2023-12-12 10:45:54 -05:00
Théophane Hufschmitt
589fb105f3 Fix the VM tests 
Work around https://github.com/NixOS/nixpkgs/issues/271146 until we can
depend on a Nixpkgs version containing https://github.com/NixOS/nixpkgs/pull/271423
 2023-12-12 16:05:32 +01:00
Théophane Hufschmitt
dfc0cee702
Merge pull request #9589 from obsidiansystems/floating-content-addressing-derivations-eval-store 
Fix building CA derivations with and eval store
 2023-12-12 10:12:24 +01:00
John Ericson
ff992f8b46 Merge remote-tracking branch 'upstream/master' into package-nix 2023-12-11 15:26:12 -05:00
John Ericson
5e649618be
Merge pull request #9519 from nix-windows/mingw-shell 
Allow getting in a MinGW dev shell
 2023-12-11 15:01:56 -05:00
John Ericson
b892161e31 flake.nix: Make a MinGW dev shell 
This requires a `shellCrossSystems` for now, since Nix doesn't actually
build on Windows. This can be dropped once it does.
 2023-12-11 12:31:27 -05:00
John Ericson
46b98a40a7 flake.nix: Make changes so a MinGW dev shell would work 2023-12-11 12:31:27 -05:00
John Ericson
78492cfde7 flake.nix: Use config not system for cross so we can be a bit more precise 2023-12-11 12:31:27 -05:00
John Ericson
f60c2e8a5a flake.nix: installScriptFor take tarballs not strings 
Trying to look up keys in multiple places is not nice, better for the
caller to be explicit.
 2023-12-11 12:31:27 -05:00
John Ericson
0b81557e2c flake.nix: Put some list items on their own line 
These things are about to become longer
 2023-12-11 12:31:27 -05:00
John Ericson
9f39dda66c Fix building CA derivations with and eval store 
I don't love the way this code looks. There are two larger problems:

- eval, build/scratch, destination stores (#5025) should have different
  types to reflect the fact that they are used for different purposes
  and those purposes correspond to different operations. It should be
  impossible to "use the wrong store" in my cases.

- Since drvs can end up in both the eval and build/scratch store, we
  should have some sort of union/layered store (not on the file sytem
  level, just conceptual level) that allows accessing both. This would
  get rid of the ugly "check both" boilerplate in this PR.

Still, it might be better to land this now / soon after minimal cleanup,
so we have a concrete idea of what problem better abstractions are
supposed to solve.
 2023-12-11 12:17:36 -05:00
John Ericson
8cddda4f89
Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore 
Give `Store::queryDerivationOutputMap` and `evalStore` argument
 2023-12-11 11:16:18 -05:00
John Ericson
5f30c8acc7 Give Store::queryDerivationOutputMap and evalStore argument 
Picking up where https://github.com/NixOS/nix/pull/9563 left off.
 2023-12-11 10:39:08 -05:00
Fabian Möller
994f1b5c0d
Add test cases for flake urls with fragments 2023-12-11 16:05:34 +01:00
Fabian Möller
f45d2ee2b7
Fix query parsing for path-like flakes 2023-12-11 16:02:09 +01:00
John Ericson
2220a4a22c Merge remote-tracking branch 'upstream/master' into package-nix 2023-12-11 08:44:58 -05:00