From 8471a8a809bf1795c34f6c4e28d3e98aebcc47cf Mon Sep 17 00:00:00 2001 From: depsterr Date: Mon, 6 Jan 2025 21:36:08 +0100 Subject: [PATCH] rollback graalvm for MCSR --- flake.nix | 13 ++----------- home-manager/applications.nix | 2 +- pkgs/graalvm.nix | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 pkgs/graalvm.nix diff --git a/flake.nix b/flake.nix index ed34c02..22edf8c 100644 --- a/flake.nix +++ b/flake.nix @@ -57,17 +57,7 @@ cornelis-vim = cornelis.packages.${system}.cornelis-vim; rc2nix = plasma-manager.packages.${system}.rc2nix; nixprof = nixprof.packages.${system}.nixprof; - sax2nf = self.packages.${system}.sax2nf; - bqn-vim = self.packages.${system}.bqn-vim; - bqn-nvim = self.packages.${system}.bqn-nvim; - shell-menu = self.packages.${system}.shell-menu; - pash = self.packages.${system}.pash; - cpypsk = self.packages.${system}.cpypsk; - renoise = self.packages.${system}.renoise; - wall = self.packages.${system}.wall; - protonmail-desktop = self.packages.${system}.protonmail-desktop; - eyezoom = self.packages.${system}.eyezoom; - }; + } // self.packages.${system}; inherit config; }; }; @@ -137,6 +127,7 @@ wall = import ./pkgs/wall.nix { inherit pkgs; }; protonmail-desktop = import ./pkgs/protonmail-desktop.nix { inherit pkgs; }; eyezoom = import ./pkgs/eyezoom.nix { inherit pkgs; }; + graalvm = import ./pkgs/graalvm.nix { inherit pkgs; }; }; }); } diff --git a/home-manager/applications.nix b/home-manager/applications.nix index 4ec1f6e..e4ee3a6 100644 --- a/home-manager/applications.nix +++ b/home-manager/applications.nix @@ -54,7 +54,6 @@ rink ttyper idris2 - graalvm-ce vimv lean4 remmina @@ -86,5 +85,6 @@ ] else []) ++ (if config.mcsr then [ pkgs.prismlauncher + extra.graalvm ] else []); } diff --git a/pkgs/graalvm.nix b/pkgs/graalvm.nix new file mode 100644 index 0000000..35645a4 --- /dev/null +++ b/pkgs/graalvm.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +let hashes = { + "version" = "22.0.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "01097qag9kjjwh3q11j76bn79x80dm8h5rdd6gzwrsqhn48hx6ns"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-aarch64_bin.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0mq6vdsfgas8lhz1vdiz8qya37fy7qn0078q30zpa09ila3b9vp5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1l8h9ai7s4km8wx1x43s3barnbq7b6hzfr1mbbmiksng1d2p26v9"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-x64_bin.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "11ncf4wd5asr3jz21fs0j5w49zxrsdw3j42mpcczjy2z1j813cc7"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-aarch64_bin.tar.gz"; + }; + }; +}; in +pkgs.graalvm-ce.overrideAttrs (old: { + src = builtins.fetchurl hashes.hashes.${pkgs.stdenv.system}; + version = hashes.version; +})