Updating everything and some more WPILib packages

flake.nix

@@ -8,12 +8,14 @@
 
   outputs = inputs @ { self, flake-utils, nixpkgs }:
     let
-      frcOverlay = final: prev: with final; {
-        advantagescope = callPackage ./pkgs/advantagescope { };
-        choreo = callPackage ./pkgs/choreo { };
-        elastic-dashboard = callPackage ./pkgs/elastic-dashboard { };
-        pathplanner = callPackage ./pkgs/pathplanner { };
-        wpilib = recurseIntoAttrs (callPackage ./pkgs/wpilib { });
+      frcOverlay = final: prev: {
+        advantagescope = final.callPackage ./pkgs/advantagescope { };
+        choreo = final.callPackage ./pkgs/choreo { };
+        elastic-dashboard = final.callPackage ./pkgs/elastic-dashboard { };
+        pathplanner = final.callPackage ./pkgs/pathplanner { };
+        wpilib = final.recurseIntoAttrs (final.callPackage ./pkgs/wpilib { });
+
+        vscode-extensions = prev.vscode-extensions // { wpilibsuite.vscode-wpilib = final.wpilib.vscode-wpilib; };
       };
 
       supportedSystems = [
@@ -55,7 +57,10 @@
                 robotbuilder
                 shuffleboard
                 smartdashboard
-                sysid;
+                sysid
+                vscode-wpilib
+                wpilib-utility
+                ;
 
               frc-nix-whitepaper =
                 pkgs.runCommandNoCC

pkgs/advantagescope/default.nix

@@ -29,7 +29,6 @@ appimageTools.wrapType2 {
   inherit pname version src;
 
   extraInstallCommands = ''
-    mv $out/bin/${pname}-${version} $out/bin/${pname}
     install -Dm 444 ${appimageContents}/${pname}.desktop "$out"/share/applications/${pname}.desktop
     install -Dm 444 ${icon} "$out"/share/pixmaps/advantagescope.png
 

pkgs/choreo/default.nix

@@ -1,35 +1,32 @@
-{ lib, fetchurl, appimageTools, makeDesktopItem }:
+{ lib, fetchurl, appimageTools }:
 
 let
   pname = "choreo";
-  version = "2024.2.1";
+  version = "2024.2.2";
 
-  desktopItem = makeDesktopItem {
-    type = "Application";
-    name = "Choreo";
-    desktopName = "Choreo";
-    comment = "A graphical tool for planning time-optimized trajectories for autonomous mobile robots in the FIRST Robotics Competition.";
-    icon = "choreo";
-    exec = "choreo %u";
+  src = fetchurl {
+    url = "https://github.com/SleipnirGroup/Choreo/releases/download/v${version}/Choreo-v${version}-Linux-x86_64.AppImage";
+    hash = "sha256-z3IdlmKWubuzSnqok7HVXnVlmLAx6JJbdxww9rk93uw=";
   };
 
   icon = fetchurl {
     url = "https://raw.githubusercontent.com/SleipnirGroup/Choreo/v${version}/icon/icon.svg";
     hash = "sha256-HKCzFijS08MKwsMsfTW9ohxWDqyqhRpLhuBjwVWWKPE=";
   };
-in
-appimageTools.wrapType2 {
-  inherit pname version;
 
-  src = fetchurl {
-    url = "https://github.com/SleipnirGroup/Choreo/releases/download/v${version}/Choreo-v${version}-Linux-x86_64.AppImage";
-    hash = "sha256-PMBmzLKLsCIbdZjsHUyFjBm7l2nuSGRztA+gB7BLNik=";
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
   };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
 
   extraInstallCommands = ''
-    mv $out/bin/${pname}-${version} $out/bin/${pname}
-    install -D "${desktopItem}/share/applications/"* -t $out/share/applications/
     install -D ${icon} $out/share/pixmaps/choreo.svg
+    install -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace "Exec=AppRun" "Exec=${pname}"
   '';
 
   meta = with lib; {

pkgs/elastic-dashboard/default.nix

@@ -1,11 +1,11 @@
 { lib
-, flutter
+, flutter319
 , fetchFromGitHub
 , copyDesktopItems
 , makeDesktopItem
 ,
 }:
-flutter.buildFlutterApplication rec {
+flutter319.buildFlutterApplication rec {
   pname = "elastic-dashboard";
   version = "2024.2.0";
 

pkgs/pathplanner/default.nix

@@ -1,13 +1,13 @@
 { lib
-, flutter
+, flutter319
 , fetchFromGitHub
 , copyDesktopItems
 , stdenv
 , libuuid
 , makeDesktopItem
 ,
 }:
-flutter.buildFlutterApplication rec {
+flutter319.buildFlutterApplication rec {
   pname = "pathplanner";
   version = "2024.1.7";
 

pkgs/wpilib/datalogtool.nix

@@ -6,10 +6,10 @@ buildBinTool {
   name = "DataLogTool";
 
   artifactHashes = {
-    linuxarm32 = "sha256-1LtRUFbGdStcW84TfZv3N6EWPMpz/QE56LWcsn3nx38=";
-    osxuniversal = "sha256-HIhhVN/y8EWysKwkXGlJ2a6ksLOWvxJ8kji2zOlDjuU=";
-    linuxarm64 = "sha256-ouuGBTnZHlL909o4YQ6uBp8o+SiwsknVl6P5gvdDXf0=";
-    linuxx86-64 = "sha256-wLWvtQtw+9l9WkhT1Ah9qAspbliPgJa4b2d63xFKURQ=";
+    linuxarm32 = "sha256-WvcdQNey68WLZnU4w8qivdwjuVAcATbBat9z2eRPWPE=";
+    linuxarm64 = "sha256-rEIFi3pYXvp4bUIyrRg2akx0ypp4xG5TDuMvtYNGMbg=";
+    linuxx86-64 = "sha256-ykWX4+j3jOb8d5UnRU2VxghQJPWn1GmqO4n3VsvcHic=";
+    osxuniversal = "sha256-QXJC/FNdRsspWKHyBBuE+oLj37Vvb6O0GH1yG1PkJKA=";
   };
 
   iconPng = "${allwpilibSources}/datalogtool/src/main/native/resources/dlt-512.png";

pkgs/wpilib/default.nix

@@ -2,12 +2,12 @@
 
 lib.makeScope pkgs.newScope (self: with self; {
   allwpilibSources = fetchFromGitHub rec {
-    passthru.version = "2024.3.1";
+    passthru.version = "2024.3.2";
 
     owner = "wpilibsuite";
     repo = "allwpilib";
     rev = "v${passthru.version}";
-    hash = "sha256-H/dMLI2wOiJ+/Z8//Q7QzAFc51dZ3L16evLJI1UaS8c=";
+    hash = "sha256-bxhAsxN0rVwXkTWZDUoTUEIfufbMqp8+OIU75xBUm6w=";
   };
 
   buildBinTool = callPackage ./build-bin-tool.nix { };
@@ -22,4 +22,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   shuffleboard = callPackage ./shuffleboard.nix { };
   smartdashboard = callPackage ./smartdashboard.nix { };
   sysid = callPackage ./sysid.nix { };
+
+  wpilib-utility = callPackage ./utility.nix { };
+  vscode-wpilib = callPackage ./vscode-extension.nix { };
 })

pkgs/wpilib/glass.nix

@@ -6,10 +6,10 @@ buildBinTool {
   name = "Glass";
 
   artifactHashes = {
-    osxuniversal = "sha256-GEh+OjehYf9yMn0cwfN5fb8ADu3vEBAg3mWh5sCIG6E=";
-    linuxx86-64 = "sha256-ZNYNZX1Vs+j3123HibKwXRjd91pLrIB9nPSEyPyk9J8=";
-    linuxarm64 = "sha256-4+B8pPoahIwExEv/EKsOF4M+fJdozQlWF2kdQbfJ+XM=";
-    linuxarm32 = "sha256-NacpM8O58+po2xO73tHNnL9v0Lt2ePQmeWDB+9x+jbw=";
+    linuxarm32 = "sha256-ch401W8oN3+Ap1Wr+nYe4NjeoQUPkBi4Ku5oAAwA7wI=";
+    linuxarm64 = "sha256-N9SyqcM7TVwB122tLBvTmOPeFcN9hFJLO394zBH2YIQ=";
+    linuxx86-64 = "sha256-hvh8+aMYQXEWV3/eMfMns+7c/IV4ipaB9d/31/F5A04=";
+    osxuniversal = "sha256-NvlGv0wzfe2awge92JBiUrFBpU7u+XJW88xBu/Kgugk=";
   };
 
   iconPng = "${allwpilibSources}/glass/src/app/native/resources/glass-512.png";

pkgs/wpilib/outlineviewer.nix

@@ -6,10 +6,10 @@ buildBinTool {
   name = "OutlineViewer";
 
   artifactHashes = {
-    linuxarm64 = "sha256-zd66DRIHasycs+wHeZaPgjw7HNDxViKfGUNDtyqFSK0=";
-    linuxarm32 = "sha256-YEHL/5OuMxMQNyyvycsDEhs197OoaCwD/HMabuinsbM=";
-    linuxx86-64 = "sha256-y1R0jRsJ0odNHlC21SafQdgn4+eYvm0VKBaHa/MnE3A=";
-    osxuniversal = "sha256-Nzj9U9RVEpb9cqk/M8DkCCPpWdmsaNgBUOBgrzNCk1g=";
+    linuxarm32 = "sha256-okTk8L+8bPF3W5KI0nDxQX8FQJgFa4H55a4m+OjFG4A=";
+    linuxarm64 = "sha256-UbUmY0wdL6dpd+QtDC4PI17Wam4i6D1UjtzDLHipmkI=";
+    linuxx86-64 = "sha256-SzDeZY2x4bMEcxUuedkZv8sknfzyitmDX6g+yFAlsAY=";
+    osxuniversal = "sha256-4O/2edenKqInr2QLe4cr3jLdJxUjZZWHN+etNRjIxHc=";
   };
 
   iconPng = "${allwpilibSources}/outlineviewer/src/main/native/resources/ov-512.png";

pkgs/wpilib/pathweaver.nix

@@ -6,11 +6,11 @@ buildJavaTool {
   name = "PathWeaver";
 
   artifactHashes = {
-    linuxarm64 = "sha256-aZsY4cXcVn14PhKCO+tj0dTCrV8rfBPmj81mh9V81iY=";
-    macarm64 = "sha256-A7JkghnOO/+l/fiHGnQHJpZ6umOepE/MQmtfZ+nPPck=";
-    linuxx64 = "sha256-BFYp9duB2pEO8dBtdrJTukOpV6CRERo3W7NQg2Ulglc=";
-    linuxarm32 = "sha256-7vUkvRXwVl15PU/riPl7KYNmWBGrwSwavw8m0feYcVQ=";
-    macx64 = "sha256-N5BRM4sKx3EaVMKm/9PZUDNnwTuuBnYHkOrsPHfXams=";
+    linuxarm32 = "sha256-FtMHHgWJN24+bGvwoyK3BJTPvWMR5zAGBUfUBizgBEs=";
+    linuxarm64 = "sha256-lgPyLSdEZPAAAX4hWRyGql17XcEK8k+SfRiWNes7zmA=";
+    linuxx64 = "sha256-LtsxWM5KSAMHZHpnEnbE/t4MM4E3WhZomFxjpG7tfYo=";
+    macarm64 = "sha256-8Ow3DoQzDCXyt2y/Mk/yRWtTwcAliVjybpozaFLKmnw=";
+    macx64 = "sha256-qYRWjiTDENT/kYglNDZyOf1GZL1AL91OnFcT6VmEh/I=";
   };
 
   iconSvg = ./wpilib_logo.svg;

pkgs/wpilib/roborioteamnumbersetter.nix

@@ -6,10 +6,10 @@ buildBinTool {
   name = "roboRIOTeamNumberSetter";
 
   artifactHashes = {
-    osxuniversal = "sha256-XoCwerp0nJ95zJ0ZiGixyoSXPHpUtvrLE/yUyE48xVY=";
-    linuxarm32 = "sha256-gt3MP/y7R2ou77PTn0yDw+p/CGCBvVUelirEIxMF42Y=";
-    linuxarm64 = "sha256-sDEo0yFwNRavB2Um7+dQBVJSUO6nGqYEgT25mh8JNeI=";
-    linuxx86-64 = "sha256-S5TA0ClNzPoL+UItjsjRb4jzNmxvaM+ivOU9XnWdbVY=";
+    linuxarm32 = "sha256-gLJxeNn+SdzMuBfJFMlW9T3UQpAYJOzUpzcx2JPeIu0=";
+    linuxarm64 = "sha256-UGJ+2NLAeNUbOs2eKhzifHusJz0RuE5vKfDM3TvOXRw=";
+    linuxx86-64 = "sha256-d6IwXiKMvSxY0Irddyb65v6OkQE+M3e3R/J19HfVNDY=";
+    osxuniversal = "sha256-BHio5JtMY9eomVhO/Qg1dThCko6Vr9X4IH9ZBeUDPVk=";
   };
 
   extraLibs = [ avahi ];

pkgs/wpilib/robotbuilder.nix

@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, makeWrapper, copyDesktopItems, makeDesktopItem, temurin-jre-bin-17 }:
+{ lib, stdenv, allwpilibSources, fetchurl, makeWrapper, copyDesktopItems, makeDesktopItem, temurin-jre-bin-17 }:
 
 stdenv.mkDerivation rec {
   pname = "robotbuilder";
-  version = "2024.3.1";
+  inherit (allwpilibSources) version;
 
   src = fetchurl {
     url = "https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/tools/RobotBuilder/${version}/RobotBuilder-${version}.jar";
-    hash = "sha256-MPldiaJCjyVhZnaMO5ody6DToOnzg7+7lQzBe2MfGYM=";
+    hash = "sha256-1uj2c5Ye56YKdu9DbnHKJHa2OUFcx/dY4cFKkR1QG1E=";
   };
 
   dontUnpack = true;

pkgs/wpilib/shuffleboard.nix

@@ -6,11 +6,11 @@ buildJavaTool {
   name = "Shuffleboard";
 
   artifactHashes = {
-    macarm64 = "sha256-WY6rwftw0fK2acVfsSZsMFHGQnA3vljIpa5GFnoEVgw=";
-    macx64 = "sha256-FCzxDHnbXFhMf3cI5LBYVdApD3tJz+X/1sFeG3upmi4=";
-    linuxarm64 = "sha256-le/FT5w9Hl/b+vp5v8X+a9qIUcIzxvhledO08PqIISA=";
-    linuxx64 = "sha256-vpM2LETutKFn4OyAQh6SrTjPH4HuQPEapfO7+sIvLTk=";
-    linuxarm32 = "sha256-Lh49scOOkWwpR4P2W8ttLpIyK2savKn5b+pZcFKiLyc=";
+    linuxarm32 = "sha256-Ne8EbJ8QVazyLEtJe3VE5enYcuzLISEmUwAWhjkZqlU=";
+    linuxarm64 = "sha256-DiNvWeOF0HzEAMbb1DeYR8eGtmH+5ATxDPnvACPSWwQ=";
+    linuxx64 = "sha256-9o557w/jqztS2cSq9aBbUS54TGRikn6XAGfJPtfBGzE=";
+    macarm64 = "sha256-S6XjUaBp91Da09R03mBMrs7/DSRXfmUin/MQP6yyX38=";
+    macx64 = "sha256-IOKISk8Z1PZo/m2teBVV7kRUVslCOn11Di3TH7wGC8g=";
   };
 
   iconSvg = ./wpilib_logo.svg;

pkgs/wpilib/smartdashboard.nix

@@ -6,8 +6,8 @@ buildJavaTool {
   name = "SmartDashboard";
 
   artifactHashes = {
-    macx64 = "sha256-YLfOzz7Kad9jq2MvctBEjWo+72oeOkwZxMZJ1Wb+L+Q=";
-    linuxx64 = "sha256-YizOJ0ScfS8zrZnZdNohVsXA5qVZtq/L2LhigJmj2cM=";
+    linuxx64 = "sha256-kbeQXTMS8Z0GKiH7bD7bj8FsX4Sm7FxoibF22rhO5hs=";
+    macx64 = "sha256-BefE5tBkv0pN2rv+gcXAz4wINryK4fAI12vNUBKSrmA=";
   };
 
   iconSvg = ./wpilib_logo.svg;

pkgs/wpilib/sysid.nix

@@ -6,10 +6,10 @@ buildBinTool {
   name = "SysId";
 
   artifactHashes = {
-    linuxarm64 = "sha256-0Jv1xEMx4BiOjWg5kr3zG94zSlyocjScojqHwSfZjWs=";
-    linuxx86-64 = "sha256-8UjRN6h3FG4tSgRcpb4nHTzXW5RdKU6cHobLKj0WJws=";
-    osxuniversal = "sha256-6e1ukOtWsekFqjag8OvY/ZSN279vuwdZoT8L1fGyr7E=";
-    linuxarm32 = "sha256-X4UukX6zFX2DGJ/2+0l7zf7pIYYL/pptjt6EG6PHfwE=";
+    linuxarm32 = "sha256-cFXEDUhU1b2lgc479UEfardlLMjoHYNnchWuXMU2wNw=";
+    linuxarm64 = "sha256-r0GPE2s5bzdo746V2C7/1pUWCLcpt9eq0588Ao7rid0=";
+    linuxx86-64 = "sha256-EjsCZa749Rc/hH57nY83jagDXI3iBro8Jt2dEcF/6jg=";
+    osxuniversal = "sha256-sbgD6hPd0oADWkZS/4Cv6C7CDpEZfIvJkzub9JzMR7M=";
   };
 
   iconPng = "${allwpilibSources}/sysid/src/main/native/resources/sysid-512.png";

pkgs/wpilib/utility.nix

@@ -0,0 +1,65 @@
+{ stdenv
+, lib
+, allwpilibSources
+, fetchurl
+, autoPatchelfHook
+, makeBinaryWrapper
+, wrapGAppsHook3
+, ffmpeg
+, mesa
+, nss
+, systemd
+, wayland
+, xdg-utils
+}:
+stdenv.mkDerivation rec {
+  pname = "wpilib-utility";
+  inherit (allwpilibSources) version;
+
+  src = fetchurl {
+    url = "https://github.com/wpilibsuite/vscode-wpilib/releases/download/v${version}/wpilibutility-linux.tar.gz";
+    hash = "sha256-Yhk9wXt/4Z05IyAntg9iixlV38w9KxuLyRIW6D+GW88=";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper wrapGAppsHook3 ];
+
+  buildInputs = [
+    ffmpeg
+    mesa # for libgbm
+    nss
+    systemd
+    wayland
+  ];
+
+  sourceRoot = ".";
+  unpackCmd = "tar xzf \"$src\"";
+
+  installPhase = ''
+    runHook preInstall
+
+    # make the needed directories
+    mkdir -p "$out"/bin
+    mkdir -p "$out"/opt/wpilib-utility
+
+    # copy over program files
+    cp -r ./* "$out"/opt/wpilib-utility
+
+    chmod +x "$out"/opt/wpilib-utility/wpilibutility
+
+    makeBinaryWrapper "$out"/opt/wpilib-utility/wpilibutility "$out"/bin/${pname} \
+      --add-flags --disable-gpu-sandbox \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
+      --suffix PATH : ${lib.makeBinPath [xdg-utils]} \
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    mainProgram = "wpilib-utility";
+    description = "WPILib VSCode Utility (Standalone)";
+    homepage = "https://github.com/wpilibsuite/vscode-wpilib/tree/main/wpilib-utility-standalone";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ max-niederman ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
+  };
+}

pkgs/wpilib/vscode-extension.nix

@@ -0,0 +1,34 @@
+{ vscode-utils
+, allwpilibSources
+, fetchurl
+, lib
+,
+}:
+vscode-utils.buildVscodeExtension rec {
+  inherit (allwpilibSources) version;
+
+  pname = "${vscodeExtPublisher}-${vscodeExtName}";
+  name = "${vscodeExtPublisher}-${vscodeExtName}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/wpilibsuite/vscode-wpilib/releases/download/v${version}/vscode-wpilib-${version}.vsix";
+    hash = "sha256-4+u7X9pQF2CQC8EojNluiTlryDJh2KuQKyd4T1Tmz4w=";
+    # The `*.vsix` file is in the end a simple zip file. Change the extension
+    # so that existing `unzip` hooks takes care of the unpacking.
+    name = "${name}.zip";
+  };
+
+  # VSCode Metadata
+  vscodeExtPublisher = "wpilibsuite";
+  vscodeExtName = "vscode-wpilib";
+  vscodeExtUniqueId = "wpilibsuite.vscode-wpilib-${version}";
+
+  # Package metadata
+  meta = with lib; {
+    description = "Visual Studio Code WPILib extension";
+    homepage = "https://github.com/wpilibsuite/vscode-wpilib";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ max-niederman ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ];
+  };
+}