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

canaille: init at 0.0.56, add module #333225

Merged
merged 8 commits into from
Nov 21, 2024
Merged

Conversation

erictapen
Copy link
Member

@erictapen erictapen commented Aug 8, 2024

Description of changes

The module is already usable and can be deployed as can be seen here: https://canaille.erictapen.name

Most of the options are missing currently, and it would be nice to have a working deployment check in the NixOS test.

Addresses:

I'll plan to get this into reviewable shape beginning next week. ✔️

Pinging people involved so far: @azmeuk @Janik-Haag @fricklerhandwerk (@soupglasses because I used parts of your package definition and you seem to be involved)

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.

@erictapen erictapen requested a review from natsukium as a code owner August 8, 2024 13:23
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 8, 2024
@erictapen erictapen marked this pull request as draft August 8, 2024 13:29
@erictapen erictapen force-pushed the canaille branch 2 times, most recently from 20626cd to d304ad4 Compare August 15, 2024 14:36
@erictapen erictapen marked this pull request as ready for review August 15, 2024 14:37
@h7x4 h7x4 added 8.has: module (new) This PR adds a module in `nixos/` 8.has: tests This PR has tests labels Aug 21, 2024
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 26, 2024
@ofborg ofborg bot requested a review from augustebaum August 26, 2024 22:59
@erictapen
Copy link
Member Author

@dotlambda Do you think you can have a look at this?

@erictapen erictapen requested a review from dotlambda August 29, 2024 16:39
pkgs/by-name/ca/canaille/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/canaille/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/canaille/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/canaille/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/canaille/package.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/slapd/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/slapd/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/slapd/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/slapd/default.nix Outdated Show resolved Hide resolved
@erictapen
Copy link
Member Author

erictapen commented Aug 30, 2024

Thanks for the review. I'll squash later to keep the commit messages for now.

@erictapen erictapen changed the title canaille: init at 0.0.54, add module canaille: init at 0.0.55, add module Aug 30, 2024
@wegank
Copy link
Member

wegank commented Oct 28, 2024

@ofborg build canaille canaille.passthru.tests

@erictapen
Copy link
Member Author

I just rebased and squashed. Weirdly I couldn't reproduce the build failure and also in the current version it builds on my machine.

@azmeuk
Copy link

azmeuk commented Nov 7, 2024

FYI Canaille 0.0.56 has been released.

  • It uses uv+hatchling instead of poetry.
  • It adds a postgresql extra which rely on sqlalchemy[postgresql].

erictapen and others added 8 commits November 21, 2024 16:57
Co-Authored-By: Auguste Baum <auguste.apple@gmail.com>
Co-Authored-By: Sofi <sofi+git@mailbox.org>
Co-Authored-By: Sofi <sofi+git@mailbox.org>
Co-Authored-By: Janik <80165193+Janik-Haag@users.noreply.github.com>
Co-Authored-By: Janik <80165193+Janik-Haag@users.noreply.github.com>
@erictapen erictapen changed the title canaille: init at 0.0.55, add module canaille: init at 0.0.56, add module Nov 21, 2024
@erictapen
Copy link
Member Author

Updated to 0.0.56, should be ready for review again!

@fricklerhandwerk fricklerhandwerk merged commit ff2f00d into NixOS:master Nov 21, 2024
22 of 23 checks passed
@erictapen erictapen added the backport release-24.11 Backport PR automatically label Nov 23, 2024
Copy link
Contributor

Successfully created backport PR for release-24.11:

@azmeuk
Copy link

azmeuk commented Nov 23, 2024

Thank you all for your hard work!

@erictapen
Copy link
Member Author

Well thanks for your feedback on it :)

@funelie
Copy link

funelie commented Dec 19, 2024

Hi Kerstin @erictapen !
It happens that providing a nix package for Canaille is part of a list of tasks sponsored by NLNet.
Since you've done it, they'll need you to reach out to them (I'll send you their contact by email) so you can work out on getting the payment that was routed to this task, they will need your name and address.

Have a nice day !

@fricklerhandwerk
Copy link
Contributor

@funelie thanks, this is taken care of, we organise this through Summer of Nix.

@soupglasses
Copy link
Member

Hi there.

Just as a curiosity to @funelie, how does these sponsorships get awarded? This PR's nix package is primarily based on my work in another repository https://github.com/soupglasses/phenix/blob/main/nixos/packages/servers/canaille/default.nix

While the NixOS test and NixOS module are new, and its great to get canaille upstream, it feels a bit disappointing that someone gets the NLNet money for a package I created based on copyright infringement (MIT requires the copyright notice to be included in substantial copies of the code). This can also be further seen in the way dependencies are fetched, to the code being character by character the same.

Example 1:
https://github.com/soupglasses/phenix/blob/14dd7b40b3194214d312c8b3d9a89ff3a3230f91/nixos/packages/servers/canaille/default.nix#L73-L79

https://github.com/erictapen/nixpkgs/blob/86f19b7908fba61b49f4c8947882ac4fa2f7b813/pkgs/by-name/ca/canaille/package.nix#L69-L74

Example 2:
https://github.com/soupglasses/phenix/blob/14dd7b40b3194214d312c8b3d9a89ff3a3230f91/nixos/packages/servers/canaille/default.nix#L81-L84

https://github.com/erictapen/nixpkgs/blob/86f19b7908fba61b49f4c8947882ac4fa2f7b813/pkgs/by-name/ca/canaille/package.nix#L64-L67

@SbirLobo
Copy link

Hi @soupglasses,
I will allow myself to answer you in place of @funelie who is not available at the moment.
I am sorry to hear of your disappointment and I understand your situation.
Unfortunately, in your case, I can only advise you to contact NLnet for all your questions. https://nlnet.nl/

Indeed, they are the ones who define and manage this funding. In addition, it seems that this functionality has already given rise to a payment. Since redistribution is no longer relevant, our role ends here.

I sincerely hope that you will receive a satisfactory response from NLnet.

Kind regards.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 8.has: tests This PR has tests 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants