From 6b23142a1b30a31bc8aca22ce4749d7eada1b870 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 8 Jun 2026 02:52:49 +0200 Subject: [PATCH 1/2] simulide: 1.1.0-SR1 -> 1.1.0-SR2 --- pkgs/by-name/si/simulide/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 3dfb24aafb63..32885ea59133 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -29,19 +29,20 @@ let }; }; "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="; + release = "SR2"; + rev = "28965e3bd6dd118598db1f5639ce1cf2e3c56e36"; + src = fetchFromGitHub { + owner = "Arcachofo"; + repo = "SimuliDE_110"; inherit rev; + hash = "sha256-Ec72OE4xBlanFFzrrGu0lTY2BEVu7slc1+ZDFr8lUT8="; }; }; "1.2.0" = rec { release = "RC1"; rev = "da3a925491fab9fa2a8633d18e45f8e1b576c9d2"; src = fetchFromGitHub { - owner = "eeTools"; + owner = "Arcachofo"; repo = "SimulIDE-dev"; hash = "sha256-6Gh0efBizDK1rUNkyU+/ysj7QwkAs3kTA1mQZYFb/pI="; inherit rev; From 1de59e443d65aa1de4921da608accced378828b7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 16 Jun 2026 13:26:24 +0200 Subject: [PATCH 2/2] simulide: use correct license above 1.1.0 --- pkgs/by-name/si/simulide/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 32885ea59133..6064a90e2e41 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -168,7 +168,8 @@ stdenv.mkDerivation { It supports PIC, AVR, Arduino and other MCUs and MPUs. ''; homepage = "https://simulide.com/"; - license = lib.licenses.gpl3Only; + license = + if lib.versionAtLeast versionNum "1.1.0" then lib.licenses.agpl3Only else lib.licenses.gpl3Only; mainProgram = "simulide"; maintainers = with lib.maintainers; [ carloscraveiro