From 5717aaef7d5291d29d6e25a6fdbe09270d71eda1 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 15 Jul 2024 21:49:27 +0200 Subject: [PATCH] chore: flake update --- config/nix.nix | 1 - flake.lock | 82 +++++++++++++++++++----------------------------- flake.nix | 2 -- pkgs/default.nix | 20 ++++-------- 4 files changed, 39 insertions(+), 66 deletions(-) diff --git a/config/nix.nix b/config/nix.nix index 580fdc0..7b4bae4 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -41,7 +41,6 @@ registry = rec { nixpkgs.flake = inputs.nixpkgs; p = nixpkgs; - templates.flake = inputs.templates; }; }; diff --git a/flake.lock b/flake.lock index 0c5a558..81ce3e3 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1720397980, - "narHash": "sha256-vI92Y+f4iTDsoy+xg0n0I/bIY1xatvZ807spIgTjTc0=", + "lastModified": 1721071152, + "narHash": "sha256-GoshD2O4dDNuGPPK4AiVCkM38j9/8OImYudY0zjFDcc=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "c071067f7d972552f5170cf8665643ed0ec19a6d", + "rev": "d63898728266e3a30f5367a0efbbfaedf9cf8041", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721007199, + "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "bad376945de7033c7adc424c02054ea3736cf7c4", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -868,11 +868,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -1079,11 +1079,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -1150,11 +1150,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -1170,11 +1170,11 @@ ] }, "locked": { - "lastModified": 1720334033, - "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", + "lastModified": 1720926593, + "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", + "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "type": "github" }, "original": { @@ -1304,11 +1304,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -1496,11 +1496,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720864742, - "narHash": "sha256-NVkF91eZPav7zbcMR+7mUzOdMKgIEBJSwtFU2rv1OpY=", + "lastModified": 1721042250, + "narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", "owner": "nix-community", "repo": "nixvim", - "rev": "195978e6272702ea5d6e9b837d083c411dc5d688", + "rev": "b9ed90003273f0a75151b32948e16b44891f403c", "type": "github" }, "original": { @@ -1631,11 +1631,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1720524665, - "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1690,7 +1690,6 @@ "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_5", "stylix": "stylix", - "templates": "templates", "whisper-overlay": "whisper-overlay", "wired-notify": "wired-notify" } @@ -1999,21 +1998,6 @@ "type": "github" } }, - "templates": { - "locked": { - "lastModified": 1719960957, - "narHash": "sha256-j9H2j4h2vdi+FHTmzkOYRirbpr0R8HCxVhJugqzpcGI=", - "owner": "NixOS", - "repo": "templates", - "rev": "be93f0377ff6e9a5538eb98508adf0bb57a73e66", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "templates", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2022,11 +2006,11 @@ ] }, "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9cbe736..fda2ef6 100644 --- a/flake.nix +++ b/flake.nix @@ -86,8 +86,6 @@ inputs.home-manager.follows = "home-manager"; }; - templates.url = "github:NixOS/templates"; - whisper-overlay = { url = "github:oddlama/whisper-overlay"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 7cca448..d583bd5 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -35,20 +35,12 @@ inputs: [ }); gpu-screen-recorder = prev.callPackage "${inputs.nixpkgs-gpu-screen-recorder}/pkgs/applications/video/gpu-screen-recorder/default.nix" {}; gpu-screen-recorder-gtk = prev.callPackage "${inputs.nixpkgs-gpu-screen-recorder}/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix" {}; - open-webui = prev.open-webui.override {python3 = prev.python311;}; - pythonPackagesExtensions = - prev.pythonPackagesExtensions - ++ [ - (_pythonFinal: pythonPrev: { - chromadb = pythonPrev.chromadb.overrideAttrs (old: { - pythonRelaxDeps = - old.pythonRelaxDeps - ++ [ - "chroma-hnswlib" - ]; - }); - }) - ]; + #pythonPackagesExtensions = + # prev.pythonPackagesExtensions + # ++ [ + # (_pythonFinal: pythonPrev: { + # }) + # ]; formats = prev.formats