removing old bleeding edge cruft replacing it by a niftier version using

source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894

6 files changed, 30 insertions, 16 deletions

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 53b42a4e6612..e9e0d502c2d8 100644
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -8,8 +8,8 @@ rec {
   };
 
   libCSS = import ./libCSS.nix {
-    inherit fetchurl stdenv lib pkgconfig libParserUtils libwapcaplet;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig libParserUtils
+      libwapcaplet;
   };
 
   libnsbmp = import ./libnsbmp.nix {
@@ -21,13 +21,11 @@ rec {
   };
 
   libwapcaplet = import ./libwapcaplet.nix {
-    inherit fetchurl stdenv lib;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib;
   };
 
   libsvgtiny = import ./libsvgtiny.nix {
-    inherit fetchurl stdenv lib pkgconfig gperf libxml2;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig gperf libxml2;
   };
 
   hubub = stdenv.mkDerivation {
@@ -55,7 +53,10 @@ rec {
   libdom = stdenv.mkDerivation {
     name = "libdom-devel";
 
-    src = bleedingEdgeRepos.sourceByName "libdom";
+    # REGION AUTO UPDATE:     { name="libdom"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; }
+    src= sourceFromHead "libdom-9721.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/libdom-9721.tar.gz"; sha256 = "ca4b94a8dd32036787331a14133c36a49daded40bdb4c04edc3eab99e2193abc"; });
+    # END
     installPhase = "make PREFIX=$out install";
     buildInputs = [pkgconfig];
 
@@ -70,17 +71,15 @@ rec {
   */
 
   netsurfHaru = import ./haru.nix {
-    inherit fetchurl stdenv lib zlib libpng; 
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib zlib libpng; 
   };
 
   browser = import ./netsurf.nix {
-    inherit fetchurl stdenv lib pkgconfig
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig
       libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
       libpng libxml2 libCSS lcms curl libmng;
     libharu = netsurfHaru;
     inherit (gnome) glib gtk libglade;
-    inherit (bleedingEdgeRepos) sourceByName;
   };
 
 
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
index a99ccdc0cccd..883cf94b06fe 100644
--- a/pkgs/applications/networking/browsers/netsurf/haru.nix
+++ b/pkgs/applications/networking/browsers/netsurf/haru.nix
@@ -3,7 +3,10 @@ stdenv.mkDerivation {
 
   name = "netsurf-haru-trunk";
 
-  src = sourceByName "netsurf_haru";
+  # REGION AUTO UPDATE:     { name="netsurf_haru"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; }
+  src= sourceFromHead "netsurf_haru-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf_haru-9721.tar.gz"; sha256 = "8113492823e1069f428ef8970c2c7a09b4c36c645480ce81f8351331ce097656"; });
+  # END
 
   preConfigure = "cd upstream";
   configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
index eff8e43fb743..67cd2eb45e40 100644
--- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
@@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
   name = "libCSS-devel";
 
-  src = sourceByName "libCSS";
+  # REGION AUTO UPDATE:      { name="libCSS"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; }
+  src= sourceFromHead "libCSS-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libCSS-9721.tar.gz"; sha256 = "b6ac015351e78c080b71bbe834eadee0d1cb2c6c4657c338be6cbf0f51d5f8a9"; });
+  # END
 
   installPhase = "make PREFIX=$out install";
   buildInputs = [pkgconfig libParserUtils libwapcaplet];
diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
index 11d81bacb126..a90e6fa193cd 100644
--- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
@@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
   name = "libsvgtiny-devel";
 
-  src = sourceByName "libsvgtiny";
+  # REGION AUTO UPDATE:      { name="libsvgtiny"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; }
+  src= sourceFromHead "libsvgtiny-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
+  # END
 
   installPhase = "make PREFIX=$out install";
   buildInputs = [pkgconfig gperf libxml2];
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
index d40051a28e9b..c4e4a60fbd68 100644
--- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
   name = "libwapcaplet-devel";
 
-  src = sourceByName "libwapcaplet";
+  # REGION AUTO UPDATE:     { name="libwapcaplet"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; }
+  src= sourceFromHead "libwapcaplet-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libwapcaplet-9721.tar.gz"; sha256 = "7f9f32ca772c939d67f3bc8bf0705544c2b2950760da3fe6a4e069ad0f77d91a"; });
+  # END
 
   installPhase = "make PREFIX=$out install";
   buildInputs = [];
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
index 9d91e674bb92..2d2253f43ef1 100644
--- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix
+++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
@@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
 
   name = "netsurf-devel";
-  src = sourceByName "netsurf";
+  # REGION AUTO UPDATE:      { name="netsurf"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; }
+  src= sourceFromHead "netsurf-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf-9721.tar.gz"; sha256 = "4705f059596fbd95b1a80d9a6c5d08daf051fd0e5e868ccd40b30af8a45e8f56"; });
+  # END
 
   # name = "netsurf-2.1";
   /*