From fac6d4f8880eac7b079a8fdfab86dc81eb485494 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Nov 2023 23:31:06 -0700 Subject: [PATCH] Revert "[NixOS] Try to fix build" This reverts commit b2d8893158cad31e4b881b37673d60e17750c910. --- nixos/base.nix | 1 - nixos/flake.lock | 247 +++++++++++++++++++++++++----------------- nixos/nixified.ai.nix | 1 + 3 files changed, 148 insertions(+), 101 deletions(-) diff --git a/nixos/base.nix b/nixos/base.nix index cb4daa0f..b954951f 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -5,7 +5,6 @@ makeEnable config "modules.base" true { "electron-12.2.3" "etcher" "electron-19.1.9" - "electron-24.8.6" ]; # Disabling these waits disables the stuck on boot up issue diff --git a/nixos/flake.lock b/nixos/flake.lock index d956f8c4..db5bec71 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1696775529, + "lastModified": 1695384796, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1677714448, + "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1673362319, + "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1666885127, + "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a", "type": "github" }, "original": { @@ -188,6 +188,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems" }, @@ -205,7 +220,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_2" }, @@ -223,7 +238,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_4" }, @@ -396,22 +411,6 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, "haskell-hie-bios": { "flake": false, "locked": { @@ -481,7 +480,7 @@ "haskell-language-server": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "fourmolu-011": "fourmolu-011", "fourmolu-012": "fourmolu-012", "gitignore": "gitignore", @@ -516,7 +515,7 @@ "haskell-language-server_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "fourmolu-011": "fourmolu-011_2", "fourmolu-012": "fourmolu-012_2", "gitignore": "gitignore_2", @@ -551,15 +550,16 @@ "hercules-ci-agent": { "inputs": { "flake-parts": "flake-parts_3", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_3" + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1686721748, - "narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=", + "lastModified": 1673183923, + "narHash": "sha256-vb+AEQJAW4Xn4oHsfsx8H12XQU0aK8VYLtWYJm/ol28=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "7192b83935ab292a8e894db590dfd44f976e183b", + "rev": "b3f8aa8e4a8b22dbbe92cc5a89e6881090b933b3", "type": "github" }, "original": { @@ -577,11 +577,11 @@ ] }, "locked": { - "lastModified": 1686830987, - "narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=", + "lastModified": 1676558019, + "narHash": "sha256-obUHCMMWbffb3k0b9YIChsJ2Z281BcDYnTPTbJRP6vs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6", + "rev": "fdbc15b55db8d037504934d3af52f788e0593380", "type": "github" }, "original": { @@ -700,11 +700,11 @@ ] }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -730,7 +730,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-rua03PcdrDhQoRjqAVHqUHfTUazlK0L1Pw8iIMM+YDA=", + "narHash": "sha256-ull5epb7JsgkrUEfC+p9j0dPjJKix8Kbn3/J7NSFfY8=", "path": "../dotfiles/config/taffybar", "type": "path" }, @@ -742,20 +742,37 @@ "invokeai-src": { "flake": false, "locked": { - "lastModified": 1697424725, - "narHash": "sha256-y3nxZ4PQ/d2wMX1crpJPDMYXf48YBG0sRIBOTgN6XlI=", + "lastModified": 1677475057, + "narHash": "sha256-REtyVcyRgspn1yYvB4vIHdOrPRZRNSSraepHik9MfgE=", "owner": "invoke-ai", "repo": "InvokeAI", - "rev": "ad786130ffb11f91cbfcc40846114dd1fdcecdf6", + "rev": "650f4bb58ceca458bff1410f35cd6d6caad399c6", "type": "github" }, "original": { "owner": "invoke-ai", - "ref": "v3.3.0post3", + "ref": "v2.3.1.post2", "repo": "InvokeAI", "type": "github" } }, + "koboldai-src": { + "flake": false, + "locked": { + "lastModified": 1668957963, + "narHash": "sha256-fKQ/6LiMmrfSWczC5kcf6M9cpuF9dDYl2gJ4+6ZLSdY=", + "owner": "koboldai", + "repo": "koboldai-client", + "rev": "f2077b8e58db6bd47a62bf9ed2649bb0711f9678", + "type": "github" + }, + "original": { + "owner": "koboldai", + "ref": "1.19.2", + "repo": "koboldai-client", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -866,20 +883,43 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixified-ai", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667419884, + "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixified-ai": { "inputs": { "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "invokeai-src": "invokeai-src", - "nixpkgs": "nixpkgs_4", - "textgen-src": "textgen-src" + "koboldai-src": "koboldai-src", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1698023400, - "narHash": "sha256-2wrm9Y9gsI/OaZEsTqc2wflkfxlrvCRocJHpqkOm/Cc=", + "lastModified": 1685671845, + "narHash": "sha256-qVA3wIxPb9PIFqa9Wf2a9jRMeMhE4kWw2y3oPSuRHU4=", "owner": "nixified-ai", "repo": "flake", - "rev": "7b9730e0a75bcd6375b0780aef75e406ea20a9a4", + "rev": "0c58f8cba3fb42c54f2a7bf9bd45ee4cbc9f2477", "type": "github" }, "original": { @@ -890,11 +930,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699044561, - "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=", + "lastModified": 1696161939, + "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c", + "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", "type": "github" }, "original": { @@ -906,15 +946,15 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1698222534, - "narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=", + "lastModified": 1696053802, + "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9", + "rev": "cadde47d123d1a534c272b04a7582f1d11474c48", "type": "github" }, "original": { @@ -942,11 +982,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "type": "github" }, "original": { @@ -975,11 +1015,11 @@ }, "nixpkgs-regression_2": { "locked": { - "lastModified": 1699132280, - "narHash": "sha256-VKICPnEe65RMvfLBd70mXGJIgGpri+nJRIoLbwHcMYs=", + "lastModified": 1696214716, + "narHash": "sha256-Buev0E1vvNdjI8MOsJd8GtgSI0/BRPZZTsBtUC0HDbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bea389de37abfab60ccb212caaaa6e428be5403b", + "rev": "6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5", "type": "github" }, "original": { @@ -1006,11 +1046,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "lastModified": 1672262501, + "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", "type": "github" }, "original": { @@ -1022,11 +1062,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1677932085, + "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "type": "github" }, "original": { @@ -1038,11 +1078,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1697851979, - "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -1054,11 +1094,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -1175,6 +1215,30 @@ "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz" } }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixified-ai", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667760143, + "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1371,30 +1435,13 @@ "type": "path" } }, - "textgen-src": { - "flake": false, - "locked": { - "lastModified": 1696789008, - "narHash": "sha256-+V8XOVnEyImj+a8uCkZXEHXW8bTIBRlnfMcQfcZNgqg=", - "owner": "oobabooga", - "repo": "text-generation-webui", - "rev": "2e471071af48e19867cfa522d2def44c24785c50", - "type": "github" - }, - "original": { - "owner": "oobabooga", - "ref": "v1.7", - "repo": "text-generation-webui", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { diff --git a/nixos/nixified.ai.nix b/nixos/nixified.ai.nix index 3db4d4b9..7eb3404b 100644 --- a/nixos/nixified.ai.nix +++ b/nixos/nixified.ai.nix @@ -11,6 +11,7 @@ specialArgs.makeEnable config "modules.nixified-ai" false { services.invokeai = { enable = false; host = "0.0.0.0"; + nsfwChecker = false; package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia; }; }