From 558dafdd0dd0c8f167a00413fe5c82ea94dfde8e Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 02:17:32 +0000 Subject: [PATCH] javacard-devkit: drop Had a dependency on the Oracle JDK, as well as being several years out-of-date. --- .../manual/release-notes/rl-2411.section.md | 3 + .../compilers/javacard-devkit/default.nix | 70 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 pkgs/development/compilers/javacard-devkit/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 2e6547528341..6e3fd6844f03 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -342,6 +342,9 @@ nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `javacard-devkit` was dropped due to having a dependency on the Oracle JDK, + as well as being several years out-of-date. + - Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`. This refactor makes it possible to also disable feature gates, without having to use `extraOpts` flags. diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix deleted file mode 100644 index c9e9b34e6ee0..000000000000 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "javacard-devkit"; - version = "2.2.2"; - uscoreVersion = builtins.replaceStrings ["."] ["_"] version; - - src = requireFile { - name = "java_card_kit-${uscoreVersion}-linux.zip"; - url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" - + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; - sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; - }; - - nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; - buildInputs = [ pcsclite ]; - - zipPrefix = "java_card_kit-${uscoreVersion}"; - - sourceRoot = "."; - unpackCmd = '' - unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x - ''; - - installPhase = '' - mkdir -p "$out/share/$pname" - cp -rt "$out/share/$pname" api_export_files - cp -rt "$out" lib - - for i in bin/*; do - case "$i" in - *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; - *) target="$out/bin/$(basename "$i")" - install -vD "$i" "$target" - sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" - wrapProgram "$target" \ - --set JAVA_HOME "$JAVA_HOME" \ - --prefix CLASSPATH : "$out/share/$pname/api_export_files" - ;; - esac - done - - makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ - --prefix CLASSPATH : "$out/lib/api.jar" - ''; - - meta = { - description = "Official development kit by Oracle for programming for the Java Card platform"; - longDescription = '' - This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. - - Instructions for usage: - - First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): - javacardc -source 1.5 -target 1.5 [MyJavaFile].java - Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): - CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu - Finally, convert the '.class' file into a '.cap': - converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] - For more details, please refer to the documentation by Oracle - ''; - homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ekleog ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cfbc05fa7739..1555b1df45b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -536,6 +536,7 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 + javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01 jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae20f332ec2..fc0201cb32f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15041,8 +15041,6 @@ with pkgs; jna = callPackage ../development/java-modules/jna { }; - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper { }; inherit (callPackage ../development/compilers/julia { })