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

devtoolbox: init at 1.1.1 (and dependencies) #295583

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

Aleksanaa
Copy link
Member

Description of changes

Tested

image

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@Aleksanaa
Copy link
Member Author

Aleksanaa commented Mar 13, 2024

Not working:

  • json yaml conversion
  • qrcode generation

Have bugs:

  • number bases converter

@Aleksanaa Aleksanaa marked this pull request as ready for review March 13, 2024 12:37
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

can you submit the patch upstream?

there seem to be tests for the python modules, can you add pytestCheckHook and run the tests?

@Aleksanaa
Copy link
Member Author

Aleksanaa commented Mar 20, 2024

can you submit the patch upstream?

The upstream will eventually update the version of ramel_yaml, and they will change it at that time. The problem is that the ramel_yaml version they rely on is incompatible with the version in nixpkgs. The patch I wrote just makes it work, which may not be good enough, and upstream may not have plans to update it at this time.

there seem to be tests for the python modules, can you add pytestCheckHook and run the tests?

Okay, I'll try it.

pythonImportsCheck = [
"uuid6"
];

Copy link
Member

Choose a reason for hiding this comment

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

hash = "sha256-7Qr7OpcwV1dfmIMgG67+QCeHyl4R4dJON3GQ8MQ/GZM=";
};

buildInputs = [
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
buildInputs = [
nativeBuildInputs = [

setuptools
pyphen
];

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
checkPhase = ''
./test.py
'';

Comment on lines +19 to +21

propagatedBuildInputs = [
setuptools
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
propagatedBuildInputs = [
setuptools
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [

hash = "sha256-aokLCuQq6iHpC90MLCcIQxeEArPyx1o6RU1224xZdxY=";
};

buildInputs = [
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
buildInputs = [
nativeBuildInputs = [

Comment on lines +12 to +13
version = "0.1.5";
pname = "daltonlens";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
version = "0.1.5";
pname = "daltonlens";
pname = "daltonlens";
version = "0.1.5";

numpy
pillow
];

Copy link
Member

Choose a reason for hiding this comment

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

];
mainProgram = "devtoolbox";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux; # webkitgtk_6_0 is broken on darwin
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
platforms = platforms.linux; # webkitgtk_6_0 is broken on darwin

but that is alread marked broken, is it? Then that propagates.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

If a package is broken on a particular platform that is not a reason to mark all packages that depend on it broken for that platform.

python3Packages.buildPythonApplication rec {
pname = "devtoolbox";
version = "1.1.1";
pyproject = false;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
pyproject = false;
pyproject = false; # uses meson

Comment on lines +30 to +32
# Upstream is using an incompatible version of ruamel.yaml
# May be removed in next update
patches = [ ./incompatible_ruamel_yaml.patch ];
Copy link
Member

Choose a reason for hiding this comment

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

Is there a commit we can fetch?

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.

None yet

2 participants