diff options
author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-06-23 01:41:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 01:41:35 +0200 |
commit | 0167eef92e4365835ff8382f8f72eacc0f1b3b39 (patch) | |
tree | 7a89d805e288d243f3f2bbd1470c0964153c8a32 /pkgs | |
parent | cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4 (diff) | |
parent | a18ee50f4c426c6c493df8722162100c264418b7 (diff) | |
download | nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar.gz nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar.bz2 nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar.lz nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar.xz nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.tar.zst nixlib-0167eef92e4365835ff8382f8f72eacc0f1b3b39.zip |
Merge pull request #16308 from philandstuff/remove-certificate-transparency
certificate-transparency: remove package
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/certificate-transparency/default.nix | 57 | ||||
-rw-r--r-- | pkgs/servers/certificate-transparency/protobuf-include-from-env.patch | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 0 insertions, 73 deletions
diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix deleted file mode 100644 index 292ca6bc0e37..000000000000 --- a/pkgs/servers/certificate-transparency/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, pkgs, ...}: - -stdenv.mkDerivation rec { - name = "certificate-transparency-${version}"; - - version = "2016-01-14"; - rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08"; - - meta = with stdenv.lib; { - homepage = https://www.certificate-transparency.org/; - description = "Auditing for TLS certificates"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ philandstuff ]; - }; - - src = pkgs.fetchFromGitHub { - owner = "google"; - repo = "certificate-transparency"; - rev = rev; - sha256 = "1gn0bqzkf09jvc2aq3da8fwhl65y7q57msqsh6iczvd6fdmrpfdj"; - }; - - # need to disable regex support in evhtp or building will fail - libevhtp_without_regex = stdenv.lib.overrideDerivation pkgs.libevhtp - (oldAttrs: { - cmakeFlags="-DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS:STRING=-fPIC"; - }); - - buildInputs = with pkgs; [ - autoconf automake clang_34 pkgconfig - glog gmock google-gflags gperftools gtest json_c leveldb - libevent libevhtp_without_regex openssl protobuf sqlite - ]; - - patches = [ - ./protobuf-include-from-env.patch - ]; - - doCheck = false; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - CC=clang - CXX=clang++ - GMOCK_DIR=${pkgs.gmock} - GTEST_DIR=${pkgs.gtest} - ) - ''; - - # the default Makefile constructs BUILD_VERSION from `git describe` - # which isn't available in the nix build environment - makeFlags = "BUILD_VERSION=${version}-${rev}"; - - protocFlags = "-I ${pkgs.protobuf}/include"; -} diff --git a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch deleted file mode 100644 index a1f9a1849b63..000000000000 --- a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch +++ /dev/null @@ -1,14 +0,0 @@ -Get protobuf include path from environment - ---- a/python/Makefile -+++ b/python/Makefile -@@ -5,7 +5,7 @@ all: ct/proto/client_pb2.py ct/proto/ct_pb2.py ct/proto/tls_options_pb2.py \ - ct/proto/test_message_pb2.py ct/proto/certificate_pb2.py - - ct/proto/%_pb2.py: ct/proto/%.proto -- $(PROTOC) $^ -I/usr/include/ -I/usr/local/include -I$(INSTALL_DIR)/include -I. --python_out=. -+ $(PROTOC) $^ $(protocFlags) -I. --python_out=. - - ct/proto/ct_pb2.py: ../proto/ct.proto - $(PROTOC) --python_out=ct/proto -I../proto ../proto/ct.proto - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 574860710298..0d1177932ca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -670,8 +670,6 @@ in gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; - certificate-transparency = callPackage ../servers/certificate-transparency { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; ccnet = callPackage ../tools/networking/ccnet { }; |