From ff513a5b89b231ad0fc3daec659b13410c70aadb Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 14 Aug 2020 12:36:39 +0200 Subject: [PATCH] gnunet_git: remove --- .../networking/p2p/gnunet/git.nix | 92 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/gnunet/git.nix diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix deleted file mode 100644 index b3d455599bf0..000000000000 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake, texinfo, which -, withVerbose ? false }: - -let - rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; -in -stdenv.mkDerivation { - name = "gnunet-git-${rev}"; - - src = fetchgit { - url = "https://gnunet.org/git/gnunet.git"; - inherit rev; - sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses libidn - pkgconfig gettext libunistring makeWrapper - autoconf automake texinfo which - ]; - - configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l '\' {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - sed -i "$i" -e's/\/127.0.0.1/g' - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - - sh contrib/pogen.sh - sh bootstrap - ''; - - doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ - - meta = with stdenv.lib; { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = "https://gnunet.org/"; - - license = licenses.agpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3df944635c18..eb7de7579aad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -163,6 +163,7 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 gnuradio-nacl = gr-nacl; # added 2019-05-27 gnuradio-gsm = gr-gsm; # added 2019-05-27 gnuradio-ais = gr-ais; # added 2019-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e7af4c09da..5daac29de10e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20414,8 +20414,6 @@ in gnunet = callPackage ../applications/networking/p2p/gnunet { }; - gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; gocr = callPackage ../applications/graphics/gocr { };