Skip to content
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

Jump to bottom

Update packages from 23.05 to 23.11 #125

Closed
wants to merge 5 commits into from
Closed

Update packages from 23.05 to 23.11 #125

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a11684b
Upgrade to postgresql 14.
jonathanlking Dec 30, 2023
2ae5ce8
Update default version of GHC/Cabal versions
jonathanlking Dec 30, 2023
e1f4892
Remove postgrest from working set
jonathanlking Dec 31, 2023
7436f71
[UPDATE BEFORE MERGING!] Update nixpkgs reference
jonathanlking Jan 1, 2024
f99f877
[UPDATE BEFORE MERGING!] Update nixpkgs reference (p11-kit)
jonathanlking Jan 1, 2024
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
2 changes: 1 addition & 1 deletion nixpkgs
Open in desktop
Submodule nixpkgs updated 20432 files
4 changes: 2 additions & 2 deletions nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
if builtins.pathExists ./nixpkgs/pkgs
then import ./nixpkgs {}
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
# This is nixos-23.05 as of 2023-06-08, with minimal patches currently having open nixpkgs PR (see commits for PR links).
else import (fetchTarball https://github.com/nh2/nixpkgs/archive/9e49f8f1f37bc906cda1adb33064c325d760819a.tar.gz) {}
# This is nixos-23.11 as of 2024-01-01, with minimal patches currently having open nixpkgs PR (see commits for PR links).
else import (fetchTarball https://github.com/nh2/nixpkgs/archive/ca1f69776b9dda07656a1051310e5e138aa83067.tar.gz) {}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have started with your static-haskell-nix-nixos-23.05 branch, which included the following patches:

I then picked the current nixos-23.11 (NixOS/nixpkgs@32f6357) and cherry-picked nh2/nixpkgs@9e49f8f1f37b on top.

I have a static-haskell-nix-nixos-23.11 branch on my fork, which you could just copy over to yours if you're happy with these changes — I find it a bit odd that GitHub already allows accessing the archive under your fork but 🤷‍♂️

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have also included NixOS/nixpkgs#278099 so that p11-kit (which is a dependency of many things, including ghc) builds on single-user install non-NixOS systems.

19 changes: 9 additions & 10 deletions survey/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ in
])."${approach}",

# When changing this, also change the default version of Cabal declared below
compiler ? "ghc927",
compiler ? "ghc948",

# Tries to use `.a` files when evaluating TH, instead of `.so` files.
useArchiveFilesForTemplateHaskell ? false,
Expand All @@ -32,8 +32,9 @@ in
({
ghc8107 = "Cabal_3_2_1_0";
ghc902 = "Cabal_3_4_1_0";
ghc927 = "Cabal_3_6_3_0";
ghc962 = "Cabal_3_10_1_0";
ghc928 = "Cabal_3_6_3_0";
ghc948 = "Cabal_3_8_1_0";
ghc963 = "Cabal_3_10_1_0";
}."${compiler}"),

# Use `integer-simple` instead of `integer-gmp` to avoid linking in
Expand Down Expand Up @@ -634,12 +635,10 @@ let
# So somehow, the above `zlib_static` uses *this* `zlib`, even though
# the above uses `previous.zlib.override` and thus shouldn't see this one.

# The test-suite for PostgreSQL 13 fails:
# https://github.com/NixOS/nixpkgs/issues/150930
#
# Even if you disable the test-suite, there are various linking issues.
# PostgreSQL 12 has similar issues, so we drop to PostgreSQL 11.
postgresql = (previous.postgresql_11.overrideAttrs (old: { dontDisableStatic = true; })).override {
# Disable failing tests for postgresql on musl that should have no impact
# on the libpq that we need (collate.icu.utf8 and foreign regression tests)
# This approach is copied from PostgREST, see https://github.com/PostgREST/postgrest/pull/2002/files#diff-72929db01d3c689277a1e7777b5df1dbbb20c5de41d1502ff8ac6b443a4e74c6R45
postgresql = (previous.postgresql_14.overrideAttrs (old: { dontDisableStatic = true; doCheck = false; })).override {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this comment wholesale from PostgREST too.
I have no reason to doubt it (and have been running software in production with no issues), but I'm not an expert on this.

# We need libpq, which does not need systemd,
# and systemd doesn't currently build with musl.
enableSystemd = false;
Expand Down Expand Up @@ -1659,7 +1658,7 @@ in
bench
dhall
dhall-json
postgrest
# postgrest # Dependency `configurator-pg-0.2.7` does not build due to `megaparsec >=7.0.0 && <9.3` (This is fixed in `configurator-pg- 0.2.8`)
# proto3-suite # Dependency `proto3-wire-1.4.0` does not build due to `bytestring >=0.10.6.0 && <0.11.0`
hsyslog # Small example of handling https://github.com/NixOS/nixpkgs/issues/43849 correctly
# aura # `aur` maked as broken in nixpkgs, but works here with `allowBroken = true;` actually
Expand Down