From 8f446797f0ddf7b4ac61597613b2994745f692fc Mon Sep 17 00:00:00 2001 From: guangtao Date: Sat, 24 Feb 2024 12:16:02 -0800 Subject: [PATCH] refactor: update omnibus --- .github/workflows/checks.yaml | 1 + default.nix | 14 + dream2nix/gpt-academic/default.nix | 2 +- flake.lock | 12 +- nix/nvfetcher/pkgs.toml | 4 + nix/nvfetcher/pkgs/generated.json | 50 ++- nix/nvfetcher/pkgs/generated.nix | 42 ++- nix/std/cells/repo/pops.nix | 7 +- nix/std/flake.lock | 478 +--------------------------- nix/std/flake.nix | 29 +- nix/std/pkgs/overlays.nix | 23 +- nix/std/pkgs/packages.nix | 7 +- nix/std/pkgs/packages/_loader.nix | 12 +- nixosModules/osquery/default.nix | 30 +- pkgs/chatgpt-next-web/version.patch | 13 +- 15 files changed, 155 insertions(+), 569 deletions(-) create mode 100644 default.nix diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index cff2221..71bafb0 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -29,6 +29,7 @@ jobs: run: nix flake show - name: Run nvfetcher-github + if: ${{ github.event_name == 'schedule' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..d70d392 --- /dev/null +++ b/default.nix @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: 2023 The omnibus Authors +# +# SPDX-License-Identifier: MIT + +let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + omnibus = import ( + (fetchTarball { + url = "https://github.com/gtrunsec/omnibusSrc/archive/${lock.nodes.omnibusSrc.locked.rev}.tar.gz"; + sha256 = lock.nodes.omnibusSrc.locked.narHash; + }) + ); +in +omnibus.call-flake ./. diff --git a/dream2nix/gpt-academic/default.nix b/dream2nix/gpt-academic/default.nix index 0967ef4..ffcd441 100644 --- a/dream2nix/gpt-academic/default.nix +++ b/dream2nix/gpt-academic/default.nix @@ -1 +1 @@ -{} +{ } diff --git a/flake.lock b/flake.lock index eb8e2ef..e8c0a6e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1700538105, - "narHash": "sha256-uZhOCmwv8VupEmPZm3erbr9XXmyg7K67Ul3+Rx2XMe0=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51a01a7e5515b469886c120e38db325c96694c2f", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -17,11 +17,11 @@ "omnibusSrc": { "flake": false, "locked": { - "lastModified": 1704842020, - "narHash": "sha256-mp+ibvam6HlukeAA0FgOORANFmMJylslRGNoby1XN1c=", + "lastModified": 1708757039, + "narHash": "sha256-r1/SbtgdlmaZz8vuCZCp5KX+Z/AFyx76XTRrZBtUFGM=", "owner": "gtrunsec", "repo": "omnibus", - "rev": "6acd4b123f5629ec1b84fced358452e5154bcd59", + "rev": "e88b800ca69efc17b6d3719a0b4e84fca4b58117", "type": "github" }, "original": { diff --git a/nix/nvfetcher/pkgs.toml b/nix/nvfetcher/pkgs.toml index 61a7699..5952e36 100644 --- a/nix/nvfetcher/pkgs.toml +++ b/nix/nvfetcher/pkgs.toml @@ -1,3 +1,7 @@ +[copilot-gpt4-service] +src.git = "https://github.com/aaamoon/copilot-gpt4-service" +fetch.github = "aaamoon/copilot-gpt4-service" + [chatgpt-next-web] src.git = "https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web" fetch.github = "ChatGPTNextWeb/ChatGPT-Next-Web" diff --git a/nix/nvfetcher/pkgs/generated.json b/nix/nvfetcher/pkgs/generated.json index e131c24..4c0d9a8 100644 --- a/nix/nvfetcher/pkgs/generated.json +++ b/nix/nvfetcher/pkgs/generated.json @@ -21,7 +21,7 @@ }, "chatgpt-next-web": { "cargoLocks": null, - "date": "2024-02-05", + "date": "2024-02-20", "extract": null, "name": "chatgpt-next-web", "passthru": null, @@ -33,11 +33,31 @@ "name": null, "owner": "ChatGPTNextWeb", "repo": "ChatGPT-Next-Web", - "rev": "bb26c03141473c9437827ceb559d43041b149604", - "sha256": "sha256-630TbrrOD92APeUpnhhHVOWCLIrJtDAYQxeGdrRrSdE=", + "rev": "e756506c185dcd786ad04db0c7f2c423a6496072", + "sha256": "sha256-2cnnpJFueojLy1/N+cQlEfFchBb7KQebBw3m7gy17sE=", + "type": "github" + }, + "version": "e756506c185dcd786ad04db0c7f2c423a6496072" + }, + "copilot-gpt4-service": { + "cargoLocks": null, + "date": "2024-02-06", + "extract": null, + "name": "copilot-gpt4-service", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "aaamoon", + "repo": "copilot-gpt4-service", + "rev": "43f68072fa5216ceb5fded45dc2e990d3bc4a3d9", + "sha256": "sha256-r/BZGi/YBLiwfXrOu6G0R3lTNlB9Hro1foKUhuGvbDQ=", "type": "github" }, - "version": "bb26c03141473c9437827ceb559d43041b149604" + "version": "43f68072fa5216ceb5fded45dc2e990d3bc4a3d9" }, "firecracker-task-driver": { "cargoLocks": null, @@ -61,7 +81,7 @@ }, "koodo-reader": { "cargoLocks": null, - "date": "2024-01-30", + "date": "2024-02-24", "extract": null, "name": "koodo-reader", "passthru": null, @@ -73,11 +93,11 @@ "name": null, "owner": "troyeguo", "repo": "koodo-reader", - "rev": "3aafbeb3cf4eefe8b4ace1cdfbd84f2e536b1600", - "sha256": "sha256-Tpy4N+Z/UFKV4iT+yU2aqr81pLIjAwVDQldGIEVfaWA=", + "rev": "bfa30002a6ddf5c6848209eb0eb90dc7fa2f2efe", + "sha256": "sha256-IwqjFXwwNOMQQ+4uMGWkZLT8QocgK4VGbunBYS6Y0NA=", "type": "github" }, - "version": "3aafbeb3cf4eefe8b4ace1cdfbd84f2e536b1600" + "version": "bfa30002a6ddf5c6848209eb0eb90dc7fa2f2efe" }, "nix-unstable-installer": { "cargoLocks": null, @@ -88,11 +108,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-iAThBSX263Bx8222qaAmVrgn9z9IEjregWNTPorCwGA=", + "sha256": "sha256-k3aaJ4NJaqj+LPFTRj7x7P9ylJrSicerHVLcQNaeja4=", "type": "url", - "url": "https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.20.0pre20240123_08bf284/install" + "url": "https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.21.0pre20240214_d857914/install" }, - "version": "nix-2.20.0pre20240123_08bf284" + "version": "nix-2.21.0pre20240214_d857914" }, "osquery": { "cargoLocks": null, @@ -171,7 +191,7 @@ }, "zeek-language-server": { "cargoLocks": null, - "date": "2024-02-05", + "date": "2024-02-19", "extract": null, "name": "zeek-language-server", "passthru": null, @@ -183,10 +203,10 @@ "name": null, "owner": "bbannier", "repo": "zeek-language-server", - "rev": "b691b42febcebf320ee1a0e5e2b471f2bc51be0d", - "sha256": "sha256-TxMMC0Ygn6GzZkRJJwUcLh4/3C4X9eZBTa/go9hUoX4=", + "rev": "634c86ac219d6de8693ba290e008303573fb6a0e", + "sha256": "sha256-TcfQ6ykaiYtBcuuYwkftE3qAQ8RIVoClgkf0+Lb8az8=", "type": "github" }, - "version": "b691b42febcebf320ee1a0e5e2b471f2bc51be0d" + "version": "634c86ac219d6de8693ba290e008303573fb6a0e" } } \ No newline at end of file diff --git a/nix/nvfetcher/pkgs/generated.nix b/nix/nvfetcher/pkgs/generated.nix index 08c2d52..92e448e 100644 --- a/nix/nvfetcher/pkgs/generated.nix +++ b/nix/nvfetcher/pkgs/generated.nix @@ -14,15 +14,27 @@ }; chatgpt-next-web = { pname = "chatgpt-next-web"; - version = "bb26c03141473c9437827ceb559d43041b149604"; + version = "e756506c185dcd786ad04db0c7f2c423a6496072"; src = fetchFromGitHub { owner = "ChatGPTNextWeb"; repo = "ChatGPT-Next-Web"; - rev = "bb26c03141473c9437827ceb559d43041b149604"; + rev = "e756506c185dcd786ad04db0c7f2c423a6496072"; fetchSubmodules = false; - sha256 = "sha256-630TbrrOD92APeUpnhhHVOWCLIrJtDAYQxeGdrRrSdE="; + sha256 = "sha256-2cnnpJFueojLy1/N+cQlEfFchBb7KQebBw3m7gy17sE="; }; - date = "2024-02-05"; + date = "2024-02-20"; + }; + copilot-gpt4-service = { + pname = "copilot-gpt4-service"; + version = "43f68072fa5216ceb5fded45dc2e990d3bc4a3d9"; + src = fetchFromGitHub { + owner = "aaamoon"; + repo = "copilot-gpt4-service"; + rev = "43f68072fa5216ceb5fded45dc2e990d3bc4a3d9"; + fetchSubmodules = false; + sha256 = "sha256-r/BZGi/YBLiwfXrOu6G0R3lTNlB9Hro1foKUhuGvbDQ="; + }; + date = "2024-02-06"; }; firecracker-task-driver = { pname = "firecracker-task-driver"; @@ -38,22 +50,22 @@ }; koodo-reader = { pname = "koodo-reader"; - version = "3aafbeb3cf4eefe8b4ace1cdfbd84f2e536b1600"; + version = "bfa30002a6ddf5c6848209eb0eb90dc7fa2f2efe"; src = fetchFromGitHub { owner = "troyeguo"; repo = "koodo-reader"; - rev = "3aafbeb3cf4eefe8b4ace1cdfbd84f2e536b1600"; + rev = "bfa30002a6ddf5c6848209eb0eb90dc7fa2f2efe"; fetchSubmodules = false; - sha256 = "sha256-Tpy4N+Z/UFKV4iT+yU2aqr81pLIjAwVDQldGIEVfaWA="; + sha256 = "sha256-IwqjFXwwNOMQQ+4uMGWkZLT8QocgK4VGbunBYS6Y0NA="; }; - date = "2024-01-30"; + date = "2024-02-24"; }; nix-unstable-installer = { pname = "nix-unstable-installer"; - version = "nix-2.20.0pre20240123_08bf284"; + version = "nix-2.21.0pre20240214_d857914"; src = fetchurl { - url = "https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.20.0pre20240123_08bf284/install"; - sha256 = "sha256-iAThBSX263Bx8222qaAmVrgn9z9IEjregWNTPorCwGA="; + url = "https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.21.0pre20240214_d857914/install"; + sha256 = "sha256-k3aaJ4NJaqj+LPFTRj7x7P9ylJrSicerHVLcQNaeja4="; }; }; osquery = { @@ -102,14 +114,14 @@ }; zeek-language-server = { pname = "zeek-language-server"; - version = "b691b42febcebf320ee1a0e5e2b471f2bc51be0d"; + version = "634c86ac219d6de8693ba290e008303573fb6a0e"; src = fetchFromGitHub { owner = "bbannier"; repo = "zeek-language-server"; - rev = "b691b42febcebf320ee1a0e5e2b471f2bc51be0d"; + rev = "634c86ac219d6de8693ba290e008303573fb6a0e"; fetchSubmodules = true; - sha256 = "sha256-TxMMC0Ygn6GzZkRJJwUcLh4/3C4X9eZBTa/go9hUoX4="; + sha256 = "sha256-TcfQ6ykaiYtBcuuYwkftE3qAQ8RIVoClgkf0+Lb8az8="; }; - date = "2024-02-05"; + date = "2024-02-19"; }; } diff --git a/nix/std/cells/repo/pops.nix b/nix/std/cells/repo/pops.nix index a0c52d0..04ee0e6 100644 --- a/nix/std/cells/repo/pops.nix +++ b/nix/std/cells/repo/pops.nix @@ -16,13 +16,14 @@ in _self: _super: { exports = rec { inherit (inputs.omnibus.lib.mapPopsExports pops) self; - pops.self = - (self.layouts.default.addLoadExtender { + pops.self = ( + self.layouts.default.addLoadExtender { load.inputs = { # extend the inputs of the default layout # inherit inputs cell; }; - }); + } + ); }; } ) diff --git a/nix/std/flake.lock b/nix/std/flake.lock index 4a54ab3..5999137 100644 --- a/nix/std/flake.lock +++ b/nix/std/flake.lock @@ -1,482 +1,6 @@ { "nodes": { - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, - "call-flake": { - "locked": { - "lastModified": 1691284812, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "0510cb1562720ae66cb5010c56b856142b837a3f", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "call-flake_2": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", - "owner": "numtide", - "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "haumea": [ - "omnibusStd", - "std", - "haumea" - ], - "nixlib": [ - "omnibusStd", - "std", - "lib" - ], - "yants": [ - "omnibusStd", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "haumea": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "namaka", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "haumea_2": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "incl": { - "inputs": { - "nixlib": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "lib": { - "locked": { - "lastModified": 1694306727, - "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "namaka": { - "inputs": { - "haumea": "haumea", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1696528717, - "narHash": "sha256-y9iQPJuIhUHojV/5yiYV68a9DaRSbHxMR2QbSdNtb/I=", - "owner": "nix-community", - "repo": "namaka", - "rev": "30a62e16535c85aa2ada2929ab7998dc2d3e5a7b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "namaka", - "type": "github" - } - }, - "nixago": { - "inputs": { - "flake-utils": "flake-utils", - "nixago-exts": [ - "omnibusStd" - ], - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687381756, - "narHash": "sha256-IUMIlYfrvj7Yli4H2vvyig8HEPpfCeMaE6+kBGPzFyk=", - "owner": "nix-community", - "repo": "nixago", - "rev": "dacceb10cace103b3e66552ec9719fa0d33c0dc9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "omnibusStd": { - "inputs": { - "call-flake": "call-flake", - "devshell": "devshell", - "haumea": [ - "omnibusStd", - "namaka", - "haumea" - ], - "namaka": "namaka", - "nixago": "nixago", - "nixpkgs": "nixpkgs_2", - "std": "std" - }, - "locked": { - "dir": "local", - "lastModified": 1704070768, - "narHash": "sha256-/vI3Z/lydpe3Ygx3ePHwkpychihJiw/yFpm8Y3G36WI=", - "owner": "gtrunsec", - "repo": "omnibus", - "rev": "b31a3fbbd40ed626ac2e78d484ff42b5c1676ddc", - "type": "github" - }, - "original": { - "dir": "local", - "owner": "gtrunsec", - "repo": "omnibus", - "type": "github" - } - }, - "paisano": { - "inputs": { - "call-flake": "call-flake_2", - "nixpkgs": [ - "omnibusStd", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "omnibusStd", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1693982790, - "narHash": "sha256-WTZYlqGUjzzz/PSzcvjEZz2kkwYSXObjeQVrFBaqa2Y=", - "owner": "paisano-nix", - "repo": "core", - "rev": "3e897a19418361ece34841105122ed4f9379ca96", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-tui": { - "flake": false, - "locked": { - "lastModified": 1694014205, - "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.2.0", - "repo": "tui", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "omnibusStd": "omnibusStd", - "std": [ - "omnibusStd", - "std" - ] - } - }, - "std": { - "inputs": { - "arion": [ - "omnibusStd", - "std", - "blank" - ], - "blank": "blank", - "devshell": [ - "omnibusStd", - "devshell" - ], - "dmerge": "dmerge", - "haumea": "haumea_2", - "incl": "incl", - "lib": "lib", - "makes": [ - "omnibusStd", - "std", - "blank" - ], - "microvm": [ - "omnibusStd", - "std", - "blank" - ], - "n2c": [ - "omnibusStd", - "std", - "blank" - ], - "nixago": [ - "omnibusStd", - "nixago" - ], - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "paisano": "paisano", - "paisano-tui": "paisano-tui", - "terranix": [ - "omnibusStd", - "std", - "blank" - ], - "yants": "yants" - }, - "locked": { - "lastModified": 1703841807, - "narHash": "sha256-VlCghX8Qw1j52bZoiWDsLdXY3yZzcz96H6bSUGxIB1U=", - "owner": "divnix", - "repo": "std", - "rev": "660a86dff77b7e4ed2395b5bebecc040ba3538ba", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - } + "root": {} }, "root": "root", "version": 7 diff --git a/nix/std/flake.nix b/nix/std/flake.nix index cd6ccd9..78b8628 100644 --- a/nix/std/flake.nix +++ b/nix/std/flake.nix @@ -1,17 +1,20 @@ { - inputs = { - nixpkgs.follows = "omnibusStd/nixpkgs"; - omnibusStd.url = "github:gtrunsec/omnibus/?dir=local"; - std.follows = "omnibusStd/std"; - }; + inputs = { }; outputs = - { std, ... }@inputs: + { ... }@inputs: + let + inputsSource = inputs // rec { + nixpkgs = (import ../..).inputs.nixpkgs; + omnibus = import (import ../..).inputs.omnibusSrc; + inherit (omnibus.flake.inputs) std; + }; + inherit (inputsSource.omnibus.flake.inputs) std; + in std.growOn { - inputs = inputs // { - omnibus = import (inputs.omnibusStd.inputs.call-flake ../..).inputs.omnibusSrc; - }; + inputs = inputsSource; + cellsFrom = ./cells; cellBlocks = with std.blockTypes; [ @@ -34,12 +37,12 @@ ]; } { - devShells = inputs.std.harvest inputs.self [ + devShells = std.harvest inputs.self [ "repo" "shells" ]; overlays = - (inputs.std.harvest inputs.self [ + (std.harvest inputs.self [ [ "python" "overlays" @@ -50,13 +53,13 @@ ] ]).x86_64-linux; nixosModules = - (inputs.std.harvest inputs.self [ + (std.harvest inputs.self [ [ "pkgs" "nixosModules" ] ]).x86_64-linux; - packages = inputs.std.harvest inputs.self [ + packages = std.harvest inputs.self [ [ "python" "packages" diff --git a/nix/std/pkgs/overlays.nix b/nix/std/pkgs/overlays.nix index 2618753..7caa696 100644 --- a/nix/std/pkgs/overlays.nix +++ b/nix/std/pkgs/overlays.nix @@ -50,20 +50,15 @@ ; }; - python3 = prev.python3.override ( - old: { - packageOverrides = - pkgs.lib.composeExtensions (old.packageOverrides or (_: _: { })) - packages; - } - ); + python3 = prev.python3.override (old: { + packageOverrides = pkgs.lib.composeExtensions (old.packageOverrides + or (_: _: { }) + ) packages; + }); - python3Packages = prev.python3Packages.override ( - old: { - overrides = - prev.lib.composeExtensions (old.packageOverrides or (_: _: { })) - packages; - } - ); + python3Packages = prev.python3Packages.override (old: { + overrides = prev.lib.composeExtensions (old.packageOverrides or (_: _: { }) + ) packages; + }); }; } diff --git a/nix/std/pkgs/packages.nix b/nix/std/pkgs/packages.nix index 85ad327..0f4c841 100644 --- a/nix/std/pkgs/packages.nix +++ b/nix/std/pkgs/packages.nix @@ -3,9 +3,8 @@ let l = inputs.nixpkgs.lib // builtins; nixpkgs = cell.lib.nixpkgs; in -inputs.cells.common.lib.filterDerivations - (cell.overlays.loader nixpkgs nixpkgs).toplevel +inputs.cells.common.lib.filterDerivations (cell.overlays.loader nixpkgs nixpkgs) + .toplevel // inputs.cells.common.lib.filterDerivations ( - (cell.overlays.loader nixpkgs nixpkgs).python nixpkgs.python3Packages - nixpkgs.python3Packages + (cell.overlays.loader nixpkgs nixpkgs).python nixpkgs.python3Packages nixpkgs.python3Packages ) diff --git a/nix/std/pkgs/packages/_loader.nix b/nix/std/pkgs/packages/_loader.nix index a4c549e..028e7ce 100644 --- a/nix/std/pkgs/packages/_loader.nix +++ b/nix/std/pkgs/packages/_loader.nix @@ -10,7 +10,11 @@ in transformer = [ ( _cursor: dir: - if dir ? default then assert (l.hasAttr "default" dir); dir.default else dir + if dir ? default then + assert (l.hasAttr "default" dir); + dir.default + else + dir ) ]; }).outputsForTarget @@ -24,7 +28,11 @@ in transformer = [ ( _cursor: dir: - if dir ? default then assert (l.hasAttr "default" dir); dir.default else dir + if dir ? default then + assert (l.hasAttr "default" dir); + dir.default + else + dir ) ]; }).outputsForTarget diff --git a/nixosModules/osquery/default.nix b/nixosModules/osquery/default.nix index 3bf6c4a..59f29f0 100644 --- a/nixosModules/osquery/default.nix +++ b/nixosModules/osquery/default.nix @@ -9,23 +9,21 @@ let cfg = config.services.osquery-bin; configFile = pkgs.writeText "osquery.conf" ( builtins.toJSON ( - recursiveUpdate - { - schedule = { - time_again = { - query = "select * from time;"; - interval = 1; - }; + recursiveUpdate { + schedule = { + time_again = { + query = "select * from time;"; + interval = 1; }; - options = { - config_plugin = "filesystem"; - logger_plugin = "filesystem"; - logger_path = cfg.loggerPath; - database_path = cfg.databasePath; - inherit (cfg) utc; - }; - } - cfg.extraConfig + }; + options = { + config_plugin = "filesystem"; + logger_plugin = "filesystem"; + logger_path = cfg.loggerPath; + database_path = cfg.databasePath; + inherit (cfg) utc; + }; + } cfg.extraConfig ) ); in diff --git a/pkgs/chatgpt-next-web/version.patch b/pkgs/chatgpt-next-web/version.patch index a286182..9e9b679 100644 --- a/pkgs/chatgpt-next-web/version.patch +++ b/pkgs/chatgpt-next-web/version.patch @@ -1,11 +1,18 @@ diff --git a/package.json b/package.json -index 0938c5b..20556be 100644 +index b31d6a9..8471152 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { - "name": "chatgpt-next-web", -+ "version": "1.0.0", + "name": "nextchat", ++ "version": "0.1.0", "private": false, "license": "mit", "scripts": { +@@ -64,4 +65,4 @@ + "resolutions": { + "lint-staged/yaml": "^2.2.2" + } +-} +\ No newline at end of file ++}