Reapply "haskellPackages: update stackage and hackage" (#354547)
This reverts commit7701a9e6c6, reversing changes made to8991dc8e9d. Restore haskell-updates on staging-next to save resources on hydra.
This commit is contained in:
Martin Weinelt
parent
2900723943
commit
46b1474255
@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`.
|
||||
Each of those compiler versions has a corresponding attribute set `packages` built with
|
||||
it. However, the non-standard package sets are not tested regularly and, as a
|
||||
result, contain fewer working packages. The corresponding package set for GHC
|
||||
9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias
|
||||
for `haskell.packages.ghc964`:
|
||||
9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias
|
||||
for `haskell.packages.ghc966`:
|
||||
|
||||
Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
|
||||
|
||||
|
||||
28
pkgs/applications/editors/yi/wrapper.nix
Normal file
28
pkgs/applications/editors/yi/wrapper.nix
Normal file
@ -0,0 +1,28 @@
|
||||
# To use this for hacking of your Yi config file, drop into a shell
|
||||
# with env attribute.
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
haskellPackages,
|
||||
extraPackages ? (s: [ ]),
|
||||
}:
|
||||
let
|
||||
yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "yi-custom";
|
||||
dontUnpack = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \
|
||||
--set NIX_GHC ${yiEnv}/bin/ghc
|
||||
'';
|
||||
|
||||
# For hacking purposes
|
||||
passthru.env = yiEnv;
|
||||
|
||||
inherit (haskellPackages.yi) meta version;
|
||||
}
|
||||
@ -15,14 +15,7 @@ let
|
||||
passthru.updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope (
|
||||
final: prev: {
|
||||
# Dependency twain requires an older version of http2, and we cannot mix
|
||||
# versions of transitive dependencies.
|
||||
http2 = final.http2_3_0_3;
|
||||
warp = final.warp_3_3_30;
|
||||
}
|
||||
);
|
||||
raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
|
||||
in
|
||||
lib.pipe raw-pkg [
|
||||
(overrideCabal overrides)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "750067bc36e810a96c066c8800438e0ce9ced327",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz",
|
||||
"sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny",
|
||||
"msg": "Update from Hackage at 2024-10-05T14:46:54Z"
|
||||
"commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz",
|
||||
"sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn",
|
||||
"msg": "Update from Hackage at 2024-10-25T11:10:52Z"
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.11.20240423";
|
||||
rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6";
|
||||
sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9";
|
||||
version = "9.13.20241031";
|
||||
rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37";
|
||||
sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i";
|
||||
}
|
||||
|
||||
@ -22,20 +22,16 @@ self: super: {
|
||||
# enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427
|
||||
dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai));
|
||||
|
||||
# Make sure that Cabal 3.10.* can be built as-is
|
||||
Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({
|
||||
# Make sure that Cabal_* can be built as-is
|
||||
Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_10_3_0;
|
||||
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
|
||||
# Use process core package when possible
|
||||
process = self.process_1_6_24_0;
|
||||
}));
|
||||
|
||||
Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({
|
||||
});
|
||||
Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_12_1_0;
|
||||
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
|
||||
# Use process core package when possible
|
||||
process = self.process_1_6_24_0;
|
||||
}));
|
||||
});
|
||||
Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_14_0_0;
|
||||
});
|
||||
|
||||
# hackage-security == 0.6.2.6 has a wider support range in theory, but it only
|
||||
# makes sense to use the non Stackage version if we want to use Cabal* >= 3.12
|
||||
@ -366,15 +362,6 @@ self: super: {
|
||||
]
|
||||
super.threadscope);
|
||||
|
||||
# http2 also overridden in all-packages.nix for mailctl.
|
||||
# twain is currently only used by mailctl, so the .overrideScope shouldn't
|
||||
# negatively affect any other packages, at least currently...
|
||||
# https://github.com/alexmingoia/twain/issues/5
|
||||
twain = super.twain.overrideScope (self: _: {
|
||||
http2 = self.http2_3_0_3;
|
||||
warp = self.warp_3_3_30;
|
||||
});
|
||||
|
||||
# The latest release on hackage has an upper bound on containers which
|
||||
# breaks the build, though it works with the version of containers present
|
||||
# and the upper bound doesn't exist in code anymore:
|
||||
@ -1270,6 +1257,7 @@ self: super: {
|
||||
stack = super.stack.overrideScope (lself: lsuper: {
|
||||
# stack-3.1.1 requires the latest versions of these libraries
|
||||
pantry = lself.pantry_0_10_0;
|
||||
static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0
|
||||
tar = lself.tar_0_6_3_0;
|
||||
|
||||
# Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to
|
||||
@ -2002,14 +1990,6 @@ self: super: {
|
||||
# Test suite fails, upstream not reachable for simple fix (not responsive on github)
|
||||
vivid-osc = dontCheck super.vivid-osc;
|
||||
vivid-supercollider = dontCheck super.vivid-supercollider;
|
||||
vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; {
|
||||
# 2024-10-18: Some library dependency must have stopped
|
||||
# re-exporting 'void', so now it needs an extra import line.
|
||||
# Fixed in 0.5.2.1.
|
||||
postPatch = ''
|
||||
sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs
|
||||
'';
|
||||
}) super.vivid;
|
||||
|
||||
# Test suite does not compile.
|
||||
feed = dontCheck super.feed;
|
||||
@ -2276,44 +2256,6 @@ self: super: {
|
||||
# Too strict bound on hspec (<2.11)
|
||||
utf8-light = doJailbreak super.utf8-light;
|
||||
|
||||
large-hashable = lib.pipe (super.large-hashable.override {
|
||||
# https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c
|
||||
utf8-light = null;
|
||||
}) [
|
||||
# 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0
|
||||
(assert super.large-hashable.version == "0.1.0.4"; overrideSrc {
|
||||
version = "unstable-2022-06-10";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "factisresearch";
|
||||
repo = "large-hashable";
|
||||
rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1";
|
||||
sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0";
|
||||
};
|
||||
})
|
||||
# Provide newly added dependencies
|
||||
(overrideCabal (drv: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
|
||||
self.cryptonite
|
||||
self.memory
|
||||
];
|
||||
testHaskellDepends = drv.testHaskellDepends or [] ++ [
|
||||
self.inspection-testing
|
||||
];
|
||||
}))
|
||||
# https://github.com/factisresearch/large-hashable/issues/24
|
||||
(overrideCabal (drv: {
|
||||
testFlags = drv.testFlags or [] ++ [
|
||||
"-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$"
|
||||
];
|
||||
}))
|
||||
# https://github.com/factisresearch/large-hashable/issues/25
|
||||
# Currently broken with text >= 2.0
|
||||
(overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") {
|
||||
broken = true;
|
||||
hydraPlatforms = [];
|
||||
}))
|
||||
];
|
||||
|
||||
# BSON defaults to requiring network instead of network-bsd which is
|
||||
# required nowadays: https://github.com/mongodb-haskell/bson/issues/26
|
||||
bson = appendConfigureFlag "-f-_old_network" (super.bson.override {
|
||||
|
||||
@ -331,6 +331,10 @@ self: super: ({
|
||||
# Tests fail on macOS https://github.com/mrkkrp/zip/issues/112
|
||||
zip = dontCheck super.zip;
|
||||
|
||||
snap = super.snap.overrideAttrs (drv: {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
});
|
||||
|
||||
warp = super.warp.overrideAttrs (drv: {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
});
|
||||
|
||||
@ -69,7 +69,7 @@ self: super: {
|
||||
integer-conversion = doDistribute self.integer-conversion_0_1_1;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0;
|
||||
http2 = super.http2_5_3_4;
|
||||
http2 = self.http2_5_3_4;
|
||||
lens = doDistribute self.lens_5_3_2;
|
||||
lukko = doDistribute self.lukko_0_1_2;
|
||||
network-control = super.network-control_0_1_3;
|
||||
@ -84,6 +84,7 @@ self: super: {
|
||||
time-manager = super.time-manager_0_1_0;
|
||||
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
|
||||
uuid-types = doDistribute self.uuid-types_1_0_6;
|
||||
warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl
|
||||
|
||||
# A given major version of ghc-exactprint only supports one version of GHC.
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0;
|
||||
@ -126,7 +127,6 @@ self: super: {
|
||||
primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.*
|
||||
bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45
|
||||
hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38
|
||||
warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl
|
||||
|
||||
haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;})));
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ with haskellLib;
|
||||
|
||||
let
|
||||
inherit (pkgs.stdenv.hostPlatform) isDarwin;
|
||||
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
|
||||
self: super: {
|
||||
@ -54,9 +54,9 @@ self: super: {
|
||||
# Version upgrades
|
||||
#
|
||||
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022;
|
||||
megaparsec = doDistribute self.megaparsec_9_6_1;
|
||||
# aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable
|
||||
# https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f
|
||||
@ -147,3 +147,8 @@ self: super: {
|
||||
}) super.reflex;
|
||||
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") {
|
||||
# Breakage related to GHC 9.8.3 / deepseq 1.5.1.0
|
||||
# https://github.com/typeable/generic-arbitrary/issues/18
|
||||
generic-arbitrary = dontCheck super.generic-arbitrary;
|
||||
}
|
||||
|
||||
@ -84,6 +84,7 @@ broken-packages:
|
||||
- aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02
|
||||
- aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02
|
||||
- aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02
|
||||
- aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06
|
||||
- aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07
|
||||
- aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02
|
||||
- aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02
|
||||
@ -2159,6 +2160,7 @@ broken-packages:
|
||||
- graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02
|
||||
- graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02
|
||||
- graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02
|
||||
- graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06
|
||||
- graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02
|
||||
- graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02
|
||||
- graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02
|
||||
@ -2909,6 +2911,7 @@ broken-packages:
|
||||
- hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02
|
||||
- HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02
|
||||
- hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02
|
||||
- hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06
|
||||
- hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02
|
||||
- hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02
|
||||
- hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02
|
||||
@ -3068,6 +3071,7 @@ broken-packages:
|
||||
- ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02
|
||||
- iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02
|
||||
- ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02
|
||||
- if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06
|
||||
- IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02
|
||||
- ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02
|
||||
- ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02
|
||||
@ -3807,6 +3811,7 @@ broken-packages:
|
||||
- microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02
|
||||
- microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02
|
||||
- microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02
|
||||
- MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06
|
||||
- microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02
|
||||
- microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02
|
||||
- microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16
|
||||
@ -4227,6 +4232,7 @@ broken-packages:
|
||||
- oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02
|
||||
- okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02
|
||||
- old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02
|
||||
- ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06
|
||||
- om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02
|
||||
- omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02
|
||||
- ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02
|
||||
@ -4731,6 +4737,8 @@ broken-packages:
|
||||
- powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02
|
||||
- powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02
|
||||
- powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02
|
||||
- ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06
|
||||
- ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06
|
||||
- pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02
|
||||
- PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02
|
||||
- pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02
|
||||
@ -6287,6 +6295,7 @@ broken-packages:
|
||||
- type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02
|
||||
- type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02
|
||||
- type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02
|
||||
- typelet # failure in job https://hydra.nixos.org/build/276367145 at 2024-11-06
|
||||
- type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02
|
||||
- type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02
|
||||
- type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02
|
||||
@ -6839,7 +6848,10 @@ broken-packages:
|
||||
- yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02
|
||||
- yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02
|
||||
- yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02
|
||||
- yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02
|
||||
- yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06
|
||||
- yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06
|
||||
- yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06
|
||||
- yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06
|
||||
- yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02
|
||||
- yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02
|
||||
- Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02
|
||||
|
||||
@ -36,7 +36,8 @@ default-package-overrides:
|
||||
- hnix-store-remote < 0.7
|
||||
# 2024-09-12: match xmonad 0.17.* from Stackage LTS
|
||||
- xmonad-contrib < 0.18.1
|
||||
|
||||
# 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment
|
||||
- http-semantics < 0.3.0
|
||||
|
||||
extra-packages:
|
||||
- Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8
|
||||
@ -72,7 +73,6 @@ extra-packages:
|
||||
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||
- hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS
|
||||
- hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover
|
||||
- http2 < 3.3 # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5>
|
||||
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
||||
- language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16
|
||||
- language-javascript == 0.7.0.0 # required by purescript
|
||||
@ -89,7 +89,6 @@ extra-packages:
|
||||
- primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2
|
||||
- stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2
|
||||
- text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10)
|
||||
- warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3
|
||||
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
|
||||
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
|
||||
- weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.*
|
||||
@ -821,8 +820,6 @@ supported-platforms:
|
||||
midi-alsa: [ platforms.linux ] # alsa-core only supported on linux
|
||||
midisurface: [ platforms.linux ] # alsa-core only supported on linux
|
||||
OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316
|
||||
password: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
password-instances: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
reactivity: [ platforms.windows ]
|
||||
reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux
|
||||
scat: [ platforms.x86 ] # uses scrypt, which requries x86
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 22.36
|
||||
# Stackage LTS 22.39
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -397,7 +397,7 @@ default-package-overrides:
|
||||
- atom-conduit ==0.9.0.1
|
||||
- atomic-counter ==0.1.2.1
|
||||
- atomic-primops ==0.8.8
|
||||
- atomic-write ==0.2.0.7
|
||||
- atomic-write ==0.2.1.0
|
||||
- attoparsec ==0.14.4
|
||||
- attoparsec-aeson ==2.1.0.0
|
||||
- attoparsec-base64 ==0.0.0
|
||||
@ -454,7 +454,7 @@ default-package-overrides:
|
||||
- bcp47 ==0.2.0.6
|
||||
- bcp47-orphans ==0.1.0.6
|
||||
- bcrypt ==0.0.11
|
||||
- beam-core ==0.10.1.0
|
||||
- beam-core ==0.10.3.0
|
||||
- bech32 ==1.1.7
|
||||
- bech32-th ==1.1.7
|
||||
- benchpress ==0.2.2.23
|
||||
@ -508,6 +508,8 @@ default-package-overrides:
|
||||
- blaze-textual ==0.2.3.1
|
||||
- bloodhound ==0.21.0.0
|
||||
- bloomfilter ==2.0.1.2
|
||||
- bluefin ==0.0.9.0
|
||||
- bluefin-internal ==0.0.9.0
|
||||
- bm ==0.2.0.0
|
||||
- bmp ==1.2.6.4
|
||||
- bnb-staking-csvs ==0.2.2.0
|
||||
@ -527,7 +529,7 @@ default-package-overrides:
|
||||
- bounded-qsem ==0.1.0.2
|
||||
- bounded-queue ==1.0.0
|
||||
- boundingboxes ==0.2.3
|
||||
- box ==0.9.3.1
|
||||
- box ==0.9.3.2
|
||||
- boxes ==0.1.5
|
||||
- breakpoint ==0.1.4.0
|
||||
- brick ==2.1.1
|
||||
@ -552,7 +554,7 @@ default-package-overrides:
|
||||
- bv-sized ==1.0.5
|
||||
- byteable ==0.1.1
|
||||
- bytebuild ==0.3.16.2
|
||||
- byte-count-reader ==0.10.1.11
|
||||
- byte-count-reader ==0.10.1.12
|
||||
- bytedump ==1.0
|
||||
- bytehash ==0.1.1.0
|
||||
- byte-order ==0.1.3.1
|
||||
@ -577,7 +579,7 @@ default-package-overrides:
|
||||
- cabal2spec ==2.7.1
|
||||
- cabal-appimage ==0.4.0.5
|
||||
- cabal-clean ==0.2.20230609
|
||||
- cabal-debian ==5.2.3
|
||||
- cabal-debian ==5.2.4
|
||||
- cabal-doctest ==1.0.10
|
||||
- cabal-file ==0.1.1
|
||||
- cabal-plan ==0.7.3.0
|
||||
@ -683,9 +685,9 @@ default-package-overrides:
|
||||
- comfort-fftw ==0.0.0.1
|
||||
- comfort-glpk ==0.1
|
||||
- comfort-graph ==0.0.4
|
||||
- commonmark ==0.2.6
|
||||
- commonmark ==0.2.6.1
|
||||
- commonmark-extensions ==0.2.5.5
|
||||
- commonmark-pandoc ==0.2.2.1
|
||||
- commonmark-pandoc ==0.2.2.2
|
||||
- commutative ==0.0.2
|
||||
- commutative-semigroups ==0.1.1.0
|
||||
- comonad ==5.0.8
|
||||
@ -824,14 +826,14 @@ default-package-overrides:
|
||||
- data-bword ==0.1.0.2
|
||||
- data-checked ==0.3
|
||||
- data-clist ==0.2
|
||||
- data-default ==0.7.1.1
|
||||
- data-default-class ==0.1.2.0
|
||||
- data-default-instances-base ==0.1.0.1
|
||||
- data-default ==0.7.1.2
|
||||
- data-default-class ==0.1.2.2
|
||||
- data-default-instances-base ==0.1.0.3
|
||||
- data-default-instances-bytestring ==0.0.1
|
||||
- data-default-instances-case-insensitive ==0.0.1
|
||||
- data-default-instances-containers ==0.0.1
|
||||
- data-default-instances-dlist ==0.0.1
|
||||
- data-default-instances-old-locale ==0.0.1
|
||||
- data-default-instances-dlist ==0.0.1.2
|
||||
- data-default-instances-old-locale ==0.0.1.2
|
||||
- data-default-instances-unordered-containers ==0.0.1
|
||||
- data-default-instances-vector ==0.0.1
|
||||
- data-diverse ==4.7.1.0
|
||||
@ -1057,7 +1059,7 @@ default-package-overrides:
|
||||
- extrapolate ==0.4.6
|
||||
- fail ==4.9.0.0
|
||||
- FailT ==0.1.2.0
|
||||
- fakedata ==1.0.3
|
||||
- fakedata ==1.0.5
|
||||
- fakedata-parser ==0.1.0.0
|
||||
- fakedata-quickcheck ==0.2.0
|
||||
- fakefs ==0.3.0.2
|
||||
@ -1066,7 +1068,7 @@ default-package-overrides:
|
||||
- falsify ==0.2.0
|
||||
- fasta ==0.10.4.2
|
||||
- fast-digits ==0.3.2.0
|
||||
- fast-logger ==3.2.3
|
||||
- fast-logger ==3.2.4
|
||||
- fast-math ==1.0.2
|
||||
- fast-myers-diff ==0.0.1
|
||||
- fb ==2.1.1.1
|
||||
@ -1074,12 +1076,11 @@ default-package-overrides:
|
||||
- fclabels ==2.0.5.1
|
||||
- fdo-notify ==0.3.1
|
||||
- feature-flags ==0.1.0.1
|
||||
- fedora-dists ==2.1.1
|
||||
- fedora-haskell-tools ==1.1
|
||||
- fedora-releases ==0.1.0
|
||||
- FenwickTree ==0.1.2.1
|
||||
- fft ==0.1.8.7
|
||||
- fftw-ffi ==0.1
|
||||
- fgl ==5.8.2.0
|
||||
- fgl ==5.8.3.0
|
||||
- fgl-arbitrary ==0.2.0.6
|
||||
- fields-json ==0.4.0.0
|
||||
- file-embed ==0.0.16.0
|
||||
@ -1132,7 +1133,7 @@ default-package-overrides:
|
||||
- ForestStructures ==0.0.1.1
|
||||
- forkable-monad ==0.2.0.3
|
||||
- forma ==1.2.0
|
||||
- formatn ==0.3.0.1
|
||||
- formatn ==0.3.1.0
|
||||
- format-numbers ==0.1.0.1
|
||||
- formatting ==7.2.0
|
||||
- foundation ==0.0.30
|
||||
@ -1170,7 +1171,7 @@ default-package-overrides:
|
||||
- generically ==0.1.1
|
||||
- generic-arbitrary ==1.0.1
|
||||
- generic-constraints ==1.1.1.1
|
||||
- generic-data ==1.1.0.0
|
||||
- generic-data ==1.1.0.1
|
||||
- generic-data-surgery ==0.3.0.0
|
||||
- generic-deriving ==1.14.5
|
||||
- generic-functor ==1.1.0.0
|
||||
@ -1296,7 +1297,7 @@ default-package-overrides:
|
||||
- GLUT ==2.7.0.16
|
||||
- gmail-simple ==0.1.0.6
|
||||
- gnuplot ==0.5.7
|
||||
- goldplate ==0.2.1.1
|
||||
- goldplate ==0.2.2.1
|
||||
- google-isbn ==1.0.3
|
||||
- gopher-proxy ==0.1.1.3
|
||||
- gpolyline ==0.1.0.1
|
||||
@ -1343,7 +1344,7 @@ default-package-overrides:
|
||||
- hashing ==0.1.1.0
|
||||
- hashmap ==1.3.3
|
||||
- hashtables ==1.3.1
|
||||
- haskell-gi ==0.26.11
|
||||
- haskell-gi ==0.26.12
|
||||
- haskell-gi-base ==0.26.8
|
||||
- haskell-gi-overloading ==1.0
|
||||
- haskell-lexer ==1.1.1
|
||||
@ -1476,7 +1477,7 @@ default-package-overrides:
|
||||
- hslua-classes ==2.3.1
|
||||
- hslua-cli ==1.4.3
|
||||
- hslua-core ==2.3.2
|
||||
- hslua-list ==1.1.3
|
||||
- hslua-list ==1.1.4
|
||||
- hslua-marshalling ==2.3.1
|
||||
- hslua-module-doclayout ==1.1.1.2
|
||||
- hslua-module-path ==1.1.1
|
||||
@ -1731,7 +1732,7 @@ default-package-overrides:
|
||||
- LambdaHack ==0.11.0.1
|
||||
- lame ==0.2.2
|
||||
- language-avro ==0.1.4.0
|
||||
- language-c ==0.9.3
|
||||
- language-c ==0.9.4
|
||||
- language-c99 ==0.2.0
|
||||
- language-c99-simple ==0.3.0
|
||||
- language-c99-util ==0.2.0
|
||||
@ -1781,7 +1782,7 @@ default-package-overrides:
|
||||
- liboath-hs ==0.0.1.2
|
||||
- libyaml ==0.1.4
|
||||
- libyaml-clib ==0.2.5
|
||||
- lifted-async ==0.10.2.5
|
||||
- lifted-async ==0.10.2.6
|
||||
- lifted-base ==0.2.3.12
|
||||
- lift-generics ==0.2.1
|
||||
- lift-type ==0.1.2.0
|
||||
@ -1853,7 +1854,7 @@ default-package-overrides:
|
||||
- markdown-unlit ==0.6.0
|
||||
- markov-chain ==0.0.3.4
|
||||
- markov-chain-usage-model ==0.0.0
|
||||
- markup-parse ==0.1.1
|
||||
- markup-parse ==0.1.1.1
|
||||
- mason ==0.2.6
|
||||
- massiv ==1.0.4.0
|
||||
- massiv-io ==1.0.0.1
|
||||
@ -1872,7 +1873,7 @@ default-package-overrides:
|
||||
- matrix-static ==0.3
|
||||
- maximal-cliques ==0.1.1
|
||||
- mbox-utility ==0.0.3.1
|
||||
- mcmc ==0.8.2.0
|
||||
- mcmc ==0.8.3.1
|
||||
- mcmc-types ==1.0.3
|
||||
- median-stream ==0.7.0.0
|
||||
- med-module ==0.1.3
|
||||
@ -2153,7 +2154,7 @@ default-package-overrides:
|
||||
- pandoc-cli ==3.1.11.1
|
||||
- pandoc-dhall-decoder ==0.1.0.1
|
||||
- pandoc-lua-engine ==0.2.1.2
|
||||
- pandoc-lua-marshal ==0.2.8
|
||||
- pandoc-lua-marshal ==0.2.9
|
||||
- pandoc-plot ==1.8.0
|
||||
- pandoc-server ==0.1.0.5
|
||||
- pandoc-throw ==0.1.0.0
|
||||
@ -2317,7 +2318,7 @@ default-package-overrides:
|
||||
- primes ==0.2.1.0
|
||||
- primitive ==0.8.0.0
|
||||
- primitive-addr ==0.1.0.3
|
||||
- primitive-extras ==0.10.2
|
||||
- primitive-extras ==0.10.2.1
|
||||
- primitive-offset ==0.2.0.1
|
||||
- primitive-serial ==0.1
|
||||
- primitive-unaligned ==0.1.1.2
|
||||
@ -2362,8 +2363,8 @@ default-package-overrides:
|
||||
- PyF ==0.11.3.0
|
||||
- qchas ==1.1.0.1
|
||||
- qm-interpolated-string ==0.3.1.0
|
||||
- qrcode-core ==0.9.9
|
||||
- qrcode-juicypixels ==0.8.5
|
||||
- qrcode-core ==0.9.10
|
||||
- qrcode-juicypixels ==0.8.6
|
||||
- quaalude ==0.0.0.1
|
||||
- quadratic-irrational ==0.1.1
|
||||
- QuasiText ==0.1.2.6
|
||||
@ -2464,7 +2465,7 @@ default-package-overrides:
|
||||
- relational-record ==0.2.2.0
|
||||
- relational-schemas ==0.1.8.1
|
||||
- reliable-io ==0.0.2
|
||||
- relude ==1.2.1.0
|
||||
- relude ==1.2.2.0
|
||||
- renderable ==0.2.0.1
|
||||
- replace-attoparsec ==1.5.0.0
|
||||
- replace-megaparsec ==1.5.0.1
|
||||
@ -2606,7 +2607,7 @@ default-package-overrides:
|
||||
- servant-rate-limit ==0.2.0.0
|
||||
- servant-rawm ==1.0.0.0
|
||||
- servant-server ==0.20.2
|
||||
- servant-static-th ==1.0.0.0
|
||||
- servant-static-th ==1.0.0.1
|
||||
- servant-subscriber ==0.7.0.0
|
||||
- servant-swagger ==1.2.1
|
||||
- servant-swagger-ui ==0.3.5.5.0.0
|
||||
@ -2635,8 +2636,8 @@ default-package-overrides:
|
||||
- shared-memory ==0.2.0.1
|
||||
- shell-conduit ==5.0.0
|
||||
- shell-escape ==0.2.0
|
||||
- shellify ==0.11.0.1
|
||||
- shellmet ==0.0.4.1
|
||||
- shellify ==0.11.0.3
|
||||
- shellmet ==0.0.5.0
|
||||
- shelltestrunner ==1.10
|
||||
- shell-utility ==0.1
|
||||
- shellwords ==0.1.3.1
|
||||
@ -2762,7 +2763,7 @@ default-package-overrides:
|
||||
- Stream ==0.4.7.2
|
||||
- streaming ==0.2.4.0
|
||||
- streaming-attoparsec ==1.0.0.1
|
||||
- streaming-bytestring ==0.3.2
|
||||
- streaming-bytestring ==0.3.3
|
||||
- streaming-commons ==0.2.2.6
|
||||
- streaming-wai ==0.1.1
|
||||
- streamly ==0.10.1
|
||||
@ -3094,9 +3095,9 @@ default-package-overrides:
|
||||
- universe-instances-extended ==1.1.3
|
||||
- universe-reverse-instances ==1.1.1
|
||||
- universe-some ==1.2.1
|
||||
- universum ==1.8.2.1
|
||||
- universum ==1.8.2.2
|
||||
- unix-bytestring ==0.4.0.2
|
||||
- unix-compat ==0.7.2
|
||||
- unix-compat ==0.7.3
|
||||
- unix-time ==0.4.15
|
||||
- unjson ==0.15.4
|
||||
- unliftio ==0.2.25.0
|
||||
@ -3282,7 +3283,7 @@ default-package-overrides:
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.11.2
|
||||
- yaml-unscrambler ==0.1.0.19
|
||||
- Yampa ==0.14.10
|
||||
- Yampa ==0.14.11
|
||||
- yarn-lock ==0.6.5
|
||||
- yeshql-core ==4.2.0.0
|
||||
- yesod ==1.6.2.1
|
||||
|
||||
@ -802,7 +802,7 @@ dont-distribute-packages:
|
||||
- chart-cli
|
||||
- chart-svg
|
||||
- chart-svg-various
|
||||
- chart-svg_0_6_1_0
|
||||
- chart-svg_0_7_0_0
|
||||
- chart-unit
|
||||
- chassis
|
||||
- chatty
|
||||
@ -1866,6 +1866,7 @@ dont-distribute-packages:
|
||||
- hark
|
||||
- harmony
|
||||
- haroonga-httpd
|
||||
- harpie-numhask
|
||||
- has-th
|
||||
- hasbolt
|
||||
- hascat
|
||||
@ -2013,7 +2014,6 @@ dont-distribute-packages:
|
||||
- hedgehog-gen-json
|
||||
- hedis-pile
|
||||
- heftia
|
||||
- heftia-effects
|
||||
- heist-aeson
|
||||
- helic
|
||||
- helics
|
||||
@ -2498,6 +2498,7 @@ dont-distribute-packages:
|
||||
- language-python-colour
|
||||
- language-qux
|
||||
- language-spelling
|
||||
- large-anon
|
||||
- lat
|
||||
- latex-formulae-hakyll
|
||||
- latex-formulae-pandoc
|
||||
@ -3028,6 +3029,7 @@ dont-distribute-packages:
|
||||
- perdure
|
||||
- perf
|
||||
- perf-analysis
|
||||
- perf_0_13_0_0
|
||||
- perfecthash
|
||||
- periodic-client
|
||||
- periodic-client-exe
|
||||
@ -3162,6 +3164,8 @@ dont-distribute-packages:
|
||||
- potoki-hasql
|
||||
- potoki-zlib
|
||||
- powerqueue-sqs
|
||||
- ppad-hmac-drbg
|
||||
- ppad-secp256k1
|
||||
- pqueue-mtl
|
||||
- practice-room
|
||||
- pred-set
|
||||
@ -3290,6 +3294,7 @@ dont-distribute-packages:
|
||||
- rasa-ext-vim
|
||||
- rascal
|
||||
- raw-feldspar
|
||||
- rawlock
|
||||
- rawr
|
||||
- razom-text-util
|
||||
- rbr
|
||||
@ -3379,6 +3384,7 @@ dont-distribute-packages:
|
||||
- reserve
|
||||
- resin
|
||||
- resource-pool-catchio
|
||||
- resource-registry
|
||||
- resource-simple
|
||||
- respond
|
||||
- rest-client
|
||||
@ -4289,25 +4295,6 @@ dont-distribute-packages:
|
||||
- yesod-routes-typescript
|
||||
- yesod-session-redis
|
||||
- yesod-worker
|
||||
- yi
|
||||
- yi-contrib
|
||||
- yi-core
|
||||
- yi-dynamic-configuration
|
||||
- yi-emacs-colours
|
||||
- yi-frontend-pango
|
||||
- yi-frontend-vty
|
||||
- yi-fuzzy-open
|
||||
- yi-ireader
|
||||
- yi-keymap-cua
|
||||
- yi-keymap-emacs
|
||||
- yi-keymap-vim
|
||||
- yi-misc-modes
|
||||
- yi-mode-haskell
|
||||
- yi-mode-javascript
|
||||
- yi-monokai
|
||||
- yi-snippet
|
||||
- yi-solarized
|
||||
- yi-spolsky
|
||||
- yjftp
|
||||
- yjftp-libs
|
||||
- yoko
|
||||
|
||||
@ -113,6 +113,35 @@ self: super: builtins.intersectAttrs super {
|
||||
'' + drv.preCheck or "";
|
||||
}) super.agda2lagda;
|
||||
|
||||
# - Disable scrypt support since the library used only works on x86 due to SSE2:
|
||||
# https://github.com/informatikr/scrypt/issues/8
|
||||
# - Use crypton as the encryption backend. That override becomes obsolete with
|
||||
# 3.1.* since cabal2nix picks crypton by default then.
|
||||
password =
|
||||
let
|
||||
scryptSupported = pkgs.stdenv.hostPlatform.isx86;
|
||||
in
|
||||
|
||||
lib.pipe
|
||||
(super.password.override ({
|
||||
cryptonite = self.crypton;
|
||||
} // lib.optionalAttrs (!scryptSupported) {
|
||||
scrypt = null;
|
||||
}))
|
||||
([
|
||||
(enableCabalFlag "crypton")
|
||||
(disableCabalFlag "cryptonite")
|
||||
# https://github.com/cdepillabout/password/pull/84
|
||||
(appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch)
|
||||
(overrideCabal (drv: {
|
||||
# patch doesn't apply otherwise because of revisions
|
||||
prePatch = drv.prePatch or "" + ''
|
||||
${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
|
||||
'';
|
||||
}))
|
||||
] ++ lib.optionals (!scryptSupported) [
|
||||
(disableCabalFlag "scrypt")
|
||||
]);
|
||||
|
||||
audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: {
|
||||
executableHaskellDepends = [self.optparse-applicative self.soxlib];
|
||||
@ -156,6 +185,11 @@ self: super: builtins.intersectAttrs super {
|
||||
'';
|
||||
}) super.nvvm;
|
||||
|
||||
# Doesn't declare LLVM dependency, needs llvm-config
|
||||
llvm-codegen = addBuildTools [
|
||||
pkgs.llvmPackages_17.llvm.dev # for native llvm-config
|
||||
] super.llvm-codegen;
|
||||
|
||||
# hledger* overrides
|
||||
inherit (
|
||||
let
|
||||
@ -381,7 +415,6 @@ self: super: builtins.intersectAttrs super {
|
||||
|
||||
# The curl executable is required for withApplication tests.
|
||||
warp = addTestToolDepend pkgs.curl super.warp;
|
||||
warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30;
|
||||
|
||||
safe-exceptions = overrideCabal (drv: {
|
||||
# Fix strictDeps build error "could not execute: hspec-discover"
|
||||
@ -1414,7 +1447,7 @@ self: super: builtins.intersectAttrs super {
|
||||
mpiImpl = pkgs.mpi.pname;
|
||||
disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi);
|
||||
in lib.pipe
|
||||
(super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; })
|
||||
(super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; })
|
||||
( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ]
|
||||
++ disableUnused
|
||||
++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl)
|
||||
|
||||
2783
pkgs/development/haskell-modules/hackage-packages.nix
generated
2783
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,21 @@
|
||||
diff --git a/password/password.cabal b/password/password.cabal
|
||||
index 506457e..8fa978b 100644
|
||||
--- a/password.cabal
|
||||
+++ b/password.cabal
|
||||
@@ -186,6 +186,8 @@ test-suite password-tasty
|
||||
other-modules:
|
||||
Scrypt
|
||||
Data.Password.Scrypt
|
||||
+ build-depends:
|
||||
+ scrypt
|
||||
ghc-options:
|
||||
-threaded -O2 -rtsopts -with-rtsopts=-N
|
||||
build-depends:
|
||||
@@ -195,7 +197,6 @@ test-suite password-tasty
|
||||
, bytestring
|
||||
, memory
|
||||
, quickcheck-instances
|
||||
- , scrypt
|
||||
, tasty
|
||||
, tasty-hunit
|
||||
, tasty-quickcheck
|
||||
@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({
|
||||
# to build hadrian. (Hackage-released conditional dependencies are handled
|
||||
# in ./hadrian.nix without requiring intervention here.)
|
||||
inherit ghc-platform ghc-toolchain;
|
||||
} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") {
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c
|
||||
Cabal = bootPkgs.Cabal_3_14_0_0;
|
||||
})
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
{ mkDerivation
|
||||
, fetchFromGitHub
|
||||
, aeson
|
||||
, base
|
||||
, base64
|
||||
, bytestring
|
||||
, containers
|
||||
, directory
|
||||
, hsyslog
|
||||
, http-conduit
|
||||
, lib
|
||||
, network-uri
|
||||
, optparse-applicative
|
||||
, pretty-simple
|
||||
, process
|
||||
, random
|
||||
, strings
|
||||
, template-haskell
|
||||
, text
|
||||
, time
|
||||
, twain
|
||||
, unix
|
||||
, utf8-string
|
||||
, warp
|
||||
, yaml
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "mailctl";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdobsan";
|
||||
repo = "mailctl";
|
||||
rev = version;
|
||||
hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU=";
|
||||
};
|
||||
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
libraryHaskellDepends = [
|
||||
aeson
|
||||
base
|
||||
base64
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
hsyslog
|
||||
http-conduit
|
||||
network-uri
|
||||
optparse-applicative
|
||||
pretty-simple
|
||||
process
|
||||
random
|
||||
strings
|
||||
template-haskell
|
||||
text
|
||||
time
|
||||
twain
|
||||
unix
|
||||
utf8-string
|
||||
warp
|
||||
yaml
|
||||
];
|
||||
|
||||
executableHaskellDepends = [
|
||||
aeson
|
||||
base
|
||||
base64
|
||||
bytestring
|
||||
containers
|
||||
directory
|
||||
hsyslog
|
||||
http-conduit
|
||||
network-uri
|
||||
optparse-applicative
|
||||
pretty-simple
|
||||
process
|
||||
random
|
||||
strings
|
||||
template-haskell
|
||||
text
|
||||
time
|
||||
twain
|
||||
unix
|
||||
utf8-string
|
||||
warp
|
||||
yaml
|
||||
];
|
||||
|
||||
description = "OAuth2 tool for mail clients";
|
||||
homepage = "https://github.com/pdobsan/mailctl";
|
||||
changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
mainProgram = "mailctl";
|
||||
}
|
||||
@ -1339,7 +1339,6 @@ mapAliases {
|
||||
|
||||
yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
|
||||
yafaray-core = libyafaray; # Added 2022-09-23
|
||||
yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09
|
||||
youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
|
||||
yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
|
||||
|
||||
|
||||
@ -13819,6 +13819,9 @@ with pkgs;
|
||||
|
||||
ytfzf = callPackage ../tools/misc/ytfzf { };
|
||||
|
||||
# To expose more packages for Yi, override the extraPackages arg.
|
||||
yi = callPackage ../applications/editors/yi/wrapper.nix { };
|
||||
|
||||
yaydl = callPackage ../tools/video/yaydl {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
@ -379,6 +379,7 @@ let
|
||||
xmobar
|
||||
xmonadctl
|
||||
xmonad-with-packages
|
||||
yi
|
||||
zsh-git-prompt
|
||||
;
|
||||
|
||||
@ -560,9 +561,8 @@ let
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
Cabal_3_10_3_0 = released;
|
||||
Cabal-syntax_3_10_3_0 = released;
|
||||
Cabal_3_12_1_0 = released;
|
||||
Cabal-syntax_3_12_1_0 = released;
|
||||
Cabal_3_14_0_0 = released;
|
||||
cabal2nix = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
@ -590,9 +590,6 @@ let
|
||||
language-nix = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
] released;
|
||||
large-hashable = [
|
||||
compilerNames.ghc928
|
||||
];
|
||||
nix-paths = released;
|
||||
titlecase = lib.subtractLists [
|
||||
compilerNames.ghc9101
|
||||
|
||||
Loading…
Reference in New Issue
Block a user