Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
on:
pull_request:
workflow_dispatch:
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
DeterminateCI:
uses: DeterminateSystems/ci/.github/workflows/workflow.yml@main
permissions:
id-token: "write"
contents: "read"
with:
visibility: public
runner-map: |
{
"aarch64-darwin": "namespace-profile-mac-m2-12c28g",
"aarch64-linux": "UbuntuLatest32Cores128GArm",
"x86_64-linux": "UbuntuLatest32Cores128G"
}
16 changes: 8 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs.nixpkgs.url = "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz";
inputs.nix = {
url = "github:NixOS/nix/2.33-maintenance";
url = "github:DeterminateSystems/nix-src/main";
# We want to control the deps precisely
flake = false;
};
Expand Down
2 changes: 2 additions & 0 deletions src/drv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <nix/util/json-utils.hh> //NOLINT(misc-include-cleaner)
#include <nix/util/pos-idx.hh>
#include <nix/util/util.hh> // for get()
#include <nix/store/async-path-writer.hh>
#include <exception>
#include <map>
#include <optional>
Expand Down Expand Up @@ -203,6 +204,7 @@ Drv::Drv(std::string &attrPath, nix::EvalState &state,

if (canReadDerivation) {
// We can read the derivation directly for precise information
state.asyncPathWriter->waitForPath(packageInfo.requireDrvPath());
auto drv = localStore->readDerivation(packageInfo.requireDrvPath());

// Use the more precise system from the derivation
Expand Down
2 changes: 2 additions & 0 deletions src/worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ auto extractConstituents(nix::EvalState &state, nix::Value *value,
[[maybe_unused]]) -> void {},
[&](const nix::NixStringContextElem::DrvDeep &drvDeep
[[maybe_unused]]) -> void {},
[&](const nix::NixStringContextElem::Path &_
[[maybe_unused]]) -> void {},
},
ctx.raw);
}
Expand Down
Loading