From 7663de773738a4f531534a247e550c071b4544c5 Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:19:44 +0200 Subject: [PATCH 1/6] Bump GHC9.0.2 -> GHC9.6.6 --- alfred-margaret.cabal | 2 ++ default.nix | 4 ++-- nix/{ghc902-overlay.nix => ghc966-overlay.nix} | 2 +- nix/haskell-overlay.nix | 4 +--- nix/nixpkgs-pinned.nix | 2 +- stack-shell.nix | 2 +- stack.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename nix/{ghc902-overlay.nix => ghc966-overlay.nix} (55%) diff --git a/alfred-margaret.cabal b/alfred-margaret.cabal index f18d409..d5f0b41 100644 --- a/alfred-margaret.cabal +++ b/alfred-margaret.cabal @@ -21,6 +21,8 @@ tested-with: , GHC == 8.10.7 -- Nixpkgs unstable (Updated 2022-04-14) , GHC == 9.0.2 + -- Nixpkgs unstable (Updated 2024-09-05) + , GHC == 9.6.6 source-repository head type: git diff --git a/default.nix b/default.nix index 9c89d2b..de01153 100644 --- a/default.nix +++ b/default.nix @@ -18,14 +18,14 @@ let stack # Haskell dependencies - (ghc902Packages.ghcWithPackages haskellDependencies) + (ghc966Packages.ghcWithPackages haskellDependencies) # Other llvm_9 ] ++ # We don't use the overlay here because the tooling doesn't need it. # The advantage of doing so is that these packages are already available in a global cache. - lib.optionals hsTools (with haskell.packages.ghc902; [ + lib.optionals hsTools (with haskell.packages.ghc966; [ haskell-language-server implicit-hie ]) ++ diff --git a/nix/ghc902-overlay.nix b/nix/ghc966-overlay.nix similarity index 55% rename from nix/ghc902-overlay.nix rename to nix/ghc966-overlay.nix index 1d9392e..483d868 100644 --- a/nix/ghc902-overlay.nix +++ b/nix/ghc966-overlay.nix @@ -2,5 +2,5 @@ self: super: let haskellOverlay = import ./haskell-overlay.nix; in { - ghc902Packages = super.haskell.packages.ghc902.extend haskellOverlay; + ghc966Packages = super.haskell.packages.ghc966.extend haskellOverlay; } diff --git a/nix/haskell-overlay.nix b/nix/haskell-overlay.nix index 2a141e6..478c7b6 100644 --- a/nix/haskell-overlay.nix +++ b/nix/haskell-overlay.nix @@ -1,5 +1,3 @@ self: super: { - hashable = self.hashable_1_4_0_2; - parsec = self.parsec_3_1_15_0; - text = self.text_2_0; + } diff --git a/nix/nixpkgs-pinned.nix b/nix/nixpkgs-pinned.nix index 8ed5941..43915c4 100644 --- a/nix/nixpkgs-pinned.nix +++ b/nix/nixpkgs-pinned.nix @@ -3,5 +3,5 @@ let sources = import ./sources.nix; in import sources.nixpkgs { - overlays = [(import ./ghc902-overlay.nix)] ++ overlays; + overlays = [(import ./ghc966-overlay.nix)] ++ overlays; } diff --git a/stack-shell.nix b/stack-shell.nix index f7919a7..4cf2de7 100644 --- a/stack-shell.nix +++ b/stack-shell.nix @@ -14,7 +14,7 @@ let in pkgs.haskell.lib.buildStackProject { name = "alfred-margaret"; - ghc = pkgs.ghc902Packages.ghcWithPackages haskellDependencies; + ghc = pkgs.ghc966Packages.ghcWithPackages haskellDependencies; buildInputs = with pkgs; [ llvm_9 zlib diff --git a/stack.yaml b/stack.yaml index 522ba36..1acb1ee 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: ghc-9.0.2 +resolver: ghc-9.6.6 packages: - . - benchmark/haskell From e0fa523f90e5393db6aa8adefa1f978b18c90ea0 Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:21:02 +0200 Subject: [PATCH 2/6] Bump dependency bounds for `alfred-margaret.cabal` Closes: https://github.com/channable/alfred-margaret/issues/62 --- alfred-margaret.cabal | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/alfred-margaret.cabal b/alfred-margaret.cabal index d5f0b41..4a3d6f8 100644 --- a/alfred-margaret.cabal +++ b/alfred-margaret.cabal @@ -60,11 +60,11 @@ library , Data.TypedByteArray build-depends: base >= 4.7 && < 5 - , containers >= 0.6 && < 0.7 - , deepseq >= 1.4 && < 1.5 - , hashable >= 1.4.0.2 && < 1.5 - , primitive >= 0.6.4 && < 0.9 - , text >= 2.0 && < 2.1 + , containers >= 0.6 && < 0.8 + , deepseq >= 1.4 && < 1.6 + , hashable >= 1.4.0.2 && < 1.6 + , primitive >= 0.6.4 && < 0.10 + , text >= 2.0 && < 2.2 , unordered-containers >= 0.2.9 && < 0.3 , vector >= 0.12 && < 0.14 ghc-options: -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns -O2 From b99632681f91d285c9816fdc14b991eba5ee8bbe Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:22:02 +0200 Subject: [PATCH 3/6] Bump `llvm_9` -> `llvm_13` --- default.nix | 2 +- stack-shell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index de01153..1bae0d8 100644 --- a/default.nix +++ b/default.nix @@ -21,7 +21,7 @@ let (ghc966Packages.ghcWithPackages haskellDependencies) # Other - llvm_9 + llvm_13 ] ++ # We don't use the overlay here because the tooling doesn't need it. # The advantage of doing so is that these packages are already available in a global cache. diff --git a/stack-shell.nix b/stack-shell.nix index 4cf2de7..d4b8876 100644 --- a/stack-shell.nix +++ b/stack-shell.nix @@ -16,7 +16,7 @@ in name = "alfred-margaret"; ghc = pkgs.ghc966Packages.ghcWithPackages haskellDependencies; buildInputs = with pkgs; [ - llvm_9 + llvm_13 zlib libacbench ]; From 6082a9b2995c7f1dedefd0a6b26d6027f237a88c Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:23:00 +0200 Subject: [PATCH 4/6] Bump `nixpkgs-unstable` pin on 2024-09-05 --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 0461ebc..391518b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "0343e3415784b2cd9c68924294794f7dbee12ab3", - "sha256": "0ypgcim0vbv2742m7rb1010ga4zlayvpdma5qqw13brp8q5vjvcy", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "sha256": "1v3y9km48glcmgzk7h8s9sg5sgv1w86pyad973d981sk84a85cdl", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/0343e3415784b2cd9c68924294794f7dbee12ab3.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/b833ff01a0d694b910daca6e2ff4a3f26dee478c.tar.gz", "url_template": "https://github.com///archive/.tar.gz", "version": "5e7fb7699c84da3420495e40459dfbff459c16e4" } From 0ca708034e17e038ffff776b2733e8d4f477e75b Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:23:28 +0200 Subject: [PATCH 5/6] Bump `niv`'s `sources.nix file (`niv init`) --- nix/sources.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nix/sources.nix b/nix/sources.nix index 1938409..41af0c6 100644 --- a/nix/sources.nix +++ b/nix/sources.nix @@ -31,8 +31,10 @@ let if spec ? branch then "refs/heads/${spec.branch}" else if spec ? tag then "refs/tags/${spec.tag}" else abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; + submodules = if spec ? submodules then spec.submodules else false; in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; + builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; } + // (if builtins.compareVersions builtins.nixVersion "2.4" >= 0 then { inherit submodules; } else {}); fetch_local = spec: spec.path; From 6ecdb32c8c5d7cf4fdb07e2bb24b220f4e08b694 Mon Sep 17 00:00:00 2001 From: Reinier Maas Date: Thu, 5 Sep 2024 12:23:42 +0200 Subject: [PATCH 6/6] Update `changelog.md` --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15af741..b6bd4fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v2.1.0.1 - "Higher bounds!" (2024-09-05) + +Tested on GHC 9.6.6. + +- Revise dependency bounds ([#62](https://github.com/channable/alfred-margaret/issues/62) thanks @Bodigrim) +- Allow using primitive < 0.9 and vector < 0.14 ([#59](https://github.com/channable/alfred-margaret/pull/59) thanks @rampion) + ## v2.1.0.0 - "All The Cases!" (2022-08-31) - Added a case-insensitive variant of the Boyer-Moore algorithm in the `Data.Text.BoyerMooreCI.*` modules. ([#47](https://github.com/channable/alfred-margaret/pull/47))