diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/tahoe-lafs/default.nix (renamed from pkgs/tools/networking/p2p/tahoe/default.nix) | 14 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/system/bootchart/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 43 |
5 files changed, 69 insertions, 46 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index b91c6a89c03d0..8a1d466634235 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, openssl, perl , pamSupport ? false, pam ? null , etcDir ? null +, hpnSupport ? false }: assert pamSupport -> pam != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "openssh-5.2p1"; src = fetchurl { @@ -36,4 +37,16 @@ stdenv.mkDerivation rec { "; installTargets = "install-nosysconf"; +} // +(if hpnSupport then +rec { + hpnSrc = fetchurl { + url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz; + sha256 = "1g91xl1vfg772072qcbcfzyqj7yfvm38xgk8zyy8wsl2g81rb8wh"; + }; + + patchPhase = '' + gunzip -c ${hpnSrc} | patch -p1 + ''; } +else {})) diff --git a/pkgs/tools/networking/p2p/tahoe/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index f5cb2316d6674..1bf6f920c4cf1 100644 --- a/pkgs/tools/networking/p2p/tahoe/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -2,16 +2,16 @@ , simplejson, zfec, pycryptopp, pysqlite, nettools }: buildPythonPackage (rec { - name = "tahoe-1.5.0"; + name = "tahoe-lafs-1.5.0"; namePrefix = ""; src = fetchurl { - url = "http://allmydata.org/source/tahoe/releases/allmydata-${name}.zip"; + url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.5.0.zip"; sha256 = "1cgwm7v49mlfsq47k8gw2bz14d6lnls0mr6dc18815pf24z4f00n"; }; patchPhase = '' - echo "forcing Tahoe to use \`setuptools' 0.6c9 rather than an unreleased version" + echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version" for i in *setup.py do sed -i "$i" -es'/0.6c12dev/0.6c9/g' @@ -43,7 +43,7 @@ buildPythonPackage (rec { postInstall = '' # Install the documentation. - # FIXME: Inkscape setfaults when run from here. Setting $HOME to + # FIXME: Inkscape segfaults when run from here. Setting $HOME to # something writable doesn't help; providing $FONTCONFIG_FILE doesn't # help either. So we just don't run `make' under `docs/'. @@ -53,10 +53,10 @@ buildPythonPackage (rec { ''; meta = { - description = "Tahoe, a decentralized, fault-tolerant, distributed storage system"; + description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system"; longDescription = '' - Tahoe is a secure, decentralized, fault-tolerant filesystem. + Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem. This filesystem is encrypted and spread over multiple peers in such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. @@ -64,7 +64,7 @@ buildPythonPackage (rec { homepage = http://allmydata.org/; - license = "GPLv2+"; + license = [ "GPLv2+" /* or */ "TGPPLv1+" ]; maintainers = [ lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 68e836ba6ee5b..dd72b340d1aac 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.13pre17232${nameSuffix}"; + name = "nix-0.13pre17922${nameSuffix}"; src = fetchurl { - url = "http://hydra.nixos.org/build/75293/download/4/${name}.tar.bz2"; - sha256 = "aaea96d6dd87f8cceb2973e561d1cd0ca1beeaa0384eb91f4db09ac75d42148f"; + url = "http://hydra.nixos.org/build/105957/download/4/${name}.tar.bz2"; + sha256 = "11735f2d01ed1c4a7dd345690cd6bbfec175626a6bf2c0d76a27da3c5f51c187"; }; buildInputs = [perl curl openssl]; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix new file mode 100644 index 0000000000000..24a1558e901d3 --- /dev/null +++ b/pkgs/tools/system/bootchart/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, gnutar, gzip, coreutils, utillinux, gnugrep, gnused, psmisc, nettools}: + +stdenv.mkDerivation rec { + name = "bootchart-0.9"; + + src = fetchurl { + url = "mirror://sourceforge/bootchart/${name}.tar.bz2"; + sha256 = "0z9jvi7cyp3hpx6hf1fyaa8fhnaz7aqid8wrkwp29cngryg3jf3p"; + }; + + buildInputs = [ gnutar gzip coreutils utillinux gnugrep gnused psmisc nettools ]; + + patchPhase = '' + export MYPATH= + for i in $buildInputs; do + export MYPATH=''${MYPATH}''${MYPATH:+:}$i/bin:$i/sbin + done + + sed -i -e 's,PATH.*,PATH='$MYPATH, \ + -e 's,^CONF.*,CONF='$out/etc/bootchartd.conf, \ + script/bootchartd + ''; + + installPhase = '' + ensureDir $out/sbin $out/etc + cp script/bootchartd $out/sbin + cp script/bootchartd.conf $out/etc + chmod +x $out/sbin/bootchartd + ''; + + meta = { + homepage = http://www.bootchart.org/; + description = "Performance analysis and visualization of the GNU/Linux boot process"; + license="GPLv2+"; + }; + +} diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 8ab1ba98e430e..1eb56c76991fe 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,47 +1,20 @@ -{ fetchurl, stdenv, python, bash }: +{ fetchurl, stdenv, python }: stdenv.mkDerivation rec { - name = "asciidoc-8.2.5"; + name = "asciidoc-8.5.1"; src = fetchurl { url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "1aqmii7qyhnn8pby5rlyrc3sl08br35xsdn7wpx2cy03p46pqr7a"; + sha256 = "ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20"; }; patchPhase = '' - cat "asciidoc.py" | \ - sed -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g ; - s,^CONF_DIR = .*$,CONF_DIR = \"$out/etc/asciidoc\",g" \ - > ,,tmp && mv ,,tmp asciidoc.py && chmod +x asciidoc.py - cat "a2x" | \ - sed -e "s,^#!/usr/bin/env bash,#!${bash},g ; - s,^CONF_DIR=.*$,CONF_DIR=\"$out/etc/asciidoc\",g" \ - > ,,tmp && mv ,,tmp a2x && chmod +x a2x - - cat "install.sh" | \ - sed -e "s,^CONFDIR=.*,CONFDIR=$out/etc/asciidoc,g" \ - > ,,tmp && mv ,,tmp install.sh - cat "install.sh" | \ - sed -e "s,^BINDIR=.*,BINDIR=$out/bin,g" \ - > ,,tmp && mv ,,tmp install.sh - cat "install.sh" | \ - sed -e "s,^MANDIR=.*,MANDIR=$out/man,g" \ - > ,,tmp && mv ,,tmp install.sh - cat "install.sh" | \ - sed -e "s,^VIM_CONFDIR=.*,VIM_CONFDIR=$out/etc/vim,g" \ - > ,,tmp && mv ,,tmp install.sh - - chmod +x install.sh + for n in asciidoc.py a2x.py; do + sed -i -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g" "$n" + chmod +x "$n" + done ''; buildInputs = [ python ]; - configurePhase = ''true''; - installPhase = '' - ensureDir $out/bin - ensureDir $out/etc - ensureDir $out/etc/vim - ensureDir $out/man - ./install.sh - ''; meta = { longDescription = '' @@ -51,4 +24,4 @@ stdenv.mkDerivation rec { homepage = http://www.methods.co.nz/asciidoc/; license = "GPLv2+"; }; -} \ No newline at end of file +} |