From 8d9b321675b211312265ec9d8d8b839c49f434c7 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Sat, 5 Nov 2022 00:07:08 +0100 Subject: [PATCH] Update Flake inputs --- flake.lock | 24 ++++++++++++------------ flake.nix | 7 ------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 8573de4..d089881 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ }, "nixpkgs-22_05_2": { "locked": { - "lastModified": 1665279158, - "narHash": "sha256-TpbWNzoJ5RaZ302dzvjY2o//WxtOJuYT3CnDj5N69Hs=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3783bcfb8ec54e0de26feccfc6cc36b8e202ed5", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1665643254, - "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", + "lastModified": 1667482890, + "narHash": "sha256-pua0jp87iwN7NBY5/ypx0s9L9CG49Ju/NI4wGwurHc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", + "rev": "a2a777538d971c6b01c6e54af89ddd6567c055e8", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665613119, - "narHash": "sha256-VTutbv5YKeBGWou6ladtgfx11h6et+Wlkdyh4jPJ3p0=", + "lastModified": 1667420999, + "narHash": "sha256-NDz83NKuuEuonbhC5HnfhUpZsJQGmAWJr22snKGfhKs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e06bd4b64bbfda91d74f13cb5eca89485d47528f", + "rev": "4f09cfce9c1d54fb56b65125061a632849de1a49", "type": "github" }, "original": { @@ -185,11 +185,11 @@ "nixpkgs-22_05": "nixpkgs-22_05_2" }, "locked": { - "lastModified": 1665289655, - "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=", + "lastModified": 1667427533, + "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3", + "rev": "486b4455da16272c1ed31bc82adcdbe7af829465", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ecbada0..ef28669 100644 --- a/flake.nix +++ b/flake.nix @@ -20,10 +20,6 @@ ]; }; }; - - openssl1_1Overlay = final: prev: { - nginxStable = prev.nginxStable.override { openssl = pkgs.openssl_1_1; }; - }; in { devShells.x86_64-linux.default = pkgs.mkShell { @@ -54,7 +50,6 @@ ./profiles/db.nix ( { - nixpkgs.overlays = [ openssl1_1Overlay ]; sops.defaultSopsFile = ./secrets.enc.yml; networking.hostName = "db1"; networking.domain = "banditlair.com"; @@ -73,7 +68,6 @@ ./profiles/backend.nix ( { - nixpkgs.overlays = [ openssl1_1Overlay ]; sops.defaultSopsFile = ./secrets.enc.yml; networking.hostName = "backend1"; networking.domain = "banditlair.com"; @@ -94,7 +88,6 @@ ./profiles/storage.nix ( { - nixpkgs.overlays = [ openssl1_1Overlay ]; sops.defaultSopsFile = ./secrets.enc.yml; networking.hostName = "storage1"; networking.domain = "banditlair.com";