From cc71aa408e874006a5c9eb42422abbcaa24739a7 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 21:57:40 +1000 Subject: [PATCH] chore(daedalus): bumped to v6.0.0 --- flake.lock | 150 +++++++++++++++++++++++++++++++++++------- flake.nix | 2 +- profiles/daedalus.nix | 11 ++-- 3 files changed, 132 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index d709128..7fa0798 100644 --- a/flake.lock +++ b/flake.lock @@ -728,6 +728,23 @@ "type": "github" } }, + "cardano-playground": { + "flake": false, + "locked": { + "lastModified": 1723217743, + "narHash": "sha256-Jt2onBMJI4O53EEi6QoyXdivOlEoPmZ/KSgfBLHgN6M=", + "owner": "input-output-hk", + "repo": "cardano-playground", + "rev": "afd96579a3fda70ddbf414b0d5c5a40193750175", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "next-2024-07-24", + "repo": "cardano-playground", + "type": "github" + } + }, "cardano-shell": { "flake": false, "locked": { @@ -824,6 +841,40 @@ "type": "github" } }, + "cardano-shell_7": { + "flake": false, + "locked": { + "lastModified": 1651849514, + "narHash": "sha256-g5vqy7WoRusIq7eOwSXLLH/+VKHJUSbErhnrzfLvmBU=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "0d1d5f036c73d18e641412d2c58d4acda592d493", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "0d1d5f036c73d18e641412d2c58d4acda592d493", + "type": "github" + } + }, + "cardano-wallet-unpatched": { + "flake": false, + "locked": { + "lastModified": 1722103243, + "narHash": "sha256-2Ilm37Lt0nnFOgVx9AFIf8go6JfKhPoE9Im7H5sscxM=", + "owner": "cardano-foundation", + "repo": "cardano-wallet", + "rev": "ceb90fcac0e7ddf9e30705ce1e9d5780222fc3fd", + "type": "github" + }, + "original": { + "owner": "cardano-foundation", + "ref": "v2024-07-27", + "repo": "cardano-wallet", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat_12", @@ -944,24 +995,25 @@ }, "daedalus": { "inputs": { - "nixpkgs": [ - "daedalus", - "tullia", - "nixpkgs" - ], + "cardano-playground": "cardano-playground", + "cardano-shell": "cardano-shell_7", + "cardano-wallet-unpatched": "cardano-wallet-unpatched", + "flake-compat": "flake-compat_13", + "nix-bundle-exe": "nix-bundle-exe", + "nixpkgs": "nixpkgs_30", "tullia": "tullia_7" }, "locked": { - "lastModified": 1673276601, - "narHash": "sha256-ImXTFG8KgQvLNfFpApRUjmZZPoBwf+5ZjXhBrRw+XPA=", + "lastModified": 1723205985, + "narHash": "sha256-z4Pj91APyMPKnuHWfmXDnxioKSieQlGnqaKnXl36jAw=", "owner": "input-output-hk", "repo": "daedalus", - "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b", + "rev": "72e26ae0ee1e600972e28704db50554115f38f4f", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "5.2.0", + "ref": "6.0.0", "repo": "daedalus", "type": "github" } @@ -1528,6 +1580,22 @@ } }, "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "eca47d3377946315596da653862d341ee5341318", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1650374568, @@ -1543,7 +1611,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2370,7 +2438,7 @@ }, "gomod2nix_7": { "inputs": { - "nixpkgs": "nixpkgs_30", + "nixpkgs": "nixpkgs_31", "utils": "utils_12" }, "locked": { @@ -3137,7 +3205,7 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_34" + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1629993366, @@ -3600,6 +3668,22 @@ "type": "github" } }, + "nix-bundle-exe": { + "flake": false, + "locked": { + "lastModified": 1682949567, + "narHash": "sha256-K9PT8LVvTLOm3gX9ZFxag0X85DFgB2vvJB+S12disWw=", + "owner": "3noch", + "repo": "nix-bundle-exe", + "rev": "3522ae68aa4188f4366ed96b41a5881d6a88af97", + "type": "github" + }, + "original": { + "owner": "3noch", + "repo": "nix-bundle-exe", + "type": "github" + } + }, "nix-nomad": { "inputs": { "flake-compat": "flake-compat_3", @@ -3839,7 +3923,7 @@ }, "nix-nomad_7": { "inputs": { - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_14", "flake-utils": [ "daedalus", "tullia", @@ -4056,7 +4140,7 @@ "nix2container_8": { "inputs": { "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_31" + "nixpkgs": "nixpkgs_32" }, "locked": { "lastModified": 1658567952, @@ -4132,11 +4216,11 @@ }, "nix_4": { "inputs": { - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_15", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_35", + "nixpkgs": "nixpkgs_36", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, @@ -5342,6 +5426,22 @@ } }, "nixpkgs_30": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -5357,7 +5457,7 @@ "type": "github" } }, - "nixpkgs_31": { + "nixpkgs_32": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -5372,7 +5472,7 @@ "type": "github" } }, - "nixpkgs_32": { + "nixpkgs_33": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -5388,7 +5488,7 @@ "type": "github" } }, - "nixpkgs_33": { + "nixpkgs_34": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -5404,7 +5504,7 @@ "type": "github" } }, - "nixpkgs_34": { + "nixpkgs_35": { "locked": { "lastModified": 1691003216, "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", @@ -5418,7 +5518,7 @@ "type": "indirect" } }, - "nixpkgs_35": { + "nixpkgs_36": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -5434,7 +5534,7 @@ "type": "github" } }, - "nixpkgs_36": { + "nixpkgs_37": { "locked": { "lastModified": 1724098845, "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", @@ -5940,7 +6040,7 @@ "daedalus": "daedalus", "iohkNix": "iohkNix_6", "nix": "nix_4", - "nixpkgs": "nixpkgs_36", + "nixpkgs": "nixpkgs_37", "nixpkgsUnstable": "nixpkgsUnstable", "ragenix": "ragenix", "utils": "utils_13" @@ -6382,7 +6482,7 @@ ], "n2c": "n2c_7", "nixago": "nixago_7", - "nixpkgs": "nixpkgs_33", + "nixpkgs": "nixpkgs_34", "yants": "yants_7" }, "locked": { @@ -6594,7 +6694,7 @@ "inputs": { "nix-nomad": "nix-nomad_7", "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_32", + "nixpkgs": "nixpkgs_33", "std": "std_7" }, "locked": { diff --git a/flake.nix b/flake.nix index 71b0b25..a123a3e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; colmena.url = github:zhaofengli/colmena/?ref=v0.4.0; - daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; + daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; diff --git a/profiles/daedalus.nix b/profiles/daedalus.nix index 5878066..cb875cc 100644 --- a/profiles/daedalus.nix +++ b/profiles/daedalus.nix @@ -2,16 +2,17 @@ { config, pkgs, - daedalus, lib, ... }: let - daedalusProject = import daedalus.daedalus {}; - daedalusMainnet = daedalusProject.daedalus; - #daedalusFlight = daedalusProject.daedalus {--argstr cluster mainnet_flight -o daedalusFlight}; + flake = builtins.getFlake (toString ../.); + daedalusMainnet = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet; + #daedalusPreview = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preview; + #daedalusPreprod = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preprod; in { environment.systemPackages = [ daedalusMainnet - #daedalusFlight + #daedalusPreview + #daedalusPreprod ]; }