Merge branch 'haskell-updates' into staging

This commit is contained in:
Wolfgang Walther
2026-01-10 17:12:28 +01:00
11 changed files with 756 additions and 890 deletions
+5
View File
@@ -23,6 +23,7 @@
cmake,
nix,
samba,
testers,
# for passthru.lore
binlore,
@@ -141,10 +142,14 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ jcumming ];
platforms = lib.platforms.all;
inherit (acl.meta) badPlatforms;
pkgConfigModules = [ "libarchive" ];
};
passthru.tests = {
inherit cmake nix samba;
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
};
# bsdtar is detected as "cannot" because its exec is internal to
+9
View File
@@ -23,6 +23,8 @@
squid,
tor,
uwsgi,
testers,
libcap,
}:
assert usePam -> pam != null;
@@ -127,6 +129,9 @@ stdenv.mkDerivation rec {
tor
uwsgi
;
pkg-config = testers.hasPkgConfigModules {
package = libcap;
};
};
meta = {
@@ -134,5 +139,9 @@ stdenv.mkDerivation rec {
homepage = "https://sites.google.com/site/fullycapable";
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
pkgConfigModules = [
"libcap"
"libpsx"
];
};
}
+5
View File
@@ -43,6 +43,7 @@
replaceVars,
openssl,
ostree-full,
testers,
}:
let
@@ -170,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: {
musl = pkgsCross.musl64.ostree;
installedTests = nixosTests.installed-tests.ostree;
inherit ostree-full;
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
};
};
@@ -179,5 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.lgpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
pkgConfigModules = [ "ostree-1" ];
};
})
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "52d973cb0421cdffbdc3e26d40c8202034c6a873",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52d973cb0421cdffbdc3e26d40c8202034c6a873.tar.gz",
"sha256": "007nwq696dcbppgpamlc20xaj0p7drccg15xig8dngbliv04cgjy",
"msg": "Update from Hackage at 2025-12-26T08:56:01Z"
"commit": "d1602cb2b331058fcfa5580f16159e47325bcd1a",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1602cb2b331058fcfa5580f16159e47325bcd1a.tar.gz",
"sha256": "134qhqlxfkv0vs58pzkll1cbqci8npr42yh0x1gmd0s8y00crqa4",
"msg": "Update from Hackage at 2025-12-30T09:01:27Z"
}
@@ -199,7 +199,6 @@ broken-packages:
- antisplice # failure in job https://hydra.nixos.org/build/233238144 at 2023-09-02
- antlr-haskell # failure in job https://hydra.nixos.org/build/233208196 at 2023-09-02
- anydbm # failure in job https://hydra.nixos.org/build/233195447 at 2023-09-02
- aoc # failure in job https://hydra.nixos.org/build/307516728 at 2025-09-19
- Aoide # failure in job https://hydra.nixos.org/build/233239286 at 2023-09-02
- aop-prelude # failure in job https://hydra.nixos.org/build/295091671 at 2025-04-22
- aosd # failure in job https://hydra.nixos.org/build/233207331 at 2023-09-02
@@ -788,7 +787,6 @@ broken-packages:
- chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13
- chalmers-lava2000 # failure in job https://hydra.nixos.org/build/233239592 at 2023-09-02
- changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02
- changeset # failure in job https://hydra.nixos.org/build/295092242 at 2025-04-22
- char-qq # failure in job https://hydra.nixos.org/build/295092253 at 2025-04-22
- character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02
- chart-histogram # failure in job https://hydra.nixos.org/build/233250470 at 2023-09-02
@@ -841,8 +839,6 @@ broken-packages:
- clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02
- CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02
- clash-finite # failure in job https://hydra.nixos.org/build/295092297 at 2025-04-22
- clash-lib # failure in job https://hydra.nixos.org/build/309812683 at 2025-10-15
- clash-lib-hedgehog # failure in job https://hydra.nixos.org/build/295122808 at 2025-04-22
- clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01
- clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01
- Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02
@@ -1076,7 +1072,6 @@ broken-packages:
- copilot-verifier # failure in job https://hydra.nixos.org/build/297024747 at 2025-05-14
- copilot-visualizer # failure in job https://hydra.nixos.org/build/315095584 at 2025-11-29
- copr # failure in job https://hydra.nixos.org/build/233252310 at 2023-09-02
- coquina # failure in job https://hydra.nixos.org/build/307610386 at 2025-09-19
- core # failure in job https://hydra.nixos.org/build/233253971 at 2023-09-02
- core-compiler # failure in job https://hydra.nixos.org/build/233250303 at 2023-09-02
- core-effect-effectful # failure in job https://hydra.nixos.org/build/252723824 at 2024-03-16
@@ -1194,7 +1189,6 @@ broken-packages:
- danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02
- Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02
- dao # failure in job https://hydra.nixos.org/build/233240654 at 2023-09-02
- dap # failure in job https://hydra.nixos.org/build/237239767 at 2023-10-21
- darcs-buildpackage # failure in job https://hydra.nixos.org/build/233213566 at 2023-09-02
- darcs-cabalized # failure in job https://hydra.nixos.org/build/233234765 at 2023-09-02
- darcs-graph # failure in job https://hydra.nixos.org/build/233245230 at 2023-09-02
@@ -1415,7 +1409,6 @@ broken-packages:
- direct-http # failure in job https://hydra.nixos.org/build/233232796 at 2023-09-02
- direct-plugins # failure in job https://hydra.nixos.org/build/233211547 at 2023-09-02
- directed-cubical # failure in job https://hydra.nixos.org/build/233215175 at 2023-09-02
- directory-contents # failure in job https://hydra.nixos.org/build/295092900 at 2025-04-22
- direm # failure in job https://hydra.nixos.org/build/233211496 at 2023-09-02
- dirstream # failure in job https://hydra.nixos.org/build/273442606 at 2024-10-01
- disco # failure in job https://hydra.nixos.org/build/233212298 at 2023-09-02
@@ -1517,6 +1510,7 @@ broken-packages:
- dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16
- dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02
- duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2
- duckdb-haskell # failure in job https://hydra.nixos.org/build/318373036 at 2026-01-10
- duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02
- duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02
- dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02
@@ -1954,7 +1948,6 @@ broken-packages:
- fortran-vars # failure in job https://hydra.nixos.org/build/233257719 at 2023-09-02
- fortytwo # failure in job https://hydra.nixos.org/build/233209552 at 2023-09-02
- foscam-filename # failure in job https://hydra.nixos.org/build/233237326 at 2023-09-02
- fp-ieee # failure in job https://hydra.nixos.org/build/307518380 at 2025-09-19
- FPretty # failure in job https://hydra.nixos.org/build/233196648 at 2023-09-02
- fptest # failure in job https://hydra.nixos.org/build/233233288 at 2023-09-02
- fquery # failure in job https://hydra.nixos.org/build/233196287 at 2023-09-02
@@ -2019,6 +2012,7 @@ broken-packages:
- FTGL-bytestring # failure in job https://hydra.nixos.org/build/233256032 at 2023-09-02
- ftp-conduit # failure in job https://hydra.nixos.org/build/233244330 at 2023-09-02
- ftphs # failure in job https://hydra.nixos.org/build/233215550 at 2023-09-02
- fudgets # failure in job https://hydra.nixos.org/build/318373386 at 2026-01-10
- fugue # failure in job https://hydra.nixos.org/build/295093405 at 2025-04-22
- FULE # failure in job https://hydra.nixos.org/build/252719910 at 2024-03-16
- full-sessions # failure in job https://hydra.nixos.org/build/233254332 at 2023-09-02
@@ -2103,7 +2097,6 @@ broken-packages:
- generic-tree # failure in job https://hydra.nixos.org/build/233219539 at 2023-09-02
- generic-trie # failure in job https://hydra.nixos.org/build/252733076 at 2024-03-16
- generic-xmlpickler # failure in job https://hydra.nixos.org/build/233246507 at 2023-09-02
- generics-eot # failure in job https://hydra.nixos.org/build/252717610 at 2024-03-16
- generics-mrsop # failure in job https://hydra.nixos.org/build/233233310 at 2023-09-02
- genericserialize # failure in job https://hydra.nixos.org/build/233253092 at 2023-09-02
- genetics # failure in job https://hydra.nixos.org/build/233219599 at 2023-09-02
@@ -3029,6 +3022,7 @@ broken-packages:
- hs2ps # failure in job https://hydra.nixos.org/build/233258362 at 2023-09-02
- hsakamai # failure in job https://hydra.nixos.org/build/252722933 at 2024-03-16
- hsaml2 # failure in job https://hydra.nixos.org/build/233252618 at 2023-09-02
- HsASA # failure in job https://hydra.nixos.org/build/318371121 at 2026-01-10
- hsautogui # failure in job https://hydra.nixos.org/build/253687662 at 2024-03-31
- hsay # failure in job https://hydra.nixos.org/build/233218925 at 2023-09-02
- hsbc # failure in job https://hydra.nixos.org/build/233206310 at 2023-09-02
@@ -3116,6 +3110,7 @@ broken-packages:
- hsSqlite3 # failure in job https://hydra.nixos.org/build/233238549 at 2023-09-02
- 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
- HsSyck # failure in job https://hydra.nixos.org/build/318371120 at 2026-01-10
- hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02
- hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02
- hstest # failure in job https://hydra.nixos.org/build/233237803 at 2023-09-02
@@ -3349,6 +3344,7 @@ broken-packages:
- integer-pure # failure in job https://hydra.nixos.org/build/233216037 at 2023-09-02
- integer-simple # failure in job https://hydra.nixos.org/build/233192893 at 2023-09-02
- integer-types # failure in job https://hydra.nixos.org/build/252734448 at 2024-03-16
- intelli-monad # failure in job https://hydra.nixos.org/build/318374656 at 2026-01-09
- intensional-datatys # failure in job https://hydra.nixos.org/build/233218337 at 2023-09-02
- interact # failure in job https://hydra.nixos.org/build/233228146 at 2023-09-02
- interactive-plot # failure in job https://hydra.nixos.org/build/233212280 at 2023-09-02
@@ -3841,7 +3837,6 @@ broken-packages:
- log2json # failure in job https://hydra.nixos.org/build/233211819 at 2023-09-02
- logentries # failure in job https://hydra.nixos.org/build/233215590 at 2023-09-02
- logger # failure in job https://hydra.nixos.org/build/233237524 at 2023-09-02
- logging-effect-colors # failure in job https://hydra.nixos.org/build/295095150 at 2025-04-22
- logging-effect-extra-file # failure in job https://hydra.nixos.org/build/233225200 at 2023-09-02
- logging-effect-extra-handler # failure in job https://hydra.nixos.org/build/233232054 at 2023-09-02
- logging-effect-syslog # failure in job https://hydra.nixos.org/build/295095176 at 2025-04-22
@@ -3873,12 +3868,10 @@ broken-packages:
- lp-diagrams # failure in job https://hydra.nixos.org/build/295095167 at 2025-04-22
- lp-diagrams-svg # failure in job https://hydra.nixos.org/build/233220097 at 2023-09-02
- LRU # failure in job https://hydra.nixos.org/build/233206273 at 2023-09-02
- lrucaching # failure in job https://hydra.nixos.org/build/307520156 at 2025-09-19
- lscabal # failure in job https://hydra.nixos.org/build/233253536 at 2023-09-02
- lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02
- lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02
- lsql-csv # failure in job https://hydra.nixos.org/build/307520164 at 2025-09-19
- ltext # failure in job https://hydra.nixos.org/build/317095607 at 2025-12-27
- lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16
- ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02
- ltk # failure in job https://hydra.nixos.org/build/233244152 at 2023-09-02
@@ -4057,6 +4050,7 @@ broken-packages:
- minilens # failure in job https://hydra.nixos.org/build/233191347 at 2023-09-02
- minions # failure in job https://hydra.nixos.org/build/233246840 at 2023-09-02
- miniplex # failure in job https://hydra.nixos.org/build/233241976 at 2023-09-02
- minisat-solver # failure in job https://hydra.nixos.org/build/318375250 at 2026-01-10
- ministg # failure in job https://hydra.nixos.org/build/233214109 at 2023-09-02
- minizinc-process # failure in job https://hydra.nixos.org/build/233211497 at 2023-09-02
- minst-idx # failure in job https://hydra.nixos.org/build/233259901 at 2023-09-02
@@ -4174,7 +4168,6 @@ broken-packages:
- morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02
- morloc # failure in job https://hydra.nixos.org/build/295095489 at 2025-04-22
- morpheus-graphql-cli # failure in job https://hydra.nixos.org/build/233249063 at 2023-09-02
- morpheus-graphql-code-gen # failure in job https://hydra.nixos.org/build/307611107 at 2025-09-19
- morphisms-functors # failure in job https://hydra.nixos.org/build/233255311 at 2023-09-02
- morphisms-objects # failure in job https://hydra.nixos.org/build/233216076 at 2023-09-02
- morte # failure in job https://hydra.nixos.org/build/233212193 at 2023-09-02
@@ -4971,7 +4964,6 @@ broken-packages:
- 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-aead # failure in job https://hydra.nixos.org/build/295096231 at 2025-04-22
- ppad-script # failure in job https://hydra.nixos.org/build/295096199 at 2025-04-22
- 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
@@ -5302,7 +5294,6 @@ broken-packages:
- reflex-orphans # failure in job https://hydra.nixos.org/build/233249128 at 2023-09-02
- reflex-sdl2 # failure in job https://hydra.nixos.org/build/307521569 at 2025-09-19
- reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02
- reflex-vty # failure in job https://hydra.nixos.org/build/295096544 at 2025-04-22
- reform-blaze # failure in job https://hydra.nixos.org/build/309816655 at 2025-10-15
- reform-hamlet # failure in job https://hydra.nixos.org/build/233230013 at 2023-09-02
- reform-hsp # failure in job https://hydra.nixos.org/build/233228737 at 2023-09-02
@@ -5954,6 +5945,7 @@ broken-packages:
- sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02
- sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16
- sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02
- sqlite-easy # failure in job https://hydra.nixos.org/build/318377025 at 2026-01-10
- sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02
- sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02
- sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21
@@ -6376,6 +6368,7 @@ broken-packages:
- subleq-toolchain # failure in job https://hydra.nixos.org/build/233239415 at 2023-09-02
- submark # failure in job https://hydra.nixos.org/build/233231701 at 2023-09-02
- subsample # failure in job https://hydra.nixos.org/build/233201324 at 2023-09-02
- substrate-protocol # failure in job https://hydra.nixos.org/build/318377131 at 2026-01-09
- subwordgraph # failure in job https://hydra.nixos.org/build/233229131 at 2023-09-02
- success # failure in job https://hydra.nixos.org/build/252718360 at 2024-03-16
- successors # failure in job https://hydra.nixos.org/build/295097331 at 2025-04-22
@@ -6417,7 +6410,6 @@ broken-packages:
- swagger-test # failure in job https://hydra.nixos.org/build/233231958 at 2023-09-02
- swarm # failure in job https://hydra.nixos.org/build/233201687 at 2023-09-02
- swearjure # failure in job https://hydra.nixos.org/build/233231407 at 2023-09-02
- sweet-egison # failure in job https://hydra.nixos.org/build/295097344 at 2025-04-22
- swf # failure in job https://hydra.nixos.org/build/233191062 at 2023-09-02
- swift-lda # failure in job https://hydra.nixos.org/build/233252608 at 2023-09-02
- swiss # failure in job https://hydra.nixos.org/build/233251942 at 2023-09-02
@@ -7059,6 +7051,7 @@ broken-packages:
- vhd # failure in job https://hydra.nixos.org/build/233230229 at 2023-09-02
- vhdl # failure in job https://hydra.nixos.org/build/233244814 at 2023-09-02
- vicinity # failure in job https://hydra.nixos.org/build/233240251 at 2023-09-02
- ViennaRNA-bindings # failure in job https://hydra.nixos.org/build/318371301 at 2026-01-10
- viewprof # failure in job https://hydra.nixos.org/build/233257842 at 2023-09-02
- views # failure in job https://hydra.nixos.org/build/233203371 at 2023-09-02
- vikunja-api # failure in job https://hydra.nixos.org/build/295098092 at 2025-04-22
@@ -113,30 +113,13 @@ extra-packages:
# keep-sorted start skip_lines=1 case=no
package-maintainers:
alexfmpe:
- aeson-gadt-th
- android-activity
- basic-sop
- bytestring-aeson-orphans
- cli-extras
- cli-git
- cli-nix
- commutative-semigroups
- constraints-extras
- dependent-map
- dependent-monoidal-map
- dependent-sum
- dependent-sum-aeson-orphans
- dependent-sum-template
- gargoyle
- gargoyle-postgresql
- gargoyle-postgresql-connect
- gargoyle-postgresql-nix
- generics-sop
- ghcjs-base
- ghcjs-dom
- ghcjs-dom-javascript
- ghcjs-dom-jsaddle
- haveibeenpwned
- jsaddle
- jsaddle-clib
- jsaddle-dom
@@ -147,25 +130,15 @@ package-maintainers:
- large-records
- lens-sop
- linux-namespaces
- monoid-map
- monoidal-containers
- nix-thunk
- patch
- proto-lens-arbitrary
- proto3-suite
- proto3-wire
- records-sop
- reflex
- reflex-dom
- reflex-dom-core
- reflex-gadt-api
- reflex-fsnotify
- th-abstraction
- universe
- universe-some
- vessel
- warp
- which
Anton-Latukha:
- hnix
- hnix-store-core
@@ -1,4 +1,4 @@
# Stackage LTS 24.25
# Stackage LTS 24.26
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -61,7 +61,7 @@ default-package-overrides:
- amqp-utils ==0.6.7.3
- annotated-exception ==0.3.0.4
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==1.1.4
- ansi-terminal ==1.1.5
- ansi-terminal-game ==1.9.3.0
- ansi-terminal-types ==1.1.3
- ansi-wl-pprint ==1.0.2
@@ -850,7 +850,7 @@ default-package-overrides:
- filtrable ==0.1.6.0
- fin ==0.3.2
- FindBin ==0.0.5
- fingertree ==0.1.6.2
- fingertree ==0.1.6.3
- finite-typelits ==0.2.1.0
- first-class-families ==0.8.2.0
- fits-parse ==0.4.2
@@ -966,7 +966,7 @@ default-package-overrides:
- genvalidity-persistent ==1.0.0.2
- genvalidity-property ==1.0.0.0
- genvalidity-scientific ==1.0.0.0
- genvalidity-sydtest ==1.0.0.0
- genvalidity-sydtest ==1.0.1.0
- genvalidity-sydtest-aeson ==1.0.0.0
- genvalidity-sydtest-hashable ==1.0.0.1
- genvalidity-sydtest-lens ==1.0.0.0
@@ -1593,7 +1593,7 @@ default-package-overrides:
- kmeans ==0.1.3
- knob ==0.2.2
- koji ==0.0.2
- koji-tool ==1.3
- koji-tool ==1.3.1
- kvitable ==1.1.1.0
- labels ==0.3.3
- lackey ==2.0.0.11
@@ -1730,7 +1730,7 @@ default-package-overrides:
- manifolds-core ==0.6.1.1
- Mantissa ==0.1.0.0
- map-syntax ==0.3
- mappings ==0.3.2.0
- mappings ==0.3.3.0
- markdown ==0.1.17.5
- markdown-unlit ==0.6.0
- markov-chain ==0.0.3.4
@@ -1876,12 +1876,12 @@ default-package-overrides:
- monoidmap-internal ==0.0.0.1
- monoidmap-quickcheck ==0.0.0.3
- more-containers ==0.2.2.2
- morpheus-graphql-app ==0.28.1
- morpheus-graphql-client ==0.28.1
- morpheus-graphql-code-gen-utils ==0.28.1
- morpheus-graphql-core ==0.28.1
- morpheus-graphql-server ==0.28.1
- morpheus-graphql-subscriptions ==0.28.1
- morpheus-graphql-app ==0.28.2
- morpheus-graphql-client ==0.28.2
- morpheus-graphql-code-gen-utils ==0.28.2
- morpheus-graphql-core ==0.28.2
- morpheus-graphql-server ==0.28.2
- morpheus-graphql-subscriptions ==0.28.2
- moss ==0.2.0.1
- mountpoints ==1.0.2
- mpi-hs ==0.7.3.1
@@ -1958,7 +1958,7 @@ default-package-overrides:
- network-uri ==2.6.4.2
- network-uri-template ==0.1.1.4
- network-wait ==0.2.0.0
- newtype ==0.2.2.0
- newtype ==0.2.2.1
- newtype-generics ==0.6.2
- nfc ==0.1.1
- nicify-lib ==1.0.1
@@ -2277,7 +2277,7 @@ default-package-overrides:
- pseudo-boolean ==0.1.12.0
- psql-helpers ==0.1.0.0
- PSQueue ==1.2.2
- psqueues ==0.2.8.2
- psqueues ==0.2.8.3
- pthread ==0.2.1
- ptr ==0.16.8.7
- ptr-poker ==0.1.2.16
@@ -3136,7 +3136,7 @@ default-package-overrides:
- valor ==1.0.0.0
- vary ==0.1.1.3
- varying ==0.8.1.0
- vault ==0.3.1.5
- vault ==0.3.1.6
- vcr ==0.1.0
- vcs-ignore ==0.0.2.0
- vec ==0.5.1
@@ -3291,7 +3291,7 @@ default-package-overrides:
- xmlhtml ==0.2.5.4
- xmonad ==0.18.0
- xmonad-contrib ==0.18.1
- xor ==0.0.1.3
- xor ==0.0.1.4
- xss-sanitize ==0.3.7.2
- xxhash-ffi ==0.3.1
- yaml ==0.11.11.2
@@ -161,7 +161,6 @@ dont-distribute-packages:
- aura
- authoring
- AutoForms
- automaton_1_6
- autonix-deps-kf5
- avers
- avers-api
@@ -421,9 +420,6 @@ dont-distribute-packages:
- cfopu
- chainweb-mining-client
- chalkboard-viewer
- changeset-containers
- changeset-lens
- changeset-reflex
- chapelure
- charade
- chart-cli
@@ -459,8 +455,6 @@ dont-distribute-packages:
- claferIG
- claferwiki
- clash
- clash-ghc
- clash-shake
- classify-frog
- classy-effects
- classy-effects-th
@@ -842,9 +836,6 @@ dont-distribute-packages:
- effect-monad
- effective-aspects-mzv
- effects-parser
- egison
- egison-quote
- egison-tutorial
- ekg-carbon
- elasticsearch-interchange
- electrs-client
@@ -1128,7 +1119,6 @@ dont-distribute-packages:
- geolite-csv
- geomancy-layout
- getemx
- ghc-debugger
- ghc-dump-util
- ghc-imported-from
- ghc-instances
@@ -1237,7 +1227,6 @@ dont-distribute-packages:
- graphicsFormats
- graphicstools
- graphtype
- graphula
- greencard-lib
- grid-proto
- gridbounds
@@ -1992,7 +1981,6 @@ dont-distribute-packages:
- knit-haskell
- koji-install
- koji-tool
- koji-tool_1_3_1
- korfu
- ks-test
- kubernetes-client
@@ -2153,7 +2141,6 @@ dont-distribute-packages:
- lostcities
- loup
- LPPaver
- lrucaching-haxl
- ls-usb
- LslPlus
- lsm-tree
@@ -2320,7 +2307,6 @@ dont-distribute-packages:
- morley-client
- morley-prelude
- morley-upgradeable
- morpheus-graphql
- morphisms-functors-inventory
- motor
- motor-diagrams
@@ -2898,12 +2884,10 @@ dont-distribute-packages:
- refh
- reflex-animation
- reflex-backend-wai
- reflex-ghci
- reflex-gloss-scene
- reflex-libtelnet
- reflex-localize
- reflex-monad-auth
- reflex-process
- refractor
- refurb
- reg-alloc-graph-color
@@ -3007,7 +2991,6 @@ dont-distribute-packages:
- roshask
- rosmsg-bin
- rounded
- rounded-hw
- roundtrip-xml
- route-generator
- route-planning
@@ -3385,6 +3368,7 @@ dont-distribute-packages:
- stunts
- stutter
- subhask
- substrate-synapse
- substring-parser
- sugar-data
- sugar-json
@@ -3411,6 +3395,7 @@ dont-distribute-packages:
- sydtest-amqp
- sydtest-webdriver-screenshot
- sydtest-webdriver-yesod
- sydtest-webdriver-yesod_0_0_1_0
- sylvia
- symantic-atom
- symantic-http-demo
@@ -3861,6 +3846,7 @@ dont-distribute-packages:
- yam-transaction-odbc
- yam-transaction-postgresql
- yam-web
- yaml-light
- yaml-rpc-scotty
- yaml-rpc-snap
- yarr-image-io
@@ -1005,6 +1005,11 @@ builtins.intersectAttrs super {
'';
}) super.sbv;
# Don't use vendored (and outdated) c-blosc library
hblosc = addPkgconfigDepends [
pkgs.c-blosc
] (enableCabalFlag "externalBlosc" super.hblosc);
# The test-suite requires a running PostgreSQL server.
Frames-beam = dontCheck super.Frames-beam;
@@ -1157,6 +1162,11 @@ builtins.intersectAttrs super {
}
);
# Don't use vendored copy of zxcvbn-c
zxcvbn-c = addBuildDepends [
pkgs.zxcvbn-c
] (enableCabalFlag "use-shared-lib" super.zxcvbn-c);
# The test suite has undeclared dependencies on git.
githash = dontCheck super.githash;
@@ -1970,6 +1980,7 @@ builtins.intersectAttrs super {
gi-gtksource5
gi-gsk
gi-adwaita
gi-ostree
sdl2-ttf
sdl2
dear-imgui
File diff suppressed because it is too large Load Diff
+11 -12
View File
@@ -60,6 +60,15 @@ let
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;
llvmPackages = pkgs.llvmPackages_20;
# Note the Nixpkgs default version is chosen in all-packages.nix.
chooseDefaultVersions = sets: {
ghc94 = sets.ghc948;
ghc96 = sets.ghc967;
ghc98 = sets.ghc984;
ghc910 = sets.ghc9103;
ghc912 = sets.ghc9122;
ghc914 = sets.ghc9141;
};
in
{
lib = haskellLibUncomposable;
@@ -100,7 +109,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc94 = compiler.ghc948;
ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {
bootPkgs =
if
@@ -116,7 +124,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc96 = compiler.ghc967;
ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {
bootPkgs =
if
@@ -134,7 +141,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc98 = compiler.ghc984;
ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
bootPkgs =
if
@@ -169,7 +175,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc910 = compiler.ghc9103;
ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
bootPkgs =
# No suitable bindist packaged yet
@@ -186,7 +191,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc912 = compiler.ghc9122;
ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
bootPkgs =
# No suitable bindist packaged yet
@@ -195,7 +199,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc914 = compiler.ghc9141;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs =
# No suitable bindist packaged yet
@@ -219,6 +222,7 @@ in
)
);
}
// chooseDefaultVersions compiler
// pkgs.lib.optionalAttrs config.allowAliases {
ghc810 = throw "'haskell.compiler.ghc810' has been removed."; # Added 2025-09-07
ghc90 = throw "'haskell.compiler.ghc90' has been removed."; # Added 2025-09-07
@@ -261,19 +265,16 @@ in
ghc = bh.compiler.ghc948;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
};
ghc94 = packages.ghc948;
ghc967 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc967;
ghc = bh.compiler.ghc967;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
};
ghc96 = packages.ghc967;
ghc984 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc984;
ghc = bh.compiler.ghc984;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
};
ghc98 = packages.ghc984;
ghc9102 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9102;
ghc = bh.compiler.ghc9102;
@@ -284,7 +285,6 @@ in
ghc = bh.compiler.ghc9103;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
};
ghc910 = packages.ghc9103;
ghc9122 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9122;
ghc = bh.compiler.ghc9122;
@@ -295,13 +295,11 @@ in
ghc = bh.compiler.ghc9123;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc912 = packages.ghc9122;
ghc9141 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9141;
ghc = bh.compiler.ghc9141;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
};
ghc914 = packages.ghc9141;
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
@@ -322,6 +320,7 @@ in
}
);
}
// chooseDefaultVersions packages
// pkgs.lib.optionalAttrs config.allowAliases {
ghc810 = throw "'haskell.packages.ghc810' has been removed."; # Added 2025-09-07
ghc90 = throw "'haskell.packages.ghc90' has been removed."; # Added 2025-09-07