diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2019-10-29 12:06:05 +0000 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2019-10-29 12:06:05 +0000 |
| commit | 4ee6646b8a78d4c20fe0b89d95f23d382e1c47fc (patch) | |
| tree | 9b02e1b92f8abf0baf3dc108ab7f4fb8f33e753a /default.nix | |
| parent | 1aaff80235237507572e0fb4be86f34cb1829b68 (diff) | |
| parent | 01c2ab3f6a58d416528efce3057e2cf2f1604489 (diff) | |
| download | verismith-4ee6646b8a78d4c20fe0b89d95f23d382e1c47fc.tar.gz verismith-4ee6646b8a78d4c20fe0b89d95f23d382e1c47fc.zip | |
Merge branch 'master' into HEADfeature/nondeterminism
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/default.nix b/default.nix index 2d64523..9093557 100644 --- a/default.nix +++ b/default.nix @@ -1,14 +1,14 @@ -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc865", doBenchmark ? false } : +{ nixpkgs ? null, compiler ? "ghc865", doBenchmark ? false } : let - haskellPackages = nixpkgs.pkgs.haskellPackages.override { - overrides = haskellPackagesNew: haskellPackagesOld: rec { - hedgehog-fn = haskellPackagesNew.callPackage ./nix/hedgehog-fn.nix {}; - tomland = nixpkgs.pkgs.haskell.lib.dontCheck (haskellPackagesNew.callPackage ./nix/tomland.nix {}); - parser-combinators = haskellPackagesNew.callPackage ./nix/parser-combinators.nix {}; - tasty-hedgehog = haskellPackagesNew.callPackage ./nix/tasty-hedgehog.nix {}; - }; + pinnedPkg = builtins.fetchGit { + name = "nixos-unstable-2019-10-06"; + url = https://github.com/nixos/nixpkgs/; + rev = "271fef8a4eb03cd9de0c1fe2f0b7f4a16c2de49a"; }; - variant = if doBenchmark then nixpkgs.pkgs.haskell.lib.doBenchmark else nixpkgs.pkgs.lib.id; - verifuzz = haskellPackages.callCabal2nix "verifuzz" (./.) {}; + npkgs = if nixpkgs == null + then import pinnedPkg {} + else import nixpkgs {}; + variant = if doBenchmark then npkgs.pkgs.haskell.lib.doBenchmark else npkgs.pkgs.lib.id; + verismith = npkgs.pkgs.haskellPackages.callCabal2nix "verismith" (./.) {}; in - variant verifuzz +variant verismith |