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

marcel: init at 0.22.2 #267461

Merged
2 commits merged into from
Feb 13, 2024
Merged

marcel: init at 0.22.2 #267461

2 commits merged into from
Feb 13, 2024

Conversation

KUD-00
Copy link
Contributor

@KUD-00 KUD-00 commented Nov 14, 2023

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/)
  • 23.11 Release Notes (or backporting 23.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.

It's my first time to contribute. I apologize first for any mistakes in the codes. I have tested the binary in /result/bin(in nix-shell - A marcel environment), but not sure if it is executable when installing it on any system. I tried $ nix-env -f . -iA marcel but it said it can't find lib and many other parameters. I'm not sure is it good to use /run/current-system/sw/bin/bash

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Nov 14, 2023
@eclairevoyant
Copy link
Contributor

Fixes #263995

pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/changes.patch Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
@KUD-00 KUD-00 requested a review from eclairevoyant November 15, 2023 08:48
Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

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

I requested some changes about using the latest version

@KUD-00 KUD-00 changed the title marcel: init at 17.0 marcel: init at 0.20.0 Nov 17, 2023
Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

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

LGTM
Please, could you restructure your commits, so that there are only 2 commits: one called maintainers: add kud, which only has the maintainer-list.nix change, and another one called marcel: init at 0.20.0, which has every other change.
If you need help with this, I can help.

@KUD-00
Copy link
Contributor Author

KUD-00 commented Nov 18, 2023

@TomaSajt now it seems only contains 2 commits. Thank you for your instructions!

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/shells/marcel/default.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
@MaxwellDupre
Copy link
Contributor

format = "setuptools";
is now
pyproject = true;

And usually the these changes are split (ie 2 PRs):

  1. for maintainers-list
  2. marcel

@eclairevoyant
Copy link
Contributor

And usually the these changes are split (ie 2 PRs):

1. for maintainers-list

2. marcel

No, they are usually one PR, adding to maintainers list isn't usually approved unless you have some package to maintain.

@eclairevoyant eclairevoyant added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 9, 2023
@AndersonTorres
Copy link
Member

AndersonTorres commented Dec 10, 2023

And usually the these changes are split (ie 2 PRs):

No need for a new Pull Request. A commit suffices

adding to maintainers list isn't usually approved unless you have some package to maintain.

This is at the discretion of the committers.

E. G. Sometimes the person wants to contribute to multiple packages at once, then it is better to do a PR for maintainers list update first.

@KUD-00
Copy link
Contributor Author

KUD-00 commented Dec 13, 2023

now using pyproject = true

I'm not sure why it seems I need to add setuptools into propagatedBuildInputs, according to this comment, pyproject = true should equals to format = setuptools.

@KUD-00 KUD-00 changed the title marcel: init at 0.20.0 marcel: init at 0.21.2 Dec 30, 2023
Copy link
Contributor

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution and patience - one more point of feedback from my side before I'd consider it mergeable. Also FYI 0.22.2 is out

pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
@KUD-00 KUD-00 changed the title marcel: init at 0.21.2 marcel: init at 0.22.2 Feb 13, 2024
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.

looks good -- minor issue with setuptools, it should not get propagated as it is just used to build the package and the substituteInPlace is not needed as python3 is already in the path.

validated maintainer info matches:

curl -s https://api.github.com/users/KUD-00|jq '{name,github:.login,githubId:.id}'

pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ma/marcel/package.nix Outdated Show resolved Hide resolved
@ghost ghost force-pushed the init-marcel branch from c549083 to 1b3b571 Compare February 13, 2024 10:43
@ghost ghost merged commit 45ecb2b into NixOS:master Feb 13, 2024
22 of 24 checks passed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants