-
-
Notifications
You must be signed in to change notification settings - Fork 35
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.
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
Update packages from 23.05 to 23.11 #125
Conversation
This no longer has the (same) failing test issue previously commented on, see NixOS/nixpkgs#150930 (comment)
nixpkgs.nix
Outdated
# 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) {} |
There was a problem hiding this comment.
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:
- nh2/nixpkgs@9e49f8f1f37b Keep, not merged
- nh2/nixpkgs@40d2db0cee0e merged in bzip2, zstd: Add enableStatic option NixOS/nixpkgs#243161
- nh2/nixpkgs@75378f1bf479 merged in bzip2, zstd: Add enableStatic option NixOS/nixpkgs#243161
- nh2/nixpkgs@c7e42e02e837 merged in gitea: Fix postPatch command; add coreutils to PATH NixOS/nixpkgs#236700
- nh2/nixpkgs@065f8ab1aeb3 merged in gitea: Fix postPatch command; add coreutils to PATH NixOS/nixpkgs#236700
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 🤷♂️
There was a problem hiding this comment.
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.
Unfortunately the GHC 9.6 releases with
GHC 9.8.1 does seem to work though, i.e. |
# 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 { |
There was a problem hiding this comment.
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.
cc @nh2 |
Relating to #125 (comment) This still fails on NixOS 24.05 with
fails with:
|
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
Fixed by @NorfairKing's patch in NixOS/nixpkgs#317175 We cherry-picked it onto the |
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
Updates nixpkgs to 23.11.
nix build --impure --expr '(import ./survey { useArchiveFilesForTemplateHaskell = true; }).working'
nix build --impure --expr '(import ./survey { }).working'
Completely succeed.
nix build --impure --expr '(import ./survey { compiler = "ghc963"; }).working'
succeeds except for:ShellCheck
andstack
(transitively) fail to build due tomtl < 2.3
.darcs
fails due tounix <2.8
.