From afaa6343abd8e034c5a2252c0e354a74a93eb49e Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 12 Nov 2022 11:14:52 +0000 Subject: [PATCH] update nixpkgs: 2022-11-05 -> 2022-11-09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'home-manager': 'github:nix-community/home-manager/87d55517f6f36aa1afbd7a4a064869d5a1d405b8' (2022-11-05) → 'github:nix-community/home-manager/6639e3a837fc5deb6f99554072789724997bc8e5' (2022-11-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3bacde6273b09a21a8ccfba15586fb165078fb62' (2022-11-05) → 'github:NixOS/nixpkgs/872fceeed60ae6b7766cc0a4cd5bf5901b9098ec' (2022-11-09) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/f09ad462c5a121d0239fde645aacb2221553a217' (2022-11-05) → 'github:NixOS/nixpkgs/fa842715565307b7e05cdb187b08c05f16ed08f1' (2022-11-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/486b4455da16272c1ed31bc82adcdbe7af829465' (2022-11-02) → 'github:Mic92/sops-nix/4407353739ad74a3d9744cf2988ab10f3b83e288' (2022-11-06) ``` --- flake.lock | 24 ++++++++++++------------ machines/servo/default.nix | 2 +- nixpatches/list.nix | 31 ------------------------------- 3 files changed, 13 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 5d46958c..372b79ef 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1667677389, - "narHash": "sha256-y9Zdq8vtsn0T5TO1iTvWA7JndYIAGjzCjbYVi/hOSmA=", + "lastModified": 1667907331, + "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "owner": "nix-community", "repo": "home-manager", - "rev": "87d55517f6f36aa1afbd7a4a064869d5a1d405b8", + "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667629849, - "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", + "lastModified": 1667991831, + "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", + "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1667653703, - "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", + "lastModified": 1668016843, + "narHash": "sha256-ioBuF+IAhmJO7s4ewEij1LkMxJvCCNCKXxMto/DU02I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09ad462c5a121d0239fde645aacb2221553a217", + "rev": "fa842715565307b7e05cdb187b08c05f16ed08f1", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1667427533, - "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=", + "lastModified": 1667767301, + "narHash": "sha256-+UDtEkw6pZ+sqkC0Um5ocJ9kjvuu0qffSCbl+jAA8K8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "486b4455da16272c1ed31bc82adcdbe7af829465", + "rev": "4407353739ad74a3d9744cf2988ab10f3b83e288", "type": "github" }, "original": { diff --git a/machines/servo/default.nix b/machines/servo/default.nix index 54902a26..5dc7e5dd 100644 --- a/machines/servo/default.nix +++ b/machines/servo/default.nix @@ -32,7 +32,7 @@ # both transmission and ipfs try to set different net defaults. # we just use the most aggressive of the two here: boot.kernel.sysctl = { - "net.core.rmem_max" = "4194304"; # 4MB + "net.core.rmem_max" = 4194304; # 4MB }; # This value determines the NixOS release from which the default diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 2484640a..163c093d 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -1,14 +1,4 @@ fetchpatch: [ - # linuxKernel.kernels.linux_rpi4: 5.15.32 -> 5.15.74 - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/199908.diff"; - sha256 = "sha256-XlyRTYwrxYa0S0qQ4R816wjPbNII2CmFQtrd3yzep9Y="; - }) - # element-web: add wrapper (faster rebuilds) - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/196885.diff"; - sha256 = "sha256-uLnRYtm2Hhyaky84hrH+7233xV3+JM5jKBbPKF4QtoQ="; - }) # phosh-mobile-settings: init at 0.21.1 (fetchpatch { url = "https://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff"; @@ -23,27 +13,6 @@ fetchpatch: [ sha256 = "sha256-FOAZYaMpSPMYwU26xYD+V/f+df0JjlbuVtqjlcBFW5Q="; }) - # lightdm-mobile-greeter: init at 2022-10-30 - (fetchpatch { - # url = "https://git.uninsane.org/colin/nixpkgs/commit/0a9018c8879d8fe871ee03bc386f8d148e4f88b8.diff"; - url = "https://github.com/NixOS/nixpkgs/pull/199154.diff"; - sha256 = "sha256-+U0AlipPzKx0NcxWu0smLsoPCRqp8KVCsSdUD4R+O64="; - }) - - # # lightdm-mobile-greeter: init at 2022-10-30 - # (fetchpatch { - # url = "https://git.uninsane.org/colin/nixpkgs/commit/0a9018c8879d8fe871ee> - # sha256 = "sha256-h1+K8UO4+G6yvl6JFd8xBGitPgOCIY7BunW49eGkXQQ="; - # }) - # # lightdm: add `greeters.mobile` config option - # (fetchpatch { - # url = "https://git.uninsane.org/colin/nixpkgs/commit/1144d6cfe976e7bcfb96> - # sha256 = "sha256-ZEvLPqrkpr79yXrsBxgxELR2Awtqk3675jkYZqx2AfY="; - # # url = "https://git.uninsane.org/colin/nixpkgs/commit/0a9018c8879d8fe871> - # url = "https://github.com/NixOS/nixpkgs/pull/199154.diff"; - # sha256 = "sha256-zvWwQ+JUt0k4HickBSULIP0n4BG0NuYuD7gHSn859/U="; - # }) - # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized