From def25567d99a3aca5353f863ac40d67de371e448 Mon Sep 17 00:00:00 2001 From: Tom Sydney Kerckhove Date: Fri, 15 Dec 2023 18:34:53 +0100 Subject: [PATCH] Upgrade to lts-21.22 and nixos-23.11 --- flake.lock | 210 +++++++++--------- flake.nix | 4 +- nix/overlay.nix | 53 ++--- smos-data/src/Smos/Data.hs | 7 +- smos-notify/src/Smos/Notify/DB.hs | 1 + smos-server/src/Smos/Server/DB.hs | 1 + .../src/Smos/Server/Handler/PostSync.hs | 1 + smos-sync-client/src/Smos/Sync/Client/DB.hs | 1 + .../src/Smos/Web/Server/Foundation.hs | 1 + .../src/Smos/Web/Server/SmosSession.hs | 1 + smos/src/Smos/Actions/Forest.hs | 2 +- stack.yaml | 26 +-- 12 files changed, 149 insertions(+), 159 deletions(-) diff --git a/flake.lock b/flake.lock index 0ce9bf9e3..c07ecacdb 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "autodocodec": { "flake": false, "locked": { - "lastModified": 1700495536, - "narHash": "sha256-a71Ea0alRBJyQdb24HseEN3U7zc71PqqXBfWELAO6IA=", + "lastModified": 1701673930, + "narHash": "sha256-Mv8LNgJrQpHpuxg7jMuYuUoLeWCW+0OvqST4KNJYH9k=", "owner": "NorfairKing", "repo": "autodocodec", - "rev": "e7f4ec8d1d47e77c0f7fe83c8032abae5b082572", + "rev": "958a1c51fbf2f166974a60e2d0a5d266483baff5", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "autodocodec_2": { "flake": false, "locked": { - "lastModified": 1685692167, - "narHash": "sha256-QMlis/+3BAhjhop9m6q3W+MBWg9Z1IhqVokdaWRDVQQ=", + "lastModified": 1701673930, + "narHash": "sha256-Mv8LNgJrQpHpuxg7jMuYuUoLeWCW+0OvqST4KNJYH9k=", "owner": "NorfairKing", "repo": "autodocodec", - "rev": "5f23727689555789389ae4fbf41f674d43325814", + "rev": "958a1c51fbf2f166974a60e2d0a5d266483baff5", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "conformance": { "flake": false, "locked": { - "lastModified": 1699436367, - "narHash": "sha256-rO/q0r83N0zpQ6DO2EwGCg3P1+zjviyR7F0yuTPXoJ0=", + "lastModified": 1701870134, + "narHash": "sha256-0qdsSpiboalB1vsOufbF5qclm9HHdeY88xLKXmzfn3g=", "owner": "NorfairKing", "repo": "conformance", - "rev": "2c236fd28c4cef63cd40d04631c5462d1df37759", + "rev": "1bc2b33152eb2aa402342b64a5275508905585e8", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "cursor": { "flake": false, "locked": { - "lastModified": 1685977767, - "narHash": "sha256-T3B2VUBvCvNGZ2Toa1FnvregOP2tFS3KnGr0GAF7nm4=", + "lastModified": 1701872873, + "narHash": "sha256-yPOSFk5ThZruEcqxzyzojkMM4tmK3kTmv+nvVKI7NnM=", "owner": "NorfairKing", "repo": "cursor", - "rev": "ae8727c0109d0706019413b36095b50541f37e5a", + "rev": "27dab66b90e314497fbf8f8984fc394b9aa80be0", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "cursor-brick": { "flake": false, "locked": { - "lastModified": 1692622254, - "narHash": "sha256-56FVSv3bnrytmf8CDmGTh3evrYU5Hl7NV6BX/Vs7tHA=", + "lastModified": 1701875950, + "narHash": "sha256-NLTw6mCI0m+vKZawMp9Af/M64uY1sWPCa9h2ULWvdVA=", "owner": "NorfairKing", "repo": "cursor-brick", - "rev": "7f682cdbf4d79c6aadd10a8141461f177dc8f027", + "rev": "cdd3d7e9e99623a290f4c287f8aa04ff98f45ea8", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "cursor-dirforest": { "flake": false, "locked": { - "lastModified": 1692622594, - "narHash": "sha256-DmUWMm+JFMTWD1M9Fs5bzkPsf2V84iXpEReyug+c42k=", + "lastModified": 1701876801, + "narHash": "sha256-bOAWux7+RdGCwzz8g/rJSo/C+lGfGJpup2T2CxN4MiY=", "owner": "NorfairKing", "repo": "cursor-dirforest", - "rev": "af4d9b313752021c5f7a220b35829638bca8ce93", + "rev": "a402ad6de33fb9d594184cce296a2fb2e4e2b06a", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "cursor-fuzzy-time": { "flake": false, "locked": { - "lastModified": 1692623616, - "narHash": "sha256-mNsDqtDPhkxSqV6SHGDLbC5ZPUM2zaYZmXJB4RYNUuc=", + "lastModified": 1701938937, + "narHash": "sha256-vbgyu0L9YmzLEjP9N+KAIyblp9Knh3UL/8DgaYXO1Vs=", "owner": "NorfairKing", "repo": "cursor-fuzzy-time", - "rev": "46ceb8b78f49c076818569d4d9a178b18bb0376a", + "rev": "fc603f1b30899ec6a5a7ace7e9f41295544d38ac", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "dekking": { "flake": false, "locked": { - "lastModified": 1697914016, - "narHash": "sha256-f7GKRmZQMztuEHLdu3B29j+mldMunzwO03GcEFw+7eY=", + "lastModified": 1702048665, + "narHash": "sha256-DHGLHBiZMNUaaVDVM979gKh2N5BqOssBIQTWGKfoPls=", "owner": "NorfairKing", "repo": "dekking", - "rev": "930252d59c3bb5c2d51cb02ecc6863d93e623c6a", + "rev": "e74091e032254c70740769996564d55ceac51278", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "dirforest": { "flake": false, "locked": { - "lastModified": 1692622519, - "narHash": "sha256-duFdCU0gRapwDus0KU5z6fv6dEEfV79LsUdjoGpA79o=", + "lastModified": 1701872328, + "narHash": "sha256-Wh9pXg127iCzRjN6wwfZzHqEFxbKqDt1FKUcYoRJsJM=", "owner": "NorfairKing", "repo": "dirforest", - "rev": "afa8b27feaabdfd584ed3200d6cc53dab94b29aa", + "rev": "e01906b7ecc4979a7d80820aa421425cc1b37f8d", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "fast-myers-diff": { "flake": false, "locked": { - "lastModified": 1696885120, - "narHash": "sha256-wqJ0/P3pXOISDhRHpEt11GVYllb+DFt46Mh+k/y1bYw=", + "lastModified": 1701674450, + "narHash": "sha256-1RP8wXPZGKB/OSdxcjvxAJCqC+trWzrNcD7UGAdpHiA=", "owner": "NorfairKing", "repo": "fast-myers-diff", - "rev": "c106ef803c69ef9440399247ec4ffd59c84f6fc7", + "rev": "7fe372e635f293cc76de95773bdc4f0eaae89597", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "feedback": { "flake": false, "locked": { - "lastModified": 1699717881, - "narHash": "sha256-8PYJ5UBACkS56RW6Ewb8okt9fnspQascL5kWLapkeU4=", + "lastModified": 1701944562, + "narHash": "sha256-qQKklG0jSeUpCFxmsbRzanmMo9R6EULQ0BXQCo67CYw=", "owner": "NorfairKing", "repo": "feedback", - "rev": "f891d19cd8bd1b6aebfca37f37261cc6c6ef2f27", + "rev": "f1d54595f3bdebc091bd269926bc99a657e7bfda", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "fuzzy-time": { "flake": false, "locked": { - "lastModified": 1692622961, - "narHash": "sha256-Vni6YvO59UDmTRuIdXryT5m5EBYUyya9d4wnYXoXM5Q=", + "lastModified": 1701871364, + "narHash": "sha256-I2rwYzm05x/L0kSj9JD6C7j2dQ5/jMLIrsQSAdEpkDI=", "owner": "NorfairKing", "repo": "fuzzy-time", - "rev": "a1c1d07a861ad984ed5b0fe6f5da74f373e814e6", + "rev": "575bc50b685bb7a8cc1810165408a16b3435caae", "type": "github" }, "original": { @@ -362,16 +362,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1702195709, + "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -379,11 +379,11 @@ "ical": { "flake": false, "locked": { - "lastModified": 1698913802, - "narHash": "sha256-olsCs4X7+tJJrEutDuyN2VEKFDZT6brRqUesQY6mrjg=", + "lastModified": 1701881999, + "narHash": "sha256-tMw9s2qI9jAs8tUHfam11u1rZo4Sjs95BWcX8S55RKs=", "owner": "NorfairKing", "repo": "ical", - "rev": "5d2ad0d37d04d0110d922dd88a4304e70d268dba", + "rev": "601ff6dd9e48e87fec524056e2e7e2234aabe147", "type": "github" }, "original": { @@ -395,11 +395,11 @@ "linkcheck": { "flake": false, "locked": { - "lastModified": 1685701263, - "narHash": "sha256-h6Pw8X+Bd61S/WMPbMYCQl6R7C2intDDEHedI6DPfS4=", + "lastModified": 1701875443, + "narHash": "sha256-+M79SDqj833VtQ31G+gYn2kYnnRP1Ju7fglGKbdKOfw=", "owner": "NorfairKing", "repo": "linkcheck", - "rev": "4ce1fd2b63db1401acb6ac87f5696af66837d9df", + "rev": "02d6a52177f4ea77dbd62fba04f51b0702797ca5", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "looper": { "flake": false, "locked": { - "lastModified": 1685975312, - "narHash": "sha256-e5l8bU8c9QIO4H/INtPxwyuIZuVRbvswTaHCZlj383A=", + "lastModified": 1701871265, + "narHash": "sha256-Ivw0OsjOdjcvBodaXKmo+ZBiTGP2mgUI17uaZ31HnWY=", "owner": "NorfairKing", "repo": "looper", - "rev": "a395be4d2edd17d81655baca20b3f68f954f4ce6", + "rev": "b9929b8a38777a044d4ca0fff9980be122cc5839", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "mergeful": { "flake": false, "locked": { - "lastModified": 1697187634, - "narHash": "sha256-Ym2f40NdmyVfEV9CfgQuSxoNyakH+VVfqfcEONHoKjk=", + "lastModified": 1701875441, + "narHash": "sha256-Shqrph/FSHcgXn1xAqvXTTuscaiQmQNUN76ytMMWG0s=", "owner": "NorfairKing", "repo": "mergeful", - "rev": "0c1e0ea93b9db61e1f0b81a9f36db4810b061a65", + "rev": "30812d2cd9ca71ea3716b89dbd8820502856706c", "type": "github" }, "original": { @@ -442,16 +442,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687466461, - "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=", - "owner": "nixos", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -490,43 +490,43 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700851152, - "narHash": "sha256-3PWITNJZyA3jz5IGREJRfSykM6xSLmD8u5A3WpBCyDM=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1685865905, - "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1685866647, - "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "validity": "validity" }, "locked": { - "lastModified": 1687352838, - "narHash": "sha256-2P3MZISa6qiwMGrt0Rsc+lPKzFYdvARwUzhvxvj6k3Y=", + "lastModified": 1702632142, + "narHash": "sha256-WA2SDidIOwWICL9ycH4ZrvWSE+2mkg3B1FsJApfkROU=", "owner": "Haskell-OpenAPI-Code-Generator", "repo": "Haskell-OpenAPI-Client-Code-Generator", - "rev": "aca57e0134f6322ecfaed226b2b4698f60f5a7f6", + "rev": "35f6ea94d0b49ead5cbb88b56027dd8e18c1aaa7", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685970613, - "narHash": "sha256-sMbR4zPciUfQ6YHt6GNVxT/yhWJKngvZo8qHzYkaU6E=", + "lastModified": 1700922917, + "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a117a1cd2c280bf8d499f26370fddfe1923e75e6", + "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "type": "github" }, "original": { @@ -606,11 +606,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", + "lastModified": 1702456155, + "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", + "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", "type": "github" }, "original": { @@ -656,11 +656,11 @@ "safe-coloured-text": { "flake": false, "locked": { - "lastModified": 1685693835, - "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=", + "lastModified": 1701675196, + "narHash": "sha256-VXPEeuP1BmYzCSe+1Qt715c3GiLUQ6XyPdnNYOhEQZc=", "owner": "NorfairKing", "repo": "safe-coloured-text", - "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0", + "rev": "5efd54e49de780700cd8af2039dff1579c75483c", "type": "github" }, "original": { @@ -672,11 +672,11 @@ "safe-coloured-text_2": { "flake": false, "locked": { - "lastModified": 1696884906, - "narHash": "sha256-7CanCNOCB5gFwqhEPFIoOojoM1iVJZKF5YRy7unUDuo=", + "lastModified": 1701941869, + "narHash": "sha256-BOsn+Q92scoIy0XPqAIjZ5iio2WE5mx0DThCdL1ajUs=", "owner": "NorfairKing", "repo": "safe-coloured-text", - "rev": "50abcbfa2a2ed15c6186fa2381fe818bd93a730b", + "rev": "b8f83cfb47ed6ada2da2d55979cf2b7dd3867b2f", "type": "github" }, "original": { @@ -688,11 +688,11 @@ "seocheck": { "flake": false, "locked": { - "lastModified": 1685701315, - "narHash": "sha256-H3i9ng2kO+FYtVoEG07CBS8gLB+qvLnyazwFpCSu5oE=", + "lastModified": 1701875442, + "narHash": "sha256-DbMNVgSmt2weeJ9Th6vN+vuyiaaJJwzV8QqoDV2qHro=", "owner": "NorfairKing", "repo": "seocheck", - "rev": "6226a03a68c0504cd36870a0859a0f88e058e9d7", + "rev": "ae488b173bdd3962b7429ae4fed7c9bc11250a4d", "type": "github" }, "original": { @@ -721,11 +721,11 @@ "sydtest": { "flake": false, "locked": { - "lastModified": 1685692408, - "narHash": "sha256-2cuINpkl9UFyzaQMqQFAeZy1FPzaYpx8Og14HdcLHi0=", + "lastModified": 1701869719, + "narHash": "sha256-+qrn2utn8W754ifrm5phT3DtAtK78vjlNObFWRHRxHg=", "owner": "NorfairKing", "repo": "sydtest", - "rev": "dcd230e48f164594a473925fa0dbbaf956eb6848", + "rev": "d22ec20ca32854f880295cb373f84e874be916bb", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "sydtest_2": { "flake": false, "locked": { - "lastModified": 1696883645, - "narHash": "sha256-Yr5piSv96hgKC7z7aHqo8kMKJPyL8ZG2lbDb7oFUZxw=", + "lastModified": 1701869719, + "narHash": "sha256-+qrn2utn8W754ifrm5phT3DtAtK78vjlNObFWRHRxHg=", "owner": "NorfairKing", "repo": "sydtest", - "rev": "6313c1b211d14c1215cdf97b9933675cf9c2adb9", + "rev": "d22ec20ca32854f880295cb373f84e874be916bb", "type": "github" }, "original": { @@ -783,11 +783,11 @@ "template-haskell-reload": { "flake": false, "locked": { - "lastModified": 1685954967, - "narHash": "sha256-50GE3cFrZsp7x2evD1klatjSa4pmFF+z1az4CP+AVX8=", + "lastModified": 1701875519, + "narHash": "sha256-VkEVHmTp/uBatmKtEFK7aAZX6Yq3Rd932KMdnljh7tA=", "owner": "NorfairKing", "repo": "template-haskell-reload", - "rev": "b37bb9bceb03c69620ca30aa8e911912c3e74713", + "rev": "5e8acede90523942cb626d9d47873e477f831423", "type": "github" }, "original": { @@ -799,11 +799,11 @@ "validity": { "flake": false, "locked": { - "lastModified": 1685699735, - "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=", + "lastModified": 1701673254, + "narHash": "sha256-TsSkc2kqAoJ/S6HaK4t4S9r7nDvcHEPiNzMjlPnkb4Y=", "owner": "NorfairKing", "repo": "validity", - "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6", + "rev": "57c4897ccfeb3de60489e0328113798f059ef140", "type": "github" }, "original": { @@ -815,11 +815,11 @@ "validity_2": { "flake": false, "locked": { - "lastModified": 1696884006, - "narHash": "sha256-w2dKXZrNxXm/hsYkef5ZLTDxm3IsIzdj3i2qc1GC+A8=", + "lastModified": 1701673254, + "narHash": "sha256-TsSkc2kqAoJ/S6HaK4t4S9r7nDvcHEPiNzMjlPnkb4Y=", "owner": "NorfairKing", "repo": "validity", - "rev": "34e17fe6d92765209f1db8127aee13c74285805d", + "rev": "57c4897ccfeb3de60489e0328113798f059ef140", "type": "github" }, "original": { @@ -831,11 +831,11 @@ "yesod-autoreload": { "flake": false, "locked": { - "lastModified": 1691567166, - "narHash": "sha256-+7sDs7yoxA4FY6qKzNVEIV+mIkp96IjwLZT5z5yLSH0=", + "lastModified": 1701870511, + "narHash": "sha256-Bk4w5HDdN3CyIIxrKDsNe0uB79aWn/gqb8O80XxB3o0=", "owner": "NorfairKing", "repo": "yesod-autoreload", - "rev": "dfd89eaa65f77c1f1a5a38810d9513b3649971e4", + "rev": "f6455e7ccb58c8e13c4698869812e73e015f94fc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01a8165cf..de3fa020a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,8 @@ extra-trusted-public-keys = "smos.cachix.org-1:YOs/tLEliRoyhx7PnNw36cw2Zvbw5R0ASZaUlpUv+yM="; }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.05"; - home-manager.url = "github:nix-community/home-manager?ref=release-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.11"; + home-manager.url = "github:nix-community/home-manager?ref=release-23.11"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; haskell-dependency-graph-nix.url = "github:NorfairKing/haskell-dependency-graph-nix"; haskell-dependency-graph-nix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/overlay.nix b/nix/overlay.nix index b9c3d0d1e..f8709dacc 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -342,47 +342,28 @@ in }; + servantPkg = name: subdir: self.callCabal2nix name + ((builtins.fetchGit { + url = "https://github.com/haskell-servant/servant"; + rev = "552da96ff9a6d81a8553c6429843178d78356054"; + }) + "/${subdir}") + { }; + servantPackages = { + "servant" = servantPkg "servant" "servant"; + "servant-client" = servantPkg "servant-client" "servant-client"; + "servant-client-core" = servantPkg "servant-client-core" "servant-client-core"; + "servant-server" = servantPkg "servant-server" "servant-server"; + "servant-auth" = servantPkg "servant-auth-client" "servant-auth/servant-auth"; + "servant-auth-client" = servantPkg "servant-auth-client" "servant-auth/servant-auth-client"; + "servant-auth-server" = servantPkg "servant-auth-server" "servant-auth/servant-auth-server"; + }; + in { inherit smosPackages; zip = dontCheck (enableCabalFlag (super.zip.override { bzlib-conduit = null; }) "disable-bzip2"); # These are turned off for the same reason as the local packages tests - brick = self.callCabal2nix "brick" - ( - builtins.fetchTarball { - url = "https://hackage.haskell.org/package/brick-1.6/brick-1.6.tar.gz"; - sha256 = "0smfwip8pyzl48l4y1p23fgbl063zdf3yzrbq41hb7lvsa7lbdiy"; - } - ) - { }; - bimap = self.callCabal2nix "bimap" - ( - builtins.fetchTarball { - url = "https://hackage.haskell.org/package/bimap-0.5.0/bimap-0.5.0.tar.gz"; - sha256 = "1p1bqvkbzjkwhrhhwcx0d4j52pa7287jdh45c8xzgksh1z33xg55"; - } - ) - { }; - text-zipper = self.callCabal2nix "text-zipper" - ( - builtins.fetchTarball { - url = "https://hackage.haskell.org/package/text-zipper-0.13/text-zipper-0.13.tar.gz"; - sha256 = "1wdr8bksdlzaqm2nnmj0nxlw6hkhgipwgb4c6aia4lk19h7vyvms"; - } - ) - { }; - vty = self.callCabal2nix "vty" - ( - builtins.fetchTarball { - url = "https://hackage.haskell.org/package/vty-5.36/vty-5.36.tar.gz"; - sha256 = "05gnrp2qyc6199s9m2y28sxszv4h03y6nwf5j42vbgj2vn3k71cq"; - } - ) - { }; - - - - } // amazonkaPackages // smosPackages + } // amazonkaPackages // servantPackages // smosPackages ); } ); diff --git a/smos-data/src/Smos/Data.hs b/smos-data/src/Smos/Data.hs index 1a9cf13dd..ee6523d11 100644 --- a/smos-data/src/Smos/Data.hs +++ b/smos-data/src/Smos/Data.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE ImpredicativeTypes #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RecordWildCards #-} module Smos.Data @@ -132,7 +132,10 @@ versionCheck oldestSupported newestSupported versionToCheck = dataVersionCheck :: Version -> VersionCheck dataVersionCheck = versionCheck oldestParsableDataVersion newestParsableDataVersion -parseWithVersionCheck :: (forall a. FromJSON a => ByteString -> Either String a) -> ByteString -> Either String SmosFile +parseWithVersionCheck :: + (forall a. FromJSON a => ByteString -> Either String a) -> + ByteString -> + Either String SmosFile parseWithVersionCheck parseFunc sb = case parseFunc sb of Right sf -> Right sf diff --git a/smos-notify/src/Smos/Notify/DB.hs b/smos-notify/src/Smos/Notify/DB.hs index 11c8be5f3..084873a0c 100644 --- a/smos-notify/src/Smos/Notify/DB.hs +++ b/smos-notify/src/Smos/Notify/DB.hs @@ -9,6 +9,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-} diff --git a/smos-server/src/Smos/Server/DB.hs b/smos-server/src/Smos/Server/DB.hs index 92f5ecc68..d10d3dc27 100644 --- a/smos-server/src/Smos/Server/DB.hs +++ b/smos-server/src/Smos/Server/DB.hs @@ -9,6 +9,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-} diff --git a/smos-server/src/Smos/Server/Handler/PostSync.hs b/smos-server/src/Smos/Server/Handler/PostSync.hs index 334f81daa..914b27750 100644 --- a/smos-server/src/Smos/Server/Handler/PostSync.hs +++ b/smos-server/src/Smos/Server/Handler/PostSync.hs @@ -2,6 +2,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeOperators #-} module Smos.Server.Handler.PostSync ( servePostSync, diff --git a/smos-sync-client/src/Smos/Sync/Client/DB.hs b/smos-sync-client/src/Smos/Sync/Client/DB.hs index da29ac05d..77f2203e8 100644 --- a/smos-sync-client/src/Smos/Sync/Client/DB.hs +++ b/smos-sync-client/src/Smos/Sync/Client/DB.hs @@ -9,6 +9,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-} diff --git a/smos-web-server/src/Smos/Web/Server/Foundation.hs b/smos-web-server/src/Smos/Web/Server/Foundation.hs index 1dec8d912..38b17aac1 100644 --- a/smos-web-server/src/Smos/Web/Server/Foundation.hs +++ b/smos-web-server/src/Smos/Web/Server/Foundation.hs @@ -7,6 +7,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE ViewPatterns #-} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/smos-web-server/src/Smos/Web/Server/SmosSession.hs b/smos-web-server/src/Smos/Web/Server/SmosSession.hs index 0b52faec4..eddb48810 100644 --- a/smos-web-server/src/Smos/Web/Server/SmosSession.hs +++ b/smos-web-server/src/Smos/Web/Server/SmosSession.hs @@ -1,6 +1,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} module Smos.Web.Server.SmosSession where diff --git a/smos/src/Smos/Actions/Forest.hs b/smos/src/Smos/Actions/Forest.hs index 4efed084f..207b785ec 100644 --- a/smos/src/Smos/Actions/Forest.hs +++ b/smos/src/Smos/Actions/Forest.hs @@ -1,5 +1,5 @@ +{-# LANGUAGE ImpredicativeTypes #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RankNTypes #-} module Smos.Actions.Forest ( allForestPlainActions, diff --git a/stack.yaml b/stack.yaml index 4a28ed663..b7fc42830 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.25 +resolver: lts-21.22 packages: - smos - smos-data @@ -39,11 +39,16 @@ ghc-options: smos-stripe-client: -w # Turn off warnings for the generated code. extra-deps: -# Newer brick -- brick-1.6 -- vty-5.38 -- bimap-0.5.0@sha256:aba506d02a1c93fc2b50dcbe728d2a4d07cca89b7033945418061a0b08576ebd,1889 -- text-zipper-0.13@sha256:e1a48d69c9324ed3784bc39d5ded84d63ea3115b32a018ddf76158ed9d58dc0a,1472 +- github: NorfairKing/servant + commit: 552da96ff9a6d81a8553c6429843178d78356054 + subdirs: + - servant + - servant-auth/servant-auth + - servant-auth/servant-auth-client + - servant-auth/servant-auth-server + - servant-client + - servant-client-core + - servant-server - github: NorfairKing/conformance commit: 2c236fd28c4cef63cd40d04631c5462d1df37759 @@ -66,7 +71,7 @@ extra-deps: - genvalidity-typed-uuid - github: NorfairKing/mergeful - commit: 3d65752421c2fa49377540dfd95bb26eba19be10 + commit: 30812d2cd9ca71ea3716b89dbd8820502856706c subdirs: - mergeful - mergeful-persistent @@ -205,13 +210,8 @@ extra-deps: subdirs: - template-haskell-reload -- github-0.27@sha256:2288b807a4bd97fefeff75487ef5d2ed31f0faa18f306e01e5f5cb498e228208,7033 - -- HaskellNet-0.6.0.1@sha256:061c503b5295e961cbe809b37305556a185ef99bc163d648c92870e3e2facca9,2376 -- HaskellNet-SSL-0.3.4.4@sha256:6a1a3c6d3804e857d183e702214476a383628eac83eb4bcbc7d5c4b8a2e05bf3,1704 - - github: brendanhay/amazonka - commit: 2dc498fe75ff47db2db3ee63e042b1aa3da57c0f + commit: 9c3594073a7787e27f13fa14c936f0fa5cb9f0e8 subdirs: - lib/amazonka - lib/amazonka-core