From 1a07d25d8f482198ca0a9fe94df3be46ac9a659c Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sun, 5 Sep 2021 23:38:21 -0400
Subject: [PATCH] Bump vpngate to 0.1.0 and add hugo

---
 common/packages.nix                  |  5 +++-
 flake.lock                           | 36 ++++++++++++++--------------
 modules/overlays/vpngate/default.nix |  6 ++---
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index 4229171..64c5b3b 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -56,6 +56,9 @@ in
         tldr
         xclip
 
+        # blog
+        hugo
+
         # printing
         ghostscript
 
@@ -132,7 +135,6 @@ in
 
         ## aws
         aws-connect
-        # aws-sam-cli # broken!
         awscli2
         awslogs
         ssm-session-manager-plugin
@@ -188,6 +190,7 @@ in
         virtmanager
         vlc
         # Unsupported on darwin but likely should be:
+        aws-sam-cli
         brave
         datasette
         deluge
diff --git a/flake.lock b/flake.lock
index c1a0c1e..66281c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "lastModified": 1629481132,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630030114,
-        "narHash": "sha256-t5lptbv7rtNSawdwoA2JUAiqXgLYAO+dGqp8KRtOaDA=",
+        "lastModified": 1630890028,
+        "narHash": "sha256-Q2ZuK0QQiSdgei68a6wV1FDPmBkR6M0apFjQrWsv8FY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "33db7cc6a66d1c1cb77c23ae8e18cefd0425a0c8",
+        "rev": "5e46262cb1fa888f6f46a675cc2806a23ba9625c",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1630117031,
-        "narHash": "sha256-O72Jv9oblwYrmPdiCC3+cBMwI8GhWuZAg+7ZeVctpog=",
+        "lastModified": 1630777757,
+        "narHash": "sha256-TIcYO6hmrXNHa/SJs52UAnRwNZ3yMRexUfCdt1ANAvY=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8af13ed946aa06636c633327c6549993e2e50116",
+        "rev": "dce50312e1e9af81fb0e3b61d6e70bdf286fbffb",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1630138306,
-        "narHash": "sha256-1tqJ6qO3A5FxrYVOq8hFCvEVn1PhKJFQUyaDeGbpXqU=",
+        "lastModified": 1630829527,
+        "narHash": "sha256-wSbHRebRTythc3NXLePvdF0wPfjzRTZGSgnL5d9o24s=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "7a899330a1acd9ed6b3783cdecd256105e408a20",
+        "rev": "b0e95d8a87473740e51a6e8d266f23b1b3577a85",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1629880049,
-        "narHash": "sha256-HOxVkROGlDA57D0Tg/0nus938o4HzmqacOiCoT1H5tE=",
+        "lastModified": 1630761588,
+        "narHash": "sha256-7GXckvZy7DGh2KIyfdArqwnyeSc5Owy1fumEDQyd8eY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88226ea038e538e09c272a7c56ba73c3f5eed57f",
+        "rev": "a51aa6523bd8ee985bc70987909eff235900197a",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1629880049,
-        "narHash": "sha256-HOxVkROGlDA57D0Tg/0nus938o4HzmqacOiCoT1H5tE=",
+        "lastModified": 1630850248,
+        "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88226ea038e538e09c272a7c56ba73c3f5eed57f",
+        "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4",
         "type": "github"
       },
       "original": {
diff --git a/modules/overlays/vpngate/default.nix b/modules/overlays/vpngate/default.nix
index 320012b..3c73803 100644
--- a/modules/overlays/vpngate/default.nix
+++ b/modules/overlays/vpngate/default.nix
@@ -3,15 +3,15 @@
 buildGoModule rec {
 
   pname = "vpngate";
-  version = "v0.0.2";
+  version = "v0.1.0";
 
-  vendorSha256 = "1ys2rvrbxgsrvmjdxqgpmxf0m9nlp905gnr2mrf3c7iaxm86wgf8";
+  vendorSha256 = "sha256-HOGPzCMh7nVKfpzKkAyaSDeRyowj9VuizCA7CLFWp78=";
 
   src = fetchFromGitHub {
     owner = "davegallant";
     repo = "vpngate";
     rev = version;
-    sha256 = "0ky3wd04xd4sb2zskrrlbgys2gw88yqhngg3bl0sjy8kr6099vfn";
+    sha256 = "sha256-kToXqICQHWgXVLc3fN2bAxHAQWS3Dq3jdpi3CBXkP90=";
   };
 
   meta = with lib; {