Update to 20.03

This commit is contained in:
Eelco Dolstra 2020-03-31 12:55:35 +02:00
parent 05bf278971
commit 810075cd3d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -3,7 +3,7 @@
edition = 201909;
inputs.nixpkgs.uri = "nixpkgs/release-19.09";
inputs.nixpkgs.url = "nixpkgs/nixos-20.03";
outputs = { self, nixpkgs, nix }:
let
@ -108,7 +108,9 @@
perlDeps perl final.nix
postgresql95 # for running the tests
boost
(nlohmann_json.override { multipleHeaders = true; })
(if lib.versionAtLeast lib.version "20.03pre"
then nlohmann_json
else nlohmann_json.override { multipleHeaders = true; })
];
hydraPath = lib.makeBinPath (