From aa686fe5c3d799c8fc6da74648f0362947fb24f4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 27 Jan 2017 18:37:24 +0100
Subject: gnutls33: remove

---
 pkgs/applications/audio/freewheeling/default.nix | 18 +++++++++++-------
 pkgs/development/libraries/gnutls/3.3.nix        | 10 ----------
 pkgs/top-level/all-packages.nix                  |  4 ----
 3 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/3.3.nix

diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index ecb9d0f85d050..6b4913d30dcad 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
 , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
 , libSM, libsndfile, libogg
 }:
 
 stdenv.mkDerivation rec {
   name = "freewheeling-${version}";
-  version = "100";
+  version = "2016-11-15";
 
-  src = fetchsvn {
-    url = svn://svn.code.sf.net/p/freewheeling/code;
-    rev = version;
-    sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv";
+  src = fetchFromGitHub {
+    owner = "free-wheeling";
+    repo = "freewheeling";
+    rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
+    sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
-    gnutls33 freetype SDL SDL_gfx SDL_ttf
+    freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
+    (gnutls.overrideAttrs (oldAttrs: {
+      configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
+    }))
   ];
 
   patches = [ ./am_path_sdl.patch ./xml.patch ];
diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
deleted file mode 100644
index 5682919306051..0000000000000
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.3.26";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
-    sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c3efc7a5f85d..28668e0fc1c25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7474,10 +7474,6 @@ with pkgs;
 
   gnutls = gnutls34;
 
-  gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
-
   gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
     guileBindings = config.gnutls.guile or false;
   };
-- 
cgit 1.4.1