~jack/misc

72f15928d5d6ce381cebaef2bb6ea68eb63dfce9 — Jack Kelly 1 year, 14 days ago d7fdeb1
Update overrides for haskell packages
M bunkplan/shell.nix => bunkplan/shell.nix +1 -5
@@ 6,8 6,4 @@ let
  inherit (nixpkgs) pkgs;
  env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
in
  env.overrideAttrs (oldAttrs: {
    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
      cabal-install cabal2nix ghcid
    ];
  })
  env

M cabinsheets/shell.nix => cabinsheets/shell.nix +1 -5
@@ 6,8 6,4 @@ let
  inherit (nixpkgs) pkgs;
  env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
in
  env.overrideAttrs (oldAttrs: {
    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
      cabal-install cabal2nix ghcid
    ];
  })
  env

M codeworld-raycaster/default.nix => codeworld-raycaster/default.nix +3 -5
@@ 12,17 12,15 @@ let

  myHaskellPackages = haskellPackages.override {
    overrides = self: super: with pkgs.haskell.lib; {
      codeworld-api = unmarkBroken super.codeworld-api;
      patch = dontCheck (unmarkBroken super.patch);
      reflex = unmarkBroken super.reflex;
      codeworld-api = doJailbreak (unmarkBroken super.codeworld-api);
      patch = doJailbreak (dontCheck (unmarkBroken super.patch));
      reflex = doJailbreak (unmarkBroken super.reflex);

      blank-canvas =
        dontCheck (doJailbreak (super.callHackage "blank-canvas" "0.6.3" {}));
      colour = dontCheck (super.callHackage "colour" "2.3.4" {});
      dependent-map = super.callHackage "dependent-map" "0.3.1.0" {};
      dependent-sum = super.callHackage "dependent-sum" "0.6.1" {};
      hashable = super.callHackage "hashable" "1.2.7.0" {};
      witherable = super.callHackage "witherable" "0.3.1" {};
    };
  };


M codeworld-raycaster/shell.nix => codeworld-raycaster/shell.nix +1 -5
@@ 6,8 6,4 @@ let
  inherit (nixpkgs) pkgs;
  env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
in
  env.overrideAttrs (oldAttrs: {
    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
      cabal-install cabal2nix ghcid
    ];
  })
  env

M metscrape2/shell.nix => metscrape2/shell.nix +1 -5
@@ 6,8 6,4 @@ let
  inherit (nixpkgs) pkgs;
  env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
in
  env.overrideAttrs (oldAttrs: {
    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
      cabal-install cabal2nix ghcid
    ];
  })
  env