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

baserow: 1.14.0 -> 1.28.0, baserow-front: init at 1.28.0, nixos/baserow: init, nixos/tests/baserow: init #324777

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

onny
Copy link
Contributor

@onny onny commented Jul 5, 2024

Description of changes

Continuation of #236877

Fixes #262907

Depends on

ToDo

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.

@onny onny force-pushed the baserow-update2 branch from f719302 to a3f8f5b Compare July 5, 2024 10:33
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 5, 2024
@ofborg ofborg bot requested review from JulienMalka and RaitoBezarius July 5, 2024 11:04
@ofborg ofborg bot requested a review from anthonyroussel July 5, 2024 11:32
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2024
@onny onny force-pushed the baserow-update2 branch from 7d08616 to 6083562 Compare October 6, 2024 10:28
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 6, 2024
@onny onny force-pushed the baserow-update2 branch from 6083562 to 7860b9e Compare October 6, 2024 13:36
@onny onny changed the title baserow: 1.14.0 -> 1.17.2, baserow-front: init at 1.17.2, nixos/baserow: init, nixos/tests/baserow: init baserow: 1.14.0 -> 1.25.2, baserow-front: init at 1.17.2, nixos/baserow: init, nixos/tests/baserow: init Oct 7, 2024
@onny onny force-pushed the baserow-update2 branch 6 times, most recently from e845909 to 40273c9 Compare October 8, 2024 13:30
@onny onny changed the title baserow: 1.14.0 -> 1.25.2, baserow-front: init at 1.17.2, nixos/baserow: init, nixos/tests/baserow: init baserow: 1.14.0 -> 1.27.2, baserow-front: init at 1.17.2, nixos/baserow: init, nixos/tests/baserow: init Oct 8, 2024
@onny onny force-pushed the baserow-update2 branch 3 times, most recently from 4f5d3d5 to a687996 Compare October 9, 2024 08:51
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 9, 2024
@onny onny force-pushed the baserow-update2 branch 5 times, most recently from ef7cc8a to 52c83bc Compare October 11, 2024 07:24
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 11, 2024
@onny onny changed the title baserow: 1.14.0 -> 1.27.2, baserow-front: init at 1.27.2, nixos/baserow: init, nixos/tests/baserow: init baserow: 1.14.0 -> 1.28.0, baserow-front: init at 1.28.0, nixos/baserow: init, nixos/tests/baserow: init Oct 12, 2024
@onny onny force-pushed the baserow-update2 branch 3 times, most recently from a5e0e45 to b4a1e8e Compare October 13, 2024 07:45
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 13, 2024
@onny onny force-pushed the baserow-update2 branch 2 times, most recently from fafee94 to 7722bb6 Compare October 13, 2024 10:59
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 13, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024
@sivizius sivizius mentioned this pull request Nov 10, 2024
13 tasks
@mweinelt
Copy link
Member

mweinelt commented Nov 12, 2024

With the slow progress you are making here we'll have to remove baserow eventually.

Comment on lines +16 to +17
<<<<<<< HEAD
=======
Copy link
Member

Choose a reason for hiding this comment

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

bad merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 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: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Django 3 End-of-life
6 participants