Merge accidentally overwritten changes #1
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "oops"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Merge accidentally overwritten changes
Flake lock file updates: • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/828735c' (2026-04-07) → 'github:nix-community/nix-vscode-extensions/231042b' (2026-04-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/36a6011' (2026-04-04) → 'github:nixos/nixpkgs/4e92bbc' (2026-04-07) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/68d8aa3' (2026-04-05) → 'github:nixos/nixpkgs/4c1018d' (2026-04-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/a4ee2de' (2026-04-05) → 'github:Mic92/sops-nix/d2e8438' (2026-04-08)Flake lock file updates: • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/231042b' (2026-04-10) → 'github:nix-community/nix-vscode-extensions/517e963' (2026-04-11) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4e92bbc' (2026-04-07) → 'github:nixos/nixpkgs/54170c5' (2026-04-10)Flake lock file updates: • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/517e963' (2026-04-11) → 'github:nix-community/nix-vscode-extensions/13a042e' (2026-04-18) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/54170c5' (2026-04-10) → 'github:nixos/nixpkgs/c7f4703' (2026-04-17) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/4c1018d' (2026-04-09) → 'github:nixos/nixpkgs/4bd9165' (2026-04-14) • Updated input 'sops-nix': 'github:Mic92/sops-nix/d2e8438' (2026-04-08) → 'github:Mic92/sops-nix/d4971dd' (2026-04-13)Flake lock file updates: • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.17.3/019d691b-0a67-74d9-90e1-1a3c86286399/source.tar.gz' (2026-04-07) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.18.0/019dabb9-22ad-71c0-8b78-e5ea2325c027/source.tar.gz' (2026-04-20) • Updated input 'determinate/determinate-nixd-aarch64-darwin': 'https://install.determinate.systems/determinate-nixd/tag/v3.17.3/macOS' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/macOS' • Updated input 'determinate/determinate-nixd-aarch64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.17.3/aarch64-linux' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/aarch64-linux' • Updated input 'determinate/determinate-nixd-x86_64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.17.3/x86_64-linux' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/x86_64-linux' • Updated input 'determinate/nix': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.17.3/019d6913-e8c2-7128-ba76-3dc4f6b58158/source.tar.gz' (2026-04-07) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.18.0/019dabb0-d850-7e52-bfec-e5abc21882af/source.tar.gz' (2026-04-20) • Updated input 'determinate/nixpkgs': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.975711%2Brev-83e29f2b8791f6dec20804382fcd9a666d744c07/019d6689-cde2-7061-b044-e0ef61ade488/source.tar.gz' (2026-04-06) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.978638%2Brev-13043924aaa7375ce482ebe2494338e058282925/019d8a9c-62d4-7081-8145-107410bd19e6/source.tar.gz' (2026-04-11) • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/13a042e' (2026-04-18) → 'github:nix-community/nix-vscode-extensions/ea6764d' (2026-04-22) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/c775c27' (2026-04-06) → 'github:NixOS/nixos-hardware/72674a6' (2026-04-22) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/c7f4703' (2026-04-17) → 'github:nixos/nixpkgs/e07580d' (2026-04-19) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/4bd9165' (2026-04-14) → 'github:nixos/nixpkgs/b12141e' (2026-04-18) • Updated input 'sops-nix': 'github:Mic92/sops-nix/d4971dd' (2026-04-13) → 'github:Mic92/sops-nix/bef289e' (2026-04-21)Flake lock file updates: • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.18.0/019dabb9-22ad-71c0-8b78-e5ea2325c027/source.tar.gz' (2026-04-20) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.18.1/019dbc08-210a-7941-b195-710393c6fd8c/source.tar.gz' (2026-04-23) • Updated input 'determinate/determinate-nixd-aarch64-darwin': 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/macOS' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.1/macOS' • Updated input 'determinate/determinate-nixd-aarch64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/aarch64-linux' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.1/aarch64-linux' • Updated input 'determinate/determinate-nixd-x86_64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v3.18.0/x86_64-linux' → 'https://install.determinate.systems/determinate-nixd/tag/v3.18.1/x86_64-linux' • Updated input 'determinate/nix': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.18.0/019dabb0-d850-7e52-bfec-e5abc21882af/source.tar.gz' (2026-04-20) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.18.1/019dbc00-786e-7020-8304-a33065736bab/source.tar.gz' (2026-04-23) • Updated input 'determinate/nixpkgs': 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.978638%2Brev-13043924aaa7375ce482ebe2494338e058282925/019d8a9c-62d4-7081-8145-107410bd19e6/source.tar.gz' (2026-04-11) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.981196%2Brev-b86751bc4085f48661017fa226dee99fab6c651b/019daeab-1563-75e1-9919-fee0062268db/source.tar.gz' (2026-04-16) • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/ea6764d' (2026-04-22) → 'github:nix-community/nix-vscode-extensions/9b6d532' (2026-04-27) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/72674a6' (2026-04-22) → 'github:NixOS/nixos-hardware/2096f3f' (2026-04-23) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e07580d' (2026-04-19) → 'github:nixos/nixpkgs/a4bf066' (2026-04-25) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/b12141e' (2026-04-18) → 'github:nixos/nixpkgs/0726a0e' (2026-04-22)Flake lock file updates: • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/9b6d532b8c6840e9e4e23e1c4f661b5ff4df4512?narHash=sha256-J9Hai2fJUd3nE/JhfwDPvi0mgzoIttKZqyxXH4a%2BzRQ%3D' (2026-04-27) → 'github:nix-community/nix-vscode-extensions/1500938a18efd84c43bab24da5da00722fd23c1d?narHash=sha256-EgUbSPqdXT1kiqE9VYwX097zvW/glUPrz4NhxTTGp0s%3D' (2026-04-30) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/a4bf06618f0b5ee50f14ed8f0da77d34ecc19160?narHash=sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4%3D' (2026-04-25) → 'github:nixos/nixpkgs/755f5aa91337890c432639c60b6064bb7fe67769?narHash=sha256-ypxFOeDz%2BCqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI%3D' (2026-04-29) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/0726a0ecb6d4e08f6adced58726b95db924cef57?narHash=sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI%3D' (2026-04-22) → 'github:nixos/nixpkgs/1c3fe55ad329cbcb28471bb30f05c9827f724c76?narHash=sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M%2BC8yzzIRYbE%3D' (2026-04-27) • Updated input 'sops-nix': 'github:Mic92/sops-nix/bef289e2248991f7afeb95965c82fbcd8ff72598?narHash=sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI%3D' (2026-04-21) → 'github:Mic92/sops-nix/8eaee5c45428b28b8c47a83e4c09dccec5f279b5?narHash=sha256-bc%2BZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E%3D' (2026-04-28)5f00c8bc44toa3a2303091