From 1a38af7e14e8ffcbd32e569bdf79b96ed82c3ed1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Jun 2005 13:52:24 +0000 Subject: [PATCH] * Gnome 2.10.1. * A script to generatie fetchurl calls for Gnome packages from directory listings. svn path=/nixpkgs/trunk/; revision=3197 --- pkgs/development/libraries/gnome/default.nix | 23 +- .../libraries/gnome/gnome-vfs/default.nix | 12 +- .../libraries/gnome/libgnome/default.nix | 8 +- .../libraries/gnome/make-listing.pl | 48 ++ .../gnome/src-gnome-desktop-2.10.1.nix | 487 ++++++++++++++++++ .../gnome/src-gnome-platform-2.10.1.nix | 193 +++++++ pkgs/system/all-packages-generic.nix | 2 +- 7 files changed, 750 insertions(+), 23 deletions(-) create mode 100755 pkgs/development/libraries/gnome/make-listing.pl create mode 100644 pkgs/development/libraries/gnome/src-gnome-desktop-2.10.1.nix create mode 100644 pkgs/development/libraries/gnome/src-gnome-platform-2.10.1.nix diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index 3ca1380023da..38fb592b15c5 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -1,7 +1,7 @@ # todo audiofile is also part of the gnome platform. Move it to this collection? { stdenv, fetchurl, pkgconfig, audiofile -, flex, bison, popt, perl, zlib, libxml2, libxslt, bzip2 +, flex, bison, popt, perl, zlib, libxml2, libxslt , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg , libpng, gtkLibs, libXmu }: @@ -10,8 +10,8 @@ rec { # Platform - platform = (import ./src-gnome-platform-2.8.3.nix) { - inherit stdenv fetchurl; + platform = (import ./src-gnome-platform-2.10.1.nix) { + inherit fetchurl; }; glib = gtkLibs.glib; @@ -39,9 +39,9 @@ rec { input = platform.ORBit2; }; - gconf = (import ./GConf) { + GConf = (import ./GConf) { inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt; - input = platform.gconf; + input = platform.GConf; }; gnomemimedata = (import ./gnome-mime-data) { @@ -50,9 +50,8 @@ rec { }; gnomevfs = (import ./gnome-vfs) { - inherit fetchurl stdenv pkgconfig perl glib libxml2 gconf - libbonobo gnomemimedata popt bzip2 perlXMLParser; - # !!! use stdenv.bzip2 + inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf + libbonobo gnomemimedata popt perlXMLParser; input = platform.gnomevfs; }; @@ -64,7 +63,7 @@ rec { libgnome = (import ./libgnome) { inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs - libbonobo gconf popt zlib; + libbonobo GConf popt zlib; input = platform.libgnome; }; @@ -123,8 +122,8 @@ rec { # Desktop - desktop = (import ./src-gnome-desktop-2.8.3.nix) { - inherit stdenv fetchurl; + desktop = (import ./src-gnome-desktop-2.10.1.nix) { + inherit fetchurl; }; gtkhtml = (import ./gtkhtml) { @@ -151,7 +150,7 @@ rec { gtksourceview = (import ./gtksourceview) { inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */ - gconf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; + GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; input = desktop.gtksourceview; }; diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix index 7ef197e00518..a63e6ecf445c 100644 --- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix +++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix @@ -1,15 +1,15 @@ -{input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, gconf -, libbonobo, gnomemimedata, popt, bzip2, perlXMLParser }: +{input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf +, libbonobo, gnomemimedata, popt, perlXMLParser }: assert pkgconfig != null && perl != null && glib != null - && libxml2 != null && gconf != null && libbonobo != null - && gnomemimedata != null && bzip2 != null; + && libxml2 != null && GConf != null && libbonobo != null + && gnomemimedata != null; stdenv.mkDerivation { inherit (input) name src; buildInputs = [ - pkgconfig perl glib libxml2 gconf libbonobo - gnomemimedata popt bzip2 perlXMLParser + pkgconfig perl glib libxml2 GConf libbonobo + gnomemimedata popt perlXMLParser ]; patches = [./no-kerberos.patch]; } diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix index da58dc7232d4..c49514d70261 100644 --- a/pkgs/development/libraries/gnome/libgnome/default.nix +++ b/pkgs/development/libraries/gnome/libgnome/default.nix @@ -1,8 +1,8 @@ -{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gnomevfs, libbonobo -, gconf, popt, zlib }: +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gnomevfs, libbonobo +, GConf, popt, zlib }: assert pkgconfig != null && perl != null && glib != null - && gnomevfs != null && libbonobo != null && gconf != null + && gnomevfs != null && libbonobo != null && GConf != null && popt != null && zlib != null; # !!! TODO CHECK: @@ -13,5 +13,5 @@ assert pkgconfig != null && perl != null && glib != null stdenv.mkDerivation { inherit (input) name src; buildInputs = [pkgconfig perl perlXMLParser popt zlib]; - propagatedBuildInputs = [glib gnomevfs libbonobo gconf]; + propagatedBuildInputs = [glib gnomevfs libbonobo GConf]; } diff --git a/pkgs/development/libraries/gnome/make-listing.pl b/pkgs/development/libraries/gnome/make-listing.pl new file mode 100755 index 000000000000..3fc6d3fee667 --- /dev/null +++ b/pkgs/development/libraries/gnome/make-listing.pl @@ -0,0 +1,48 @@ +#! /usr/bin/perl -w + +use strict; + +# Example use: +# ./make-listing.sh \ +# http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/ \ +# http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/MD5SUMS-for-bz2 + +my $baseURL = shift; +my $md5URL = shift; + +print <) { + chomp; + /^(\S+)\s+(\S+)$/ or die; + my $md5 = $1; + my $fileName = $2; + my $name = $fileName; + $name =~ s/\.tar.*$//; + my $attrName = $name; + $attrName =~ s/\-[0-9].*$//; + $attrName =~ s/\-//g; + $attrName =~ s/\+//g; + print <