From 242fd47f936a58e77ae47732ac5f60dd857d737c Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Wed, 18 Feb 2026 13:29:52 +0100
Subject: [PATCH] works

---
 default.nix  | 99 +++++++++++++++-------------------------------------
 flake.nix    | 77 +---------------------------------------
 nuget.config |  2 +-
 3 files changed, 30 insertions(+), 148 deletions(-)

diff --git a/default.nix b/default.nix
index 7b4e3cd..64a3d2a 100644
--- a/default.nix
+++ b/default.nix
@@ -1,80 +1,37 @@
 {
-  pkgs ? import <nixpkgs> { },
+  stdenvNoCC,
+  fetchzip,
+  lib,
+  powershell,
+  runtimeShell,
 }:
-let
-  psreadline = pkgs.fetchzip {
-    url = "https://www.powershellgallery.com/api/v2/package/PSReadLine/2.4.5";
-    sha256 = "12pwy5b426lv7cmlasa7ajy202a0vjjs9drfyg2q5zwqxhj8g8cz";
-    stripRoot = false;
-    extension = "zip";
-  };
-
-  psscriptanalyzer = pkgs.fetchzip {
-    url = "https://www.powershellgallery.com/api/v2/package/PSScriptAnalyzer/1.24.0";
-    sha256 = "03bz9f5rcx749758h6l9wsv86300s0a34qgd522v6166crbpvg2p";
-    stripRoot = false;
-    extension = "zip";
-  };
-
-  invokebuild = pkgs.fetchzip {
-    url = "https://www.powershellgallery.com/api/v2/package/InvokeBuild/5.12.2";
-    sha256 = "0cry70c6ndlv4y0fmlg5iip0ix1r51p7i6dxx3y2zzczbkz2mn6m";
-    stripRoot = false;
-    extension = "zip";
-  };
-
-  platyps = pkgs.fetchzip {
-    url = "https://www.powershellgallery.com/api/v2/package/platyPS/0.14.2";
-    sha256 = "13m11mf42blcn2327m9a4dqfg8sgjjg1vg9dmiwvnbq7wpam260q";
-    stripRoot = false;
-    extension = "zip";
-  };
-in
-pkgs.stdenv.mkDerivation {
+stdenvNoCC.mkDerivation rec {
   pname = "powershell-editor-services";
   version = "4.4.0";
-  src = ./.;
 
-  phases = [
-    "unpackPhase"
-    "patchPhase"
-    "buildPhase"
-    "installPhase"
-  ];
-
-  nativeBuildInputs = [
-    pkgs.dotnet-sdk_8
-    pkgs.git
-    pkgs.powershell
-  ];
-
-  buildPhase = ''
-    export HOME=$TMPDIR
-    export DOTNET_CLI_TELEMETRY_OPTOUT=1
-    export NUGET_PACKAGES=$TMPDIR/nuget
-    export NUGET_CONFIG_FILE=$PWD/nuget.config
-
-    git init -q
-    git config user.email "nix@local"
-    git config user.name "nix"
-    git add -A
-    git commit -qm "nix build"
-
-    mkdir -p module
-    cp -r ${psreadline} module/PSReadLine
-    cp -r ${psscriptanalyzer} module/PSScriptAnalyzer
-
-    mkdir -p $TMPDIR/psmodules
-    cp -r ${invokebuild} $TMPDIR/psmodules/InvokeBuild
-    cp -r ${platyps} $TMPDIR/psmodules/platyPS
-    export PSModulePath="$TMPDIR/psmodules${"PSModulePath:+:$PSModulePath"}"
-
-    pwsh -NoLogo -NoProfile -Command \
-      "Import-Module InvokeBuild; Invoke-Build -File PowerShellEditorServices.build.ps1 -Task Build,AssembleModule -Configuration Release"
-  '';
+  src = fetchzip {
+    url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip";
+    hash = "sha256-tmz6xkcF44xnG5VwSeHNWzjRQK6wxQ7Ii6mDNisCMb8=";
+    stripRoot = false;
+  };
 
   installPhase = ''
-    mkdir -p $out/share/powershell/Modules
-    cp -r module/* $out/share/powershell/Modules/
+    mkdir -p $out/lib/powershell-editor-services/ $out/bin
+    mv * $out/lib/powershell-editor-services/
+    cat > $out/bin/powershell-editor-services <<EOF
+    #! ${runtimeShell} -e
+    exec ${lib.getExe' powershell "pwsh"} -noprofile -nologo -c "& '$out/lib/powershell-editor-services/PowerShellEditorServices/Start-EditorServices.ps1' \$@"
+    EOF
+    chmod +x $out/bin/powershell-editor-services
   '';
+
+  meta = {
+    description = "Common platform for PowerShell development support in any editor or application";
+    homepage = "https://github.com/PowerShell/PowerShellEditorServices";
+    changelog = "https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v${version}";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    mainProgram = "powershell-editor-services";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+  };
 }
diff --git a/flake.nix b/flake.nix
index 1a5ffd5..24459e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,85 +8,10 @@
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
-
-      psreadline = pkgs.fetchzip {
-        url = "https://www.powershellgallery.com/api/v2/package/PSReadLine/2.4.5";
-        sha256 = "12pwy5b426lv7cmlasa7ajy202a0vjjs9drfyg2q5zwqxhj8g8cz";
-        stripRoot = false;
-        extension = "zip";
-      };
-
-      psscriptanalyzer = pkgs.fetchzip {
-        url = "https://www.powershellgallery.com/api/v2/package/PSScriptAnalyzer/1.24.0";
-        sha256 = "03bz9f5rcx749758h6l9wsv86300s0a34qgd522v6166crbpvg2p";
-        stripRoot = false;
-        extension = "zip";
-      };
-
-      invokebuild = pkgs.fetchzip {
-        url = "https://www.powershellgallery.com/api/v2/package/InvokeBuild/5.12.2";
-        sha256 = "0cry70c6ndlv4y0fmlg5iip0ix1r51p7i6dxx3y2zzczbkz2mn6m";
-        stripRoot = false;
-        extension = "zip";
-      };
-
-      platyps = pkgs.fetchzip {
-        url = "https://www.powershellgallery.com/api/v2/package/platyPS/0.14.2";
-        sha256 = "13m11mf42blcn2327m9a4dqfg8sgjjg1vg9dmiwvnbq7wpam260q";
-        stripRoot = false;
-        extension = "zip";
-      };
     in
     {
       packages.${system} = rec {
-        pses = pkgs.stdenv.mkDerivation {
-          pname = "powershell-editor-services";
-          version = "4.4.0";
-          src = ./.;
-
-          phases = [
-            "unpackPhase"
-            "patchPhase"
-            "buildPhase"
-            "installPhase"
-          ];
-
-          nativeBuildInputs = [
-            pkgs.dotnet-sdk_8
-            pkgs.git
-            pkgs.powershell
-          ];
-
-          buildPhase = ''
-            export HOME=$TMPDIR
-            export DOTNET_CLI_TELEMETRY_OPTOUT=1
-            export NUGET_PACKAGES=$TMPDIR/nuget
-            export NUGET_CONFIG_FILE=$PWD/nuget.config
-
-            git init -q
-            git config user.email "nix@local"
-            git config user.name "nix"
-            git add -A
-            git commit -qm "nix build"
-
-            mkdir -p module
-            cp -r ${psreadline} module/PSReadLine
-            cp -r ${psscriptanalyzer} module/PSScriptAnalyzer
-
-            mkdir -p $TMPDIR/psmodules
-            cp -r ${invokebuild} $TMPDIR/psmodules/InvokeBuild
-            cp -r ${platyps} $TMPDIR/psmodules/platyPS
-            export PSModulePath="$TMPDIR/psmodules''${PSModulePath:+:$PSModulePath}"
-
-            pwsh -NoLogo -NoProfile -Command \
-              "Import-Module InvokeBuild; Invoke-Build -File PowerShellEditorServices.build.ps1 -Task Build,AssembleModule -Configuration Release"
-          '';
-
-          installPhase = ''
-            mkdir -p $out/share/powershell/Modules
-            cp -r module/* $out/share/powershell/Modules/
-          '';
-        };
+        pses = pkgs.callPackage ./default.nix { };
 
         default = pses;
       };
diff --git a/nuget.config b/nuget.config
index f003b0f..765346e 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>