From d22575be494d6aa5f69f8112af98e8d16f58c750 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 10:05:24 +0800 Subject: imag: drop --- pkgs/applications/misc/imag/default.nix | 61 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 --- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/applications/misc/imag/default.nix diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index d923dc9bfedbd..0000000000000 --- a/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages -, openssl -, pkg-config -, installShellFiles -, Security -, gitMinimal -, util-linuxMinimal -}: - -rustPlatform.buildRustPackage rec { - pname = "imag"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "matthiasbeyer"; - repo = pname; - rev = "v${version}"; - sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; - }; - - nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; - - cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; - - checkPhase = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - - # UI tests uses executables directly, so we need to build them before - # launching the tests - cargo build - '' + ( - # CLI uses the presence of a controlling TTY to check if arguments are - # passed in stdin, or in the command-line, so we use script to create - # a PTY for us. - if !stdenv.isDarwin then '' - script -qfec "cargo test --workspace" - '' else '' - script -q "cargo test --workspace" - '' - ); - - postInstall = '' - installShellCompletion target/imag.{bash,fish} --zsh target/_imag - ''; - - meta = with lib; { - description = "Commandline personal information management suite"; - homepage = "https://imag-pim.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ Br1ght0ne minijackson ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7cde84f5295ba..14c0f0002a2aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -652,6 +652,7 @@ mapAliases ({ idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 + imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daec05886d779..6a21d40cc0409 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30072,11 +30072,6 @@ with pkgs; avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; - imag = callPackage ../applications/misc/imag { - inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; - }; - image-roll = callPackage ../applications/graphics/image-roll { }; imagej = callPackage ../applications/graphics/imagej { }; -- cgit 1.4.1