commit f865ed612f8d9a3d91ee96a047affa1f21dd44b8 · pyrox.dev/nixpkgs

+33 -17

pkgs/development/compilers/graalvm/community-edition/repository.nix

···

       130
       130
        
             unpack_jar ''${arr[4]}

     

       131
       131
        
           '';

     

       132
       132
        
       

     

       133
       133
       -
           installPhase = {

     

       134
       134
       -
             "8-linux-amd64" = ''

     

       133
       133
       +
           outputs = [ "out" "lib" ];

     

       134
       134
       +
       

     

       135
       135
       +
           installPhase = let

     

       136
       136
       +
             nativePRNGWorkaround = path: ''

     

       135
       137
        
               # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html

     

       136
       136
       -
               substituteInPlace $out/jre/lib/security/java.security \

     

       138
       138
       +
               substituteInPlace ${path} \

     

       137
       139
        
                 --replace file:/dev/random    file:/dev/./urandom \

     

       138
       140
        
                 --replace NativePRNGBlocking  SHA1PRNG

     

       139
       139
       -
       

     

       141
       141
       +
             '';

     

       142
       142
       +
             copyClibrariesToOut = basepath: ''

     

       140
       143
        
               # provide libraries needed for static compilation

     

       141
       144
        
               for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do

     

       142
       142
       -
                 ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f)

     

       145
       145
       +
                 ln -s $f ${basepath}/${platform}/$(basename $f)

     

       143
       146
        
               done

     

       147
       147
       +
             '';

     

       148
       148
       +
       

     

       149
       149
       +
             copyClibrariesToLib = ''

     

       150
       150
       +
               # add those libraries to $lib output too, so we can use them with

     

       151
       151
       +
               # `native-image -H:CLibraryPath=''${graalvm11-ce.lib}/lib ...` and reduce

     

       152
       152
       +
               # closure size by not depending on GraalVM $out (that is much bigger)

     

       153
       153
       +
               mkdir -p $lib/lib

     

       154
       154
       +
               for f in ${glibc}/lib/*; do

     

       155
       155
       +
                 ln -s $f $lib/lib/$(basename $f)

     

       156
       156
       +
               done

     

       157
       157
       +
             '';

     

       158
       158
       +
           in {

     

       159
       159
       +
             "8-linux-amd64" = ''

     

       160
       160
       +
               ${nativePRNGWorkaround "$out/jre/lib/security/java.security"}

     

       161
       161
       +
       

     

       162
       162
       +
               ${copyClibrariesToOut "$out/jre/lib/svm/clibraries"}

     

       163
       163
       +
       

     

       164
       164
       +
               ${copyClibrariesToLib}

     

       144
       165
        
       

     

       145
       166
        
               # allow using external truffle-api.jar and languages not included in the distrubution

     

       146
       167
        
               rm $out/jre/lib/jvmci/parentClassLoader.classpath

     

       147
       168
        
             '';

     

       148
       169
        
             "11-linux-amd64" = ''

     

       149
       149
       -
               # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html

     

       150
       150
       -
               substituteInPlace $out/conf/security/java.security \

     

       151
       151
       -
                 --replace file:/dev/random    file:/dev/./urandom \

     

       152
       152
       -
                 --replace NativePRNGBlocking  SHA1PRNG

     

       170
       170
       +
               ${nativePRNGWorkaround "$out/conf/security/java.security"}

     

       171
       171
       +
       

     

       172
       172
       +
               ${copyClibrariesToOut "$out/lib/svm/clibraries"}

     

       153
       173
        
       

     

       154
       154
       -
               # provide libraries needed for static compilation

     

       155
       155
       -
               for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do

     

       156
       156
       -
                 ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f)

     

       157
       157
       -
               done

     

       174
       174
       +
               ${copyClibrariesToLib}

     

       158
       175
        
             '';

     

       159
       176
        
             "11-darwin-amd64" = ''

     

       160
       160
       -
               # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html

     

       161
       161
       -
               substituteInPlace $out/conf/security/java.security \

     

       162
       162
       -
                 --replace file:/dev/random    file:/dev/./urandom \

     

       163
       163
       -
                 --replace NativePRNGBlocking  SHA1PRNG

     

       177
       177
       +
               # create empty $lib/lib to avoid breaking builds

     

       178
       178
       +
               mkdir -p $lib/lib

     

       179
       179
       +
               ${nativePRNGWorkaround "$out/conf/security/java.security"}

     

       164
       180
        
             '';

     

       165
       181
        
           }.${javaVersionPlatform} + ''

     

       166
       182
        
             # jni.h expects jni_md.h to be in the header search path.

+1

pkgs/development/interpreters/clojure/babashka.nix

···

       23
       23
        
       

     

       24
       24
        
           # https://github.com/babashka/babashka/blob/v0.6.1/script/compile#L41-L52

     

       25
       25
        
           args=("-jar" "$BABASHKA_JAR"

     

       26
       26
       +
                 "-H:CLibraryPath=${graalvm11-ce.lib}/lib"

     

       26
       27
        
                 # Required to build babashka on darwin. Do not remove.

     

       27
       28
        
                 "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"

     

       28
       29
        
                 "-H:Name=$BABASHKA_BINARY"

+16 -22

pkgs/development/tools/clj-kondo/default.nix

···

       4
       4
        
         pname = "clj-kondo";

     

       5
       5
        
         version = "2021.09.25";

     

       6
       6
        
       

     

       7
       7
       -
         reflectionJson = fetchurl {

     

       8
       8
       -
           name = "reflection.json";

     

       9
       9
       -
           url = "https://raw.githubusercontent.com/clj-kondo/${pname}/v${version}/reflection.json";

     

       10
       10
       -
           sha256 = "sha256-C4QYk5lLienCHKnWXXZPcKmsCTMtIIkXOkvCrZfyIhA=";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       7
        
         src = fetchurl {

     

       14
       8
        
           url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";

     

       15
       9
        
           sha256 = "sha256-kS6bwsYH/cbjJlIeiDAy6QsAw+D1uHp26d4NBLfStjg=";

     
···

       20
       14
        
         buildInputs = [ graalvm11-ce ];

     

       21
       15
        
       

     

       22
       16
        
         buildPhase = ''

     

       23
       23
       -
           native-image  \

     

       24
       24
       -
             -jar ${src} \

     

       25
       25
       -
             -H:Name=clj-kondo \

     

       26
       26
       -
             ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \

     

       27
       27
       -
             -H:+ReportExceptionStackTraces \

     

       28
       28
       -
             -J-Dclojure.spec.skip-macros=true \

     

       29
       29
       -
             -J-Dclojure.compiler.direct-linking=true \

     

       30
       30
       -
             "-H:IncludeResources=clj_kondo/impl/cache/built_in/.*" \

     

       31
       31
       -
             -H:ReflectionConfigurationFiles=${reflectionJson} \

     

       32
       32
       -
             --initialize-at-build-time  \

     

       33
       33
       -
             -H:Log=registerResource: \

     

       34
       34
       -
             --verbose \

     

       35
       35
       -
             --no-fallback \

     

       36
       36
       -
             --no-server \

     

       37
       37
       -
             "-J-Xmx3g"

     

       17
       17
       +
           runHook preBuild

     

       18
       18
       +
       

     

       19
       19
       +
           # https://github.com/clj-kondo/clj-kondo/blob/v2021.09.25/script/compile#L17-L21

     

       20
       20
       +
           args=("-jar" "$src"

     

       21
       21
       +
                 "-H:CLibraryPath=${graalvm11-ce.lib}/lib"

     

       22
       22
       +
                 # Required to build babashka on darwin. Do not remove.

     

       23
       23
       +
                 "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"

     

       24
       24
       +
                 "-H:+ReportExceptionStackTraces"

     

       25
       25
       +
                 "--verbose"

     

       26
       26
       +
                 "--no-fallback"

     

       27
       27
       +
                 "-J-Xmx3g")

     

       28
       28
       +
       

     

       29
       29
       +
            native-image ''${args[@]}

     

       30
       30
       +
       

     

       31
       31
       +
            runHook postBuild

     

       38
       32
        
         '';

     

       39
       33
        
       

     

       40
       34
        
         installPhase = ''

     
···

       47
       41
        
           homepage = "https://github.com/clj-kondo/clj-kondo";

     

       48
       42
        
           license = licenses.epl10;

     

       49
       43
        
           platforms = graalvm11-ce.meta.platforms;

     

       50
       50
       -
           maintainers = with maintainers; [ jlesquembre bandresen ];

     

       44
       44
       +
           maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ];

     

       51
       45
        
         };

     

       52
       46
        
       }

+10 -1

pkgs/development/tools/misc/clojure-lsp/default.nix

···

       25
       25
        
         buildPhase = with lib; ''

     

       26
       26
        
           runHook preBuild

     

       27
       27
        
       

     

       28
       28
       -
           bash ./graalvm/native-unix-compile.sh

     

       28
       28
       +
           # https://github.com/clojure-lsp/clojure-lsp/blob/2021.09.30-15.28.01/graalvm/native-unix-compile.sh#L19-L24

     

       29
       29
       +
           args=("-jar" "$CLOJURE_LSP_JAR"

     

       30
       30
       +
                 "-H:CLibraryPath=${graalvm11-ce.lib}/lib"

     

       31
       31
       +
                 "-H:+ReportExceptionStackTraces"

     

       32
       32
       +
                 "--verbose"

     

       33
       33
       +
                 "--no-fallback"

     

       34
       34
       +
                 "--native-image-info"

     

       35
       35
       +
                 "$CLOJURE_LSP_XMX")

     

       36
       36
       +
       

     

       37
       37
       +
           native-image ''${args[@]}

     

       29
       38
        
       

     

       30
       39
        
           runHook postBuild

     

       31
       40
        
         '';

+1

pkgs/development/tools/zprint/default.nix

···

       24
       24
        
           -H:Name=${pname} \

     

       25
       25
        
           -H:EnableURLProtocols=https,http \

     

       26
       26
        
           -H:+ReportExceptionStackTraces \

     

       27
       27
       +
           -H:CLibraryPath=${graalvm11-ce.lib}/lib \

     

       27
       28
        
           ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \

     

       28
       29
        
           --report-unsupported-elements-at-runtime \

     

       29
       30
        
           --initialize-at-build-time \