Skip to content

Commit 4a5ec2f

Browse files
ericdalloericdallo
authored
Merge pull request #363 from editor-code-assistant/fix-nix
Fix nix build by updating flake inputs and build command
2 parents 740bb44 + e05ac9d commit 4a5ec2f

3 files changed

Lines changed: 56 additions & 37 deletions

File tree

‎deps-lock.json‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,62 +2179,62 @@
21792179
},
21802180
{
21812181
"mvn-path": "org/clojure/clojure/1.10.3/clojure-1.10.3.jar",
2182-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2182+
"mvn-repo": "https://repo1.maven.org/maven2/",
21832183
"hash": "sha256-fxJHLa7Y9rUXSYqqKrE6ViR1w+31FHjkWBzHYemJeaM="
21842184
},
21852185
{
21862186
"mvn-path": "org/clojure/clojure/1.10.3/clojure-1.10.3.pom",
2187-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2187+
"mvn-repo": "https://repo1.maven.org/maven2/",
21882188
"hash": "sha256-GJwAxDNAdJai+7DsyzeQjJSVXZHq0b5IFWdE7MGBbZQ="
21892189
},
21902190
{
21912191
"mvn-path": "org/clojure/clojure/1.11.0/clojure-1.11.0.jar",
2192-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2192+
"mvn-repo": "https://repo1.maven.org/maven2/",
21932193
"hash": "sha256-PiH6daB+yd278bK1A1bPGAcQ0DmN6qT0TpHNYwRVWUc="
21942194
},
21952195
{
21962196
"mvn-path": "org/clojure/clojure/1.11.0/clojure-1.11.0.pom",
2197-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2197+
"mvn-repo": "https://repo1.maven.org/maven2/",
21982198
"hash": "sha256-SQjMS0yeYsmoFJb5PLWsb2lBd8xkXc87jOXkkavOHro="
21992199
},
22002200
{
22012201
"mvn-path": "org/clojure/clojure/1.11.1/clojure-1.11.1.jar",
2202-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2202+
"mvn-repo": "https://repo1.maven.org/maven2/",
22032203
"hash": "sha256-I4G26UI6tGUVFFWUSQPROlYkPWAGuRlK/Bv0+HEMtN4="
22042204
},
22052205
{
22062206
"mvn-path": "org/clojure/clojure/1.11.1/clojure-1.11.1.pom",
2207-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2207+
"mvn-repo": "https://repo1.maven.org/maven2/",
22082208
"hash": "sha256-IMRaGr7b2L4grvk2BQrjGgjBZ0CzL4dAuIOM3pb/y4o="
22092209
},
22102210
{
22112211
"mvn-path": "org/clojure/clojure/1.11.2/clojure-1.11.2.jar",
2212-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2212+
"mvn-repo": "https://repo1.maven.org/maven2/",
22132213
"hash": "sha256-iPqZkT1pIs+39kn1xGdQOHfLb8yMwW02948mSAhLqZc="
22142214
},
22152215
{
22162216
"mvn-path": "org/clojure/clojure/1.11.2/clojure-1.11.2.pom",
2217-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2217+
"mvn-repo": "https://repo1.maven.org/maven2/",
22182218
"hash": "sha256-FzbP/xCV4dT+/raogrut9ttB7+MV8pbw/aMtt//EExE="
22192219
},
22202220
{
22212221
"mvn-path": "org/clojure/clojure/1.11.3/clojure-1.11.3.jar",
2222-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2222+
"mvn-repo": "https://repo1.maven.org/maven2/",
22232223
"hash": "sha256-nDBUCTKOK5boXdK160t1gQxnt2unCuTQ9t3pvPtVsbc="
22242224
},
22252225
{
22262226
"mvn-path": "org/clojure/clojure/1.11.3/clojure-1.11.3.pom",
2227-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2227+
"mvn-repo": "https://repo1.maven.org/maven2/",
22282228
"hash": "sha256-DA2+Ge4NKpxXMQzr3dNWRD8NFlFMQmBHsGLjpXwNuK0="
22292229
},
22302230
{
22312231
"mvn-path": "org/clojure/clojure/1.11.4/clojure-1.11.4.jar",
2232-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2232+
"mvn-repo": "https://repo1.maven.org/maven2/",
22332233
"hash": "sha256-/H/xtmENDjSUp1zBHvgYEL2kAqwVcBL+TjuJlYbPQTM="
22342234
},
22352235
{
22362236
"mvn-path": "org/clojure/clojure/1.11.4/clojure-1.11.4.pom",
2237-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2237+
"mvn-repo": "https://repo1.maven.org/maven2/",
22382238
"hash": "sha256-a6YADmhI+Cw5y5tJqyqmo6Vi9MJNUrMeUZCuZJXwwwk="
22392239
},
22402240
{
@@ -2257,6 +2257,26 @@
22572257
"mvn-repo": "https://repo1.maven.org/maven2/",
22582258
"hash": "sha256-JUvpyKuMzDArR9fFaj/KEUl+WcMFvxX6YFTD3/TrkZ0="
22592259
},
2260+
{
2261+
"mvn-path": "org/clojure/clojure/1.12.2/clojure-1.12.2.jar",
2262+
"mvn-repo": "https://repo1.maven.org/maven2/",
2263+
"hash": "sha256-pYv4B+zv7K6iIri4tH4UNo7o4yy0VAs//v/4yglTSA0="
2264+
},
2265+
{
2266+
"mvn-path": "org/clojure/clojure/1.12.2/clojure-1.12.2.pom",
2267+
"mvn-repo": "https://repo1.maven.org/maven2/",
2268+
"hash": "sha256-55suCRfnPnPCX7N5PzFV+PD4jYAvUMJf1Sl3l3rDQiA="
2269+
},
2270+
{
2271+
"mvn-path": "org/clojure/clojure/1.12.3/clojure-1.12.3.jar",
2272+
"mvn-repo": "https://repo1.maven.org/maven2/",
2273+
"hash": "sha256-yyoaPbHCzXbvT6SlRdWmXxCxtIt/dnLwoQn1R28FcWY="
2274+
},
2275+
{
2276+
"mvn-path": "org/clojure/clojure/1.12.3/clojure-1.12.3.pom",
2277+
"mvn-repo": "https://repo1.maven.org/maven2/",
2278+
"hash": "sha256-q2CmyyuMxXyG21ECte4p8hWsg8/20wEblV+fxb5dAZ0="
2279+
},
22602280
{
22612281
"mvn-path": "org/clojure/clojure/1.12.4/clojure-1.12.4.jar",
22622282
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -2359,22 +2379,22 @@
23592379
},
23602380
{
23612381
"mvn-path": "org/clojure/core.specs.alpha/0.2.56/core.specs.alpha-0.2.56.jar",
2362-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2382+
"mvn-repo": "https://repo1.maven.org/maven2/",
23632383
"hash": "sha256-/PRCveArBKhj8vzFjuaiowxM8Mlw99q4VjTwq3ERZrY="
23642384
},
23652385
{
23662386
"mvn-path": "org/clojure/core.specs.alpha/0.2.56/core.specs.alpha-0.2.56.pom",
2367-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2387+
"mvn-repo": "https://repo1.maven.org/maven2/",
23682388
"hash": "sha256-AarxdIP/HHSCySoHKV1+e8bjszIt9EsptXONAg/wB0A="
23692389
},
23702390
{
23712391
"mvn-path": "org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar",
2372-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2392+
"mvn-repo": "https://repo1.maven.org/maven2/",
23732393
"hash": "sha256-Bu6owHC75FwVhWfkQ0OWgbyMRukSNBT4G/oyukLWy8g="
23742394
},
23752395
{
23762396
"mvn-path": "org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.pom",
2377-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2397+
"mvn-repo": "https://repo1.maven.org/maven2/",
23782398
"hash": "sha256-F3i70Ti9GFkLgFS+nZGdG+toCfhbduXGKFtn1Ad9MA4="
23792399
},
23802400
{
@@ -2474,7 +2494,7 @@
24742494
},
24752495
{
24762496
"mvn-path": "org/clojure/pom.contrib/0.3.0/pom.contrib-0.3.0.pom",
2477-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2497+
"mvn-repo": "https://repo1.maven.org/maven2/",
24782498
"hash": "sha256-fxgrOypUPgV0YL+T/8XpzvasUn3xoTdqfZki6+ee8Rk="
24792499
},
24802500
{
@@ -2489,22 +2509,22 @@
24892509
},
24902510
{
24912511
"mvn-path": "org/clojure/spec.alpha/0.2.194/spec.alpha-0.2.194.jar",
2492-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2512+
"mvn-repo": "https://repo1.maven.org/maven2/",
24932513
"hash": "sha256-z2iZ+YUpjGSxPqEplGrZAo3uja3w6rmuGORVAn04JJw="
24942514
},
24952515
{
24962516
"mvn-path": "org/clojure/spec.alpha/0.2.194/spec.alpha-0.2.194.pom",
2497-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2517+
"mvn-repo": "https://repo1.maven.org/maven2/",
24982518
"hash": "sha256-WhHw4eizwFLmUcSYxpRbRNs1Nb8sGHGf3PZd8fiLE+Y="
24992519
},
25002520
{
25012521
"mvn-path": "org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar",
2502-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2522+
"mvn-repo": "https://repo1.maven.org/maven2/",
25032523
"hash": "sha256-Z+yJjrVcZqlXpVJ53YXRN2u5lL2HZosrDeHrO5foquA="
25042524
},
25052525
{
25062526
"mvn-path": "org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.pom",
2507-
"mvn-repo": "https://repo.maven.apache.org/maven2/",
2527+
"mvn-repo": "https://repo1.maven.org/maven2/",
25082528
"hash": "sha256-bY3hTDrIdXYMX/kJVi/5hzB3AxxquTnxyxOeFp/pB1g="
25092529
},
25102530
{

‎flake.lock‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,15 @@
5656
projectSrc = ./.;
5757
name = "com.github.editor-code-assistant/eca";
5858
main-ns = "eca.main";
59-
buildInputs = [ pkgs.babashka ];
6059

6160
jdkRunner = jdk;
6261
buildCommand =
6362
''
64-
bb prod-jar
65-
export jarPath=eca.jar
63+
clojure -T:build prod-jar
64+
export jarPath=target/eca.jar
6665
'';
6766
doCheck = true;
68-
checkPhase = "bb test";
67+
checkPhase = "clojure -M:test";
6968
};
7069

7170
eca = cljpkgs.mkGraalBin {

0 commit comments

Comments
 (0)