Skip to content
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

Use default python3 version from nixpkgs #2262

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Use default python3 version from nixpkgs #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e37920f
Use default python3 version
avdv Nov 19, 2024
b6968cd
Merge branch 'master' into nixpkgs-update
mergify[bot] Nov 26, 2024
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
2 changes: 1 addition & 1 deletion non_module_dev_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def repositories(*, bzlmod):

nixpkgs_package(
name = "sphinx",
attribute_path = "python39Packages.sphinx",
attribute_path = "python3Packages.sphinx",
repository = "@nixpkgs_default",
)

Expand Down
2 changes: 1 addition & 1 deletion rules_haskell_tests/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mkShell {
# check the start script for problems
shellcheck
file
] ++ lib.optionals docTools [ graphviz python39Packages.sphinx zip unzip ];
] ++ lib.optionals docTools [ graphviz python3Packages.sphinx zip unzip ];

packages = [ bazel_6 ];

Expand Down
2 changes: 1 addition & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ mkShell {
shellcheck
file
]
++ lib.optionals docTools [ graphviz python39Packages.sphinx zip unzip ]
++ lib.optionals docTools [ graphviz python3Packages.sphinx zip unzip ]
++ lib.optional stdenv.isDarwin macOS-security;

packages = [ bazel_6 ];
Expand Down