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.

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

Nixos 24.05 #127

Merged
merged 25 commits into from
Jun 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5392d22
Upgrade to postgresql 14.
jonathanlking Dec 30, 2023
2ef6d76
Update default version of GHC/Cabal versions
jonathanlking Dec 30, 2023
b49f61c
Remove postgrest from working set
jonathanlking Dec 31, 2023
9a20880
Update nixpkgs submodule for 24.05
jonathanlking Jan 1, 2024
075d119
Set ghc version to the one from NixOS 24.05
nh2 Jun 9, 2024
42d492a
Fix new curl dependencies not having static libs
nh2 Jun 9, 2024
79945d6
Create pkgsWithGhc package set
jonathanlking Jul 31, 2023
743c156
Reorder pkgsWithArchiveFiles and pkgsWithGhc
jonathanlking Nov 10, 2023
6601d2c
No longer depend on two GHC versions #122
jonathanlking Dec 30, 2023
0f21cbc
Set dontDisableStatic by default in an overlay
FPtje Jun 9, 2024
7b0ba2f
NixOS upgrade fix: get X packages from xorg
FPtje Jun 9, 2024
2018b46
Apply dontDisableStatic to xorg
FPtje Jun 9, 2024
9b925d2
Fix some nil warnings
FPtje Jun 9, 2024
6e3740e
nixpkgs: Fix nix file not using commit from submodule.
nh2 Jun 9, 2024
2cc53bb
Work around unordered-containers failing test suite with -O0
nh2 Jun 9, 2024
dd8b314
Work around aeson failing test suite with -O0
nh2 Jun 9, 2024
67c7d87
Don't use python2
nh2 Jun 9, 2024
dd0c245
Fix deprecated `enableSystemd` -> `systemdSupport`
nh2 Jun 9, 2024
8f5a35f
Fixes `useArchiveFilesForTemplateHaskell = true` on GHC 9.6.
nh2 Jun 9, 2024
2247dbd
Fix postgresql-simple on -O0
nh2 Jun 9, 2024
526e161
nixpkgs: Update submodule to include `libtiff` fix
nh2 Jun 15, 2024
444e6a5
Add "Open questions" section, overlay for fixing `pkg-config`
nh2 Jun 15, 2024
bbd56c1
nixpkgs: Update submodule to include `mariadb_config` wrong linker fl…
nh2 Jun 15, 2024
c38da36
`workingStackageExecutable` now working.
nh2 Jun 15, 2024
1416fd4
Update `workingStackageExecutables`.
nh2 Jun 15, 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
Prev Previous commit
Next Next commit
nixpkgs: Fix nix file not using commit from submodule.
I forgot it in commit "Update nixpkgs submodule for 24.05"
nh2 committed Jun 15, 2024
commit 6e3740e9ccc5d8648b8023ef420a934b81fe9e99
2 changes: 1 addition & 1 deletion nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
then import ./nixpkgs {}
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
# 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/71f5f45c33ac4c59e316c9d41ca8837b7d7f9e9b.tar.gz) {}
else import (fetchTarball https://github.com/nh2/nixpkgs/archive/942314d40590668d3975f431d23f928a741912cf.tar.gz) {}