From 9d25dc12d931838074e5027a6a7ddc68a7d29ecc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 28 Aug 2016 19:28:31 +0200 Subject: Revert "hdf5: 1.8.16 -> 1.10.0-patch1" This reverts commit 1c1a03f0d38606fd4a80e61a19ddfd3c463d99df. hdf5 1.10 is not yet supported by all tools/libraries (e.g pytables, a dependency of pandas, requires hdf5 1.8). --- pkgs/tools/misc/hdf5/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 235242a558d4..0fd33fc3e394 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -15,12 +15,12 @@ assert !cpp || mpi == null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - version = "1.10.0-patch1"; + version = "1.8.16"; name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; - sha256 = "1fnzdw0ay5mm9v2vjxfhpjkwrkf9ccfah62lhlcfpp2kv16jcwpp"; - }; + url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2"; + sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk"; + }; passthru = { mpiSupport = (mpi != null); -- cgit 1.4.1 From 2fce6824ee4d7714cd45c54ec81db7e994c5b3f5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Aug 2016 22:32:32 +0200 Subject: a2ps: fix a misspelling in description --- pkgs/tools/text/a2ps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 7de6a8dd5745..e26b4ad89a35 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpaper gperf file ]; meta = with stdenv.lib; { - description = "An Anyithing to PostScript converter and pretty-printer"; + description = "An Anything to PostScript converter and pretty-printer"; longDescription = '' GNU a2ps converts files into PostScript for printing or viewing. It uses a nice default format, usually two pages on each physical page, borders surrounding pages, headers with useful information -- cgit 1.4.1 From e113db1e2446d55f864898f921a2a8aeef1531c7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 29 Aug 2016 01:06:35 +0200 Subject: relfs: port to stdenv.mkDerivation https://github.com/NixOS/nixpkgs/issues/4210 --- pkgs/tools/filesystems/relfs/default.nix | 74 +++++++++++++++----------------- 1 file changed, 34 insertions(+), 40 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 6d803f725318..0c8e1c4ef81a 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -1,54 +1,48 @@ -{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre +{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre , libuuid, gnome_vfs, pkgconfig, GConf }: - let localDefs = builderDefs.passthru.function { +stdenv.mkDerivation rec { + name = "relfs-2008.03.05"; + src = fetchcvs { cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; module = "relfs"; date = "2008-03-05"; sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3"; }; - - buildInputs = [ocaml fuse postgresql pcre - libuuid gnome_vfs pkgconfig GConf]; - configureFlags = []; - build = builderDefs.stringsWithDeps.fullDepEntry (" - cd deps - sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl - make - cd ../src - sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c - sed -e 's@/usr/local/@'\$out/'@' -i Makefile - sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile - make - mkdir -p \$out/bin - echo ' - createuser -A -D \$1 - dropdb relfs_\$1 ; - rm -rf /tmp/relfs-\$1-tmp; - mkdir /tmp/relfs-\$1-tmp; - USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & - sleep 1 && - kill -15 \${!}; - rm -rf /tmp/relfs-\$1-tmp ; - psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; - ALTER TABLE obj OWNER TO \$1; - ALTER TABLE obj_mimetype OWNER TO \$1; - ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; - chmod a+x \$out/bin/relfs_grant; - ") ["minInit" "doUnpack" "addInputs"]; - }; - in with localDefs; -assert libuuid != null; - -stdenv.mkDerivation rec { - name = "relfs-2008.03.05"; - builder = writeScript (name + "-builder") - (textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]); + buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs pkgconfig GConf ]; + + buildPhase = '' + cd deps + sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl + make + cd ../src + sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c + sed -e 's@/usr/local/@'\$out/'@' -i Makefile + sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile + make + mkdir -p \$out/bin + echo ' + createuser -A -D \$1 + dropdb relfs_\$1 ; + rm -rf /tmp/relfs-\$1-tmp; + mkdir /tmp/relfs-\$1-tmp; + USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & + sleep 1 && + kill -15 \''${!}; + rm -rf /tmp/relfs-\$1-tmp ; + psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; + ALTER TABLE obj OWNER TO \$1; + ALTER TABLE obj_mimetype OWNER TO \$1; + ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; + chmod a+x \$out/bin/relfs_grant; + ''; + meta = { description = "A relational filesystem on top of FUSE"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } -- cgit 1.4.1 From 4e13a718953d49d46f8817fb8da7e726e5b4e2d9 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 29 Aug 2016 07:20:22 +0800 Subject: logstalgia: fix build (#18065) --- pkgs/tools/graphics/logstalgia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0deb24ed56f9..f7f9211b5154 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew -, mesa, boost, glm }: +{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew +, mesa, boost, glm, freetype }: stdenv.mkDerivation rec { name = "logstalgia-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; }; - buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost - glm ]; + buildInputs = [ glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa boost + glm freetype ]; meta = with stdenv.lib; { homepage = http://code.google.com/p/logstalgia; -- cgit 1.4.1