Bump.

kurnevsky · Dec 31, 2024 · c836f72 · c836f72
1 parent 492b2f4
commit c836f72
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 53 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,6 +7,13 @@
       ref = "nixos-unstable";
     };
 
+    nixpkgs-old = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "3566ab7246670a43abd2ffa913cc62dad9cdf7d5";
+    };
+
     fenix = {
       type = "github";
       owner = "nix-community";
@@ -129,6 +136,29 @@
         ]) common-home)
         # Keep flake inputs from being garbage collected
         { system.extraDependencies = collectFlakeInputs inputs.self; }
+        (
+          # TODO: a lot of things are broken :(
+          { pkgs, ... }:
+          let
+            oldPkgs = import inputs.nixpkgs-old {
+              inherit (pkgs.stdenv.targetPlatform) system;
+            };
+          in
+          {
+            nixpkgs.overlays = [
+              (_self: _super: {
+                inherit (oldPkgs)
+                  rocmPackages
+                  cataclysm-dda
+                  openmw
+                  ansible-lint
+                  kcat
+                  dsniff
+                  ;
+              })
+            ];
+          }
+        )
       ];
       desktopModules = commonModules ++ [
         {
@@ -191,6 +221,8 @@
           environment.systemPackages = [
             (llamaOverride pkgs config (
               inputs.llama-cpp.packages.${pkgs.system}.rocm.override {
+                # TODO: rocm is broken in nixpkgs
+                rocmPackages = pkgs.rocmPackages;
                 rocmGpuTargets = gpuTargets;
               }
             ))

diff --git a/machines/pc/configuration.nix b/machines/pc/configuration.nix
@@ -60,24 +60,25 @@
         gpuTargets = "gfx1100";
       }
     ))
-    (
-      (python3.withPackages (
-        pkgs: with pkgs; [
-          # TODO: broken
-          # torchWithRocm
-          torch
-          transformers
-          sentencepiece
-          sacremoses
-          torchvision
-          diffusers
-          accelerate
-          peft
-          (callPackage ./compel.nix { })
-        ]
-      )).override
-      { ignoreCollisions = true; }
-    )
+    # TODO: broken
+    # (
+    #   (python3.withPackages (
+    #     pkgs: with pkgs; [
+    #       # TODO: broken
+    #       # torchWithRocm
+    #       torch
+    #       transformers
+    #       sentencepiece
+    #       sacremoses
+    #       torchvision
+    #       diffusers
+    #       accelerate
+    #       peft
+    #       (callPackage ./compel.nix { })
+    #     ]
+    #   )).override
+    #   { ignoreCollisions = true; }
+    # )
   ];
 
   networking.hostName = "pc";

diff --git a/modules/wine-ge.nix b/modules/wine-ge.nix
@@ -14,7 +14,7 @@ let
       inherit pkgs;
     }).unstable;
 in
-callPackage "${pkgs.path}/pkgs/applications/emulators/wine/base.nix" rec {
+(callPackage "${pkgs.path}/pkgs/applications/emulators/wine/base.nix" rec {
   pname = "wine-ge";
   version = "Proton8-26";
   src = fetchFromGitHub {
@@ -76,4 +76,9 @@ callPackage "${pkgs.path}/pkgs/applications/emulators/wine/base.nix" rec {
     waylandSupport = true;
     embedInstallers = true;
   };
-}
+}).overrideAttrs
+  (old: {
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=incompatible-pointer-types"
+    ];
+  })