zed-editor_git: fix from nixos-unstable-small and bump to 20241223123…

…429-5df4099
chaotic-cx · Dec 23, 2024 · 7768475 · 7768475 · github-actions · Dec 23, 2024
1 parent 914e86e
commit 7768475
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     # For all users
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     # Used by "homeManagerModules" (for HM users)
     home-manager = {
       url = "github:nix-community/home-manager";

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -10,6 +10,7 @@
 
 { flakes
 , nixpkgs ? flakes.nixpkgs
+, nixpkgs-small ? flakes.nixpkgs-small or nixpkgs
 , self ? flakes.self
 , selfOverlay ? self.overlays.default
 , jovian ? flakes.jovian or null
@@ -278,6 +279,7 @@ in
 
   zed-editor_git = callOverride ../pkgs/zed-editor-git {
     zedPins = importJSON ../pkgs/zed-editor-git/pins.json;
+    prev = nixpkgs-small.legacyPackages.${prev.system};
   };
 
   zfs_cachyos = cachyosPackages.zfs;

diff --git a/pkgs/zed-editor-git/default.nix b/pkgs/zed-editor-git/default.nix
@@ -17,6 +17,10 @@ gitOverride {
   };
   ref = "main";
 
+  preOverride = prevAttrs: {
+    postPatch = builtins.replaceStrings [ prevAttrs.version ] [ "*" ] prevAttrs.postPatch;
+  };
+
   postOverride = _prevAttrs: {
     # Nothing wrong on it, just saving compilation time for me!
     dontCheck = true;

diff --git a/pkgs/zed-editor-git/version.json b/pkgs/zed-editor-git/version.json
@@ -1,6 +1,6 @@
 {
-  "version": "unstable-20241221142008-831930a",
-  "rev": "831930aad0b3b953e90c413fb02e67a7d69f035b",
-  "hash": "sha256-uAcnaCpwo/WW28UeTTqh3iCjAf8cLdFxqk5c4v2OTxo=",
-  "cargoHash": "sha256-An6zMBnMf77a+06zrWGKeqEqiixY5Iu11ZZAbfbf71I="
+  "version": "unstable-20241223123429-5df4099",
+  "rev": "5df409971c0825688e776239da045aeadb72d062",
+  "hash": "sha256-CwYatUb9YUrT2YVkpfNsCT17EIDxs8V2V0HWOqE8Ttk=",
+  "cargoHash": "sha256-5N0E0Z97RtnT5rW/Uxh8BffPbL+FZGrUcyii0r/wBiw="
 }
diff --git a/shared/git-override.nix b/shared/git-override.nix
@@ -19,6 +19,7 @@ let
     , version ? null
     , newInputs ? null
     , postOverride ? null
+    , preOverride ? null
     , withUpdateScript ? true
     , withLastModified ? false
     , withLastModifiedDate ? false
@@ -88,6 +89,10 @@ let
         in
         common // whenCargo;
 
+      optionalPreOverride = lib.lists.optional
+        (preOverride != null)
+        preOverride;
+
       optionalPostOverride = lib.lists.optional
         (postOverride != null)
         postOverride;
@@ -97,7 +102,7 @@ let
         lib.lists.foldl
           (accu: accu.overrideAttrs)
           (if newInputs == null then prev else prev.override newInputs)
-          ([ main ] ++ optionalPostOverride);
+          (optionalPreOverride ++ [ main ] ++ optionalPostOverride);
       inherit current;
     };