From 6ca1d4f8502d952392b2870cd4db1cfe565112c6 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 10 Jul 2025 14:45:55 +0200 Subject: [PATCH] cup-docker: drop The web FOD was unsound, see https://github.com/NixOS/nixpkgs/pull/424038 for context --- pkgs/by-name/cu/cup-docker/package.nix | 97 -------------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 pkgs/by-name/cu/cup-docker/package.nix 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 d142bd8e15003..0000000000000 --- a/pkgs/by-name/cu/cup-docker/package.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - rustPlatform, - fetchFromGitHub, - lib, - stdenvNoCC, - bun, - nodejs-slim_latest, - nix-update-script, - withServer ? true, -}: -let - pname = "cup-docker"; - version = "3.4.2"; - src = fetchFromGitHub { - owner = "sergi0g"; - repo = "cup"; - tag = "v${version}"; - hash = "sha256-gKKSrd58F8pe/fy29gLY/4ugfhVXI0yyUnIarIMF/L8="; - }; - web = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "${pname}-web"; - inherit version src; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" - "SOCKS_SERVER" - ]; - sourceRoot = "${finalAttrs.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-Ac1PJYmTQv9XrmhmF1p77vdXh8252hz0CUKxJA+VQR4="; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }); -in -rustPlatform.buildRustPackage { - inherit - src - version - pname - ; - - cargoHash = "sha256-1VSbv6lDRRLZIu7hYrAqzQmvxcuhnPU0rcWfg7Upcm4="; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "cli" - ] - ++ lib.optional withServer [ - "server" - ]; - - preConfigure = lib.optionalString withServer '' - cp -r ${web}/dist src/static - ''; - - passthru = { - inherit web; - 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 8263260bc55c3..835ce787d5aca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -682,6 +682,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 was removed due to being package in a unreproducible manner"; # Added 2025-08-13 + cup-docker-noserver = throw "cup-docker-noserver was removed due to being package in a unreproducible manner"; # Added 2025-08-13 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a2391fb7cf60..54ff0770c718f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -345,8 +345,6 @@ with pkgs; copilot-language-server-fhs = copilot-language-server.fhs; - cup-docker-noserver = cup-docker.override { withServer = false; }; - deck = callPackage ../by-name/de/deck/package.nix { buildGoModule = buildGo123Module; };