From 94262c2c207b86605f39b63e75980366644d1156 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 16 Aug 2024 10:27:28 +0200
Subject: [PATCH] Update flake.lock
---
flake.lock | 86 ++++++++++++++++++++--------------------
overlays/mitigations.nix | 8 ++++
2 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/flake.lock b/flake.lock
index 9256d0a..1784646 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1722339003,
- "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
+ "lastModified": 1723293904,
+ "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
+ "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@@ -43,11 +43,11 @@
]
},
"locked": {
- "lastModified": 1722347739,
- "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
+ "lastModified": 1723405438,
+ "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
+ "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
"type": "github"
},
"original": {
@@ -371,11 +371,11 @@
]
},
"locked": {
- "lastModified": 1722630065,
- "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
+ "lastModified": 1723399884,
+ "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "afc892db74d65042031a093adb6010c4c3378422",
+ "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github"
},
"original": {
@@ -421,11 +421,11 @@
]
},
"locked": {
- "lastModified": 1721330371,
- "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
+ "lastModified": 1722623071,
+ "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm",
"repo": "hyprcursor",
- "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
+ "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"type": "github"
},
"original": {
@@ -469,11 +469,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1722773977,
- "narHash": "sha256-AqSmHptledo4Tp+hrHWovGR+e//bejR458sRmhq+jT4=",
+ "lastModified": 1723738578,
+ "narHash": "sha256-TLkmHk6xWEUGpLci1QNyWRC7VFqocgBat2gl1gVXpY4=",
"ref": "refs/heads/main",
- "rev": "5dd2c27b631f16e49a2c6e6cbbefba9fa50bf543",
- "revCount": 5050,
+ "rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60",
+ "revCount": 5095,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -606,11 +606,11 @@
]
},
"locked": {
- "lastModified": 1722098849,
- "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
+ "lastModified": 1722869141,
+ "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
+ "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
"type": "github"
},
"original": {
@@ -686,11 +686,11 @@
]
},
"locked": {
- "lastModified": 1722740924,
- "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
+ "lastModified": 1723352546,
+ "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
+ "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github"
},
"original": {
@@ -708,11 +708,11 @@
]
},
"locked": {
- "lastModified": 1722559629,
- "narHash": "sha256-BDnSIH6Ccd09MNmYY1N+rxBPN0zSSH5+9WkXN4K8rqE=",
+ "lastModified": 1723769240,
+ "narHash": "sha256-8u6lV2alO1cj8/+2Ua/sFnJ0fm+hwVW8xvLlLd1uFAo=",
"owner": "Silveere",
"repo": "nix-minecraft",
- "rev": "9f98a05b4e3f75a001b5f94da400d689157b48cb",
+ "rev": "e7e395d07bb008f9d4b4e0007fd4045b8b1e5261",
"type": "github"
},
"original": {
@@ -731,11 +731,11 @@
]
},
"locked": {
- "lastModified": 1722562463,
- "narHash": "sha256-LctuHlTmJPqQna/3F10v4eNE8/KYh2bu0naEwalJ73o=",
+ "lastModified": 1723772202,
+ "narHash": "sha256-e8nH/JfdW4OuaYcNnnRKaeB9fPRdCO3y4I3KzhXgE8k=",
"owner": "infinidoge",
"repo": "nix-minecraft",
- "rev": "6c5e8f138e4ba944f423850148651e00589dde73",
+ "rev": "77d0ca95f039e4e28f9b64c3f042c574d26a88e2",
"type": "github"
},
"original": {
@@ -753,11 +753,11 @@
]
},
"locked": {
- "lastModified": 1722253092,
- "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
+ "lastModified": 1723124175,
+ "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
+ "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
"type": "github"
},
"original": {
@@ -791,11 +791,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1722185531,
- "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+ "lastModified": 1723637854,
+ "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+ "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github"
},
"original": {
@@ -823,11 +823,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1722640603,
- "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
+ "lastModified": 1723703277,
+ "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
+ "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d",
"type": "github"
},
"original": {
@@ -855,11 +855,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1722519197,
- "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
+ "lastModified": 1723556749,
+ "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
+ "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
"type": "github"
},
"original": {
@@ -899,11 +899,11 @@
]
},
"locked": {
- "lastModified": 1722738111,
- "narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=",
+ "lastModified": 1723774846,
+ "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280",
+ "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f",
"type": "github"
},
"original": {
diff --git a/overlays/mitigations.nix b/overlays/mitigations.nix
index dc90406..b929fa0 100644
--- a/overlays/mitigations.nix
+++ b/overlays/mitigations.nix
@@ -1,5 +1,8 @@
nixfiles: final: prev:
let
+ pkgsStable = import nixfiles.inputs.nixpkgs.outPath { inherit (prev) system; };
+ updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
+
inherit (final) lib callPackage fetchFromGitHub;
inherit (lib) recurseIntoAttrs optionalAttrs
versionOlder versionAtLeast;
@@ -35,6 +38,11 @@ in {
then (final.python3Packages.toPythonApplication pkgs-y.python3Packages.yt-dlp)
else prev.yt-dlp;
+ easyeffects = let
+ stable = pkgsStable.easyeffects;
+ unstable = prev.easyeffects;
+ in if updateTime < 1726148749 then stable else unstable;
+
redlib = let
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
inherit (prev) redlib;