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

Bump to recent-ish nixpkgs unstable #115

Closed
wants to merge 8 commits into from
Closed

Bump to recent-ish nixpkgs unstable #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2bba47
Update default.nix to build with pinned nixpkgs (fixes #113)
robx Jun 7, 2022
7fdc4a4
use postgrest's nixpkgs
robx Jun 15, 2022
f6c5ecb
default ghc version bump
robx Jun 15, 2022
42c2564
ghc8107
robx Jun 15, 2022
667ebc3
ghc-bignum is not a proper haskell package
robx Jun 15, 2022
3fad305
new ncurses
robx Jul 27, 2022
b16451e
bump submodule
robx Jul 27, 2022
fe82f7f
bump nixpkgs revision to the latest used in PostgREST
robx Jul 27, 2022
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "nixpkgs"]
path = nixpkgs
url = https://github.com/nh2/nixpkgs.git
url = https://github.com/NixOS/nixpkgs.git
4 changes: 2 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: This is just a minimal example. For proper usage, see the README.

{ nixpkgs ? (import ./nixpkgs.nix).pkgsMusl, compiler ? "ghc864", strip ? true }:
{ nixpkgs ? (import ./nixpkgs.nix).pkgsMusl, compiler ? "ghc8107", strip ? true }:


let
Expand All @@ -21,7 +21,7 @@ let
enableSharedExecutables = false;
enableSharedLibraries = false;
executableHaskellDepends = [ base scotty ];
license = stdenv.lib.licenses.bsd3;
license = pkgs.lib.licenses.bsd3;
configureFlags = [
"--ghc-option=-optl=-static"
"--extra-lib-dirs=${pkgs.gmp6.override { withStatic = true; }}/lib"
Expand Down
2 changes: 1 addition & 1 deletion nixpkgs
Open in desktop
Submodule nixpkgs updated 23594 files
2 changes: 1 addition & 1 deletion nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ 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.
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5.tar.gz) {}
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/8eb14e7e79d6c34a9cce146182bfc8c820d527c2.tar.gz) {}
6 changes: 4 additions & 2 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 ? "ghc8104",
compiler ? "ghc8107",

# See:
# * https://www.snoyman.com/base/
Expand All @@ -38,6 +38,7 @@ in
ghc881 = "Cabal_3_0_0_0";
ghc8104 = "Cabal_3_2_1_0";
ghc8105 = "Cabal_3_2_1_0";
ghc8107 = "Cabal_3_2_1_0";
ghc901 = "Cabal_3_4_0_0";
}."${compiler}"),

Expand Down Expand Up @@ -80,6 +81,7 @@ let
# `.override` and the likes).
isProperHaskellPackage = val:
lib.isDerivation val && # must pass lib.isDerivation
val.pname != "ghc-bignum" &&
val ? env; # must have an .env key

# Function that tells us if a given Haskell package has an executable.
Expand Down Expand Up @@ -1519,7 +1521,7 @@ let
[
"--enable-executable-static" # requires `useFixedCabal`
# `enableShared` seems to be required to avoid `recompile with -fPIC` errors on some packages.
"--extra-lib-dirs=${final.ncurses.override { enableStatic = true; enableShared = true; }}/lib"
"--extra-lib-dirs=${final.ncurses.override { enableStatic = true; }}/lib"
]
# TODO Figure out why this and the below libffi are necessary.
# `working` and `workingStackageExecutables` don't seem to need that,
Expand Down