summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-03-05 17:09:34 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-03-05 17:09:34 +0000
commite1f0221bc39c5396fac4d22a2e4d843b3f2e47df (patch)
tree8d244496c5f78d9e51536eae242bfeb013b43e0f /pkgs
parent0894348d60f9b9543663829d9395d3bedc81e316 (diff)
downloadnixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar.gz
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar.bz2
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar.lz
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar.xz
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.tar.zst
nixlib-e1f0221bc39c5396fac4d22a2e4d843b3f2e47df.zip
As the main openoffice servers don't hold the 3.1.1 source anymore (This means I could
not find it), I update the URLs so it is taken from a mirror still having them.

I tried one at random from:
http://distribution.openoffice.org/mirrors/#mirrors
and it worked. They don't have older versions other than 3.1.1 though.

This also reverts the attempt from Sander updating the expression to 3.2.0, because
it failed. That deserves more effort.

svn path=/nixpkgs/trunk/; revision=20419
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/office/openoffice/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 14e1191b31f6..08a536fe151e 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -6,23 +6,21 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
 }:
 
-let version = "3.2.0"; in
+let version = "3.1.1"; in
 stdenv.mkDerivation rec {
   name = "openoffice.org-${version}";
   builder = ./builder.sh;
 
   src = fetchurl {
-      url = "http://download.services.openoffice.org/files/stable/${version}/OOo_${version}_src_core.tar.bz2";
-      name = "OOo_${version}_src_core.tar.bz2";
-      sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml";
+      url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_core.tar.bz2";
+      sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
     };
 
-  patches = [ ./oo.patch /*./OOo-3.1.1-HEADERFIX-1.patch*/ ./root-required.patch ];
+  patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
 
   src_system = fetchurl {
-      url = "http://download.services.openoffice.org/files/stable/${version}/OOo_${version}_src_system.tar.bz2";
-      name = "OOo_${version}_src_system.tar.bz2";
-      sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp";
+      url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_system.tar.bz2";
+      sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
     };
 
   configureFlags = "