From dcc123b7336b827bb1f06ff2288b9ea94f0cc21c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 29 May 2024 03:55:01 -0300 Subject: [PATCH] dbqn: migrate to by-name (#314612) Also, changed the default `buildNativeImage` to false, in order not to bring graalvm-ce as a dependency by accident. --- .../dzaima-bqn/default.nix => by-name/db/dbqn/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/{development/interpreters/bqn/dzaima-bqn/default.nix => by-name/db/dbqn/package.nix} (98%) diff --git a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/pkgs/by-name/db/dbqn/package.nix similarity index 98% rename from pkgs/development/interpreters/bqn/dzaima-bqn/default.nix rename to pkgs/by-name/db/dbqn/package.nix index b6591825f887..240729a46513 100644 --- a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , jdk , makeWrapper -, buildNativeImage ? true +, buildNativeImage ? false }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf55a0103420..ec218ca0fa15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17116,12 +17116,13 @@ with pkgs; }; }; - dbqn = callPackage ../development/interpreters/bqn/dzaima-bqn { + dbqn = callPackage ../by-name/db/dbqn/package.nix { buildNativeImage = false; - stdenv = stdenvNoCC; jdk = jre; + stdenv = stdenvNoCC; }; - dbqn-native = callPackage ../development/interpreters/bqn/dzaima-bqn { + + dbqn-native = dbqn.override { buildNativeImage = true; jdk = graalvm-ce; };