aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2023-04-19 08:35:55 +0200
committerKarel Kočí <cynerd@email.cz>2023-04-19 08:35:55 +0200
commit7c7e5963e311dd7207bfd68b6e335a68e7aae844 (patch)
tree99451cb0c531586175fb018d76410678b2e1ee7e
parent6487de443137c73e57f07f912b982afb7b4ef04d (diff)
downloadnixos-personal-7c7e5963e311dd7207bfd68b6e335a68e7aae844.tar.gz
nixos-personal-7c7e5963e311dd7207bfd68b6e335a68e7aae844.tar.bz2
nixos-personal-7c7e5963e311dd7207bfd68b6e335a68e7aae844.zip
devShells: switch from newlib-nano to newlib
-rw-r--r--devShells/apo.nix6
-rw-r--r--devShells/nuttx.nix2
-rw-r--r--flake.lock18
3 files changed, 12 insertions, 14 deletions
diff --git a/devShells/apo.nix b/devShells/apo.nix
index a840670..b4ab8fd 100644
--- a/devShells/apo.nix
+++ b/devShells/apo.nix
@@ -7,10 +7,8 @@
localSystem = pkgs.buildPlatform.system;
crossSystem = {
config = "riscv32-none-elf";
- libc = "newlib-nano";
- gcc = {
- arch = "rv32i";
- };
+ libc = "newlib";
+ gcc.arch = "rv32i";
};
};
in
diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix
index 33f5761..506ea12 100644
--- a/devShells/nuttx.nix
+++ b/devShells/nuttx.nix
@@ -14,7 +14,7 @@ with pkgs.lib; let
if (hasPrefix "armv" arch)
then "arm-none-eabi" + (optionalString (fpu != null) "hf")
else "riscv32-none-elf";
- libc = "newlib-nano";
+ libc = "newlib";
gcc =
{
inherit arch;
diff --git a/flake.lock b/flake.lock
index c3a00e0..4862dd1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,11 +113,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1681211910,
- "narHash": "sha256-zbQX/+a7HlE3nHy8d4+VmHy2ItczY2qmpajhHXmBdYA=",
+ "lastModified": 1681829373,
+ "narHash": "sha256-ePNYkq/HPGb4ELomI3FFqMVtoIgg7LwURdsk85x70ZM=",
"owner": "NixOS",
"repo": "nix",
- "rev": "0a546242755890e41099cf4aa49762c916876748",
+ "rev": "28d7ffd448b51deedc87c4b350169394ee93b601",
"type": "github"
},
"original": {
@@ -206,11 +206,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1681198006,
- "narHash": "sha256-n1hrMtctmDOLHgpVqd8/9/C9hGT6BuwKYZR6Bo6zQls=",
+ "lastModified": 1681770396,
+ "narHash": "sha256-tq+GZOkRA3uF3I/jIzuBGfnTRQFT4QnnRCWJ8DKSaMg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "10193ca1539f79a6b0f4b7b23e02264526ea0445",
+ "rev": "4df48038a44e9f3a3da8e9b42ca182726b743de4",
"type": "github"
},
"original": {
@@ -388,11 +388,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1681215734,
- "narHash": "sha256-pxLEXvoO/C//R0zehF/j30gF2fXOpKE7kt9IqP149+U=",
+ "lastModified": 1681831259,
+ "narHash": "sha256-83xMn7BZpZ0utQtsT6PeURXwG6N5D7HprV4lTq5I6BE=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "1bd98cc80b3e45e986b4db388ff624e90075d345",
+ "rev": "a5c817b78882fa72b5a294af06b7ee8ae41aed1e",
"type": "github"
},
"original": {