From be76fb11c918c9b1b116e1b4ee7a84c0dcc80d28 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Wed, 10 May 2023 01:19:15 -0500 Subject: [PATCH 1/2] tlaplus: remove jdk dependency As of b5d3526, this package fetches a pre-compiled TLA+ distribution instead of compiling from source. --- pkgs/applications/science/logic/tlaplus/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index abbcd417693..5004e42a43f 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "tlaplus"; @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ adoptopenjdk-bin ]; dontUnpack = true; installPhase = '' From 886fa6e8af52f8410590c2aef9d5bbf0a7b7361b Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Wed, 10 May 2023 01:30:45 -0500 Subject: [PATCH 2/2] add myself to the maintainers list This is my second patch to the tlaplus package and I agreed to add myself as a maintainer on my next contribution. --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/science/logic/tlaplus/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 75452d43570..6b1c13a598a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10145,6 +10145,11 @@ githubId = 9469313; name = "Gregoire Martinache"; }; + mgregson = { + github = "mgregson"; + githubId = 333572; + name = "Michael Gregson"; + }; mgttlinger = { email = "megoettlinger@gmail.com"; github = "mgttlinger"; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 5004e42a43f..2d2542a607a 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ florentc thoughtpolice ]; + maintainers = with lib.maintainers; [ florentc thoughtpolice mgregson ]; }; }