config

commit d72fec58b46e778f01955f7cacd6039bfc99d06d (tree)
parent 5fa7c1230ee446e9576af6acf0b32f01da2eb076
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Thu, 23 Jan 2025 11:04:34 +0200

update base packages

Diffstat:
M
flake.lock
 | 
18
+++++++++---------
M
modules/base/default.nix
 | 
7
+++----

2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -189,11 +189,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1737359802,
-        "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=",
+        "lastModified": 1737590910,
+        "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6",
+        "rev": "9368027715d8dde4b84c79c374948b5306fdd2db",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737299813,
-        "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
+        "lastModified": 1737404927,
+        "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
+        "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1737522473,
-        "narHash": "sha256-WxGH8tw42muGji2Q7plhBjDeZ9lp6jANWL5uQhxvsYE=",
+        "lastModified": 1737622208,
+        "narHash": "sha256-pSVJnFreBAGSkIOqqcb9oLEPZR+c3r6KK+dm/PH63N8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "12b99d964292665ae893d208de483c810fdc938a",
+        "rev": "acf80ca65c9f1b91ef2410b0cdcf9e27f9c90fdd",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/default.nix b/modules/base/default.nix
@@ -160,6 +160,7 @@ in
             binutils
             dos2unix
             patchelf
+            p7zip-rar
             compsize # compression ratio on btrfs
             hyperfine
             stress-ng
@@ -180,7 +181,6 @@ in
             dig
             nmap
             # broken on aarch64-linux
-            #wrk2
             wget
             btop
             ngrep
@@ -202,17 +202,16 @@ in
 
             # compression/decompression
             xz
-            unrar
             pigz
             zstd
-            p7zip # TODO: p7zip-rar in 24.11+
+            unrar
             zopfli
             brotli
 
-            config.boot.kernelPackages.cpupower
             config.boot.kernelPackages.vm-tools # https://github.com/NixOS/nixpkgs/issues/355369
           ]
           (lib.mkIf (!cfg.skipPerf) [ config.boot.kernelPackages.perf ])
+          (lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [ wrk2 ])
         ];
     };