diff --git a/flake.lock b/flake.lock index a5a97682e69eec3ea552bcf329cbf5178bd76056..64716a00bd95ac9338ce10bad77d7a25e8665079 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "all-cabal-hashes": { - "flake": false, - "locked": { - "lastModified": 1667742759, - "narHash": "sha256-PniFwhuGiX32rPHNyqgx8nn1No39SP89CHSoBuJOXlE=", - "owner": "commercialhaskell", - "repo": "all-cabal-hashes", - "rev": "eaf3b72978447f236e82c0de1d6f770e3dec00a7", - "type": "github" - }, - "original": { - "owner": "commercialhaskell", - "ref": "hackage", - "repo": "all-cabal-hashes", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -130,7 +113,6 @@ }, "root": { "inputs": { - "all-cabal-hashes": "all-cabal-hashes", "flake-utils": "flake-utils", "get-flake": "get-flake", "horizon-gen-nix": "horizon-gen-nix", diff --git a/flake.nix b/flake.nix index e229255a496860967eaf002c03f364530df76655..b1b1e6821bd54338aabc7f2a5db91d966f8608b3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,5 @@ { inputs = { - all-cabal-hashes = { - url = "github:commercialhaskell/all-cabal-hashes/hackage"; - flake = false; - }; get-flake.url = "github:ursi/get-flake"; lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils"; horizon-gen-nix = { @@ -12,22 +8,21 @@ }; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; }; - outputs = inputs@{ self, all-cabal-hashes, nixpkgs, flake-utils, get-flake, horizon-gen-nix, lint-utils, ... }: + outputs = inputs@{ self, nixpkgs, flake-utils, get-flake, horizon-gen-nix, lint-utils, ... }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let pkgs = import nixpkgs { inherit system; }; horizon-gen-nix-app = get-flake horizon-gen-nix; - configuration = import ./configuration.nix { inherit inputs pkgs; }; haskellLib = pkgs.haskell.lib.compose; hsPkgs = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) { buildHaskellPackages = pkgs.haskell.packages.ghc942; + compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { inherit haskellLib; }; configurationCommon = import ./configuration.nix; configurationNix = { pkgs, haskellLib }: self: super: { }; ghc = pkgs.haskell.compiler.ghc942; - haskellLib = pkgs.haskell.lib.compose; + inherit haskellLib; initialPackages = import ./overlay.nix; nonHackagePackages = self: super: { }; - compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { haskellLib = haskellLib; }; }; hp' = pkgs.lib.filterAttrs (n: v: v != null