From e24884f9292ababdf451f119c69f7bd037975699 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Sun, 19 Mar 2017 10:02:17 -0500
Subject: [PATCH] nix.org: remove some unneeded packages.

---
 nix.org | 138 --------------------------------------------------------
 1 file changed, 138 deletions(-)

diff --git a/nix.org b/nix.org
index f0354fc..cf4e0ad 100644
--- a/nix.org
+++ b/nix.org
@@ -18,23 +18,8 @@ Nix user config.nix setup.
   {
     packageOverrides = pkgs: with pkgs;
     let in rec {
-      custom-pybugz = with python34Packages; buildPythonPackage rec {
-        name = "pybugz-${version}";
-        version = "0.13";
-        src = pkgs.fetchgit {
-          url = https://github.com/williamh/pybugz.git;
-          rev = "4dec396d43061c1def9aa19601c89c8aa00742b3";
-          sha256 = "1s21jma83cyynmv3696hbrgy0d3sq4j027iplhnw22q2237bk1xd";
-        };
-        # TODO: Fix this, something to do with how its using unittest
-        doCheck = false;
-        buildInputs = [ pkgs.glibcLocales ];
-        propagatedBuildInputs = [ six ];
-      };
       custom-pinentry = pinentry.override { gtk2 = null; qt4 = null; ncurses = null; };
       custom-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; };
-      # 3 unit tests fail on both 27 pylint and 35 pylint, so ignore it
-#      custom-pylint = python35Packages.pylint.override { doCheck = false; };
 
       custom-git = git.override {
         pythonSupport = false;
@@ -43,125 +28,11 @@ Nix user config.nix setup.
         sendEmailSupport = true;
       };
 
-<<<<<<< variant A
-    default = buildEnv {
-      name = "default";
-      ignoreCollisions = true;
-      paths = [
-        ack
-        ansible
-        aria
-        aspell
-        aspellDicts.en
-        bazaarTools
-        cacert
-        clang
-        clang-analyzer
-        cloc
-        cscope
-        ctags
-        curl
-        custom-git
-        custom-pinentry
-        custom-pybugz
-        custom-pylint
-        custom-youtube-dl
-        diffutils
-        docbook5
-        duply
-        emacs
-        entr
-        gcc
-        gdbm
-        ghostscript
-        gist
-        gitAndTools.git-extras
-        gitAndTools.gitFull
-        gnumake
-        gnupg
-        gnupg1compat
-        gnutar
-        graphviz-nox
-        haskellPackages.ShellCheck
-        haskellPackages.bake
-        haskellPackages.cabal-install
-        haskellPackages.cabal-dependency-licenses
-        haskellPackages.ghc-core
-        haskellPackages.ghc-mod
-        haskellPackages.hasktags
-        haskellPackages.hindent
-        haskellPackages.hoogle
-        haskellPackages.hspec
-        haskellPackages.idris
-        haskellPackages.intero
-        haskellPackages.network
-        haskellPackages.pandoc
-        haskellPackages.shake
-        haskellPackages.stack
-        htop
-        imagemagick
-        iperf
-        jq
-        keychain
-        lastpass-cli
-        less
-        llvm
-        mercurial
-        moreutils
-        mosh
-        multimarkdown
-        multitail
-        mutt
-        mr
-        nox
-        openssl
-        p7zip
-        patchutils
-        pbzip2
-        pigz
-        pixz
-        pkgconfig
-        poppler_utils
-        postgresql
-        pv
-        python27Packages.bugzilla
-        python27Packages.flake8
-        python27Packages.howdoi
-        python27Packages.pip
-        python27Packages.pyflakes
-        python27Packages.virtualenv
-        readline
-        rlwrap
-        rsync
-        rtags
-        gmp
-        silver-searcher
-        sloccount
-        sqlite
-        sshpass
-        subversionClient
-        texlive.combined.scheme-full
-        tmux
-        tree
-        unrar
-        unzip
-        upx
-        wakelan
-        watch
-        wget
-        xz
-# If I ever come up with some linux only stuff or figure out xhyve
-#      ] ++ stdenv.lib.optionals stdenv.isLinux [
-#      ] ++ stdenv.lib.optionals stdenv.isDarwin [
-#        xhyve
-      ];
->>>>>>> variant B
       default = buildEnv {
         name = "default";
         ignoreCollisions = true;
         paths = [
           ack
-          ansible
           aria
           aspell
           aspellDicts.en
@@ -175,8 +46,6 @@ Nix user config.nix setup.
           curl
           custom-git
           custom-pinentry
-          custom-pybugz
-#          custom-pylint
           custom-youtube-dl
           diffutils
           docbook5
@@ -205,7 +74,6 @@ Nix user config.nix setup.
           haskellPackages.hspec
           haskellPackages.idris
           haskellPackages.intero
-          haskellPackages.network
           haskellPackages.pandoc
           haskellPackages.shake
           haskellPackages.stack
@@ -233,16 +101,12 @@ Nix user config.nix setup.
           pigz
           pixz
           pkgconfig
-          poppler_utils
-          postgresql
           pv
-          python27Packages.bugzilla
           python27Packages.flake8
           python27Packages.howdoi
           python27Packages.pip
           python27Packages.pyflakes
           python27Packages.virtualenv
-          readline
           rlwrap
           rsync
           rtags
@@ -251,7 +115,6 @@ Nix user config.nix setup.
           sloccount
           sqlite
           sshpass
-          subversionClient
           texlive.combined.scheme-full
           tmux
           tree
@@ -269,7 +132,6 @@ Nix user config.nix setup.
   #        xhyve
         ];
       };
-======= end
     };
     allowUnfree = true;
   }