summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Scholten <marc@digitallyinduced.com>2025-08-10 15:56:52 +0200
committerGitHub <noreply@github.com>2025-08-10 15:56:52 +0200
commit6a91782abbf262e386c99866617802ea052d7738 (patch)
tree6990ffcaf8aff0af4546ec20fc81c0bac7bad20e
parenthaskell.packages.ghc.910.ghc-lib{,-parser,-parser-ex}: 9.10.2.20250515 -> 9.1... (diff)
downloadnixpkgs-6a91782abbf262e386c99866617802ea052d7738.tar.gz
haskellPackages.libssh2: unbreak (#424042)
* haskellPackages.libssh2: unbreak * haskellPackages.libssh2: add mpscholten as maintainer * haskellPackages.libssh2-conduit: unbreak
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix13
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml1
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml1
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix3
5 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 06a370e66041..dba94d81690f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3179,6 +3179,19 @@ with haskellLib;
# and therefore aren't uploaded to hackage
# Needs to be fixed upstream
haskore = dontCheck (doJailbreak super.haskore);
+
+ # 2025-07-10: Hackage release is outdated, https://github.com/portnov/libssh2-hs/issues/77
+ libssh2 = overrideSrc {
+ version = "0.2.0.9-unstable-2025-04-03";
+ src =
+ pkgs.fetchFromGitHub {
+ owner = "portnov";
+ repo = "libssh2-hs";
+ rev = "d35fa047cd872a73cd4db83aa3185463ac88a1d7";
+ sha256 = "sha256-m3VVx9mgI3OqtWHC8qY63/Wns808q5iITD5regdMILo=";
+ }
+ + "/libssh2";
+ } super.libssh2;
}
// import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 66fa27b7ff0e..56dd9dd4700c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3574,7 +3574,6 @@ broken-packages:
- libriscv # failure in job https://hydra.nixos.org/build/295122867 at 2025-04-22
- libsecp256k1 # failure in job https://hydra.nixos.org/build/234441559 at 2023-09-13
- libsodium # failure in job https://hydra.nixos.org/build/243816565 at 2024-01-01
- - libssh2 # failure in job https://hydra.nixos.org/build/295095049 at 2025-04-22
- libstackexchange # failure in job https://hydra.nixos.org/build/295095048 at 2025-04-22
- libsystemd-daemon # failure in job https://hydra.nixos.org/build/233207090 at 2023-09-02
- libtagc # failure in job https://hydra.nixos.org/build/233223631 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index c9c6c6836f4a..a8e3ac27c4fe 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -371,6 +371,7 @@ package-maintainers:
- pdftotext
- warp-systemd
- amazonka
+ - libssh2
ncfavier:
- Agda
- irc-client
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index fce4eac7f02a..ac9e1bf36114 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -2017,7 +2017,6 @@ dont-distribute-packages:
- libraft
- librarian
- librato
- - libssh2-conduit
- libxml-enumerator
- lifted-base-tf
- lightning-haskell
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f5fef10d8b0a..e2914af5bb92 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -414141,8 +414141,6 @@ self: {
libraryToolDepends = [ c2hs ];
description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
) { inherit (pkgs) libssh2; };
@@ -414172,7 +414170,6 @@ self: {
];
description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}
) { };