github-actions[bot]
2 years ago
committed by
GitHub
commit
b0b4881903
@ -1,101 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip |
|
||||||
, gnumake, gcc-arm-embedded, binutils-arm-embedded |
|
||||||
, dfu-util-axoloti, jdk, ant, libfaketime }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
version = "1.0.12-2"; |
|
||||||
pname = "axoloti"; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "axoloti"; |
|
||||||
repo = "axoloti"; |
|
||||||
rev = version; |
|
||||||
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; |
|
||||||
}; |
|
||||||
|
|
||||||
chibi_version = "2.6.9"; |
|
||||||
chibi_name = "ChibiOS_${chibi_version}"; |
|
||||||
|
|
||||||
chibios = fetchurl { |
|
||||||
url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; |
|
||||||
sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; |
|
||||||
}; |
|
||||||
|
|
||||||
nativeBuildInputs = [ |
|
||||||
makeWrapper |
|
||||||
unzip |
|
||||||
gcc-arm-embedded |
|
||||||
binutils-arm-embedded |
|
||||||
dfu-util-axoloti |
|
||||||
ant |
|
||||||
]; |
|
||||||
buildInputs = [jdk libfaketime ]; |
|
||||||
|
|
||||||
patchPhase = '' |
|
||||||
unzip ${chibios} |
|
||||||
mv ${chibi_name} chibios |
|
||||||
(cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) |
|
||||||
|
|
||||||
# Remove source of non-determinism in ChibiOS |
|
||||||
substituteInPlace "chibios/os/various/shell.c" \ |
|
||||||
--replace "#ifdef __DATE__" "#if 0" |
|
||||||
|
|
||||||
# Hardcode path to "make" |
|
||||||
for f in "firmware/compile_firmware_linux.sh" \ |
|
||||||
"firmware/compile_patch_linux.sh"; do |
|
||||||
substituteInPlace "$f" \ |
|
||||||
--replace "make" "${gnumake}/bin/make" |
|
||||||
done |
|
||||||
|
|
||||||
# Hardcode dfu-util path |
|
||||||
substituteInPlace "platform_linux/upload_fw_dfu.sh" \ |
|
||||||
--replace "/bin/dfu-util" "" |
|
||||||
substituteInPlace "platform_linux/upload_fw_dfu.sh" \ |
|
||||||
--replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" |
|
||||||
|
|
||||||
# Fix build version |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "(git missing)" "${version}" |
|
||||||
|
|
||||||
# Remove build time |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "<tstamp>" "" |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace \ |
|
||||||
'<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \ |
|
||||||
'<property name="build.time" value=""/>' |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace "</tstamp>" "" |
|
||||||
substituteInPlace "build.xml" \ |
|
||||||
--replace \ |
|
||||||
'{line.separator}</echo>' \ |
|
||||||
'{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />' |
|
||||||
''; |
|
||||||
|
|
||||||
buildPhase = '' |
|
||||||
find . -exec touch -d '1970-01-01 00:00' {} \; |
|
||||||
(cd platform_linux; sh compile_firmware.sh) |
|
||||||
faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true |
|
||||||
''; |
|
||||||
|
|
||||||
installPhase = '' |
|
||||||
mkdir -p $out/bin $out/share/axoloti |
|
||||||
|
|
||||||
cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ |
|
||||||
install -vD dist/Axoloti.jar $out/share/axoloti/ |
|
||||||
|
|
||||||
makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" |
|
||||||
''; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
homepage = "http://www.axoloti.com"; |
|
||||||
description = '' |
|
||||||
Sketching embedded digital audio algorithms. |
|
||||||
|
|
||||||
To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>: |
|
||||||
<literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal> |
|
||||||
''; |
|
||||||
license = licenses.gpl3; |
|
||||||
maintainers = with maintainers; [ ]; |
|
||||||
}; |
|
||||||
} |
|
||||||
@ -1,31 +0,0 @@ |
|||||||
{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "dfu-util"; |
|
||||||
version = "0.8"; |
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]; |
|
||||||
buildInputs = [ libusb1-axoloti ]; |
|
||||||
|
|
||||||
src = fetchurl { |
|
||||||
url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; |
|
||||||
sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; |
|
||||||
}; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Device firmware update (DFU) USB programmer"; |
|
||||||
longDescription = '' |
|
||||||
dfu-util is a program that implements the host (PC) side of the USB |
|
||||||
DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. |
|
||||||
|
|
||||||
DFU is intended to download and upload firmware to devices connected over |
|
||||||
USB. It ranges from small devices like micro-controller boards up to mobile |
|
||||||
phones. With dfu-util you are able to download firmware to your device or |
|
||||||
upload firmware from it. |
|
||||||
''; |
|
||||||
homepage = "http://dfu-util.sourceforge.net"; |
|
||||||
license = licenses.gpl2Plus; |
|
||||||
platforms = platforms.unix; |
|
||||||
maintainers = [ ]; |
|
||||||
}; |
|
||||||
} |
|
||||||
@ -1,39 +0,0 @@ |
|||||||
{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "libusb"; |
|
||||||
version = "1.0.19"; |
|
||||||
|
|
||||||
src = fetchurl { |
|
||||||
url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; |
|
||||||
sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; |
|
||||||
}; |
|
||||||
|
|
||||||
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure |
|
||||||
|
|
||||||
buildInputs = [ pkg-config ]; |
|
||||||
propagatedBuildInputs = lib.optional stdenv.isLinux systemd |
|
||||||
++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; |
|
||||||
|
|
||||||
patches = [ |
|
||||||
(fetchpatch { |
|
||||||
name = "libusb.stdfu.patch"; |
|
||||||
url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; |
|
||||||
sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; |
|
||||||
}) |
|
||||||
]; |
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; |
|
||||||
|
|
||||||
preFixup = lib.optionalString stdenv.isLinux '' |
|
||||||
sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la |
|
||||||
''; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
homepage = "http://www.libusb.info"; |
|
||||||
description = "User-space USB library"; |
|
||||||
maintainers = with maintainers; [ ]; |
|
||||||
platforms = platforms.unix; |
|
||||||
license = licenses.lgpl21; |
|
||||||
}; |
|
||||||
} |
|
||||||
@ -1,6 +1,6 @@ |
|||||||
{ |
{ |
||||||
"commit": "78324aa49909392e169c86bbfd204694523907e8", |
"commit": "38aa99a1623af5371157721c2a4b033b828e9938", |
||||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78324aa49909392e169c86bbfd204694523907e8.tar.gz", |
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz", |
||||||
"sha256": "15k5ag36asswwv8yazq53lkj9blnz4hzlq23cznvvk5pkjpdm0ni", |
"sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34", |
||||||
"msg": "Update from Hackage at 2022-05-05T15:07:55Z" |
"msg": "Update from Hackage at 2022-05-10T13:45:20Z" |
||||||
} |
} |
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,41 +0,0 @@ |
|||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, ilmbase, libtiff, openexr }: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "ctl"; |
|
||||||
version = "1.5.2"; |
|
||||||
|
|
||||||
src = fetchFromGitHub { |
|
||||||
owner = "ampas"; |
|
||||||
repo = pname; |
|
||||||
rev = "${pname}-${version}"; |
|
||||||
sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; |
|
||||||
}; |
|
||||||
|
|
||||||
patches = [ |
|
||||||
(fetchpatch { |
|
||||||
name = "ctl-1.5.2-ilm_230.patch"; |
|
||||||
url = "https://src.fedoraproject.org/rpms/CTL/raw/9d7c15a91bccdc0a9485d463bf2789be72e6b17d/f/ctl-1.5.2-ilm_230.patch"; |
|
||||||
sha256 = "0mdx7llwrm0q8ai53zhyxi40i9h5s339dbkqpqv30yzi2xpnfj3d"; |
|
||||||
}) |
|
||||||
]; |
|
||||||
|
|
||||||
postPatch = '' |
|
||||||
# Fix include guard name |
|
||||||
substituteInPlace lib/dpx/dpx_raw.hh \ |
|
||||||
--replace CRL_DPX_RAW_INTERNAL_INCLUDE CTL_DPX_RAW_INTERNAL_INCLUDE |
|
||||||
|
|
||||||
# Fix undefined symbols (link with Imath) |
|
||||||
substituteInPlace lib/IlmCtlMath/CMakeLists.txt \ |
|
||||||
--replace "( IlmCtlMath IlmCtl )" "( IlmCtlMath IlmCtl Imath)" |
|
||||||
''; |
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ]; |
|
||||||
buildInputs = [ libtiff ilmbase openexr ]; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Color Transformation Language"; |
|
||||||
homepage = "https://github.com/ampas/CTL"; |
|
||||||
license = "A.M.P.A.S"; # BSD-derivative, free but GPL incompatible |
|
||||||
platforms = platforms.all; |
|
||||||
}; |
|
||||||
} |
|
||||||
@ -0,0 +1,43 @@ |
|||||||
|
diff --git a/src/tscore/unit_tests/test_History.cc b/src/tscore/unit_tests/test_History.cc
|
||||||
|
index 3e699139da0..7505f10aa4c 100644
|
||||||
|
--- a/src/tscore/unit_tests/test_History.cc
|
||||||
|
+++ b/src/tscore/unit_tests/test_History.cc
|
||||||
|
@@ -59,10 +59,10 @@ TEST_CASE("History", "[libts][History]")
|
||||||
|
REQUIRE(history[2].reentrancy == static_cast<short>(NO_REENTRANT));
|
||||||
|
|
||||||
|
history[0].location.str(buf, sizeof(buf));
|
||||||
|
- REQUIRE(string_view{buf} == "test_History.cc:48 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(string_view{buf} == "test_History.cc:48 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
history[1].location.str(buf, sizeof(buf));
|
||||||
|
- REQUIRE(string_view{buf} == "test_History.cc:49 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(string_view{buf} == "test_History.cc:49 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
ts::LocalBufferWriter<128> w;
|
||||||
|
SM<HISTORY_DEFAULT_SIZE> *sm = new SM<HISTORY_DEFAULT_SIZE>;
|
||||||
|
@@ -71,10 +71,10 @@ TEST_CASE("History", "[libts][History]")
|
||||||
|
SM_REMEMBER(sm, 3, NO_REENTRANT);
|
||||||
|
|
||||||
|
w.print("{}", sm->history[0].location);
|
||||||
|
- REQUIRE(w.view() == "test_History.cc:69 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(w.view() == "test_History.cc:69 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
w.reset().print("{}", sm->history[1].location);
|
||||||
|
- REQUIRE(w.view() == "test_History.cc:70 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(w.view() == "test_History.cc:70 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
REQUIRE(sm->history[0].event == 1);
|
||||||
|
REQUIRE(sm->history[0].reentrancy == 1);
|
||||||
|
@@ -106,10 +106,10 @@ TEST_CASE("History", "[libts][History]")
|
||||||
|
REQUIRE(sm2->history.overflowed() == true);
|
||||||
|
|
||||||
|
w.reset().print("{}", sm2->history[0].location);
|
||||||
|
- REQUIRE(w.view() == "test_History.cc:103 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(w.view() == "test_History.cc:103 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
w.reset().print("{}", sm2->history[1].location);
|
||||||
|
- REQUIRE(w.view() == "test_History.cc:98 (____C_A_T_C_H____T_E_S_T____0)");
|
||||||
|
+ REQUIRE(w.view() == "test_History.cc:98 (C_A_T_C_H_T_E_S_T_0)");
|
||||||
|
|
||||||
|
sm2->history.clear();
|
||||||
|
REQUIRE(sm2->history.size() == 0);
|
||||||
@ -1,18 +0,0 @@ |
|||||||
{ lib, stdenv, fetchurl, libgpg-error, libgcrypt, libassuan, libksba, pth, openldap |
|
||||||
, libiconv}: |
|
||||||
|
|
||||||
stdenv.mkDerivation rec { |
|
||||||
pname = "dirmngr"; |
|
||||||
version = "1.1.1"; |
|
||||||
src = fetchurl { |
|
||||||
url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2"; |
|
||||||
sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; |
|
||||||
}; |
|
||||||
buildInputs = [ libgpg-error libgcrypt libassuan libksba |
|
||||||
pth openldap libiconv ]; |
|
||||||
|
|
||||||
meta = { |
|
||||||
platforms = lib.platforms.unix; |
|
||||||
license = lib.licenses.gpl2Plus; |
|
||||||
}; |
|
||||||
} |
|
||||||
Loading…
Reference in new issue