haskellPackages.HSH: patch openFd function from unix package

This commit is contained in:
hellwolf 2024-03-25 19:19:06 +02:00
parent 3edac3b767
commit 727df1e93f
No known key found for this signature in database
GPG Key ID: 1080B4863AD0F5D1
5 changed files with 20 additions and 13 deletions

View File

@ -2986,6 +2986,9 @@ self: super: {
})
] super.niv;
# 2024-03-25: HSH broken because of the unix-2.8.0.0 breaking change
HSH = appendPatches [./patches/HSH-unix-openFd.patch] super.HSH;
inherit
(let
unbreakRepa = packageName: drv: lib.pipe drv [

View File

@ -2762,7 +2762,6 @@ broken-packages:
- hsgnutls-yj # failure in job https://hydra.nixos.org/build/233220680 at 2023-09-02
- hsgsom # failure in job https://hydra.nixos.org/build/233192340 at 2023-09-02
- HsHaruPDF # failure in job https://hydra.nixos.org/build/233220916 at 2023-09-02
- HSH # failure in job https://hydra.nixos.org/build/252713464 at 2024-03-16
- HsHyperEstraier # failure in job https://hydra.nixos.org/build/233253787 at 2023-09-02
- hsI2C # failure in job https://hydra.nixos.org/build/233247520 at 2023-09-02
- hSimpleDB # failure in job https://hydra.nixos.org/build/233236736 at 2023-09-02

View File

@ -873,7 +873,6 @@ dont-distribute-packages:
- clckwrks-theme-bootstrap
- clckwrks-theme-clckwrks
- clckwrks-theme-geo-bootstrap
- clean-home
- cleff-plugin
- cless
- cleveland
@ -1098,7 +1097,6 @@ dont-distribute-packages:
- ddc-tools
- ddc-war
- ddci-core
- debian-binary
- debug
- decidable
- decimal-arithmetic
@ -2078,7 +2076,6 @@ dont-distribute-packages:
- hesh
- hesql
- heterolist
- hevm
- hevolisa
- hevolisa-dph
- hexpat-conduit
@ -2896,7 +2893,6 @@ dont-distribute-packages:
- mysql-simple-typed
- mywatch
- mywork
- n-m
- n2o-web
- nakadi-client
- named-servant-client
@ -3453,7 +3449,6 @@ dont-distribute-packages:
- rest-types
- rest-wai
- restful-snap
- restless-git
- restricted-workers
- rethinkdb-model
- rethinkdb-wereHamster

View File

@ -9716,8 +9716,6 @@ self: {
];
description = "Library to mix shell scripting with Haskell programs";
license = "LGPL";
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"HSHHelpers" = callPackage
@ -65701,7 +65699,6 @@ self: {
];
description = "Keep your home dir clean by finding old conf files";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "clean-home";
}) {};
@ -83665,7 +83662,6 @@ self: {
libraryHaskellDepends = [ base directory filepath HSH ];
description = "Utilities to work with debian binary packages";
license = "unknown";
hydraPlatforms = lib.platforms.none;
}) {};
"debian-build" = callPackage
@ -145813,7 +145809,6 @@ self: {
doHaddock = false;
description = "Symbolic EVM Evaluator";
license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
mainProgram = "hevm";
maintainers = [ lib.maintainers.arturcygan ];
}) {inherit (pkgs) gmp; inherit (pkgs) libff;
@ -211144,7 +211139,6 @@ self: {
executableHaskellDepends = [ base HSH mtl process ];
description = "Utility to call iwconfig";
license = "unknown";
hydraPlatforms = lib.platforms.none;
mainProgram = "n-m";
}) {};
@ -256962,7 +256956,6 @@ self: {
];
description = "Easy Git repository serialization";
license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
"restricted-workers" = callPackage

View File

@ -0,0 +1,17 @@
diff --git a/HSH/ShellEquivs.hs b/HSH/ShellEquivs.hs
index f9287e8..b132737 100644
--- a/HSH/ShellEquivs.hs
+++ b/HSH/ShellEquivs.hs
@@ -223,9 +223,9 @@ catToFIFO fp ichan =
return (ChanString "")
fifoOpen :: FilePath -> IO Handle
-fifoOpen fp =
- do fd <- throwErrnoPathIf (< 0) "HSH fifoOpen" fp $
- openFd fp WriteOnly Nothing defaultFileFlags
+fifoOpen fp =
+ do fd <- throwErrnoPathIf (< 0) "HSH fifoOpen" fp $
+ openFd fp WriteOnly defaultFileFlags
fdToHandle fd
#endif