From d230f9fabe7ff0890f6613506f9f6e2a0be4a9f1 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 11 Jul 2024 07:02:50 -0400 Subject: [PATCH] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake inputs: • Updated input 'discord-overlay': 'github:matt1432/discord-nightly-overlay/012ca035ff0e7eb8d8663674645e00f8cea5757e?narHash=sha256-A1gms/3YZLz%2B6E2RQoR/aCRApz6imSy9KOlct8QY1hs%3D' (2024-07-09) → 'github:matt1432/discord-nightly-overlay/94cb9dac116b1038d65f7733c8a88d9139a6f773?narHash=sha256-mnFt2qx1hgYEV5Brimp/swrbyl8zlm0NO55Q%2BUqBGtk%3D' (2024-07-11) • Updated input 'discord-overlay/Vencord-src': 'github:Vendicated/vencord/02092a985c2f95f2f265387a849db8cec95742a8?narHash=sha256-i7UqEjdV6%2BkeocA8jkZsLYKEYew8luJqYn7CS5cgF7w%3D' (2024-07-06) → 'github:Vendicated/vencord/9f8c7494216b3d5aadb8d3fec14fa5ac7d8f448a?narHash=sha256-uZQkPqIYcy7ESnCADR7lpjNQL3C1tcqZcgpwioDbb5o%3D' (2024-07-10) • Updated input 'home-manager': 'github:nix-community/home-manager/2fb5c1e0a17bc6059fa09dc411a43d75f35bb192?narHash=sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo%2B7IQ9n7vbNWgv28%3D' (2024-07-08) → 'github:nix-community/home-manager/c085b984ff2808bf322f375b10fea5a415a9c43d?narHash=sha256-BivO5yIQukDlJL%2B1875Sqf3GuOPxZDdA48dYDi3PkL8%3D' (2024-07-10) • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS/5d1928b925da7390eae3e369e6808d64cf916ed7?narHash=sha256-rw8s4EsRSVtlAGNd5ttO4Ynb/eq0rMJsqG9zyREK3sk%3D' (2024-07-08) → 'github:Jovian-Experiments/Jovian-NixOS/6f9390004b18e8b9be7863ab6506a038129e4f06?narHash=sha256-DPP3lWzpRxEETzlYbfvQVmIse/ZKWqLkDAFkvu4XRl4%3D' (2024-07-10) • Updated input 'neovim-nightly': 'github:nix-community/neovim-nightly-overlay/b6b51915180e6d2eac488d6f882e4ba36bad380d?narHash=sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE%3D' (2024-07-09) → 'github:nix-community/neovim-nightly-overlay/ec4631892b2515261158b1b12900758a9eb5a660?narHash=sha256-x%2Bg48Jl5De2oOfFazKbEP8IabXaeAKmF3JLcQyADYvE%3D' (2024-07-10) • Updated input 'neovim-nightly/git-hooks': 'github:cachix/git-hooks.nix/2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96?narHash=sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw%3D' (2024-07-08) → 'github:cachix/git-hooks.nix/8d6a17d0cdf411c55f12602624df6368ad86fac1?narHash=sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY%3D' (2024-07-09) • Updated input 'neovim-nightly/neovim-src': 'github:neovim/neovim/fb6c059dc55c8d594102937be4dd70f5ff51614a?narHash=sha256-66u%2Byzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8%3D' (2024-07-08) → 'github:neovim/neovim/f3c7fb9db176f32606e83eb47cc7549300191d2f?narHash=sha256-1rWj8M6J/pd4NtNJlnucdteZ%2BYzSIA5YJVdk/T2ssfo%3D' (2024-07-09) • Updated input 'nix-on-droid': 'github:nix-community/nix-on-droid/f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25?narHash=sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q%3D' (2024-07-07) → 'github:nix-community/nix-on-droid/8bcadcef69dcb5ca177bfb6ea3dc6b092cda2b06?narHash=sha256-WbjV0gmnh6jG1B292K4KIJwtBacn2sTWhiw1ZMeti9s%3D' (2024-07-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/655a58a72a6601292512670343087c2d75d859c1?narHash=sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU%3D' (2024-07-08) → 'github:NixOS/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497?narHash=sha256-ZgnNHuKV6h2%2BfQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ%3D' (2024-07-09) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/813f608e25bc14b16053c005b05ebf8b18d25503?narHash=sha256-05wIPweI6ts1BtVaMYbdL5KEelMfM4g5f/Z/xQzXRQI%3D' (2024-07-08) → 'github:nix-community/nixpkgs-wayland/8f132445454c6b9f0b21952953885007b961310a?narHash=sha256-r0a7rtlx5GzJ57izpq58B30sAzSIH2V/ctwIsMV51rY%3D' (2024-07-11) • Updated input 'pcsd': 'github:matt1432/nixos-pcsd/f9a452d33a0c02d6aecb15d330c9bb91b3f3b11e?narHash=sha256-b1IcFAJpwQNb/761B2Ohq02tTlNtDhKihX1wpQY8Qic%3D' (2024-07-07) → 'github:matt1432/nixos-pcsd/797d947767101781497a1e1b869f27d449e2a7c2?narHash=sha256-MFbEMQu%2BvlWYzRPYrEANm02PWkRSgkJkaHuSVIyIEzM%3D' (2024-07-11) Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:01f8359d5e1bbb7aa614acffebf81bea6ffce4f9fb9e57872466df381103a4bd → sha256:a6d70b4df97eab6b52ee7094c80109b28c0c2e8d9066c60b71b3222e88726444 • ghcr.io/immich-app/immich-server v1.108.0: sha256:75746006b35a7bc61408cd4d124dc73344f0a087c2d9769c4715ca84a1d87591 → sha256:248a6da7dadeb57f90eacd5635ecc65e63d4c3646a6c94a362bb57cba1b314fa • ghcr.io/immich-app/immich-machine-learning v1.108.0: sha256:f22d949f5f3e16d1c3dcf0aa3ca5f7a73f053b51d2883ac864f9742d3053576b → sha256:4dc544396bf08cd92066f83a270155201d80512add127ca9fac2d3e56694d2a4 • ghcr.io/linuxserver/calibre latest: sha256:ab3c6fb537e1b3085963c7407a4971e7e535812341eb65b10b42691389697292 → sha256:4e886252cad4a7796289a737afb4b47e9b547b7e2d2b9e35fd3153c8f97eefca • ghcr.io/linuxserver/sabnzbd latest: sha256:db76abdcd65ba2c06a630d17d7e71e75245f8c7ace734d4cadd6402e2776ad5c → sha256:cd0e0de27454b040a0d55d1a06885dc78366435ce6794b82a6e4194b795e213a --- .../arion/forgejo/images/act_runner.nix | 4 +- .../arion/immich/images/machine-learning.nix | 6 +- .../modules/arion/immich/images/server.nix | 6 +- .../arion/media/calibre/images/calibre.nix | 4 +- .../arion/media/sabnzbd/images/sabnzbd.nix | 4 +- devices/wim/modules/security.nix | 23 +------ flake.lock | 66 +++++++++---------- modules/printer.nix | 5 +- pkgs/yuzu/mainline.nix | 1 - 9 files changed, 47 insertions(+), 72 deletions(-) diff --git a/devices/nos/modules/arion/forgejo/images/act_runner.nix b/devices/nos/modules/arion/forgejo/images/act_runner.nix index 7b3a54ec..080788ae 100644 --- a/devices/nos/modules/arion/forgejo/images/act_runner.nix +++ b/devices/nos/modules/arion/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:01f8359d5e1bbb7aa614acffebf81bea6ffce4f9fb9e57872466df381103a4bd"; - sha256 = "0khlyh7naff3yl5mmww154z48l4ykgnql30d3msqpzd3g1j08jw7"; + imageDigest = "sha256:a6d70b4df97eab6b52ee7094c80109b28c0c2e8d9066c60b71b3222e88726444"; + sha256 = "0z0ffjavp2r07vp61f7ygwps28m0h9hkdvva0gj4bgsbwdk0pn76"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/arion/immich/images/machine-learning.nix b/devices/nos/modules/arion/immich/images/machine-learning.nix index c06e5c21..7ee3ea63 100644 --- a/devices/nos/modules/arion/immich/images/machine-learning.nix +++ b/devices/nos/modules/arion/immich/images/machine-learning.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-machine-learning"; - imageDigest = "sha256:f22d949f5f3e16d1c3dcf0aa3ca5f7a73f053b51d2883ac864f9742d3053576b"; - sha256 = "03zcw95lhpdd0pp4zh49zpga5ir44qbq75barqgcsn8003rlzmzd"; + imageDigest = "sha256:4dc544396bf08cd92066f83a270155201d80512add127ca9fac2d3e56694d2a4"; + sha256 = "17hp5ljnc34nmj74wjvvicc3zjkwhrq4k748r5jbmydgb4bsvji7"; finalImageName = "ghcr.io/immich-app/immich-machine-learning"; - finalImageTag = "v1.107.2"; + finalImageTag = "v1.108.0"; } diff --git a/devices/nos/modules/arion/immich/images/server.nix b/devices/nos/modules/arion/immich/images/server.nix index e5932c49..afd43e26 100644 --- a/devices/nos/modules/arion/immich/images/server.nix +++ b/devices/nos/modules/arion/immich/images/server.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/immich-app/immich-server"; - imageDigest = "sha256:75746006b35a7bc61408cd4d124dc73344f0a087c2d9769c4715ca84a1d87591"; - sha256 = "066j9ihn8kwznq8m0hpdayki2sc4ijwry5bc47vg4lif4dbxsdg3"; + imageDigest = "sha256:248a6da7dadeb57f90eacd5635ecc65e63d4c3646a6c94a362bb57cba1b314fa"; + sha256 = "03w9m0hsid9ppfyy8wmnccvmjh0m4h061yy1hwa4psijlx976xxp"; finalImageName = "ghcr.io/immich-app/immich-server"; - finalImageTag = "v1.107.2"; + finalImageTag = "v1.108.0"; } diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix index 34a0fefd..9f02d9e4 100644 --- a/devices/nos/modules/arion/media/calibre/images/calibre.nix +++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/calibre"; - imageDigest = "sha256:ab3c6fb537e1b3085963c7407a4971e7e535812341eb65b10b42691389697292"; - sha256 = "0x35v68bjwjkfnrjqvisg4gv7dwaz5qsb9y3xl2rdrbjbm30yvg4"; + imageDigest = "sha256:4e886252cad4a7796289a737afb4b47e9b547b7e2d2b9e35fd3153c8f97eefca"; + sha256 = "10xan2lwgi77qgmq964j290xykn4pk75r397fqj5kkkbxkqbndgh"; finalImageName = "ghcr.io/linuxserver/calibre"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix index a619d4b0..db5071a5 100644 --- a/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix +++ b/devices/nos/modules/arion/media/sabnzbd/images/sabnzbd.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/sabnzbd"; - imageDigest = "sha256:db76abdcd65ba2c06a630d17d7e71e75245f8c7ace734d4cadd6402e2776ad5c"; - sha256 = "0m8d8xiyip99wvlq83n06drn8fyl3kq6lf1dwi5zb64jjqs16d6x"; + imageDigest = "sha256:cd0e0de27454b040a0d55d1a06885dc78366435ce6794b82a6e4194b795e213a"; + sha256 = "0gl8z845aih0kdqabdhhf8fvbldx121vqiind9lx6zjmxjrr22wk"; finalImageName = "ghcr.io/linuxserver/sabnzbd"; finalImageTag = "latest"; } diff --git a/devices/wim/modules/security.nix b/devices/wim/modules/security.nix index 9b72e8fd..e808d6f0 100644 --- a/devices/wim/modules/security.nix +++ b/devices/wim/modules/security.nix @@ -16,28 +16,7 @@ auth sufficient pam_unix.so try_first_pass nullok ''; in { - services.fprintd = { - enable = true; - - # FIXME: https://github.com/NixOS/nixpkgs/issues/325836 - package = pkgs.fprintd.overrideAttrs (o: rec { - version = "1.94.3"; - src = pkgs.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = "fprintd"; - rev = "v${version}"; - sha256 = "sha256-shH+ctQAx4fpTMWTmo3wB45ZS38Jf8RknryPabfZ6QE="; - }; - patches = []; - mesonCheckFlags = [ - "--no-suite" - "fprintd:PAM" - "--no-suite" - "fprintd:TestPamFprintd" - ]; - }); - }; + services.fprintd.enable = true; # https://www.reddit.com/r/NixOS/comments/z7i83r/fingertip_tip_start_fprintd_at_boot_for_a_quick/ systemd.services.fprintd = { diff --git a/flake.lock b/flake.lock index ab42820f..abb873c0 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "Vencord-src": { "flake": false, "locked": { - "lastModified": 1720284193, - "narHash": "sha256-i7UqEjdV6+keocA8jkZsLYKEYew8luJqYn7CS5cgF7w=", + "lastModified": 1720596783, + "narHash": "sha256-uZQkPqIYcy7ESnCADR7lpjNQL3C1tcqZcgpwioDbb5o=", "owner": "Vendicated", "repo": "vencord", - "rev": "02092a985c2f95f2f265387a849db8cec95742a8", + "rev": "9f8c7494216b3d5aadb8d3fec14fa5ac7d8f448a", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1720508834, - "narHash": "sha256-A1gms/3YZLz+6E2RQoR/aCRApz6imSy9KOlct8QY1hs=", + "lastModified": 1720681602, + "narHash": "sha256-mnFt2qx1hgYEV5Brimp/swrbyl8zlm0NO55Q+UqBGtk=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "012ca035ff0e7eb8d8663674645e00f8cea5757e", + "rev": "94cb9dac116b1038d65f7733c8a88d9139a6f773", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1720450253, - "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -840,11 +840,11 @@ ] }, "locked": { - "lastModified": 1720470846, - "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", + "lastModified": 1720646128, + "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", + "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", "type": "github" }, "original": { @@ -1131,11 +1131,11 @@ ] }, "locked": { - "lastModified": 1720432056, - "narHash": "sha256-rw8s4EsRSVtlAGNd5ttO4Ynb/eq0rMJsqG9zyREK3sk=", + "lastModified": 1720632304, + "narHash": "sha256-DPP3lWzpRxEETzlYbfvQVmIse/ZKWqLkDAFkvu4XRl4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "5d1928b925da7390eae3e369e6808d64cf916ed7", + "rev": "6f9390004b18e8b9be7863ab6506a038129e4f06", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1720483510, - "narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=", + "lastModified": 1720592831, + "narHash": "sha256-x+g48Jl5De2oOfFazKbEP8IabXaeAKmF3JLcQyADYvE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d", + "rev": "ec4631892b2515261158b1b12900758a9eb5a660", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1720478486, - "narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=", + "lastModified": 1720555545, + "narHash": "sha256-1rWj8M6J/pd4NtNJlnucdteZ+YzSIA5YJVdk/T2ssfo=", "owner": "neovim", "repo": "neovim", - "rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a", + "rev": "f3c7fb9db176f32606e83eb47cc7549300191d2f", "type": "github" }, "original": { @@ -1553,11 +1553,11 @@ "nmd": "nmd_2" }, "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "lastModified": 1720612508, + "narHash": "sha256-WbjV0gmnh6jG1B292K4KIJwtBacn2sTWhiw1ZMeti9s=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "rev": "8bcadcef69dcb5ca177bfb6ea3dc6b092cda2b06", "type": "github" }, "original": { @@ -1590,11 +1590,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1751,11 +1751,11 @@ ] }, "locked": { - "lastModified": 1720471092, - "narHash": "sha256-05wIPweI6ts1BtVaMYbdL5KEelMfM4g5f/Z/xQzXRQI=", + "lastModified": 1720662315, + "narHash": "sha256-r0a7rtlx5GzJ57izpq58B30sAzSIH2V/ctwIsMV51rY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "813f608e25bc14b16053c005b05ebf8b18d25503", + "rev": "8f132445454c6b9f0b21952953885007b961310a", "type": "github" }, "original": { @@ -1913,11 +1913,11 @@ ] }, "locked": { - "lastModified": 1720394696, - "narHash": "sha256-b1IcFAJpwQNb/761B2Ohq02tTlNtDhKihX1wpQY8Qic=", + "lastModified": 1720681475, + "narHash": "sha256-MFbEMQu+vlWYzRPYrEANm02PWkRSgkJkaHuSVIyIEzM=", "owner": "matt1432", "repo": "nixos-pcsd", - "rev": "f9a452d33a0c02d6aecb15d330c9bb91b3f3b11e", + "rev": "797d947767101781497a1e1b869f27d449e2a7c2", "type": "github" }, "original": { diff --git a/modules/printer.nix b/modules/printer.nix index f97cd29e..43fd5fd6 100644 --- a/modules/printer.nix +++ b/modules/printer.nix @@ -4,10 +4,7 @@ printing = { enable = true; drivers = with pkgs; [ - (hplip.override { - # FIXME: https://github.com/NixOS/nixpkgs/pull/325682 - python3Packages = python311Packages; - }) + hplip ]; }; }; diff --git a/pkgs/yuzu/mainline.nix b/pkgs/yuzu/mainline.nix index ab7b6523..5ee69e98 100644 --- a/pkgs/yuzu/mainline.nix +++ b/pkgs/yuzu/mainline.nix @@ -136,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; # Fixes vulkan detection. - # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" ];