From 2f7e7163011220f87f28708e54375950aa5aa40b Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 16 Oct 2024 17:12:34 -0600 Subject: [PATCH 1/3] release freckle-app with TextualEnum --- freckle-app/CHANGELOG.md | 6 +++++- freckle-app/freckle-app.cabal | 2 +- freckle-app/package.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md index 6f7e287..3254c42 100644 --- a/freckle-app/CHANGELOG.md +++ b/freckle-app/CHANGELOG.md @@ -1,4 +1,8 @@ -## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.2.1...main) +## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.3.0...main) + +## [v1.20.3.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.2.1...freckle-app-v1.20.3.0) + +Add `Freckle.App.TextualEnum` ## [v1.20.2.1](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.2.0...freckle-app-v1.20.2.1) diff --git a/freckle-app/freckle-app.cabal b/freckle-app/freckle-app.cabal index ad295b5..f9fe509 100644 --- a/freckle-app/freckle-app.cabal +++ b/freckle-app/freckle-app.cabal @@ -5,7 +5,7 @@ cabal-version: 1.22 -- see: https://github.com/sol/hpack name: freckle-app -version: 1.20.2.1 +version: 1.20.3.0 synopsis: Haskell application toolkit used at Freckle description: Please see README.md category: Utils diff --git a/freckle-app/package.yaml b/freckle-app/package.yaml index a923084..cd6de85 100644 --- a/freckle-app/package.yaml +++ b/freckle-app/package.yaml @@ -1,5 +1,5 @@ name: freckle-app -version: 1.20.2.1 +version: 1.20.3.0 maintainer: Freckle Education category: Utils From 8229235fb52ff40b1068fa3c2fd4b4ccdf0a7ecc Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 16 Oct 2024 17:14:02 -0600 Subject: [PATCH 2/3] bump latest stack resolver --- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stack.yaml b/stack.yaml index ff91021..ec8026a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.34 +resolver: lts-22.38 extra-deps: - Blammo-2.1.1.0 - Blammo-wai-0.0.0.2 diff --git a/stack.yaml.lock b/stack.yaml.lock index a3fcf9d..a3ea930 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -111,7 +111,7 @@ packages: hackage: thread-utils-finalizers-0.1.1.0 snapshots: - completed: - sha256: edbd50d7e7c85c13ad5f5835ae2db92fab1e9cf05ecf85340e2622ec0a303df1 - size: 720020 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/34.yaml - original: lts-22.34 + sha256: 0964f3e2c04e21abf42e271490e6974bc923aac2f2fd595fcb53ad0c237dbed1 + size: 720034 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/38.yaml + original: lts-22.38 From 522537d1704bd1bac4cb4d2668ae24db47e2a1a0 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 16 Oct 2024 17:16:42 -0600 Subject: [PATCH 3/3] update nix flake --- flake.lock | 369 +++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 24 ++-- 2 files changed, 356 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 3dd6af8..bd1a84b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,47 @@ { "nodes": { + "autodocodec": { + "flake": false, + "locked": { + "lastModified": 1722952210, + "narHash": "sha256-+vz0En2dkS0nfOq12QAJtV6GcdP0WoDv7HwzrMIsnGo=", + "owner": "NorfairKing", + "repo": "autodocodec", + "rev": "ac36615cb344ec43259fb65cafe3e55308ce4662", + "type": "github" + }, + "original": { + "owner": "NorfairKing", + "repo": "autodocodec", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -22,6 +54,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -39,6 +89,7 @@ "freckle": { "inputs": { "flake-utils": "flake-utils_2", + "haskell-openapi-code-generator": "haskell-openapi-code-generator", "nix-github-actions": "nix-github-actions", "nixpkgs-22-11": "nixpkgs-22-11", "nixpkgs-23-05": "nixpkgs-23-05", @@ -49,20 +100,22 @@ "nixpkgs-master-2023-07-18": "nixpkgs-master-2023-07-18", "nixpkgs-master-2023-09-15": "nixpkgs-master-2023-09-15", "nixpkgs-master-2024-01-27": "nixpkgs-master-2024-01-27", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable-2023-07-25": "nixpkgs-stable-2023-07-25", "nixpkgs-unstable-2023-10-21": "nixpkgs-unstable-2023-10-21", "nixpkgs-unstable-2024-02-20": "nixpkgs-unstable-2024-02-20", "nixpkgs-unstable-2024-04-03": "nixpkgs-unstable-2024-04-03", - "nixpkgs-unstable-2024-05-30": "nixpkgs-unstable-2024-05-30" + "nixpkgs-unstable-2024-05-30": "nixpkgs-unstable-2024-05-30", + "nixpkgs-unstable-2024-07-29": "nixpkgs-unstable-2024-07-29", + "stack-lint-extra-deps": "stack-lint-extra-deps" }, "locked": { "dir": "main", - "lastModified": 1720803681, - "narHash": "sha256-Z5CtHFadOrWzHK3bE6IQO+YQNAPUHi9uZvcFtqEbh2M=", + "lastModified": 1728511001, + "narHash": "sha256-wDWBPCl81tghuD8heE+NbFkPjtEWVHaHvYOiGPpxyeU=", "ref": "refs/heads/main", - "rev": "02f46f10a0583bdb53ff9fb3d5fff5ee144025d1", - "revCount": 50, + "rev": "0a771073d025c719669a53f01cf958a25e3c5c99", + "revCount": 83, "type": "git", "url": "ssh://git@github.com/freckle/flakes?dir=main" }, @@ -72,6 +125,53 @@ "url": "ssh://git@github.com/freckle/flakes?dir=main" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "freckle", + "haskell-openapi-code-generator", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "haskell-openapi-code-generator": { + "inputs": { + "autodocodec": "autodocodec", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "safe-coloured-text": "safe-coloured-text", + "sydtest": "sydtest", + "validity": "validity" + }, + "locked": { + "lastModified": 1723367996, + "narHash": "sha256-maI3mrsCCt+su8PBuLmVtznwyaR8e4xKGgmu7qKW6l8=", + "owner": "Haskell-OpenAPI-Code-Generator", + "repo": "Haskell-OpenAPI-Client-Code-Generator", + "rev": "3ab804875a272cf51b9faeab04c2f7afd2628a25", + "type": "github" + }, + "original": { + "owner": "Haskell-OpenAPI-Code-Generator", + "repo": "Haskell-OpenAPI-Client-Code-Generator", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -93,6 +193,22 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-22-11": { "locked": { "lastModified": 1688392541, @@ -127,11 +243,11 @@ }, "nixpkgs-23-11": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -143,11 +259,11 @@ }, "nixpkgs-24-05": { "locked": { - "lastModified": 1720553833, - "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", + "lastModified": 1728328465, + "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", + "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", "type": "github" }, "original": { @@ -159,11 +275,11 @@ }, "nixpkgs-haskell-updates": { "locked": { - "lastModified": 1720656888, - "narHash": "sha256-OZruDiu8Zyt49KxLU1uQOrzbcSYYACi0L96UdFwOcbk=", + "lastModified": 1728432978, + "narHash": "sha256-NEeCQnt26lTI2EkVqMBfKiE8HLSWDQwVKa8NOuJU02E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40f675fdb81fb6a0d2c35da269bc5f733962cb45", + "rev": "e92179eaa014e4a7c18d05a02b389da05774aae5", "type": "github" }, "original": { @@ -239,15 +355,15 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720553833, - "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", - "owner": "nixos", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" @@ -269,6 +385,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1728328465, + "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable-2023-10-21": { "locked": { "lastModified": 1697793076, @@ -333,6 +465,91 @@ "type": "github" } }, + "nixpkgs-unstable-2024-07-29": { + "locked": { + "lastModified": 1722141560, + "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pgp-wordlist": { + "flake": false, + "locked": { + "lastModified": 1714149562, + "narHash": "sha256-WCFQgtWqq+gLst4lXkFYlmlW7L8PQOJfChsKMApy3Ng=", + "owner": "quchen", + "repo": "pgp-wordlist", + "rev": "1f0cfd90d62179952cbfd59c3405283a1d364272", + "type": "github" + }, + "original": { + "owner": "quchen", + "repo": "pgp-wordlist", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -340,22 +557,89 @@ "stable": "stable" } }, + "safe-coloured-text": { + "flake": false, + "locked": { + "lastModified": 1722709522, + "narHash": "sha256-zglWqKISYz34A+/PvqwvwrbQYSEcko8C595VAeINitw=", + "owner": "NorfairKing", + "repo": "safe-coloured-text", + "rev": "046f10147a058c00c2706d98c341219e3cbc7669", + "type": "github" + }, + "original": { + "owner": "NorfairKing", + "repo": "safe-coloured-text", + "type": "github" + } + }, "stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, + "stack-lint-extra-deps": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "pgp-wordlist": "pgp-wordlist", + "stacklock2nix": "stacklock2nix" + }, + "locked": { + "lastModified": 1723061685, + "narHash": "sha256-11XpTeXmjUBgK3dOk9+9Mwb0EbtKTTl9AZU6hPXtP2Q=", + "owner": "freckle", + "repo": "stack-lint-extra-deps", + "rev": "0dccbb297a4bdc01509e2e18c8e3f726014bc35a", + "type": "github" + }, + "original": { + "owner": "freckle", + "repo": "stack-lint-extra-deps", + "type": "github" + } + }, + "stacklock2nix": { + "locked": { + "lastModified": 1705051190, + "narHash": "sha256-xgH0gaD3dNtOzZzX3A40hZTiHJP5cIGmifbmfcS2OGI=", + "owner": "cdepillabout", + "repo": "stacklock2nix", + "rev": "22676dfc45fa1c33899ba1da1a23665172a18ba7", + "type": "github" + }, + "original": { + "owner": "cdepillabout", + "repo": "stacklock2nix", + "type": "github" + } + }, + "sydtest": { + "flake": false, + "locked": { + "lastModified": 1722766036, + "narHash": "sha256-i7N8HKkFPUfnOOmj47Di/XnQS66mUzTG6HISUccNhOA=", + "owner": "NorfairKing", + "repo": "sydtest", + "rev": "23baea50a08857baf3121fc55096c40a93ff5f17", + "type": "github" + }, + "original": { + "owner": "NorfairKing", + "repo": "sydtest", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -385,6 +669,37 @@ "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" + } + }, + "validity": { + "flake": false, + "locked": { + "lastModified": 1722943924, + "narHash": "sha256-hq5FwDFW+02u5Qsx8v1KWoQUsY6S6ufI4WYKZ6yhYUA=", + "owner": "NorfairKing", + "repo": "validity", + "rev": "51b8843b9bd5228160b99f653d3271147245d689", + "type": "github" + }, + "original": { + "owner": "NorfairKing", + "repo": "validity", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 67ed665..a472cef 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,18 @@ { inputs = { - stable.url = "github:nixos/nixpkgs/nixos-23.11"; + stable.url = "github:nixos/nixpkgs/nixos-24.05"; freckle.url = "git+ssh://git@github.com/freckle/flakes?dir=main"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = inputs: - inputs.flake-utils.lib.eachDefaultSystem (system: + outputs = + inputs: + inputs.flake-utils.lib.eachDefaultSystem ( + system: let - nixpkgsArgs = { inherit system; config = { }; }; + nixpkgsArgs = { + inherit system; + config = { }; + }; nixpkgs = { stable = import inputs.stable nixpkgsArgs; @@ -21,13 +26,11 @@ fourmolu = freckle.fourmolu-0-13-x; ghc = freckleLib.haskellBundle { - ghcVersion = "ghc-9-4-8"; + ghcVersion = "ghc-9-6-6"; enableHLS = true; }; - implicit-hie = - nixpkgs.stable.haskell.lib.justStaticExecutables - nixpkgs.stable.haskellPackages.implicit-hie; + implicit-hie = nixpkgs.stable.haskell.lib.justStaticExecutables nixpkgs.stable.haskellPackages.implicit-hie; }; devShells.default = nixpkgs.stable.mkShell { @@ -47,8 +50,9 @@ ]; shellHook = '' - export STACK_YAML=stack-lts-21.25.yaml + export STACK_YAML=stack.yaml ''; }; - }); + } + ); }