diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2022-02-21 17:27:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-21 17:27:03 +0100 |
commit | 34f3300e968a25c0df74cc889a002f002d024ebf (patch) | |
tree | bfc90c53b9d957cd4075d9ed37a1e1545801149f /pkgs | |
parent | 55bf481a215ebbb80eeb548d15d19cdce853aa66 (diff) | |
parent | e4d3cc8f6705211ef4dc1f549473975fa59c7bc3 (diff) | |
download | nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar.gz nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar.bz2 nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar.lz nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar.xz nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.tar.zst nixpkgs-34f3300e968a25c0df74cc889a002f002d024ebf.zip |
Merge pull request #160238 from helsinki-systems/drop/scallion
scallion: drop
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/scallion/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 38 deletions
diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix deleted file mode 100644 index 6f0dcd1bb01..00000000000 --- a/pkgs/tools/security/scallion/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: - -stdenv.mkDerivation rec { - version = "2.1"; - pname = "scallion"; - - src = fetchFromGitHub { - owner = "lachesis"; - repo = "scallion"; - rev = "v${version}"; - sha256 = "1l9aj101xpsaaa6kmmhmq68m6z8gzli1iaaf8xaxbivq0i7vka9k"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ mono ]; - - buildPhase = '' - xbuild scallion.sln - ''; - - installPhase = '' - mkdir -p $out/share - cp scallion/bin/Debug/* $out/share/ - makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ - --add-flags $out/share/scallion.exe - ''; - - meta = with lib; { - description = "GPU-based tor hidden service name generator"; - homepage = src.meta.homepage; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ volth ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b1de0987755..6d971b47e07 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1061,6 +1061,7 @@ mapAliases ({ saneBackendsGit = sane-backends; # Added 2016-01-02 saneFrontends = sane-frontends; # Added 2016-01-02 scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 + scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 scim = sc-im; # Added 2016-01-22 scollector = bosun; # Added 2018-04-25 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4538d4fc25..6fa83bbc292 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9605,8 +9605,6 @@ with pkgs; sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; - scallion = callPackage ../tools/security/scallion { }; - scanbd = callPackage ../tools/graphics/scanbd { }; scdoc = callPackage ../tools/typesetting/scdoc { }; |