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.

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

python312Packages.lox: init at 0.12.0 #331174

Merged
merged 1 commit into from
Aug 11, 2024
Merged

Conversation

greg-hellings
Copy link
Contributor

@greg-hellings greg-hellings commented Jul 30, 2024

Homepage: https://github.com/BrianPugh/lox

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@drupol
Copy link
Contributor

drupol commented Jul 31, 2024

I gave a try and I got something different, though I don't know which one is best to use.

diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix
index 02e58f703370..7f81c0cfc5d5 100644
--- a/pkgs/development/python-modules/lox/default.nix
+++ b/pkgs/development/python-modules/lox/default.nix
@@ -3,8 +3,10 @@
   fetchFromGitHub,
   lib,
 
+  setuptools,
+  setuptools-scm,
   pathos,
-  pip,
+  sphinx_rtd_theme,
   pytestCheckHook,
   pytest-benchmark,
   pytest-mock,
@@ -15,6 +17,7 @@
 buildPythonPackage rec {
   pname = "lox";
   version = "0.12.0";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "BrianPugh";
@@ -23,9 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08=";
   };
 
-  propagatedBuildInputs = [ pathos ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  buildInputs = [ pip ];
+  dependencies = [
+    pathos
+    sphinx_rtd_theme
+  ];
 
   checkInputs = [
     pytestCheckHook
-- 
2.45.2

pkgs/development/python-modules/lox/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/lox/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/lox/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/lox/default.nix Outdated Show resolved Hide resolved
drupol
drupol previously requested changes Aug 1, 2024
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please rename the PR to: python3Packages.lox: init at 0.12.0 and also make sure there's only one commit in it so that the builds are automatically triggered by the CI ?

@greg-hellings
Copy link
Contributor Author

Could you please rename the PR to: python3Packages.lox: init at 0.12.0 and also make sure there's only one commit in it so that the builds are automatically triggered by the CI ?

As mentioned in the packaging guidelines for Python, the current naming scheme is correct. I have also squashed this down to a single commit.

@greg-hellings greg-hellings force-pushed the init-lox branch 2 times, most recently from 02dfddf to 9e1bb03 Compare August 5, 2024 04:20
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides this, LGTM.

pkgs/development/python-modules/lox/default.nix Outdated Show resolved Hide resolved
@natsukium natsukium merged commit 310fcfd into NixOS:master Aug 11, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants