M-Labs
/
thermostat
9
0
Fork 4
Code Issues 8 Pull Requests 7 Releases Wiki Activity

cleanup + build gdb on hydra

softspi
Sebastien Bourdeauducq 2019-03-22 20:34:32 +08:00
parent cc35c81e55
commit 7d98fd416c
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default.nix
View File

@ -8,11 +8,11 @@ let
in in
with pkgs; with pkgs;
let let
rustPlatform = recurseIntoAttrs (callPackage (import ./nix/rustPlatform.nix) { rustPlatform = recurseIntoAttrs (callPackage ./nix/rustPlatform.nix {
inherit rustManifest; inherit rustManifest;
}); });
adc2tcp = callPackage (import ./nix/adc2tcp.nix) { inherit rustPlatform; }; adc2tcp = callPackage ./nix/adc2tcp.nix { inherit rustPlatform; };
openocd = callPackage (import ./nix/openocd.nix) {}; openocd = callPackage ./nix/openocd.nix {};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "adc2tcp-dist"; name = "adc2tcp-dist";

4
release.nix
View File

@ -5,11 +5,13 @@
with pkgs; with pkgs;
let let
adc2tcp = callPackage (import ./default.nix) { gdb = callPackage ./nix/gdb.nix;
adc2tcp = callPackage ./default.nix {
inherit rustManifest; inherit rustManifest;
mozillaOverlay = import <mozillaOverlay>; mozillaOverlay = import <mozillaOverlay>;
}; };
in in
{ {
build = lib.hydraJob adc2tcp; build = lib.hydraJob adc2tcp;
gdb = lib.hydraJob gdb;
} }

15
shell.nix
View File

@ -12,18 +12,9 @@ let
in in
with pkgs; with pkgs;
let let
rustPlatform = callPackage (import ./nix/rustPlatform.nix) {}; rustPlatform = callPackage ./nix/rustPlatform.nix {};
openocd = callPackage (import ./nix/openocd.nix) {}; openocd = callPackage ./nix/openocd.nix {};
# TODO: gdb 8.2.1 from NixOS >= 19.XX is multiarch by default. gdb = callPackage ./nix/gdb.nix {};
# remove the following as `gdb` is already in scope
gdb = pkgs.gdb.override {
stdenv = stdenv.override {
targetPlatform = {
config = "arm-none-eabihf";
libc = "newlib";
};
};
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "adc2tcp-env"; name = "adc2tcp-env";