From 3a3c84e1921bb5bcc6d2230770e58efddba4603a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 31 Mar 2024 12:00:23 +0200 Subject: [PATCH] haskellPackages.idris: fix --- .../haskell-modules/configuration-common.nix | 18 +++++++++++------- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5587800b63e9..e9c0303afb55 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1095,15 +1095,19 @@ self: super: { }) newer; # * The standard libraries are compiled separately. - # * We need a patch from master to fix compilation with - # updated dependencies (haskeline and megaparsec) which can be + # * We need a few patches from master to fix compilation with + # updated dependencies which can be # removed when the next idris release comes around. - idris = self.generateOptparseApplicativeCompletions [ "idris" ] + idris = lib.pipe super.idris [ + dontCheck + doJailbreak (appendPatch (fetchpatch { - name = "idris-libffi-0.2.patch"; - url = "https://github.com/idris-lang/Idris-dev/commit/6d6017f906c5aa95594dba0fd75e7a512f87883a.patch"; - hash = "sha256-wyLjqCyLh5quHMOwLM5/XjlhylVC7UuahAM79D8+uls="; - }) (doJailbreak (dontCheck super.idris))); + name = "idris-bumps.patch"; + url = "https://github.com/idris-lang/Idris-dev/compare/c99bc9e4af4ea32d2172f873152b76122ee4ee14...cf78f0fb337d50f4f0dba235b6bbe67030f1ff47.patch"; + hash = "sha256-RCMIRHIAK1PCm4B7v+5gXNd2buHXIqyAxei4bU8+eCk="; + })) + (self.generateOptparseApplicativeCompletions [ "idris" ]) + ]; # Too strict bound on hspec # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f80089d6fb9e..ced72a5d30be 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3012,7 +3012,6 @@ broken-packages: - identifiers # failure in job https://hydra.nixos.org/build/233251845 at 2023-09-02 - idiii # failure in job https://hydra.nixos.org/build/233228586 at 2023-09-02 - idna2008 # failure in job https://hydra.nixos.org/build/233206444 at 2023-09-02 - - idris # failure in job https://hydra.nixos.org/build/253681757 at 2024-03-31 - IDynamic # failure in job https://hydra.nixos.org/build/233196222 at 2023-09-02 - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 31a29ebcf4b4..db12ebd8c773 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -167723,8 +167723,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage