nix: update inputs

diff --git a/flake.lock b/flake.lock
index 9a499542c06918d019f30d0b4b0cc7e411832925..025557b3992dde8284f91f77ac6ac53a1ce7de75 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -168,11 +168,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648283590,
-        "narHash": "sha256-OjoAiY2XWr2ah73rY+kvEYLF+q40S/X61tUC0JPuCKw=",
+        "lastModified": 1650190514,
+        "narHash": "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8afee75d0d1cb054cfeddfdc9f7193adc7741c95",
+        "rev": "620ed197f3624dafa5f42e61d5c043f39b8df366",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648339732,
-        "narHash": "sha256-RFPWIdtuMhWNiZ91bci/8AkD2me7uB851XEwQN0ONoY=",
+        "lastModified": 1650231401,
+        "narHash": "sha256-I69JoSaTxQqDn78andUGwObM0xuQoA0NzXIwukdum3Q=",
         "ref": "main",
-        "rev": "fc82f153463773e0c2558ca9984fafd30fac12f6",
-        "revCount": 425,
+        "rev": "5916c378e9bef85adccc08a803dab072a8bb69ea",
+        "revCount": 437,
         "type": "git",
         "url": "file:///home/julm/work/sourcephile/nix/julm-nix"
       },
@@ -273,17 +273,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1646497237,
-        "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
+        "lastModified": 1650076401,
+        "narHash": "sha256-QGxadqKWICchuuLIF2QwmHPVaUk+qO33ml5p1wW4IyA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
+        "rev": "75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
+        "rev": "75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb",
         "type": "github"
       }
     },

diff --git a/flake.nix b/flake.nix
index b45df288d2182f615df6b74f99e21e7aeb1921e8..79b3a7867ab4b1e59a17a2aff82326ef9fb9001d 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
 # Pin down nixpkgs from github, instead of using global, system or user registries.
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/75ad56bdc927f3a9f9e05e3c3614c4c1fcd99fcb";
 #inputs.nixpkgs.url = "flake:nixpkgs";
 inputs.flake-utils.url = "github:numtide/flake-utils";
 inputs.home-manager.follows = "julm-nix/home-manager";

diff --git a/nixos/profiles/services/nginx.nix b/nixos/profiles/services/nginx.nix
index 9d125ac90e14729a432b86128297ea94d923aa3c..bb7b1f233478f554801d135e2ddc3d710c82971c 100644 (file)
--- a/nixos/profiles/services/nginx.nix
+++ b/nixos/profiles/services/nginx.nix
@@ -36,8 +36,8 @@ systemd.services.nginx = {
 };
 services.logrotate = {
   enable = true;
-  paths.nginx = {
-    path = [
+  settings.nginx = {
+    files = [
       "/var/log/nginx/*.log"
       "/var/log/nginx/*/*.log"
       "/var/log/nginx/*/*/*.log"
@@ -50,13 +50,11 @@ services.logrotate = {
       "/var/log/nginx/*/*/*/*/*.json"
     ];
     frequency = "weekly";
-    keep = 26;
-    extraConfig = ''
-      compress
-      delaycompress
-      postrotate
-        [ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`
-      endscript
+    rotate = 26;
+    compress = true;
+    delaycompress = true;
+    postrotate = ''
+      [ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`
     '';
   };
 };