Skip to content
Snippets Groups Projects
Commit 9d0b00c8 authored by Daniel Firth's avatar Daniel Firth
Browse files

be more explicit about legacyPackages

parent 497a6a3b
No related merge requests found
...@@ -8,13 +8,18 @@ ...@@ -8,13 +8,18 @@
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
}; };
outputs = inputs@{ self, 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: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let let
pkgs = import nixpkgs { inherit system; };
pkgs = nixpkgs.legacyPackages.${system};
horizon-gen-nix-app = get-flake horizon-gen-nix; horizon-gen-nix-app = get-flake horizon-gen-nix;
haskellLib = pkgs.haskell.lib.compose; haskellLib = pkgs.haskell.lib.compose;
hsPkgs = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
buildHaskellPackages = pkgs.haskell.packages.ghc942; buildHaskellPackages = pkgs.haskell.packages.ghc942;
compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { inherit haskellLib; }; compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { inherit haskellLib; };
configurationCommon = import ./configuration.nix; configurationCommon = import ./configuration.nix;
...@@ -24,16 +29,20 @@ ...@@ -24,16 +29,20 @@
initialPackages = import ./overlay.nix; initialPackages = import ./overlay.nix;
nonHackagePackages = self: super: { }; nonHackagePackages = self: super: { };
}; };
packages = pkgs.lib.filterAttrs packages = pkgs.lib.filterAttrs
(n: v: v != null (n: v: v != null
&& builtins.typeOf v == "set" && builtins.typeOf v == "set"
&& pkgs.lib.hasAttr "type" v && pkgs.lib.hasAttr "type" v
&& v.type == "derivation" && v.type == "derivation"
&& v.meta.broken == false) && v.meta.broken == false)
hsPkgs; legacyPackages;
horizon-gen-gitlab-ci = pkgs.writers.writeBashBin "gen-gitlab-ci" "${pkgs.dhall-json}/bin/dhall-to-yaml --file .gitlab-ci.dhall"; horizon-gen-gitlab-ci = pkgs.writers.writeBashBin "gen-gitlab-ci" "${pkgs.dhall-json}/bin/dhall-to-yaml --file .gitlab-ci.dhall";
in in
{ {
apps = { apps = {
horizon-gen-nix = horizon-gen-nix-app.outputs.apps.${system}.horizon-gen-nix; horizon-gen-nix = horizon-gen-nix-app.outputs.apps.${system}.horizon-gen-nix;
horizon-gen-gitlab-ci = { horizon-gen-gitlab-ci = {
...@@ -41,11 +50,15 @@ ...@@ -41,11 +50,15 @@
program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci"; program = "${horizon-gen-gitlab-ci}/bin/gen-gitlab-ci";
}; };
}; };
checks = { checks = {
dhall-format = lint-utils.outputs.linters.x86_64-linux.dhall-format ./.; dhall-format = lint-utils.outputs.linters.x86_64-linux.dhall-format ./.;
nixpkgs-fmt = lint-utils.outputs.linters.x86_64-linux.nixpkgs-fmt ./.; nixpkgs-fmt = lint-utils.outputs.linters.x86_64-linux.nixpkgs-fmt ./.;
}; };
legacyPackages = hsPkgs;
inherit legacyPackages;
inherit packages; inherit packages;
}); });
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment