nix: update inputs

diff --git a/flake.lock b/flake.lock
index 9c4a209843a866f6fed3f7093d46b75bb3c9d619..3e1cd32b1089379bed680160fe4e71eac4ba4b52 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -65,6 +65,22 @@
         "type": "github"
       }
     },
+    "emacs-overlay_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1638613975,
+        "narHash": "sha256-8eoHiDhmBfTUtrv44tgMPeT1Y3WVDqOOPL8H7PWosGE=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "72196870e68eaedbf43658967ac943ca73337d4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "emacs-so-long": {
       "flake": false,
       "locked": {
@@ -160,12 +176,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
-          "julm-nix",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1638150501,
@@ -195,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1638163001,
-        "narHash": "sha256-k0cNjDxR69WS43F4NcyqaVNx84lpWu9Qu7AnoUHk830=",
+        "lastModified": 1638621956,
+        "narHash": "sha256-gHsWSfl8ox6YZ6clOWmt6zQPVH7Sl6L+JKLX+UU/T/I=",
         "ref": "main",
-        "rev": "f6b6b843e10c02fda974514e9903019a02eecde0",
-        "revCount": 341,
+        "rev": "24f2facf44e1977f6fbcf481fed3c0527f477f28",
+        "revCount": 358,
         "type": "git",
         "url": "file:///home/julm/work/sourcephile/nix/julm-nix"
       },
@@ -213,24 +241,15 @@
       "inputs": {
         "doom-emacs": "doom-emacs_2",
         "doom-snippets": "doom-snippets",
-        "emacs-overlay": [
-          "julm-nix",
-          "emacs-overlay"
-        ],
+        "emacs-overlay": "emacs-overlay_2",
         "emacs-so-long": "emacs-so-long",
         "evil-markdown": "evil-markdown",
         "evil-org-mode": "evil-org-mode",
         "evil-quick-diff": "evil-quick-diff",
         "explain-pause-mode": "explain-pause-mode",
-        "flake-utils": [
-          "julm-nix",
-          "flake-utils"
-        ],
+        "flake-utils": "flake-utils_2",
         "nix-straight": "nix-straight",
-        "nixpkgs": [
-          "julm-nix",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "nose": "nose",
         "ob-racket": "ob-racket",
         "org": "org",
@@ -273,17 +292,46 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638110343,
-        "narHash": "sha256-hQaow8sGPyUrXgrqgDRsfA+73uR0vms2goTQNxIAaRQ=",
+        "lastModified": 1638376152,
+        "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1638432899,
+        "narHash": "sha256-iZ+rgyRx3JVyylXYxSyW01liDWEn+O8cKnin6cMzOFU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "56cbe42f1668338d05febfbb866e32f2c865609a",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixpkgs-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1638376152,
+        "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "942eb9a335b4cd22fa6a7be31c494e53e76f5637",
+        "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "942eb9a335b4cd22fa6a7be31c494e53e76f5637",
+        "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
         "type": "github"
       }
     },
@@ -431,7 +479,7 @@
           "julm-nix",
           "nix-doom-emacs"
         ],
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "pass": "pass",
         "secrets": "secrets",
         "shell": "shell"
@@ -456,7 +504,7 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-KS6PmDLNYlcYJCGloveL6k59T7bImml9gFoDw5RWjow=",
+        "narHash": "sha256-7wGz31hevJWOOV7EhZhbKfsv+xOBNpzcZxLDiCmbhxU=",
         "path": "/home/julm/work/sourcephile/nix/sec",
         "type": "path"
       },

diff --git a/flake.nix b/flake.nix
index 76038110792c3f420b36b9c01eb6da9f181a511f..b51636e7678bd1733b6df07cf118cf66aa5757ed 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/942eb9a335b4cd22fa6a7be31c494e53e76f5637";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f";
 #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 f0f729ce953f79c68395a0c3ef874548c7829d24..ba539fe31d4c9da05565e0b730b711346d47ce31 100644 (file)
--- a/nixos/profiles/services/nginx.nix
+++ b/nixos/profiles/services/nginx.nix
@@ -165,7 +165,6 @@ services.nginx = {
         tcp_nodelay on;
         keepalive_timeout 20;
         reset_timedout_connection on;
-        types_hash_max_size 4096;
         server_names_hash_bucket_size 128;
       '';
       map = ''

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 8db3dde86c752b065507ca8c6847440011584a54..be24077cc88752986494533a21f3f374f1f83c70 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -12,9 +12,9 @@
   sha256 = "sha256-rHf6TRd2O6SBdk7B4FGUm3upFJavrRSxko0iQti+xzs=";
 }
 {
-  meta.description = "Update public-inbox to 1.6.1 and add systemd services";
+  meta.description = "Update public-inbox to 1.7.0 and add systemd services";
   url = "https://github.com/NixOS/nixpkgs/pull/104457.diff";
-  sha256 = "sha256-zwdvMxlUTCP9Ubz220zJnkD2D/EdE3iJ7vFMkjo1keI=";
+  sha256 = "sha256-NO3E2/4SiHxEr7gYpF7Es9XvnAI1E6OL+BveugctIVs=";
 }
 {
   meta.description = "nixos/openvpn: add network namespace support";
@@ -32,8 +32,8 @@
   sha256 = "sha256-g7wkSE7Sal8hOz+EqlecnuazzvoPa6/qxCsvC3JsRvg=";
 }
 {
-  meta.description = "stig: fix build";
-  url = "https://github.com/NixOS/nixpkgs/pull/147806.diff";
-  sha256 = "sha256-XtNA3e/85vKWsOBt+5PfWEM3TdsIz/+mPbthMixSyuY=";
+  meta.description = "zpool-iostat-viz";
+  url = "https://github.com/NixOS/nixpkgs/pull/148565.diff";
+  sha256 = "sha256-h8vddGQ0Vx1V1uee4DNmu7Qq1qYoqQ06GxmMurwL/mI=";
 }
 ]