diff options
-rw-r--r-- | default.nix | 7 | ||||
-rw-r--r-- | nix/sources.json | 6 | ||||
-rw-r--r-- | pkgs/default.nix | 17 |
3 files changed, 21 insertions, 9 deletions
diff --git a/default.nix b/default.nix index 490b01d..6c17444 100644 --- a/default.nix +++ b/default.nix @@ -18,8 +18,8 @@ , sources ? import ./nix/sources.nix }: let - haskellPackages = pkgs.haskell.packages.ghc98; - jsHaskellPackages = pkgs.pkgsCross.ghcjs.haskell.packages.ghc98; + haskellPackages = pkgs.haskell.packages.ghc910; + jsHaskellPackages = pkgs.pkgsCross.ghcjs.haskell.packages.ghc910; lib = pkgs.lib; in rec { @@ -75,6 +75,9 @@ rec { nix-build tests.nix --no-out-link '') ]; + shellHook = '' + export EM_CACHE="${toString ./.}/.emcache" # nixos/nixpkgs#282509 + ''; }) ]; }; diff --git a/nix/sources.json b/nix/sources.json index 6cfed78..d2b20a1 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -11,10 +11,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", - "sha256": "0017sk0zjp6dkvf83c6lw6x2lvhaq2adqyyr1cvln862gc6sbs7y", + "rev": "632f04521e847173c54fa72973ec6c39a371211c", + "sha256": "16l9l6jbx2xy751p2nbz14fd9qgk9qsns38pihr5g12fk7361fsi", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/632f04521e847173c54fa72973ec6c39a371211c.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "sh": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 660a462..cc883c0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,18 +1,27 @@ { sources ? import ../nix/sources.nix }: (self: super: - let pkgs = self; in + let + pkgs = self; + haskellLib = pkgs.haskell.lib; + in { haskell = super.haskell // { packageOverrides = pkgs.lib.composeManyExtensions [ super.haskell.packageOverrides (self: super: { acms = self.callCabal2nix "acms" ../acms { }; - astore = self.callCabal2nix "astore" sources.json2sql { }; + astore = haskellLib.doJailbreak (self.callCabal2nix "astore" sources.json2sql { }); autotypes = self.callCabal2nix "autotypes" ../autotypes { }; frontend = self.callCabal2nix "frontend" ../frontend { }; - sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" sources.sh { }); - websockets = pkgs.haskell.lib.doJailbreak super.websockets; + sh = haskellLib.dontCheck (self.callCabal2nix "sh" sources.sh { }); + repline = haskellLib.doJailbreak super.repline; + uuid = haskellLib.doJailbreak super.uuid; + websockets = haskellLib.doJailbreak super.websockets; + hinotify = super.hinotify.overrideAttrs (_: { + version = "0.4.2"; + src = builtins.fetchTarball "https://hackage.haskell.org/package/hinotify-0.4.2/hinotify-0.4.2.tar.gz"; + }); }) ]; }; |