From cff6561279531078b93b79374232b7abc95757e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Thu, 3 Nov 2022 21:04:24 +0100
Subject: [PATCH] :bug: fix openssl issues

---
 flake.lock           | 94 +++++++++++++++++---------------------------
 overlays/default.nix |  2 +-
 2 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6edd3ac..a579e21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1664140963,
-        "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=",
+        "lastModified": 1665870395,
+        "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0",
+        "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     "arkenfox-userjs": {
       "flake": false,
       "locked": {
-        "lastModified": 1662893183,
-        "narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=",
+        "lastModified": 1665257885,
+        "narHash": "sha256-4PNnCRLomAd5OdN4UEbsVSm8eNuteZHKaUqRVvIBvN8=",
         "owner": "arkenfox",
         "repo": "user.js",
-        "rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7",
+        "rev": "f4187632faef76df4de0cbb0cdc7199f22fadd76",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1663284638,
-        "narHash": "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=",
+        "lastModified": 1666010793,
+        "narHash": "sha256-6zhTpR0cfaHrupOXRZAdCzLAGINgsB6h3HQnj7+qHWs=",
         "owner": "nix-community",
         "repo": "comma",
-        "rev": "c83ff3839983b3cb8deb407ff618ca12179de588",
+        "rev": "691120d169189f3a9cb29b1c72bcd521ac372b2b",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1664251341,
-        "narHash": "sha256-1f0KvK1VA8tGK7RVYZv17vSJ6URyt8fs81kRGfzPK3Q=",
+        "lastModified": 1666352875,
+        "narHash": "sha256-kbzTmj9ihe4rowgjLxD4uT4nKh304lN0RJMd5yBX03w=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "550ce5667fee8f74aa20ad6456720ed84ebdd241",
+        "rev": "3d7c61b6dc5fc9d7c5e4a74e575c582aa567d547",
         "type": "github"
       },
       "original": {
@@ -212,11 +212,11 @@
     "forgit-git": {
       "flake": false,
       "locked": {
-        "lastModified": 1663431390,
-        "narHash": "sha256-dz7HNm9+dgb2ibomdrYdtSUC+ksrYdRR5RjBxSmc9eI=",
+        "lastModified": 1665756353,
+        "narHash": "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=",
         "owner": "wfxr",
         "repo": "forgit",
-        "rev": "49579b2d1f620db6a71d070b40416c1af8a32168",
+        "rev": "2872548075e63bc83a0b960e2813b16571998563",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1664273942,
-        "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=",
+        "lastModified": 1666253070,
+        "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24",
+        "rev": "c485669ca529e01c1505429fa9017c9a93f15559",
         "type": "github"
       },
       "original": {
@@ -250,15 +250,14 @@
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs",
-        "pre-commit-hooks": "pre-commit-hooks",
-        "utils": "utils_3"
+        "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1665340940,
-        "narHash": "sha256-6IIBGkD4spWRvMTEXRxWa31IerfVc1SSTruggY/lNR4=",
+        "lastModified": 1665343480,
+        "narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=",
         "ref": "refs/heads/main",
-        "rev": "17159cf269ce194703bc04671bb6d2378d124959",
-        "revCount": 3,
+        "rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de",
+        "revCount": 5,
         "type": "git",
         "url": "https://git.sr.ht/~moritzboehme/howdy"
       },
@@ -269,11 +268,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1664278750,
-        "narHash": "sha256-frpTZQ+QMS7Xwi3fQSYdUTKd5e4YnrrDcS4WT+fdpfI=",
+        "lastModified": 1666360603,
+        "narHash": "sha256-EbTKhA5z4us1tOwitpbwHy42K6VF0jeisHuM197Ak5I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ff346a442d1e5ec81b24c312c06fd134bcc9c088",
+        "rev": "2615fa1055a8462db5c5be0b2ef5fd77b42aad10",
         "type": "github"
       },
       "original": {
@@ -322,11 +321,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1664235386,
-        "narHash": "sha256-hlkYFCJ9VKZPRW50vtpHHq4h1PJrptD5BbdLOEp4Lyc=",
+        "lastModified": 1666333455,
+        "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ea4a87537cfdc83eebcd1804a5ec51057018784f",
+        "rev": "93e0ac196106dce51878469c9a763c6233af5c57",
         "type": "github"
       },
       "original": {
@@ -381,11 +380,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1663082609,
-        "narHash": "sha256-lmCCIu4dj59qbzkGKHQtolhpIEQMeAd2XUbXVPqgPYo=",
+        "lastModified": 1666160137,
+        "narHash": "sha256-8bQu+6poMzUyS2n3C1v3hkO6ZhRzj8Pf3CDCNckqQE4=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "60cad1a326df17a8c6cf2bb23436609fdd83024e",
+        "rev": "e6c8efee1c108bb27522b9fd25b1cd0eb3288681",
         "type": "github"
       },
       "original": {
@@ -410,16 +409,16 @@
         "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "stable": "stable",
-        "utils": "utils_4"
+        "utils": "utils_3"
       }
     },
     "stable": {
       "locked": {
-        "lastModified": 1664178928,
-        "narHash": "sha256-+WVCZH/3Ifef4Da9N1tkGnmfX0QwtkJQz013QuImu10=",
+        "lastModified": 1666249138,
+        "narHash": "sha256-CzK8NA8xEMKAhvHXB8UMODckcH97sZXm6lziKNWLv0M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b542cc75fa03a3a29350d4c3b69739e946268a93",
+        "rev": "44fc3cb097324c9f9f93313dd3f103e78d722968",
         "type": "github"
       },
       "original": {
@@ -460,27 +459,6 @@
       }
     },
     "utils_3": {
-      "inputs": {
-        "flake-utils": [
-          "howdy",
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1657226504,
-        "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "type": "github"
-      }
-    },
-    "utils_4": {
       "inputs": {
         "flake-utils": "flake-utils_4"
       },
diff --git a/overlays/default.nix b/overlays/default.nix
index dc2ac76..d29fe96 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,7 +1,7 @@
 { inputs }: final: prev: {
   inherit (inputs.comma.packages."${prev.system}") comma;
   nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}";
-  kdeconnect = prev.plasma5Packages.kdeconnect-kde;
+  openssl = final.master.openssl_3; # HACK to fix openssl CVE-2022-3786 and CVE-2022-3602
   agenix = inputs.agenix.defaultPackage."${prev.system}";
   master = import inputs.master {
     inherit (prev) system;