diff options
Diffstat (limited to 'pkgs/development/tools')
15 files changed, 215 insertions, 78 deletions
diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 441ed8067cec4..f0d48ac331d1e 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.9"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-X3k8OTNG74Dkfwg63k08L9/ESGWKeRf9o1zNe9K5Ebg="; + hash = "sha256-ox2++MMDrqEmgGi0sawa7BQqxBJMfLfZx+61fEFPjRU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index 7044262373de2..e9d907c6f86d9 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.17.0"; + version = "4.17.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-lsqSWhozTdLPwqnwYMLxH3kF62MsUCcjzKJ7qTU79qQ="; + sha256 = "sha256-9PJ3XxEA2PEaPFE3BbZkJB8XdJmm0gZf2Ko5T9DAZBw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; + vendorHash = "sha256-03nNN1FkGee01gNOmIASc2B7mMTes1pEDc6Lo08dhcw="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 29cc7543e37fc..b0db2e0b4f4f1 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -22,6 +22,7 @@ , speechd , fontconfig , udev +, withDebug ? false , withPlatform ? "linuxbsd" , withTarget ? "editor" , withPrecision ? "single" @@ -43,14 +44,14 @@ let in stdenv.mkDerivation rec { pname = "godot4"; - version = "4.2.1-stable"; - commitHash = "b09f793f564a6c95dc76acc654b390e68441bd01"; + version = "4.2.2-stable"; + commitHash = "15073afe3856abd2aa1622492fe50026c7d63dc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-Q6Og1H4H2ygOryMPyjm6kzUB6Su6T9mJIp0alNAxvjQ="; + hash = "sha256-anJgPEeHIW2qIALMfPduBVgbYYyz1PWCmPsZZxS9oHI="; }; nativeBuildInputs = [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { platform = withPlatform; target = withTarget; precision = withPrecision; # Floating-point precision level + debug_symbols = withDebug; # Options from 'platform/linuxbsd/detect.py' pulseaudio = withPulseaudio; # Use PulseAudio @@ -125,6 +127,8 @@ stdenv.mkDerivation rec { touch = withTouch; # Enable touch events }; + dontStrip = withDebug; + outputs = [ "out" "man" ]; installPhase = '' @@ -142,12 +146,12 @@ stdenv.mkDerivation rec { cp icon.png "$out/share/icons/godot.png" ''; - meta = with lib; { + meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ shiryel ]; + maintainers = with lib.maintainers; [ shiryel superherointj ]; mainProgram = "godot4"; }; } diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 3f14b469211ac..e34160ea44a9d 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.11.2"; + version = "8.11.4"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.11.2/6a1a730/heroku-v8.11.2-6a1a730-linux-x64.tar.xz"; - hash = "sha256-dQNe4zhCp0ouSjKwfccXcODO1ZShFntewmp/jD8l1Fs="; + url = "https://cli-assets.heroku.com/versions/8.11.4/501330b/heroku-v8.11.4-501330b-linux-x64.tar.xz"; + hash = "sha256-Q8kXXsk2VGNLv4LyUqnN3Rapozac/jgkyhSnkBOcDmo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 601a568554be8..becdbd892a03e 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -15,17 +15,18 @@ , nix , nixpkgs-fmt , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nixd"; - version = "1.2.3"; + version = "2.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; - rev = version; - hash = "sha256-i/z5VnsWPWloQfdk48i+a4XaGnTMPJ6QougChkT9IWw="; + rev = finalAttrs.version; + hash = "sha256-K6atInl+/58nzMj4JJHds//HY7luBRmX79g+Arj6iUw="; }; mesonBuildType = "release"; @@ -74,19 +75,29 @@ stdenv.mkDerivation rec { # Disable nixd regression tests, because it uses some features provided by # nix, and does not correctly work in the sandbox - meson test --print-errorlogs server regression/nix-ast-dump + meson test --print-errorlogs unit/libnixf/Basic unit/libnixf/Parse unit/libnixt runHook postCheck ''; passthru.updateScript = nix-update-script { }; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "libnixf" "libnixt" ]; + }; + }; + meta = { description = "Nix language server"; homepage = "https://github.com/nix-community/nixd"; - changelog = "https://github.com/nix-community/nixd/releases/tag/${version}"; + changelog = "https://github.com/nix-community/nixd/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth marsam ]; mainProgram = "nixd"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7acf37c5ccf83..99f51272c573b 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.3.8"; + version = "4.4.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-8sUXJExg1CApMbF95Lx3B/mnOJ5Y6HAck8+0UgF0bdc="; + sha256 = "sha256-hoy7hvabXvrU/ZcW9dRJnO1l4fnOIFpbgvAZ+CBnSbA="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 37029689e63f0..972f137034415 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,6 +43,7 @@ , cacert , glibcLocales , fetchFromGitHub +, fetchpatch2 , nixosTests }: @@ -205,6 +206,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + # https://github.com/NixOS/hydra/security/advisories/GHSA-2p75-6g9f-pqgx + (fetchpatch2 { + name = "CVE-2024-32657.patch"; + url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch"; + hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU="; + }) + ]; + postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index b68fc0deafe8a..24a0df088d678 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-UrymfiuaQ6k2MSwq/ZhtdsaSzc3uRzIsdq/Wepeo5+I="; + hash = "sha256-kVLB1ruWOWGmCyEgHj8wtA7GwbdKiCYo7n4anVyKM5Y="; }; - vendorHash = "sha256-yWRfYzctunXRHN9j3K7KUUAsJhs2bUzgPb+u6SjuAlk="; + vendorHash = "sha256-Vwa3km9CAq3Zik7dXWeHOnkIbL0eAwuKJ+bkw2lDe5k="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 64562c17f5a0a..56b07f8aee0f4 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.20.0"; + version = "19.21.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f85CKfYPNh06eVHu5nn4MhX5wuptpJCmvSiPHWGzjkg="; + hash = "sha256-Vhqk7U4FKl9r7WMX/FJ/4LEtuTUsZquM98A+nQRFqMQ="; }; - vendorHash = "sha256-SeeVHqeQCfOJTNfWIfTd71jGk5mYH5HRArUosZqRreY="; + vendorHash = "sha256-rcw9HgN677NxrMZDrpNFLHNyHdlRXvgxCtQnLt0TRLw="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 33204d80b9d23..fd83af91f15e7 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.3.0"; + version = "24.4.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-FlD2bSCNToyXLiMb4c2tJYJxHN4QORMJPeFPuFpjMEM="; + hash = "sha256-u59NnxDFQN92BMkm2sHy8OhundFJElJ2H1SgdeLpOMs="; }; - cargoHash = "sha256-GJFUSOAY6F0ZmqF/9SHOGMNFssfHUdFIcsgz6JwZuqE="; + cargoHash = "sha256-7dLpqhT3v7b0I1wmn7Q6IL1M5Ul/Mu9xxrdwlI2xKAs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index fa6bc5ce3634d..2c3269681d7e4 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-5+UE1Ka2pciuNrkrPDCJMp12+IUbgq7k3cKSP5pahw4="; + hash = "sha256-iumHMVDlgwjjQsn0aoSJUPoOKmLztD47b7he2nJhins="; }; - cargoHash = "sha256-GuajrFdPlgneL95eWT3n2MdzfsbuID/pI9ED8TlVOCo="; + cargoHash = "sha256-/mrVrbPHi4lo2iu/IWwDYIjqWZYNkm/4lWpRMLKBNpA="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 02a06edf5d238..a7737222d3480 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-P0/c9GTQRdErwE3/uuZpMqiTl/nFGSaHoWGRtBDjc8M="; + hash = "sha256-sqBZVCVJkgqCK5JcNcJ6kKxL26XGxOA1uDlOOt/+iDo="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-+uRjitfaSbjsO1yO5NL3gw+qjx4neiht3BDvWltogX0="; + cargoHash = "sha256-g1uDF7lL9dmZY5J8uNDAsA8dG5IVrV7MumN1w+fk1/8="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index e10ebf1e5519d..6e0b80497f4bd 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -1,80 +1,104 @@ -{ lib, stdenv, fetchFromGitHub, openjdk20, maven, makeDesktopItem, copyDesktopItems, makeWrapper, glib, wrapGAppsHook }: +{ lib +, jdk21 +, maven +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, glib +, makeWrapper +, wrapGAppsHook +}: let - jdk = openjdk20.override (lib.optionalAttrs stdenv.isLinux { + jdk = jdk21.override { enableJavaFX = true; - }); + }; maven' = maven.override { inherit jdk; }; - selectSystem = attrs: - attrs.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in maven'.buildMavenPackage rec { pname = "scenebuilder"; - version = "20.0.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "gluonhq"; - repo = pname; + repo = "scenebuilder"; rev = version; - hash = "sha256-Og+dzkJ6+YH0fD4HJw8gUKGgvQuNw17BxgzZMP/bEA0="; + hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA="; }; - buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date - mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; - mvnHash = selectSystem { - x86_64-linux = "sha256-QwxA3lKVkRG5CV2GIwfVFPOj112pHr7bDlZJD6KwrHc="; - aarch64-linux = "sha256-cO5nHSvv2saBuAjq47A+GW9vFWEM+ysXyZgI0Oe/F70="; - }; + patches = [ + # makes the mvnHash platform-independent + ./pom-remove-javafx.patch + + # makes sure that maven upgrades don't change the mvnHash + ./fix-default-maven-plugin-versions.patch + ]; + + postPatch = '' + # set the build timestamp to $SOURCE_DATE_EPOCH + substituteInPlace app/pom.xml \ + --replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" + ''; + + mvnParameters = toString [ + "-Dmaven.test.skip" + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" + ]; - nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ]; + mvnHash = "sha256-fS7dS2Q4ORThLBwDOzJJnRboNNRmhp0RG6Dae9fl+pw="; + + nativeBuildInputs = [ + copyDesktopItems + glib + makeWrapper + wrapGAppsHook + ]; dontWrapGApps = true; # prevent double wrapping installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/java $out/share/{${pname},icons/hicolor/128x128/apps} - cp app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/java/${pname}.jar - - cp app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png + install -Dm644 app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/scenebuilder/scenebuilder.jar + install -Dm644 app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png runHook postInstall ''; postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/${pname} \ + makeWrapper ${jdk}/bin/java $out/bin/scenebuilder \ --add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \ --add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \ - --add-flags "-cp $out/share/java/${pname}.jar" \ - --add-flags "com.oracle.javafx.scenebuilder.app.SceneBuilderApp" \ + --add-flags "-jar $out/share/scenebuilder/scenebuilder.jar" \ "''${gappsWrapperArgs[@]}" - ''; - - desktopItems = [ (makeDesktopItem { - name = "scenebuilder"; - exec = "scenebuilder"; - icon = "scenebuilder"; - comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = "Scene Builder"; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" ]; - }) ]; + ''; + + desktopItems = [ + (makeDesktopItem { + name = "scenebuilder"; + exec = "scenebuilder"; + icon = "scenebuilder"; + comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; + }) + ]; meta = with lib; { - broken = stdenv.isDarwin; + changelog = "https://github.com/gluonhq/scenebuilder/releases/tag/${src.rev}"; description = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - mainProgram = "scenebuilder"; homepage = "https://gluonhq.com/products/scene-builder/"; + license = licenses.bsd3; + mainProgram = "scenebuilder"; + maintainers = with maintainers; [ wirew0rm ]; + platforms = jdk.meta.platforms; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; - license = licenses.bsd3; - maintainers = with maintainers; [ wirew0rm ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch new file mode 100644 index 0000000000000..be5e590694a02 --- /dev/null +++ b/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch @@ -0,0 +1,60 @@ +diff --git a/pom.xml b/pom.xml +index 193f7ca..45faa1a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -137,6 +137,55 @@ + </plugins> + </pluginManagement> + <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.3.0</version> ++ <executions> ++ <execution> ++ <id>require-all-plugin-versions-to-be-set</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>3.3.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>4.0.0-M13</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <version>3.2.5</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.3.0</version> ++ </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> diff --git a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch new file mode 100644 index 0000000000000..6c9c9784d0375 --- /dev/null +++ b/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch @@ -0,0 +1,28 @@ +diff --git a/kit/pom.xml b/kit/pom.xml +index 644d36c..e4d91fb 100644 +--- a/kit/pom.xml ++++ b/kit/pom.xml +@@ -11,23 +11,6 @@ + </parent> + + <dependencies> +- <!-- JavaFX --> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-fxml</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-web</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-swing</artifactId> +- <version>${javafx.version}</version> +- </dependency> +- + <!-- Eclipse Aether --> + <dependency> + <groupId>org.eclipse.aether</groupId> |