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

nixpkgs-fmt

parent 554c2980
Branches
Tags
No related merge requests found
...@@ -67,23 +67,27 @@ ...@@ -67,23 +67,27 @@
}; };
}; };
outputs = inputs@{ self, nixpkgs, flake-utils, lint-utils, ... }: outputs = inputs@{ self, nixpkgs, flake-utils, lint-utils, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let let
overlay-ach = final: prev: { all-cabal-hashes = inputs.all-cabal-hashes; }; overlay-ach = final: prev: { all-cabal-hashes = inputs.all-cabal-hashes; };
pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [overlay-ach]; }; pkgs = import nixpkgs { inherit system; overlays = [ overlay-ach ]; };
overrides-hp = import ./overlay.nix { inherit inputs pkgs; }; overrides-hp = import ./overlay.nix { inherit inputs pkgs; };
hp = pkgs.haskell.packages.ghc942.override { hp = pkgs.haskell.packages.ghc942.override {
overrides = overrides-hp; overrides = overrides-hp;
}; };
hp' = pkgs.lib.filterAttrs (n: v: v != null hp' = pkgs.lib.filterAttrs
&& builtins.typeOf v == "set" (n: v: v != null
&& pkgs.lib.hasAttr "type" v && builtins.typeOf v == "set"
&& v.type == "derivation" && pkgs.lib.hasAttr "type" v
&& v.meta.broken == false) hp; && v.type == "derivation"
&& v.meta.broken == false)
hp;
in in
{ {
checks.x86_64-linux = { checks = {
nixpkgs-fmt = lint-utils.outputs.linters.x86_64-linux.nixpkgs-fmt ./.; nixpkgs-fmt = lint-utils.outputs.linters.x86_64-linux.nixpkgs-fmt ./.;
}; };
packages.x86_64-linux = hp'; overrides = overrides-hp;
}; packages = hp';
});
} }
{ inputs, pkgs }: { inputs, pkgs }:
final: prev: with pkgs.haskell.lib; { final: prev: with pkgs.haskell.lib; {
Cabal = prev.callHackage "Cabal" "3.8.1.0" {}; Cabal = prev.callHackage "Cabal" "3.8.1.0" { };
ChasingBottoms = prev.callHackage "ChasingBottoms" "1.3.1.12" { }; ChasingBottoms = prev.callHackage "ChasingBottoms" "1.3.1.12" { };
...@@ -47,7 +47,7 @@ final: prev: with pkgs.haskell.lib; { ...@@ -47,7 +47,7 @@ final: prev: with pkgs.haskell.lib; {
composite-base = doJailbreak (prev.callHackage "composite-base" "0.8.1.0" { }); composite-base = doJailbreak (prev.callHackage "composite-base" "0.8.1.0" { });
composite-dhall = prev.callHackage "composite-dhall" "0.1.0.1" {}; composite-dhall = prev.callHackage "composite-dhall" "0.1.0.1" { };
composite-lens-extra = prev.callCabal2nix "composite-lens-extra" inputs.composite-lens-extra { }; composite-lens-extra = prev.callCabal2nix "composite-lens-extra" inputs.composite-lens-extra { };
...@@ -91,9 +91,9 @@ final: prev: with pkgs.haskell.lib; { ...@@ -91,9 +91,9 @@ final: prev: with pkgs.haskell.lib; {
ghc-tcplugins-extra = final.callCabal2nix "ghc-tcplugins-extra" inputs.ghc-tcplugins-extra { }; ghc-tcplugins-extra = final.callCabal2nix "ghc-tcplugins-extra" inputs.ghc-tcplugins-extra { };
hashable = prev.callHackage "hashable" "1.4.1.0" {}; hashable = prev.callHackage "hashable" "1.4.1.0" { };
hashtables = prev.callHackage "hashtables" "1.3" {}; hashtables = prev.callHackage "hashtables" "1.3" { };
hedgehog = dontHaddock (prev.callCabal2nix "hedgehog" (inputs.hedgehog + /hedgehog) { }); hedgehog = dontHaddock (prev.callCabal2nix "hedgehog" (inputs.hedgehog + /hedgehog) { });
...@@ -147,9 +147,9 @@ final: prev: with pkgs.haskell.lib; { ...@@ -147,9 +147,9 @@ final: prev: with pkgs.haskell.lib; {
parallel = doJailbreak (final.callHackage "parallel" "3.2.2.0" { }); parallel = doJailbreak (final.callHackage "parallel" "3.2.2.0" { });
polysemy = dontCheck (prev.callHackage "polysemy" "1.7.1.0" {}); polysemy = dontCheck (prev.callHackage "polysemy" "1.7.1.0" { });
polysemy-time = dontCheck (prev.callHackage "polysemy-time" "0.5.1.0" {}); polysemy-time = dontCheck (prev.callHackage "polysemy-time" "0.5.1.0" { });
postgresql-libpq = doJailbreak prev.postgresql-libpq; postgresql-libpq = doJailbreak prev.postgresql-libpq;
......
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