chore: update locks

hardenedlinux · Jan 1, 2024 · 89ee335 · 89ee335
1 parent 4dde6ba
commit 89ee335
Show file tree

Hide file tree

Showing 23 changed files with 1,012 additions and 805 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,11 +18,11 @@
         "aarch64-linux"
         "aarch64-darwin"
       ];
-      srcPop = import ./nix/src/__init.nix { inherit inputs eachSystem omnibus; };
+      srcPop = import ./nix/src { inherit inputs eachSystem omnibus; };
       src = srcPop.exports.default;
     in
     {
       inherit src;
-      inherit (src.flakeOutputs) packages overlays scopedPackages;
+      # inherit (src.flakeOutputs) packages overlays scopedPackages;
     };
 }
diff --git a/nix/nvfetcher/go/generated.json b/nix/nvfetcher/go/generated.json
@@ -88,10 +88,10 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-nO286zR4KXzPyb6idXFCkMhVOG7mNVNgIhNGvDqJcB4=",
+            "sha256": "sha256-DGgc3L2h5Hh03EtRDRREJH/aFJhToL2g1XO6RaIVPQ0=",
             "type": "url",
-            "url": "https://github.com/zitadel/zitadel/releases/download/v2.42.1/zitadel-linux-amd64.tar.gz"
+            "url": "https://github.com/zitadel/zitadel/releases/download/v2.42.3/zitadel-linux-amd64.tar.gz"
         },
-        "version": "v2.42.1"
+        "version": "v2.42.3"
     }
 }
diff --git a/nix/nvfetcher/go/generated.nix b/nix/nvfetcher/go/generated.nix
@@ -51,10 +51,10 @@
   };
   zitadel-bin = {
     pname = "zitadel-bin";
-    version = "v2.42.1";
+    version = "v2.42.3";
     src = fetchurl {
-      url = "https://github.com/zitadel/zitadel/releases/download/v2.42.1/zitadel-linux-amd64.tar.gz";
-      sha256 = "sha256-nO286zR4KXzPyb6idXFCkMhVOG7mNVNgIhNGvDqJcB4=";
+      url = "https://github.com/zitadel/zitadel/releases/download/v2.42.3/zitadel-linux-amd64.tar.gz";
+      sha256 = "sha256-DGgc3L2h5Hh03EtRDRREJH/aFJhToL2g1XO6RaIVPQ0=";
     };
   };
 }
diff --git a/nix/nvfetcher/pkgs/generated.json b/nix/nvfetcher/pkgs/generated.json
@@ -21,7 +21,7 @@
     },
     "chatgpt-next-web": {
         "cargoLocks": null,
-        "date": "2023-11-29",
+        "date": "2023-12-31",
         "extract": null,
         "name": "chatgpt-next-web",
         "passthru": null,
@@ -33,11 +33,11 @@
             "name": null,
             "owner": "Yidadaa",
             "repo": "ChatGPT-Next-Web",
-            "rev": "cf50299b142a40d1b043f0b3ceb3cc6c4c5b249d",
-            "sha256": "sha256-f0AZQwoPpaMP6ZH/KdxmqdKzihdpgDNsYJv8/TwTwKY=",
+            "rev": "9eaf492d5b72d252c9dcaa55d5d99dab87bf19e0",
+            "sha256": "sha256-Le1OwflPvhe2JehVwacA6ytxstvswv4pjAqsV297UCU=",
             "type": "github"
         },
-        "version": "cf50299b142a40d1b043f0b3ceb3cc6c4c5b249d"
+        "version": "9eaf492d5b72d252c9dcaa55d5d99dab87bf19e0"
     },
     "firecracker-task-driver": {
         "cargoLocks": null,
@@ -61,7 +61,7 @@
     },
     "koodo-reader": {
         "cargoLocks": null,
-        "date": "2023-12-02",
+        "date": "2024-01-01",
         "extract": null,
         "name": "koodo-reader",
         "passthru": null,
@@ -73,11 +73,11 @@
             "name": null,
             "owner": "troyeguo",
             "repo": "koodo-reader",
-            "rev": "f40c9cebe3f45521d6d72d7535bf15be6780a2db",
-            "sha256": "sha256-qTiNzox2dTdILAEUC3EcQrNp0EAD+supL+hFkFhiZDI=",
+            "rev": "52737f6ccf29ed5e5c070ec876799cdae01bab96",
+            "sha256": "sha256-owbelVGUVYQk8E2Y4XP2QX25ihOHxJAV22JXON/OmM4=",
             "type": "github"
         },
-        "version": "f40c9cebe3f45521d6d72d7535bf15be6780a2db"
+        "version": "52737f6ccf29ed5e5c070ec876799cdae01bab96"
     },
     "nix-unstable-installer": {
         "cargoLocks": null,
@@ -171,7 +171,7 @@
     },
     "zeek-language-server": {
         "cargoLocks": null,
-        "date": "2023-11-27",
+        "date": "2023-12-30",
         "extract": null,
         "name": "zeek-language-server",
         "passthru": null,
@@ -183,10 +183,10 @@
             "name": null,
             "owner": "bbannier",
             "repo": "zeek-language-server",
-            "rev": "515320b25ba0cc341f0a69354b00df2a1502ed30",
-            "sha256": "sha256-p2A0muru8qpr6myrxLPd3YUjnovtbRHzHgE41FO/jwQ=",
+            "rev": "b1573d324c91772f4ee14ade2297bd85a5ea6297",
+            "sha256": "sha256-zh54vI/Q7axQ1T+Du11ww4CTxzgkXoaQwt+ZC+iPNVU=",
             "type": "github"
         },
-        "version": "515320b25ba0cc341f0a69354b00df2a1502ed30"
+        "version": "b1573d324c91772f4ee14ade2297bd85a5ea6297"
     }
 }
diff --git a/nix/nvfetcher/pkgs/generated.nix b/nix/nvfetcher/pkgs/generated.nix
@@ -14,15 +14,15 @@
   };
   chatgpt-next-web = {
     pname = "chatgpt-next-web";
-    version = "cf50299b142a40d1b043f0b3ceb3cc6c4c5b249d";
+    version = "9eaf492d5b72d252c9dcaa55d5d99dab87bf19e0";
     src = fetchFromGitHub {
       owner = "Yidadaa";
       repo = "ChatGPT-Next-Web";
-      rev = "cf50299b142a40d1b043f0b3ceb3cc6c4c5b249d";
+      rev = "9eaf492d5b72d252c9dcaa55d5d99dab87bf19e0";
       fetchSubmodules = false;
-      sha256 = "sha256-f0AZQwoPpaMP6ZH/KdxmqdKzihdpgDNsYJv8/TwTwKY=";
+      sha256 = "sha256-Le1OwflPvhe2JehVwacA6ytxstvswv4pjAqsV297UCU=";
     };
-    date = "2023-11-29";
+    date = "2023-12-31";
   };
   firecracker-task-driver = {
     pname = "firecracker-task-driver";
@@ -38,15 +38,15 @@
   };
   koodo-reader = {
     pname = "koodo-reader";
-    version = "f40c9cebe3f45521d6d72d7535bf15be6780a2db";
+    version = "52737f6ccf29ed5e5c070ec876799cdae01bab96";
     src = fetchFromGitHub {
       owner = "troyeguo";
       repo = "koodo-reader";
-      rev = "f40c9cebe3f45521d6d72d7535bf15be6780a2db";
+      rev = "52737f6ccf29ed5e5c070ec876799cdae01bab96";
       fetchSubmodules = false;
-      sha256 = "sha256-qTiNzox2dTdILAEUC3EcQrNp0EAD+supL+hFkFhiZDI=";
+      sha256 = "sha256-owbelVGUVYQk8E2Y4XP2QX25ihOHxJAV22JXON/OmM4=";
     };
-    date = "2023-12-02";
+    date = "2024-01-01";
   };
   nix-unstable-installer = {
     pname = "nix-unstable-installer";
@@ -102,14 +102,14 @@
   };
   zeek-language-server = {
     pname = "zeek-language-server";
-    version = "515320b25ba0cc341f0a69354b00df2a1502ed30";
+    version = "b1573d324c91772f4ee14ade2297bd85a5ea6297";
     src = fetchFromGitHub {
       owner = "bbannier";
       repo = "zeek-language-server";
-      rev = "515320b25ba0cc341f0a69354b00df2a1502ed30";
+      rev = "b1573d324c91772f4ee14ade2297bd85a5ea6297";
       fetchSubmodules = true;
-      sha256 = "sha256-p2A0muru8qpr6myrxLPd3YUjnovtbRHzHgE41FO/jwQ=";
+      sha256 = "sha256-zh54vI/Q7axQ1T+Du11ww4CTxzgkXoaQwt+ZC+iPNVU=";
     };
-    date = "2023-11-27";
+    date = "2023-12-30";
   };
 }
diff --git a/nix/nvfetcher/python.toml b/nix/nvfetcher/python.toml
@@ -39,10 +39,6 @@ src.git = "https://github.com/kootenpv/cliche"
 fetch.github = "kootenpv/cliche"
 
 #Python Packages
-[durationpy]
-src.pypi = "durationpy"
-fetch.pypi = "durationpy"
-
 [sh]
 src.pypi = "sh"
 fetch.pypi = "sh"
diff --git a/nix/nvfetcher/python/generated.json b/nix/nvfetcher/python/generated.json
@@ -21,7 +21,7 @@
     },
     "cliche": {
         "cargoLocks": null,
-        "date": "2023-11-23",
+        "date": "2023-12-21",
         "extract": null,
         "name": "cliche",
         "passthru": null,
@@ -33,26 +33,11 @@
             "name": null,
             "owner": "kootenpv",
             "repo": "cliche",
-            "rev": "3621191561579f93867417c14b6bc25583d00c0d",
-            "sha256": "sha256-K/39gTrZrZ1Nsrv9zYQV7ID3r8V1LcAJeHUQbq8Eqo0=",
+            "rev": "82c4f9dc1644f34077ab0995dda3bf7dcc2946a4",
+            "sha256": "sha256-rM6HPITGKrHElBrDoYrfm5ivXa+6SGjPbIbWVrFTwpA=",
             "type": "github"
         },
-        "version": "3621191561579f93867417c14b6bc25583d00c0d"
-    },
-    "durationpy": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "durationpy",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "name": null,
-            "sha256": "sha256-XvlBa1J7UNci80ZVvs+3Xkkijrgvh7hV7RkRszFLVAg=",
-            "type": "url",
-            "url": "https://pypi.org/packages/source/d/durationpy/durationpy-0.5.tar.gz"
-        },
-        "version": "0.5"
+        "version": "82c4f9dc1644f34077ab0995dda3bf7dcc2946a4"
     },
     "eZeeKonfigurator": {
         "cargoLocks": null,
@@ -96,7 +81,7 @@
     },
     "elastalert2": {
         "cargoLocks": null,
-        "date": "2023-11-30",
+        "date": "2023-12-17",
         "extract": null,
         "name": "elastalert2",
         "passthru": null,
@@ -108,11 +93,11 @@
             "name": null,
             "owner": "jertel",
             "repo": "elastalert2",
-            "rev": "a47a8841dc91dcaa28545194003ec11fd2218f08",
-            "sha256": "sha256-RYuAel5ob2G2rYX6WKo4SCuoSiohGxvcLw6E3jO3tcY=",
+            "rev": "436d3386652d1f9367368a7910943ee00986cc34",
+            "sha256": "sha256-TDWG7losdoTy4wdGP8ueM+ZQoT/nQaVcUNYXP6irLV4=",
             "type": "github"
         },
-        "version": "a47a8841dc91dcaa28545194003ec11fd2218f08"
+        "version": "436d3386652d1f9367368a7910943ee00986cc34"
     },
     "polars": {
         "cargoLocks": null,
@@ -128,11 +113,11 @@
             "name": null,
             "owner": "pola-rs",
             "repo": "polars",
-            "rev": "py-0.19.19",
-            "sha256": "sha256-uT228XgmSEBfCFbkYEOvrjDt1Xv6e4coz9/SjgA2Tjg=",
+            "rev": "py-0.20.2",
+            "sha256": "sha256-NZsM3y9xNX9C3/lm+pXgfxvjFy2KgvPXufc6i4eXP0A=",
             "type": "github"
         },
-        "version": "py-0.19.19"
+        "version": "py-0.20.2"
     },
     "sh": {
         "cargoLocks": null,

diff --git a/nix/nvfetcher/python/generated.nix b/nix/nvfetcher/python/generated.nix
@@ -15,23 +15,15 @@
   };
   cliche = {
     pname = "cliche";
-    version = "3621191561579f93867417c14b6bc25583d00c0d";
+    version = "82c4f9dc1644f34077ab0995dda3bf7dcc2946a4";
     src = fetchFromGitHub {
       owner = "kootenpv";
       repo = "cliche";
-      rev = "3621191561579f93867417c14b6bc25583d00c0d";
+      rev = "82c4f9dc1644f34077ab0995dda3bf7dcc2946a4";
       fetchSubmodules = false;
-      sha256 = "sha256-K/39gTrZrZ1Nsrv9zYQV7ID3r8V1LcAJeHUQbq8Eqo0=";
-    };
-    date = "2023-11-23";
-  };
-  durationpy = {
-    pname = "durationpy";
-    version = "0.5";
-    src = fetchurl {
-      url = "https://pypi.org/packages/source/d/durationpy/durationpy-0.5.tar.gz";
-      sha256 = "sha256-XvlBa1J7UNci80ZVvs+3Xkkijrgvh7hV7RkRszFLVAg=";
+      sha256 = "sha256-rM6HPITGKrHElBrDoYrfm5ivXa+6SGjPbIbWVrFTwpA=";
     };
+    date = "2023-12-21";
   };
   eZeeKonfigurator = {
     pname = "eZeeKonfigurator";
@@ -59,25 +51,25 @@
   };
   elastalert2 = {
     pname = "elastalert2";
-    version = "a47a8841dc91dcaa28545194003ec11fd2218f08";
+    version = "436d3386652d1f9367368a7910943ee00986cc34";
     src = fetchFromGitHub {
       owner = "jertel";
       repo = "elastalert2";
-      rev = "a47a8841dc91dcaa28545194003ec11fd2218f08";
+      rev = "436d3386652d1f9367368a7910943ee00986cc34";
       fetchSubmodules = false;
-      sha256 = "sha256-RYuAel5ob2G2rYX6WKo4SCuoSiohGxvcLw6E3jO3tcY=";
+      sha256 = "sha256-TDWG7losdoTy4wdGP8ueM+ZQoT/nQaVcUNYXP6irLV4=";
     };
-    date = "2023-11-30";
+    date = "2023-12-17";
   };
   polars = {
     pname = "polars";
-    version = "py-0.19.19";
+    version = "py-0.20.2";
     src = fetchFromGitHub {
       owner = "pola-rs";
       repo = "polars";
-      rev = "py-0.19.19";
+      rev = "py-0.20.2";
       fetchSubmodules = false;
-      sha256 = "sha256-uT228XgmSEBfCFbkYEOvrjDt1Xv6e4coz9/SjgA2Tjg=";
+      sha256 = "sha256-NZsM3y9xNX9C3/lm+pXgfxvjFy2KgvPXufc6i4eXP0A=";
     };
   };
   sh = {

diff --git a/nix/src/__init.nix → nix/src/default.nix b/nix/src/__init.nix → nix/src/default.nix
@@ -8,11 +8,12 @@
   omnibus,
 }:
 let
-  inherit ((omnibus.pops.load { }).load.inputs) haumea;
+  inherit ((omnibus.pops.load { }).load.inputs) haumea lib;
 in
 (omnibus.pops.load {
   src = ./.;
   loader = with haumea; [ (matchers.nix loaders.scoped) ];
+  transformer = [ omnibus.lib.haumea.removeTopDefault ];
   inputs = {
     inherit inputs eachSystem;
     projectDir = ../..;

diff --git a/nix/src/flakeOutputs.nix b/nix/src/flakeOutputs.nix
@@ -8,8 +8,12 @@
 let
 in
 {
-  packages = eachSystem (system: super.pops.packages.${system}.exports.derivations);
-  scopedPackages = eachSystem (system: super.pops.packages.${system}.exports.packages);
+  packages = eachSystem (
+    system: super.pops.packages.${system}.exports.derivations
+  );
+  scopedPackages = eachSystem (
+    system: super.pops.packages.${system}.exports.packages
+  );
   overlays = {
     inherit (super.pops.packages.x86_64-linux.exports.overlays) default compose;
   };

diff --git a/nix/src/pops/packages.nix b/nix/src/pops/packages.nix
@@ -30,7 +30,7 @@ eachSystem (
           fetchurl
           fetchFromGitHub
           dockerTools
-        ;
+          ;
       };
   in
   (omnibus.pops.packages {

diff --git a/nix/std/cells/repo/shellProfiles.nix b/nix/std/cells/repo/shellProfiles.nix
@@ -29,7 +29,7 @@
       {
         name = "nvfetcher-all";
         command = ''
-        nvfetcher-python; nvfetcher-pkgs; nvfetcher-go
+          nvfetcher-python; nvfetcher-pkgs; nvfetcher-go
         '';
       }
     ];