Skip to content

hare: unstable-2023-10-23 -> unstable-2023-11-27; harec: unstable-2023-10-22 -> unstable-2023-11-29#271476

Merged
pbsds merged 4 commits intoNixOS:masterfrom
onemoresuza:hare
Dec 15, 2023
Merged

hare: unstable-2023-10-23 -> unstable-2023-11-27; harec: unstable-2023-10-22 -> unstable-2023-11-29#271476
pbsds merged 4 commits intoNixOS:masterfrom
onemoresuza:hare

Conversation

@onemoresuza
Copy link
Contributor

@onemoresuza onemoresuza commented Dec 1, 2023 •
edited
Loading

Description of changes

  • hare: migrate to pkgs/by-name
  • harec: migrate to pkgs/by-name
  • harec: unstable-2023-10-22 -> unstable-2023-11-29
  • hare: move platform and arch check to outer let-in
  • hare: refactor configurePhase and reorder attributes
  • hare: patch tzdata paths
  • hare: unstable-2023-10-23 -> unstable-2023-11-27
  • hare: set outputs "out" and "man"

This update puts hare right before the move to support OpenBSD on it, which is still having some bugs ironed out.

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.

Priorities

Add a 👍 reaction to pull requests you find important.

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 1, 2023

Result of nixpkgs-review run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
3 packages built:
  • hare
  • harec
  • himitsu

@onemoresuza onemoresuza force-pushed the hare branch 2 times, most recently from fd0467e to 9b57e9c Compare December 1, 2023 16:38
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 2, 2023
@onemoresuza onemoresuza marked this pull request as draft December 2, 2023 14:50
@onemoresuza onemoresuza changed the title hare: unstable-2023-10-23 -> unstable-2023-12-01 hare: unstable-2023-10-23 -> unstable-2023-11-27 Dec 2, 2023
@onemoresuza onemoresuza changed the title hare: unstable-2023-10-23 -> unstable-2023-11-27 hare: unstable-2023-10-23 -> unstable-2023-11-27; harec: unstable-2023-10-22 -> unstable-2023-11-29 Dec 2, 2023
@onemoresuza onemoresuza force-pushed the hare branch 2 times, most recently from 70061c7 to 4971b6d Compare December 2, 2023 17:48
@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 2, 2023

Result of nixpkgs-review run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
4 packages built:
  • hare
  • hare.man
  • harec
  • himitsu

@onemoresuza onemoresuza mentioned this pull request Dec 2, 2023
Merged
13 tasks
@onemoresuza onemoresuza marked this pull request as ready for review December 3, 2023 00:52
@nixos-discourse
Copy link

nixos-discourse commented Dec 3, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3035

@AndersonTorres
Copy link
Member

AndersonTorres commented Dec 3, 2023

I don't have the know-how to work with this code. Sorry but I can't be useful here.

SuperSandro2000
SuperSandro2000 reviewed Dec 3, 2023
View reviewed changes
@onemoresuza onemoresuza marked this pull request as draft December 3, 2023 20:12
@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 3, 2023

I don't have the know-how to work with this code. Sorry but I can't be useful here.

No worries!

ghost
ghost reviewed Dec 4, 2023
View reviewed changes
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.

one packages fails to build. is this expected?

Result of nixpkgs-review run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
1 package failed to build:
  • hareThirdParty.hare-json
4 packages built:
  • hare
  • hare.man
  • harec
  • himitsu

other than that LGTM. a few nits described inline.

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 4, 2023 •
edited
Loading

one packages fails to build. is this expected?

Result of nixpkgs-review run on x86_64-linux 1
1 package marked as broken and skipped:

* himitsu-firefox

1 package failed to build:

* hareThirdParty.hare-json

4 packages built:

* hare

* hare.man

* harec

* himitsu

other than that LGTM. a few nits described inline.

This is to be expected: I've had the same problem when packaging hare-toml.

I'm going to create a patch upstream and a PR to update hare-json to this version of Hare.

Actually, upstream seems to have already fix it: see here.

Created the hare-json PR.

@onemoresuza onemoresuza mentioned this pull request Dec 4, 2023
Merged
13 tasks
@onemoresuza onemoresuza mentioned this pull request Dec 6, 2023
Merged
13 tasks
@pbsds
Copy link
Member

pbsds commented Dec 6, 2023

Any reason this is marked draft?

Result of nixpkgs-review pr 271476 run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
1 package failed to build:
  • hareThirdParty.hare-json
4 packages built:
  • hare
  • hare.man
  • harec
  • himitsu

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 7, 2023 •
edited
Loading

Any reason this is marked draft?

Still learning the ropes of nixpkgs. Made this PR into a draft because it is dependent on #265124 --- merged onto staging, now on staging-next ---, but I could just change the base branch of this PR from master to staging-next, couldn't I?

After reading RFC 026, it seems like it's a no go, as it states:

There shall be the following branches:

  • master is the main branch where all small deliveries go;
  • staging is branched from master and mass-rebuilds and other large deliveries go to this branch;
  • staging-next is branched from staging and only fixes to stabilize and security fixes shall be delivered to this branch. This branch shall be merged into master when deemed of sufficiently high quality.

Since this PR neither causes a mass-rebuild, is a security fix, nor seems to be fix to stabilize, it looks like its only place to be is here on master.

We may track its current branch through nixpk.gs, as @SuperSandro2000 stated in a prior conversation on this PR.

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 11, 2023 •
edited
Loading

Result of nixpkgs-review run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
1 package failed to build:
  • hareThirdParty.hare-json
6 packages built:
  • hare
  • hare.man
  • harec
  • haredo
  • haredo.man
  • himitsu

Notes

  • hareThirdParty.hare-json is broken due to changes to hare stdlib, but it will be fixed by #272136.

@onemoresuza onemoresuza marked this pull request as ready for review December 11, 2023 20:44
@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 11, 2023

#265124 was merged onto master, thus, this PR is ready for review.

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 11, 2023

Commits squashed, making this PR have 4 commits:

  1. move of harec to pkgs/by-name;
  2. move of hare to pkgs/by-name;
  3. update of harec;
  4. update of hare.

@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Dec 12, 2023
@nixos-discourse
Copy link

nixos-discourse commented Dec 12, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1300

@onemoresuza
Copy link
Contributor Author

onemoresuza commented Dec 12, 2023

@pbsds, anything else needed before the merge?

@delroth delroth added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Dec 13, 2023
@onemoresuza
hare: unstable-2023-10-23 -> unstable-2023-11-27
a47d6e0 
And also:
- move platform and arch to outer let-in
- patch tzdata paths to use the nix store
- set `outputs` to `[ "out" "man" ]`
- append `nixpkgs` `hare version`'s output
- compact `postFixup` phase
- rework description
- move `binutils-unwrapped` only to `buildInputs`

[1]: https://nixpk.gs/pr-tracker.html?pr=265124
@delroth delroth removed the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Dec 14, 2023
@pbsds
Copy link
Member

pbsds commented Dec 15, 2023

Result of nixpkgs-review pr 271476 run on x86_64-linux 1

1 package marked as broken and skipped:
  • himitsu-firefox
1 package failed to build:
  • hareThirdParty.hare-json
6 packages built:
  • hare
  • hare.man
  • harec
  • haredo
  • haredo.man
  • himitsu

@pbsds pbsds merged commit 239c6fb into NixOS:master Dec 15, 2023
@onemoresuza onemoresuza deleted the hare branch December 30, 2023 15:57
@pbsds pbsds mentioned this pull request Jan 31, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pbsds pbsds pbsds approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@onemoresuza @nixos-discourse @AndersonTorres @pbsds @SuperSandro2000 @delroth