diff --git a/.github/workflows/Optional-Nix-dev-env-macOS.yml b/.github/workflows/Optional-Nix-dev-env-macOS.yml index d98ca63bd..8be422289 100644 --- a/.github/workflows/Optional-Nix-dev-env-macOS.yml +++ b/.github/workflows/Optional-Nix-dev-env-macOS.yml @@ -7,7 +7,7 @@ on: env: - rev: "272fad732d39b24c4549c475176e0d8cbc8c897a" + rev: "8e5e424b1c059e9ccf5db6a652458e30de05fa3a" cachixAccount: "hnix" CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }} doCheck: "false" diff --git a/.github/workflows/Optional-Nix-dev-env-main.yml b/.github/workflows/Optional-Nix-dev-env-main.yml index 4250b1f1f..3431bbcda 100644 --- a/.github/workflows/Optional-Nix-dev-env-main.yml +++ b/.github/workflows/Optional-Nix-dev-env-main.yml @@ -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" diff --git a/default.nix b/default.nix index 0471bc470..0ac78ff5c 100644 --- a/default.nix +++ b/default.nix @@ -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. @@ -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 diff --git a/flake.lock b/flake.lock index eab8dc49f..d8341cce2 100644 --- a/flake.lock +++ b/flake.lock @@ -3,30 +3,31 @@ "nix": { "flake": false, "locked": { - "lastModified": 1570712626, - "narHash": "sha256-R3yyxSlyz41cLbB6F54etKNkusPNPGHU0WZkSrfJoKU=", + "lastModified": 1654014617, + "narHash": "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g=", "owner": "NixOS", "repo": "nix", - "rev": "61e816217bfdfffd39c130c7cd24f07e640098fc", + "rev": "624e38aa43f304fbb78b4779172809add042b513", "type": "github" }, "original": { "id": "nix", - "rev": "61e816217bfdfffd39c130c7cd24f07e640098fc", + "rev": "624e38aa43f304fbb78b4779172809add042b513", "type": "indirect" } }, "nixpkgs": { "locked": { - "lastModified": 1635792138, - "narHash": "sha256-D79GqaYrwgyM4wvOPbQeKveAHROnVh97F36iSGZO9uA=", + "lastModified": 1700272409, + "narHash": "sha256-Mge6iOvomplBsvQ47sIeVAwAUGSVXH4qCW4pLUt/qMI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b165ce0c4efbb74246714b5c66b6bcdce8cde175", + "rev": "8e5e424b1c059e9ccf5db6a652458e30de05fa3a", "type": "github" }, "original": { "id": "nixpkgs", + "rev": "8e5e424b1c059e9ccf5db6a652458e30de05fa3a", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index ae60df7cf..939256e78 100644 --- a/flake.nix +++ b/flake.nix @@ -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; @@ -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 diff --git a/shell.nix b/shell.nix index b1420d8e8..01633b5ef 100644 --- a/shell.nix +++ b/shell.nix @@ -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))