gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.botan-bindings: Fix broken package

Browse Source 
- Patch few build errors related to pointers
- Add override for botan, so the package finds botan3
- Remove botan-bindings from broken.yaml and regenerate the hackage
  packages list

Signed-off-by: Mika Tammi <mikatammi@gmail.com>
This commit is contained in:
Mika Tammi
2025-08-01 17:58:14 +03:00
parent 770927f2ca
commit cc2a679575
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -3298,6 +3298,14 @@ with haskellLib;
# and therefore aren't uploaded to hackage # and therefore aren't uploaded to hackage
# Needs to be fixed upstream # Needs to be fixed upstream
haskore = dontCheck (doJailbreak super.haskore); haskore = dontCheck (doJailbreak super.haskore);
# 2025-08-01: Fixes few build errors related to pointers.
# https://github.com/haskell-cryptography/botan/pull/17
botan-bindings = appendPatch (pkgs.fetchpatch2 {
url = "https://github.com/haskell-cryptography/botan/commit/99de68c3938187b7ab740c6534ec032a4a236747.patch";
sha256 = "sha256-v255WFO9HsRuTAWFZG27TYbpoK7rJ1AuiCFNFIV18mI=";
stripLen = 1;
}) super.botan-bindings;
} }
// import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super // import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@@ -539,7 +539,6 @@ broken-packages:
- boring-window-switcher # failure in job https://hydra.nixos.org/build/233252547 at 2023-09-02 - boring-window-switcher # failure in job https://hydra.nixos.org/build/233252547 at 2023-09-02
- borsh # failure in job https://hydra.nixos.org/build/252718760 at 2024-03-16 - borsh # failure in job https://hydra.nixos.org/build/252718760 at 2024-03-16
- bot # failure in job https://hydra.nixos.org/build/233230089 at 2023-09-02 - bot # failure in job https://hydra.nixos.org/build/233230089 at 2023-09-02
- botan-bindings # failure in job https://hydra.nixos.org/build/253695799 at 2024-03-31
- botpp # failure in job https://hydra.nixos.org/build/233201674 at 2023-09-02 - botpp # failure in job https://hydra.nixos.org/build/233201674 at 2023-09-02
- bottom # failure in job https://hydra.nixos.org/build/233225154 at 2023-09-02 - bottom # failure in job https://hydra.nixos.org/build/233225154 at 2023-09-02
- bound-simple # failure in job https://hydra.nixos.org/build/233201896 at 2023-09-02 - bound-simple # failure in job https://hydra.nixos.org/build/233201896 at 2023-09-02

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -1767,4 +1767,6 @@ builtins.intersectAttrs super {
# Upper bounds of text and bytestring too strict: https://github.com/zsedem/haskell-cpython/pull/24 # Upper bounds of text and bytestring too strict: https://github.com/zsedem/haskell-cpython/pull/24
cpython = doJailbreak super.cpython; cpython = doJailbreak super.cpython;
botan-bindings = super.botan-bindings.override { botan = pkgs.botan3; };
} }

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@@ -114240,8 +114240,6 @@ self: {
libraryPkgconfigDepends = [ botan ]; libraryPkgconfigDepends = [ botan ];
description = "Raw Botan bindings"; description = "Raw Botan bindings";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
} }
) { botan = null; }; ) { botan = null; };