summaryrefslogtreecommitdiff
path: root/pack
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2019-05-12 14:20:23 -0700
committerBen Sima <ben@bsima.me>2019-05-12 14:20:23 -0700
commit2eebdc423c1cdac026b88374883796ebea90514a (patch)
tree6a56148b5f124149ae56ab3ea977ae297b533702 /pack
parent2f017e1b0926d3141067f0a5bc810be32c335e61 (diff)
wip: upgrade nixos, mailserver, and enable znc
Diffstat (limited to 'pack')
-rw-r--r--pack/ibb.nix2
-rw-r--r--pack/nixpkgs.nix4
2 files changed, 4 insertions, 2 deletions
diff --git a/pack/ibb.nix b/pack/ibb.nix
index 05d2b7d..fe74346 100644
--- a/pack/ibb.nix
+++ b/pack/ibb.nix
@@ -24,6 +24,8 @@ let
tasty-quickcheck = dontCheck super.tasty-quickcheck;
scientific = dontCheck super.scientific; # takes forever
servant = dontCheck super.servant;
+ comonad = dontCheck super.comonad;
+ QuickCheck = dontCheck super.QuickCheck;
};
});
ghcjs = ghcjs_.ghcWithPackages (hp: with hp; [
diff --git a/pack/nixpkgs.nix b/pack/nixpkgs.nix
index 154daca..8065373 100644
--- a/pack/nixpkgs.nix
+++ b/pack/nixpkgs.nix
@@ -1,5 +1,5 @@
# Get the sha256 with: nix-prefetch-url --unpack ${url}
{
- url = "https://github.com/NixOS/nixpkgs/archive/da81531c1d76b4c24b944f6cf69b7025770662c1.tar.gz";
- sha256 = "00qqchbvvbcmmkfpjkp1ki4kwcm33ch1ljbi2n3zxy36r430way1";
+ url = "https://github.com/NixOS/nixpkgs/archive/482e21883fb0393f935c30f2754db94d181a8d32.tar.gz";
+ sha256 = "12z06zc8nm2q0yn8w5qkzi8rvbx75pshcq970nahmygl46wbpyl4";
}