aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-10-19 11:26:00 +0200
committerGitHub <noreply@github.com>2020-10-19 11:26:00 +0200
commit05347387e78d6703d270b37386dba325724b148c (patch)
treeba4494e4c89235e007f2f4da3d34c7b7c599a349
parent20a7d8d23a19530207378fc74ddd558232240f43 (diff)
parentc27fcd94ce3de918d506afe90759d97d1946eca1 (diff)
Merge pull request #4162 from edolstra/nixpkgs-20.09
Switch to Nixpkgs 20.09
-rw-r--r--flake.lock8
-rw-r--r--flake.nix4
2 files changed, 5 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index ddff58979..9f8c788ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,16 +18,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1602604700,
- "narHash": "sha256-TSfAZX0czPf1P8xnnGFXcoeoM9I5CaFjAdNP63W9DCY=",
+ "lastModified": 1602702596,
+ "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3a10a004bb5802d5f23c58886722e4239705e733",
+ "rev": "ad0d20345219790533ebe06571f82ed6b034db31",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-20.03-small",
+ "ref": "nixos-20.09-small",
"type": "indirect"
}
},
diff --git a/flake.nix b/flake.nix
index 0602861fa..abc614c8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
{
description = "The purely functional package manager";
- inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
+ inputs.nixpkgs.url = "nixpkgs/nixos-20.09-small";
inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
outputs = { self, nixpkgs, lowdown-src }:
@@ -440,8 +440,6 @@
checks = forAllSystems (system: {
binaryTarball = self.hydraJobs.binaryTarball.${system};
perlBindings = self.hydraJobs.perlBindings.${system};
- } // nixpkgs.lib.optionalAttrs (builtins.elem system linuxSystems) {
- buildStatic = self.hydraJobs.buildStatic.${system};
});
packages = forAllSystems (system: {