Skip to content

build: fix build by upstream nixpkgs now #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

build: fix build by upstream nixpkgs now #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c78e6de
build(flake): run `nix flake update`
ncaq May 23, 2025
e1f0429
build(cabal.project): remove `postgresql-libpq` package section
ncaq May 23, 2025
23ffe30
build(cabal.project): remove `mysql` `source-repository`
ncaq May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,13 @@ packages:
persistent-redis
persistent-qq

-- required by nix but breaks macOS cabal builds:
--package postgresql-libpq
-- flags: +use-pkg-config

allow-newer:
-- https://github.com/fizruk/http-api-data/pull/146
http-api-data:base
, postgresql-simple:base
, postgresql-simple:template-haskell
, bytestring-lexing:base

source-repository-package
type: git
location: https://github.com/parsonsmatt/mysql
tag: 1e7dc274bf9a2919c9dd4298ed46c1bd1a1b677d
--sha256: 1zbwly28rpwkqqkj9cbsbr57rx2y79nbfcrvqmp7a0gxy0d9i4qy

-- Needed to test that `persistent-redis` works with mtl-2.3
-- https://github.com/informatikr/hedis/pull/190
-- source-repository-package
Expand Down
103 changes: 59 additions & 44 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@
sqlite
];
};
modules = [{
packages."mysql".components.library = with pkgs; {
configureFlags = [
"--with-mysql_config=${mariadb-connector-c.dev}/bin/mysql_config"
];
includes = [ openssl zlib ];
libs = [ openssl zlib ];
};
}];
};
})
];
Expand Down
Loading