From 810075cd3d9d9b8fcca1bb9e22c1b5c190f95473 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Mar 2020 12:55:35 +0200 Subject: [PATCH] Update to 20.03 --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8acea7c3..edb8e4d6 100644 --- a/flake.nix +++ b/flake.nix @@ -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 (