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.

Sign up for GitHub

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

Jump to bottom

edgedb: 3.4.0 -> 4.0.2 #277193

Merged
merged 3 commits into from
Jan 9, 2024
Merged

edgedb: 3.4.0 -> 4.0.2 #277193

merged 3 commits into from
Jan 9, 2024

Conversation

ahirner
Copy link
Contributor

@ahirner ahirner commented Dec 27, 2023 •
edited
Loading

  • update default.nix src
  • update Cargo.lock

Description of changes

I wonder if Cargo.lock can be de-vendored, since it built with ${src}/Cargo.lock in a flake of mine as well.
The discussions in #221716 go into some depths, but I couldn't find a quick answer.

nix shell .#edgedb
edgedb -V
edgedb project init
# ...
edgedb
select "foo";
# {'foo'}
\quit
edgedb instance destroy -I nixpkgs --force
rm -rf dbschema
rm edgedb.toml

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.

@ahirner ahirner marked this pull request as ready for review December 27, 2023 22:48
@ofborg ofborg bot requested a review from ranfdev December 27, 2023 23:25
kirillrdy
kirillrdy reviewed Dec 28, 2023
View reviewed changes
pkgs/tools/networking/edgedb/default.nix
rev = "v${version}";
sha256 = "sha256-w6YpjSmh517yat45l4gGdV6qWD4O3aCx/6LL5wea+RA=";
rev = "v${version}";
sha256 = "sha256-uilotat61U6jW1NLh7fVHOujkzUSFRdpeOx+ECGsByY=";
fetchSubmodules = true;
};

cargoLock = {
lockFile = ./Cargo.lock;
Copy link
Member

Choose a reason for hiding this comment

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

I've asked a question in #221716, using Cargo.lock from src seems to be working

@ahirner
Copy link
Contributor Author

ahirner commented Jan 3, 2024

Unlike what ofborg suggests, ${src}/Cargo.lock comes into existence on my machine. I'm not a "nix-pert" enough to say whether it was realized from other builds or so.

$ nix-store --query --referrers-closure /nix/store/f1qwbypqxv2xvkqpqf25p4h49j6caaj3-source
/nix/store/f1qwbypqxv2xvkqpqf25p4h49j6caaj3-source
/nix/store/ajfzjh6wlq4dl2l58mzc6dbn7xk412va-cargo-vendor-dir

I guess I revert 00dcab4 and then it's good to go? @kirillrdy @ranfdev

@kirillrdy
Copy link
Member

Unlike what ofborg suggests, ${src}/Cargo.lock comes into existence on my machine. I'm not a "nix-pert" enough to say whether it was realized from other builds or so.

$ nix-store --query --referrers-closure /nix/store/f1qwbypqxv2xvkqpqf25p4h49j6caaj3-source
/nix/store/f1qwbypqxv2xvkqpqf25p4h49j6caaj3-source
/nix/store/ajfzjh6wlq4dl2l58mzc6dbn7xk412va-cargo-vendor-dir

I guess I revert 00dcab4 and then it's good to go? @kirillrdy @ranfdev

yeah sorry I forgot to follow up,

"${src}/Cargo.lock" will trigger import from derivation which is disabled in hydra/ofborg to speed up eval time.

you can test this locally by adding

          allow-import-from-derivation = false

into your nix.conf

so yes, revert devendering of lock file

@ranfdev
Copy link
Contributor

ranfdev commented Jan 5, 2024

I'm sorry, I can't follow this. Could you remove me from the maintainers list? Thanks

@ahirner
Copy link
Contributor Author

ahirner commented Jan 6, 2024

maintainers list

Are the thumbs up a vote for emtpy maintainer list or for @kirillrdy to step up? Not sure if an empty list is acceptable ;)

@kirillrdy
Copy link
Member

maintainers list

Are the thumbs up a vote for emtpy maintainer list or for @kirillrdy to step up? Not sure if an empty list is acceptable ;)

empty list for existing package is acceptable. @ahirner if you are actively using edgedb then I would recommend you to add yourself as maintainer. I am happy to be added as well. ( if you add yourself or not )

@ahirner
Copy link
Contributor Author

ahirner commented Jan 8, 2024

using edgedb ... happy to be added as well

Sounds great! I know the package but not enough of nix(pkgs).

@kirillrdy
Copy link
Member

@ahirner can you either squash commits, eg all maintainer related commits squashed.

as for hash change can be own commit ( or squashed ) just need to update commit message so that it matches contribution guidelines

@kirillrdy
Copy link
Member

apologies, i kinda told you a wrong thing

  • maintainers: add ahirner
  • edgedb: 3.4.0 -> 4.0.2
  • edgedb: update maintainers

@ahirner
maintainers: add ahirner
035cabd
@ahirner
edgedb: 3.4.0 -> 4.0.2
813ca30 
* update default.nix src
* generic hash
* update Cargo.lock

changelog: edgedb/edgedb-cli@v3.4.0...v4.0.2
note that server binaries follow a rather independent release and
are not part of nixpkgs (https://www.edgedb.com/docs/changelog/4_x)
@ahirner
edgedb: update maintainers
ebb198f
@ofborg ofborg bot requested a review from kirillrdy January 8, 2024 04:27
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Jan 8, 2024
@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 8, 2024
@thiagokokada thiagokokada merged commit e383206 into NixOS:master Jan 9, 2024
26 checks passed
@ahirner ahirner deleted the update_edgedb branch January 9, 2024 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thiagokokada thiagokokada thiagokokada approved these changes

@kirillrdy kirillrdy kirillrdy approved these changes

@ranfdev ranfdev Awaiting requested review from ranfdev

Assignees
No one assigned
Labels
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.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ahirner @kirillrdy @ranfdev @thiagokokada @delroth