diff options
| author | ners <ners@gmx.ch> | 2022-08-14 17:22:00 +0200 |
|---|---|---|
| committer | ners <ners@gmx.ch> | 2022-10-20 11:01:42 +0200 |
| commit | cfe77e5de2c4ef23ff18116d99172c72f77988a5 (patch) | |
| tree | 7b09b865854d477005252aa5219d67995e5d3205 /pkgs/development/embedded | |
| parent | 406e19540ad51d93c5c22d2dbab56c2e0be45825 (diff) | |
| download | nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar.gz nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar.bz2 nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar.lz nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar.xz nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.tar.zst nixlib-cfe77e5de2c4ef23ff18116d99172c72f77988a5.zip | |
bossa: 1.8 -> 1.9.1
Diffstat (limited to 'pkgs/development/embedded')
| -rw-r--r-- | pkgs/development/embedded/bossa/bossa-no-applet-build.patch | 16 | ||||
| -rw-r--r-- | pkgs/development/embedded/bossa/default.nix | 6 |
2 files changed, 2 insertions, 20 deletions
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 4284245f485d..000000000000 --- 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 fbb1b4c1fd40..f3d6cd6a6d89 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 ]; |