From a89407bf011bca055b7b921e2f4889cf41092609 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Oct 2024 06:40:32 +0300 Subject: [PATCH 1/2] antares: modernize derivation --- pkgs/by-name/an/antares/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index e5cc1e500a47..e4d468c85774 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -15,7 +15,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "antares-sql"; repo = "antares"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g="; }; @@ -66,10 +66,11 @@ buildNpmPackage rec { }) ]; - meta = with lib; { + meta = { description = "Modern, fast and productivity driven SQL client with a focus in UX"; homepage = "https://github.com/antares-sql/antares"; - license = licenses.mit; - maintainers = with maintainers; [ eymeric ]; + changelog = "https://github.com/antares-sql/antares/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eymeric ]; }; } From eef5536acb98956019ae3c5a8e8b205d99822cef Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Oct 2024 06:41:34 +0300 Subject: [PATCH 2/2] antares: remove redundant Electron override As far as I'm concerned all (currently) available Electron versions are supported, so we can remove the override. Should an issue arise, the override can be added back. --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5830b3edb7f..69810a66296d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16853,10 +16853,6 @@ with pkgs; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; - antares = callPackage ../by-name/an/antares/package.nix { - electron = electron_30; - }; - antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };