chore(nix): remove deprecated packages
- Remove opencode flake input (old v1.4.3 URL, superseded) - Remove code2prompt package - Remove opencode-desktop package
This commit is contained in:
48
flake.lock
generated
48
flake.lock
generated
@@ -3,11 +3,11 @@
|
|||||||
"agents": {
|
"agents": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776092721,
|
"lastModified": 1777305531,
|
||||||
"narHash": "sha256-avV4Snqp0K57I9s8D61+GHlg9DYZFSIvjaS4d4RYpG8=",
|
"narHash": "sha256-8GM2Aydq9i8KbvyObqyMYhWkY+e7oh3+eyMfUVnt6Oo=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "0ad41acb03eee0e22cba611b2171a3d3ee30cb10",
|
"rev": "3829556188ee7a5bcdb23afa5ca5d50d6b621085",
|
||||||
"revCount": 72,
|
"revCount": 81,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://code.m3ta.dev/m3tam3re/AGENTS"
|
"url": "https://code.m3ta.dev/m3tam3re/AGENTS"
|
||||||
},
|
},
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775423009,
|
"lastModified": 1776877367,
|
||||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -55,11 +55,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775657231,
|
"lastModified": 1777312179,
|
||||||
"narHash": "sha256-DP8FfybiZPp5WLB9eIk0TC2mdvuYzxLGgrBODDrwPEI=",
|
"narHash": "sha256-AyQh4VtqwzVeLO1uHZ6/pzS6O96nXCXiUQZgCG+3X6k=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4e03baaa39b7746eac5704d623461422131cd03d",
|
"rev": "20123554ae9affff1a5bc969ad3ad02e839f49cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -69,27 +69,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"opencode": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs-master"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1775782812,
|
|
||||||
"narHash": "sha256-m+Ue7FWiTjKMAn1QefAwOMfOb2Vybk0mJPV9zcbkOmE=",
|
|
||||||
"owner": "anomalyco",
|
|
||||||
"repo": "opencode",
|
|
||||||
"rev": "877be7e8e04142cd8fbebcb5e6c4b9617bf28cce",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "anomalyco",
|
|
||||||
"ref": "v1.4.3",
|
|
||||||
"repo": "opencode",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"openspec": {
|
"openspec": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -97,11 +76,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775372219,
|
"lastModified": 1776788052,
|
||||||
"narHash": "sha256-MJakKC026Sarz7nMmiFrfONWc4xgaw8ApV0Hhp4ebhM=",
|
"narHash": "sha256-L4LBHVVtgMhSJm+IzZSYOR0UXPbvIRg4xiEV5urYxdI=",
|
||||||
"owner": "Fission-AI",
|
"owner": "Fission-AI",
|
||||||
"repo": "OpenSpec",
|
"repo": "OpenSpec",
|
||||||
"rev": "64d476f8b924bb9b74b896ea0aa784970e37da69",
|
"rev": "3c7a05c5dc88b2397c478805890b55ed392b19e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -116,7 +95,6 @@
|
|||||||
"basecamp": "basecamp",
|
"basecamp": "basecamp",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"opencode": "opencode",
|
|
||||||
"openspec": "openspec"
|
"openspec": "openspec"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,12 +10,6 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# opencode needs newer bun from master
|
|
||||||
opencode = {
|
|
||||||
url = "github:anomalyco/opencode/v1.4.3";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs-master";
|
|
||||||
};
|
|
||||||
|
|
||||||
# openspec - spec-driven development for AI coding assistants
|
# openspec - spec-driven development for AI coding assistants
|
||||||
openspec = {
|
openspec = {
|
||||||
url = "github:Fission-AI/OpenSpec";
|
url = "github:Fission-AI/OpenSpec";
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
fetchFromGitHub,
|
|
||||||
nix-update-script,
|
|
||||||
rustPlatform,
|
|
||||||
pkg-config,
|
|
||||||
perl,
|
|
||||||
openssl,
|
|
||||||
}:
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "code2prompt";
|
|
||||||
version = "4.2.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "mufeedvh";
|
|
||||||
repo = "code2prompt";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-Gh8SsSTZW7QlyyC3SWJ5pOK2x85/GT7+LPJn2Jeczpc=";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoLock = {
|
|
||||||
lockFile = src + "/Cargo.lock";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildAndTestSubdir = "crates/code2prompt";
|
|
||||||
|
|
||||||
nativeBuildInputs = [pkg-config perl];
|
|
||||||
|
|
||||||
buildInputs = [openssl];
|
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script {};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting";
|
|
||||||
homepage = "https://github.com/mufeedvh/code2prompt";
|
|
||||||
license = licenses.mit;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
mainProgram = "code2prompt";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,6 @@ in {
|
|||||||
|
|
||||||
sidecar = pkgs.callPackage ./sidecar {};
|
sidecar = pkgs.callPackage ./sidecar {};
|
||||||
td = pkgs.callPackage ./td {};
|
td = pkgs.callPackage ./td {};
|
||||||
code2prompt = pkgs.callPackage ./code2prompt {};
|
|
||||||
eigent = pkgs.callPackage ./eigent {};
|
eigent = pkgs.callPackage ./eigent {};
|
||||||
hyprpaper-random = pkgs.callPackage ./hyprpaper-random {};
|
hyprpaper-random = pkgs.callPackage ./hyprpaper-random {};
|
||||||
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
||||||
@@ -39,13 +38,4 @@ in {
|
|||||||
|
|
||||||
basecamp = inputs.basecamp.packages.${system}.default;
|
basecamp = inputs.basecamp.packages.${system}.default;
|
||||||
openspec = inputs.openspec.packages.${system}.default;
|
openspec = inputs.openspec.packages.${system}.default;
|
||||||
|
|
||||||
# ── Modified packages ────────────────────────────────────────────
|
|
||||||
# Imported from flake inputs but built with local overrides.
|
|
||||||
|
|
||||||
# inputs.opencode is used for:
|
|
||||||
# - opencode binary (copied into the Tauri sidecars directory)
|
|
||||||
# - node_modules (with FOD hash fix for upstream issue #11755)
|
|
||||||
# - src + patches (via inputs.opencode)
|
|
||||||
opencode-desktop = pkgs.callPackage ./opencode-desktop {inherit inputs;};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
symlinkJoin,
|
|
||||||
makeWrapper,
|
|
||||||
rustPlatform,
|
|
||||||
pkg-config,
|
|
||||||
cargo-tauri,
|
|
||||||
bun,
|
|
||||||
nodejs,
|
|
||||||
cargo,
|
|
||||||
rustc,
|
|
||||||
jq,
|
|
||||||
wrapGAppsHook4,
|
|
||||||
dbus,
|
|
||||||
glib,
|
|
||||||
gtk4,
|
|
||||||
libsoup_3,
|
|
||||||
librsvg,
|
|
||||||
libappindicator,
|
|
||||||
glib-networking,
|
|
||||||
openssl,
|
|
||||||
webkitgtk_4_1,
|
|
||||||
gst_all_1,
|
|
||||||
inputs ? null,
|
|
||||||
}: let
|
|
||||||
# Get upstream opencode package for shared attributes
|
|
||||||
opencode = inputs.opencode.packages.${stdenv.hostPlatform.system}.default;
|
|
||||||
|
|
||||||
# Workaround for https://github.com/anomalyco/opencode/issues/11755
|
|
||||||
# Upstream is missing outputHashes for git dependencies
|
|
||||||
# Also fix stale npm deps hash in upstream node_modules FOD
|
|
||||||
fixedNodeModules = opencode.node_modules.overrideAttrs {
|
|
||||||
outputHash = "sha256-285KZ7rZLRoc6XqCZRHc25NE+mmpGh/BVeMpv8aPQtQ=";
|
|
||||||
};
|
|
||||||
|
|
||||||
opencode-desktop = rustPlatform.buildRustPackage (finalAttrs: {
|
|
||||||
pname = "opencode-desktop";
|
|
||||||
version = opencode.version;
|
|
||||||
src = opencode.src;
|
|
||||||
node_modules = fixedNodeModules;
|
|
||||||
patches = opencode.patches;
|
|
||||||
|
|
||||||
cargoRoot = "packages/desktop/src-tauri";
|
|
||||||
cargoLock = {
|
|
||||||
lockFile = finalAttrs.src + "/packages/desktop/src-tauri/Cargo.lock";
|
|
||||||
outputHashes = {
|
|
||||||
"specta-2.0.0-rc.22" = "sha256-YsyOAnXELLKzhNlJ35dHA6KGbs0wTAX/nlQoW8wWyJQ=";
|
|
||||||
"tauri-2.9.5" = "sha256-dv5E/+A49ZBvnUQUkCGGJ21iHrVvrhHKNcpUctivJ8M=";
|
|
||||||
"tauri-specta-2.0.0-rc.21" = "sha256-n2VJ+B1nVrh6zQoZyfMoctqP+Csh7eVHRXwUQuiQjaQ=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
|
||||||
[pkg-config cargo-tauri.hook bun nodejs cargo rustc jq makeWrapper]
|
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
|
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isLinux [
|
|
||||||
dbus
|
|
||||||
glib
|
|
||||||
gtk4
|
|
||||||
libsoup_3
|
|
||||||
librsvg
|
|
||||||
libappindicator
|
|
||||||
glib-networking
|
|
||||||
openssl
|
|
||||||
webkitgtk_4_1
|
|
||||||
gst_all_1.gstreamer
|
|
||||||
gst_all_1.gst-plugins-base
|
|
||||||
gst_all_1.gst-plugins-good
|
|
||||||
gst_all_1.gst-plugins-bad
|
|
||||||
];
|
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
cp -a ${finalAttrs.node_modules}/{node_modules,packages} .
|
|
||||||
chmod -R u+w node_modules packages
|
|
||||||
patchShebangs node_modules
|
|
||||||
patchShebangs packages/desktop/node_modules
|
|
||||||
|
|
||||||
mkdir -p packages/desktop/src-tauri/sidecars
|
|
||||||
cp ${opencode}/bin/opencode packages/desktop/src-tauri/sidecars/opencode-cli-${stdenv.hostPlatform.rust.rustcTarget}
|
|
||||||
'';
|
|
||||||
|
|
||||||
tauriBuildFlags = ["--config" "tauri.prod.conf.json" "--no-sign"];
|
|
||||||
|
|
||||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
|
||||||
mv $out/bin/OpenCode $out/bin/opencode-desktop
|
|
||||||
sed -i 's|^Exec=OpenCode$|Exec=opencode-desktop|' $out/share/applications/OpenCode.desktop
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
# Wrapper for Wayland support
|
|
||||||
in
|
|
||||||
symlinkJoin {
|
|
||||||
name = "opencode-desktop";
|
|
||||||
paths = [opencode-desktop];
|
|
||||||
|
|
||||||
nativeBuildInputs = [makeWrapper];
|
|
||||||
|
|
||||||
postBuild = ''
|
|
||||||
wrapProgram $out/bin/opencode-desktop \
|
|
||||||
--run 'if [[ "$NIXOS_OZONE_WL" == "1" ]]; then export OC_ALLOW_WAYLAND=1; fi'
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "OpenCode Desktop App with Wayland support";
|
|
||||||
homepage = "https://opencode.ai";
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
platforms = lib.platforms.linux;
|
|
||||||
mainProgram = "opencode-desktop";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -57,7 +57,6 @@ in
|
|||||||
customPackages.sidecar
|
customPackages.sidecar
|
||||||
|
|
||||||
# Code analysis tools
|
# Code analysis tools
|
||||||
customPackages.code2prompt
|
|
||||||
|
|
||||||
# Nix development tools (for this repo)
|
# Nix development tools (for this repo)
|
||||||
nil
|
nil
|
||||||
|
|||||||
Reference in New Issue
Block a user