digital: 0.29 -> 0.30

Changelog: https://github.com/hneemann/Digital/releases/tag/v0.30

    - Added a search function
    - Added a presentation mode.
    - Adds Q and CTRL-Q hotkeys to copy the component the mouse
    - pointer is hovering over.
    - Now there is resetRandom method available in the test code to
    - reset the random number generator used by the random function.
    - The remote server is now disabled by default.
    - It must be enabled in the settings.
    - When a new component has been placed with CRTL click,
    - you can place another one.
    - Fixes the ignored default value in demuxer HDL export.
This commit is contained in:
Paul Dettorer Hervot 2023-02-05 11:29:14 +01:00
parent 489843eab7
commit 8025367cd6
2 changed files with 8 additions and 45 deletions

View file

@ -4,8 +4,8 @@
let
pkgDescription = "A digital logic designer and circuit simulator.";
version = "0.29";
buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date
version = "0.30";
buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date
desktopItem = makeDesktopItem {
type = "Application";
@ -24,7 +24,8 @@ let
# inspect the .git folder to find the version number we are building, we then
# provide that version number manually as a property.
# (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481)
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}";
# Also use the commit date as a build and output timestamp.
mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
in
stdenv.mkDerivation rec {
pname = "digital";
@ -33,20 +34,16 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "hneemann";
repo = "Digital";
rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c";
sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg=";
rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6";
sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM=";
};
# Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to
# a version where they support reproducible builds
patches = [ ./pom.xml.patch ];
# Fetching maven dependencies from "central" needs the network at build phase,
# we do that in this extra derivation that explicitely specifies its
# outputHash to ensure determinism.
mavenDeps = stdenv.mkDerivation {
name = "${pname}-${version}-maven-deps";
inherit src nativeBuildInputs version patches postPatch;
inherit src nativeBuildInputs version;
dontFixup = true;
buildPhase = ''
mvn package ${mvnOptions} -Dmaven.repo.local=$out
@ -62,15 +59,11 @@ stdenv.mkDerivation rec {
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI=";
outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE=";
};
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
postPatch = ''
substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}"
'';
buildPhase = ''
mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps}
'';

View file

@ -1,30 +0,0 @@
diff --git a/pom.xml b/pom.xml
index d5f8330b4..58ed18b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<manifest>
@@ -188,6 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.2.0</version>
<configuration>
<finalName>Digital</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -202,7 +204,7 @@
</manifest>
<manifestEntries>
<Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision>
- <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Time>@buildDate@</Build-Time>
<SplashScreen-Image>icons/splash.png</SplashScreen-Image>
</manifestEntries>
</archive>