libobjc2: 1.7 -> 1.8.1

pkgs/development/libraries/gnustep/base/default.nix

@@ -6,7 +6,7 @@
 , libffi
 , libjpeg, libtiff, libpng, giflib, libungif
 , libxml2, libxslt, libiconv
-, libobjc2, libgcrypt
+, libobjc, libgcrypt
 , icu
 , pkgconfig, portaudio
 }:
@@ -27,7 +27,7 @@ gsmakeDerivation {
     libffi
     libjpeg libtiff libpng giflib libungif
     libxml2 libxslt libiconv
-    libobjc2 libgcrypt
+    libobjc libgcrypt
     icu
     portaudio
   ];

pkgs/development/libraries/gnustep/default.nix

@@ -10,7 +10,7 @@ let
     gorm = callPackage ./gorm {};
     projectcenter = callPackage ./projectcenter {};
     system_preferences = callPackage ./systempreferences {};
-    libobjc2 = callPackage ./libobjc2 {};
+    libobjc = callPackage ./libobjc2 {};
     make = callPackage ./make {};
     back = callPackage ./back {};
     base = callPackage ./base { giflib = pkgs.giflib_4_1; };

pkgs/development/libraries/gnustep/gworkspace/default.nix

@@ -1,7 +1,6 @@
 { back, base, gui, gsmakeDerivation
 , fetchurl
 , sqlite
-, stdenv
 , system_preferences
 }:
 let

pkgs/development/libraries/gnustep/libobjc2/default.nix

@@ -1,30 +1,28 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, lib, fetchFromGitHub, cmake }:
 
 let
-  version = "1.7";
+  version = "1.8.1";
 in
+
 stdenv.mkDerivation rec {
   name = "libobjc2-${version}";
-  src = fetchurl {
-    url = "http://download.gna.org/gnustep/libobjc2-1.7.tar.bz2";
-    sha256 = "1h9wkm1x9wrzd3alm99bx710lrs9nb8h2x5jpxbqwgbgzzv4l6rs";
+
+  src = fetchFromGitHub {
+    owner = "gnustep";
+    repo = "libobjc2";
+    rev = "v${version}";
+    sha256 = "12v9pjg97h56mb114cqd22q1pdwhmxrgdw5hal74ddlrhiq1nzvi";
   };
+
   buildInputs = [ cmake ];
 
-  # since we don't support Objective-C++, we don't interoperate
-  # with C++ either
-  patches = [ ./removeCXXtests.patch ];
-  
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
 
-  meta = {
+  meta = with lib; {
     description = "Objective-C runtime for use with GNUstep";
-  
     homepage = http://gnustep.org/;
-  
-    license = stdenv.lib.licenses.mit;
-  
-    maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ashalkhakov matthewbauer ];
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/gnustep/libobjc2/removeCXXtests.patch

@@ -1,18 +0,0 @@
-diff -c libobjc2-1.7/Test/CMakeLists.txt libobjc2-1.7-patched/Test/CMakeLists.txt
-*** libobjc2-1.7/Test/CMakeLists.txt	2014-11-17 13:38:30.000000000 +0600
---- libobjc2-1.7-patched/Test/CMakeLists.txt	2014-11-17 13:38:56.000000000 +0600
-***************
-*** 49,54 ****
-  endforeach()
-  
-  # Tests that are more than a single file.
-! addtest_flags(CXXExceptions "-O0" "CXXException.m;CXXException.cc")
-! addtest_flags(CXXExceptions_optimised "-O3" "CXXException.m;CXXException.cc")
-  
---- 49,54 ----
-  endforeach()
-  
-  # Tests that are more than a single file.
-! #addtest_flags(CXXExceptions "-O0" "CXXException.m;CXXException.cc")
-! #addtest_flags(CXXExceptions_optimised "-O3" "CXXException.m;CXXException.cc")
-  

pkgs/development/libraries/gnustep/make/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, clang, which, libobjc2 }:
+{ stdenv, fetchurl, clang, which, libobjc }:
 let
   version = "2.6.8";
 in
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0";
   };
   configureFlags = "--with-installation-domain=SYSTEM";
-  buildInputs = [ clang which libobjc2 ];
+  buildInputs = [ clang which libobjc ];
   patches = [ ./fixup-paths.patch ];
   setupHook = ./setup-hook.sh;
   meta = {

pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, libobjc2, clang, make, makeWrapper, which }:
+{ stdenv, lib, make, makeWrapper, which }:
 { buildInputs ? [], ...} @ args:
 stdenv.mkDerivation (args // {
   buildInputs = [ makeWrapper make which ] ++ buildInputs;