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

nix: compiler ghc8107 -> ghc947 #1097

Closed
wants to merge 5 commits into from
Closed

nix: compiler ghc8107 -> ghc947 #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94e5a80
nix: compiler ghc8107 -> ghc947
sorki Nov 18, 2023
a9b52a1
flake: bump to release-23.05, bump nix
sorki Nov 18, 2023
ce602b1
ci: bump rev in Optional-Nix-dev-env-*
sorki Nov 18, 2023
f8a5434
fixup! flake: bump to release-23.05, bump nix
sorki Nov 18, 2023
e839221
fixup! nix: compiler ghc8107 -> ghc947
sorki Nov 18, 2023
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 .github/workflows/Optional-Nix-dev-env-macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:


env:
rev: "272fad732d39b24c4549c475176e0d8cbc8c897a"
rev: "8e5e424b1c059e9ccf5db6a652458e30de05fa3a"
cachixAccount: "hnix"
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
doCheck: "false"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Optional-Nix-dev-env-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
### and the other part of keys explained in `build.sh`, since those address external procedures aound the builds.
### Additional documentation is in Nixpkgs Haskell.lib: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/lib.nix
###
rev: "272fad732d39b24c4549c475176e0d8cbc8c897a"
rev: "8e5e424b1c059e9ccf5db6a652458e30de05fa3a"
cachixAccount: "hnix"
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
allowInconsistentDependencies: "false"
Expand Down
4 changes: 2 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
# For current default and explicitly supported GHCs https://search.nixos.org/packages?query=ghc&from=0&size=500&channel=unstable, Nixpkgs implicitly supports older minor versions also, until the configuration departs from compatibility with them.
# Compiler in a form ghc8101 <- GHC 8.10.1, just remove spaces and dots
compiler ? "ghc8107"
compiler ? "ghc947"

# Deafult.nix is a unit package abstraciton that allows to abstract over packages even in monorepos:
# Example: pass --arg cabalName --arg packageRoot "./subprojectDir", or map default.nix over a list of tiples for subprojects.
Expand Down Expand Up @@ -93,7 +93,7 @@
# , nixos-20.03 # Last stable release, gets almost no updates to recipes, gets only required backports
# ...
# }
, rev ? "ce6aa13369b667ac2542593170993504932eb836"
, rev ? "8e5e424b1c059e9ccf5db6a652458e30de05fa3a"

, pkgs ?
if builtins.compareVersions builtins.nixVersion "2.0" > 0
Expand Down
15 changes: 8 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "A Haskell re-implementation of the Nix expression language";

inputs = {
nixpkgs.url = "nixpkgs/ce6aa13369b667ac2542593170993504932eb836";
nixpkgs.url = "nixpkgs/8e5e424b1c059e9ccf5db6a652458e30de05fa3a";
nix = {
url = "nix/624e38aa43f304fbb78b4779172809add042b513";
flake = false;
Expand All @@ -27,7 +27,7 @@
(system: pkgs: import ./default.nix {
inherit pkgs;
withHoogle = true;
compiler = "ghc8107";
compiler = "ghc947";
packageRoot = pkgs.runCommand "hnix-src" {} ''
cp -r ${./.} $out
chmod -R +w $out
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ let defaultAttrs = {
# Defaults are put in this form deliberately. Details: #748
withHoogle = true;
returnShellEnv = true;
compiler = "ghc8107";
compiler = "ghc947";
};
in (import ./. (defaultAttrs // attrs))
Loading