From a0d45d6f9b581ab1670ec99126c2a48e06938dbb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 11 Jan 2013 18:20:44 +0100 Subject: graphviz: Fix compilation on darwin --- pkgs/tools/graphics/graphviz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index db4d766b7605..96ae324b01f0 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext }: stdenv.mkDerivation rec { @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; patches = [ ./fix-broken-memcp-signature.patch ]; -- cgit 1.4.1 From f286cc65b111df56c5df23af09dbd2d8eb598ccc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 18:26:46 +0100 Subject: Fix bad URLs lacking a scheme --- pkgs/applications/graphics/gocr/default.nix | 2 +- pkgs/applications/science/logic/iprover/default.nix | 2 +- pkgs/applications/science/logic/opensmt/default.nix | 2 +- pkgs/os-specific/linux/pmtools/default.nix | 4 ++-- pkgs/tools/graphics/mscgen/default.nix | 6 +++--- pkgs/tools/system/hardlink/default.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 0e8f860c5101..0f42ac7743e3 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.49"; src = fetchurl { - url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 91d8c122a8d4..2acc0ac8d89a 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -13,7 +13,7 @@ let baseName="iprover"; version="0.8.1"; name="${baseName}_v${version}"; - url="${baseName}.googlecode.com/files/${name}.tar.gz"; + url="http://${baseName}.googlecode.com/files/${name}.tar.gz"; hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; }; in diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 165c8a2f1484..430537fd57ff 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -15,7 +15,7 @@ let version="20101017"; name="${baseName}-${version}"; filename="${baseName}_src_${version}"; - url="${baseName}.googlecode.com/files/${filename}.tgz"; + url="http://${baseName}.googlecode.com/files/${filename}.tgz"; hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; }; in diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 1cb2220a3bdc..13a6e87319ed 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pmtools-20071116"; src = fetchurl { - url = "www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; + url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.lesswatts.org/projects/acpi/utilities.php"; + homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; license = "GPLv2"; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 63e6afaa8039..ed69327b752a 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "mscgen-${version}"; src = fetchurl { - url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; + url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; @@ -19,8 +19,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.mcternan.me.uk/mscgen/"; - description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; + homepage = http://www.mcternan.me.uk/mscgen/; + description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = "GPLv2"; longDescription = '' diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 192f7d871a1f..982aac3c9900 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "hardlink-2012.9.${rev}"; src = fetchurl { - url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; name = "hardlink-${rev}.zip"; }; -- cgit 1.4.1 From 33db3fb3bb27acec162413fed64ff9e25c465adf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Jan 2013 16:43:35 +0400 Subject: Update Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 6 +++--- pkgs/tools/graphics/cuneiform/default.upstream | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/graphics/cuneiform/default.upstream (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 13f7d4b7f6fc..fb07e0a04b5f 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "1.0" a; + version = "1.1.0"; buildInputs = with a; [ cmake imagemagick patchelf ]; in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2"; - sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e"; + url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; inherit buildInputs; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream new file mode 100644 index 000000000000..70f7857580ce --- /dev/null +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -0,0 +1,7 @@ +url https://launchpad.net/cuneiform-linux/+download + +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} -- cgit 1.4.1 From f67bc6bbfd97414f7c3f5b488fe1cb9326b4b7d2 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Wed, 16 Jan 2013 11:43:53 +0100 Subject: Added jbig2enc. --- pkgs/tools/graphics/jbig2enc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/graphics/jbig2enc/default.nix (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix new file mode 100644 index 000000000000..60704d6300c3 --- /dev/null +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { + name = "jbig2enc-0.28"; + + src = fetchurl { + url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + }; + + propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb41a94bd61..b50bd8b30006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1318,6 +1318,8 @@ let pdfjam = callPackage ../tools/typesetting/pdfjam { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; + pdfread = callPackage ../tools/graphics/pdfread { }; briss = callPackage ../tools/graphics/briss { }; -- cgit 1.4.1 From 4b123fee39dd92a34a5f318abdfbc8d742031931 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 17 Jan 2013 11:21:04 +0400 Subject: Fix URL for Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.upstream | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index fb07e0a04b5f..3c75af4bcf38 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2"; sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream index 70f7857580ce..4fb85a2a1e89 100644 --- a/pkgs/tools/graphics/cuneiform/default.upstream +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -4,4 +4,5 @@ do_overwrite () { ensure_hash set_var_value version "$CURRENT_VERSION" set_var_value sha256 "$CURRENT_HASH" + set_var_value ' url' "$CURRENT_URL" } -- cgit 1.4.1