M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate linien-server to not-os #50

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:linien-server into master 2024-08-17 17:37:24 +08:00
Conversation 0 Commits 1 Files Changed 1 +3 -1
fsagbuya commented 2024-03-18 16:12:44 +08:00
Collaborator
Copy Link

Description

Integrate linien-server to not-os:

  • transfer not-os-configured inside board-package-set to inherit board option
  • export the armv7l linien-server package
### Description Integrate `linien-server` to not-os: - transfer `not-os-configured` inside `board-package-set` to inherit board option - export the armv7l linien-server package
sb10q reviewed 2024-03-18 17:22:14 +08:00
flake.nix Outdated
@ -79,2 +71,2 @@
rev = "v${version}";
hash = "sha256-43TTlpJ5SMAjQM71bNVvrWQyciRXM3zpuA/Dw41AEgU=";
fast-servo-extrapkg = ({ config, pkgs, ... }: let
pyrp3 = pkgs.python3Packages.buildPythonPackage rec {
sb10q commented 2024-03-18 17:22:14 +08:00
Owner
Copy Link

Why does this have to be inside fast-servo-extrapkg?
Sounds simpler to put them outside and inherit them here. Then you also won't need system.build.

Why does this have to be inside fast-servo-extrapkg? Sounds simpler to put them outside and inherit them here. Then you also won't need ``system.build``.
fsagbuya commented 2024-03-18 17:47:18 +08:00
Author
Collaborator
Copy Link

I agree. It should be simpler to just inherit after defining it outside. However, for some reason, the module is not being successfully loaded inside environment.systemPackages when done this way. It invokes this error upon running: 4b1427bfd6/linien-not-os-error.txt.

I agree. It should be simpler to just inherit after defining it outside. However, for some reason, the module is not being successfully loaded inside `environment.systemPackages` [when done this way](https://gist.github.com/fsagbuya/053647293625e0a7f1a7521d7b199803). It invokes this error upon running: https://gist.githubusercontent.com/fsagbuya/8fe088e0e665970f25c575c6022d07c9/raw/4b1427bfd65693ee4dc8b3e396aeec1d3538f906/linien-not-os-error.txt.
sb10q commented 2024-04-03 12:48:23 +08:00
Owner
Copy Link

Please investigate this bug. What are the contents of /run/current-system/sw/bin/linien-server ?

Please investigate this bug. What are the contents of /run/current-system/sw/bin/linien-server ?
fsagbuya commented 2024-04-03 13:16:46 +08:00
Author
Collaborator
Copy Link

Please investigate this bug.

Will do.

What are the contents of /run/current-system/sw/bin/linien-server ?

#! /nix/store/087167dfxal194pm54cmcbbxsfy3cjgn-bash-5.2p26/bin/bash -e
PATH=${PATH:+':'$PATH':'}
PATH=${PATH/':''/nix/store/k97xgsv6vgm1myags8ffxibvssbpshbr-python3.11-charset-normalizer-3.3.2/bin'':'/':'}
PATH='/nix/store/k97xgsv6vgm1myags8ffxibvssbpshbr-python3.11-charset-normalizer-3.3.2/bin'$PATH
PATH=${PATH#':'}
PATH=${PATH%':'}
export PATH
PATH=${PATH:+':'$PATH':'}
PATH=${PATH/':''/nix/store/4mv3ailwka4chyr3inhna54sh3cb3yix-python3.11-rpyc4-4.1.5/bin'':'/':'}
PATH='/nix/store/4mv3ailwka4chyr3inhna54sh3cb3yix-python3.11-rpyc4-4.1.5/bin'$PATH
PATH=${PATH#':'}
PATH=${PATH%':'}
export PATH
PATH=${PATH:+':'$PATH':'}
PATH=${PATH/':''/nix/store/f4dfqdjg0j0gwaf1lgbwy2dxzxnqcnhy-python3.11-numpy-1.26.4/bin'':'/':'}
PATH='/nix/store/f4dfqdjg0j0gwaf1lgbwy2dxzxnqcnhy-python3.11-numpy-1.26.4/bin'$PATH
PATH=${PATH#':'}
PATH=${PATH%':'}
export PATH
PATH=${PATH:+':'$PATH':'}
PATH=${PATH/':''/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin'':'/':'}
PATH='/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin'$PATH
PATH=${PATH#':'}
PATH=${PATH%':'}
export PATH
PATH=${PATH:+':'$PATH':'}
PATH=${PATH/':''/nix/store/sxr2igfkwhxbagri49b8krmcqz168sim-python3-3.11.8/bin'':'/':'}
PATH='/nix/store/sxr2igfkwhxbagri49b8krmcqz168sim-python3-3.11.8/bin'$PATH
PATH=${PATH#':'}
PATH=${PATH%':'}
export PATH
export PYTHONNOUSERSITE='true'
exec -a "$0" "/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin/.linien-server-wrapped"  "$@"
> Please investigate this bug. Will do. > What are the contents of /run/current-system/sw/bin/linien-server ? ``` #! /nix/store/087167dfxal194pm54cmcbbxsfy3cjgn-bash-5.2p26/bin/bash -e PATH=${PATH:+':'$PATH':'} PATH=${PATH/':''/nix/store/k97xgsv6vgm1myags8ffxibvssbpshbr-python3.11-charset-normalizer-3.3.2/bin'':'/':'} PATH='/nix/store/k97xgsv6vgm1myags8ffxibvssbpshbr-python3.11-charset-normalizer-3.3.2/bin'$PATH PATH=${PATH#':'} PATH=${PATH%':'} export PATH PATH=${PATH:+':'$PATH':'} PATH=${PATH/':''/nix/store/4mv3ailwka4chyr3inhna54sh3cb3yix-python3.11-rpyc4-4.1.5/bin'':'/':'} PATH='/nix/store/4mv3ailwka4chyr3inhna54sh3cb3yix-python3.11-rpyc4-4.1.5/bin'$PATH PATH=${PATH#':'} PATH=${PATH%':'} export PATH PATH=${PATH:+':'$PATH':'} PATH=${PATH/':''/nix/store/f4dfqdjg0j0gwaf1lgbwy2dxzxnqcnhy-python3.11-numpy-1.26.4/bin'':'/':'} PATH='/nix/store/f4dfqdjg0j0gwaf1lgbwy2dxzxnqcnhy-python3.11-numpy-1.26.4/bin'$PATH PATH=${PATH#':'} PATH=${PATH%':'} export PATH PATH=${PATH:+':'$PATH':'} PATH=${PATH/':''/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin'':'/':'} PATH='/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin'$PATH PATH=${PATH#':'} PATH=${PATH%':'} export PATH PATH=${PATH:+':'$PATH':'} PATH=${PATH/':''/nix/store/sxr2igfkwhxbagri49b8krmcqz168sim-python3-3.11.8/bin'':'/':'} PATH='/nix/store/sxr2igfkwhxbagri49b8krmcqz168sim-python3-3.11.8/bin'$PATH PATH=${PATH#':'} PATH=${PATH%':'} export PATH export PYTHONNOUSERSITE='true' exec -a "$0" "/nix/store/3y74yzs4hhzx186w7441pqmgwkqhrpa6-python3.11-linien-server-1.0.1/bin/.linien-server-wrapped" "$@" ```
fsagbuya commented 2024-04-04 13:12:15 +08:00
Author
Collaborator
Copy Link

The error came from inheriting the same x86_64 pkgs in building the linien-server and run-time dependencies. Updated it to use the armv7l version.

The error came from inheriting the same x86_64 `pkgs` in building the linien-server and run-time dependencies. Updated it to use the `armv7l` version.
sb10q reviewed 2024-03-18 17:23:20 +08:00
flake.nix Outdated
@ -492,6 +498,8 @@
"${board}-dtb" = dtb;
"${board}-sd-image" = sd-image;
"${board}-qemu" = not-os-qemu;
# linien-server cross-compiled for armv7l platform
sb10q commented 2024-03-18 17:23:20 +08:00
Owner
Copy Link

Since it ends up in packages.armv7l-linux this comment is redundant.

Since it ends up in packages.armv7l-linux this comment is redundant.
👍 1
fsagbuya force-pushed linien-server from 2621d23920 to 80b136246c 2024-03-18 17:58:55 +08:00 Compare
fsagbuya force-pushed linien-server from 80b136246c to d9bf216a9e 2024-03-20 16:09:02 +08:00 Compare
fsagbuya force-pushed linien-server from bb61f0f9eb to 64d83bc50d 2024-04-02 10:35:35 +08:00 Compare
fsagbuya force-pushed linien-server from 64d83bc50d to 4061bf53ac 2024-04-03 12:45:45 +08:00 Compare
sb10q reviewed 2024-04-03 12:46:50 +08:00
flake.nix Outdated
@ -110,2 +102,2 @@
rev = "v${version}";
hash = "sha256-43TTlpJ5SMAjQM71bNVvrWQyciRXM3zpuA/Dw41AEgU=";
fast-servo-extrapkg = ({ config, pkgs, ... }: let
pyrp3 = pkgs.python3Packages.buildPythonPackage rec {
sb10q commented 2024-04-03 12:46:50 +08:00
Owner
Copy Link

Take pyrp3 out and inherit it here.

Take pyrp3 out and inherit it here.
👍 1
sb10q reviewed 2024-04-03 12:47:09 +08:00
flake.nix Outdated
@ -381,3 +387,3 @@
IMGDIR=$(mktemp -d /tmp/not-os-qemu-XXXXXX)
BASE=$(realpath $(dirname $0))
qemu-img create -F raw -f qcow2 -b $BASE/sd-image.img $IMGDIR/sd-overlay.qcow2 512M
qemu-img create -F raw -f qcow2 -b $BASE/sd-image.img $IMGDIR/sd-overlay.qcow2 4G
sb10q commented 2024-04-03 12:47:09 +08:00
Owner
Copy Link

That big?

That big?
fsagbuya commented 2024-04-03 12:52:57 +08:00
Author
Collaborator
Copy Link
1015M -r--r--r--  2 root root  1.1G Jan  1  1970 sd-image.img

Will reduce it to 2G.

``` 1015M -r--r--r-- 2 root root 1.1G Jan 1 1970 sd-image.img ``` Will reduce it to 2G.
fsagbuya force-pushed linien-server from 4061bf53ac to 03a7b2a75e 2024-04-04 13:09:07 +08:00 Compare
fsagbuya force-pushed linien-server from 03a7b2a75e to 0ff299aa55 2024-04-04 13:43:31 +08:00 Compare
sb10q merged commit 0ff299aa55 into master 2024-04-04 16:30:04 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 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: M-Labs/nix-servo#50
No description provided.
Delete Branch "fsagbuya/nix-servo:linien-server"

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?