From 7786767beafcf8d249b36976501d62f00c0cd354 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 29 Apr 2017 12:22:11 +0200 Subject: [PATCH] ccnx: remove upstream has been replaced by another project, doesn't build with openssl 1.1 and is not used elsewhere in nixpkgs See https://github.com/ProjectCCNx/ccnx --- pkgs/development/libraries/ccnx/default.nix | 38 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 40 deletions(-) delete mode 100644 pkgs/development/libraries/ccnx/default.nix diff --git a/pkgs/development/libraries/ccnx/default.nix b/pkgs/development/libraries/ccnx/default.nix deleted file mode 100644 index 4634a80ade6..00000000000 --- a/pkgs/development/libraries/ccnx/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, openssl, expat, libpcap }: -let - version = "0.8.2"; -in -stdenv.mkDerivation { - name = "ccnx-${version}"; - src = fetchurl { - url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz"; - sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00"; - }; - buildInputs = [ openssl expat libpcap ]; - preConfigure = '' - mkdir -p $out/include - mkdir -p $out/lib - mkdir -p $out/bin - substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh" - ''; - meta = with stdenv.lib; { - homepage = http://www.ccnx.org/; - description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; - longDescription = '' - To address the Internet’s modern-day requirements with a better - fitting model, PARC has created a new networking architecture - called Content-Centric Networking (CCN), which operates by addressing - and delivering Content Objects directly by Name instead of merely - addressing network end-points. In addition, the CCN security model - explicitly secures individual Content Objects rather than securing - the connection or “pipe”. Named and secured content resides in - distributed caches automatically populated on demand or selectively - pre-populated. When requested by name, CCN delivers named content to - the user from the nearest cache, thereby traversing fewer network hops, - eliminating redundant requests, and consuming less resources overall. - ''; - license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f17916f5b4..cc8b614f90b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7529,8 +7529,6 @@ with pkgs; capnproto = callPackage ../development/libraries/capnproto { }; - ccnx = callPackage ../development/libraries/ccnx { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; cddlib = callPackage ../development/libraries/cddlib {};