alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

haskellPackages: remove deprecated aliases mysql and utillinux

Browse source 
These attribute names were converted into aliases in the following
changes:

* 62733b37b4
* https://github.com/NixOS/nixpkgs/pull/104776

cabal2nix-unstable has been updated to be aware of these changes in
7a9080d774, so these aliases should no
longer cause issues when evaluating with `allowAliases = false`.
This commit is contained in:
sternenseemann 2021-06-10 14:10:39 +02:00
parent 7a9080d774
commit 35a73693f4
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
# Use the default version of mysql to build this package (which is actually mariadb).
# test phase requires networking
mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
mysql = dontCheck super.mysql;
# CUDA needs help finding the SDK headers and libraries.
cuda = overrideCabal super.cuda (drv: {

13
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -115325,7 +115325,7 @@ self: {
, parsec, process, QuickCheck, random, regex-tdfa, resourcet
, scientific, tagsoup, tasty, tasty-golden, tasty-hunit
, tasty-quickcheck, template-haskell, text, time
, time-locale-compat, unordered-containers, utillinux, vector, wai
, time-locale-compat, unordered-containers, util-linux, vector, wai
, wai-app-static, warp, yaml
}:
mkDerivation {
@ -115349,11 +115349,11 @@ self: {
base bytestring containers filepath QuickCheck tasty tasty-golden
tasty-hunit tasty-quickcheck text unordered-containers yaml
];
testToolDepends = [ utillinux ];
testToolDepends = [ util-linux ];
description = "A static website compiler library";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ erictapen ];
}) {inherit (pkgs) utillinux;};
}) {inherit (pkgs) util-linux;};
"hakyll-R" = callPackage
({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
@ -182663,7 +182663,8 @@ self: {
}) {};
"mysql" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
({ mkDerivation, base, bytestring, Cabal, containers, hspec
, libmysqlclient
}:
mkDerivation {
pname = "mysql";
@ -182671,11 +182672,11 @@ self: {
sha256 = "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring containers ];
librarySystemDepends = [ mysql ];
librarySystemDepends = [ libmysqlclient ];
testHaskellDepends = [ base bytestring hspec ];
description = "A low-level MySQL client library";
license = lib.licenses.bsd3;
}) {inherit (pkgs) mysql;};
}) {inherit (pkgs) libmysqlclient;};
"mysql-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects, mysql