From d5c92e8d69bb994e05f932dc78800c8a5b60e9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Sep 2026 17:56:15 -0700 Subject: [PATCH] celeste: drop --- pkgs/by-name/ce/celeste/librclone-path.patch | 31 ------ .../ce/celeste/missing-unsafe-block.patch | 25 ----- pkgs/by-name/ce/celeste/package.nix | 102 ------------------ pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 pkgs/by-name/ce/celeste/librclone-path.patch delete mode 100644 pkgs/by-name/ce/celeste/missing-unsafe-block.patch delete mode 100644 pkgs/by-name/ce/celeste/package.nix diff --git a/pkgs/by-name/ce/celeste/librclone-path.patch b/pkgs/by-name/ce/celeste/librclone-path.patch deleted file mode 100644 index 21af74dfde51..000000000000 --- a/pkgs/by-name/ce/celeste/librclone-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/librclone-sys/build.rs b/librclone-sys/build.rs -index 10e45bc..7d04c08 100644 ---- a/librclone-sys/build.rs -+++ b/librclone-sys/build.rs -@@ -16,15 +16,8 @@ fn main() { - println!("cargo:rerun-if-changed=go.mod"); - println!("cargo:rerun-if-changed=go.sum"); - -- Command::new("go") -- .args(["build", "--buildmode=c-archive", "-o"]) -- .arg(&format!("{}/librclone.a", out_dir)) -- .arg("github.com/rclone/rclone/librclone") -- .status() -- .expect("`go build` failed. Is `go` installed and latest version?"); -- -- println!("cargo:rustc-link-search=native={}", out_dir); -- println!("cargo:rustc-link-lib=static=rclone"); -+ println!("cargo:rustc-link-search=native={}", "@librclone@/lib"); -+ println!("cargo:rustc-link-lib=dylib=rclone"); - - if target_triple.ends_with("darwin") { - println!("cargo:rustc-link-lib=framework=CoreFoundation"); -@@ -32,7 +25,7 @@ fn main() { - } - - let bindings = bindgen::Builder::default() -- .header(format!("{}/librclone.h", out_dir)) -+ .header(format!("{}/librclone.h", "@librclone@/include")) - .allowlist_function("RcloneRPC") - .allowlist_function("RcloneInitialize") - .allowlist_function("RcloneFinalize") diff --git a/pkgs/by-name/ce/celeste/missing-unsafe-block.patch b/pkgs/by-name/ce/celeste/missing-unsafe-block.patch deleted file mode 100644 index 3810ec496f11..000000000000 --- a/pkgs/by-name/ce/celeste/missing-unsafe-block.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 96ec13b49ee2fcb2869f87b1f9e8c6cfc92275df Mon Sep 17 00:00:00 2001 -From: Tom van Dijk <18gatenmaker6@gmail.com> -Date: Fri, 14 Nov 2025 18:55:40 +0100 -Subject: [PATCH] rust 2024 fixes - ---- - src/main.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main.rs b/src/main.rs -index 127f649..5ef526e 100644 ---- a/src/main.rs -+++ b/src/main.rs -@@ -103,7 +103,7 @@ fn main() { - } - } else { - // Set `RUST_BACKTRACE` so we get a better backtrace for reporting. -- env::set_var("RUST_BACKTRACE", "1"); -+ unsafe { env::set_var("RUST_BACKTRACE", "1"); } - - // Run the command and get the stderr, checking for a backtrace. - let mut args = vec!["run-gui"]; --- -2.51.0 - diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix deleted file mode 100644 index 809a13df35b4..000000000000 --- a/pkgs/by-name/ce/celeste/package.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, - just, - pkg-config, - wrapGAppsHook4, - cairo, - dbus, - gdk-pixbuf, - glib, - graphene, - gtk4, - libadwaita, - librclone, - pango, - rclone, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "celeste"; - version = "0.8.3"; - - src = fetchFromGitHub { - owner = "hwittenborn"; - repo = "celeste"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; - }; - - cargoHash = "sha256-OBGDnhpVLOPdYhofWfeaueklt7KBkLhM02JNvuvUQ2Q="; - - # rust 2024 requires that you put an unsafe block around std::env::set_var - patches = [ ./missing-unsafe-block.patch ]; - - postPatch = '' - pushd $cargoDepsCopy/*/librclone-sys-* - oldHash=$(sha256sum build.rs | cut -d " " -f 1) - patch -p2 < ${./librclone-path.patch} - substituteInPlace build.rs \ - --subst-var-by librclone ${librclone} - substituteInPlace .cargo-checksum.json \ - --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) - popd - - substituteInPlace justfile \ - --replace "{{ env_var('DESTDIR') }}/usr" "${placeholder "out"}" - # buildRustPackage takes care of installing the binary - sed -i "#/bin/celeste#d" justfile - - # fix: as of rust 1.85, it is required that you specify edition 2024 for let chains - substituteInPlace Cargo.toml \ - --replace-warn 'edition = "2021"' 'edition = "2024"' - ''; - - env.RUSTC_BOOTSTRAP = 1; - - nativeBuildInputs = [ - just - pkg-config - rustPlatform.bindgenHook - wrapGAppsHook4 - ]; - - buildInputs = [ - cairo - dbus - gdk-pixbuf - glib - graphene - gtk4 - libadwaita - librclone - pango - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ - "-Wno-error=incompatible-function-pointer-types" - ] - ); - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ rclone ]}" - ) - ''; - - postInstall = '' - just install - ''; - - meta = { - changelog = "https://github.com/hwittenborn/celeste/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - description = "GUI file synchronization client that can sync with any cloud provider"; - mainProgram = "celeste"; - homepage = "https://github.com/hwittenborn/celeste"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3c071c369a2b..17ebc74a9779 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -486,6 +486,7 @@ mapAliases { cdparanoiaIII = cdparanoia-iii; # Added 2026-02-08 cdwe = throw "'cdwe' has been removed, as it has been unmaintained upstream since June 2023"; # Added 2026-01-01 cedille = throw "'cedille' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 + celeste = throw "'celeste' has been removed because it was broken and the upstream project was archived (or did you mean 'celestegame'?)"; # added 2026-09-11 cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12 cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12 certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27