aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-02-18 16:21:13 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-02-18 16:21:13 +0100
commit5921ca89f9cc6247830e92a71f7db3f1fe0c193b (patch)
treed91595728f3911de2b46e7d686241043a0494d5c
parentb5e3c04c0364abf91550b043df975272bfeecb9e (diff)
Use Nixpkgs 20.03
-rw-r--r--flake.lock10
-rw-r--r--flake.nix4
2 files changed, 7 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index 13e10e611..07ee5a14c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,19 +2,19 @@
"inputs": {
"nixpkgs": {
"info": {
- "lastModified": 1580555706,
- "narHash": "sha256-ly5Gxl9yZgW2w1F3aDU5bvg34Ct+juUaOg8vue+Mkbo="
+ "lastModified": 1582018495,
+ "narHash": "sha256-xcpSl9tQKAsMQFmZfHXCqv6E9y1k6pk6T3i3jX1hsuk="
},
"inputs": {},
"locked": {
- "owner": "edolstra",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "43e283790fbe330b723ac44b584824cf6d85c1ee",
+ "rev": "01d84d1ecfd50d809796176670448e0ec1cc4f5d",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "release-19.09",
+ "ref": "release-20.03",
"type": "indirect"
}
}
diff --git a/flake.nix b/flake.nix
index 078f51fa4..34e1e6ffb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
edition = 201909;
- inputs.nixpkgs.uri = "nixpkgs/release-19.09";
+ inputs.nixpkgs.uri = "nixpkgs/release-20.03";
outputs = { self, nixpkgs }:
@@ -72,7 +72,7 @@
openssl pkgconfig sqlite
libarchive
boost
- (nlohmann_json.override { multipleHeaders = true; })
+ nlohmann_json
rustc cargo
# Tests