nixpkgs: remove merged patches

diff --git a/hosts/carotte/security.nix b/hosts/carotte/security.nix
index bbd39fdaa1a353acf403379ffab997d55ac193e1..8fd474953aad1e41c6d188f45439af41cf3b969c 100644 (file)
--- a/hosts/carotte/security.nix
+++ b/hosts/carotte/security.nix
@@ -3,7 +3,9 @@
 security.lockKernelModules = false;
 security.virtualisation.flushL1DataCache = lib.mkForce null;
 security.gnupg.agent = {
-  keyring."00B1DD47EA6B7BEF92FFEA66922C6249D6336C94" = {};
+  keyring."00B1DD47EA6B7BEF92FFEA66922C6249D6336C94" = {
+    passwordGpg = "gnupg/root.gpg";
+  };
 };
 services.openssh.extraConfig = ''
   # This is for removing remote gpg-agent's socket

diff --git a/hosts/losurdo/security.nix b/hosts/losurdo/security.nix
index 1befae92a33da329693d373d609e16bfd8b524e7..ec10f9ce9829b7ed5601e6f1f2babb3ce7c9df5c 100644 (file)
--- a/hosts/losurdo/security.nix
+++ b/hosts/losurdo/security.nix
@@ -2,7 +2,9 @@
 {
 security.lockKernelModules = false;
 security.gnupg.agent = {
-  keyring."9AA84E6F6D71F9163C46BF396B141A0806219077" = {};
+  keyring."9AA84E6F6D71F9163C46BF396B141A0806219077" = {
+    passwordGpg = "gnupg/root.gpg";
+  };
 };
 services.openssh.extraConfig = ''
   # This is for removing remote gpg-agent's socket

diff --git a/hosts/mermet/security.nix b/hosts/mermet/security.nix
index 37fcdcc03400599baa9123c47620a466c551e6bf..959204f86bd9f90323e56cd4c31933cd2969bbb1 100644 (file)
--- a/hosts/mermet/security.nix
+++ b/hosts/mermet/security.nix
@@ -1,7 +1,9 @@
 { inputs, pkgs, lib, config, ... }:
 {
 security.gnupg.agent = {
-  keyring."89F52A879E0019A966503AFFDE72EEA84CDFA3A7" = {};
+  keyring."89F52A879E0019A966503AFFDE72EEA84CDFA3A7" = {
+    passwordGpg = "gnupg/root.gpg";
+  };
 };
 services.openssh.extraConfig = ''
   # This is for removing remote gpg-agent's socket

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 9d4613dfb118c7ae0ff0955788b17106d658edaf..3a707ead8ed7955cc13c4a3ab0cb2ba0ee3b7a63 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -9,12 +9,7 @@
 {
   meta.description = "nixos/security.gnupg: provisioning GnuPG-protected secrets through the Nix store";
   url = "https://github.com/NixOS/nixpkgs/pull/93659.diff";
-  sha256 = "sha256-rMAaoFSC97ANp6upZl7WLCDHGXSwU0yTiKBphfZcpkA=";
-}
-{
-  meta.description = "transmission: use freeformType on settings";
-  url = "https://github.com/NixOS/nixpkgs/pull/96655.diff";
-  sha256 = "sha256-gkZO+mcPj4VoxKD4EwgYw7eEAuHtUwt2Fs2AaypIj6g=";
+  sha256 = "sha256-4Yt6c+3hJyLr71aiAw/gfp2rZNAk9vU2CVG0WJN8gbA=";
 }
 {
   meta.description = "Update public-inbox to 1.6.1 and add systemd services";
@@ -31,21 +26,6 @@
   url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
   sha256 = "sha256-1iJ46NXslDxsP/uO0cSaCzO3A5VF338M6d027G7sK3o=";
 }
-{
-  meta.description = "xorg.xinit: fix cross-compiling";
-  url = "https://github.com/NixOS/nixpkgs/pull/141903.diff";
-  sha256 = "sha256-1Bv7UwoYkWSNQ6MlSnm9ZmUV4wZQwEL6zM3JDoAauoo=";
-}
-{
-  meta.description = "nmon: fix cross-compiling";
-  url = "https://github.com/NixOS/nixpkgs/pull/142242.diff";
-  sha256 = "sha256-5Rsuhzup2a4v7OrQRGOeyO2LMQfBCWS7ei5ZD57p0Wk=";
-}
-{
-  meta.description = "nethogs: fix cross-compiling";
-  url = "https://github.com/NixOS/nixpkgs/pull/142268.diff";
-  sha256 = "sha256-jJ+wpGoFhvoGI7eyVz+7jZbnjqC6WYeL2M/0RSdG1s4=";
-}
 {
   meta.description = "nixos/console: fix cross-compiling";
   url = "https://github.com/NixOS/nixpkgs/pull/142272.diff";
@@ -54,11 +34,6 @@
 {
   meta.description = "nixos/display-managers: fix cross-compiling";
   url = "https://github.com/NixOS/nixpkgs/pull/142273.diff";
-  sha256 = "sha256-M8PyGa7cweRkUFauVf4t5Jf2IHynesV5MnDXXzjCvKY=";
-}
-{
-  meta.description = "uboot: add Cubieboard2 target";
-  url = "https://github.com/NixOS/nixpkgs/pull/142274.diff";
-  sha256 = "sha256-vB9aComj3ldlkPTX84xKdUrhY64l7ZRnJJAIxdqNrRs=";
+  sha256 = "sha256-ZCDQ7SpGhH8JvAwWzdcyrc68RFEWHxxAj0M2+AvEzIg=";
 }
 ]

diff --git a/shell/gnupg.nix b/shell/gnupg.nix
index d4f774ce80bce53001a2b1b3937ac5600f235515..7f1b15b4785c2642a506c9a465ea5fa0ef289059 100644 (file)
--- a/shell/gnupg.nix
+++ b/shell/gnupg.nix
@@ -34,7 +34,7 @@ gnupg.keys = {
   algo = "rsa4096";
   expire = "0";
   usage = ["cert" "sign"];
-  passPath = "hosts/${host}/root/key.pass";
+  passPath = "hosts/${host}/gnupg/root";
   subKeys = [
     { algo = "rsa4096"; expire = "0"; usage = ["encrypt"]; }
   ];