merge: merged leyla/main

modules/common-modules/pkgs/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ./python
   ];
@@ -16,15 +20,17 @@
         ./prostudiomasters.nix
         {};
     })
-    (final: prev: {
-      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
-    })
     (final: prev: {
       gdx-liftoff = pkgs.callPackage ./gdx-liftoff.nix {};
     })
     (final: prev: {
       codium-extensions = pkgs.callPackage ./codium-extensions {};
     })
+    (final: prev: {
+      firefox-extensions = pkgs.callPackage ./firefox-extensions {
+        inherit inputs;
+      };
+    })
     (final: prev: {
       mapillary-uploader = pkgs.callPackage ./mapillary-uploader.nix {};
     })
@@ -38,8 +44,5 @@
       # Override h3 C library to version 4.3.0
       h3 = pkgs.callPackage ./h3-c-lib.nix {};
     })
-    (final: prev: {
-      polycule = pkgs.callPackage ./polycule {};
-    })
   ];
 }