From 75693a0b6be2d123eb0507e8f588e2f004999599 Mon Sep 17 00:00:00 2001 From: "eve n.u" Date: Thu, 2 May 2024 15:35:10 -0700 Subject: [PATCH] feat: add gensql.gpm.sppl-compatible container --- deps-lock.json | 297 ++++++++++++++++++++++++++++++++ deps.edn | 7 + flake.lock | 335 +++++++++++++++++++++++++++++++++++- flake.nix | 67 +++++--- nix/bin/default.nix | 15 +- nix/bin/with_extra_deps.nix | 15 ++ nix/uber/default.nix | 3 +- 7 files changed, 700 insertions(+), 39 deletions(-) create mode 100644 nix/bin/with_extra_deps.nix diff --git a/deps-lock.json b/deps-lock.json index d5dc1660..251f54e8 100644 --- a/deps-lock.json +++ b/deps-lock.json @@ -22,6 +22,13 @@ "git-dir": "https/github.com/inferenceql/inferenceql.inference", "hash": "sha256-gjVmfbcAEeb0uHJTOUrFasDhZY+c4wI8M5W+itJynz4=" }, + { + "lib": "io.github.opengen/gensql.gpm.sppl", + "url": "https://github.com/opengen/gensql.gpm.sppl.git", + "rev": "1d87ef476c17c3cfc464b0dfec3cd8ed73178711", + "git-dir": "https/github.com/opengen/gensql.gpm.sppl", + "hash": "sha256-1M9MuaOGK2eMhpS9ByjLkxjhLtgdeF/mikBzfvaVDJQ=" + }, { "lib": "io.github.probcomp/metaprob", "url": "https://github.com/probcomp/metaprob.git", @@ -86,6 +93,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-JezOPysastKFP6SSVze/8ZvwYnbr/uu5PhHvdTc7ea8=" }, + { + "mvn-path": "camel-snake-kebab/camel-snake-kebab/0.4.2/camel-snake-kebab-0.4.2.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-p7hxVjg5GmkjD1D8Nh6W+zt/vAWXj5zMdO+veamBdrs=" + }, + { + "mvn-path": "camel-snake-kebab/camel-snake-kebab/0.4.2/camel-snake-kebab-0.4.2.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-q0kp6YUZCevRFA1J6OSnV3922+u4eHSlO/wa65suEyc=" + }, { "mvn-path": "cheshire/cheshire/5.10.0/cheshire-5.10.0.pom", "mvn-repo": "https://repo.clojars.org/", @@ -116,6 +133,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-B71Nb2N/jk0TljOexdQI0xDc4OLCs17Wet0qWkDKh7Q=" }, + { + "mvn-path": "clj-python/libpython-clj/2.023/libpython-clj-2.023.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-EE9di3S5qYku7A5hIDtW0x26yFfEoBqAVoE0CtlJHqo=" + }, + { + "mvn-path": "clj-python/libpython-clj/2.023/libpython-clj-2.023.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-bcM6b2zDs4IX9iZQKHurWJeRVemmuHu8+PVuuaW4jmk=" + }, { "mvn-path": "clj-time/clj-time/0.15.2/clj-time-0.15.2.jar", "mvn-repo": "https://repo.clojars.org/", @@ -136,6 +163,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-ahZELYfCkwwDImtKo9KYkVfVi5TtPnyNZ2aLDrZYOJs=" }, + { + "mvn-path": "cljs-bean/cljs-bean/1.7.0/cljs-bean-1.7.0.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-mfia1lyVNncZL4WSMo7CMGwUKY0bILaXUU/s4j2vPzs=" + }, + { + "mvn-path": "cljs-bean/cljs-bean/1.7.0/cljs-bean-1.7.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-D/xuvTuPmNwI4tT6OBFRmeMTKV7p/rKzi5PTvVchBbg=" + }, { "mvn-path": "cljs-bean/cljs-bean/1.8.0/cljs-bean-1.8.0.jar", "mvn-repo": "https://repo.clojars.org/", @@ -156,6 +193,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-n0sJ40YL4OFuAt7ol6BjL0JF9zbVo+Z+y7URF6IzUkc=" }, + { + "mvn-path": "cnuernber/dtype-next/10.000-beta-20/dtype-next-10.000-beta-20.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-FdD4leseGnfZsfiLtFm/XI8cct80yq3V/isw/SdUFY4=" + }, + { + "mvn-path": "cnuernber/dtype-next/10.000-beta-20/dtype-next-10.000-beta-20.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-k675IGYC39vFhNXIJ8Ikp1P71J6OpSRD/eohQXx4zp0=" + }, { "mvn-path": "com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar", "mvn-repo": "https://repo.clojars.org/", @@ -186,6 +233,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-OZif4zTZYVoDj6UC8jRyaviBTyMlitPTxHdSmEeV0t8=" }, + { + "mvn-path": "com/cnuernber/ham-fisted/1.000-beta-74/ham-fisted-1.000-beta-74.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-QEswSpdd2Bb+EchKfH8TAbPm+vR9jUQE0SzyY40QydA=" + }, + { + "mvn-path": "com/cnuernber/ham-fisted/1.000-beta-74/ham-fisted-1.000-beta-74.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-HsiUDD98kr7OhUy2aDGDaHOVWTrpKyT6xCvcLMkIBNY=" + }, { "mvn-path": "com/cognitect/aws/api/0.8.612/api-0.8.612.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -351,6 +408,26 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-k3tSiy5LHiJc2cC3o6zxlB/BOVqFe/0MPTUQGNUHdF8=" }, + { + "mvn-path": "com/github/ben-manes/caffeine/caffeine/2.9.3/caffeine-2.9.3.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=" + }, + { + "mvn-path": "com/github/ben-manes/caffeine/caffeine/2.9.3/caffeine-2.9.3.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + { + "mvn-path": "com/github/wendykierp/JTransforms/3.1/JTransforms-3.1.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-2d/6Pid5MEDcy5ewVNlSZ99G5mnDlr8cpPOwhQabwtU=" + }, + { + "mvn-path": "com/github/wendykierp/JTransforms/3.1/JTransforms-3.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-lrWRq517j7FFnPq0Mo/XSwI/G+7ecE1Wuk7PlF70Wrc=" + }, { "mvn-path": "com/google/auto/auto-parent/6/auto-parent-6.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -461,6 +538,11 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" }, + { + "mvn-path": "com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, { "mvn-path": "com/google/guava/guava/30.0-jre/guava-30.0-jre.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -486,6 +568,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" }, + { + "mvn-path": "com/google/guava/guava/31.1-jre/guava-31.1-jre.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=" + }, + { + "mvn-path": "com/google/guava/guava/31.1-jre/guava-31.1-jre.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, { "mvn-path": "com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -521,16 +613,36 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" }, + { + "mvn-path": "com/google/javascript/closure-compiler-main/v20220502/closure-compiler-main-v20220502.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-7F9PqbsQeH4xxX0tdPqSmZyaTo/MwiDhMUhsvcY461w=" + }, { "mvn-path": "com/google/javascript/closure-compiler-main/v20230802/closure-compiler-main-v20230802.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-xchbVGIcwXAKcFg5OtoTa+GKdC8AY6jRg351j/37QfY=" }, + { + "mvn-path": "com/google/javascript/closure-compiler-parent/v20220502/closure-compiler-parent-v20220502.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-6L656nzyQchrdH9r55W/fsGQ6okKjDyJLpj/TbwehJY=" + }, { "mvn-path": "com/google/javascript/closure-compiler-parent/v20230802/closure-compiler-parent-v20230802.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-xWtaS/2dPJCpZr6NA6tkgO7NdBMyRXMv2Q8bPCJf4R8=" }, + { + "mvn-path": "com/google/javascript/closure-compiler-unshaded/v20220502/closure-compiler-unshaded-v20220502.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-WQx5QFep/7SBikqg0UD5G8GqCv57QhtijJV+wXMtmk0=" + }, + { + "mvn-path": "com/google/javascript/closure-compiler-unshaded/v20220502/closure-compiler-unshaded-v20220502.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-M2wDJLOXG4JktHHYZNSBH0X3IQi7MWCi87DSzdwK4MY=" + }, { "mvn-path": "com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -621,6 +733,11 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" }, + { + "mvn-path": "commons-codec/commons-codec/1.12/commons-codec-1.12.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-I99Y+unIPRvNJ3uZ+UKenYwTTwYAtz4uhrI4XteTyB4=" + }, { "mvn-path": "commons-codec/commons-codec/1.12/commons-codec-1.12.pom", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -756,6 +873,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-+yb7uKcebqzMaUdiSNSQrWKtXKxEmqpvi2o6bRW0RoM=" }, + { + "mvn-path": "insn/insn/0.5.2/insn-0.5.2.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-n6t9hk+ogtoP9yv+8ctdSxKRJPg0KVJhGYMNVmQB3zk=" + }, + { + "mvn-path": "insn/insn/0.5.2/insn-0.5.2.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-ID+WmZJwrx65tlWOhylt40no6d1x4AJJH653mcOvaU0=" + }, { "mvn-path": "instaparse/instaparse/1.4.12/instaparse-1.4.12.jar", "mvn-repo": "https://repo.clojars.org/", @@ -801,6 +928,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-tFTJn/nVuMaSbzEMvP2pN8PS1j0haZ6nE5dcfoRvAKI=" }, + { + "mvn-path": "it/unimi/dsi/fastutil-core/8.5.8/fastutil-core-8.5.8.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-kzd8lW4A3XphCNE94GeZpWte2pWn47QUGgid/XVUkd4=" + }, + { + "mvn-path": "it/unimi/dsi/fastutil-core/8.5.8/fastutil-core-8.5.8.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-L6jSY7LefSHwf6e6cCp5Ui9Zd50TJJ5VQQDuXFcRD6A=" + }, { "mvn-path": "it/unimi/dsi/fastutil/8.3.0/fastutil-8.3.0.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -896,6 +1033,11 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-/jSrgs700JyDFCohcxafaOxDfpS4ysyqWKa5g/RelE4=" }, + { + "mvn-path": "medley/medley/1.3.0/medley-1.3.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-Mxqk/EXddj1j66qFXJAZxBPMI0qw402OnP+Id0Gbk8E=" + }, { "mvn-path": "medley/medley/1.4.0/medley-1.4.0.jar", "mvn-repo": "https://repo.clojars.org/", @@ -936,6 +1078,16 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-pOKMydh8sWSV4JAgpctfTqjwZfgCAnR9kb+mRpY+6t8=" }, + { + "mvn-path": "net/cgrand/macrovich/0.2.0/macrovich-0.2.0.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-6gdZEjM/nqP40CWa3Fls6vAJTYyGJ45ImSnD5pl4znU=" + }, + { + "mvn-path": "net/cgrand/macrovich/0.2.0/macrovich-0.2.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-eJZwv8mcMp2YLbFQGT48VScindycRHCJw51apOfxtNw=" + }, { "mvn-path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar", "mvn-repo": "https://repo.clojars.org/", @@ -1466,6 +1618,26 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" }, + { + "mvn-path": "org/checkerframework/checker-qual/3.19.0/checker-qual-3.19.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=" + }, + { + "mvn-path": "org/checkerframework/checker-qual/3.19.0/checker-qual-3.19.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + { + "mvn-path": "org/clj-commons/primitive-math/1.0.0/primitive-math-1.0.0.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-jf43Wpf+4h86ri7BjxNoQVQNzyOUAIzUv6hTA39pXK4=" + }, + { + "mvn-path": "org/clj-commons/primitive-math/1.0.0/primitive-math-1.0.0.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-v10eGdhEPOwecFfDEJu78iLmKYzOq8MPjfz18e7/bzQ=" + }, { "mvn-path": "org/clojure/clojure/1.10.3/clojure-1.10.3.jar", "mvn-repo": "https://repo1.maven.org/maven2/", @@ -1506,6 +1678,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-P/01QSpDDIx0FX5fIzu6zESw+qfVcPLeaWAbFvLsalc=" }, + { + "mvn-path": "org/clojure/clojurescript/1.11.51/clojurescript-1.11.51.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-1OawkZ64DYR+PnsHwUhN31EnKv4C5WcUcT/pe1+8Fx4=" + }, + { + "mvn-path": "org/clojure/clojurescript/1.11.51/clojurescript-1.11.51.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-6hMGtK+OR0befcBDNuNqddas3T5A+PluRiTN3WrCSCA=" + }, { "mvn-path": "org/clojure/core.async/1.5.648/core.async-1.5.648.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1616,6 +1798,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-8T2ZaEbW16cCQ2JlqjhjKmdGkgJaQYpWaVxQKBPd2ng=" }, + { + "mvn-path": "org/clojure/data.csv/1.0.0/data.csv-1.0.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-khcKPKULbI2QMi3er0YvyzyDzULeyW24XyFzxQJ2UZA=" + }, + { + "mvn-path": "org/clojure/data.csv/1.0.0/data.csv-1.0.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-JaOXio9lS2BC7sqK+qxI9NeWEXrdLtEAi9JxtELmKI8=" + }, { "mvn-path": "org/clojure/data.csv/1.0.1/data.csv-1.0.1.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1626,6 +1818,11 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-1cESYLiumGM6l3FThM8ENeAknrIhTi7VPaTMGMkToAE=" }, + { + "mvn-path": "org/clojure/data.json/1.0.0/data.json-1.0.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-FIwv5rXvLug2zwbzgn3z6pQrFDYpP76KbRjXQcdbOKA=" + }, { "mvn-path": "org/clojure/data.json/2.4.0/data.json-2.4.0.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1666,6 +1863,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-r27O5bMSGWJukB2Gja+zp/raf7xHaOrvDnvngPOtstI=" }, + { + "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20211011-0726fdeb/google-closure-library-third-party-0.0-20211011-0726fdeb.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-/FNsq/SBL0h93J70nHuIdoznIm4DoAbBgrpJ6ykgiFo=" + }, + { + "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20211011-0726fdeb/google-closure-library-third-party-0.0-20211011-0726fdeb.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-TJdXE8WPrjKHZxAbUWZsk8k5/8uDLiwQ+xjEUOPGQmA=" + }, { "mvn-path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1676,6 +1883,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-dhVz7jVV7/WzITGoKz7ul+l3tR+XvnR6TKhDwupC8FU=" }, + { + "mvn-path": "org/clojure/google-closure-library/0.0-20211011-0726fdeb/google-closure-library-0.0-20211011-0726fdeb.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-KjPFSw8nqZPRjcBeGXuRRyw8kIIA4NDYISm94QexZOI=" + }, + { + "mvn-path": "org/clojure/google-closure-library/0.0-20211011-0726fdeb/google-closure-library-0.0-20211011-0726fdeb.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-xLwwLiNcKsr4EXURo9sOO50S6mqBKdlauJJ7m6iIYJg=" + }, { "mvn-path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -1846,6 +2063,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-230HS84slEV+bsKwUSg+Typ4oayhZNhPjYFhelVCkZ0=" }, + { + "mvn-path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-ZTEN++LnNziP8KllagxxmuNkU1w88dlpOuGjYXf8X3Q=" + }, + { + "mvn-path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-C4+IR3G2LL7q02f6F2FxV5oEzIIUG7XTzam+wpPwciQ=" + }, { "mvn-path": "org/clojure/tools.logging/1.2.4/tools.logging-1.2.4.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -2241,6 +2468,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-lEl9jwL43oFZpbfVE24BD1f12axliGES7O2GlcUFbe4=" }, + { + "mvn-path": "org/ow2/asm/asm/9.0/asm-9.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=" + }, + { + "mvn-path": "org/ow2/asm/asm/9.0/asm-9.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, { "mvn-path": "org/ow2/asm/asm/9.2/asm-9.2.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -2256,6 +2493,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" }, + { + "mvn-path": "org/roaringbitmap/RoaringBitmap/0.9.0/RoaringBitmap-0.9.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-E2ZU+QMXWmEuMMZ/NvqXVVLtR1VsYbMJkWvSu8d96pQ=" + }, + { + "mvn-path": "org/roaringbitmap/RoaringBitmap/0.9.0/RoaringBitmap-0.9.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-aJR2e+FkDD7+IKLfoff76nVIav/2h2yaaofbQvpcFXw=" + }, { "mvn-path": "org/roaringbitmap/RoaringBitmap/0.9.25/RoaringBitmap-0.9.25.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -2266,6 +2513,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-z17GLVqzwo+OVHBPgP3ZNDvKr3HC2SGWkBqVqkiFs9Y=" }, + { + "mvn-path": "org/roaringbitmap/shims/0.9.0/shims-0.9.0.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-dA9WoUa1ggorP9JrpkYGS7mXBfqYY2jmJf4dTFHoALA=" + }, + { + "mvn-path": "org/roaringbitmap/shims/0.9.0/shims-0.9.0.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-TLeQqxftMV3pY8fX4bzqA9DhKQHD9B5kPquGAzRP/fM=" + }, { "mvn-path": "org/roaringbitmap/shims/0.9.25/shims-0.9.25.jar", "mvn-repo": "https://repo.maven.apache.org/maven2/", @@ -2351,6 +2608,36 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-5uGiImN0fokpANH1Aj4dDf6LFtZe/shy8gV3oGl+01c=" }, + { + "mvn-path": "org/xerial/larray/larray-buffer/0.4.1/larray-buffer-0.4.1.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-UqUnKmXPw24p3rfV/UUhlYKaJ1nFg+/cRggXR7CDdY0=" + }, + { + "mvn-path": "org/xerial/larray/larray-buffer/0.4.1/larray-buffer-0.4.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-G0OoAJmdB/Y2AVGmJiZv1n9VWI0cW4o9OyvYKL4RSUU=" + }, + { + "mvn-path": "org/xerial/larray/larray-mmap/0.4.1/larray-mmap-0.4.1.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-o8wN71698lc5zqxqpohzV13KBcy8NJ073x/AaSIw1Ls=" + }, + { + "mvn-path": "org/xerial/larray/larray-mmap/0.4.1/larray-mmap-0.4.1.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-OHrgA3P2W31jN3ba2//Lbo4govEqxh1rPpAGSPfuKus=" + }, + { + "mvn-path": "pl/edu/icm/JLargeArrays/1.5/JLargeArrays-1.5.jar", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-bcpasj4f25GQolfARoep6hkRHDa27JR4vOayoSjKGus=" + }, + { + "mvn-path": "pl/edu/icm/JLargeArrays/1.5/JLargeArrays-1.5.pom", + "mvn-repo": "https://repo.maven.apache.org/maven2/", + "hash": "sha256-LWIBDpiLwiRk/6gN5/RBOwhT023cosYAfXvGr967vJ0=" + }, { "mvn-path": "potemkin/potemkin/0.4.5/potemkin-0.4.5.jar", "mvn-repo": "https://repo.clojars.org/", @@ -2486,6 +2773,16 @@ "mvn-repo": "https://repo.maven.apache.org/maven2/", "hash": "sha256-VX8IP5FuXZWDfFW1oEl06Bwr7uDkAv/Z7H+8/8FXkZ0=" }, + { + "mvn-path": "techascent/tech.resource/5.07/tech.resource-5.07.jar", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-UJfczqA4o28YVaFF2Vj5U9UZwvu8SZXuP4FSlQ1UbCI=" + }, + { + "mvn-path": "techascent/tech.resource/5.07/tech.resource-5.07.pom", + "mvn-repo": "https://repo.clojars.org/", + "hash": "sha256-Qzbpb6UnNqc//IXcBi2CJHzMChNdxCjoYonqaHnxbtM=" + }, { "mvn-path": "thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar", "mvn-repo": "https://repo.clojars.org/", diff --git a/deps.edn b/deps.edn index abf2dd61..15c0bb6d 100644 --- a/deps.edn +++ b/deps.edn @@ -27,6 +27,9 @@ org.clojure/test.check {:mvn/version "1.1.1"}}} :build {:deps {io.github.clojure/tools.build {:git/sha "8e78bccc35116f6b6fc0bf0c125dba8b8db8da6b"}} :ns-default build} + :build-with-sppl {:deps {io.github.clojure/tools.build {:git/sha "8e78bccc35116f6b6fc0bf0c125dba8b8db8da6b"} + io.github.opengen/gensql.gpm.sppl {:git/sha "1d87ef476c17c3cfc464b0dfec3cd8ed73178711"}} + :ns-default build} :cljs {:extra-deps {thheller/shadow-cljs {:mvn/version "2.27.5"}}} :clj-test {:extra-deps {io.github.cognitect-labs/test-runner {:git/sha "7284cda41fb9edc0f3bc6b6185cfb7138fc8a023"}} :main-opts ["--main" "cognitect.test-runner"] @@ -41,6 +44,10 @@ criterium/criterium {:mvn/version "0.4.6"}} :jvm-opts ["-Djdk.attach.allowAttachSelf"]} + :query-sppl { :extra-deps { io.github.opengen/gensql.gpm.sppl {:git/sha "1d87ef476c17c3cfc464b0dfec3cd8ed73178711"}} + :main-opts ["-m" "inferenceql.query.main"] + } + :coverage ;; Invoke with clj -M:test:coverage {:main-opts ["-m" "cloverage.coverage" diff --git a/flake.lock b/flake.lock index 78094190..cab729fa 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,26 @@ "type": "github" } }, + "clj-nix_2": { + "inputs": { + "devshell": "devshell_2", + "nix-fetcher-data": "nix-fetcher-data_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1702929109, + "narHash": "sha256-k5DGTFzkto/8xlY1B32441Jtp/VCgakzdmieB9HLMWw=", + "owner": "jlesquembre", + "repo": "clj-nix", + "rev": "26cee183a691cabd113b0751a09ad6f381e6681f", + "type": "github" + }, + "original": { + "owner": "jlesquembre", + "repo": "clj-nix", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -42,6 +62,30 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "nixpkgs": [ + "opengen", + "iqlquery", + "clj-nix", + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1700815693, + "narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=", + "owner": "numtide", + "repo": "devshell", + "rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-part": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -60,6 +104,24 @@ "type": "github" } }, + "flake-part_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, + "locked": { + "lastModified": 1685546676, + "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -95,6 +157,80 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_6" + }, + "locked": { + "lastModified": 1685546676, + "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_7" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "iqlquery": { + "inputs": { + "clj-nix": "clj-nix_2", + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710956070, + "narHash": "sha256-sgonEpcwheIlpM0PwHP3yO4UCntKbhiimzUUVZmdZ6k=", + "owner": "inferenceql", + "repo": "inferenceql.query", + "rev": "9cd372e042780cac173e57d2c46eb7df1ac02698", + "type": "github" + }, + "original": { + "owner": "inferenceql", + "repo": "inferenceql.query", + "type": "github" + } + }, "nix-fetcher-data": { "inputs": { "flake-part": "flake-part", @@ -118,6 +254,31 @@ "type": "github" } }, + "nix-fetcher-data_2": { + "inputs": { + "flake-part": "flake-part_2", + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "opengen", + "iqlquery", + "clj-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685572850, + "narHash": "sha256-lYKEqFG9F84xu51H1rM1u+Ip88cINL0+W26sT+vFEZc=", + "owner": "jlesquembre", + "repo": "nix-fetcher-data", + "rev": "f14967db6c92c79b77419f52c22a698518c91120", + "type": "github" + }, + "original": { + "owner": "jlesquembre", + "repo": "nix-fetcher-data", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1701253981, @@ -188,6 +349,78 @@ "type": "github" } }, + "nixpkgs-lib_4": { + "locked": { + "dir": "lib", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_5": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_6": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_7": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1706718339, @@ -204,12 +437,82 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1706718339, + "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "opengen": { + "inputs": { + "flake-parts": "flake-parts_3", + "iqlquery": "iqlquery", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1713486328, + "narHash": "sha256-tas17gjPQDTEiWtOH+9pTQyouR5C9lm4ikrNwR8HEno=", + "owner": "OpenGen", + "repo": "nix", + "rev": "d770a976564844b1bd670f18844a72e53a74bf59", + "type": "github" + }, + "original": { + "owner": "OpenGen", + "repo": "nix", + "rev": "d770a976564844b1bd670f18844a72e53a74bf59", + "type": "github" + } + }, "root": { "inputs": { "clj-nix": "clj-nix", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2", - "systems": "systems_2" + "opengen": "opengen", + "systems": "systems_4" } }, "systems": { @@ -241,6 +544,36 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 66cc5ae1..69295315 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + opengen.url = "github:OpenGen/nix/d770a976564844b1bd670f18844a72e53a74bf59"; systems.url = "github:nix-systems/default"; clj-nix.url = "github:jlesquembre/clj-nix"; flake-parts = { @@ -22,10 +23,12 @@ }; depsCache = pkgsWithCljNixOverlay.callPackage ./nix/depsCache {}; - uber = pkgs.callPackage ./nix/uber {inherit depsCache;}; + uber = pkgs.callPackage ./nix/uber {inherit depsCache; buildTool="build";}; + uberGpmSppl = pkgs.callPackage ./nix/uber {inherit depsCache; buildTool="build-with-sppl";}; pname = "iql"; bin = pkgs.callPackage ./nix/bin { inherit uber pname; }; + binGpmSppl = pkgs.callPackage ./nix/bin/with_extra_deps.nix { inherit pname; uber = uberGpmSppl; extraDeps = [ inputs.opengen.packages.${system}.sppl ]; }; basicToolsFn = pkgs: with pkgs; [ coreutils @@ -51,34 +54,52 @@ nixpkgs = inputs.nixpkgs; }; + ociImgSppl = pkgs.callPackage ./nix/oci { + inherit pname basicToolsFn depsCache; + uber = uberGpmSppl; + # ... we still must pass in the original nixpkgs because + # we need access to a different system's set of packages + # when compiling for linux while remaining agnostic of + # the workstation platform we are running this on. + nixpkgs = inputs.nixpkgs; + }; + + mutableCacheHook = '' + echo "Setting up default dev shell..." + + DEPS_CACHE_TMP="/tmp/clojure_cache_gensql_query" + echo "Using read-write clojure cache at:" + echo "$DEPS_CACHE_TMP" + + cache_signature_file="/tmp/clojure_cache_gensql_query_signature" + cache_signature="$(echo ${depsCache} | tr -d '\n')" + last_cache_signature="$(cat $cache_signature_file | tr -d '\n')" + + if [[ $cache_signature != $last_cache_signature ]]; then + echo -n $cache_signature > $cache_signature_file + + mkdir -p $DEPS_CACHE_TMP + echo "Copying readonly clojure cache to read-write location" + rsync -LrltgoD --chmod=ug+w ${depsCache}/ $DEPS_CACHE_TMP/ + fi + + export CLJ_CONFIG="$DEPS_CACHE_TMP/.clojure" + export GITLIBS="$DEPS_CACHE_TMP/.gitlibs" + export JAVA_TOOL_OPTIONS="-Duser.home=$DEPS_CACHE_TMP" + ''; + in { # development shell devShells.default = pkgs.mkShell { buildInputs = [ pkgs.openjdk21 pkgs.clojure pkgs.babashka depsCache ] ++ (basicToolsFn pkgs); - shellHook = '' - echo "Setting up default dev shell..." - - DEPS_CACHE_TMP="/tmp/clojure_cache_gensql_query" - echo "Using read-write clojure cache at:" - echo "$DEPS_CACHE_TMP" - - cache_signature_file="/tmp/clojure_cache_gensql_query_signature" - cache_signature="$(echo ${depsCache} | tr -d '\n')" - last_cache_signature="$(cat $cache_signature_file | tr -d '\n')" - - if [[ $cache_signature != $last_cache_signature ]]; then - echo -n $cache_signature > $cache_signature_file + shellHook = mutableCacheHook; + }; - mkdir -p $DEPS_CACHE_TMP - echo "Copying readonly clojure cache to read-write location" - rsync -LrltgoD --chmod=ug+w ${depsCache}/ $DEPS_CACHE_TMP/ - fi + devShells.sppl = pkgs.mkShell { + buildInputs = [ pkgs.openjdk21 pkgs.clojure pkgs.babashka depsCache inputs.opengen.sppl ] ++ (basicToolsFn pkgs); - export CLJ_CONFIG="$DEPS_CACHE_TMP/.clojure" - export GITLIBS="$DEPS_CACHE_TMP/.gitlibs" - export JAVA_TOOL_OPTIONS="-Duser.home=$DEPS_CACHE_TMP" - ''; + shellHook = mutableCacheHook; }; # development shell with readonly dependencies @@ -106,7 +127,7 @@ }; packages = { - inherit uber bin ociImg; + inherit uber bin ociImg uberGpmSppl ociImgSppl binGpmSppl; default = bin; }; }; diff --git a/nix/bin/default.nix b/nix/bin/default.nix index 3c57d511..acdfc775 100644 --- a/nix/bin/default.nix +++ b/nix/bin/default.nix @@ -1,14 +1 @@ -{ pkgs, - uber, - pname -}: pkgs.stdenv.mkDerivation { - name = "inferenceql.query"; - inherit pname; - src = ./.; - nativeBuildInputs = [ pkgs.makeWrapper ]; - buildInputs = [ pkgs.openjdk17 ]; - installPhase = '' - makeWrapper ${pkgs.openjdk17}/bin/java $out/bin/${pname} \ - --add-flags "-jar ${uber}" - ''; -} +args@{ ... }: import ./with_extra_deps.nix { inherit args; extraDeps = []; } diff --git a/nix/bin/with_extra_deps.nix b/nix/bin/with_extra_deps.nix new file mode 100644 index 00000000..3ff5bfd7 --- /dev/null +++ b/nix/bin/with_extra_deps.nix @@ -0,0 +1,15 @@ +{ pkgs, + uber, + extraDeps, + pname +}: pkgs.stdenv.mkDerivation { + name = "inferenceql.query"; + inherit pname; + src = ./.; + nativeBuildInputs = [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.openjdk17 ] ++ extraDeps; + installPhase = '' + makeWrapper ${pkgs.openjdk17}/bin/java $out/bin/${pname} \ + --add-flags "-jar ${uber}" + ''; +} diff --git a/nix/uber/default.nix b/nix/uber/default.nix index bd48dfba..337f32e4 100644 --- a/nix/uber/default.nix +++ b/nix/uber/default.nix @@ -1,6 +1,7 @@ { stdenv, pkgs, depsCache, + buildTool }: stdenv.mkDerivation { name = "inferenceql.query-uberjar"; version = "unstable"; @@ -19,7 +20,7 @@ nativeBuildInputs = with pkgs; [ clojure git ]; buildPhase = '' cp -R $src . - clojure -T:build uber + clojure -T:${buildTool} uber ''; installPhase = '' cp -R target/*.jar $out