From 4819a098ae2800a71b3d7239589978c07305afab Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 4 Dec 2024 10:23:17 +1000 Subject: [PATCH] =?UTF-8?q?trajto(daedalus):=20frapi=C4=9Dis=20al=20la=20v?= =?UTF-8?q?6.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Progresses #3 --- flake.lock | 488 +++++------------------------------------------------ flake.nix | 2 +- 2 files changed, 41 insertions(+), 449 deletions(-) diff --git a/flake.lock b/flake.lock index 3cb66c9..8042356 100644 --- a/flake.lock +++ b/flake.lock @@ -244,21 +244,6 @@ "type": "github" } }, - "blank_7": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "cabal-32": { "flake": false, "locked": { @@ -697,6 +682,23 @@ "type": "github" } }, + "cardano-node-override": { + "flake": false, + "locked": { + "lastModified": 1725255033, + "narHash": "sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=", + "owner": "IntersectMBO", + "repo": "cardano-node", + "rev": "efd560070aaf042d1eb4680ae37fc607c7742319", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "ref": "9.1.1", + "repo": "cardano-node", + "type": "github" + } + }, "cardano-node-snapshot": { "inputs": { "customConfig": "customConfig_4", @@ -731,11 +733,11 @@ "cardano-playground": { "flake": false, "locked": { - "lastModified": 1723217743, - "narHash": "sha256-Jt2onBMJI4O53EEi6QoyXdivOlEoPmZ/KSgfBLHgN6M=", + "lastModified": 1721869644, + "narHash": "sha256-2qPZuuXtNi7kRPCFHv1Zvno/FIH0dOyg3Zqeywt77WQ=", "owner": "input-output-hk", "repo": "cardano-playground", - "rev": "afd96579a3fda70ddbf414b0d5c5a40193750175", + "rev": "c3042e1669ad9e5af43622972913614d6b934488", "type": "github" }, "original": { @@ -1018,6 +1020,7 @@ }, "daedalus": { "inputs": { + "cardano-node-override": "cardano-node-override", "cardano-playground": "cardano-playground", "cardano-shell": "cardano-shell_7", "cardano-wallet-unpatched": "cardano-wallet-unpatched", @@ -1027,16 +1030,16 @@ "tullia": "tullia_7" }, "locked": { - "lastModified": 1723205985, - "narHash": "sha256-z4Pj91APyMPKnuHWfmXDnxioKSieQlGnqaKnXl36jAw=", + "lastModified": 1727770993, + "narHash": "sha256-Wa6Vpc6dTVOWKy2oSf2GmDDJjAkeDhL7AZW2eYoISHI=", "owner": "input-output-hk", "repo": "daedalus", - "rev": "72e26ae0ee1e600972e28704db50554115f38f4f", + "rev": "ca5b0036009f4976679ecff68b479596b2b097a9", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "6.0.0", + "ref": "6.0.2", "repo": "daedalus", "type": "github" } @@ -1256,35 +1259,6 @@ "type": "github" } }, - "devshell_7": { - "inputs": { - "flake-utils": [ - "daedalus", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "nixlib": [ @@ -1477,35 +1451,6 @@ "type": "github" } }, - "dmerge_7": { - "inputs": { - "nixlib": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "daedalus", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, "em": { "flake": false, "locked": { @@ -1635,22 +1580,6 @@ } }, "flake-compat_15": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_16": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2061,51 +1990,6 @@ } }, "flake-utils_24": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_25": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_26": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_27": { "inputs": { "systems": "systems_2" }, @@ -2475,25 +2359,6 @@ "type": "github" } }, - "gomod2nix_7": { - "inputs": { - "nixpkgs": "nixpkgs_31", - "utils": "utils_12" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hackage": { "flake": false, "locked": { @@ -3244,7 +3109,7 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_35" + "nixpkgs": "nixpkgs_31" }, "locked": { "lastModified": 1629993366, @@ -3392,22 +3257,6 @@ "type": "github" } }, - "mdbook-kroki-preprocessor_3": { - "flake": false, - "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", - "type": "github" - }, - "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" - } - }, "membench": { "inputs": { "cardano-mainnet-mirror": "cardano-mainnet-mirror_3", @@ -3662,30 +3511,6 @@ "type": "github" } }, - "n2c_7": { - "inputs": { - "flake-utils": "flake-utils_26", - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -3960,41 +3785,6 @@ "type": "github" } }, - "nix-nomad_7": { - "inputs": { - "flake-compat": "flake-compat_15", - "flake-utils": [ - "daedalus", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix_7", - "nixpkgs": [ - "daedalus", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "daedalus", - "tullia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", - "type": "github" - }, - "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", - "type": "github" - } - }, "nix-tools": { "flake": false, "locked": { @@ -4176,25 +3966,6 @@ "type": "github" } }, - "nix2container_8": { - "inputs": { - "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_32" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nixTools": { "flake": false, "locked": { @@ -4255,11 +4026,11 @@ }, "nix_4": { "inputs": { - "flake-compat": "flake-compat_16", + "flake-compat": "flake-compat_15", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_36", + "nixpkgs": "nixpkgs_32", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, @@ -4515,41 +4286,6 @@ "type": "github" } }, - "nixago_7": { - "inputs": { - "flake-utils": [ - "daedalus", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1642336556, @@ -5481,11 +5217,11 @@ }, "nixpkgs_30": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1672844754, + "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "type": "github" }, "original": { @@ -5496,69 +5232,6 @@ } }, "nixpkgs_31": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_32": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_33": { - "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_34": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_35": { "locked": { "lastModified": 1691003216, "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", @@ -5572,7 +5245,7 @@ "type": "indirect" } }, - "nixpkgs_36": { + "nixpkgs_32": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -5588,7 +5261,7 @@ "type": "github" } }, - "nixpkgs_37": { + "nixpkgs_33": { "locked": { "lastModified": 1732981179, "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", @@ -6067,7 +5740,7 @@ "inputs": { "agenix": "agenix", "crane": "crane", - "flake-utils": "flake-utils_27", + "flake-utils": "flake-utils_24", "nixpkgs": [ "nixpkgs" ], @@ -6095,10 +5768,10 @@ "daedalus": "daedalus", "iohkNix": "iohkNix_6", "nix": "nix_4", - "nixpkgs": "nixpkgs_37", + "nixpkgs": "nixpkgs_33", "nixpkgsUnstable": "nixpkgsUnstable", "ragenix": "ragenix", - "utils": "utils_13" + "utils": "utils_12" } }, "rust-overlay": { @@ -6537,44 +6210,6 @@ "type": "github" } }, - "std_7": { - "inputs": { - "blank": "blank_7", - "devshell": "devshell_7", - "dmerge": "dmerge_7", - "flake-utils": "flake-utils_25", - "makes": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_3", - "microvm": [ - "daedalus", - "tullia", - "std", - "blank" - ], - "n2c": "n2c_7", - "nixago": "nixago_7", - "nixpkgs": "nixpkgs_34", - "yants": "yants_7" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -6767,18 +6402,13 @@ } }, "tullia_7": { - "inputs": { - "nix-nomad": "nix-nomad_7", - "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_33", - "std": "std_7" - }, + "flake": false, "locked": { - "lastModified": 1668711738, - "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", + "lastModified": 1677666696, + "narHash": "sha256-Oga/fHNJba7dM6HSz83RNv/UrUeGs1WRHUHbI8dCUqc=", "owner": "input-output-hk", "repo": "tullia", - "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", + "rev": "708d1ec45b17923d2452ba8f28795228ba8aafd5", "type": "github" }, "original": { @@ -6833,21 +6463,6 @@ } }, "utils_12": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_13": { "inputs": { "systems": "systems_3" }, @@ -7131,29 +6746,6 @@ "repo": "yants", "type": "github" } - }, - "yants_7": { - "inputs": { - "nixpkgs": [ - "daedalus", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", - "owner": "divnix", - "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 342bfb7..5012102 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ url = github:lilyinstarlight/nixos-cosmic; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; + daedalus.url = github:input-output-hk/daedalus/?ref=6.0.2; iohkNix.url = github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd; nix.url = github:NixOS/nix/?ref=2.24.6; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.11;