From 13367bf0d9f0d2c88ee0e65b6692f3c2b5208da2 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Thu, 28 Sep 2023 19:13:57 +0200 Subject: [PATCH] [Chore] Clean up stack.yaml (#125) 1. context and glider-nlp are listed as Slacker's deps, but they are not. Let's move them outside. 2. context-0.2.0.1 is available in the resolver we are using. Let's delete it from extra-deps. 3. The most recent tztime is available on Hackage, let's get it from there. --- cabal.project | 5 ----- cabal.project.freeze | 1 + flake.lock | 12 +++++----- stack.yaml | 9 +++----- stack.yaml.lock | 53 ++++++++++++++++++-------------------------- 5 files changed, 31 insertions(+), 49 deletions(-) diff --git a/cabal.project b/cabal.project index 47e3100..0cf7d2e 100644 --- a/cabal.project +++ b/cabal.project @@ -10,11 +10,6 @@ source-repository-package location: https://github.com/martijnbastiaan/doctest-parallel tag: 112b85b55c63dae1cc52b5216efe03873f1acc06 -source-repository-package - type: git - location: https://github.com/serokell/tztime.git - tag: 79034a1afc072e859df1ef8f58c2a1cdc04c78a3 - source-repository-package type: git location: https://github.com/velveteer/slacker.git diff --git a/cabal.project.freeze b/cabal.project.freeze index a16801e..f5e622c 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -2763,6 +2763,7 @@ constraints: any.AC-Angle ==1.0, any.typography-geometry ==1.0.1.0, any.tz ==0.1.3.6, any.tzdata ==0.2.20221129.0, + any.tztime ==0.1.1.0, any.ua-parser ==0.7.7.0, any.uglymemo ==0.1.0.1, any.ulid ==0.3.2.0, diff --git a/flake.lock b/flake.lock index 9da47c9..9f0c3ea 100644 --- a/flake.lock +++ b/flake.lock @@ -302,11 +302,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1689553923, - "narHash": "sha256-B5pnktSnsj+sci6zEFmg52gWhmYmMUzyOTIbf9b1VAY=", + "lastModified": 1695860572, + "narHash": "sha256-/HJL7ub2Kx0mQEouK6YMmlr2B8olrWOACRh5RRhHaaI=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "6debf045a11c4bcdd816ba0c7561d82abdf9c8dc", + "rev": "bd042193699709029bd963abd132b96e11127d5d", "type": "github" }, "original": { @@ -814,11 +814,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1675210232, - "narHash": "sha256-sRYTcYZYJ6s1AriIbndhPV/TtOr/LtMDGuSA1sn8Om0=", + "lastModified": 1695859746, + "narHash": "sha256-i36APTMy5SOQ83uhriYH9z4p2t8SvC7JuyPwpGmXFqQ=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "eeb1f9bd9db2cbbcae9982d5e92c426f49db6328", + "rev": "291606f6b669a9441faf533acd43e0a34957749f", "type": "github" }, "original": { diff --git a/stack.yaml b/stack.yaml index 8f2459d..7481cb2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -10,20 +10,17 @@ packages: extra-deps: - nyan-interpolation-0.9.2 - nyan-interpolation-core-0.9.2 +- guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 +- glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 +- tztime-0.1.1.0 - git: https://github.com/velveteer/slacker.git commit: bf8e13bbc566f92f900d2cc92ebd8a6f1e46334f # nix-sha256: sha256-X/8l6jvudzi46dWyrvOAPxdT4f2nSAISGEzqVNyelKY= -- git: https://github.com/serokell/tztime.git - commit: 79034a1afc072e859df1ef8f58c2a1cdc04c78a3 - git: https://github.com/martijnbastiaan/doctest-parallel commit: 112b85b55c63dae1cc52b5216efe03873f1acc06 -- guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - # Slacker's deps - monad-logger-aeson-0.3.1.0@sha256:dbb1f816d00a820982094362551e20582de0a27c337d430fa7080dcacbe66f34,5193 -- context-0.2.0.1@sha256:b5a1390a5ad11b7edd0449c9ef96823f082bff4988bd09583e37a4e93e9aad10,1891 -- glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 nix: enable: false diff --git a/stack.yaml.lock b/stack.yaml.lock index 5a6db68..58959ab 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -18,6 +18,27 @@ packages: size: 1464 original: hackage: nyan-interpolation-core-0.9.2 +- completed: + hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 + pantry-tree: + sha256: a33838b7b1c54f6ac3e1b436b25674948713a4189658e4d82e639b9a689bc90d + size: 364 + original: + hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 +- completed: + hackage: glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 + pantry-tree: + sha256: fc6bbae05b6e309686a6eef93366028cdbe68814f882be655b23c0bca76d8bde + size: 1040 + original: + hackage: glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 +- completed: + hackage: tztime-0.1.1.0@sha256:6231f710c3e033aaa60af67aaa9f712fff8a3aeb960f7d74b3acd34b85b8a75b,6873 + pantry-tree: + sha256: 00ab5625edc94e8d4acbbacc46dfd5e306f60902291e8d624a8cdbd6291f4cdd + size: 1065 + original: + hackage: tztime-0.1.1.0 - completed: commit: bf8e13bbc566f92f900d2cc92ebd8a6f1e46334f git: https://github.com/velveteer/slacker.git @@ -29,17 +50,6 @@ packages: original: commit: bf8e13bbc566f92f900d2cc92ebd8a6f1e46334f git: https://github.com/velveteer/slacker.git -- completed: - commit: 79034a1afc072e859df1ef8f58c2a1cdc04c78a3 - git: https://github.com/serokell/tztime.git - name: tztime - pantry-tree: - sha256: 8e1442aea3adc276360168234b44f48d55de6482eca9bd0d70315bf122c4e6df - size: 2728 - version: 0.1.0.0 - original: - commit: 79034a1afc072e859df1ef8f58c2a1cdc04c78a3 - git: https://github.com/serokell/tztime.git - completed: commit: 112b85b55c63dae1cc52b5216efe03873f1acc06 git: https://github.com/martijnbastiaan/doctest-parallel @@ -51,13 +61,6 @@ packages: original: commit: 112b85b55c63dae1cc52b5216efe03873f1acc06 git: https://github.com/martijnbastiaan/doctest-parallel -- completed: - hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - pantry-tree: - sha256: a33838b7b1c54f6ac3e1b436b25674948713a4189658e4d82e639b9a689bc90d - size: 364 - original: - hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - completed: hackage: monad-logger-aeson-0.3.1.0@sha256:dbb1f816d00a820982094362551e20582de0a27c337d430fa7080dcacbe66f34,5193 pantry-tree: @@ -65,20 +68,6 @@ packages: size: 5103 original: hackage: monad-logger-aeson-0.3.1.0@sha256:dbb1f816d00a820982094362551e20582de0a27c337d430fa7080dcacbe66f34,5193 -- completed: - hackage: context-0.2.0.1@sha256:b5a1390a5ad11b7edd0449c9ef96823f082bff4988bd09583e37a4e93e9aad10,1891 - pantry-tree: - sha256: ebb043dd007864588c6b1676a0d30e521deab4353a3f19716f6f6f7d52b62817 - size: 952 - original: - hackage: context-0.2.0.1@sha256:b5a1390a5ad11b7edd0449c9ef96823f082bff4988bd09583e37a4e93e9aad10,1891 -- completed: - hackage: glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 - pantry-tree: - sha256: fc6bbae05b6e309686a6eef93366028cdbe68814f882be655b23c0bca76d8bde - size: 1040 - original: - hackage: glider-nlp-0.4@sha256:3bf4edc4dc72b633debc0ffc2dc8edffae7871ed59c400512ac5aa4cf4a2bc90,2339 snapshots: - completed: sha256: a684cdbdf9304b325a503e0fe1d9648e9c18155ce4c7cfebbe8a7f93674e6295