From c79e0264d875dd4af809f7096ca972134af9ccc5 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 13 Jun 2024 07:53:50 -0700 Subject: [PATCH] Use Nix from PR 10903 in closure --- flake.lock | 43 +++++++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index ec510fb..9557db1 100644 --- a/flake.lock +++ b/flake.lock @@ -125,38 +125,57 @@ "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1715246928, - "narHash": "sha256-5Q1WkpTWH7fkVfYhHDc5r0A+Vc+K5xB1UhzrLzBCrB8=", - "rev": "adba2f19a02eaa74336a06a026d3c37af8020559", - "revCount": 17044, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.22.1/018f61d9-3f9a-7ccf-9bfc-174e3a17ab38/source.tar.gz" + "lastModified": 1718279742, + "narHash": "sha256-KUl2AvmSMQ1Okg2VW9ncK+qhohRIcQRqbu+rYe7qM7Q=", + "owner": "DeterminateSystems", + "repo": "nix-src", + "rev": "1dc7c8e59991b15a78504be52931f8561dcff32b", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/2.20.tar.gz" + "owner": "DeterminateSystems", + "ref": "fix-stack-overflow", + "repo": "nix-src", + "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "lastModified": 1718284527, + "narHash": "sha256-fEaiSC68wAkLJlrewKysAioLyPcMRLFzLcDErJR5DAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "rev": "6791e0ffcf125607dbe3bf9e124769c695b6e2c8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, diff --git a/flake.nix b/flake.nix index 560d87c..fe5a664 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"; - nix.url = "https://flakehub.com/f/NixOS/nix/2.20.tar.gz"; + nix.url = "github:DeterminateSystems/nix-src/fix-stack-overflow"; }; outputs = { self, nixpkgs, nix, ... }@inputs: