Skip to content

Commit ae3bffe

Browse files
committed
Update to latest nixpkgs unstable.
This switches from my nixpkgs fork back to upstream nixpkgs, which thanks to community-sponsored CI has been shown to be green for a while. Not carrying my changes to `pkgsStatic` breaks support for using that as a base, but that was only an experiment on my side anyway. `pkgsMusl` is the better base.
1 parent b854a48 commit ae3bffe

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

nixpkgs

Submodule nixpkgs updated 7923 files

nixpkgs.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
1717
if builtins.pathExists ./nixpkgs/pkgs
1818
then import ./nixpkgs {}
1919
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
20-
else import (fetchTarball https://github.com/nh2/nixpkgs/archive/6b43b1d11bb67607919256ea5b8a29aec770f1f7.tar.gz) {}
20+
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/0c960262d159d3a884dadc3d4e4b131557dad116.tar.gz) {}

survey/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ in
2121
overlays ? [],
2222

2323
approach ? # "pkgsMusl" or "pkgsStatic"
24+
# TODO `pkgsStatic` support is currently not maintained and will likely be removed,
25+
# because `pkgsMusl` is a better base for what we need.
26+
# See https://github.com/NixOS/nixpkgs/issues/61575
2427
# TODO Find out why `pkgsStatic` creates ~3x larger binaries.
2528
"pkgsMusl", # does not exercise cross compilation
2629
# "pkgsStatic", # exercises cross compilation

0 commit comments

Comments
 (0)