diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/development/embedded/bossa/arduino.nix new file mode 100644 index 00000000000..04e483ff38b --- /dev/null +++ b/pkgs/development/embedded/bossa/arduino.nix @@ -0,0 +1,13 @@ +{ bossa, git, fetchFromGitHub }: + +bossa.overrideAttrs (attrs: rec { + pname = "bossa-arduino"; + version = "1.9.1-arduino2"; + + src = fetchFromGitHub { + owner = "arduino"; + repo = "BOSSA"; + rev = version; + sha256 = "sha256-sBJ6QMd7cTClDnGCeOU0FT6IczEjqqRxCD7kef5GuY8="; + }; +}) diff --git a/pkgs/development/embedded/bossa/bossa-no-applet-build.patch b/pkgs/development/embedded/bossa/bossa-no-applet-build.patch deleted file mode 100644 index 4284245f485..00000000000 --- a/pkgs/development/embedded/bossa/bossa-no-applet-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile b/Makefile -index cc8882e..97b11ee 100644 ---- a/Makefile -+++ b/Makefile -@@ -184,11 +184,6 @@ $(foreach src,$(COMMON_SRCS),$(eval $(call common_obj,$(src)))) - # Applet rules - # - define applet_obj --$(SRCDIR)/$(1:%.asm=%.cpp): $(SRCDIR)/$(1) -- @echo APPLET $(1:%.asm=%) -- $$(Q)$$(ARMAS) -o $$(@:%.o=%.obj) $$< -- $$(Q)$$(ARMOBJCOPY) -O binary $$(@:%.o=%.obj) $$(@:%.o=%.bin) -- $$(Q)appletgen $(1:%.asm=%) $(SRCDIR) $(OBJDIR) - $(OBJDIR)/$(1:%.asm=%.o): $(SRCDIR)/$(1:%.asm=%.cpp) - @echo CPP APPLET $$< - $$(Q)$$(CXX) $$(COMMON_CXXFLAGS) -c -o $$(@) $$(<:%.asm=%.cpp) diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index fbb1b4c1fd4..f3d6cd6a6d8 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -15,17 +15,15 @@ let in stdenv.mkDerivation rec { pname = "bossa"; - version = "1.8"; + version = "1.9.1"; src = fetchFromGitHub { owner = "shumatech"; repo = "BOSSA"; rev = version; - sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y="; + sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; - patches = [ ./bossa-no-applet-build.patch ]; - nativeBuildInputs = [ bin2c ]; buildInputs = [ wxGTK libX11 readline ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f72969d311..6c0db95df8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16286,6 +16286,8 @@ with pkgs; wxGTK = wxGTK30; }; + bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { }; + bob = callPackage ../development/tools/build-managers/bob { }; buck = callPackage ../development/tools/build-managers/buck { };