alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #7173 from ryantm/fetchurlGnome

Browse source 
Get rid of fetchurlGnome
This commit is contained in:
Domen Kožar 2015-04-05 10:03:37 +02:00
parent 2f180f6888 93f1029b0f
commit 4c449b86ea
17 changed files with 84 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/graphics/dia/default.nix
View file

@ -1,13 +1,13 @@
{stdenv, fetchurl, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext {stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
, withGNOME ? false, libgnomeui }: , withGNOME ? false, libgnomeui }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "dia-${minVer}.3";
minVer = "0.97";
src = fetchurlGnome { src = fetchurl {
project = "dia"; url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz";
major = "0"; minor = "97"; patchlevel = "3"; extension = "xz";
sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
}; };

17
pkgs/build-support/fetchurl/gnome.nix
View file

@ -1,17 +0,0 @@
{ fetchurl }:
{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }:
let
baseVersion = "${major}.${minor}";
version = baseVersion + (if patchlevel != null then ".${patchlevel}" else "");
name = "${project}-${version}";
in
(fetchurl {
url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}";
inherit sha256;
}) // {
inherit major minor patchlevel baseVersion version;
pkgname = name;
}

10
pkgs/desktops/gnome-2/platform/ORBit2/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, glib, libIDL, libintlOrEmpty }: { stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "ORBit2-${minVer}.19";
minVer = "2.14";
src = fetchurlGnome { src = fetchurl {
project = "ORBit2"; url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2";
major = "2"; minor = "14"; patchlevel = "19";
sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
}; };

12
pkgs/desktops/gnome-2/platform/gconfmm/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurlGnome, pkgconfig, GConf, gtkmm, glibmm }: { stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gconfmm-${minVer}.3";
minVer = "2.28";
src = fetchurlGnome { src = fetchurl {
project = "gconfmm"; url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2";
sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108"; sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
}; };
nativeBuildInputs = [pkgconfig]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ GConf gtkmm glibmm ]; propagatedBuildInputs = [ GConf gtkmm glibmm ];

10
pkgs/desktops/gnome-2/platform/gnome-common/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchurlGnome, which }: { stdenv, fetchurl, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gnome-common-${minVer}.0";
minVer = "2.34";
src = fetchurlGnome { src = fetchurl {
project = "gnome-common"; url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2";
major = "2"; minor = "34"; patchlevel = "0";
sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
}; };

10
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurlGnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gnome-vfs-${minVer}.4";
minVer = "2.24";
src = fetchurlGnome { src = fetchurl {
project = "gnome-vfs"; url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2";
major = "2"; minor = "24"; patchlevel = "4";
sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
}; };

10
pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }: { stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gtkglextmm-${minVer}.0";
minVer = "1.2";
src = fetchurlGnome { src = fetchurl {
project = "gtkglextmm"; url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea"; sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
}; };

10
pkgs/desktops/gnome-2/platform/libIDL/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, gettext}: {stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libIDL-${minVer}.14";
minVer = "0.8";
src = fetchurlGnome { src = fetchurl {
project = "libIDL"; url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2";
major = "0"; minor = "8"; patchlevel = "14";
sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
}; };

10
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt { stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
, intltool, ORBit2, procps }: , intltool, ORBit2, procps }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libbonobo-${minVer}.1";
minVer = "2.32";
src = fetchurlGnome { src = fetchurl {
project = "libbonobo"; url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2";
major = "2"; minor = "32"; patchlevel = "1";
sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
}; };

10
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurlGnome, bison, pkgconfig, popt, libxml2, gtk, libtool { stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool
, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libbonoboui-${minVer}.5";
minVer = "2.24";
src = fetchurlGnome { src = fetchurl {
project = "libbonoboui"; url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2";
major = "2"; minor = "24"; patchlevel = "5";
sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
}; };

10
pkgs/desktops/gnome-2/platform/libgnome/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra
, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libgnome-${minVer}.1";
minVer = "2.32";
src = fetchurlGnome { src = fetchurl {
project = "libgnome"; url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2";
major = "2"; minor = "32"; patchlevel = "1";
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
}; };

10
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }: { stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libgnomecanvas-${minVer}.3";
minVer = "2.30";
src = fetchurlGnome { src = fetchurl {
project = "libgnomecanvas"; url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2";
major = "2"; minor = "30"; patchlevel = "3";
sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
}; };

10
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurlGnome, pkgconfig, libxml2, xlibs, glib, pango { stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
, gnome_vfs, libgnome_keyring, libglade }: , gnome_vfs, libgnome_keyring, libglade }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "libgnomeui-${minVer}.5";
minVer = "2.24";
src = fetchurlGnome { src = fetchurl {
project = "libgnomeui"; url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2";
major = "2"; minor = "24"; patchlevel = "5";
sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
}; };

10
pkgs/development/libraries/gtkmm/2.x.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: { stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gtkmm-${minVer}.4";
minVer = "2.24";
src = fetchurlGnome { src = fetchurl {
project = "gtkmm"; url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz";
major = "2"; minor = "24"; patchlevel = "4"; extension = "xz";
sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
}; };

15
pkgs/development/libraries/json-glib/default.nix
View file

@ -1,18 +1,15 @@
{ stdenv, fetchurlGnome, glib, pkgconfig, gobjectIntrospection, dbus }: { stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "json-glib-${minVer}.2";
minVer = "1.0";
src = fetchurlGnome { src = fetchurl {
project = "json-glib"; url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
major = "1";
minor = "0";
patchlevel = "2";
extension = "xz";
sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"; sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
}; };
configureflags= "--with-introspection" ; configureflags= "--with-introspection";
propagatedBuildInputs = [ glib gobjectIntrospection ]; propagatedBuildInputs = [ glib gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

10
pkgs/development/tools/misc/gob2/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, glib, bison, flex }: { stdenv, fetchurl, pkgconfig, glib, bison, flex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gob2-${minVer}.18";
minVer = "2.0";
src = fetchurlGnome { src = fetchurl {
project = "gob2"; url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz";
major = "2"; minor = "0"; patchlevel = "18"; extension = "gz";
sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa";
}; };

3
pkgs/top-level/all-packages.nix
View file

@ -360,9 +360,6 @@ let
inherit curl stdenv; inherit curl stdenv;
}; };
# A wrapper around fetchurl that generates miror://gnome URLs automatically
fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { };
# fetchurlBoot is used for curl and its dependencies in order to # fetchurlBoot is used for curl and its dependencies in order to
# prevent a cyclic dependency (curl depends on curl.tar.bz2, # prevent a cyclic dependency (curl depends on curl.tar.bz2,
# curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It