From f7e74a43db6511b40c2730f478d5dc78c1b6fc45 Mon Sep 17 00:00:00 2001 From: RemcoSchrijver Date: Tue, 16 Apr 2024 23:44:52 +0200 Subject: [PATCH 1/3] maintainers: add RemcoSchrijver --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 62ca359b7982..b0daf0dd7295 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16807,6 +16807,13 @@ githubId = 801525; name = "rembo10"; }; + remcoschrijver = { + email = "info@writerit.nl"; + matrix = "@remcoschrijver:tchncs.de"; + github = "remcoschrijver"; + githubId = 45097990; + name = "Remco Schrijver"; + }; remexre = { email = "nathan+nixpkgs@remexre.com"; github = "remexre"; From a8a9b3df2c91aa77e63af0b9dd1b895568b9bd2e Mon Sep 17 00:00:00 2001 From: RemcoSchrijver Date: Tue, 16 Apr 2024 11:18:38 +0200 Subject: [PATCH 2/3] jetbrains.aqua: 2023.1 -> 2024.1 Public Preview --- .../editors/jetbrains/bin/versions.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index af8d8453ad7c..c269a23e8bf6 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -1,5 +1,13 @@ { "x86_64-linux": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", + "version": "2024.1 Public Preview", + "sha256": "027cac4bfab747ef97f055b63eff8a69cefc32751fcca9510c3eccaf7c36b2be", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.tar.gz", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", @@ -123,6 +131,14 @@ } }, "aarch64-linux": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", + "version": "2024.1 Public Preview", + "sha256": "ec59ff6e259ce0f03441e30a9d8bce8334d11c3ae858705d2f17375565adb80c", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.tar.gz", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", @@ -246,6 +262,14 @@ } }, "x86_64-darwin": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", + "version": "2024.1 Public Preview", + "sha256": "e90b3cc44efcabd3f31025bae506ec87da138f0a06f5cd4eaf7f96bb57db123a", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.dmg", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", @@ -369,6 +393,14 @@ } }, "aarch64-darwin": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", + "version": "2024.1 Public Preview", + "sha256": "29b975e6845b62ed466d26920fec4c9e5e74588b5ff5cf384d672b98bb602549", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.dmg", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", From ba6371aec152470ac63b196b024fe203f09b2b06 Mon Sep 17 00:00:00 2001 From: RemcoSchrijver Date: Tue, 16 Apr 2024 11:20:34 +0200 Subject: [PATCH 3/3] jetbrains.aqua: init at 2024.1 Based on request: https://github.com/NixOS/nixpkgs/issues/302799 --- pkgs/applications/editors/jetbrains/bin/ides.json | 11 +++++++++++ pkgs/applications/editors/jetbrains/default.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index b503a7c6759c..fb3fd56149e4 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -1,4 +1,15 @@ { + "aqua": { + "product": "Aqua", + "wmClass": "jetbrains-aqua", + "meta": { + "isOpenSource": false, + "description": "Test automation IDE from JetBrains", + "maintainers": [ "remcoschrijver" ], + "longDescription": "Aqua is a test automation IDE from jetbrains that can deal with many languages and frameworks to improve your test workflows. Has support for popular testing frameworks like Selenium, Cypress, and Playwright.", + "homepage": "https://www.jetbrains.com/aqua/" + } + }, "clion": { "product": "CLion", "wmClass": "jetbrains-clion", diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fa055bd83050..10d30c53de59 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -97,6 +97,8 @@ in rec { # Sorted alphabetically + aqua = mkJetBrainsProduct { pname = "aqua"; extraBuildInputs = [ stdenv.cc.cc lldb ]; }; + clion = (mkJetBrainsProduct { pname = "clion"; extraBuildInputs = lib.optionals (stdenv.isLinux) [