push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,15 @@
diff --git a/src/mcusim/mcuinterface.h b/src/mcusim/mcuinterface.h
index cc5e24b..78871de 100644
--- a/src/mcusim/mcuinterface.h
+++ b/src/mcusim/mcuinterface.h
@@ -73,8 +73,9 @@ class McuInterface : public eElement
bool stepOne( int line );
virtual void stepCpu()=0;
- protected:
+ public:
static McuInterface* m_pSelf;
+ protected:
QString m_firmware; // firmware file loaded
QString m_device;

View File

@@ -0,0 +1,181 @@
{
lib,
stdenv,
fetchbzr,
fetchFromGitHub,
libsForQt5,
versionNum ? "1.1.0",
}:
let
versionInfo = {
"0.4.15" = rec {
release = "SR10";
rev = "291";
src = fetchbzr {
# the branch name does not mach the version for some reason
url = "https://code.launchpad.net/~arcachofo/simulide/simulide_0.4.14";
sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM=";
inherit rev;
};
};
"1.0.0" = rec {
release = "SR2";
rev = "1449";
src = fetchbzr {
url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0";
sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g=";
inherit rev;
};
};
"1.1.0" = rec {
release = "SR1";
rev = "2005";
src = fetchbzr {
url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0";
sha256 = "sha256-YVQduUjPQF5KxMlm730FZTShHP/7JEcAMIFn+mQITrQ=";
inherit rev;
};
};
"1.2.0" = rec {
release = "RC1";
rev = "da3a925491fab9fa2a8633d18e45f8e1b576c9d2";
src = fetchFromGitHub {
owner = "eeTools";
repo = "SimulIDE-dev";
hash = "sha256-6Gh0efBizDK1rUNkyU+/ysj7QwkAs3kTA1mQZYFb/pI=";
inherit rev;
};
};
};
in
let
inherit (versionInfo.${versionNum} or (throw "Unsupported versionNum")) release rev src;
iconPath =
if lib.versionOlder versionNum "1.0.0" then
"resources/icons/hicolor/256x256/simulide.png" # upstream had a messed up icon path in this release
else
"resources/icons/simulide.png";
release' = lib.optionalString (lib.versionOlder versionNum "1.2.0") "-" + release;
in
stdenv.mkDerivation {
pname = "simulide";
version = "${versionNum}-${release}";
inherit src;
patches = lib.optionals (versionNum == "1.0.0") [
# a static field was declared as protected but was accessed
# from a place where it would have had to be public
# this is only an error when using clang, gcc is more lenient
./clang-fix-protected-field.patch
];
postPatch = ''
sed -i resources/simulide.desktop \
-e "s|^Exec=.*$|Exec=simulide|" \
-e "s|^Icon=.*$|Icon=simulide|"
# Note: older versions don't have REV_NO
# Note: the project file hardcodes a homebrew gcc compiler when using darwin
# which we don't want, so we just delete the relevant lines
sed -i SimulIDE.pr* \
-e "s|^VERSION = .*$|VERSION = ${versionNum}|" \
-e "s|^RELEASE = .*$|RELEASE = ${release'}|" \
-e "s|^REV_NO = .*$|REV_NO = ${rev}|" \
-e "s|^BUILD_DATE = .*$|BUILD_DATE = ??????|" \
-e "/QMAKE_CC/d" \
-e "/QMAKE_CXX/d" \
-e "/QMAKE_LINK/d"
${lib.optionalString (lib.versionOlder versionNum "1.0.0") ''
# GCC 13 needs the <cstdint> header explicitly included
sed -i src/gpsim/value.h -e '1i #include <cstdint>'
sed -i src/gpsim/modules/watchdog.h -e '1i #include <cstdint>'
''}
'';
preConfigure = ''
cd build_XX
'';
nativeBuildInputs = [
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
];
buildInputs = [
libsForQt5.qtserialport
libsForQt5.qtmultimedia
libsForQt5.qttools
]
++ lib.optionals (lib.versionOlder versionNum "1.1.0") [
libsForQt5.qtscript
];
installPhase = ''
runHook preInstall
${lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 ../resources/simulide.desktop $out/share/applications/simulide.desktop
install -Dm644 ../${iconPath} $out/share/icons/hicolor/256x256/apps/simulide.png
''}
pushd executables/SimulIDE_*
${
if stdenv.hostPlatform.isDarwin then
''
mkdir -p $out/Applications
cp -r simulide.app $out/Applications
''
else if lib.versionOlder versionNum "1.0.0" then
''
mkdir -p $out/share/simulide $out/bin
cp -r share/simulide/* $out/share/simulide
cp bin/simulide $out/bin/simulide
''
else
''
mkdir -p $out/share/simulide $out/bin
cp -r data examples $out/share/simulide
cp simulide $out/bin/simulide
''
}
popd
runHook postInstall
'';
# on darwin there are some binaries in the examples directory which
# accidentally get wrapped by wrapQtAppsHook so we do the wrapping manually instead
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/bin
wrapQtApp $out/Applications/simulide.app/Contents/MacOs/simulide
ln -s $out/Applications/simulide.app/Contents/MacOs/simulide $out/bin/simulide
'';
meta = {
description = "Simple real time electronic circuit simulator";
longDescription = ''
SimulIDE is a simple real time electronic circuit simulator, intended for hobbyist or students
to learn and experiment with analog and digital electronic circuits and microcontrollers.
It supports PIC, AVR, Arduino and other MCUs and MPUs.
'';
homepage = "https://simulide.com/";
license = lib.licenses.gpl3Only;
mainProgram = "simulide";
maintainers = with lib.maintainers; [
carloscraveiro
tomasajt
];
platforms = [
"x86_64-linux"
"x86_64-darwin"
];
};
}