diff options
| -rw-r--r-- | devShells/default.nix | 2 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 2 | ||||
| -rw-r--r-- | devShells/qt.nix | 5 | ||||
| -rw-r--r-- | devShells/riscv.nix | 2 | ||||
| -rw-r--r-- | flake.lock | 30 |
5 files changed, 22 insertions, 19 deletions
diff --git a/devShells/default.nix b/devShells/default.nix index 02ecc11..1e8dee3 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -16,7 +16,7 @@ let espc = callDevelop ./nuttx.nix { arch = "rv32imc"; }; c = callDevelop ./c.nix { }; qt = callDevelop ./qt.nix { }; - riscv = callDevelop ./riscv.nix { }; + #riscv = callDevelop ./riscv.nix { }; }; in shells diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix index ef6e632..2d3e271 100644 --- a/devShells/nuttx.nix +++ b/devShells/nuttx.nix @@ -11,7 +11,7 @@ let config = if (hasPrefix "armv" arch) then "arm-none-eabi" + (optionalString (fpu != null) "hf") else "riscv32-none-elf"; - libc = "newlib"; + libc = "newlib-nano"; gcc = { arch = arch; } // (optionalAttrs (fpu != null) { fpu = fpu; }); diff --git a/devShells/qt.nix b/devShells/qt.nix index e16af50..8bcce47 100644 --- a/devShells/qt.nix +++ b/devShells/qt.nix @@ -6,7 +6,10 @@ let in pkgs.mkShell { packages = (with pkgs; with libsForQt5; [ - qt5.qtbase + qtbase + qtserialport + qtserialport + qtwebsockets doctest (qcoro.overrideAttrs (oldAttrs: { diff --git a/devShells/riscv.nix b/devShells/riscv.nix index f17b85d..99a0259 100644 --- a/devShells/riscv.nix +++ b/devShells/riscv.nix @@ -6,7 +6,7 @@ let localSystem = system; crossSystem = { config = "riscv32-none-elf"; - libc = "newlib"; + libc = "newlib-nano"; gcc = { arch = "rv32i"; }; @@ -79,11 +79,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1668594520, - "narHash": "sha256-/9iBitEL6mtWZDikR/T0FNlkzj5HVkduw/Nek7HjgcY=", + "lastModified": 1669112333, + "narHash": "sha256-eZKw11rU4vbAfezhpb5C6+XsjPTnKsgELXL+93jQvmQ=", "owner": "NixOS", "repo": "nix", - "rev": "62960f32915909a5104f2ca3a32b25fb3cfd34c7", + "rev": "96a9511a9c424f0986d6c01bef63afff672fa986", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1668334946, - "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", + "lastModified": 1668973873, + "narHash": "sha256-DnTrRduUIRgsCBruvUXsaBw2G46JNq6/DtrM5R7VrRc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", + "rev": "1108c1b8614017c8b52005054fd27a00e4feb51b", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1668829732, - "narHash": "sha256-T8mzu6/rN1i7kSQIOuxCPYy0BVRxfFy0CsSuXYVq+V8=", + "lastModified": 1669067947, + "narHash": "sha256-DbTlGzUSj2j+3tMJ7UwV5ExGSg1WeZ+XZq6eAGpyd40=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c4c1866143ec02016d30eabed22cd6d0de39a10b", + "rev": "802115d0227228b66b691f3b85b30b868976e8eb", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1668771122, - "narHash": "sha256-ZNliqLNhAPsyaeCf7h4FWRJH8GtP0+QoxiXk/O00TUA=", + "lastModified": 1668953219, + "narHash": "sha256-EHRU5hfg8XZAAmU/fNko2oEpDYLdcb0NydFUSbkLZ2U=", "owner": "cynerd", "repo": "nixturris", - "rev": "59e66ef8c4384da3ed2a673be19bf3195749a542", + "rev": "6271385d037c5a18be0865b4e2e2fda670f42749", "type": "github" }, "original": { @@ -305,11 +305,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1668800841, - "narHash": "sha256-Vq5lY9dbRBBCLvKANlEWsD+J8ShF6dj8HKJbrcZaIf0=", + "lastModified": 1669053324, + "narHash": "sha256-VuhRPkCfgWVINaGOlhtmop0BXquPfUuU+TCEfMiLWAY=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "bf17797286196d756e482303d40eaf3b43549506", + "rev": "7349a6cd5bdec28fa116f349191916263265ee24", "type": "github" }, "original": { |