diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
commit | 3e387c3e005c87566b5403d24c86f71f4945a79b (patch) | |
tree | 6ddd883a2e405850093d1f19cd18bb9b712e7c01 /pkgs/tools | |
parent | df8958435e1fd0c6d55394e95d3d3d2e0edca474 (diff) | |
parent | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (diff) | |
download | nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.gz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.bz2 nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.lz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.xz nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.zst nixlib-3e387c3e005c87566b5403d24c86f71f4945a79b.zip |
Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.
Diffstat (limited to 'pkgs/tools')
25 files changed, 115 insertions, 180 deletions
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index c74814ae1974..56da02cc8d08 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - configurePhase = ":"; - buildPhase = ":"; + dontBuild = false; + doCheck = false; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp sec $out/bin cp sec.man $out/share/man/man1/sec.1 ''; - doCheck = false; meta = { homepage = "http://simple-evcorr.sourceforge.net/"; @@ -26,5 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; - } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a165ab2b157b..f46ddd1c5369 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,96 +1,33 @@ -{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }: +{ stdenv, fetchurl +, linkStatic ? (stdenv.system == "i686-cygwin") +}: -let - version = "1.0.6"; - - sharedLibrary = !(stdenv ? isStatic) - && stdenv.system != "i686-cygwin" && !linkStatic; - - darwinMakefile = fetchurl { - url = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib"; - sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz"; - }; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bzip2-${version}"; + version = "1.0.6.0.1"; + /* We use versions patched to use autotools style properly, + saving lots of trouble. */ src = fetchurl { - url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz"; - sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; - }; - - crossAttrs = { - buildInputs = [ libtool autoconf automake gnum4 ]; - patches = [ - # original upstream for the autoconf patch is here: - # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch - # but we get the mingw-builds version of the patch, which fixes - # a few more issues - (fetchurl { - url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; - sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; - }) - ]; - patchFlags = "-p0"; - postPatch = '' - sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c - ''; - preConfigure = "sh ./autogen.sh"; - # clear native hooks that are not needed with autoconf - preBuild = ""; - preInstall = ""; - postInstall = ""; + urls = map + (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz") + [ + "http://ftp.uni-kl.de/pub/linux/suse" + "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse" + "ftp://ftp.mplayerhq.hu/pub/linux/suse" + "http://ftp.suse.com/pub" # the original patched version but slow + ]; + sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; }; - outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out"; - - preBuild = stdenv.lib.optionalString sharedLibrary '' - make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"} - ''; - - preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then '' - mkdir -p $out/lib - mv libbz2.so* $out/lib - ( cd $out/lib && - ln -s libbz2.so.1.0.? libbz2.so && - ln -s libbz2.so.1.0.? libbz2.so.1 - ) - '' else '' - mkdir -p $out/lib - mv libbz2.*.dylib $out/lib - ( cd $out/lib && - ln -s libbz2.1.0.?.dylib libbz2.dylib && - ln -s libbz2.1.0.?.dylib libbz2.1.dylib - ) - ''); - - installFlags = [ "PREFIX=$(bin)" ]; - - postInstall = '' - rm $bin/bin/bunzip2* $bin/bin/bzcat* - ln -s bzip2 $bin/bin/bunzip2 - ln -s bzip2 $bin/bin/bzcat - - mkdir "$static" - mv "$bin/lib" "$static/" - ''; - postPatch = '' - substituteInPlace Makefile --replace CC=gcc CC=cc - substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc - '' + stdenv.lib.optionalString stdenv.isDarwin '' - cp ${darwinMakefile} Makefile-libbz2_dylib - substituteInPlace Makefile-libbz2_dylib \ - --replace "CC=gcc" "CC=cc" \ - --replace "PREFIX=/usr" "PREFIX=$out" - ''; - - preConfigure = '' - substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man' + sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c ''; - makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static"; + outputs = [ "dev" "bin" "out" "man" ]; - inherit linkStatic; + configureFlags = + stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; meta = { homepage = "http://www.bzip.org"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cf09ec8bf739..31a67b1baf94 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gzip-${version}"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnu/gzip/${name}.tar.xz"; - sha256 = "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv"; + sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; }; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 19457e136556..ad237e408c66 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -267,7 +267,7 @@ stdenv.mkDerivation { # Fix .la file link dependencies find "$lib/lib" -name \*.la | xargs sed -i \ - -e 's,-lboost_[a-z]*,-L${boost.lib}/lib \0,g' \ + -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \ '' + optionalString (cryptoStr == "cryptopp") '' -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \ '' + optionalString (cryptoStr == "nss") '' diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 556cb674212d..bbd4b185d5ec 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export ANT_HOME=${ant} export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.lib}/lib + export BOOST_LIBRARYDIR=${boost.out}/lib export OPENSSL_ROOT_DIR=${openssl} substituteInPlace cpp/cmake/FindValgrind.cmake \ diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 9b983450f480..24d678e11422 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; + broken = true; }; } diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 632f46f81e94..690043791b20 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -23,7 +23,7 @@ let for prog in ibus ibus-daemon ibus-setup; do wrapProgram "$out/bin/$prog" \ - --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index f9f9f06eb518..596030216f60 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: +, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "calamares-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkit-qt parted + cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 4af6475668e7..d60b47ca0116 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: let - # USAGE like this: debootstrap sid /tmp/target-chroot-directory - # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { name = "makedev-for-debootstrap"; src = fetchurl { @@ -27,11 +24,7 @@ let chmod +x $t ''; }; - -in - -stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { name = "debootstrap-${version}"; version = "1.0.80"; @@ -44,14 +37,13 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg gettext gawk perl ]; - buildPhase = ":"; + dontBuild = true; # If you have to update the patch for functions a vim regex like this # can help you identify which lines are used to write scripts on TARGET and # which should /bin/ paths should be replaced: # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END installPhase = '' - sed -i \ -e 's@/usr/bin/id@id@' \ -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \ @@ -59,7 +51,6 @@ stdenv.mkDerivation rec { -e 's@/bin/sha@${coreutils}/bin/sha@' \ debootstrap - for file in functions debootstrap; do substituteInPlace "$file" \ --subst-var-by gunzip "$(type -p gunzip)" \ @@ -103,7 +94,7 @@ stdenv.mkDerivation rec { inherit makedev; }; - meta = { + meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index afdca314ae64..ecc8f1908de0 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; + outputs = [ "dev" "out" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 3e8f3ca3dc59..f8a8b6393d21 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -5,33 +5,34 @@ stdenv.mkDerivation rec { name = "swec-0.4"; src = fetchurl { - url = "http://random.zerodogg.org/files/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; - configurePhase = - '' for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' - done - ''; - - buildPhase = "true"; - installPhase = - '' make install prefix="$out" - - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : \ - ${stdenv.lib.concatStringsSep ":" - (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} - ''; + configurePhase = '' + for i in swec tests/{runTests,testServer} + do + sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' + done + ''; + + dontBuild = true; + + installPhase = '' + make install prefix="$out" + + mkdir -p "$out/share/${name}" + cp -v default.sdf "$out/share/${name}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + + wrapProgram "$out/bin/swec" \ + --prefix PERL5LIB : \ + ${stdenv.lib.concatStringsSep ":" + (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} + ''; doCheck = true; checkPhase = "make test"; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index e8670770c5f4..8dfc9e6333eb 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -14,18 +14,17 @@ stdenv.mkDerivation { buildInputs = [ nix readline ]; - buildPhase = "true"; + dontBuild = true; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; + installPhase = '' + mkdir -p $out/bin + $CXX -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix \ + -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ + -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" + ''; meta = { homepage = https://github.com/edolstra/nix-repl; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 332576a9873c..3a20fdc0fac3 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -15,21 +15,20 @@ stdenv.mkDerivation rec { buildInputs = [ perl nix ] ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); - buildPhase = "true"; + dontBuild = false; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/libexec/nix-serve - cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi - - mkdir -p $out/bin - cat > $out/bin/nix-serve <<EOF - #! ${stdenv.shell} - PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" - EOF - chmod +x $out/bin/nix-serve - ''; + installPhase = '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve <<EOF + #! ${stdenv.shell} + PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" + EOF + chmod +x $out/bin/nix-serve + ''; meta = { homepage = https://github.com/edolstra/nix-serve; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index ae9b3be9ee2f..c81a01ef8962 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation { buildInputs = [ python ]; - patchPhase = - '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' - ''; + patchPhase = '' + sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' + ''; - buildPhase = "true"; + dontBuild = true; - installPhase = - '' mkdir -p "$out/bin" - cp -v pius "$out/bin" + installPhase = '' + mkdir -p "$out/bin" + cp -v pius "$out/bin" - mkdir -p "$out/doc/pius-${version}" - cp -v README "$out/doc/pius-${version}" - ''; + mkdir -p "$out/doc/pius-${version}" + cp -v README "$out/doc/pius-${version}" + ''; meta = { homepage = http://www.phildev.net/pius/; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d618f842a4a5..3e714871827d 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "2.22"; in +let version = "2.25"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa"; + sha256 = "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2"; }; # Perl is needed for testing diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 062715b83020..c0db454ed29b 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; + cmakeFlags = stdenv.lib.optional + (stdenv.cross.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; + # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index d5530a3df916..5015a220afb5 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost ]; - configureFlags = [ "--with-boost=${boost.lib}" ]; + configureFlags = [ "--with-boost=${boost.out}" ]; enableParallelBuilding = false; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 000584a50e10..c76e0f49734e 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { dpkg-deb -x ${src} ./ ''; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index e2b59bdb115a..b7ff365fad52 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { mimeType = "text/xml"; }; - # We're using a pre-built package - configurePhase = "true"; - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p "$out" cp -r * "$out" diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix index da029639c3d2..c19447cc0c4a 100644 --- a/pkgs/tools/typesetting/pygmentex/default.nix +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -11,12 +11,11 @@ python2Packages.buildPythonApplication rec { pythonPath = [ python2Packages.pygments python2Packages.chardet ]; - buildPhase = ":"; - + dontBuild = true; + doCheck = false; - + installPhase = '' - mkdir -p $out/bin cp -a pygmentex.py $out/bin ''; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 18f9c99ee240..0aab900f1503 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { done ''; - buildPhase = "true"; + dontBuild = true; installPhase = '' python ./setup.py install --prefix="$out" --use-python-path --verbose diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index a26513d9f26d..5e84a92caddb 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -8,11 +8,13 @@ stdenv.mkDerivation { sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; - buildPhase = "true"; + dontBuild = true; + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "1"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 821357e72739..05e28454be1f 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation { sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; - buildPhase = "true"; + dontBuild = true; installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "2"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 32c73c4a43cc..b8df977cfb01 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -17,12 +17,13 @@ stdenv.mkDerivation { unzip $src ''; - buildPhase = "true"; + dontBuild = true; installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "3"; }; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index 67739350c6f6..d7c03967b0b4 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation { name = "pgfplots-1.5.1"; + src = fetchurl { url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; - + buildInputs = [ unzip ]; - + unpackPhase = "unzip $src"; - - buildPhase = "true"; - + + dontBuild = true; + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix |