pkgs: drop upstreamed packages

README.md

@@ -7,7 +7,6 @@ NixOS packages for personal use.
 - [adb-sync] : Fork of [Google's adb-sync] with bugfixes for busybox users and the pull times feature
 - [adbtuifm] : TUI based file manager for ADB
 - [adx] : Rust tool to poll Google Maven for AndroidX packages and their latest versions
-- [bundletool] : Command-line tool to manipulate Android App Bundles
 - [clipboard-substitutor] : Rust CLI to listen to clipboard events and perform operations on the copied text
 - [diffuse] : Java tool to diff between APKs, AARs and JARs
 - [file-collector] : Simple CLI tool to watch directories and move their files to a single dumping ground
@@ -16,13 +15,11 @@ NixOS packages for personal use.
 - [gphotos-cdp] : Use the Chrome DevTools Protocol to drive a Chrome session that downloads your photos stored in Google Photos.
 - [hcctl]: CLI to look up the status of checks on https://healthchecks.io
 - [healthchecks-monitor]: CLI tool to run commands and report its result to https://healthchecks.io
-- [hyperlink]: Very fast link checker for CI
 - [katbin] : A CLI for [katb.in]
 - [linkleaner] : Telegram bot to fix social media link previews
 - [monocraft-nerdfonts] : A monospaced programming font inspired by the Minecraft typeface
 - [patreon-dl] : Download content from creators you're subscribed to on Patreon
 - [pidcat] : Fork of [JakeWharton's pidcat] with Python3 support and some other fixes
-- [samply] : A command line profiler for macOS and Linux
 - [tea] : Gitea CLI built from latest sources
 - [twt] : Multipurpose tool to extract metadata from a user's tweets
 - [when] : A CLI tool to deal with timezones 
@@ -31,7 +28,6 @@ NixOS packages for personal use.
 [Google's adb-sync]: https://github.com/google/adb-sync
 [adbtuifm]: https://github.com/darkhz/adbtuifm
 [adx]: https://msfjarvis.dev/g/androidx-release-watcher
-[bundletool]: https://developer.android.com/studio/command-line/bundletool
 [clipboard-substitutor]: https://msfjarvis.dev/g/clipboard-substitutor
 [diffuse]: https://github.com/JakeWharton/diffuse
 [file-collector]: https://msfjarvis.dev/g/file-collector
@@ -40,8 +36,6 @@ NixOS packages for personal use.
 [gphotos-cdp]: https://msfjarvis.dev/g/gphotos-cdp
 [hcctl]: https://msfjarvis.dev/g/healthchecks-rs
 [healthchecks-monitor]: https://msfjarvis.dev/g/healthchecks-rs
-[hyperlink]: https://github.com/untitaker/hyperlink
-[jetbrains-mono-nerdfonts]: https://github.com/ryanoasis/nerd-fonts
 [katbin]: https://github.com/SphericalKat/katbin-cli
 [katb.in]: https://katb.in
 [linkleaner]: https://msfjarvis.dev/g/linkleaner
@@ -51,5 +45,4 @@ NixOS packages for personal use.
 [JakeWharton's pidcat]: https://github.com/JakeWharton/pidcat
 [tea]: https://gitea.com/gitea/tea
 [twt]: https://msfjarvis.dev/g/twt
-[samply]: https://github.com/mstange/samply/
 [when]: https://github.com/mitsuhiko/when

pkgs/bundletool-bin/default.nix

@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-}:
-stdenvNoCC.mkDerivation rec {
-  pname = "bundletool-bin";
-  version = "1.15.6";
-  src = fetchurl {
-    url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
-    hash = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg=";
-  };
-
-  dontUnpack = true;
-  dontBuild = true;
-  dontConfigure = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    printf "#!/bin/sh\n\nexec java \$JAVA_OPTS -jar \$0 \"\$@\"\n" > $out/bin/bundletool
-    cat $src >> $out/bin/bundletool
-    chmod +x $out/bin/bundletool
-  '';
-
-  meta = with lib; {
-    description = "Bundletool is a command-line tool to manipulate Android App Bundles";
-    homepage = "https://g.co/androidappbundle";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [msfjarvis];
-    mainProgram = "bundletool";
-  };
-}

pkgs/default.nix

@@ -9,7 +9,6 @@ in {
   adb-sync = callPackage ./adb-sync {};
   adbtuifm = callPackage ./adbtuifm {};
   adx = callPackage ./adx {};
-  bundletool-bin = callPackage ./bundletool-bin {};
   clipboard-substitutor = callPackage ./clipboard-substitutor {};
   diffuse-bin = callPackage ./diffuse-bin {};
   gdrive = callPackage ./gdrive {};
@@ -20,7 +19,6 @@ in {
   gphotos-cdp = callPackage ./gphotos-cdp {};
   hcctl = callPackage ./hcctl {};
   healthchecks-monitor = callPackage ./healthchecks-monitor {};
-  hyperlink = callPackage ./hyperlink {};
   katbin = callPackage ./katbin {};
   linkleaner = callPackage ./linkleaner {
     inherit (fenix) fromManifestFile;
@@ -30,7 +28,6 @@ in {
   patreon-dl = callPackage ./patreon-dl {};
   pidcat = callPackage ./pidcat {};
   rucksack = callPackage ./rucksack {};
-  samply = callPackage ./samply {};
   tea-dev = callPackage ./tea-dev {};
   twt = lib.warn "twt is no longer maintained" callPackage ./twt {};
   when = callPackage ./when {};

pkgs/hyperlink/default.nix

@@ -1,28 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "hyperlink";
-  version = "0.1.32";
-
-  src = fetchFromGitHub {
-    owner = "untitaker";
-    repo = "hyperlink";
-    rev = version;
-    hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4=";
-  };
-
-  cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc=";
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Very fast link checker for CI";
-    homepage = "https://github.com/untitaker/hyperlink";
-    license = licenses.mit;
-    maintainers = with maintainers; [msfjarvis];
-    mainProgram = "hyperlink";
-  };
-}

pkgs/samply/default.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  stdenv,
-  darwin,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "samply";
-  version = "unstable-2023-07-11";
-
-  src = fetchFromGitHub {
-    owner = "mstange";
-    repo = "samply";
-    rev = "d4b3fa2a30f755340d1bd9df3f6b3417b165569b";
-    hash = "sha256-d2OLyjjztdDUQKdsAa8S9CmfcXqu9lJ1EXqiEBRbxWo=";
-  };
-
-  buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.CoreFoundation
-    darwin.apple_sdk.frameworks.CoreServices
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  buildAndTestSubdir = "samply";
-
-  cargoHash = "sha256-deOXO+NmgETX33vY2KdFdCverojr+i2FdemhGXWZ3NU=";
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A command line profiler for macOS and Linux";
-    homepage = "https://github.com/mstange/samply/";
-    license = with licenses; [asl20 mit];
-    maintainers = with maintainers; [msfjarvis];
-    mainProgram = "samply";
-  };
-}