-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
onny
wants to merge
8
commits into
NixOS:master
Choose a base branch
from
onny:baserow-update2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wegank
added
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Jul 6, 2024
ofborg
bot
removed
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Oct 6, 2024
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
force-pushed
the
baserow-update2
branch
6 times, most recently
from
October 8, 2024 13:30
e845909
to
40273c9
Compare
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
force-pushed
the
baserow-update2
branch
3 times, most recently
from
October 9, 2024 08:51
4f5d3d5
to
a687996
Compare
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
force-pushed
the
baserow-update2
branch
5 times, most recently
from
October 11, 2024 07:24
ef7cc8a
to
52c83bc
Compare
ofborg
bot
removed
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Oct 11, 2024
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
force-pushed
the
baserow-update2
branch
3 times, most recently
from
October 13, 2024 07:45
a5e0e45
to
b4a1e8e
Compare
ofborg
bot
added
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Oct 13, 2024
onny
force-pushed
the
baserow-update2
branch
2 times, most recently
from
October 13, 2024 10:59
fafee94
to
7722bb6
Compare
ofborg
bot
removed
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Oct 13, 2024
wegank
added
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Nov 9, 2024
With the slow progress you are making here we'll have to remove baserow eventually. |
mweinelt
reviewed
Nov 12, 2024
Comment on lines
+16
to
+17
<<<<<<< HEAD | ||
======= |
There was a problem hiding this comment.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Continuation of #236877
Fixes #262907
Depends on
ToDo
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.