commit 60aaad9e31f73396365a064294e3a172073e86b4 · pyrox.dev/nixpkgs

pkgs/build-support/build-graalvm-native-image/default.nix

···

       13
       13
        
       , nativeImageBuildArgs ? [

     

       14
       14
        
           (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain")

     

       15
       15
        
           "-H:Name=${executable}"

     

       16
       16
       +
           "-march=compatibility"

     

       16
       17
        
           "--verbose"

     

       17
       18
        
         ]

     

       18
       19
        
         # Extra arguments to be passed to the native-image

+15

pkgs/development/interpreters/babashka/clojure-tools.nix

···

       1
       1
       +
       # This file tracks the Clojure tools version required by babashka.

     

       2
       2
       +
       # See https://github.com/borkdude/deps.clj#deps_clj_tools_version for background.

     

       3
       3
       +
       # The `updateScript` provided in default.nix takes care of keeping it in sync, as well.

     

       4
       4
       +
       { clojure

     

       5
       5
       +
       , fetchurl

     

       6
       6
       +
       }:

     

       7
       7
       +
       clojure.overrideAttrs (previousAttrs: {

     

       8
       8
       +
         pname = "babashka-clojure-tools";

     

       9
       9
       +
         version = "1.11.1.1403";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchurl {

     

       12
       12
       +
           url = previousAttrs.src.url;

     

       13
       13
       +
           hash = "sha256-bVNHEEzpPanPF8pfDP51d13bxv9gZGzqczNmFQOk6zI=";

     

       14
       14
       +
         };

     

       15
       15
       +
       })

+88 -73

pkgs/development/interpreters/babashka/default.nix

···

       6
       6
        
       , writeScript

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
       -
       buildGraalvmNativeImage rec {

     

       10
       10
       -
         pname = "babashka-unwrapped";

     

       11
       11
       -
         version = "1.3.184";

     

       9
       9
       +
       let

     

       10
       10
       +
         babashka-unwrapped = buildGraalvmNativeImage rec {

     

       11
       11
       +
           pname = "babashka-unwrapped";

     

       12
       12
       +
           version = "1.3.184";

     

       13
       13
       +
       

     

       14
       14
       +
           src = fetchurl {

     

       15
       15
       +
             url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";

     

       16
       16
       +
             sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ=";

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           graalvmDrv = graalvmCEPackages.graalvm-ce;

     

       12
       20
        
       

     

       13
       13
       -
         src = fetchurl {

     

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

     

       15
       15
       -
           sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ=";

     

       16
       16
       -
         };

     

       21
       21
       +
           executable = "bb";

     

       17
       22
        
       

     

       18
       18
       -
         graalvmDrv = graalvmCEPackages.graalvm-ce;

     

       23
       23
       +
           nativeBuildInputs = [ removeReferencesTo ];

     

       19
       24
        
       

     

       20
       20
       -
         executable = "bb";

     

       25
       25
       +
           extraNativeImageBuildArgs = [

     

       26
       26
       +
             "-H:+ReportExceptionStackTraces"

     

       27
       27
       +
             "--no-fallback"

     

       28
       28
       +
             "--native-image-info"

     

       29
       29
       +
             "--enable-preview"

     

       30
       30
       +
           ];

     

       21
       31
        
       

     

       22
       22
       -
         nativeBuildInputs = [ removeReferencesTo ];

     

       32
       32
       +
           doInstallCheck = true;

     

       23
       33
        
       

     

       24
       24
       -
         extraNativeImageBuildArgs = [

     

       25
       25
       -
           "-H:+ReportExceptionStackTraces"

     

       26
       26
       -
           "--no-fallback"

     

       27
       27
       -
           "--native-image-info"

     

       28
       28
       -
           "--enable-preview"

     

       29
       29
       -
         ];

     

       34
       34
       +
           installCheckPhase = ''

     

       35
       35
       +
             $out/bin/bb --version | grep '${version}'

     

       36
       36
       +
             $out/bin/bb '(+ 1 2)' | grep '3'

     

       37
       37
       +
             $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'

     

       38
       38
       +
           '';

     

       30
       39
        
       

     

       31
       31
       -
         doInstallCheck = true;

     

       40
       40
       +
           # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology,

     

       41
       41
       +
           # not sure the implications of this but this file is not available in

     

       42
       42
       +
           # graalvm-ce anyway.

     

       43
       43
       +
           postInstall = ''

     

       44
       44
       +
             remove-references-to -t ${graalvmDrv} $out/bin/${executable}

     

       45
       45
       +
           '';

     

       32
       46
        
       

     

       33
       33
       -
         installCheckPhase = ''

     

       34
       34
       -
           $out/bin/bb --version | grep '${version}'

     

       35
       35
       -
           $out/bin/bb '(+ 1 2)' | grep '3'

     

       36
       36
       -
           $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'

     

       37
       37
       -
         '';

     

       47
       47
       +
           passthru.updateScript = writeScript "update-babashka" ''

     

       48
       48
       +
             #!/usr/bin/env nix-shell

     

       49
       49
       +
             #!nix-shell -i bash -p curl common-updater-scripts jq libarchive

     

       38
       50
        
       

     

       39
       39
       -
         # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology,

     

       40
       40
       -
         # not sure the implications of this but this file is not available in

     

       41
       41
       -
         # graalvm-ce anyway.

     

       42
       42
       -
         postInstall = ''

     

       43
       43
       -
           remove-references-to -t ${graalvmDrv} $out/bin/${executable}

     

       44
       44
       -
         '';

     

       51
       51
       +
             set -euo pipefail

     

       52
       52
       +
             shopt -s inherit_errexit

     

       45
       53
        
       

     

       46
       46
       -
         passthru.updateScript = writeScript "update-babashka" ''

     

       47
       47
       -
           #!/usr/bin/env nix-shell

     

       48
       48
       -
           #!nix-shell -i bash -p curl common-updater-scripts jq

     

       54
       54
       +
             latest_version="$(curl \

     

       55
       55
       +
               ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \

     

       56
       56
       +
               -fsL "https://api.github.com/repos/babashka/babashka/releases/latest" \

     

       57
       57
       +
               | jq -r '.tag_name')"

     

       49
       58
        
       

     

       50
       50
       -
           set -euo pipefail

     

       59
       59
       +
             if [ "$(update-source-version babashka-unwrapped "''${latest_version/v/}" --print-changes)" = "[]" ]; then

     

       60
       60
       +
               # no need to update babashka.clojure-tools when babashka-unwrapped wasn't updated

     

       61
       61
       +
               exit 0

     

       62
       62
       +
             fi

     

       51
       63
        
       

     

       52
       52
       -
           readonly latest_version="$(curl \

     

       53
       53
       -
             ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \

     

       54
       54
       -
             -s "https://api.github.com/repos/babashka/babashka/releases/latest" \

     

       55
       55
       -
             | jq -r '.tag_name')"

     

       64
       64
       +
             clojure_tools_version=$(curl \

     

       65
       65
       +
               -fsL \

     

       66
       66
       +
               "https://github.com/babashka/babashka/releases/download/''${latest_version}/babashka-''${latest_version/v/}-standalone.jar" \

     

       67
       67
       +
               | bsdtar -qxOf - borkdude/deps.clj \

     

       68
       68
       +
               | ${babashka-unwrapped}/bin/bb -I -o -e "(or (some->> *input* (filter #(= '(def version) (take 2 %))) first last last last) (throw (ex-info \"Couldn't find expected '(def version ...)' form in 'borkdude/deps.clj'.\" {})))")

     

       56
       69
        
       

     

       57
       57
       -
           # v0.6.2 -> 0.6.2

     

       58
       58
       -
           update-source-version babashka "''${latest_version/v/}"

     

       59
       59
       -
         '';

     

       70
       70
       +
             update-source-version babashka.clojure-tools "$clojure_tools_version" \

     

       71
       71
       +
               --file="pkgs/development/interpreters/babashka/clojure-tools.nix"

     

       72
       72
       +
           '';

     

       60
       73
        
       

     

       61
       61
       -
         meta = with lib; {

     

       62
       62
       -
           description = "A Clojure babushka for the grey areas of Bash";

     

       63
       63
       -
           longDescription = ''

     

       64
       64
       -
             The main idea behind babashka is to leverage Clojure in places where you

     

       65
       65
       -
             would be using bash otherwise.

     

       74
       74
       +
           meta = with lib; {

     

       75
       75
       +
             description = "A Clojure babushka for the grey areas of Bash";

     

       76
       76
       +
             longDescription = ''

     

       77
       77
       +
               The main idea behind babashka is to leverage Clojure in places where you

     

       78
       78
       +
               would be using bash otherwise.

     

       66
       79
        
       

     

       67
       67
       -
             As one user described it:

     

       80
       80
       +
               As one user described it:

     

       68
       81
        
       

     

       69
       69
       -
                 I’m quite at home in Bash most of the time, but there’s a substantial

     

       70
       70
       -
                 grey area of things that are too complicated to be simple in bash, but

     

       71
       71
       -
                 too simple to be worth writing a clj/s script for. Babashka really

     

       72
       72
       -
                 seems to hit the sweet spot for those cases.

     

       82
       82
       +
                   I’m quite at home in Bash most of the time, but there’s a substantial

     

       83
       83
       +
                   grey area of things that are too complicated to be simple in bash, but

     

       84
       84
       +
                   too simple to be worth writing a clj/s script for. Babashka really

     

       85
       85
       +
                   seems to hit the sweet spot for those cases.

     

       73
       86
        
       

     

       74
       74
       -
             Goals:

     

       87
       87
       +
               Goals:

     

       75
       88
        
       

     

       76
       76
       -
             - Low latency Clojure scripting alternative to JVM Clojure.

     

       77
       77
       -
             - Easy installation: grab the self-contained binary and run. No JVM needed.

     

       78
       78
       -
             - Familiarity and portability:

     

       79
       79
       -
               - Scripts should be compatible with JVM Clojure as much as possible

     

       80
       80
       -
               - Scripts should be platform-independent as much as possible. Babashka

     

       81
       81
       -
                 offers support for linux, macOS and Windows.

     

       82
       82
       -
             - Allow interop with commonly used classes like java.io.File and System

     

       83
       83
       -
             - Multi-threading support (pmap, future, core.async)

     

       84
       84
       -
             - Batteries included (tools.cli, cheshire, ...)

     

       85
       85
       -
             - Library support via popular tools like the clojure CLI

     

       86
       86
       -
           '';

     

       87
       87
       -
           homepage = "https://github.com/babashka/babashka";

     

       88
       88
       -
           changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md";

     

       89
       89
       -
           sourceProvenance = with sourceTypes; [ binaryBytecode ];

     

       90
       90
       -
           license = licenses.epl10;

     

       91
       91
       -
           maintainers = with maintainers; [

     

       92
       92
       -
             bandresen

     

       93
       93
       -
             bhougland

     

       94
       94
       -
             DerGuteMoritz

     

       95
       95
       -
             jlesquembre

     

       96
       96
       -
             thiagokokada

     

       97
       97
       -
           ];

     

       89
       89
       +
               - Low latency Clojure scripting alternative to JVM Clojure.

     

       90
       90
       +
               - Easy installation: grab the self-contained binary and run. No JVM needed.

     

       91
       91
       +
               - Familiarity and portability:

     

       92
       92
       +
                 - Scripts should be compatible with JVM Clojure as much as possible

     

       93
       93
       +
                 - Scripts should be platform-independent as much as possible. Babashka

     

       94
       94
       +
                   offers support for linux, macOS and Windows.

     

       95
       95
       +
               - Allow interop with commonly used classes like java.io.File and System

     

       96
       96
       +
               - Multi-threading support (pmap, future, core.async)

     

       97
       97
       +
               - Batteries included (tools.cli, cheshire, ...)

     

       98
       98
       +
               - Library support via popular tools like the clojure CLI

     

       99
       99
       +
             '';

     

       100
       100
       +
             homepage = "https://github.com/babashka/babashka";

     

       101
       101
       +
             changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md";

     

       102
       102
       +
             sourceProvenance = with sourceTypes; [ binaryBytecode ];

     

       103
       103
       +
             license = licenses.epl10;

     

       104
       104
       +
             maintainers = with maintainers; [

     

       105
       105
       +
               bandresen

     

       106
       106
       +
               bhougland

     

       107
       107
       +
               DerGuteMoritz

     

       108
       108
       +
               jlesquembre

     

       109
       109
       +
               thiagokokada

     

       110
       110
       +
             ];

     

       111
       111
       +
           };

     

       98
       112
        
         };

     

       99
       99
       -
       }

     

       113
       113
       +
       in

     

       114
       114
       +
       babashka-unwrapped

+14 -7

pkgs/development/interpreters/babashka/wrapped.nix

···

       1
       1
        
       { stdenvNoCC

     

       2
       2
        
       , lib

     

       3
       3
        
       , babashka-unwrapped

     

       4
       4
       -
       , clojure

     

       4
       4
       +
       , callPackage

     

       5
       5
        
       , makeWrapper

     

       6
       6
        
       , rlwrap

     

       7
       7
       -
       

     

       8
       8
       -
       , jdkBabashka ? clojure.jdk

     

       7
       7
       +
       , clojureToolsBabashka ? callPackage ./clojure-tools.nix { }

     

       8
       8
       +
       , jdkBabashka ? clojureToolsBabashka.jdk

     

       9
       9
        
       

     

       10
       10
        
         # rlwrap is a small utility to allow the editing of keyboard input, see

     

       11
       11
        
         # https://book.babashka.org/#_repl

     
···

       18
       18
        
       }:

     

       19
       19
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       20
       20
        
         pname = "babashka";

     

       21
       21
       -
         inherit (babashka-unwrapped) version meta doInstallCheck installCheckPhase;

     

       21
       21
       +
         inherit (babashka-unwrapped) version meta doInstallCheck;

     

       22
       22
        
       

     

       23
       23
        
         dontUnpack = true;

     

       24
       24
        
         dontBuild = true;

     
···

       29
       29
        
           let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in

     

       30
       30
        
           ''

     

       31
       31
        
             mkdir -p $out/clojure_tools

     

       32
       32
       -
             ln -s -t $out/clojure_tools ${clojure}/*.edn

     

       33
       33
       -
             ln -s -t $out/clojure_tools ${clojure}/libexec/*

     

       32
       32
       +
             ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn

     

       33
       33
       +
             ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*

     

       34
       34
        
       

     

       35
       35
        
             makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \

     

       36
       36
        
               --inherit-argv0 \

     

       37
       37
        
               --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \

     

       38
       38
       -
               --set-default DEPS_CLJ_TOOLS_VERSION ${clojure.version} \

     

       39
       38
        
               --set-default JAVA_HOME ${jdkBabashka}

     

       40
       39
        
       

     

       41
       40
        
           '' +

     
···

       44
       43
        
               --replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"'

     

       45
       44
        
           '';

     

       46
       45
        
       

     

       46
       46
       +
         installCheckPhase = ''

     

       47
       47
       +
           ${babashka-unwrapped.installCheckPhase}

     

       48
       48
       +
           # Needed for Darwin compat, see https://github.com/borkdude/deps.clj/issues/114

     

       49
       49
       +
           export CLJ_CONFIG="$TMP/.clojure"

     

       50
       50
       +
           $out/bin/bb clojure --version | grep -wF '${clojureToolsBabashka.version}'

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       47
       53
        
         passthru.unwrapped = babashka-unwrapped;

     

       54
       54
       +
         passthru.clojure-tools = clojureToolsBabashka;

     

       48
       55
        
       })