Merge haskell-updates PR #485516 into staging (3c04c957) · Commits · nix / nixpkgs

pkgs/by-name/ec/echidna/package.nix

+17 −25

Original line number	Diff line number	Diff line
		@@ -11,32 +11,28 @@

		haskellPackages.mkDerivation rec {
		pname = "echidna";
		version = "2.2.7";
		version = "2.3.1";

		src = fetchFromGitHub {
		owner = "crytic";
		repo = "echidna";
		tag = "v${version}";
		sha256 = "sha256-rDtxyUpWfdMvS5BY1y8nydkQk/eCdmtjCqGJ+I4vy0I=";
		sha256 = "sha256-Zopkqc01uUccJzdjP+qmHHZzB2iXK0U0fQi6EhgCRKg=";
		};

		isExecutable = true;

		patches = [
		# Fix build with GHC 9.10
		# https://github.com/crytic/echidna/pull/1446
		(fetchpatch {
		url = "https://github.com/crytic/echidna/commit/1b498bdb8c86d8297aa34de8f48b6dce2f4dd84d.patch";
		hash = "sha256-JeKPv2Q2gIt1XpI81XPFu80/x8QcOI4k1QN/mTf+bqk=";
		})
		];

		buildTools = with haskellPackages; [
		hpack
		makeWrapper
		];

		prePatch = ''
		hpack
		'';

		executableHaskellDepends = with haskellPackages; [
		# base dependencies
		# package.yml/dependencies
		aeson
		base
		containers
		@@ -45,9 +41,9 @@ haskellPackages.mkDerivation rec {
		MonadRandom
		mtl
		text
		# library dependencies
		# package.yml/library.dependencies
		ansi-terminal
		async
		array
		base16-bytestring
		binary
		brick
		@@ -58,11 +54,14 @@ haskellPackages.mkDerivation rec {
		exceptions
		extra
		filepath
		Glob
		hashable
		html-conduit
		html-entities
		http-conduit
		ListLike
		mcp-server
		mustache
		optics
		optics-core
		process
		@@ -71,19 +70,22 @@ haskellPackages.mkDerivation rec {
		semver
		signal
		split
		stm
		strip-ansi-escape
		time
		unliftio
		unliftio-core
		utf8-string
		vector
		vty
		vty-crossplatform
		wai-extra
		warp
		wreq
		word-wrap
		xml-conduit
		yaml
		# executable dependencies
		# package.yml/ecutable.echidna.dependencies
		code-page
		filepath
		hashable
		@@ -92,14 +94,6 @@ haskellPackages.mkDerivation rec {
		with-utf8
		];

		executableToolDepends = [
		makeWrapper
		];

		prePatch = ''
		hpack
		'';

		postInstall =
		with haskellPackages;
		# https://github.com/NixOS/nixpkgs/pull/304352
		@@ -127,6 +121,4 @@ haskellPackages.mkDerivation rec {
		];
		platforms = lib.platforms.unix;
		mainProgram = "echidna";
		# Fails to build since https://hydra.nixos.org/build/313316669/nixlog/2
		broken = true;
		}

pkgs/data/misc/hackage/pin.json

+4 −4

Original line number	Diff line number	Diff line
		{
		"commit": "fff69f8f5a9d3fd24badf3c5924216977fb86568",
		"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/fff69f8f5a9d3fd24badf3c5924216977fb86568.tar.gz",
		"sha256": "1bbsyimw1kiig8m3am0y60rvpfs7gd97xjzrhil3hn3k94varkxs",
		"msg": "Update from Hackage at 2026-01-10T16:06:01Z"
		"commit": "2128173b41632a6cc5b2342152a28985650cc4ce",
		"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2128173b41632a6cc5b2342152a28985650cc4ce.tar.gz",
		"sha256": "19amns4ybljw2xf240anldqxaabymxad4izjclh5kxd13llk0jdb",
		"msg": "Update from Hackage at 2026-01-30T20:25:58Z"
		}

pkgs/development/compilers/ghc/common-hadrian.nix

+4 −3

Original line number	Diff line number	Diff line
		@@ -50,8 +50,9 @@
		# If enabled, GHC will be built with the GPL-free but slightly slower native
		# bignum backend instead of the faster but GPLed gmp backend.
		enableNativeBignum ?
		!(lib.meta.availableOn stdenv.hostPlatform gmp && lib.meta.availableOn stdenv.targetPlatform gmp)
		\|\| stdenv.targetPlatform.isGhcjs,
		stdenv.targetPlatform.isGhcjs
		\|\| !(lib.meta.availableOn stdenv.hostPlatform gmp)
		\|\| !(lib.meta.availableOn stdenv.targetPlatform gmp),
		gmp,

		# If enabled, use -fPIC when compiling static libs.
		@@ -671,7 +672,7 @@ stdenv.mkDerivation (
		"--with-ffi-includes=${targetLibs.libffi.dev}/include"
		"--with-ffi-libraries=${targetLibs.libffi.out}/lib"
		]
		++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [
		++ lib.optionals (!enableNativeBignum) [
		"--with-gmp-includes=${targetLibs.gmp.dev}/include"
		"--with-gmp-libraries=${targetLibs.gmp.out}/lib"
		]

pkgs/development/compilers/ghc/common-make-native-bignum.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -539,6 +539,8 @@ stdenv.mkDerivation (
		]
		++ lib.optionals enableUnregisterised [
		"--enable-unregisterised"
		# The C backend generates code incompatible with gnu23
		"CONF_CC_OPTS_STAGE2=-std=gnu17"
		];

		# Make sure we never relax`$PATH` and hooks support for compatibility.

pkgs/development/haskell-modules/configuration-common.nix

+22 −35

Original line number	Diff line number	Diff line
		@@ -340,17 +340,6 @@ with haskellLib;
		# https://github.com/yesodweb/shakespeare/issues/294
		shakespeare = dontCheck super.shakespeare;

		# Fixes test suite with mime-types >= 0.1.2.1
		yesod-static = appendPatches [
		(pkgs.fetchpatch {
		name = "yesod-static-mime-types-0.1.2.1.patch";
		url = "https://github.com/yesodweb/yesod/commit/5466dc3b984efcd1f963ae3c6c3a5241c4f625ee.patch";
		sha256 = "sha256-UN8kdnSsZPRt8PdQdortd50cB+j9kUOmhECl6lfxIxI=";
		includes = [ "**/EmbedProductionTest.hs" ];
		stripLen = 1;
		})
		] super.yesod-static;

		# Work around -Werror failures until a more permanent solution is released
		# https://github.com/haskell-cryptography/HsOpenSSL/issues/88
		# https://github.com/haskell-cryptography/HsOpenSSL/issues/93
		@@ -611,7 +600,7 @@ with haskellLib;
		name = "git-annex-${super.git-annex.version}-src";
		url = "git://git-annex.branchable.com/";
		tag = super.git-annex.version;
		sha256 = "sha256-Cnkohi1sl7kS4JECCsNDbxXKIWBus1gDcWoO3xZtXoM=";
		sha256 = "sha256-wH/As9KdHLlUgGUuIVjBjC8akqHfCZPBWABFXry6z28=";
		# delete android and Android directories which cause issues on
		# darwin (case insensitive directory). Since we don't need them
		# during the build process, we can delete it to prevent a hash
		@@ -2436,7 +2425,9 @@ with haskellLib;
		NGLess = dontCheck super.NGLess;

		# Too strict bound on network (<3.2)
		hookup = appendPatches [
		hookup =
		appendPatches
		[
		(pkgs.fetchpatch {
		name = "hookup-network-3.2.patch";
		url = "https://github.com/glguy/irc-core/commit/a3ec982e729b0f77b2db336ec32c5e4b7283bed5.patch";
		@@ -2444,7 +2435,13 @@ with haskellLib;
		stripLen = 1;
		includes = [ "hookup.cabal" ];
		})
		] super.hookup;
		]
		(
		overrideCabal {
		revision = null;
		editedCabalFile = null;
		} super.hookup
		);

		basic-sop = appendPatch (fetchpatch {
		# https://github.com/well-typed/basic-sop/pull/13
		@@ -2878,19 +2875,9 @@ with haskellLib;

		# 2024-07-27: building test component requires non-trivial custom build steps
		# https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311
		# Hackage release trails a good deal behind master
		proto3-suite = lib.pipe super.proto3-suite [
		dontCheck
		doJailbreak
		(overrideSrc {
		version = "0.9.0-unstable-2025-04-10";
		src = pkgs.fetchFromGitHub {
		owner = "awakesecurity";
		repo = "proto3-suite";
		rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8";
		hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU=";
		};
		})
		];

		# Tests require docker
		@@ -2934,7 +2921,7 @@ with haskellLib;
		http2-tls =
		lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10")
		"haskellPackages.http2-tls: tls override can be removed"
		(super.http2-tls.override { tls = self.tls_2_1_14; });
		(super.http2-tls.override { tls = self.tls_2_2_1; });

		# Relax http2 version bound (5.3.9 -> 5.3.10)
		# https://github.com/well-typed/grapesy/issues/297
		@@ -3012,7 +2999,7 @@ with haskellLib;
		]
		) super)
		what4
		what4_1_7_2
		what4_1_7_3
		;

		copilot-theorem = lib.pipe super.copilot-theorem [
		@@ -3088,12 +3075,12 @@ with haskellLib;
		# 2025-04-13: jailbreak to allow th-abstraction >= 0.7
		crucible = doJailbreak (
		super.crucible.override {
		what4 = self.what4_1_7_2;
		what4 = self.what4_1_7_3;
		}
		);

		crucible-llvm = super.crucible-llvm.override {
		what4 = self.what4_1_7_2;
		what4 = self.what4_1_7_3;
		};

		# Test suite invokes cabal-install in a way incompatible with our generic builder

Admin message