From fbf51076b32dc383308964dc98037f245e673c95 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 18 Mar 2024 18:08:03 +0000 Subject: [PATCH 1/3] Automatic Update --- config/desktop.nix | 2 +- flake.lock | 54 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/desktop.nix b/config/desktop.nix index be5cee44..01b5f612 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -188,5 +188,5 @@ in { enableSSHSupport = true; }; programs.gamemode.enable = true; - nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0"]; + nixpkgs.config.permittedInsecurePackages = ["electron-26.3.0"]; } diff --git a/flake.lock b/flake.lock index 7f0a1ef9..48e8fd7f 100644 --- a/flake.lock +++ b/flake.lock @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1710332687, - "narHash": "sha256-mlYRkSBboiojBO0Uyqv7faOmoAlJKHXF4VBznm01nbI=", + "lastModified": 1710723375, + "narHash": "sha256-jB4rOJgoD1AzYMMuwI48clBaEVVPKOxLwBhR77ehGqI=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "9636cc748b18a93719dd4aae1b3c0b95a8ad47be", + "rev": "16903506d4145f5e385bfe534519afffc464c0dd", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1710349883, - "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1710184940, - "narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=", + "lastModified": 1710677371, + "narHash": "sha256-yqjXunc+Zvqf6rcH7W9wMvhr18jMZhDvIdnretlfj78=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf", + "rev": "f890211817b941d9ed9de48d62ba8553fa2c20f3", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710310905, - "narHash": "sha256-D7f1CTKO8AZupjvymvrgCm3PY1x79IMrTqvppNyVjnY=", + "lastModified": 1710637843, + "narHash": "sha256-NVszlVTM0sEe8yZuOShitwOhNdl2juD7032SQg2dV+U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dcae53055d404ee74a8273276d4b8731718574a9", + "rev": "da2c09734818d85ef4d112997b5188b62cfdd0fd", "type": "github" }, "original": { @@ -610,11 +610,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710123225, - "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -680,11 +680,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710252211, - "narHash": "sha256-hQChQpB4LDBaSrNlD6DPLhU9T+R6oyxMCg2V+S7Y1jg=", + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7eeacecff44e05a9fd61b9e03836b66ecde8a525", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", "type": "github" }, "original": { @@ -696,11 +696,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710352901, - "narHash": "sha256-2W2XVH7LwPHexpSBbd/zhL1PjsjtyAp2t25PjaD6lIw=", + "lastModified": 1710784999, + "narHash": "sha256-6w/OnpXuBymYMHtkKje8eUNR8Spchd/AA/BV6T2rwpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b85d17fbc21d207dbd9a432c7b6b814eb597ef02", + "rev": "3d23162141a4e84e33293a6f9133e6bd4be5e7c7", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1710295923, - "narHash": "sha256-B7wIarZOh5nNnj4GTOOYcxAwVGTO8y0dRSOzd6PtYE8=", + "lastModified": 1710727870, + "narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a30facbf72f29e5c930f394f637559f46a855e8b", + "rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9", "type": "github" }, "original": { @@ -771,11 +771,11 @@ ] }, "locked": { - "lastModified": 1710195194, - "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { From 48749c421fb0cf05b5901be4408ca3b28278bbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 20 Mar 2024 10:14:44 +0100 Subject: [PATCH 2/3] Revert "Merge pull request #371 from DarkKirb/update-xivlauncher" This reverts commit 6518d92899e90b237ea5a85d14d6ea2cd7e39315, reversing changes made to 2310722115717520fa8f0ac7a26b94df1cce95b9. --- overlays/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index fcffc874..5a457ba9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -74,14 +74,4 @@ in doCheck = false; doInstallCheck = false; }); - xivlauncher = prev.xivlauncher.overrideAttrs (_: { - version = "1.0.8"; - src = self.fetchFromGitHub { - owner = "goatcorp"; - repo = "XIVLauncher.Core"; - rev = "1.0.8"; - hash = "sha256-x4W5L4k+u0MYKDWJu82QcXARW0zjmqqwGiueR1IevMk="; - fetchSubmodules = true; - }; - }); } From 1be6b3fa426e1fc7669aee2586f81867ea250059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 20 Mar 2024 10:14:55 +0100 Subject: [PATCH 3/3] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 5ef2ac5e..26f63f0b 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1707031713, - "narHash": "sha256-E7lnU/HNZGWVpJCaRXUFYIGnbZnaDq9hpGgEZ6YJQR0=", + "lastModified": 1710925314, + "narHash": "sha256-sSxRqGcGRjG4rZYAK2D83T+JGDyW/2nREREa0vnl2/E=", "owner": "DarkKirb", "repo": "admin-fe", - "rev": "cbe5fc66e2fbc8e6219ee61c98d50d19f5007334", + "rev": "f113b022f895aa796575abe79c5eaabac1846989", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1710723375, - "narHash": "sha256-jB4rOJgoD1AzYMMuwI48clBaEVVPKOxLwBhR77ehGqI=", + "lastModified": 1710896099, + "narHash": "sha256-FPLwZjTbs09yiwIqD9O95QL0BwNpLoLJdZshNk/ImtA=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "16903506d4145f5e385bfe534519afffc464c0dd", + "rev": "719f2c0dfa897e635628f6021d8848824dfc3fbe", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710637843, - "narHash": "sha256-NVszlVTM0sEe8yZuOShitwOhNdl2juD7032SQg2dV+U=", + "lastModified": 1710810847, + "narHash": "sha256-l1DacjuZny7i7YRbxIsa6DhXWoKJZEnM3Em8gt6Fsfk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "da2c09734818d85ef4d112997b5188b62cfdd0fd", + "rev": "03d036f41beaa8c31b2b2261918d248f5c4d45c8", "type": "github" }, "original": { @@ -594,11 +594,11 @@ ] }, "locked": { - "lastModified": 1710836777, - "narHash": "sha256-kurSSXi+OgdZJ7wn7QibMBSQZ9U5aSOY9/yWXVZY/WU=", + "lastModified": 1710917210, + "narHash": "sha256-TNyOgW3Xxonsnb/fCUxlG0uvlMFiZMEX5kfJDY1FCtg=", "owner": "DarkKirb", "repo": "nix-packages", - "rev": "e60c0585e3af0d4cbc03d2494f104aa25990d5d4", + "rev": "767ad111fb7656dffbf37a3defb5f444c640c8d7", "type": "github" }, "original": { @@ -680,11 +680,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "lastModified": 1710701596, + "narHash": "sha256-v4lsAi3vE/sEWg0G8AydMjs3NTHlsNw8K01xw06cKLg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "rev": "34ad8c9f29a18b4dd97a9ad40ceb16954f24afe7", "type": "github" }, "original": { @@ -696,11 +696,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710784999, - "narHash": "sha256-6w/OnpXuBymYMHtkKje8eUNR8Spchd/AA/BV6T2rwpA=", + "lastModified": 1710925866, + "narHash": "sha256-tsnHj38FLdKO5pkqpSkz8CEqRjDPdEbNvrNNuOy4PDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d23162141a4e84e33293a6f9133e6bd4be5e7c7", + "rev": "bf7fb6c310bc8d3364632f7414d174cb490ce4d0", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1710727870, - "narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=", + "lastModified": 1710900660, + "narHash": "sha256-PcHmHQvKIOdvAxlqxZ/DPmUMhUUvfp16pRtyW148u/0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9", + "rev": "549f4db17b5c0c143b1308fcfe9620129c387472", "type": "github" }, "original": {