refactor: update omnibus

hardenedlinux · Feb 24, 2024 · bdd53b7 · bdd53b7
1 parent cd678c4
commit bdd53b7
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 529 deletions.
diff --git 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
@@ -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/flake.lock b/flake.lock
diff --git a/nix/nvfetcher/pkgs.toml b/nix/nvfetcher/pkgs.toml
@@ -1,3 +1,8 @@
+[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
@@ -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"
     }
 }
diff --git 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";
   };
 }