From ed260d87438370eabc4927c55e84209217a4c1f9 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 6 Feb 2024 08:53:25 -0500 Subject: [PATCH] chore: update flake.lock --- devices/binto/hardware-configuration.nix | 13 ---- flake.lock | 91 ++++++++++-------------- flake.nix | 8 --- 3 files changed, 37 insertions(+), 75 deletions(-) diff --git a/devices/binto/hardware-configuration.nix b/devices/binto/hardware-configuration.nix index 4cf75f89..55d32cf9 100644 --- a/devices/binto/hardware-configuration.nix +++ b/devices/binto/hardware-configuration.nix @@ -2,25 +2,12 @@ config, lib, modulesPath, - nixpkgs-nvidia-fix, pkgs, ... }: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; imports = [(modulesPath + "/installer/scan/not-detected.nix")]; - # FIXME: remove this once PR reaches unstable - nixpkgs.overlays = [ - (self: super: (let - patched-pkgs = import nixpkgs-nvidia-fix { - inherit (self) system; - config.allowUnfree = true; - }; - in { - linuxPackages_zen = patched-pkgs.linuxPackages_zen; - })) - ]; - boot = { kernelPackages = pkgs.linuxPackages_zen; kernelModules = ["kvm-amd"]; diff --git a/flake.lock b/flake.lock index 5aadd90a..160047ec 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1707101684, - "narHash": "sha256-p/CZjHBjrCQp0WIW1OwxdpD4seW3qROlUDMmE5ICE1k=", + "lastModified": 1707224103, + "narHash": "sha256-v2vbXEju5kdvpqP9khSNgrCLT4A3ScTMicLAWTK0gM0=", "owner": "Aylur", "repo": "ags", - "rev": "58e1b14fe9abff805d70f685b15f86893437563f", + "rev": "45be37a5cc67698652a166fc4ca34658dac80eb1", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1703950660, - "narHash": "sha256-GgynJdQ6KngwFBd4YbMYbwesyOiMTZAFymsStE0PSfM=", + "lastModified": 1707151070, + "narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=", "owner": "hercules-ci", "repo": "arion", - "rev": "f295eabd25b7c894ab405be784e2a010f83fde55", + "rev": "9e5caa2b4869c9094a39a7819511a88c35e35671", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1706530549, - "narHash": "sha256-96HQ3EF6xVbjT3jPhcbwLHjPBiFw/p+d6AyNggNOqsY=", + "lastModified": 1707185512, + "narHash": "sha256-bj7ykxfQgX4aK9SD3qA5BQTY9KEZfywSCY8ZpD7YHIM=", "ref": "refs/heads/master", - "rev": "f36182ea1318d6b19a7e518a6b542d5b19b07276", - "revCount": 471, + "rev": "ad777a5136575c00a1cd013b5877a343304c4627", + "revCount": 473, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", + "lastModified": 1704029560, + "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", + "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1707114923, - "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -479,11 +479,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707098342, - "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=", + "lastModified": 1707176359, + "narHash": "sha256-h6BkgPOewfefG40E0KhEIqub207lUsfA84VfETb1m7c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47", + "rev": "ded174d6e5d14bc376919194cbc52c238a07f640", "type": "github" }, "original": { @@ -806,22 +806,6 @@ "type": "github" } }, - "nixpkgs-nvidia-fix": { - "locked": { - "lastModified": 1706975488, - "narHash": "sha256-arYN4yIKU1cN5sde1+hsRNrTsgEIsU+mrwT5N8jX+BQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "468a37e6ba01c45c91460580f345d48ecdb5a4db", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "468a37e6ba01c45c91460580f345d48ecdb5a4db", - "type": "github" - } - }, "nixpkgs-pacemaker": { "locked": { "lastModified": 1691894234, @@ -862,11 +846,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1707121157, - "narHash": "sha256-YYn/jO2VKcEx31vSQwCM2cBlkI/th4DCgFTTEjzKqLk=", + "lastModified": 1707225515, + "narHash": "sha256-y6pLuPu6N7IjQSH7zbFQCMgJPzuqaPv8eoQmkJuBqvk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "ce2098dcdb085f2a8194f04d7f4d2d22f60d1950", + "rev": "7d813d5fa088931411a3d85a8ff0118b3a164464", "type": "github" }, "original": { @@ -909,11 +893,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -941,11 +925,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -1058,11 +1042,11 @@ }, "nur": { "locked": { - "lastModified": 1707126301, - "narHash": "sha256-fzYJfTdd3I6YsWIY2FTya+asDoSWTVwxmVgIJjmvn8Y=", + "lastModified": 1707224015, + "narHash": "sha256-W8r+Fu3LJ5RbP+u8BxCGmnuCfRvA6jZ9bzz7AWiOIWY=", "owner": "nix-community", "repo": "NUR", - "rev": "4f131f190ff362b8cadca9d063ac8e16207c7af7", + "rev": "547506ae6419ea2e54e8fcf02c37fba340dd97d7", "type": "github" }, "original": { @@ -1246,7 +1230,6 @@ "nix-melt": "nix-melt", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs_4", - "nixpkgs-nvidia-fix": "nixpkgs-nvidia-fix", "nixpkgs-wayland": "nixpkgs-wayland", "nms": "nms", "nur": "nur", diff --git a/flake.nix b/flake.nix index aa4281f1..4fa22196 100644 --- a/flake.nix +++ b/flake.nix @@ -95,14 +95,6 @@ ref = "nixos-unstable"; }; - # FIXME: wait for this rev to reach unstable - nixpkgs-nvidia-fix = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - rev = "468a37e6ba01c45c91460580f345d48ecdb5a4db"; - }; - home-manager = { type = "github"; owner = "nix-community";