update gentoo and nix builds -- release:patch

ralyodio · ralyodio · commit 9d6ba0c505fe · 2026-01-26T09:04:13.000-08:00
diff --git a/scripts/lib/package-managers/gentoo.ts b/scripts/lib/package-managers/gentoo.ts
@@ -137,13 +137,84 @@ Icon=pairux
 Type=Application
 Categories=Network;RemoteAccess;
 StartupWMClass=PairUX
+`;
+
+    // Generate README
+    const readme = `# PairUX Gentoo Overlay
+
+Gentoo overlay for [PairUX](https://pairux.com) - Collaborative screen sharing with remote control.
+
+## Installation
+
+### Using eselect-repository (recommended)
+
+\`\`\`bash
+# Install eselect-repository if not already installed
+sudo emerge app-eselect/eselect-repository
+
+# Add the overlay
+sudo eselect repository add pairux git https://github.com/profullstack/gentoo-pairux.git
+
+# Sync the overlay
+sudo emaint sync -r pairux
+
+# Install PairUX
+sudo emerge net-misc/pairux-bin
+\`\`\`
+
+### Using layman (deprecated)
+
+\`\`\`bash
+# Add overlay
+sudo layman -o https://raw.githubusercontent.com/profullstack/gentoo-pairux/master/repositories.xml -f -a pairux
+
+# Install
+sudo emerge net-misc/pairux-bin
+\`\`\`
+
+## Package Info
+
+- **Category:** net-misc
+- **Package:** pairux-bin
+- **Version:** ${release.version}
+- **License:** MIT
+
+## Uninstall
+
+\`\`\`bash
+sudo emerge --unmerge net-misc/pairux-bin
+sudo eselect repository remove pairux
+\`\`\`
+
+## License
+
+MIT
+`;
+
+    // Generate repositories.xml for layman compatibility
+    const repositoriesXml = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd">
+<repositories xmlns="" version="1.0">
+  <repo quality="experimental" status="unofficial">
+    <name>pairux</name>
+    <description>Gentoo overlay for PairUX - collaborative screen sharing</description>
+    <homepage>https://pairux.com</homepage>
+    <owner>
+      <email>hello@pairux.com</email>
+      <name>PairUX Team</name>
+    </owner>
+    <source type="git">https://github.com/profullstack/gentoo-pairux.git</source>
+  </repo>
+</repositories>
 `;
 
     return Promise.resolve({
       [`${CATEGORY}/${PACKAGE_NAME}/${PACKAGE_NAME}-${release.version}.ebuild`]: ebuild,
       [`${CATEGORY}/${PACKAGE_NAME}/metadata.xml`]: metadataXml,
       [`${CATEGORY}/${PACKAGE_NAME}/files/pairux`]: actualWrapper,
       [`${CATEGORY}/${PACKAGE_NAME}/files/pairux.desktop`]: actualDesktop,
+      'README.md': readme,
+      'repositories.xml': repositoriesXml,
     });
   }
 
diff --git a/scripts/lib/package-managers/nix.ts b/scripts/lib/package-managers/nix.ts
@@ -1,15 +1,15 @@
 /**
  * Nix Package Manager
  *
- * Submits packages to nixpkgs via Pull Request.
- * Target repo: NixOS/nixpkgs
+ * Submits packages to a custom flake repository (profullstack/pairux-nix).
+ * Users can install via: nix profile install github:profullstack/pairux-nix
  */
 
 import { BasePackageManager } from './base.js';
 import type { ReleaseInfo, SubmissionResult } from './types.js';
 
-const NIXPKGS_OWNER = 'NixOS';
-const NIXPKGS_REPO = 'nixpkgs';
+const FLAKE_OWNER = 'profullstack';
+const FLAKE_REPO = 'pairux-nix';
 const PACKAGE_NAME = 'pairux';
 
 export class NixPackageManager extends BasePackageManager {
@@ -24,20 +24,18 @@ export class NixPackageManager extends BasePackageManager {
 
   async checkExisting(version: string): Promise<boolean> {
     try {
-      // Check if there's already an open PR for this version
-      const prs = await this.githubRequest<{ title: string }[]>(
-        `/repos/${NIXPKGS_OWNER}/${NIXPKGS_REPO}/pulls?state=open&per_page=100`
-      );
-
-      return prs.some(
-        (pr) => pr.title.toLowerCase().includes(PACKAGE_NAME) && pr.title.includes(version)
-      );
+      // Check if the version is already in our flake repo
+      const file = await this.getFileContent(FLAKE_OWNER, FLAKE_REPO, 'flake.nix');
+      if (!file) return false;
+
+      // Check if version is in the flake
+      return file.content.includes(`version = "${version}"`);
     } catch {
       return false;
     }
   }
 
-  generateManifest(release: ReleaseInfo): Promise<string> {
+  generateManifest(release: ReleaseInfo): Promise<Record<string, string>> {
     // Find assets for different architectures
     const x86AppImage = this.findAsset(
       release,
@@ -46,98 +44,178 @@ export class NixPackageManager extends BasePackageManager {
 
     const x86Sha256 = release.checksums.get(x86AppImage?.name ?? '') ?? '';
 
-    // Generate Nix expression
-    const nixExpr = `{ lib
-, appimageTools
-, fetchurl
-}:
+    // Generate flake.nix
+    const flakeNix = `{
+  description = "PairUX - Collaborative screen sharing with remote control";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
+      let
+        pkgs = nixpkgs.legacyPackages.\${system};
+        pname = "${PACKAGE_NAME}";
+        version = "${release.version}";
+
+        src = pkgs.fetchurl {
+          url = "https://github.com/profullstack/pairux.com/releases/download/v\${version}/PairUX-\${version}-x86_64.AppImage";
+          sha256 = "${x86Sha256 !== '' ? x86Sha256 : 'sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='}";
+        };
+
+        appimageContents = pkgs.appimageTools.extractType2 { inherit pname version src; };
+      in
+      {
+        packages = {
+          default = pkgs.appimageTools.wrapType2 {
+            inherit pname version src;
+
+            extraInstallCommands = ''
+              install -m 444 -D \${appimageContents}/pairux.desktop $out/share/applications/pairux.desktop
+              install -m 444 -D \${appimageContents}/usr/share/icons/hicolor/512x512/apps/pairux.png \\
+                $out/share/icons/hicolor/512x512/apps/pairux.png 2>/dev/null || true
+              substituteInPlace $out/share/applications/pairux.desktop \\
+                --replace 'Exec=AppRun' 'Exec=pairux' 2>/dev/null || true
+            '';
+
+            meta = with pkgs.lib; {
+              description = "Collaborative screen sharing with remote control";
+              longDescription = ''
+                PairUX is a collaborative screen sharing application with simultaneous
+                remote mouse and keyboard control. Like Screenhero, but open source.
+                Perfect for pair programming, remote support, and collaboration.
+              '';
+              homepage = "https://pairux.com";
+              changelog = "https://github.com/profullstack/pairux.com/releases/tag/v\${version}";
+              license = licenses.mit;
+              maintainers = [ ];
+              platforms = [ "x86_64-linux" ];
+              mainProgram = "pairux";
+              sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+            };
+          };
+
+          ${PACKAGE_NAME} = self.packages.\${system}.default;
+        };
+
+        apps.default = {
+          type = "app";
+          program = "\${self.packages.\${system}.default}/bin/pairux";
+        };
+      }
+    );
+}
+`;
+
+    // Generate README
+    const readme = `# PairUX Nix Flake
+
+Nix flake for [PairUX](https://pairux.com) - Collaborative screen sharing with remote control.
+
+## Installation
+
+### Using flakes (recommended)
+
+\`\`\`bash
+# Install directly
+nix profile install github:profullstack/pairux-nix
+
+# Or run without installing
+nix run github:profullstack/pairux-nix
+\`\`\`
 
-let
-  pname = "${PACKAGE_NAME}";
-  version = "${release.version}";
+### Using nix-shell
 
-  src = fetchurl {
-    url = "https://github.com/profullstack/pairux.com/releases/download/v\${version}/PairUX-\${version}-x86_64.AppImage";
-    sha256 = "${x86Sha256 !== '' ? x86Sha256 : 'sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='}";
+\`\`\`bash
+nix-shell -p "(builtins.getFlake \\"github:profullstack/pairux-nix\\").packages.x86_64-linux.default"
+\`\`\`
+
+### NixOS configuration
+
+Add to your \`flake.nix\`:
+
+\`\`\`nix
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    pairux.url = "github:profullstack/pairux-nix";
   };
 
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    install -m 444 -D \${appimageContents}/pairux.desktop $out/share/applications/pairux.desktop
-    install -m 444 -D \${appimageContents}/usr/share/icons/hicolor/512x512/apps/pairux.png \\
-      $out/share/icons/hicolor/512x512/apps/pairux.png
-    substituteInPlace $out/share/applications/pairux.desktop \\
-      --replace 'Exec=AppRun' 'Exec=pairux'
-  '';
-
-  meta = with lib; {
-    description = "Collaborative screen sharing with remote control";
-    longDescription = ''
-      PairUX is a collaborative screen sharing application with simultaneous
-      remote mouse and keyboard control. Like Screenhero, but open source.
-      Perfect for pair programming, remote support, and collaboration.
-    '';
-    homepage = "https://pairux.com";
-    changelog = "https://github.com/profullstack/pairux.com/releases/tag/v\${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "pairux";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  outputs = { self, nixpkgs, pairux }: {
+    nixosConfigurations.yourhostname = nixpkgs.lib.nixosSystem {
+      modules = [
+        ({ pkgs, ... }: {
+          environment.systemPackages = [
+            pairux.packages.\${pkgs.system}.default
+          ];
+        })
+      ];
+    };
   };
 }
+\`\`\`
+
+## Version
+
+Current version: ${release.version}
+
+## License
+
+MIT
 `;
 
-    return Promise.resolve(nixExpr);
+    return Promise.resolve({
+      'flake.nix': flakeNix,
+      'README.md': readme,
+    });
   }
 
   async submit(release: ReleaseInfo, dryRun = false): Promise<SubmissionResult> {
-    // Check if PR already exists
+    // Check if already exists
     if (await this.checkExisting(release.version)) {
       return {
         packageManager: this.name,
         status: 'skipped',
-        message: `PR for version ${release.version} already exists in nixpkgs`,
+        message: `Version ${release.version} already exists in Nix flake`,
         alreadyExists: true,
       };
     }
 
-    const nixExpr = await this.generateManifest(release);
+    const files = await this.generateManifest(release);
 
     if (dryRun) {
-      this.logger.info('Dry run - generated Nix expression:');
-      console.log(nixExpr);
+      this.logger.info('Dry run - generated Nix flake files:');
+      for (const [path, content] of Object.entries(files)) {
+        this.logger.info(`\n--- ${path} ---`);
+        console.log(content);
+      }
       return {
         packageManager: this.name,
         status: 'skipped',
-        message: 'Dry run - Nix expression generated',
+        message: 'Dry run - flake files generated',
       };
     }
 
-    // For nixpkgs, we need to fork and create PR
-    // This is more complex - we'll create the expression and guide the user
-    this.logger.info('Nix package submission requires manual PR to nixpkgs.');
-    this.logger.info('Generated Nix expression:');
-    console.log(nixExpr);
-    this.logger.info('');
-    this.logger.info('To submit to nixpkgs:');
-    this.logger.info('1. Fork https://github.com/NixOS/nixpkgs');
-    this.logger.info('2. Create pkgs/by-name/pa/pairux/package.nix with the above content');
-    this.logger.info('3. Test locally with: nix-build -A pairux');
-    this.logger.info('4. Submit a PR following nixpkgs contribution guidelines');
-
-    this.logger.info('');
-    this.logger.info('Alternatively, users can install via flake:');
-    this.logger.info('  nix profile install github:profullstack/pairux-nix');
-
-    return {
-      packageManager: this.name,
-      status: 'skipped',
-      message: 'Nix expression generated - manual submission to nixpkgs required',
-    };
+    // Ensure flake repo exists
+    await this.ensureRepo(
+      FLAKE_OWNER,
+      FLAKE_REPO,
+      'Nix flake for PairUX - collaborative screen sharing'
+    );
+
+    // Submit directly to the flake repo
+    const githubFiles = Object.entries(files).map(([path, content]) => ({
+      path,
+      content,
+    }));
+
+    return this.submitDirect(
+      FLAKE_OWNER,
+      FLAKE_REPO,
+      githubFiles,
+      `Update pairux to ${release.version}`
+    );
   }
 }
