From a8c3a293c7430eb9991e93174ec2213ec8342961 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 17 Apr 2025 21:13:43 -0700 Subject: [PATCH 1/2] cliscord: modernize --- pkgs/misc/cliscord/default.nix | 19 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 5531b8c9805e..41f2f38e74ee 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -1,36 +1,33 @@ { lib, - stdenv, rustPlatform, + fetchFromGitHub, openssl, pkg-config, - fetchFromGitHub, - Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "cliscord"; - version = "unstable-2022-10-07"; + version = "0-unstable-2022-10-07"; src = fetchFromGitHub { owner = "somebody1234"; - repo = pname; + repo = "cliscord"; rev = "d62317d55c07ece8c9d042dcd74b62e58c9bfaeb"; hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4="; }; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; - useFetchCargoVendor = true; cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U="; - meta = with lib; { + meta = { description = "Simple command-line tool to send text and files to discord"; homepage = "https://github.com/somebody1234/cliscord"; - license = licenses.mit; - maintainers = with maintainers; [ lom ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lom ]; mainProgram = "cliscord"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff9041c61f98..385cd3a03903 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7292,9 +7292,7 @@ with pkgs; jdk = graalvmPackages.graalvm-ce; }; - cliscord = callPackage ../misc/cliscord { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cliscord = callPackage ../misc/cliscord { }; clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { jre = jre8; From 1c89974d74b0b499630625383a44767552484ead Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 17 Apr 2025 21:14:46 -0700 Subject: [PATCH 2/2] cliscord: migrate to by-name --- .../cliscord/default.nix => by-name/cl/cliscord/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/cliscord/default.nix => by-name/cl/cliscord/package.nix} (100%) diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/by-name/cl/cliscord/package.nix similarity index 100% rename from pkgs/misc/cliscord/default.nix rename to pkgs/by-name/cl/cliscord/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 385cd3a03903..2f5ebe9966ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7292,8 +7292,6 @@ with pkgs; jdk = graalvmPackages.graalvm-ce; }; - cliscord = callPackage ../misc/cliscord { }; - clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { jre = jre8; };