auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

WIP: feat: support for x86_64-linux #1

Draft
isabelroses wants to merge 3 commits from feat/x86-64_linux into main
pull from: feat/x86-64_linux
merge into: auxolotl:main
Conversation 9 Commits 3 Files changed 73 +388 -161
isabelroses commented 2024-06-13 12:56:36 +00:00
Owner
Copy link
No description provided.
isabelroses self-assigned this 2024-06-13 12:56:36 +00:00
isabelroses added 1 commit 2024-06-13 12:56:37 +00:00
isabelroses requested review from jakehamilton 2024-06-13 12:56:47 +00:00
isabelroses commented 2024-06-13 12:58:50 +00:00
Author
Owner
Copy link

Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter.

Currently I'm formatting with `nixfmt-rfc-style` since no formatter is specified, let me know if you would like me to reformat with another formatter.
❤️ 1
isabelroses changed title from feat: inital support for x86_64-linux to feat: support for x86_64-linux 2024-06-13 13:27:48 +00:00
jakehamilton commented 2024-06-13 15:07:12 +00:00
Owner
Copy link

potluck isn't ready to be used by anything just yet, I'm currently working out issues with the module system (there seems to be some trouble around submodules). Can we revert the changes in potluck/ for now?

`potluck` isn't ready to be used by anything just yet, I'm currently working out issues with the module system (there seems to be some trouble around submodules). Can we revert the changes in `potluck/` for now?
👍 1
jakehamilton reviewed 2024-06-13 15:10:29 +00:00
foundation/flake.nix Outdated
@ -23,1 +17,3 @@
};
forEachSystem = lib.attrs.generate [
"i686-linux"
"x86_64-linux"
jakehamilton commented 2024-06-13 15:10:29 +00:00
Owner
Copy link

Pretty much all of the packages from stage1 and beyond are restricted to i686-linux. I don't think that adding the extra system here will do much unless we modify packages to build properly on x86_64-linux and set their meta.platforms to include the new system.

Pretty much all of the packages from `stage1` and beyond are restricted to `i686-linux`. I don't think that adding the extra system here will do much unless we modify packages to build properly on `x86_64-linux` and set their `meta.platforms` to include the new system.
👍 1
isabelroses marked this conversation as resolved
isabelroses force-pushed feat/x86-64_linux from e0eeb90446 to e068db6843 2024-06-13 21:38:04 +00:00 Compare
isabelroses force-pushed feat/x86-64_linux from e068db6843 to c2143518d7 2024-06-13 21:40:51 +00:00 Compare
minion commented 2024-06-13 22:20:44 +00:00
Owner
Copy link

Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter.

This is the correct thing to do, thanks!

Probably we should make another PR to add that as the specified formatter

> Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter. [This is the correct thing to do](https://wiki.auxolotl.org/en/contributing/formatting/tools#nix), thanks! Probably we should make another PR to add that as the specified formatter
👍 1
jakehamilton commented 2024-06-14 01:52:46 +00:00
Owner
Copy link

Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter.

This is the correct thing to do, thanks!

Probably we should make another PR to add that as the specified formatter

Perhaps we can add a nix-shell script. I would like to avoid adding any dependencies to these projects.

> > Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter. > > [This is the correct thing to do](https://wiki.auxolotl.org/en/contributing/formatting/tools#nix), thanks! > > Probably we should make another PR to add that as the specified formatter Perhaps we can add a nix-shell script. I would like to avoid adding any dependencies to these projects.
jakehamilton commented 2024-06-14 01:54:09 +00:00
Owner
Copy link

Currently I'm formatting with nixfmt-rfc-style since no formatter is specified, let me know if you would like me to reformat with another formatter.

This is fine, though it's made the PR a little hard to follow since it is also introducing platform changes. I think the only changes right now are to meta.platforms?

> Currently I'm formatting with `nixfmt-rfc-style` since no formatter is specified, let me know if you would like me to reformat with another formatter. This is fine, though it's made the PR a little hard to follow since it is also introducing platform changes. I think the only changes right now are to meta.platforms?
coded commented 2024-06-14 02:09:48 +00:00
Owner
Copy link

Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it).

Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it).
jakehamilton commented 2024-06-14 05:23:10 +00:00
Owner
Copy link

Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it).

So long as we don't introduce additional inputs to the projects then I am down! I'd like to keep these all self-contained.

> Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it). So long as we don't introduce additional inputs to the projects then I am down! I'd like to keep these all self-contained.
minion commented 2024-06-14 09:40:11 +00:00
Owner
Copy link

Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it).

So long as we don't introduce additional inputs to the projects then I am down! I'd like to keep these all self-contained.

This seems likely to be an extremely annoying restriction, unless we use something like niv instead... would you be OK with a separate "dev" flake (i.e. allowing us to have development inputs as well as regular ones)?

> > Yea I'm wondering if we want to pull out the format and move it into a separate PR (maybe not worth the trouble here). We should also add something about formatting before each commit to our standards. Maybe we could write a pre-commit hook or similar? This should be easy if we're standardizing treefmt (me, @minion and @dfh (on the forums) are writing a module for it). > > So long as we don't introduce additional inputs to the projects then I am down! I'd like to keep these all self-contained. This seems likely to be an extremely annoying restriction, unless we use something like niv instead... would you be OK with a separate "dev" flake (i.e. allowing us to have development inputs as well as regular ones)?
❤️ 1
isabelroses force-pushed feat/x86-64_linux from c2143518d7 to fe8157bd15 2024-06-21 22:53:44 +00:00 Compare
isabelroses changed title from feat: support for x86_64-linux to WIP: feat: support for x86_64-linux 2024-06-21 22:53:56 +00:00
isabelroses removed review request for jakehamilton 2024-06-21 22:54:19 +00:00
isabelroses added 1 commit 2024-06-22 12:04:24 +00:00
isabelroses commented 2024-06-22 12:05:35 +00:00
Author
Owner
Copy link

Currently getting an error with gnutar-boot

> linking ./intl/libgettext.h to intl/libintl.h
> configure: error: ./intl/libgettext.h: File not found
Currently getting an error with gnutar-boot ``` > linking ./intl/libgettext.h to intl/libintl.h > configure: error: ./intl/libgettext.h: File not found ```
isabelroses force-pushed feat/x86-64_linux from 61139839b6 to 7adf088998 2024-06-22 17:02:06 +00:00 Compare
isabelroses force-pushed feat/x86-64_linux from 7adf088998 to 786738b368 2024-06-22 18:09:32 +00:00 Compare
isabelroses force-pushed feat/x86-64_linux from 786738b368 to 7adf088998 2024-06-22 18:21:29 +00:00 Compare
isabelroses force-pushed feat/x86-64_linux from 7adf088998 to e1ca419046 2024-06-22 19:20:40 +00:00 Compare
isabelroses force-pushed feat/x86-64_linux from e1ca419046 to 3332f332b9 2024-06-22 19:36:08 +00:00 Compare
isabelroses added 1 commit 2024-06-22 19:38:49 +00:00
This pull request has changes conflicting with the target branch.
  • foundation/src/stages/stage1/gawk/boot.nix
  • foundation/src/stages/stage1/gnutar/boot.nix
  • foundation/src/stages/stage1/gnutar/musl.nix
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/x86-64_linux:feat/x86-64_linux
git checkout feat/x86-64_linux

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff feat/x86-64_linux
git checkout main
git merge --ff-only feat/x86-64_linux
git checkout feat/x86-64_linux
git rebase main
git checkout main
git merge --no-ff feat/x86-64_linux
git checkout main
git merge --squash feat/x86-64_linux
git checkout main
git merge --ff-only feat/x86-64_linux
git checkout main
git merge feat/x86-64_linux
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
Compat
Breaking
Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Compat
Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
isabelroses
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: auxolotl/labs#1
No description provided.
Delete branch "feat/x86-64_linux"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?