From 2aae7efa83467c55adba880320d000371f5444d0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:39:49 +0100 Subject: [PATCH 1/4] simulide: don't redeclare in all-packages.nix --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a608a55e6f..d1e7af5684de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17719,7 +17719,6 @@ with pkgs; simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; }; simulide_1_0_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; }; simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; }; - simulide = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; From 0dd3453251f4e7d0422fc524e809986250d73991 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:51:41 +0100 Subject: [PATCH 2/4] simulide_1_1_0: 1.1.0-SR0 -> 1.1.0-SR1 --- pkgs/by-name/si/simulide/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 1f82243942f9..0968f1f978b8 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchbzr, + fetchFromGitHub, libsForQt5, versionNum ? "1.0.0", }: @@ -28,11 +29,11 @@ let }; }; "1.1.0" = rec { - release = "SR0"; - rev = "1917"; + release = "SR1"; + rev = "2005"; src = fetchbzr { url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; - sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; + sha256 = "sha256-YVQduUjPQF5KxMlm730FZTShHP/7JEcAMIFn+mQITrQ="; inherit rev; }; }; From 1169ee8c6c0a66a4c3def5f774609f4c30bddfe2 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:57:47 +0100 Subject: [PATCH 3/4] simulide_1_2_0: init at 1.2.0-RC1 --- pkgs/by-name/si/simulide/package.nix | 15 +++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 0968f1f978b8..60a4bec5c4b3 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -37,6 +37,16 @@ let 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 @@ -71,6 +81,7 @@ let cp simulide $out/bin/simulide ''; + release' = lib.optionalString (lib.versionOlder versionNum "1.2.0") "-" + release; in stdenv.mkDerivation { @@ -84,9 +95,9 @@ stdenv.mkDerivation { -e "s|^Icon=.*$|Icon=simulide|" # Note: older versions don't have REV_NO - sed -i SimulIDE.pro \ + sed -i SimulIDE.pr* \ -e "s|^VERSION = .*$|VERSION = ${versionNum}|" \ - -e "s|^RELEASE = .*$|RELEASE = -${release}|" \ + -e "s|^RELEASE = .*$|RELEASE = ${release'}|" \ -e "s|^REV_NO = .*$|REV_NO = ${rev}|" \ -e "s|^BUILD_DATE = .*$|BUILD_DATE = ??-??-??|" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1e7af5684de..3850c71575f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17719,6 +17719,7 @@ with pkgs; simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; }; simulide_1_0_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.0.0"; }; simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; }; + simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; From efd26167c92e3d88bc541816c0109dd9e29cf902 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:12:08 +0100 Subject: [PATCH 4/4] simulide: set simulide_1_1_0 as default --- pkgs/by-name/si/simulide/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 60a4bec5c4b3..19465ee749be 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -4,7 +4,7 @@ fetchbzr, fetchFromGitHub, libsForQt5, - versionNum ? "1.0.0", + versionNum ? "1.1.0", }: let