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

Compare commits

base: M-Labs:678b9f50cfcc7c1b2f2c6c11cbf857dfaf1face2
Branches Tags
M-Labs:master
..
compare: M-Labs:1bf090dbb9485825f0003ebbff8d8755f5eacacb
Branches Tags
M-Labs:master

No commits in common. "678b9f50cfcc7c1b2f2c6c11cbf857dfaf1face2" and "1bf090dbb9485825f0003ebbff8d8755f5eacacb" have entirely different histories.
678b9f50cf ... 1bf090dbb9

2 changed files with 21 additions and 32 deletions
Show Stats Expand all files Collapse all files

41
flake.lock
View File

@ -18,27 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701053011, "lastModified": 1700390070,
"narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1700794826,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,12 +32,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1697730408,
"narHash": "sha256-Ww//zzukdTrwTrCUkaJA/NsaLEfUfQpWZXBdXBYfhak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ff0a5a776b56e0ca32d47a4a47695452ec7f7d80",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"not-os": { "not-os": {
"inputs": { "inputs": {
"firmware": "firmware", "firmware": "firmware",
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1699416673, "lastModified": 1699416673,
@ -72,7 +68,6 @@
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"not-os": "not-os" "not-os": "not-os"
} }
} }

12
flake.nix
View File

@ -1,16 +1,12 @@
{ {
description = "Not-OS port to the Zynq-7000 platform"; description = "Not-OS port to the Zynq-7000 platform";
inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.not-os.url = github:cleverca22/not-os; inputs.not-os.url = github:cleverca22/not-os;
inputs.not-os.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, nixpkgs-unstable, not-os }: outputs = { self, nixpkgs, not-os }:
let let
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
# To be used for building u-boot.
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
gnu-platform = "arm-none-eabi"; gnu-platform = "arm-none-eabi";
@ -178,9 +174,7 @@
dontFixup = true; dontFixup = true;
}; };
# U-boot needs the recent patch in master to fix cross-compile issues. u-boot = pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
# See https://github.com/NixOS/nixpkgs/pull/265411.
u-boot = pkgs-unstable.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
defconfig = "xilinx_zynq_virt_defconfig"; defconfig = "xilinx_zynq_virt_defconfig";
preConfigure = '' preConfigure = ''
export DEVICE_TREE=zynq-zc706 export DEVICE_TREE=zynq-zc706