diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-09-26 18:49:33 +0100 |
---|---|---|
committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-09-27 10:25:45 +0100 |
commit | 3e9ecc840b778c82db5288b2239bac2612ebf1e4 (patch) | |
tree | f629a91bd29780e6bf2892bf666cca1372b179bd /pkgs/development/compilers/graalvm | |
parent | 8374f4d7934054d3c6e0bacaafd54e93fa89dd93 (diff) | |
download | nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar.gz nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar.bz2 nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar.lz nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar.xz nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.tar.zst nixpkgs-3e9ecc840b778c82db5288b2239bac2612ebf1e4.zip |
graalvmCEPackages: reorganize each product in its own subdirectory
Diffstat (limited to 'pkgs/development/compilers/graalvm')
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix (renamed from pkgs/development/compilers/graalvm/community-edition/graaljs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix (renamed from pkgs/development/compilers/graalvm/community-edition/hashes-graaljs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix (renamed from pkgs/development/compilers/graalvm/community-edition/graalnodejs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix (renamed from pkgs/development/compilers/graalvm/community-edition/hashes-graalnodejs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix (renamed from pkgs/development/compilers/graalvm/community-edition/graalpy.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix (renamed from pkgs/development/compilers/graalvm/community-edition/hashes-graalpy.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix (renamed from pkgs/development/compilers/graalvm/community-edition/hashes-graalvm-ce.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix (renamed from pkgs/development/compilers/graalvm/community-edition/truffleruby.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix (renamed from pkgs/development/compilers/graalvm/community-edition/hashes-truffleruby.nix) | 0 | ||||
-rwxr-xr-x | pkgs/development/compilers/graalvm/community-edition/update.sh | 4 |
11 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index bae45348767..726db815fe4 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -20,9 +20,10 @@ let "aarch64-darwin" = "macos-aarch64"; "x86_64-darwin" = "macos-x64"; }; - version = product: (import (./. + "/hashes-${product}.nix")).version; - source = product: (import (./. + "/hashes-${product}.nix")).${product}.${javaPlatform.${stdenv.system}} - or (import (./. + "/hashes-${product}.nix")).${product}.${javaPlatformForProducts.${stdenv.system}} + hashes = product: (import (./. + "/${product}/hashes.nix")); + version = product: (hashes product).version; + source = product: (hashes product).${product}.${javaPlatform.${stdenv.system}} + or (hashes product).${product}.${javaPlatformForProducts.${stdenv.system}} or (throw "Unsupported product combination: product=${product} system=${stdenv.system}"); in rec { @@ -34,22 +35,22 @@ rec { meta.platforms = builtins.attrNames javaPlatform; }; - graaljs = callPackage ./graaljs.nix { + graaljs = callPackage ./graaljs { version = version "graaljs"; src = fetchurl (source "graaljs"); }; - graalnodejs = callPackage ./graalnodejs.nix { + graalnodejs = callPackage ./graalnodejs { version = "21"; src = fetchurl (source "graalnodejs"); }; - graalpy = callPackage ./graalpy.nix { + graalpy = callPackage ./graalpy { version = version "graalpy"; src = fetchurl (source "graalpy"); }; - truffleruby = callPackage ./truffleruby.nix { + truffleruby = callPackage ./truffleruby { version = version "truffleruby"; src = fetchurl (source "truffleruby"); }; diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix index 00aafa51d7c..00aafa51d7c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes-graaljs.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix index 5ecfc4dffdd..5ecfc4dffdd 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes-graaljs.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix index cc38253657c..cc38253657c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes-graalnodejs.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix index b9679ae0c3b..b9679ae0c3b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes-graalnodejs.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix index 3526f9fc0b3..3526f9fc0b3 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes-graalpy.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index 3e543b44569..3e543b44569 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes-graalpy.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes-graalvm-ce.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index e98e8715300..e98e8715300 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes-graalvm-ce.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index bb4a00325b7..bb4a00325b7 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes-truffleruby.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix index ba99286d6a1..ba99286d6a1 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes-truffleruby.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 8c648f996d9..23c36c91a67 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -29,9 +29,11 @@ verlte() { } readonly product="${1:-graalvm-ce}" -readonly hashes_nix="hashes-$product.nix" +readonly hashes_nix="$product/hashes.nix" readonly nixpkgs=../../../../.. +mkdir -p "$product" + declare -r -A update_urls=( [graalvm-ce]="https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest" [graaljs]="https://api.github.com/repos/oracle/graaljs/releases/latest" |