From 18ad20a8c5f92031514d35b33e315e66bc0bbfc7 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sun, 14 May 2023 18:11:57 +0100 Subject: [PATCH] Update inputs --- flake.lock | 197 ++++++++++++++++++++------------- flake.nix | 2 +- nixos/boxes/castle/default.nix | 2 +- 3 files changed, 124 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 15e44a4..15af72f 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1680281360, - "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", + "lastModified": 1682101079, + "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "owner": "ryantm", "repo": "agenix", - "rev": "e64961977f60388dd0b49572bb0fc453b871f896", + "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "type": "github" }, "original": { @@ -67,6 +67,36 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ], + "rust-overlay": [ + "ragenix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1681680516, + "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -99,11 +129,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", + "lastModified": 1683779844, + "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", "owner": "serokell", "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", + "rev": "c80189917086e43d49eece2bd86f56813500a0eb", "type": "github" }, "original": { @@ -152,17 +182,17 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs-unstable" - ] + ], + "systems": "systems_3" }, "locked": { - "lastModified": 1671489820, - "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", + "lastModified": 1683635384, + "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=", "owner": "numtide", "repo": "devshell", - "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", + "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369", "type": "github" }, "original": { @@ -187,6 +217,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1642700792, @@ -269,39 +315,6 @@ } }, "flake-utils_6": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { "inputs": { "systems": "systems_4" }, @@ -319,7 +332,25 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_7": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -362,11 +393,11 @@ ] }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1684061181, + "narHash": "sha256-EJpZ+Drpt3aHpowddpsQFBWsqLSJHyP6dnremTVMdWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "e4272987f785a8848205263abb4911b922c21e1b", "type": "github" }, "original": { @@ -376,11 +407,11 @@ }, "impermanence": { "locked": { - "lastModified": 1675359654, - "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", + "lastModified": 1682268411, + "narHash": "sha256-ICDKQ7tournRVtfM8C2II0qHiOZOH1b3dXVOCsgr11o=", "owner": "nix-community", "repo": "impermanence", - "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", + "rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d", "type": "github" }, "original": { @@ -407,11 +438,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1681568636, - "narHash": "sha256-Gxf6HjXf/aToxwjS1ru0o1sJEZDo4Gr6CLLrXABq+Kc=", + "lastModified": 1684080076, + "narHash": "sha256-enkKv85FBPWpj4X22WAKzl2WQY8rSTLoFv5pIoIYXxM=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "a2c7caa17443d269a73573e57569e6a7a38369b5", + "rev": "7225c47dc6d3b7a043c9589141367eab8c703ed1", "type": "github" }, "original": { @@ -423,11 +454,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1681568655, - "narHash": "sha256-f3QEajUrDH41QTJY3vWDJpncecBfxSJSIVuxHoIYJHE=", + "lastModified": 1684080105, + "narHash": "sha256-II3wzUAQ9vRJneIhXJDpbZV4istQdB8WdNJta5ayIvI=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "19c7ccd3bf704e2db72a41ac0151487a4d117436", + "rev": "2af45041838409d143fa6a2cb9f8bc094790e1fe", "type": "github" }, "original": { @@ -439,11 +470,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1681349002, - "narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=", + "lastModified": 1683928319, + "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c", + "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", "type": "github" }, "original": { @@ -454,11 +485,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -520,18 +551,19 @@ "ragenix": { "inputs": { "agenix": "agenix", - "flake-utils": "flake-utils_8", + "crane": "crane", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs-unstable" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1681577442, - "narHash": "sha256-MhF/Kld7CKDSp7AjQCjFaT07VffRwW6z5Tai7wafXB0=", + "lastModified": 1682237245, + "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", "owner": "yaxitech", "repo": "ragenix", - "rev": "f7b2ef3a0bedf86e85b023029ea1b69ebd220092", + "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", "type": "github" }, "original": { @@ -546,7 +578,7 @@ "borgthin": "borgthin", "deploy-rs": "deploy-rs", "devshell": "devshell_3", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "impermanence": "impermanence", @@ -570,11 +602,11 @@ ] }, "locked": { - "lastModified": 1681525152, - "narHash": "sha256-KzI+ILcmU03iFWtB+ysPqtNmp8TP8v1BBReTuPP8MJY=", + "lastModified": 1682129965, + "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b6f8d87208336d7cb85003b2e439fc707c38f92a", + "rev": "2c417c0460b788328220120c698630947547ee83", "type": "github" }, "original": { @@ -585,17 +617,17 @@ }, "sharry": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1681539934, - "narHash": "sha256-j5lpunzfHr4Un+c6pRn/QPeuJ2eG2InYIk7Z4BJGlek=", + "lastModified": 1683958759, + "narHash": "sha256-JC1853IwTUNrJ6zsZ1CeOy5nJnGSJjzofJAdUd3OvCA=", "owner": "eikek", "repo": "sharry", - "rev": "a80b26fa138ed4914b027ab5d043eb00d356184e", + "rev": "73782a61d2a61b24fa107aed66926d56705005e9", "type": "github" }, "original": { @@ -664,6 +696,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 4980322..b9fc6a8 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ overlays = [ pkgsLibOverlay myPkgsOverlay - inputs.devshell.overlay + inputs.devshell.overlays.default inputs.ragenix.overlays.default inputs.deploy-rs.overlay (flakePackageOverlay inputs.home-manager-unstable system) diff --git a/nixos/boxes/castle/default.nix b/nixos/boxes/castle/default.nix index d2ac6a6..b292620 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_2; + kernelPackages = pkgs.linuxKernel.packages.linux_6_3; kernelModules = [ "kvm-amd" ]; kernelParams = [ "amd_iommu=on" "amd_pstate=passive" ]; kernelPatches = [