diff options
Diffstat (limited to 'pkgs/tools')
105 files changed, 980 insertions, 251 deletions
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 871dc5e130a6..f4776933e53d 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://savannah.nongnu.org/download/autocutsel/${name}.tar.gz"; + url = "mirror://savannah/autocutsel/${name}.tar.gz"; sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y"; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix new file mode 100644 index 000000000000..96241bd02cdf --- /dev/null +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, imlib2, libX11, libXext }: + +stdenv.mkDerivation { + name = "hsetroot-1.0.2"; + + # The primary download site seems to no longer exist; use Gentoo's mirror for now. + src = fetchurl { + url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz"; + sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; + }; + + buildInputs = [ imlib2 libX11 libXext ]; + + meta = { + description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + homepage = http://thegraveyard.org/hsetroot.html; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix new file mode 100644 index 000000000000..b53db509dafe --- /dev/null +++ b/pkgs/tools/X11/winswitch/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, buildPythonPackage, pythonPackages +, which, xpra, xmodmap }: + +let + base = buildPythonPackage rec { + name = "winswitch-${version}"; + namePrefix = ""; + version = "0.12.16"; + + src = fetchurl { + url = "http://winswitch.org/src/${name}.src.tar.bz2"; + sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8"; + }; + + propagatedBuildInputs = with pythonPackages; [ + pygtk twisted pycrypto pyasn1 which xpra xmodmap + ]; + + patchPhase = '' + sed -i -r -e 's|(PREFIX_DIR *= *).*|\1"'"$out"'"|' \ + -e 's|(PREFIX_SEARCH_ORDER *= *).*|\1["'"$out"'"]|' \ + -e 's|(ETC_SEARCH_ORDER *= *).*|\1["'"$out/etc"'"]|' \ + -e 's|(BIN_SEARCH_ORDER *= *).*|\1["'"$out/bin"'"]|' \ + winswitch/util/paths.py + + sed -i -e '/elif *LINUX:/,/distro_helper/{ + s/elif *LINUX:.*/else: name = "NixOS"/p + /distro_helper/!d + }' winswitch/util/distro_packaging_util.py + ''; + + buildPhase = '' + python setup.py build + ''; + + installCommand = '' + PREFIX="$out" python ./setup.py install --prefix="$out" + ''; + + doCheck = false; + }; +in stdenv.lib.overrideDerivation base (b: { + postFixup = b.postFixup + '' + sed -i -e 's/\''${PATH:+:}\$PATH//g' "$out/bin"/* + ''; +}) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix new file mode 100644 index 000000000000..f4705bdb0d41 --- /dev/null +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }: + +stdenv.mkDerivation rec { + + name = "wmctrl-1.07"; + + src = fetchurl { + url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; + sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; + }; + + buildInputs = [ libX11 libXmu glib pkgconfig ]; + + meta = { + homepage = http://tomas.styblo.name/wmctrl/; + description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix new file mode 100644 index 000000000000..272f1ca0907c --- /dev/null +++ b/pkgs/tools/X11/xcape/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig +, inputproto, libXi}: +let + s = rec { + baseName = "xcape"; + version = "git-2013-05-30"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + libX11 libXtst xproto xextproto pkgconfig inputproto libXi + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + url = https://github.com/alols/xcape; + rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb"; + sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg"; + }; + preConfigure = '' + makeFlags="$makeFlags PREFIX=$out" + ''; + meta = { + inherit (s) version; + description = ''A tool to have Escape and Control on a single key''; + license = stdenv.lib.licenses.gpl3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index df5d59c7b57c..52ddb5a0f6b1 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, file }: stdenv.mkDerivation rec { - name = "xdg-utils-1.0.2"; + name = "xdg-utils-1.1.0-rc1"; src = fetchurl { - url = "http://portland.freedesktop.org/download/${name}.tgz"; - sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"; + url = "http://portland.freedesktop.org/download/${name}.tar.gz"; + sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; }; postInstall = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix new file mode 100644 index 000000000000..aa8361c737f1 --- /dev/null +++ b/pkgs/tools/admin/awscli/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "awscli-${version}"; + version = "0.8.3"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; + sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; + }; + + propagatedBuildInputs = [ + pythonPackages.argparse + pythonPackages.botocore + pythonPackages.colorama + ]; +} diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix index edc770a5fbb8..73102be6afe5 100644 --- a/pkgs/tools/admin/webdruid/src-for-default.nix +++ b/pkgs/tools/admin/webdruid/src-for-default.nix @@ -1,7 +1,7 @@ rec { advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz"; version = "0.6.0-alpha5"; - url="http://downloads.sourceforge.net/webdruid/files/webdruid/${version}/webdruid-${version}.tar.gz"; + url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz"; hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0"; name = "webdruid-0.6.0-alpha5"; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index d376f75a552c..f041f2050ea0 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "atool-0.39"; + name = "atool-0.39.0"; src = fetchurl { - url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz; + url = mirror://savannah/atool/atool-0.39.0.tar.gz; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 3512d62223f4..fdba02d12b72 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10"; + name = "cromfs-1.5.10.1"; src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j"; + sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2"; }; patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix new file mode 100644 index 000000000000..ecdf40be0a5a --- /dev/null +++ b/pkgs/tools/backup/httrack/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib, openssl }: + +stdenv.mkDerivation rec { + version = "3.47.21"; + name = "httrack-${version}"; + + src = fetchurl { + url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; + sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0"; + }; + + buildInputs = [ zlib openssl ]; + + meta = { + homepage = "http://www.httrack.com"; + description = "HTTrack is a free (GPL, libre/free software) and easy-to-use offline browser utility."; + license = "GPL"; + }; +} diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index d06ef2c83662..009dc90576b3 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = http://sourceforge.net/projects/partimage/files/stable/0.6.9/partimage-0.6.9.tar.bz2; + url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; configureFlags = "--with-ssl-headers=${openssl}/include/openssl"; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index f108e6a50634..d52cbdebb677 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rdiff-backup-1.2.8"; src = fetchurl { - url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz; + url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz; sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; }; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index bcf03356c683..ae432c6122a0 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: stdenv.mkDerivation { - name = "tarsnap-1.0.33"; + name = "tarsnap-1.0.35"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz"; - sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; + sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; }; buildInputs = [ openssl zlib e2fsprogs ]; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index b1fd5a10c2b4..0b97f03a9adc 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }: -let version = "563"; in +let version = "585"; in stdenv.mkDerivation rec { name = "unetbootin-${version}"; src = fetchurl { url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz"; - sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939"; + sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3"; }; sourceRoot = "."; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index de29c34f150e..03a8a7f169db 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz"; + url = "mirror://savannah/lzip/${name}.tar.gz"; sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz"; }; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index f3b8037a9f19..4df2947d1374 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "upx-3.07"; src = fetchurl { - url = http://upx.sourceforge.net/download/upx-3.07-src.tar.bz2; + url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2; sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs"; }; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 7e52190d43a8..d081f08ffc7c 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.tar.bz2"; + url = "http://tarballs.nixos.org/${name}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index b0ee47e23b56..a98def328352 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.11"; + name = "dosfstools-3.0.21"; src = fetchurl { - urls = [ - "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2" - "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2" - ]; - sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll"; + url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; + sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix new file mode 100644 index 000000000000..3d8fa0827ca4 --- /dev/null +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, e2fsprogs }: + +stdenv.mkDerivation rec { + version = "0.2.4"; + name = "extundelete-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2"; + sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1"; + }; + + buildInputs = [ e2fsprogs ]; + + meta = with stdenv.lib; { + description = "utility that can recover deleted files from an ext3 or ext4 partition"; + homepage = http://extundelete.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix index 91060795e7cd..fb5b72d714af 100644 --- a/pkgs/tools/filesystems/jfsrec/default.nix +++ b/pkgs/tools/filesystems/jfsrec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jfsrec-pre-svn-7"; src = fetchurl { - url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz; + url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz; sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; }; diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix new file mode 100644 index 000000000000..2cd40bb08675 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, buildPythonPackage, blivet +# Propagated to blivet +, useNixUdev ? null, udevSoMajor ? null +}: + +let + blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) { + inherit useNixUdev udevSoMajor; + }; +in buildPythonPackage rec { + name = "nixpart-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; + }; + + propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; + + doCheck = false; + + meta = { + description = "NixOS storage manager/partitioner"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + }; +} diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 946d18b8cc57..6f8ec54c4c04 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -12,8 +12,7 @@ let version="0.98"; baseName="barcode"; name="${baseName}-${version}"; - # mirror://gnu/ doesn't work for this package - url="http://ftp.gnu.org/gnu/${baseName}/${name}.tar.gz"; + url="mirror://gnu/${baseName}/${name}.tar.gz"; hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2"; }; in diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix index ae3a227a4fe0..29c6b5ebf795 100644 --- a/pkgs/tools/graphics/dmtx/default.nix +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -12,7 +12,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2"; + url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2"; sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk"; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix new file mode 100644 index 000000000000..64222185044d --- /dev/null +++ b/pkgs/tools/graphics/editres/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: + +stdenv.mkDerivation rec { + name = "editres-1.0.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/${name}.tar.gz"; + sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45"; + }; + + buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ]; + + preConfigure = "configureFlags=--with-appdefaultdir=$out/share/X11/app-defaults/editres"; + + meta = { + homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; + description = "a dynamic resource editor for X Toolkit applications"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 485edf7335d3..5dee1079ae27 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper +{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline , texLive ? null , lua ? null , emacs ? null @@ -10,9 +10,9 @@ , pango ? null , cairo ? null , pkgconfig ? null -, readline -, fontconfig ? null, gnused ? null, coreutils ? null -}: +, fontconfig ? null +, gnused ? null +, coreutils ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); @@ -26,11 +26,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig makeWrapper - ]; + pango cairo pkgconfig makeWrapper ] + # compiling with wxGTK causes a malloc (double free) error on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + postInstall = stdenv.lib.optionalString (libX11 != null) '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ @@ -39,9 +42,10 @@ stdenv.mkDerivation rec { --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; - meta = { - homepage = "http://www.gnuplot.info"; + meta = with stdenv.lib; { + homepage = http://www.gnuplot.info; description = "A portable command-line driven graphing utility for many platforms"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2af863e37bc7..39e134ad9069 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11 }: +{ stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }: let rev = 1742; in stdenv.mkDerivation { @@ -12,18 +12,28 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform - buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 ]; + buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ]; - configurePhase = "cp config.mk.in config.mk"; + configurePhase = '' + cp config.mk.in config.mk + substituteInPlace "config.mk" \ + --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \ + --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \ + --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" + ''; preBuild = '' - export LDFLAGS=-lz + export LDFLAGS="-lz" substituteInPlace "pm_config.in.h" \ --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \ --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \ --subst-var-by "rgbPath3" "/var/empty/rgb.txt" + touch lib/standardppmdfont.c ''; + enableParallelBuilding = true; + installPhase = '' make package pkgdir=$PWD/netpbmpkg # Pass answers to the script questions @@ -51,5 +61,6 @@ stdenv.mkDerivation { homepage = http://netpbm.sourceforge.net/; description = "Toolkit for manipulation of graphic images"; license = "GPL,free"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index b3d75106980b..efdeffe1ad79 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pstoedit-3.50"; src = fetchurl { - url = http://prdownloads.sourceforge.net/pstoedit/pstoedit-3.50.tar.gz; + url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz; sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92"; }; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix new file mode 100644 index 000000000000..bec0840490d5 --- /dev/null +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, libiconvOrEmpty }: + +stdenv.mkDerivation rec { + version = "3.0.9"; + name = "aescrypt-${version}"; + + src = fetchurl { + url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; + sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882"; + }; + + preBuild = '' + cd src + ''; + + installPhase= '' + mkdir -p $out/bin + cp aescrypt $out/bin + cp aescrypt_keygen $out/bin + ''; + + buildInputs = [ libiconvOrEmpty ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + + meta = with stdenv.lib; { + description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files"; + homepage = http://www.aescrypt.com/; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 qknight ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 459c9c86ce43..9b9155a1edbb 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -16,6 +16,9 @@ in dontBuild = true; installPhase = '' + # don't check shell support (we're running with bash anyway) + sed -i -e 150,153d install.sh + bash ./install.sh -d $out mkdir -p "$out/etc/bash_completion.d" diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix new file mode 100644 index 000000000000..29a6db4e6d27 --- /dev/null +++ b/pkgs/tools/misc/bmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }: + +stdenv.mkDerivation { + name = "bmon-3.1"; + + src = fetchurl { + url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz; + sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky"; + }; + + buildInputs = [ pkgconfig ncurses confuse libnl ]; + + meta = with stdenv.lib; { + description = "Network bandwidth monitor"; + homepage = http://www.carisma.slowglass.com/~tgr/bmon/; + # Neither the homepage nor the source archive has license info, but in the + # latest git version there is a LICENSE file that is the 2-clause BSD + # license. + # - https://github.com/tgraf/bmon/blob/master/LICENSE + # - http://opensource.org/licenses/BSD-2-Clause + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index b9a15ac6a204..75a9a2037dbe 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, bzip2, openssl }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.2"; + name = "dmg2img-1.6.4"; src = fetchurl { url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; - sha256 = "1ibxjsrl9g877qi3jjpv0zdgl4x8j1vnd4y27q17a8my1jkhh5cg"; + sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb"; }; - + buildInputs = [zlib bzip2 openssl]; installPhase = '' diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 1fc03a4ebff1..90d345daa135 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,18 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ethtool-3.2"; +stdenv.mkDerivation rec { + name = "ethtool-3.10"; src = fetchurl { - url = mirror://kernel/software/network/ethtool/ethtool-3.2.tar.xz; - sha256 = "0g9ldaba3vwlsmf490j33y3fgsmpfzxlzzblwashl448f8lcfap7"; + url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; + sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq"; }; + meta = with stdenv.lib; { + description = "Utility for controlling network drivers and hardware"; + homepage = https://www.kernel.org/pub/software/network/ethtool/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; } diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index faa4a9e8f7a9..41bc2ffc99df 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "getopt-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz; + url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz; md5 = "02188ca68da27c4175d6e9f3da732101"; }; } diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index eb9aa5feaa3b..f3c5dd02c7e5 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; db = fetchurl{ - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db; + url = mirror://savannah/hddtemp/hddtemp.db; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; src = fetchurl { - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2; + url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2; sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index c8ba478af330..0aacf744b1ab 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,7 +3,7 @@ , fetchurl }: stdenv.mkDerivation { - name = "hdf5-1.8.10"; + name = "hdf5-1.8.10-patch1"; src = fetchurl { url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 54367e671ea4..5374cb743618 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "man-db-2.5.1"; src = fetchurl { - url = http://download.savannah.nongnu.org/releases/man-db/man-db-2.5.1.tar.gz; + url = mirror://savannah/man-db/man-db-2.5.1.tar.gz; sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3"; }; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix new file mode 100644 index 000000000000..7701f0e20590 --- /dev/null +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libmcrypt, libmhash }: + +stdenv.mkDerivation rec { + version = "2.6.8"; + name = "mcrypt-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz"; + sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; + }; + + buildInputs = [libmcrypt libmhash]; + + meta = { + description = "mcrypt, and the accompanying libmcrypt, are intended to be replacements for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes."; + homepage = http://mcrypt.sourceforge.net; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 9b1968c6fd1f..ee9dc4f28b60 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mdbtools-0.6pre1"; src = fetchurl { - url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz; + url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz; sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 35395fc116f4..978bb2729f84 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86-4.0a"; + name = "memtest86-4.1.0"; src = fetchurl { - url = http://memtest86.com/memtest86-4.0a.tar.gz; - sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y"; + url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz; + sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq"; }; preBuild = '' diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index ef735bf4384c..2ab1195020c3 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "minicom-2.4"; + name = "minicom-2.6.2"; src = fetchurl { - url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz"; - sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb"; + url = "http://alioth.debian.org/frs/download.php/file/3869/${name}.tar.gz"; + sha256 = "0s4ibk8scspm8a0raf5s4zgp9b82c4bn529rir9abzqlg5gj3kzk"; }; buildInputs = [ncurses]; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 713d6dc70b81..f177e9e84c28 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, openssl}: stdenv.mkDerivation { - name = "mktorrent-1.0.0"; + name = "mktorrent-1.0"; src = fetchurl { url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz; diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 6d4793a4aab5..527dbe858138 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, readline}: stdenv.mkDerivation { - name = "renameutils-0.12"; + name = "renameutils-0.12.0"; src = fetchurl { url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index a1cf21aa64a1..805bcf6b01cb 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01"; }; + preConfigure = '' + substituteInPlace Makefile.in \ + --replace "/usr/" "/" + ''; + makeFlags="DESTDIR=$(out)"; meta = { diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 6ccfea50482b..47734b4cd69e 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "testdisk-6.13"; - + src = fetchurl { url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2; sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8"; @@ -13,6 +13,8 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' TestDisk is a program for data recovery, primarily designed to help recover lost partitions and/or make non-booting disks diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 659b04a62386..5a03e0995393 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; src = fetchurl { - url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz; + url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index a056ec13f027..d4cd07aa4c6f 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "units-1.86"; src = fetchurl { - url = ftp://ftp.gnu.org/gnu/units/units-1.86.tar.gz; + url = mirror://gnu/units/units-1.86.tar.gz; sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi"; }; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix new file mode 100644 index 000000000000..b4f9732dec6c --- /dev/null +++ b/pkgs/tools/misc/venus/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }: + +let + rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b"; +in + +stdenv.mkDerivation rec { + name = "venus-${rev}"; + + src = fetchurl { + url = "https://github.com/rubys/venus/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy"; + }; + + preConfigure = '' + substituteInPlace tests/test_spider.py \ + --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \ + --replace "[200,200,200,200,404]" "[200,200,200,404]" + substituteInPlace planet.py \ + --replace "#!/usr/bin/env python" "#!${python}/bin/python" + substituteInPlace tests/test_apply.py \ + --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + substituteInPlace planet/shell/xslt.py \ + --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + ''; + + doCheck = true; + checkPhase = "python runtests.py"; + + buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt + libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -R ./* $out/ + ln -s $out/planet.py $out/bin/venus-planet + wrapProgram $out/planet.py \ + --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages + python runtests.py + ''; + + meta = { + description = "Planet Venus is an awesome ‘river of news’ feed reader. It downloads news feeds published by web sites and aggregates their content together into a single combined feed, latest news first."; + homepage = "http://intertwingly.net/code/venus/docs/index.html"; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; +} diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 5692aecebbf0..de7ee27d7045 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vfdecrypt"; src = fetchgit { - url = git://github.com/dra1nerdrake/VFDecrypt.git; + url = git://github.com/drakealleg/VFDecrypt.git; rev = "4e2fa32816254907e82886b936afcae9859a876c"; sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 54b3e6a48564..e4d934968b2e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchurl, python, pandoc, zip }: +{ stdenv, fetchurl, python, zip }: let - version = "2012.12.11"; + version = "2013.06.21"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { - url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz"; - sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn"; + url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; + sha256 = "3d4e9cc38af3c2fccfafd83d0c6382080531fd03e9067ceccc6864dfbea92b1e"; }; buildInputs = [ python ]; - nativeBuildInputs = [ zip ] ++ - stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) pandoc; + nativeBuildInputs = [ zip ]; patchPhase = '' rm youtube-dl - substituteInPlace Makefile --replace "#!/usr/bin/env python" "#!${python}/bin/python" ''; configurePhase = '' - makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc ) + makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; meta = { diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index 120e32ab29cc..4f58463ecf93 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -4,7 +4,7 @@ let version="0.14.0"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { - url = "http://downloads.sourceforge.net/aria2/aria2c-${version}.tar.bz2"; + url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr"; }; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 383a2963ff23..75b6492a851f 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, openssl, libxml2, zlib }: +{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.10.8"; + name = "aria2-1.17.1"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "1cbcrxwdc6gp4l4zqg2i18zdg5ry5f9r3zj66kx6l5plwfjv9fdc"; + sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y"; }; - buildInputs = [ openssl libxml2 zlib ]; + buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; meta = { homepage = http://aria2.sourceforge.net/; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index e83ad7933f10..91061a457d41 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, python, sysstat }: +{ stdenv, fetchurl, python, sysstat, unzip }: stdenv.mkDerivation rec { - name = "dd-agent-ab14fde6f9"; + version = "3.8.0"; + name = "dd-agent-${version}"; - src = fetchgit { - url = git://github.com/DataDog/dd-agent.git; - rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770"; - sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; + src = fetchurl { + url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; + sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx"; }; - buildInputs = [ python ]; + buildInputs = [ python unzip ]; + propagatedBuildInputs = [ python ]; postUnpack = "export sourceRoot=$sourceRoot/packaging"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.datadoghq.com; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix new file mode 100644 index 000000000000..99cfb92a18b6 --- /dev/null +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, autoconf, automake111x, makeWrapper +, gnugrep, openssl}: + +stdenv.mkDerivation rec { + name = "easyrsa-2.2.0"; + + src = fetchurl { + url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz"; + sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; + }; + + # Copy missing files and autoreconf + preConfigure = '' + cp ${automake111x}/share/automake/install-sh . + cp ${automake111x}/share/automake/missing . + + autoreconf + ''; + + preBuild = '' + mkdir -p $out/share/easy-rsa + ''; + + nativeBuildInputs = [ autoconf makeWrapper automake111x ]; + buildInputs = [ gnugrep openssl]; + + # Make sane defaults and patch default config vars + postInstall = '' + for prog in $(find "$out/share/easy-rsa" -executable); do + makeWrapper "$prog" "$out/bin/$(basename $prog)" \ + --set EASY_RSA "$out/share/easy-rsa" \ + --set OPENSSL "${openssl}/bin/openssl" \ + --set GREP "${gnugrep}/bin/grep" + done + sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars + ''; + + meta = with stdenv.lib; { + description = "Simple shell based CA utility"; + homepage = http://openvpn.net/; + license = licenses.gpl2; + maintainers = [ maintainers.offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index 8649eda4bf71..13efc944bd04 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, tcl}: stdenv.mkDerivation { - name = "eggdrop-1.6.19"; + name = "eggdrop-1.6.19+ctcpfix"; src = fetchurl { url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 052367400efc..a6700284af56 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="fdm"; - version="1.6"; + version="1.7"; name="${baseName}-${version}"; - url="http://downloads.sourceforge.net/${baseName}/${name}.tar.gz"; - hash="01ipxay4rv52ra2zzybf92x6n1hyklib94ncsg04k3rp4w5a8sbj"; + url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; + hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; }; in rec { @@ -26,7 +26,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["fixInstall" "doMakeInstall"]; + phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"]; makeFlags = ["PREFIX=$out"]; fixInstall = a.fullDepEntry ('' sed -i */Makefile -i Makefile -e 's@ -g bin @ @' diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3072ba3bd4fc..fc2b56efd105 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { name = "filegive-${version}"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; - name = "${name}.tar.gz"; - sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1"; + url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz"; + sha256 = "11rjw906nr73kysm9l84yg443rxzh22l934hir7892h02924i4c4"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index cbc07522019a..c9bc05658d03 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "flvstreamer-2.1c1"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz"; + url = "mirror://savannah/flvstreamer/source/${name}.tar.gz"; sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; }; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 1ea2b761fc89..8ab939481915 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { patchPhase = '' cat ${startScript} > etc/scripts/gmvault chmod +x etc/scripts/gmvault + substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2" ''; meta = { diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix index 097f275feffd..88264c5d7715 100644 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ b/pkgs/tools/networking/gvpe/src-for-default.nix @@ -2,7 +2,7 @@ rec { version="2.24"; name="gvpe-2.24"; hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy"; - url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url="mirror://gnu/gvpe/gvpe-${version}.tar.gz"; advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz"; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 0a43251dc350..d44c9f831f34 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchurl }: +{ stdenv, pkgs, fetchurl }: -stdenv.mkDerivation { - name = "haproxy-1.4.20"; +stdenv.mkDerivation rec { + version = "1.4.24"; + name = "haproxy-${version}"; src = fetchurl { - url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz; - sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh"; + url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz"; + sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8"; }; - buildInputs = []; + buildInputs = [ ]; + # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux26 PREFIX=$out" + export makeFlags="TARGET=linux2628 PREFIX=$out" ''; - + meta = { description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; - homepage = http://haproxy.1wt.eu/; + homepage = http://haproxy.1wt.eu; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + license = [ + stdenv.lib.licenses.gpl2 + stdenv.lib.licenses.lgpl21 + ]; }; } diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 3a9c0e10a784..a1f5026fb28b 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - meta = { - description = "iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts."; - - license = "GPLv2+"; + meta = with stdenv.lib; { + description = "Display bandwidth usage on a network interface"; + longDescription = '' + iftop does for network usage what top(1) does for CPU usage. It listens + to network traffic on a named interface and displays a table of current + bandwidth usage by pairs of hosts. + ''; + license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index 1cb984e3d1c4..66f600f76784 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iperf-2.0.4"; src = fetchurl { - url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; + url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz; sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; }; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 7daf12075675..69c7b77e3f90 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn, udev }: +, makeWrapper, networkmanager_openvpn, networkmanager_vpnc +, networkmanager_openconnect, udev, hicolor_icon_theme }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.8.0"; + version = "${major}.8.2"; in stdenv.mkDerivation rec { @@ -14,23 +15,35 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "141m0n4fhsv1k82jm4531f12mq29d3213lph5c9rbfkhd1rnxyqs"; + sha256 = "1ixd19b7ap29lz9lq4mmlq9lqsmnisix1a33hrxrl68wjx1wfh55"; }; buildInputs = [ - gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib - polkit isocodes makeWrapper udev + gtk libglade networkmanager libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev GConf libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; + propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; + makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; postInstall = '' - ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager - ln -s ${networkmanager_openvpn}/lib/* $out/lib + mkdir -p $out/etc/NetworkManager/VPN + ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name + ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name + ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name + mkdir -p $out/lib/NetworkManager + ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ + mkdir -p $out/libexec + ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ + ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ + ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix new file mode 100644 index 000000000000..ccb5badd9031 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openconnect"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "16sdgrabbh2y7j6g9ic9lm5z6sxn7iz3j0xininkiwnjgbsqf961"; + }; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-openconnect-service.c" \ + --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "NetworkManager's OpenConnect plugin"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 9817a8cddd12..c51bf09f99c0 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; }; } diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a60199aab2d0..41dda0086e4b 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l"; + sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac"; }; buildInputs = [ networkmanager pptp ppp ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix new file mode 100644 index 000000000000..683a7e76948d --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-vpnc"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "1hdigqfvsjlr1zr23lwmcsvcv1x74cqhfpwrd0j0zhhmjdb4ql74"; + }; + + buildInputs = [ vpnc networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-vpnc-service.c" \ + --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "NetworkManager's VPNC plugin"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 92cb053bb44b..a63ec2a3d680 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nss-pam-ldapd-${version}"; - version = "0.8.11"; + version = "0.8.13"; src = fetchurl { url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; - sha256 = "9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6"; + sha256 = "08jxxskzv983grc28zksk9fd8q5qad64rma9vcjsq0l4r6cax4mp"; }; buildInputs = [ makeWrapper pkgconfig python openldap pam ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 1b1aa768a25f..a5b46ebbc3c6 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "6.5.5-rc2"; name = "offlineimap-${version}"; + namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 9de3156f2a75..8542580e431b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,7 +6,7 @@ let hpnSrc = fetchurl { - url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz; + url = http://tarballs.nixos.org/openssh-6.1p1-hpn13v14.diff.gz; sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; }; diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 3e613bb9a6b3..ffa360f3de4b 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/Azureus2.3.0.6.jar; + url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; md5 = "84f85b144cdc574338c2c84d659ca620"; }; # buildInputs = [unzip]; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 7457a72b5d50..af5b9aacffcc 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -13,7 +13,7 @@ let baseName="philter"; version="1.1"; name="${baseName}-${version}"; - url="http://prdownloads.sourceforge.net/${baseName}/${name}.tar.gz"; + url="mirror://sourceforge/${baseName}/${name}.tar.gz"; hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l"; }; in diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix new file mode 100644 index 000000000000..15ca99f47e9e --- /dev/null +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, pythonPackages }: + +stdenv.mkDerivation rec { + name = "speedtest-cli-dev"; + + src = fetchgit { + url = "https://github.com/sivel/speedtest-cli.git"; + rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab"; + sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k"; + }; + + buildInputs = [ pythonPackages.python ]; + + installPhase = '' + mkdir -p $out/bin + cp speedtest-cli $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/sivel/speedtest-cli; + description = "Command line interface for testing internet bandwidth using speedtest.net"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 8c8c02412049..54390d4f9eee 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,22 +1,30 @@ {stdenv, fetchurl, pam, openssl}: stdenv.mkDerivation { - name = "uw-imap-2007"; + name = "uw-imap-2007f"; src = fetchurl { url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz"; sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; - makeFlags = "lnp"; # Linux with PAM modules + makeFlags = if stdenv.isDarwin + then "osx" + else "lnp" # Linux with PAM modules; + # -fPIC is required to compile php with imap on x86_64 systems + + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"; - buildInputs = [ pam openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patchPhase = '' sed -i -e s,/usr/local/ssl,${openssl}, \ src/osdep/unix/Makefile ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-I${openssl}/include/openssl"; + installPhase = '' mkdir -p $out/bin $out/lib $out/include cp c-client/*.h c-client/linkage.c $out/include diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 47e417ffd8a2..524c93d218a1 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in + sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in rm po/ast.po ''; diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch index 52d91846518f..fbda1caacb7a 100644 --- a/pkgs/tools/networking/wicd/dhclient.patch +++ b/pkgs/tools/networking/wicd/dhclient.patch @@ -1,4 +1,23 @@ -diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py +diff -ruN wicd-1.7.2.4.orig/wicd/wicd-daemon.py wicd-1.7.2.4/wicd/wicd-daemon.py +--- wicd-1.7.2.4.orig/wicd/wicd-daemon.py 2013-06-22 18:55:02.641242947 +0000 ++++ wicd-1.7.2.4/wicd/wicd-daemon.py 2013-06-22 18:58:33.990244153 +0000 +@@ -69,6 +69,7 @@ + wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf") + wired_conf = os.path.join(wpath.etc, "wired-settings.conf") + dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template") ++dhclient_conf_default = os.path.join(wpath.share, "other", "dhclient.conf.template.default") + + class WicdDaemon(dbus.service.Object): + """ The main wicd daemon class. +@@ -910,7 +911,7 @@ + + if not os.path.isfile(dhclient_conf): + print "dhclient.conf.template not found, copying..." +- shutil.copy(dhclient_conf + ".default", dhclient_conf) ++ shutil.copy(dhclient_conf_default, dhclient_conf) + # Hide the files, so the keys aren't exposed. + print "chmoding configuration files 0600..." + os.chmod(app_conf.get_config(), 0600)diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py --- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000 +++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000 @@ -37,6 +37,7 @@ diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix deleted file mode 100644 index beae2e3b5f69..000000000000 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null -, enableApacheWebApplication ? false -, enableAxis2WebService ? false -, enableEjabberdDump ? false -, enableMySQLDatabase ? false -, enablePostgreSQLDatabase ? false -, enableSubversionRepository ? false -, enableTomcatWebApplication ? false -, catalinaBaseDir ? "/var/tomcat" -}: - -assert enableMySQLDatabase -> mysql != null; -assert enablePostgreSQLDatabase -> postgresql != null; -assert enableSubversionRepository -> subversion != null; -assert enableEjabberdDump -> ejabberd != null; - -stdenv.mkDerivation { - name = "disnix-activation-scripts-0.3pre30423"; - src = fetchurl { - url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; - sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx"; - }; - - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - - configureFlags = '' - ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} - ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} - ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} - ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} - ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} - ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} - ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} - ''; - - buildInputs = [] - ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql - ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion; - - meta = { - description = "Provides various activation types for Disnix"; - license = "MIT"; - maintainers = [ stdenv.lib.maintainers.sander ]; - }; -} diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 9c17b9b78f7f..62a644e195aa 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre32254"; + name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef"; src = fetchurl { - url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz; - sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw"; + url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz; + sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv - ++ stdenv.lib.optional (!stdenv.isLinux) gettext; - + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; + dontStrip = true; meta = { diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 93cd2f3f846d..80ac91b54899 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre33586"; + name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz"; src = fetchurl { - url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz; - sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny"; + url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz; + sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix new file mode 100644 index 000000000000..de3690e3e203 --- /dev/null +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, enableApacheWebApplication ? false +, enableAxis2WebService ? false +, enableEjabberdDump ? false +, enableMySQLDatabase ? false +, enablePostgreSQLDatabase ? false +, enableSubversionRepository ? false +, enableTomcatWebApplication ? false +, catalinaBaseDir ? "/var/tomcat" +}: + +assert enableMySQLDatabase -> mysql != null; +assert enablePostgreSQLDatabase -> postgresql != null; +assert enableSubversionRepository -> subversion != null; +assert enableEjabberdDump -> ejabberd != null; + +stdenv.mkDerivation { + name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; + src = fetchurl { + url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; + sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; + }; + + preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; + + configureFlags = '' + ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} + ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} + ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} + ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} + ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} + ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} + ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} + ''; + + buildInputs = [] + ++ stdenv.lib.optional enableEjabberdDump ejabberd + ++ stdenv.lib.optional enableMySQLDatabase mysql + ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql + ++ stdenv.lib.optional enableSubversionRepository subversion; + + meta = { + description = "Automated deployment of mutable components and services for Disnix"; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix new file mode 100644 index 000000000000..7c4a098cad8a --- /dev/null +++ b/pkgs/tools/package-management/guix/default.nix @@ -0,0 +1,69 @@ +{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }: + +let + # Getting the bootstrap Guile binary. This is normally performed by Guix's build system. + base_url = arch: + "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz"; + boot_guile = { + i686 = fetchurl { + url = base_url "i686"; + sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"; + }; + x86_64 = fetchurl { + url = base_url "x86_64"; + sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"; + }; + }; +in stdenv.mkDerivation rec { + name = "guix-0.3"; + + src = fetchurl { + url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz"; + sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix"; + }; + + configureFlags = + [ "--localstatedir=/nix/var" + "--with-libgcrypt-prefix=${libgcrypt}" + ]; + + preBuild = + # Copy the bootstrap Guile tarballs like Guix's makefile normally does. + '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz + cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile libgcrypt sqlite bzip2 ]; + + doCheck = true; + enableParallelBuilding = true; + + meta = { + description = "Functional package manager with a Scheme interface"; + + longDescription = '' + GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof. + + In addition to standard package management features, Guix supports + transactional upgrades and roll-backs, unprivileged package management, + per-user profiles, and garbage collection. + + It provides Guile Scheme APIs, including high-level embedded + domain-specific languages (EDSLs), to describe how packages are built + and composed. + + A user-land free software distribution for GNU/Linux comes as part of + Guix. + + Guix is based on the Nix package manager. + ''; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; + + homepage = http://www.gnu.org/software/guix; + }; +} diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 73bed52654f2..bab89a1145eb 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.3pre3141_1b6ee8f"; + name = "nix-1.6pre3166_15e5ac8"; src = fetchurl { - url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz"; - sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0"; + url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz"; + sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 4e47a50078a9..7f2b533383e1 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,12 +1,12 @@ { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }: pythonPackages.buildPythonPackage rec { - name = "nixops-1.0"; + name = "nixops-1.0.1"; namePrefix = ""; src = fetchurl { url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; - sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb"; + sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394"; }; buildInputs = [ libxslt ]; @@ -21,6 +21,9 @@ pythonPackages.buildPythonPackage rec { postInstall = '' + # Backward compatibility symlink. + ln -s nixops $out/bin/charon + make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man diff --git a/pkgs/tools/security/apg/apg.patch b/pkgs/tools/security/apg/apg.patch new file mode 100644 index 000000000000..abc22647d52f --- /dev/null +++ b/pkgs/tools/security/apg/apg.patch @@ -0,0 +1,44 @@ +diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile +*** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200 +--- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200 +*************** +*** 113,131 **** + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + +--- 113,131 ---- + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 7eeb491374a3..28f66e1e4929 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - preInstall = '' - export CHOWNPROG=true - export CHGRPPROG=true - ''; + + patches = [ ./apg.patch ]; meta = { description = "A tool set for random password generation."; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 3200d27c004b..5d6eaf551734 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -11,7 +11,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip"; + url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip"; sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; }; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index bccf0cc77c5b..cb32085a8cfe 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.97.5"; src = fetchurl { - url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz"; + url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; }; diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index c779b979d9db..f9b959061da0 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -8,7 +8,7 @@ let idea = fetchurl { - url = http://nixos.org/tarballs/idea.c.gz; + url = http://tarballs.nixos.org/idea.c.gz; md5 = "9dc3bc086824a8c7a331f35e09a3e57f"; }; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index a1982cc4e66b..f131fcef4ce2 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mkpasswd-${version}"; - version = "5.0.20"; + version = "5.0.25"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz"; - sha256 = "1kwf5pwc7w8dw40nrd4m4637mz7pbhc4c1v78j56nqj38sak50w1"; + sha256 = "0qb859vwd6g93cb5zbf19gpw2g2b9s1qlq4nqia1a966pjkvw1qj"; }; preConfigure = '' diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 58786f1bd61e..80ab866e1f3f 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "oath-toolkit-2.0.2"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz"; + url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99"; }; diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index ecbc95362e61..aaa3b577657f 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pwgen-2.05"; src = fetchurl { - url = ftp://ftp.chg.ru/pub/sourceforge/p/pw/pwgen/pwgen-2.05.tar.gz; + url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz; sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8"; }; meta = { diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 3cab8b0ef104..3f63d077c7fa 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: +let + pciids = fetchurl { + # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. + url = http://tarballs.nixos.org/pci.ids.20120929.bz2; + sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb"; + }; +in stdenv.mkDerivation rec { - name = "pciutils-3.1.10"; + name = "pciutils-3.2.0"; src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl"; + sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq"; }; - buildInputs = [ zlib ]; - - pciids = fetchurl { - # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. - url = http://nixos.org/tarballs/pci.ids.20120929.bz2; - sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb"; - }; + buildInputs = [ pkgconfig zlib kmod which ]; - # Override broken auto-detect logic. - # Note: we can't compress pci.ids (ZLIB=yes) because udev requires - # an uncompressed pci.ids. - makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}"; + # currently up-to-date + #preBuild = "bunzip2 < ${pciids} > pci.ids"; - preBuild = '' - bunzip2 < $pciids > pci.ids - ''; + makeFlags = "SHARED=yes PREFIX=\${out}"; installTargets = "install install-lib"; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 909b0d832f78..be34fc52c7aa 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,21 +2,21 @@ let driverdb = fetchurl { - url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797"; - sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz"; + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812"; + sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp"; name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { - name = "smartmontools-6.1"; + name = "smartmontools-6.2"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059"; + sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8"; }; patchPhase = '' - cp ${driverdb} drivedb.h + : cp ${driverdb} drivedb.h sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index a13f500c34f8..63850454b3df 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "thinkfan-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz"; + url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz"; sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs"; }; diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix index c20f5db97984..0bfa72ca00d5 100644 --- a/pkgs/tools/text/cheetah-template/2.0.1.nix +++ b/pkgs/tools/text/cheetah-template/2.0.1.nix @@ -1,7 +1,7 @@ args : with args; rec { src = fetchurl { - url = http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz; + url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz; sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh"; }; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index fc8813e7cec7..52781ed37927 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "kdiff3-0.9.96"; + name = "kdiff3-0.9.97"; src = fetchurl { url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh"; + sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3"; }; buildInputs = [ kdelibs ]; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index eb5ebf612b2b..1eae8c4d5274 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "numdiff-${version}"; src = fetchurl { - url = "http://ftp.igh.cnrs.fr/pub/nongnu/numdiff/numdiff-${version}.tar.gz"; + url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx"; }; meta = { diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index fa8e8078362a..3ff89294ab1d 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://nixos.org/tarballs/xpf-0.2.tar.gz; + url = http://tarballs.nixos.org/xpf-0.2.tar.gz; md5 = "d92658828139e1495e052d0cfe25d312"; }; diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index 304f50f29060..c2c9a942845a 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "bibtex-tools-0.2pre13026"; src = fetchurl { - url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz; + url = http://tarballs.nixos.org/bibtex-tools-0.2pre13026.tar.gz; md5 = "2d8a5de7c53eb670307048eb3d14cdd6"; }; configureFlags = " diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 6ca85167aeda..9774d7d1a948 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation ( rec { }; src = fetchurl { - url = "http://ftp.gnu.org/pub/gnu/${pname}/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${name}.tar.gz"; sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; }; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 6139911623f6..d129cc62020e 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -3,7 +3,10 @@ rec { version = "0.7"; name = "moderntimeline-${version}"; src = fetchurl { - url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"; + urls = [ + "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" + "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" + ]; sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; }; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix new file mode 100644 index 000000000000..f2f77bd84cd4 --- /dev/null +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "vnc2flv-20100207"; + namePrefix = ""; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; + md5 = "8492e46496e187b49fe5569b5639804e"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "Tool to record VNC sessions to Flash Video"; + homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + }; +} diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 1905166c38e5..e9b62886fce8 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.zip"; + url = "http://tarballs.nixos.org/${name}.zip"; sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq"; }; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index ac2902aab94d..a80ad91c4c30 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ec2-api-tools-1.6.5.1"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.zip"; + url = "http://tarballs.nixos.org/${name}.zip"; sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda"; }; |