Permalink
Browse files

gimp 2.8

- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708
  • Loading branch information...
1 parent 09478d9 commit f41f478da3ed2b0f9cc50e08f68570926baac867 @garbas committed Jun 10, 2012
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- name = "babl-0.1.10";
-
- src = fetchurl {
- url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
- sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
- };
-
- meta = {
- description = "Image pixel format conversion library";
- homepage = http://gegl.org/babl/;
- license = "GPL3";
- };
-}
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babl-0.1.4";
+ name = "babl-0.1.10";
src = fetchurl {
- url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2";
- sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
+ url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
+ sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
};
meta = {
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk, bzip2, intltool }:
-
-stdenv.mkDerivation rec {
- name = "gegl-0.2.0";
-
- src = fetchurl {
- url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
- sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
- };
-
- # needs fonts otherwise don't know how to pass them
- configureFlags = "--disable-docs";
-
- buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
-
- buildNativeInputs = [ pkgconfig ];
-
- meta = {
- description = "Graph-based image processing framework";
- homepage = http://www.gegl.org;
- license = "GPL3";
- };
-}
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk, bzip2 }:
+, librsvg, pango, gtk, bzip2, intltool }:
stdenv.mkDerivation rec {
- name = "gegl-0.1.6";
+ name = "gegl-0.2.0";
src = fetchurl {
- url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2";
- sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
+ url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
+ sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
};
# needs fonts otherwise don't know how to pass them
configureFlags = "--disable-docs";
- buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ];
+ buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
buildNativeInputs = [ pkgconfig ];
@@ -3182,8 +3182,6 @@ let
babl = callPackage ../development/libraries/babl { };
- babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {};
-
beecrypt = callPackage ../development/libraries/beecrypt { };
boehmgc = callPackage ../development/libraries/boehm-gc { };
@@ -3440,10 +3438,6 @@ let
# avocodec avformat librsvg
};
- gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix {
- babl = babl_0_1_10;
- };
-
geoclue = callPackage ../development/libraries/geoclue {};
geoip = builderDefsPackage ../development/libraries/geoip {
@@ -6767,10 +6761,8 @@ let
inherit (gnome) libart_lgpl;
};
- gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix {
+ gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
inherit (gnome) libart_lgpl;
- babl = babl_0_1_10;
- gegl = gegl_0_2_0;
};
gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {

0 comments on commit f41f478

Please sign in to comment.