diff options
| author | Matthew "strager" Glazar <strager.nds@gmail.com> | 2023-01-14 15:48:31 -0800 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2023-01-14 19:55:17 -0600 |
| commit | 7875a11bd6ed9b70de960a70724c1a4f90dc1ea8 (patch) | |
| tree | 3f4cd41fda672f8ccdc1fba3564931629a6d3642 | |
| parent | 09091c7521e559542d0a720a9cccb363875d62e6 (diff) | |
sapling: use latest Python
After upgrading to Sapling 0.2.20221222-152408-ha6a66d09, we no longer
need a specific version of Python. Use the Nixpkgs default.
| -rw-r--r-- | pkgs/applications/version-management/sapling/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 2e8d735fa0e5..8873e8c4718e 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python38Packages +, python3Packages , fetchFromGitHub , fetchurl , sd @@ -90,11 +90,7 @@ let }; # Builds the main `sl` binary and its Python extensions - # - # FIXME(lf-): when next updating this package, delete the python 3.8 override - # here, since the fix for https://github.com/facebook/sapling/issues/279 that - # required it will be in the next release. - sapling = python38Packages.buildPythonPackage { + sapling = python3Packages.buildPythonPackage { pname = "sapling-main"; inherit src version; @@ -135,7 +131,7 @@ let # so that 'sl web' always works # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB preFixup = '' - sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages chmod +w $sitepackages cp -r ${isl} $sitepackages/edenscm-isl '' + lib.optionalString (!enableMinimal) '' |