Skip to content

c-blosc2: init at 2.13.2, python3Packages.blosc2: 2.3.2 -> 2.5.1#287081

Merged
risicle merged 2 commits intoNixOS:masterfrom
risicle:ris-c-blosc-2.13.2
Feb 11, 2024
Merged

c-blosc2: init at 2.13.2, python3Packages.blosc2: 2.3.2 -> 2.5.1#287081
risicle merged 2 commits intoNixOS:masterfrom
risicle:ris-c-blosc-2.13.2

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Feb 7, 2024

Description of changes

c-blosc2 package largely copied from c-blosc, however c-blosc2 is developed under a separate tree and has a different e.g. pkg-config name so probably warrants a separate package as it will likely diverge.

This allows us to switch python3Packages.blosc2 to use this system c-blosc2 instead of its own bundled version.

Also built pkgsStatic, pkgsMusl, pkgsCross.aarch64-multiplatform, pkgsi686Linux versions of c-blosc2.

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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Feb 7, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 7, 2024
@risicle risicle force-pushed the ris-c-blosc-2.13.2 branch 2 times, most recently from 642f0bd to 7713547 Compare February 8, 2024 00:34
@ofborg ofborg bot requested a review from drewrisinger February 8, 2024 01:12
@risicle
Copy link
Contributor Author

risicle commented Feb 8, 2024

pkgs/by-name check is failing but I don't really want to separate this package from c-blosc.

(cc @infinisil )

@risicle risicle marked this pull request as ready for review February 8, 2024 23:02
@infinisil
Copy link
Member

@risicle Yeah i wouldn't separate it in that way. Check out #285922 (comment) for my recommendation

@risicle
Copy link
Contributor Author

risicle commented Feb 9, 2024

Hmm neither of those really feel appropriate here.

Have you considered the ghetto option of simply making the checker ignore any attrnames ending in a digit?

@infinisil
Copy link
Member

Hmm neither of those really feel appropriate here.

I'd expect this to work out just fine:

  inherit (callPackages ../development/libraries/c-biosc { })
    c-biosc c-biosc2;

Or is there a problem with this?

Have you considered the ghetto option of simply making the checker ignore any attrnames ending in a digit?

I have considered it, but it feels like a hack, which I'm really not fond of!

It's actually really interesting to have this restriction, because it highlights the problem of multiple package versions and encourages exploration of better solutions.

Even the above recommendation already has the benefit of being explicit about multiple attributes coming from the same source, which is a step in the right direction for future improvements.

largely copied from c-blosc, however c-blosc2 is developed
under a separate tree and has a different e.g. pkg-config
name so probably warrants a separate package as it will
diverge
also don't need fetchSubmodules if we're not using the vendored
c-blosc2
@risicle
Copy link
Contributor Author

risicle commented Feb 10, 2024

Ok I've gone with that approach, but FWIW it also feels like a bit of a hack that doesn't serve much purpose but to placate the CI. And I'd much rather have a hacky CI than to fill nixpkgs with all these hacks that don't really add any value.

@risicle risicle requested review from Mindavi and fabaff February 10, 2024 14:59
@Mindavi
Copy link
Contributor

Mindavi commented Feb 11, 2024

Sometimes adding a hack to CI is ok, but exempting packages with a number at the end is overly broad to me. So I think this is the right solution, for now. We can always reconsider later if we get tens or hundreds of packages like this.

@risicle risicle merged commit 5e8daf8 into NixOS:master Feb 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants