flake.lock: update

Lots of breaking changes and workarounds...
khaneliman · Jul 12, 2024 · 7221d50 · 7221d50
1 parent 80093eb
commit 7221d50
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 52 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/home/programs/graphical/apps/mpv/default.nix b/modules/home/programs/graphical/apps/mpv/default.nix
@@ -25,6 +25,7 @@ in
       scripts = lib.optionals pkgs.stdenv.isLinux [ pkgs.mpvScripts.mpris ];
     };
 
-    services.plex-mpv-shim.enable = pkgs.stdenv.isLinux;
+    # FIXME: broken nixpkgs
+    # services.plex-mpv-shim.enable = pkgs.stdenv.isLinux;
   };
 }
diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/desktop/default.nix
@@ -22,7 +22,8 @@ in
       bitwarden
       bleachbit
       dropbox
-      dupeguru
+      # TODO: remove override after https://github.com/NixOS/nixpkgs/pull/325740 is in unstable
+      (dupeguru.override { python3Packages = pkgs.python311Packages; })
       filelight
       fontpreview
       gparted

diff --git a/modules/home/suites/development/default.nix b/modules/home/suites/development/default.nix
@@ -53,7 +53,8 @@ in
         ]
         ++ lib.optionals cfg.sqlEnable [
           dbeaver-bin
-          mysql-workbench
+          # TODO: remove override after https://github.com/NixOS/nixpkgs/pull/325851 in unstable
+          (mysql-workbench.override { python3 = pkgs.python311; })
         ];
 
       shellAliases = {

diff --git a/modules/nixos/suites/art/default.nix b/modules/nixos/suites/art/default.nix
@@ -18,7 +18,8 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      blender
+      # FIXME: broken nixpkgs
+      # blender
       gimp
       inkscape-with-extensions
     ];

diff --git a/modules/nixos/suites/common/default.nix b/modules/nixos/suites/common/default.nix
@@ -46,7 +46,8 @@ in
 
       security = {
         auditd = enabled;
-        clamav = enabled;
+        # FIXME: broken nixpkgs
+        # clamav = enabled;
         gpg = enabled;
         usbguard = enabled;
       };

diff --git a/overlays/bitwarden/default.nix b/overlays/bitwarden/default.nix
@@ -0,0 +1,19 @@
+_: _final: prev: {
+  # TODO: remove after https://github.com/NixOS/nixpkgs/pull/325840 hits unstable
+  bitwarden-desktop = prev.bitwarden-desktop.overrideAttrs (_oldAttrs: rec {
+    cargoRoot = "apps/desktop/desktop_native";
+
+    checkPhase = ''
+      runHook preCheck
+      pushd ${cargoRoot}
+      export HOME=$(mktemp -d)
+      export -f cargoCheckHook runHook _eval _callImplicitHook _logHook
+      export cargoCheckType=release
+      dbus-run-session \
+        --config-file=${prev.dbus}/share/dbus-1/session.conf \
+        -- bash -e -c cargoCheckHook
+      popd
+      runHook postCheck
+    '';
+  });
+}