From 50ff30ae5be3677ea891774de186a2e3421e6e8c Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Tue, 26 Mar 2024 16:37:50 +0100 Subject: [PATCH] Nix: Switch to nixpkgs-unstable, rather than nixos-unstable. (#407) If we're going to be unstable, let's go all the way. This change was motivated by needing to upgrade cargo-machete to make it work with Rust v1.77, and not having the upgrade in nixos-unstable. V3_GIT_ORIGIN_REV_ID: 8191a376a6aeebc08787f973d58d373f8ab9ad0d --- v3/flake.lock | 19 +++++++++---------- v3/flake.nix | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/v3/flake.lock b/v3/flake.lock index e14a488380f..af06883902c 100644 --- a/v3/flake.lock +++ b/v3/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710886643, - "narHash": "sha256-saTZuv9YeZ9COHPuj8oedGdUwJZcbQ3vyRqe7NVJMsQ=", + "lastModified": 1711407199, + "narHash": "sha256-A/nB4j3JHL51ztlMQdfKw6y8tUJJzai3bLsZUEEaBxY=", "owner": "ipetkov", "repo": "crane", - "rev": "5bace74e9a65165c918205cf67ad3977fe79c584", + "rev": "7e468a455506f2e65550e08dfd45092f0857a009", "type": "github" }, "original": { @@ -40,16 +40,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1711461781, + "narHash": "sha256-nI/IhcOS7r8EOe6wMojDptDL0VFVbl05gPd0EW1COts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "b776d8d98eaa689c6a4b23fe84eb8ea241bf4861", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -72,11 +71,11 @@ ] }, "locked": { - "lastModified": 1711073443, - "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=", + "lastModified": 1711419061, + "narHash": "sha256-+5M/czgYGqs/jKmi8bvYC+JUYboUKNTfkRiesXopeXQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe", + "rev": "4c11d2f698ff1149f76b69e72852d5d75f492d0c", "type": "github" }, "original": { diff --git a/v3/flake.nix b/v3/flake.nix index 28ab2908c93..36dc3df6260 100644 --- a/v3/flake.nix +++ b/v3/flake.nix @@ -2,7 +2,7 @@ description = "DDN Engine"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + nixpkgs.url = github:NixOS/nixpkgs; flake-utils.url = github:numtide/flake-utils; crane = {