From 2d25aeb2a745879f83503b9579e0725d655f59eb Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 15 Jun 2023 17:56:08 +0200 Subject: [PATCH] 1password-gui: use version from master --- flake.lock | 26 +++++++++++++------------- overlays/overrides.nix | 6 ++++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 7f2aaf75..15cbc777 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1683635384, - "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=", + "lastModified": 1686680692, + "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", "owner": "numtide", "repo": "devshell", - "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369", + "rev": "fd6223370774dd9c33354e87a007004b5fd36442", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -306,11 +306,11 @@ }, "master": { "locked": { - "lastModified": 1683992631, - "narHash": "sha256-lCo68+qQI6H2C7exzBIQCuffFiI5l4w0CpV6i386F/Q=", + "lastModified": 1686841982, + "narHash": "sha256-ic9o7z8VOF9jqxAC1UN9gmymbgtix6OR8guYkHxowXw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9daee206706752c84a40ad207f88d4231a2c9ebd", + "rev": "8a3054c4f31ffa22ad4cca22a8aa271c59ccc91d", "type": "github" }, "original": { @@ -519,11 +519,11 @@ ] }, "locked": { - "lastModified": 1684242426, - "narHash": "sha256-kvFD6WP6I1fK9DMCPpuRDZxsAGKpzXMMd2G5MYP42kU=", + "lastModified": 1686817625, + "narHash": "sha256-UUt00+BuPiqBv5it8eG99KLWVa7F392PPt52TPO20Zs=", "ref": "main", - "rev": "d227038987158fa894872868f25bbf911c9cb8d1", - "revCount": 61, + "rev": "c2280bb09683372f2f482bea3a8bd1112cf990e7", + "revCount": 62, "type": "git", "url": "https://git.greenbaum.cloud/dev/tritonshell" }, diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 33a6b7d6..241b9822 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -5,8 +5,10 @@ channels: final: prev: { (channels.latest) ; - #inherit (channels.master) - # ; + inherit + (channels.master) + _1password-gui + ; inherit (channels.nixos-22-05)