From 5c063245d4f54883c811c50455a2a9dae8d10e1b Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 2 Mar 2024 14:33:02 +0800 Subject: [PATCH 1/3] haskellPackages.ema: More jailbreaks to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8542d16e080c8..19c1a1131eeef 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1623,11 +1623,12 @@ self: super: { sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }) super.splot; - # Fix build with newer monad-logger: https://github.com/obsidiansystems/monad-logger-extras/pull/5 + # 2023-07-27: Fix build with newer monad-logger: https://github.com/obsidiansystems/monad-logger-extras/pull/5 + # 2024-03-02: jailbreak for ansi-terminal <0.12, mtl <2.3 monad-logger-extras = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/monad-logger-extras/commit/55d414352e740a5ecacf313732074d9b4cf2a6b3.patch"; sha256 = "sha256-xsQbr/QIrgWR0uwDPtV0NRTbVvP0tR9bY9NMe1JzqOw="; - }) super.monad-logger-extras; + }) (doJailbreak super.monad-logger-extras); # Fails with encoding problems, likely needs locale data. # Test can be executed by adding which to testToolDepends and @@ -2491,6 +2492,9 @@ self: super: { # 2023-07-18: https://github.com/srid/ema/issues/156 ema = doJailbreak super.ema; + # 2024-03-02: base <=4.18.0.0 - https://github.com/srid/url-slug/issues/1 + url-slug = doJailbreak super.url-slug; + glirc = doJailbreak (super.glirc.override { vty = self.vty_5_35_1; }); From d26becd0acba29cc3112e61a59073906e75b5759 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 2 Mar 2024 15:19:05 +0800 Subject: [PATCH 2/3] haskellPackages.emanote: Fix build with jailbreaks and patch --- .../haskell-modules/configuration-common.nix | 34 ++++++++++++++++--- .../configuration-hackage2nix/broken.yaml | 4 --- .../configuration-hackage2nix/main.yaml | 1 - 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 19c1a1131eeef..640e1cd5ead51 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2492,7 +2492,7 @@ self: super: { # 2023-07-18: https://github.com/srid/ema/issues/156 ema = doJailbreak super.ema; - # 2024-03-02: base <=4.18.0.0 - https://github.com/srid/url-slug/issues/1 + # 2024-03-02: base <=4.18.0.0 https://github.com/srid/url-slug/pull/2 url-slug = doJailbreak super.url-slug; glirc = doJailbreak (super.glirc.override { @@ -2729,9 +2729,35 @@ self: super: { # multiple bounds too strict snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; - emanote = super.emanote.overrideScope (lself: lsuper: { - commonmark-extensions = lself.commonmark-extensions_0_2_3_2; - }); + # Test failure https://gitlab.com/lysxia/ap-normalize/-/issues/2 + ap-normalize = dontCheck super.ap-normalize; + + heist-extra = doJailbreak super.heist-extra; # base <4.18.0.0.0 + unionmount = doJailbreak super.unionmount; # base <4.18 + path-tree = doJailbreak super.path-tree; # base <4.18 https://github.com/srid/pathtree/pull/1 + tailwind = doJailbreak super.tailwind; # base <=4.17.0.0 + tagtree = doJailbreak super.tagtree; # base <=4.17 https://github.com/srid/tagtree/issues/1 + commonmark-wikilink = doJailbreak super.commonmark-wikilink; # base <4.18.0.0.0 + + # 2024-03-02: Apply unreleased changes necessary for compatibility + # with commonmark-extensions-0.2.5.3. + commonmark-simple = assert super.commonmark-simple.version == "0.1.0.0"; + appendPatches (map ({ rev, hash }: fetchpatch { + name = "commonmark-simple-${lib.substring 0 7 rev}.patch"; + url = "https://github.com/srid/commonmark-simple/commit/${rev}.patch"; + includes = [ "src/Commonmark/Simple.hs" ]; + inherit hash; + }) [ + { + rev = "71f5807ed4cbd8da915bf5ba04cd115b49980bcb"; + hash = "sha256-ibDQbyTd2BoA0V+ldMOr4XYurnqk1nWzbJ15tKizHrM="; + } + { + rev = "fc106c94f781f6a35ef66900880edc08cbe3b034"; + hash = "sha256-9cpgRNFWhpSuSttAvnwPiLmi1sIoDSYbp0sMwcKWgDQ="; + } + ]) + (doJailbreak super.commonmark-simple); # Test files missing from sdist # https://github.com/tweag/webauthn/issues/166 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2c223be952895..e7404ef8ef079 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -825,7 +825,6 @@ broken-packages: - Command # failure in job https://hydra.nixos.org/build/233249718 at 2023-09-02 - Commando # failure in job https://hydra.nixos.org/build/233248911 at 2023-09-02 - commodities # failure in job https://hydra.nixos.org/build/233239851 at 2023-09-02 - - commonmark-simple # failure in job https://hydra.nixos.org/build/245703574 at 2024-01-07 - Compactable # failure in job https://hydra.nixos.org/build/233227285 at 2023-09-02 - compactable # failure in job https://hydra.nixos.org/build/233228106 at 2023-09-02 - compact-list # failure in job https://hydra.nixos.org/build/233241961 at 2023-09-02 @@ -3985,7 +3984,6 @@ broken-packages: - pandoc-include-plus # failure in job https://hydra.nixos.org/build/233198059 at 2023-09-02 - pandoc-lens # failure in job https://hydra.nixos.org/build/233251239 at 2023-09-02 - pandoc-linear-table # failure in job https://hydra.nixos.org/build/233254813 at 2023-09-02 - - pandoc-link-context # failure in job https://hydra.nixos.org/build/233254006 at 2023-09-02 - pandoc-logic-proof # failure in job https://hydra.nixos.org/build/233223409 at 2023-09-02 - pandoc-markdown-ghci-filter # failure in job https://hydra.nixos.org/build/233213731 at 2023-09-02 - pandoc-placetable # failure in job https://hydra.nixos.org/build/233243163 at 2023-09-02 @@ -5381,12 +5379,10 @@ broken-packages: - tagsoup-megaparsec # failure in job https://hydra.nixos.org/build/233205700 at 2023-09-02 - tagsoup-parsec # failure in job https://hydra.nixos.org/build/233200887 at 2023-09-02 - tagsoup-selection # failure in job https://hydra.nixos.org/build/233228969 at 2023-09-02 - - tagtree # failure in job https://hydra.nixos.org/build/233209409 at 2023-09-02 - tahoe-capabilities # failure in job https://hydra.nixos.org/build/233253813 at 2023-09-02 - tahoe-chk # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237298038 at 2023-10-21 - tai64 # failure in job https://hydra.nixos.org/build/233257422 at 2023-09-02 - tai # failure in job https://hydra.nixos.org/build/233210483 at 2023-09-02 - - tailwind # failure in job https://hydra.nixos.org/build/233238757 at 2023-09-02 - tak # failure in job https://hydra.nixos.org/build/233191188 at 2023-09-02 - Takusen # failure in job https://hydra.nixos.org/build/233230088 at 2023-09-02 - takusen-oracle # failure in job https://hydra.nixos.org/build/233197944 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5907ddbb9971a..3189d0f236750 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -113,7 +113,6 @@ extra-packages: - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* - - commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3) - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.* From 97dc55595774320001d5a9482761fc3b261f6875 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 2 Mar 2024 15:14:17 +0800 Subject: [PATCH 3/3] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../transitive-broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 31 ++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9cacf439aa774..fddb04e8b9c42 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1216,7 +1216,6 @@ dont-distribute-packages: - emacs-keys - email - emailparse - - emanote - embroidery - emd - engine-io-growler diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index df0f025c48954..a201ff8d1c054 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -69114,15 +69114,15 @@ self: { mainProgram = "commonmark"; }) {}; - "commonmark-extensions_0_2_3_2" = callPackage + "commonmark-extensions_0_2_4" = callPackage ({ mkDerivation, base, commonmark, containers, emojis, filepath , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text , transformers }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.2"; - sha256 = "1k5rlh2grg6g1waszhp565m360n1iynjvbkjz8xmap8y234g1bjj"; + version = "0.2.4"; + sha256 = "1yrz32lbipzwvxmy4i3vkvs735jfd9jvlhfzh6xm2nx2rjapnx9n"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -69157,6 +69157,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-pandoc_0_2_1_3" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.1.3"; + sha256 = "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -69188,8 +69204,6 @@ self: { ]; description = "Simple interface to commonmark-hs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "commonmark-wikilink" = callPackage @@ -97191,7 +97205,6 @@ self: { description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; badPlatforms = [ "x86_64-darwin" ]; - hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; maintainers = [ lib.maintainers.srid ]; }) {}; @@ -224288,8 +224301,6 @@ self: { ]; description = "Extract \"contextual links\" from Pandoc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-logic-proof" = callPackage @@ -292315,8 +292326,6 @@ self: { ]; description = "Hierarchical Tags & Tag Trees"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tahoe-capabilities" = callPackage @@ -292602,9 +292611,7 @@ self: { ]; description = "Tailwind wrapped in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tailwind-run"; - broken = true; }) {}; "tak" = callPackage