diff --git a/README.md b/README.md index 6fe957d3527ad9d8b8800156f74be0b839e06035..c977fa928cda960a8d81388634f9eef475b9ffe2 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # Horizon Haskell (Advance Package Set) -horizon-advance is a Package Set targetting GHC mainline. This package set -extends +horizon-advance is a Package Set targetting GHC mainline. This package +set extends [horizon-core](https://gitlab.horizon-haskell.net/package-sets/horizon-core). -While horizon-core only contains packages required to bootstrap the horizon -toolchain, horizon-advance contains packages required for canary testing -any compatibility issues with GHC mainline. This includes a mix of things -that make heavy use of system libraries, or perhaps template-haskell or -type-checker plugins. +While horizon-core only contains packages required to bootstrap the +horizon toolchain, horizon-advance contains packages required for canary +testing any compatibility issues with GHC mainline. This includes a mix +of things that make heavy use of system libraries, or perhaps +template-haskell or type-checker plugins. The following things are always expected to be here: @@ -37,9 +37,9 @@ The following things are always expected to be here: * vulkan-utils * wai-app-static -This is the master branch building against the GHC 9.12 pre-release. +This is the master branch building against ghc-9.12-alpha. -For other ocmpiler versions, see the protected branches named `lts/ghc-*`. +For other compiler versions, see the protected branches named `lts/ghc-*`. ## Updating the Package Set diff --git a/flake.lock b/flake.lock index cf8897dc0ea41a61470be5fbb1e3bec3a55407a3..bb471c76ea1cc372ff963002dad01a2ef9c76512 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1728019357, - "narHash": "sha256-8FB4varne9uSaq6S22470RKWIuZZRVm7tzMa+mlc1vA=", + "lastModified": 1729111300, + "narHash": "sha256-crbowiJMHwZlHZFUQwuo8vqVuj4kwuXeISWVDUY90q4=", "ref": "refs/heads/master", - "rev": "6e77e3b661ecb7318332f510f1c85480df7cda88", - "revCount": 1383, + "rev": "1ef0c63679552db368c7607244a8fc9a226e943c", + "revCount": 1391, "type": "git", "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" }, @@ -189,11 +189,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727914564, - "narHash": "sha256-S0KZLpF6yfX6c6ehfz2svB3VzYNJ8YxfQJH6NgyHNk8=", + "lastModified": 1729037774, + "narHash": "sha256-BmdllvnhVXFwOoh4y1lHydWp1J57gAK2qizzcxlgdeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d0ab8b5db9ba62989e648db86c66c0fb620b6e9", + "rev": "fe21c441dbc7103502d680cad61016cd7134835b", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728000969, - "narHash": "sha256-MYiswvy74bWkXGSk+D8Hhu7Gg2iel6Tu4J3sbgC3krg=", + "lastModified": 1729037774, + "narHash": "sha256-BmdllvnhVXFwOoh4y1lHydWp1J57gAK2qizzcxlgdeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4db941d790cc72a8b6867ccf85ef4e6d77e1097", + "rev": "fe21c441dbc7103502d680cad61016cd7134835b", "type": "github" }, "original": {