diff options
Diffstat (limited to 'pkgs/desktops/gnome-2/platform')
18 files changed, 74 insertions, 65 deletions
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index bf5ae4ebbb1a5..a45095ba49780 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: stdenv.mkDerivation rec { - name = "ORBit2-${minVer}.19"; - minVer = "2.14"; + pname = "ORBit2"; + version = "2.14.19"; src = fetchurl { - url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/ORBit2/${lib.versions.majorMinor version}/ORBit2-${version}.tar.bz2"; sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index 54a2bd526a945..eba913c80c2d9 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "gnome-common-${minVer}.0"; - minVer = "2.34"; + pname = "gnome-common"; + version = "2.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.bz2"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index d5af0e362b435..1604dbe0cf08f 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl, intltool}: +{ lib, stdenv, fetchurl, intltool }: -stdenv.mkDerivation { - name = "gnome-mime-data-2.18.0"; +stdenv.mkDerivation rec { + pname = "gnome-mime-data"; + version = "2.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; + url = "mirror://gnome/sources/gnome-mime-data/${lib.versions.majorMinor version}/gnome-mime-data-${version}.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4196cf21c2742..4c9f28230c31e 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { - name = "gnome-vfs-${minVer}.4"; - minVer = "2.24"; + pname = "gnome-vfs"; + version = "2.24.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index ec87bafc99808..4f4e0503f819b 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, pkg-config, gtk2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { - name = "gtkhtml-3.32.2"; + pname = "gtkhtml"; + version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/3.32/${name}.tar.bz2"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2"; sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7"; }; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 4e9376d5c8242..61b21ba88c015 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}: +{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, gettext }: stdenv.mkDerivation rec { - name = "libIDL-${minVer}.14"; - minVer = "0.8"; + pname = "libIDL"; + version = "0.8.14"; src = fetchurl { - url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libIDL/${lib.versions.majorMinor version}/libIDL-${version}.tar.bz2"; sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix index 7b1ccb97dc4b0..80ea3d02d939c 100644 --- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix +++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libart_lgpl-2.3.21"; + pname = "libart_lgpl"; + version = "2.3.21"; src = fetchurl { - url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2"; + url = "mirror://gnome/sources/libart_lgpl/${lib.versions.majorMinor version}/libart_lgpl-${version}.tar.bz2"; sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx"; }; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 8d991d743bec9..e928052a47642 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt +{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { - name = "libbonobo-${minVer}.1"; - minVer = "2.32"; + pname = "libbonobo"; + version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libbonobo/${lib.versions.majorMinor version}/libbonobo-${version}.tar.bz2"; sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 4f9176acf103e..36ab293f5f12e 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool +{ lib, stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation rec { - name = "libbonoboui-${minVer}.5"; - minVer = "2.24"; + pname = "libbonoboui"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libbonoboui/${lib.versions.majorMinor version}/libbonoboui-${version}.tar.bz2"; sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 3eb7b533f09e3..3ed162cd8d5ee 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -2,11 +2,12 @@ assert withLibgladeConvert -> python2 != null; -stdenv.mkDerivation { - name = "libglade-2.6.4"; +stdenv.mkDerivation rec { + pname = "libglade"; + version = "2.6.4"; src = fetchurl { - url = "mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2"; + url = "mirror://gnome/sources/libglade/${lib.versions.majorMinor version}/libglade-${version}.tar.bz2"; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index ee477cb63c1b6..2c70338a9005a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 +{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: stdenv.mkDerivation rec { - name = "libgnome-${minVer}.1"; - minVer = "2.32"; + pname = "libgnome"; + version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index eb40c5ec0b5b4..b856442290a4a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: stdenv.mkDerivation rec { - name = "libgnomecanvas-${minVer}.3"; - minVer = "2.30"; + pname = "libgnomecanvas"; + version = "2.30.3"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomecanvas/${lib.versions.majorMinor version}/libgnomecanvas-${version}.tar.bz2"; sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index 2811a138cb631..9cc2d169b7c39 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: +{ lib, stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: -stdenv.mkDerivation { - name = "libgnomecanvasmm-2.26.0"; +stdenv.mkDerivation rec { + pname = "libgnomecanvasmm"; + version = "2.26.0"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2"; + url = "mirror://gnome/sources/libgnomecanvasmm/${lib.versions.majorMinor version}/libgnomecanvasmm-${version}.tar.bz2"; sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 7e33ee91285f0..42de8c2471a3b 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: stdenv.mkDerivation rec { - name = "libgnomecups-0.2.3"; + pname = "libgnomecups"; + version = "0.2.3"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomecups/${lib.versions.majorMinor version}/libgnomecups-${version}.tar.bz2"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index b67be2b7f5b20..bb2e435f422d0 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -2,10 +2,11 @@ , libgnomecups, bison, flex }: stdenv.mkDerivation rec { - name = "libgnomeprint-2.18.8"; + pname = "libgnomeprint"; + version = "2.18.8"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomeprint/${lib.versions.majorMinor version}/libgnomeprint-${version}.tar.bz2"; sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index 80d2c2050afea..a95ee70bca107 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme }: -stdenv.mkDerivation { - name = "libgnomeprintui-2.18.6"; +stdenv.mkDerivation rec { + pname = "libgnomeprintui"; + version = "2.18.6"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2"; + url = "mirror://gnome/sources/libgnomeprintui/${lib.versions.majorMinor version}/libgnomeprintui-${version}.tar.bz2"; sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 0fa3847d9bdab..0a84e0ea3ec58 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { - name = "libgnomeui-${minVer}.5"; - minVer = "2.24"; + pname = "libgnomeui"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomeui/${lib.versions.majorMinor version}/libgnomeui-${version}.tar.bz2"; sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index e7cf117ecdbcc..9c7189c117ac8 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: -stdenv.mkDerivation { - name = "libgtkhtml-2.11.1"; +stdenv.mkDerivation rec { + pname = "libgtkhtml"; + version = "2.11.1"; src = fetchurl { - url = "mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2"; + url = "mirror://gnome/sources/libgtkhtml/${lib.versions.majorMinor version}/libgtkhtml-${version}.tar.bz2"; sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; |