diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-07-02 16:02:32 +0900 |
|---|---|---|
| committer | Dennis Gosnell <cdep.illabout@gmail.com> | 2023-07-02 16:02:32 +0900 |
| commit | c15e0b6bdcb77f7a9bfef427b158c32023e33dff (patch) | |
| tree | 2ade527eabdb3d148c09ce5638afa9d326f2813d /pkgs | |
| parent | f5b28a0744186f9be570bedbc5717012577df150 (diff) | |
| download | nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar.gz nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar.bz2 nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar.lz nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar.xz nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.tar.zst nixpkgs-c15e0b6bdcb77f7a9bfef427b158c32023e33dff.zip | |
haskellPackages.crypton-x509: get building
Diffstat (limited to 'pkgs')
3 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f98dad60408..99012cd2dbe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1788,6 +1788,28 @@ self: super: { # https://github.com/jgm/pandoc/issues/7163 pandoc = dontCheck super.pandoc; + crypton-x509 = + lib.pipe + super.crypton-x509 + [ + # Mistype in a dependency in a test. + # https://github.com/kazu-yamamoto/crypton-certificate/pull/3 + (appendPatch + (fetchpatch { + name = "crypton-x509-rename-dep.patch"; + url = "https://github.com/kazu-yamamoto/crypton-certificate/commit/5281ff115a18621407b41f9560fd6cd65c602fcc.patch"; + hash = "sha256-pLzuq+baSDn+MWhtYIIBOrE1Js+tp3UsaEZy5MhWAjY="; + relative = "x509"; + }) + ) + # There is a revision in crypton-x509, so the above patch won't + # apply because of line endings in revised .cabal files. + (overrideCabal { + editedCabalFile = null; + revision = null; + }) + ]; + # * doctests don't work without cabal # https://github.com/noinia/hgeometry/issues/132 # * Too strict version bound on vector-builder diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 82b11e27f51..8b6a26ea0bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -956,7 +956,6 @@ broken-packages: - crypto-keys-ssh - crypto-multihash - crypto-numbers - - crypton-x509 # failure building test suite 'test-x509' in job https://hydra.nixos.org/build/225569131 at 2023-06-28 - crypto-pubkey-openssh - crypto-random-effect - crypto-simple diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 36691409846..7437ff6d085 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -72586,8 +72586,6 @@ self: { ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crypton-x509-store" = callPackage |