From 3dc7224330bcdd3e320bf6ff5b0b439ae0747359 Mon Sep 17 00:00:00 2001 From: markoburcul Date: Thu, 9 Jan 2025 11:15:35 +0100 Subject: [PATCH] nix: update nix packages and dependencies in flake Signed-off-by: markoburcul --- flake.lock | 37 ++++++++++++------------------------- flake.nix | 7 +++++-- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ac86a75c..56d5a06a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,50 +2,37 @@ "nodes": { "circom-compat": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1732627240, - "narHash": "sha256-GvJTiBWBv799i5ZCCc4gF86bnQY/nZvx0vCPi1+OPD4=", + "lastModified": 1736348751, + "narHash": "sha256-d34XNLg9NGPEOARHW+BIOAWalkHdEUAwsv3mpLZQxds=", "owner": "codex-storage", "repo": "circom-compat-ffi", - "rev": "297c46fdc7d8a8fd53c8076b0be77334e4a54447", + "rev": "afadf4d9a411ce0589f6b4c1858a9a5a4e7f4661", "type": "github" }, "original": { "owner": "codex-storage", "repo": "circom-compat-ffi", + "rev": "afadf4d9a411ce0589f6b4c1858a9a5a4e7f4661", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -53,7 +40,7 @@ "root": { "inputs": { "circom-compat": "circom-compat", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index e0b483c9..b4fa8151 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,11 @@ description = "Codex build flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - circom-compat.url = "github:codex-storage/circom-compat-ffi"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + circom-compat = { + url = "github:codex-storage/circom-compat-ffi/afadf4d9a411ce0589f6b4c1858a9a5a4e7f4661"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, circom-compat}: