From 51b59d04e6ef92800f957774c449557b582cbe77 Mon Sep 17 00:00:00 2001 From: "kody.low" Date: Mon, 21 Oct 2024 15:17:18 -0700 Subject: [PATCH] chore: bump fedimint --- flake.lock | 471 +++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 4 +- 2 files changed, 408 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index fd840302e..391edc6c2 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1720458342, - "narHash": "sha256-H8HeiVq7P3VEPxU0MUwh13xlcg0VXvKP5SQ37fs3QOs=", + "lastModified": 1727103737, + "narHash": "sha256-otyUwbqaXYkeBxPy3Gf0ACB0rHl23OzAlfpsVvY1hbc=", "owner": "rustsec", "repo": "advisory-db", - "rev": "502a1ba73728791a73e8b94cee6406ab79ec8ba5", + "rev": "45780a4d66ad647bd3c148509fb081943efdacfd", "type": "github" }, "original": { @@ -22,22 +22,48 @@ "flake-utils": "flake-utils_3", "nixpkgs": [ "fedimint", + "cargo-deluxe", "flakebox", "nixpkgs" ] }, "locked": { - "lastModified": 1719001124, - "narHash": "sha256-JXrMwYlQarZPyjN5UkD4fS9mrHSE1PUa7P//1Z5Sqr0=", + "lastModified": 1727381935, + "narHash": "sha256-G2fOYRZM7bXK5eBb+GK3k/WmO+q5JA/GtFwSPc3kdc8=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "7fa1348249564e43185d3053f579f9fa923d46cc", + "rev": "522d86121cbd413aff922c54f38106ecf8740107", "type": "github" }, "original": { "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "7fa1348249564e43185d3053f579f9fa923d46cc", + "rev": "522d86121cbd413aff922c54f38106ecf8740107", + "type": "github" + } + }, + "android-nixpkgs_2": { + "inputs": { + "devshell": "devshell_2", + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "fedimint", + "flakebox", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727381935, + "narHash": "sha256-G2fOYRZM7bXK5eBb+GK3k/WmO+q5JA/GtFwSPc3kdc8=", + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "522d86121cbd413aff922c54f38106ecf8740107", + "type": "github" + }, + "original": { + "owner": "tadfisher", + "repo": "android-nixpkgs", + "rev": "522d86121cbd413aff922c54f38106ecf8740107", "type": "github" } }, @@ -45,24 +71,75 @@ "inputs": { "nix-bundle": "nix-bundle", "nix-utils": "nix-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "fedimint", + "nixpkgs" + ] }, "locked": { - "lastModified": 1708548996, - "narHash": "sha256-U7DF6oLGaGm4SmfUnaK8X2Y36fprVd7EFr8sqV6Ocp8=", - "owner": "dpc", + "lastModified": 1729104746, + "narHash": "sha256-7K+dlB8JPT/HD8wcnbb+BV3kFllnBQ6jpXtJX6wmDPk=", + "owner": "NixOS", "repo": "bundlers", - "rev": "e8aafe89a11ae0a5f3ce97d1d7d0fcfb354c79eb", + "rev": "ea1e72ad1dbb0864fd55b3ba52ed166cd190afa2", "type": "github" }, "original": { - "owner": "dpc", + "owner": "NixOS", "repo": "bundlers", - "rev": "e8aafe89a11ae0a5f3ce97d1d7d0fcfb354c79eb", + "rev": "ea1e72ad1dbb0864fd55b3ba52ed166cd190afa2", + "type": "github" + } + }, + "cargo-deluxe": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakebox": "flakebox", + "nixpkgs": [ + "fedimint", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729202329, + "narHash": "sha256-lltxyfay1Vg1CmcAU/r3kOCQs7/WdK22YKORAgzmXkg=", + "owner": "rustshop", + "repo": "cargo-deluxe", + "rev": "4acc6488d02f032434a5a1341f21f20d328bba40", + "type": "github" + }, + "original": { + "owner": "rustshop", + "repo": "cargo-deluxe", + "rev": "4acc6488d02f032434a5a1341f21f20d328bba40", "type": "github" } }, "crane": { + "inputs": { + "nixpkgs": [ + "fedimint", + "cargo-deluxe", + "flakebox", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717383740, + "narHash": "sha256-559HbY4uhNeoYvK3H6AMZAtVfmR3y8plXZ1x6ON/cWU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "b65673fce97d277934488a451724be94cc62499a", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "rev": "b65673fce97d277934488a451724be94cc62499a", + "type": "github" + } + }, + "crane_2": { "inputs": { "nixpkgs": [ "fedimint", @@ -89,11 +166,12 @@ "inputs": { "nixpkgs": [ "fedimint", + "cargo-deluxe", "flakebox", "android-nixpkgs", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1695195896, @@ -109,27 +187,52 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "fedimint", + "flakebox", + "android-nixpkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "owner": "numtide", + "repo": "devshell", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "fedimint": { "inputs": { "advisory-db": "advisory-db", "bundlers": "bundlers", - "fenix": "fenix", - "flake-utils": "flake-utils_2", - "flakebox": "flakebox", + "cargo-deluxe": "cargo-deluxe", + "fenix": "fenix_2", + "flake-utils": "flake-utils_5", + "flakebox": "flakebox_2", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727317398, - "narHash": "sha256-NUr1ZpYJozWIej46Oqlf/7feJ4kztYYvX3TEzQ5VoWo=", + "lastModified": 1729547752, + "narHash": "sha256-qHe0RzjOk/H1c9y/WzKmfCgL7yBXxCaHs+xl98H7/LM=", "owner": "fedimint", "repo": "fedimint", - "rev": "1813069d5d18a29f611a423990e8013a7331d2a2", + "rev": "6f6bdb319e83ae737a14ef5689deef4fa17f9268", "type": "github" }, "original": { "owner": "fedimint", - "ref": "refs/tags/v0.4.3", "repo": "fedimint", + "rev": "6f6bdb319e83ae737a14ef5689deef4fa17f9268", "type": "github" } }, @@ -137,16 +240,40 @@ "inputs": { "nixpkgs": [ "fedimint", + "cargo-deluxe", + "flakebox", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1719015507, - "narHash": "sha256-Fi9voHxBDWyKpvD2SJA9ARSMYSZg/atD9x7nkYr/ELw=", + "lastModified": 1696918968, + "narHash": "sha256-18rAHsM9YsGp7aKKemO4gKIeWfrSyDsdJZ/mk4dQ3JI=", "owner": "nix-community", "repo": "fenix", - "rev": "261936e5e770489369ecdd664647908a8ae5cab6", + "rev": "638fc95a2a3d01b372c76f71cbb6d73c63909d6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "fedimint", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1729492502, + "narHash": "sha256-d6L4bBlUWr4sHC+eRXo+4acFPEFXKmqHpM/BfQ5gQQw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "4002a1ec3486b855f341d2b864ba06b61e73af28", "type": "github" }, "original": { @@ -172,14 +299,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -190,7 +317,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -210,10 +337,65 @@ "inputs": { "systems": [ "fedimint", + "cargo-deluxe", "flakebox", "systems" ] }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_8" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -228,9 +410,31 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_8": { "inputs": { - "systems": "systems_5" + "systems": [ + "fedimint", + "flakebox", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "inputs": { + "systems": "systems_10" }, "locked": { "lastModified": 1726560853, @@ -250,48 +454,71 @@ "inputs": { "android-nixpkgs": "android-nixpkgs", "crane": "crane", + "fenix": "fenix", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1728662483, + "narHash": "sha256-phVyjjgVmHFUF6+DGFRA+1fCV0zs8ipwRn/M33LtIYY=", + "owner": "rustshop", + "repo": "flakebox", + "rev": "1a65534520d8a592fd7d75f7db18cfed40fa5c09", + "type": "github" + }, + "original": { + "owner": "rustshop", + "repo": "flakebox", + "type": "github" + } + }, + "flakebox_2": { + "inputs": { + "android-nixpkgs": "android-nixpkgs_2", + "crane": "crane_2", "fenix": [ "fedimint", "fenix" ], - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_8", "nixpkgs": [ "fedimint", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_9" }, "locked": { - "lastModified": 1719004469, - "narHash": "sha256-TZSHiEJ3qYgA46vikQKT2bwGCEF2LrJVw7cettqa+/g=", + "lastModified": 1727478500, + "narHash": "sha256-nrDYdwIAI1nskNEE/r9rhDJDaouZ4tpSyURfndRsPho=", "owner": "dpc", "repo": "flakebox", - "rev": "12d5ee4f6c47bc01f07ec6f5848a83db265902d3", + "rev": "ee39d59b2c3779e5827f8fa2d269610c556c04c8", "type": "github" }, "original": { "owner": "dpc", "repo": "flakebox", - "rev": "12d5ee4f6c47bc01f07ec6f5848a83db265902d3", + "rev": "ee39d59b2c3779e5827f8fa2d269610c556c04c8", "type": "github" } }, "nix-bundle": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "utils": "utils" }, "locked": { - "lastModified": 1708548961, - "narHash": "sha256-WVA2EMhl/jk5GS84y20ExnIW03UyH43wRuoiySxHGZE=", - "owner": "dpc", + "lastModified": 1729095141, + "narHash": "sha256-2AXV3I8D/I3UkQY797j/fSKrIwbUpTVZ82s2O/ErtVM=", + "owner": "matthewbauer", "repo": "nix-bundle", - "rev": "8ab9acfe0a31805de7899eddb8f3312d4e34a13d", + "rev": "4f6330b20767744a4c28788e3cdb05e02d096cd8", "type": "github" }, "original": { - "owner": "dpc", + "owner": "matthewbauer", "repo": "nix-bundle", - "rev": "8ab9acfe0a31805de7899eddb8f3312d4e34a13d", "type": "github" } }, @@ -316,17 +543,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-20.03-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { @@ -346,24 +574,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", - "path": "/nix/store/p53cz6rh27q40g9i0q98k3vfrz6lm12w-source", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", - "type": "path" + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1727129439, + "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "type": "github" }, "original": { @@ -376,17 +607,34 @@ "root": { "inputs": { "fedimint": "fedimint", - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_9" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1718888342, - "narHash": "sha256-fzdX+mapnBrex5biWA6Q/Be4mDfm0q1r/N4SL1qIq6k=", + "lastModified": 1696840854, + "narHash": "sha256-wphOvjDSDsUN5DMe3MOhdargANIab7YE3hkh3Qv7qso=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "67f7eb505e3aaf37db4bc805c79c95f9be44e2a5", + "rev": "aaa1e8e1b82d742b876d164a30dda02f318ce809", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1729454508, + "narHash": "sha256-1W5B/CnLgdC03iIFG0wtawO1+dGDWDpc84PeOHo2ecU=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "9323b5385863739d1c113f02e4cf3f2777c09977", "type": "github" }, "original": { @@ -411,6 +659,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -470,6 +733,84 @@ "repo": "default", "type": "github" } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6a78733d7..f0daedc18 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; fedimint.url = - "github:fedimint/fedimint?ref=refs/tags/v0.4.3"; + "github:fedimint/fedimint?rev=6f6bdb319e83ae737a14ef5689deef4fa17f9268"; }; outputs = { self, flake-utils, fedimint }: flake-utils.lib.eachDefaultSystem (system: @@ -10,7 +10,7 @@ nixpkgs = fedimint.inputs.nixpkgs; pkgs = import nixpkgs { inherit system; - overlays = fedimint.overlays.fedimint; + overlays = [ fedimint.overlays.all ]; }; fmLib = fedimint.lib.${system};