diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2013-02-05 11:59:26 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2013-02-06 01:26:24 +0100 |
commit | cb4c42e9c39952f4187bfafcb4996285419f9c48 (patch) | |
tree | 2514d2049060d65697844b09e30360cfe85144d2 /pkgs | |
parent | 6cc91771a8d1329b495f0e9825e01180a3c6780b (diff) | |
download | nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar.gz nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar.bz2 nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar.lz nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar.xz nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.tar.zst nixlib-cb4c42e9c39952f4187bfafcb4996285419f9c48.zip |
gnumeric: Update to 1.12.0
Also update dependencies (goffice, libgsf) to required versions.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/gnumeric/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/goffice/0.10.nix (renamed from pkgs/development/libraries/goffice/0.9.nix) | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libgsf/syscall-name-clash.patch | 120 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 11 insertions, 133 deletions
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 6063024c2160..1bdc41d1fb57 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,12 +3,12 @@ , pango, pkgconfig, scrollkeeper, zlib }: -stdenv.mkDerivation { - name = "gnumeric-1.11.3"; +stdenv.mkDerivation rec { + name = "gnumeric-1.12.0"; src = fetchurl { - url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz; - sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72"; + url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; + sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"; }; configureFlags = "--disable-component"; diff --git a/pkgs/development/libraries/goffice/0.9.nix b/pkgs/development/libraries/goffice/0.10.nix index 23b65b1c712c..793704be255c 100644 --- a/pkgs/development/libraries/goffice/0.9.nix +++ b/pkgs/development/libraries/goffice/0.10.nix @@ -3,11 +3,11 @@ , cairo, gconf, libgnomeui }: stdenv.mkDerivation rec { - name = "goffice-0.9.3"; + name = "goffice-0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz"; - sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h"; + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0acd4a77b46d..4264890fd956 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n && glib != null; stdenv.mkDerivation rec { - name = "libgsf-1.14.23"; + name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; + sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; }; buildNativeInputs = [ intltool pkgconfig ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./syscall-name-clash.patch ]; - meta = { homepage = http://www.gnome.org/projects/libgsf; license = "LGPLv2"; diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch deleted file mode 100644 index 01543ade4fdd..000000000000 --- a/pkgs/development/libraries/libgsf/syscall-name-clash.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c ---- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400 -@@ -34,7 +34,7 @@ - static void clone_dir (GsfInfile *in, GsfOutfile *out); - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - if (gsf_input_size (input) > 0) { - guint8 const *data; -@@ -87,7 +87,7 @@ - gsf_infile_name_by_index (in, i), - is_dir); - -- clone (new_input, new_output); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output); - } - /* An observation: when you think about the explanation to is_dir - * above, you realize that clone_dir is called even for regular files. -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c ---- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInfile *in, GsfOutfile *out) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out) - { - GsfInput *input = GSF_INPUT (in); - GsfOutput *output = GSF_OUTPUT (out); -@@ -85,7 +85,7 @@ - output = gsf_outfile_new_child_full (out, name, is_dir, - "compression-level", level, - NULL); -- clone (GSF_INFILE (input), GSF_OUTFILE (output)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output)); - } - } - gsf_output_close (GSF_OUTPUT (out)); -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_zip_new (output, &err); - g_object_unref (G_OBJECT (output)); -- clone (infile, outfile); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c ---- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -118,7 +118,7 @@ - g_error_free (err); - return 1; - } -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c ---- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -111,7 +111,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0c59f18833..9ee90a1feb6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3852,7 +3852,7 @@ let libart = gnome.libart_lgpl; }; - goffice_0_9 = callPackage ../development/libraries/goffice/0.9.nix { + goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { inherit (gnome) libglade libgnomeui; gconf = gnome.GConf; libart = gnome.libart_lgpl; @@ -7197,7 +7197,7 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_9; + goffice = goffice_0_10; inherit (gnome) libglade scrollkeeper; }; |