diff --git a/pkgs/development/libraries/gnustep/back/default.nix b/pkgs/development/libraries/gnustep/back/default.nix index ba97a6b3d20..c6915279aa0 100644 --- a/pkgs/development/libraries/gnustep/back/default.nix +++ b/pkgs/development/libraries/gnustep/back/default.nix @@ -2,19 +2,18 @@ , cairo , fetchurl , base, gui -, xlibs , x11 , freetype , pkgconfig }: let - version = "0.24.0"; + version = "0.25.0"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.24.0.tar.gz"; - sha256 = "0qixbilkkrqxrhhj9hnp7ygd5gs23b3qbbgk3gaxj73d0xqfvhjz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; + sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; }; buildInputs = [ cairo base gui freetype pkgconfig x11 ]; meta = { diff --git a/pkgs/development/libraries/gnustep/base/default.nix b/pkgs/development/libraries/gnustep/base/default.nix index 150200abb6c..7f3c54fbf51 100644 --- a/pkgs/development/libraries/gnustep/base/default.nix +++ b/pkgs/development/libraries/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.24.7"; + version = "1.24.9"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.7.tar.gz"; - sha256 = "0qhphw61ksyzf04a4apmvx8000alws6d92x8ila1mi5bapcpv41s"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; + sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gnustep/default.nix b/pkgs/development/libraries/gnustep/default.nix index 77ceec3f96d..2eb7a623442 100644 --- a/pkgs/development/libraries/gnustep/default.nix +++ b/pkgs/development/libraries/gnustep/default.nix @@ -12,7 +12,6 @@ let system_preferences = callPackage ./systempreferences {}; libobjc2 = callPackage ./libobjc2 {}; make = callPackage ./make {}; - xcode = callPackage ./xcode {}; back = callPackage ./back {}; base = callPackage ./base { giflib = pkgs.giflib_4_1; }; gui = callPackage ./gui {}; diff --git a/pkgs/development/libraries/gnustep/gorm/default.nix b/pkgs/development/libraries/gnustep/gorm/default.nix index b655bd5b598..65101867d69 100644 --- a/pkgs/development/libraries/gnustep/gorm/default.nix +++ b/pkgs/development/libraries/gnustep/gorm/default.nix @@ -1,17 +1,15 @@ { fetchurl, base, back, gsmakeDerivation, gui }: let - version = "1.2.18"; + version = "1.2.22"; in gsmakeDerivation { name = "gorm-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1vpzvmsnynlq5dv6rw9vbk1zzsim6z7b2kprrlm8dknyq0r1sdrq"; + sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; }; -# patches = [ ./fix-gs-makefiles.patch ]; buildInputs = [ base back gui ]; -# propagatedBuildInputs = [ gnustep_base gnustep_back gnustep_gui ]; meta = { description = "Gorm stands for Graphical Object Relationship Modeller and is an easy-to-use interface designer for GNUstep"; diff --git a/pkgs/development/libraries/gnustep/gui/default.nix b/pkgs/development/libraries/gnustep/gui/default.nix index 5859c42fafe..6463297b062 100644 --- a/pkgs/development/libraries/gnustep/gui/default.nix +++ b/pkgs/development/libraries/gnustep/gui/default.nix @@ -1,17 +1,14 @@ { gsmakeDerivation, fetchurl, base }: let - version = "0.24.0"; + version = "0.25.0"; in gsmakeDerivation { name = "gnustep-gui-${version}"; src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.24.0.tar.gz"; - sha256 = "0d6jzfcyacxjzrr2p398ysvs1akv1fcmngfzxxbfxa947miydjxg"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; + sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5"; }; buildInputs = [ base ]; -# propagatedBuildInputs = [ gnustep_base ]; -# patches = [ ./fixup-gui-makefile-installdir.patch ]; - # DEBUG! patches = [ ./fixup-all.patch ]; meta = { description = "GNUstep-gui is a GUI class library of GNUstep."; diff --git a/pkgs/development/libraries/gnustep/gworkspace/default.nix b/pkgs/development/libraries/gnustep/gworkspace/default.nix index 5bf49e6a22a..7aa61c67f84 100644 --- a/pkgs/development/libraries/gnustep/gworkspace/default.nix +++ b/pkgs/development/libraries/gnustep/gworkspace/default.nix @@ -5,19 +5,18 @@ , system_preferences }: let - version = "0.9.2"; + version = "0.9.3"; in gsmakeDerivation { name = "gworkspace-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; - sha256 = "1yzlka2dl1gb353wf9kw6l26sdihdhgwvdfg5waqwdfl7ycfyfaj"; + sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3"; }; # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! buildInputs = [ back base gui system_preferences ]; -# propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui system_preferences ]; configureFlags = [ "--with-inotify" ]; meta = { description = "GWorkspace is a workspace manager for GNUstep"; diff --git a/pkgs/development/libraries/gnustep/libobjc2/default.nix b/pkgs/development/libraries/gnustep/libobjc2/default.nix index 3e3ebe7a2df..26ea8c0bc0b 100644 --- a/pkgs/development/libraries/gnustep/libobjc2/default.nix +++ b/pkgs/development/libraries/gnustep/libobjc2/default.nix @@ -15,23 +15,7 @@ stdenv.mkDerivation rec { # with C++ either patches = [ ./removeCXXtests.patch ]; - # build phase: - # mkdir Build - # cd Build - # cmake .. - # make -j8 - # make install - # - # probably useful: cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - # - # cmakeDir = "../src"; # Build? -# postInstall = '' -# mkdir Build -# cd Build -# cmake -DCMAKE_INSTALL_PREFIX=$out -DGNUSTEP_INSTALL_TYPE=NONE .. -# make install -# ''; meta = { description = "Objective-C runtime for use with GNUstep"; diff --git a/pkgs/development/libraries/gnustep/make/default.nix b/pkgs/development/libraries/gnustep/make/default.nix index beabe8865e3..953aa20e066 100644 --- a/pkgs/development/libraries/gnustep/make/default.nix +++ b/pkgs/development/libraries/gnustep/make/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, clang, which, libobjc2 }: let - version = "2.6.6"; + version = "2.6.8"; in stdenv.mkDerivation rec { name = "gnustep-make-${version}"; src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.6.tar.gz"; - sha256 = "07cqr8x17bia9w6clbmiv7ay6r9nplrjz2cyzinv4w7zfpc19vxw"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; + sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0"; }; configureFlags = "--with-installation-domain=SYSTEM"; buildInputs = [ clang which libobjc2 ]; diff --git a/pkgs/development/libraries/gnustep/xcode/default.nix b/pkgs/development/libraries/gnustep/xcode/default.nix deleted file mode 100644 index b576f86705e..00000000000 --- a/pkgs/development/libraries/gnustep/xcode/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ gsmakeDerivation, fetchFromGitHub, make, libobjc2, base }: - -gsmakeDerivation rec { - name = "xcode-${version}"; - version = "1.0"; - - makeFlags = "messages=yes"; - - installFlags = "DESTDIR=$(out)"; - - buildInputs = [ libobjc2 base ]; - - src = fetchFromGitHub { - owner = "gnustep"; - repo = "xcode"; - rev = "cc5016794e44f9998674120a5e4625aa09ca455a"; - sha256 = "85420f3f61091b2e4548cf5e99d886cb9c72cf07b8b9fae3eebc87e7b6b7e54a"; - }; -}