diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix deleted file mode 100644 index bae3e53f441f..000000000000 --- a/pkgs/development/libraries/openssl/chacha.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, zlib -, withCryptodev ? false, cryptodev -}: - -with lib; -stdenv.mkDerivation { - pname = "openssl-chacha"; - version = "2016-08-22"; - - src = fetchFromGitHub { - owner = "PeterMosmans"; - repo = "openssl"; - rev = "293717318e903b95f4d7e83a98a087282f37efc3"; - sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00"; - }; - - outputs = [ "bin" "dev" "out" "man" ]; - setOutputFlags = false; - - nativeBuildInputs = [ perl zlib ]; - buildInputs = lib.optional withCryptodev cryptodev; - - configureScript = "./config"; - - configureFlags = [ - "zlib" - "shared" - "experimental-jpake" - "enable-md2" - "enable-rc5" - "enable-rfc3779" - "enable-gost" - "--libdir=lib" - "--openssldir=etc/ssl" - ] ++ lib.optionals withCryptodev [ - "-DHAVE_CRYPTODEV" - "-DUSE_CRYPTODEV_DIGESTS" - ]; - - makeFlags = [ - "MANDIR=$(man)/share/man" - ]; - - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; - - postInstall = '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then - rm "$out/lib/"*.a - fi - - mkdir -p $bin - mv $out/bin $bin/ - - mkdir $dev - mv $out/include $dev/ - - # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc - - rmdir $out/etc/ssl/{certs,private} - ''; - - postFixup = '' - # Check to make sure we don't depend on perl - if grep -r '${perl}' $out; then - echo "Found an erroneous dependency on perl ^^^" >&2 - exit 1 - fi - ''; - - meta = { - homepage = "https://www.openssl.org/"; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.cstrahan ]; - license = licenses.openssl; - priority = 10; # resolves collision with ‘man-pages’ - }; -} diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix deleted file mode 100644 index 23022f92b6af..000000000000 --- a/pkgs/tools/security/cipherscan/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }: - -stdenv.mkDerivation rec { - pname = "cipherscan"; - version = "2016-08-16"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "cipherscan"; - rev = "74dd82e8ad994a140daf79489d3bd1c5ad928d38"; - sha256 = "16azhlmairnvdz7xmwgvfpn2pzw1p8z7c9b27m07fngqjkpx0mhh"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 ]; - - strictDeps = true; - - buildPhase = '' - substituteInPlace cipherscan --replace '$0' 'cipherscan' - ''; - - installPhase = '' - mkdir -p $out/bin - - cp cipherscan $out/bin - cp openssl.cnf $out/bin - cp analyze.py $out/bin/cipherscan-analyze - - wrapProgram $out/bin/cipherscan \ - --set NOAUTODETECT 1 \ - --set TIMEOUTBIN "${coreutils}/bin/timeout" \ - --set OPENSSLBIN "${openssl}/bin/openssl" - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Very simple way to find out which SSL ciphersuites are supported by a target"; - license = licenses.mpl20; - platforms = platforms.all; - maintainers = with maintainers; [ cstrahan fpletz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc86887cba15..c398b3efdfbd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -139,6 +139,7 @@ mapAliases ({ caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 + callPackage_i686 = pkgsi686Linux.callPackage; cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; @@ -150,8 +151,8 @@ mapAliases ({ chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 + cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 - callPackage_i686 = pkgsi686Linux.callPackage; creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 # these are for convenience, not for backward compat and shouldn't expire diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65c5b9e133f0..7208913d4c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4244,12 +4244,6 @@ with pkgs; cilium-cli = callPackage ../applications/networking/cluster/cilium { }; - cipherscan = callPackage ../tools/security/cipherscan { - openssl = if stdenv.hostPlatform.system == "x86_64-linux" - then openssl-chacha - else openssl; - }; - cjdns = callPackage ../tools/networking/cjdns { }; cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; @@ -19630,8 +19624,6 @@ with pkgs; openssl_1_1 openssl_3_0; - openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; - opensubdiv = callPackage ../development/libraries/opensubdiv { }; opensupaplex = callPackage ../games/opensupaplex { };