Merge pull request #2262 from tweag/nixpkgs-update

mergify[bot] · web-flow · commit 7b4e8d41fae8 · 2024-11-26T11:12:31.000Z
Use default python3 version from nixpkgs
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -119,7 +119,7 @@ def repositories(*, bzlmod):
 
     nixpkgs_package(
         name = "sphinx",
-        attribute_path = "python39Packages.sphinx",
+        attribute_path = "python3Packages.sphinx",
         repository = "@nixpkgs_default",
     )
 
diff --git a/rules_haskell_tests/shell.nix b/rules_haskell_tests/shell.nix
@@ -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 ];
 
diff --git a/shell.nix b/shell.nix
@@ -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 ];

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ def repositories(*, bzlmod):`
`119`	`119`
`120`	`120`	`nixpkgs_package(`
`121`	`121`	`name = "sphinx",`
`122`		`- attribute_path = "python39Packages.sphinx",`
	`122`	`+ attribute_path = "python3Packages.sphinx",`
`123`	`123`	`repository = "@nixpkgs_default",`
`124`	`124`	`)`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ mkShell {`
`39`	`39`	`shellcheck`
`40`	`40`	`file`
`41`	`41`	`]`
`42`		`- ++ lib.optionals docTools [ graphviz python39Packages.sphinx zip unzip ]`
	`42`	`+ ++ lib.optionals docTools [ graphviz python3Packages.sphinx zip unzip ]`
`43`	`43`	`++ lib.optional stdenv.isDarwin macOS-security;`
`44`	`44`
`45`	`45`	`packages = [ bazel_6 ];`