From 008c9eea9a5b21317d29d8e13736175f81a0e5fd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 27 Jun 2026 23:18:45 +0200 Subject: [PATCH] cup-docker: drop The web FOD was unsound, see #424038 for context --- .../cu/cup-docker-noserver/package.nix | 7 -- pkgs/by-name/cu/cup-docker/package.nix | 91 ------------------- pkgs/top-level/aliases.nix | 2 + 3 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 pkgs/by-name/cu/cup-docker-noserver/package.nix delete mode 100644 pkgs/by-name/cu/cup-docker/package.nix diff --git a/pkgs/by-name/cu/cup-docker-noserver/package.nix b/pkgs/by-name/cu/cup-docker-noserver/package.nix deleted file mode 100644 index 64597c39dbe4..000000000000 --- a/pkgs/by-name/cu/cup-docker-noserver/package.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - cup-docker, -}: - -cup-docker.override { - withServer = false; -} diff --git a/pkgs/by-name/cu/cup-docker/package.nix b/pkgs/by-name/cu/cup-docker/package.nix deleted file mode 100644 index 03695438dbe4..000000000000 --- a/pkgs/by-name/cu/cup-docker/package.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - rustPlatform, - fetchFromGitHub, - lib, - stdenvNoCC, - bun, - nodejs-slim_latest, - nix-update-script, - withServer ? true, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "cup-docker"; - version = "3.5.1"; - - src = fetchFromGitHub { - owner = "sergi0g"; - repo = "cup"; - tag = "v${finalAttrs.version}"; - hash = "sha256-l7TQwCzQNwrsM+xRcRcQaxIsnd8SVzrqEMwIoZGVBR0="; - }; - - web = stdenvNoCC.mkDerivation (finalAttrsWeb: { - pname = "cup-docker-web"; - inherit (finalAttrs) version src; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" - "SOCKS_SERVER" - ]; - sourceRoot = "${finalAttrsWeb.src.name}/web"; - nativeBuildInputs = [ - bun - nodejs-slim_latest - ]; - configurePhase = '' - runHook preConfigure - bun install --no-progress --frozen-lockfile - substituteInPlace node_modules/.bin/{vite,tsc} \ - --replace-fail "/usr/bin/env node" "${nodejs-slim_latest}/bin/node" - runHook postConfigure - ''; - buildPhase = '' - runHook preBuild - bun run build - runHook postBuild - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/dist - cp -R ./dist $out - runHook postInstall - ''; - outputHash = "sha256-uLsWppRabaI7JSHYf3YsEvf0Y36kU/iuNXnDXd+6AXY="; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }); - - cargoHash = "sha256-1VSbv6lDRRLZIu7hYrAqzQmvxcuhnPU0rcWfg7Upcm4="; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "cli" - ] - ++ lib.optional withServer [ - "server" - ]; - - preConfigure = lib.optionalString withServer '' - cp -r ${finalAttrs.web}/dist src/static - ''; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "web" - ]; - }; - }; - - meta = { - description = "Lightweight way to check for container image updates. written in Rust"; - homepage = "https://cup.sergi0g.dev"; - license = lib.licenses.agpl3Only; - platforms = lib.platforms.all; - changelog = "https://github.com/sergi0g/cup/releases"; - mainProgram = "cup"; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 986a37e07249..d237c0ab6e6b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -609,6 +609,8 @@ mapAliases { cudaPackages_12_3 = throw "CUDA 12.3 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 + cup-docker = throw "'cup-docker' has been removed, due to being orphaned and packaged in an unreproducible manner"; # Added 2026-06-27 + cup-docker-noserver = throw "'cup-docker-noserver' has been removed, due to being orphaned and packaged in an unreproducible manner"; # Added 2026-06-27 cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27 cura = throw "'cura' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22 curaengine = throw "'curaengine' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22