From d1bf20f03fc24e68bcf65391061401522b833bff Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 4 Aug 2025 23:43:52 -0700 Subject: [PATCH] update --- flake.lock | 71 +++++++++++++++++++++--------------------------------- flake.nix | 6 ----- 2 files changed, 27 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index d56cf5c..c90f5c3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1753316655, - "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753693791, - "narHash": "sha256-pZQyCkqIFwGA77np+vqVQZgg2P0qPAI6x6kC3w6+PjE=", + "lastModified": 1754297745, + "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "785a5701b22259b85735301b1aad19c2bee15498", + "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1754074052, - "narHash": "sha256-NW+f3iKMokI8bMgf+W+ChpXzL7GIUAtFWuGGCJ7CCp0=", + "lastModified": 1754348736, + "narHash": "sha256-rNJpXydIdOtVdbtN0A8XCgcR2+s8JP5IznEp34gy68s=", "owner": "ggml-org", "repo": "llama.cpp", - "rev": "9c35706b98ea271858acef4194f526a71b24cdc9", + "rev": "ec428b02c347767f24c78111309e3f30d2ada289", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1754015684, - "narHash": "sha256-5Aet3ANxlrWFUqT65+W2esoo9eWp14EGsTdUQFbzqt8=", + "lastModified": 1754360791, + "narHash": "sha256-Nn2f13jY3M3v79uGscM3qZW0bqCF1EmOk+8ruaH5Drg=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "880dac6903961763770d507ce363ae0cc1da9444", + "rev": "9b109c7db8379df8ae33317c10c29099de91b942", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -317,22 +317,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, - "nixpkgs-qbt": { - "locked": { - "lastModified": 1753162786, - "narHash": "sha256-ORkhaeeZ0GeCLabfgHplvXODINpOHrIJVoIVyaloqAc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "84d174e312870ccefb9ba0dd11532bb2a58773db", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "pull/287923/head", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -369,7 +353,6 @@ "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-qbt": "nixpkgs-qbt", "srvos": "srvos", "vpn-confinement": "vpn-confinement" } @@ -382,11 +365,11 @@ ] }, "locked": { - "lastModified": 1753584741, - "narHash": "sha256-i147iFSy4K4PJvID+zoszLbRi2o+YV8AyG4TUiDQ3+I=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69dfe029679e73b8d159011c9547f6148a85ca6b", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", "type": "github" }, "original": { @@ -402,11 +385,11 @@ ] }, "locked": { - "lastModified": 1753924140, - "narHash": "sha256-eZ+71f1rflReoA3EtIlUVV11ar2wQJ577jLHWHZWWdE=", + "lastModified": 1754273897, + "narHash": "sha256-l7epHqAcg8Qktu8vO2ZfjSH1wcai01XQOKQA9ADHIk4=", "owner": "nix-community", "repo": "srvos", - "rev": "f7c9ea726dcaeb7954091bf51c73611b9f2781c6", + "rev": "8e7d3c690975ee6790926bdfd1258016c967d163", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b56fb9e..8c258c3 100644 --- a/flake.nix +++ b/flake.nix @@ -18,8 +18,6 @@ vpn-confinement.url = "github:Maroka-chan/VPN-Confinement"; - nixpkgs-qbt.url = "github:NixOS/nixpkgs/pull/287923/head"; - home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -53,7 +51,6 @@ nix-minecraft, nixos-hardware, vpn-confinement, - nixpkgs-qbt, home-manager, lanzaboote, disko, @@ -185,9 +182,6 @@ vpn-confinement.nixosModules.default - # import the `services.qbittorrent` module - (nixpkgs-qbt + "/nixos/modules/services/torrent/qbittorrent.nix") - # get nix-minecraft working! nix-minecraft.nixosModules.minecraft-servers {