delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4204 commits 1 branch 0 tags 17 MiB
Commit graph

4204 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson 8a02bb7c36
Merge pull request #1347 from NixOS/simplify-req-features 
Simplify `StoreConfig::getDefaultSystemFeatures` call
 2024-01-25 16:17:25 -05:00
John Ericson c64eed7d07 Simplify StoreConfig::getDefaultSystemFeatures call 
That method is now static.
 2024-01-25 15:58:07 -05:00
John Ericson aed130cd17 flake.lock: Update 
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/03e96b9dc011a16a0f6db9c7cb021ff93f8dcf88' (2024-01-19)
  → 'github:NixOS/nix/2c4bb93ba5a97e7078896ebc36385ce172960e4e' (2024-01-25)
 2024-01-25 15:57:39 -05:00
John Ericson 7a6c401d42
Merge pull request #1346 from obsidiansystems/flake-reorg 
Clean up the flake/build in a a few ways
 2024-01-25 15:55:47 -05:00
John Ericson b5ed0787f7 Replace "not Perl" and "Perl again" with something more self-explanatory 2024-01-25 14:55:10 -05:00
John Ericson c5f37eca91 Reorganize hydra modules 2024-01-25 14:55:07 -05:00
John Ericson 73b6c1fb11 Filter out (mosts test) when !doCheck 2024-01-25 14:55:07 -05:00
John Ericson 4bbc7b8f75 Use the Nixpkgs fileset library to filter source 
Now I can change Nix files without causing rebuilds.
 2024-01-25 14:55:07 -05:00
John Ericson d6d6d1b649 flake.nix: Temporarily add a second Nixpkgs for lib.fileset 
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/b38e5a665e9d0aa7975beb0ed12e42d13a392e74' (2023-12-13)
  → 'github:NixOS/nix/03e96b9dc011a16a0f6db9c7cb021ff93f8dcf88' (2024-01-19)
• Added input 'nixpkgs-for-fileset':
    'github:NixOS/nixpkgs/a77ab169a83a4175169d78684ddd2e54486ac651' (2024-01-24)
 2024-01-25 14:55:07 -05:00
John Ericson 1bd195a513 Clean up deps 
- `strictDeps`

- Ensure it builds with and without `doCheck`
 2024-01-25 14:55:07 -05:00
John Ericson 1471aacadc Split out a package.nix 
Just like we did with Nix.
 2024-01-25 14:55:06 -05:00
John Ericson 62ddeb0ff0
Merge pull request #1345 from SuperSandro2000/patch-2 
Remove automake, libtool
 2024-01-25 14:47:07 -05:00
Sandro a876e46894
Remove automake, libtool 
Those are already part of autoreconfHook
 2024-01-25 17:12:40 +01:00
Pierre Bourdon 6df06b089e
web: disable Sign in with Google popup 2024-01-25 09:27:46 +01:00
John Ericson cc50fdff6f
Merge pull request #1343 from obsidiansystems/default-machine-file-features 
Use `StoreConfig::getDefaultSystemFeatures` for default machine config
 2024-01-24 21:44:32 -05:00
John Ericson b1fa6b3aac Use StoreConfig::getDefaultSystemFeatures for default machine config 
We have to oddly make a `StoreConfig` subclass to get it, but
https://github.com/NixOS/nix/pull/9848 will fix that.

The purpose of this is to ensure that, absent an explicit config,
`localhost` includes `ca-derivations` and `recursive-nix` if those
experimental features are enabled.

Very much the complement of #1342, the previous PR.
 2024-01-24 21:37:13 -05:00
John Ericson f6a2b7562a
Merge pull request #1342 from obsidiansystems/dedup-required-system-features 
Use `nix::ParsedDerivation::getRequiredSystemFeatures()`
 2024-01-24 21:13:49 -05:00
John Ericson 07cb5d1b7c Use nix::ParsedDerivation::getRequiredSystemFeatures() 
A slight dedup, and also ensures that floating CA derivations require a
`ca-derivations` experimental feature. This fixes the scheduling issue
that @SuperSandro2000 found.
 2024-01-24 21:04:14 -05:00
John Ericson 449eb2d873 Use more nix::Machine fields 
The upstream fields were made to match Hydra, so we can get rid of the
extra fields temporary added in
70e5469303.
 2024-01-24 20:14:31 -05:00
John Ericson 2bdbf51d7d flake.lock: Update 
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/b6aee9a93f6646bbffd919d362a5c75c37bb9caa' (2024-01-23)
  → 'github:NixOS/nix/212ba69e6f995992f8b4e4c0656d19c0156c8714' (2024-01-24)
 2024-01-24 18:46:56 -05:00
John Ericson 9e7ac58042 Merge branch 'master' into nix-next 2024-01-24 18:36:03 -05:00
John Ericson d45e14fd43
Merge pull request #1316 from NixOS/ca-derivations-prep 
Prepare for CA derivation support with lower impact changes
 2024-01-24 18:12:42 -05:00
John Ericson 9a86da0e7b Merge branch 'master' into nix-next 2024-01-23 15:49:14 -05:00
John Ericson d02e20a4c1
Merge pull request #1341 from NixOS/machine-dedup 
Use Nix's `Machine` type in a minimal way
 2024-01-23 15:38:19 -05:00
John Ericson 70e5469303 Use Nix's Machine type in a mimimal way 
This is *just* using the fields from that type, and only where the types
coincide. (There are two fields with different types, `speedFactor` most
interestingly.) No code is reused, so we can be sure that no behavior is
changed.

Once the types are reconciled on the Nix side, then we can start
carefully actually reusing code.

Progress on #1164
 2024-01-23 12:18:57 -05:00
John Ericson 2e6ee28f9b Machine -> ::Machine so we don't conflict with Nix's 2024-01-23 11:03:19 -05:00
John Ericson 20b0ad3ba2
Merge pull request #1339 from NixOS/use-nix-ssh 
Use Nix's `SSHMaster`
 2024-01-23 10:35:02 -05:00
John Ericson 7386caaecf Use Nix's SSHMaster 2024-01-23 10:24:02 -05:00
John Ericson 84c46b6b68 Update to newer Nix 
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/74534829f23b668fb9b2f2a14ff6afa4d5e71d4a' (2024-01-22)
  → 'github:NixOS/nix/b6aee9a93f6646bbffd919d362a5c75c37bb9caa' (2024-01-23)
 2024-01-23 10:21:48 -05:00
John Ericson f1d9230f25 Merge remote-tracking branch 'upstream/master' into nix-next 2024-01-23 01:18:13 -05:00
John Ericson f5c0efb11e
Merge pull request #1340 from NixOS/start-using-nix-ssh 
Replace `Child` with `SSHMaster::Connection`
 2024-01-23 01:17:26 -05:00
John Ericson 4e8fbaa3d6 Replace Child with SSHMaster::Connection 
Nix defines basically an identical struct for the same purpose, so let's
just use that.
 2024-01-23 01:11:46 -05:00
John Ericson 34c51fcea9
Merge pull request #1165 from obsidiansystems/factor-out-proto 
Begin factoring out the protocol code
 2024-01-22 14:49:07 -05:00
John Ericson 4ac31c89df Use nix::serv_proto::BasicConnection in build_remote.cc 
- Use the type itself

  This lays the foundation for being able to dedup the protocol code.

- Use `BasicConnection::handshake`, replacing ours.

- Use `BasicConnection::queryValidPaths`

- Use `BasicConnection::putBuildDerivationRequest`
 2024-01-22 14:20:39 -05:00
John Ericson db7aa01b8d Update to newer Nix master 
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/b7e016ab2464ad2e7e2e856ad0f173157135aae0' (2023-12-10)
  → 'github:NixOS/nix/74534829f23b668fb9b2f2a14ff6afa4d5e71d4a' (2024-01-22)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e9f06adb793d1cca5384907b3b8a4071d5d7cb19' (2023-12-03)
  → 'github:NixOS/nixpkgs/a1982c92d8980a0114372973cbdfe0a307f1bdea' (2024-01-12)
• Removed input 'nix/lowdown-src'
 2024-01-22 14:14:59 -05:00
John Ericson 89cfe26533 Merge remote-tracking branch 'upstream/master' into nix-next 2024-01-22 13:01:40 -05:00
John Ericson 588a0c5269 Merge remote-tracking branch 'upstream/master' into ca-derivations-prep 2023-12-23 19:19:54 -05:00
John Ericson 02e453fc8c
Merge pull request #1329 from NixOS/small-std-optional-cleanup 
Clean up `std::optional` dereferencing in the queue runner
 2023-12-23 19:18:41 -05:00
John Ericson 75f26f1fc4 Clean up std::optional dereferencing in the queue runner 
Instead of doing this partial operation a number of times, assert (with
a comment, get a reference to the thing inside, and use that just once.
(This refactor was done twice, "just once" for each time.)
 2023-12-23 19:10:58 -05:00
John Ericson 3c89067f52
Merge pull request #1328 from JackKelly-Bellroy/doc-store-uri 
Document the `store_uri` parameter by way of example
 2023-12-23 03:57:10 -05:00
Jack Kelly abd858d3dc Document the store_uri parameter by way of example 2023-12-19 07:54:40 +10:00
John Ericson 163dbf7f54
Merge pull request #1327 from NixOS/latest-2.19 
flake.lock: Update Nix
 2023-12-14 00:57:19 -05:00
John Ericson 642156372f Merge branch 'latest-2.19' into ca-derivations-prep 2023-12-14 00:33:22 -05:00
John Ericson 7517c134c5 flake.lock: Update Nix 
Newer 2.19-maintenance has some `restricted-eval` fixes that benefit
Hydra.

Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d' (2023-12-11)
  → 'github:NixOS/nix/b38e5a665e9d0aa7975beb0ed12e42d13a392e74' (2023-12-13)
 2023-12-14 00:32:15 -05:00
John Ericson 6e67884ff1 One more queryDerivationOutputMap should use the eval store param 2023-12-11 14:05:18 -05:00
John Ericson a6b6c5a539 Revert query -- those columns don't exist yet! 2023-12-11 12:58:54 -05:00
John Ericson ebfefb9161 Sync up with some changes done to the main CA branch 2023-12-11 12:46:36 -05:00
John Ericson 8783dd53f6 Merge remote-tracking branch 'upstream/master' into ca-derivations-prep 2023-12-11 12:42:43 -05:00
John Ericson f3a760ad9c
Merge pull request #1324 from obsidiansystems/serve-proto-build-options-serializer 
Use `ServeProto::Serialise<ServeProto::BuildOptions>`
 2023-12-11 10:45:33 -05:00
John Ericson 8c10331ee8 Fix totalNarSize summation 
I accidentally removed it in d0d3b0a298.
 2023-12-10 14:05:26 -05:00