From 501ca74ce656e1a2b9a6c21256927a8a520d0967 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 4 Feb 2022 20:58:17 -0800 Subject: [PATCH] flake.lock: Update nixpkgs and stable --- flake.lock | 33 ++++++++++----------------------- flake.nix | 1 + 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 907d1cb..f0b651d 100644 --- a/flake.lock +++ b/flake.lock @@ -34,7 +34,9 @@ "nix-eval-jobs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1641681369, @@ -53,26 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639573498, - "narHash": "sha256-YAoywqjyjOJYuEZpA8sln84jk99GG9hYbPEYXwGEGGM=", + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aef12c8678fd5e927edba764bd04f3ba2930ae15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1643080866, - "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "type": "github" }, "original": { @@ -86,18 +73,18 @@ "inputs": { "flake-compat": "flake-compat", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stable": "stable", "utils": "utils" } }, "stable": { "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", + "lastModified": 1643788601, + "narHash": "sha256-6l5Ax44pC/Oo/Muj5Y/NA27Pd38Wty/7GtGSSmYNug4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", + "rev": "f6ddd55d5f9d5eca08df138c248008c1ba73ecec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b04e551..233a557 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ # not yet upstreamed nix-eval-jobs.url = "github:zhaofengli/nix-eval-jobs/colmena"; + nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; flake-compat = { url = "github:edolstra/flake-compat";