From 08bdc5def814ffc8f9b9eaa7a76613602558f576 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Tue, 31 Oct 2023 14:30:11 +0000 Subject: [PATCH] Update inputs --- flake.lock | 60 +++++++++++++++++----------------- nixos/boxes/castle/default.nix | 9 ++--- nixos/boxes/tower/default.nix | 2 +- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 3757c42..4d81f56 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1686747123, - "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", + "lastModified": 1695052866, + "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", "owner": "serokell", "repo": "deploy-rs", - "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", + "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1692793255, - "narHash": "sha256-yVyj0AE280JkccDHuG1XO9oGxN6bW8ksr/xttXcXzK0=", + "lastModified": 1698410321, + "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", "owner": "numtide", "repo": "devshell", - "rev": "2aa26972b951bc05c3632d4e5ae683cb6771a7c6", + "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "07682fff75d41f18327a871088d20af2710d4744", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1693125758, - "narHash": "sha256-7u591OQ1nzQ/IRMDBix8Ox1q+u3OyPQHs2HDZnR89qk=", + "lastModified": 1698670511, + "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8c5fd75092448ac134d7fb823556b37d3c821f5", + "rev": "8e5416b478e465985eec274bc3a018024435c106", "type": "github" }, "original": { @@ -421,11 +421,11 @@ }, "impermanence": { "locked": { - "lastModified": 1690797372, - "narHash": "sha256-GImz19e33SeVcIvBB7NnhbJSbTpFFmNtWLh7Z85Y188=", + "lastModified": 1697303681, + "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "owner": "nix-community", "repo": "impermanence", - "rev": "e3a7acd113903269a1b5c8b527e84ce7ee859851", + "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1693148900, - "narHash": "sha256-rk+VheIaneH2XpLgYQ1QvC+w4rTiKxGaq/3onUq/OBk=", + "lastModified": 1698758299, + "narHash": "sha256-J5Ljnna3fmtSRXvYOo0fm+65+lsP6FO1DXNp+fnSFA8=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "34753e65f6c7887a1ea6bad9700b84993b336c41", + "rev": "aebb3f35c0cb5270052dd4a1ac511cca5607a65e", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1693148935, - "narHash": "sha256-EzIaEnhDZBSSO6LCRhRriq5tZLyayseuTxWaLndtFHU=", + "lastModified": 1698758314, + "narHash": "sha256-n5lkK0deuU/yHN6c+d1IeGFWW0DIOXDe2ZQK0OdMyY4=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "e1d2b37448af90de8215c270230967fa29446cae", + "rev": "2e412711696ca846a039eafcc7a23e80d85de1e3", "type": "github" }, "original": { @@ -505,11 +505,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1693087214, - "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", + "lastModified": 1698562188, + "narHash": "sha256-9nkxGnA/T+jLhHAMFRW157Qi/zfbf5dF1q7HfKROl3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", + "rev": "3e10c80821dedb93592682379f476745f370a58e", "type": "github" }, "original": { @@ -520,11 +520,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1693003285, - "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { diff --git a/nixos/boxes/castle/default.nix b/nixos/boxes/castle/default.nix index da87c31..1ce3522 100644 --- a/nixos/boxes/castle/default.nix +++ b/nixos/boxes/castle/default.nix @@ -25,7 +25,7 @@ efi.canTouchEfiVariables = false; timeout = 10; }; - kernelPackages = pkgs.linuxKernel.packages.linux_6_4; + kernelPackages = pkgs.linuxKernel.packages.linux_6_5; kernelModules = [ "kvm-amd" ]; kernelParams = [ "amd_iommu=on" "amd_pstate=passive" ]; kernelPatches = [ @@ -149,9 +149,10 @@ packages = with pkgs; [ jacktrip qpwgraph - (writeShellScriptBin "boardie" '' - exec pw-jack ${pkgs.boardie}/bin/boardie "$@" - '') + # TODO: seems to be borked (infinite recursion???) + # (writeShellScriptBin "boardie" '' + # exec pw-jack ${boardie}/bin/boardie "$@" + # '') ]; }; diff --git a/nixos/boxes/tower/default.nix b/nixos/boxes/tower/default.nix index 447cc12..7ed6d02 100644 --- a/nixos/boxes/tower/default.nix +++ b/nixos/boxes/tower/default.nix @@ -25,7 +25,7 @@ efi.canTouchEfiVariables = true; timeout = 10; }; - kernelPackages = pkgs.linuxKernel.packages.linux_6_4; + kernelPackages = pkgs.linuxKernel.packages.linux_6_5; kernelModules = [ "kvm-intel" ]; kernelParams = [ "intel_iommu=on" ]; initrd = {