Skip to content

Makes passing the 'rustToolchain' optional when using pkgs.callPackage to build opsqueue.nix or opsqueue_python.nix #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OpsBotPrime merged 1 commit into from
Feb 6, 2026
Merged

Makes passing the 'rustToolchain' optional when using pkgs.callPackage to build opsqueue.nix or opsqueue_python.nix #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions libs/opsqueue_python/opsqueue_python.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
pkgs,
lib,

# Rust version. (Override this with an overlay if you like)
rustToolchain,
# Downstream users can override which Rust version is used.
# But this is opt-in. By default we'll use the same version
# that we use in this repo for development.
rustToolchain ? (
(lib.fix (final: pkgs // (import (import ../../nix/sources.nix).rust-overlay) final pkgs))
.rust-bin.fromRustupToolchainFile
../../rust-toolchain.toml
),

# Native build dependencies:
maturin,
Expand Down
10 changes: 9 additions & 1 deletion opsqueue/opsqueue.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
pkgs,
lib,
rustToolchain,
git,

# Downstream users can override which Rust version is used.
# But this is opt-in. By default we'll use the same version
# that we use in this repo for development.
rustToolchain ? (
(lib.fix (final: pkgs // (import (import ./nix/sources.nix).rust-overlay) final pkgs))
.rust-bin.fromRustupToolchainFile
./rust-toolchain.toml
),
}:
let
sources = import ../nix/sources.nix;
Expand Down
Loading