diff --git a/flake.lock b/flake.lock index 0b1f7d914ef64246cba287e74778e9f266d5f275..c1fc27f5dbe10d275eb7797839c4392a973270b8 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1672397839, - "narHash": "sha256-o+TBFFNSdOu5L1CUetXGMSinghqqlWcI2Sj9GVoJmUY=", + "lastModified": 1673947312, + "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f612564c15e8471dd17c15efaf7ede83c57763", + "rev": "2d38b664b4400335086a713a0036aafaa002c003", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9bcc39ad82f9e2b0e143bb40643c077714b544b..1568463d7602907026173bbd989207e69d9249b6 100644 --- a/flake.nix +++ b/flake.nix @@ -45,13 +45,13 @@ haskellLib = pkgs.haskell.lib.compose; legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) { - buildHaskellPackages = pkgs.haskell.packages.ghc942; + buildHaskellPackages = pkgs.haskell.packages.ghc944; compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { inherit haskellLib; }; configurationArm = { pkgs, haskellLib }: self: super: { }; configurationCommon = import ./configuration.nix; configurationDarwin = { pkgs, haskellLib }: self: super: { }; configurationNix = { pkgs, haskellLib }: self: super: { }; - ghc = pkgs.haskell.compiler.ghc942; + ghc = pkgs.haskell.compiler.ghc944; inherit haskellLib; initialPackages = import ./initial-packages.nix; nonHackagePackages = self: super: { }; diff --git a/horizon.dhall b/horizon.dhall index 665efc28e639d4aa6bb0c7220a7df0d4730f1154..00f55ab39fde18fe1e8dfbe38a9fd24894bcd5f7 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -427,7 +427,7 @@ let packages = , genvalidity-vector = H.callHackage "genvalidity-vector" "1.0.0.0" , ghc-byteorder = H.callHackage "ghc-byteorder" "4.11.0.0.10" , ghc-check = H.callHackage "ghc-check" "0.5.0.8" - , ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.0" + , ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.1.1" , ghc-lib-parser = H.callHackage "ghc-lib-parser" "9.4.2.20220822" , ghc-lib-parser-ex = H.callHackage "ghc-lib-parser-ex" "9.4.0.0" , ghc-paths = H.callHackage "ghc-paths" "0.1.0.12" diff --git a/pkgs/ghc-exactprint.nix b/pkgs/ghc-exactprint.nix index 497220f72b8f8e85129c6a8b8ecf8f445a5e88dc..1f500f9de8e6abb5d5f539c30c1a24fdbb3f1a73 100644 --- a/pkgs/ghc-exactprint.nix +++ b/pkgs/ghc-exactprint.nix @@ -22,10 +22,8 @@ }: mkDerivation { pname = "ghc-exactprint"; - version = "1.6.0"; - sha256 = "8eb59736bbf052a380d5c72277abad05802730b37629ea67a4517b2d88dd40fa"; - revision = "1"; - editedCabalFile = "14ilvq5j0x153x6y4sxhks3fccwb0m03b029ffi9pvf1g6y3pqh7"; + version = "1.6.1.1"; + sha256 = "8883b247ca97c8720c047b820941c1119c4537c0121b21b02cca441ea12df437"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = false;