From 75f01ec9094f29477e53e043c72bfd17c27bdab1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 4 May 2021 16:06:57 +0200 Subject: [PATCH] yi: unbreak yi-language: apply patch allowing newer regex-* dependencies --- .../haskell-modules/configuration-common.nix | 10 ++++++ .../configuration-hackage2nix.yaml | 16 ---------- .../haskell-modules/hackage-packages.nix | 32 ------------------- 3 files changed, 10 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f08525a54504..191b4fea7603 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1810,4 +1810,14 @@ self: super: { # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42 hyper-extra = doJailbreak super.hyper-extra; + # Fixes too strict version bounds on regex libraries + # Presumably to be removed at the next release + yi-language = appendPatch super.yi-language (pkgs.fetchpatch { + url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; + sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01"; + includes = [ "yi-language.cabal" ]; + stripLen = 2; + extraPrefix = ""; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 005a3a69e8f4..21b6716d0649 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -11883,24 +11883,8 @@ broken-packages: - yggdrasil - yhccore - yhseq - - yi - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-language - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - yi-monokai - - yi-snippet - yi-solarized - yi-spolsky - yices diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c2df2f968724..381bc6b83537 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -290668,8 +290668,6 @@ self: { ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-contrib" = callPackage @@ -290720,8 +290718,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-dynamic-configuration" = callPackage @@ -290738,8 +290734,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-emacs-colours" = callPackage @@ -290751,8 +290745,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-pango" = callPackage @@ -290772,8 +290764,6 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-vty" = callPackage @@ -290791,8 +290781,6 @@ self: { ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-fuzzy-open" = callPackage @@ -290811,8 +290799,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-gtk" = callPackage @@ -290840,8 +290826,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-cua" = callPackage @@ -290857,8 +290841,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-emacs" = callPackage @@ -290876,8 +290858,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-vim" = callPackage @@ -290904,8 +290884,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-language" = callPackage @@ -290933,8 +290911,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -290952,8 +290928,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-haskell" = callPackage @@ -290971,8 +290945,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-javascript" = callPackage @@ -290991,8 +290963,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-monokai" = callPackage @@ -291045,8 +291015,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-solarized" = callPackage