diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-17 14:19:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-17 14:19:59 +0000 |
| commit | d97069da1a884600688ceee314c8f9d876744a52 (patch) | |
| tree | 92e2491cebd50976c2f59c8e05fd1a72fc26af8a /pkgs/tools | |
| parent | 579099e9d00f3dc6b04ba0b0759a8b45a7b1b738 (diff) | |
| download | nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar.gz nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar.bz2 nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar.lz nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar.xz nixlib-d97069da1a884600688ceee314c8f9d876744a52.tar.zst nixlib-d97069da1a884600688ceee314c8f9d876744a52.zip | |
* Quick start section.
* Updated some packages that are referenced in that section. svn path=/nixpkgs/trunk/; revision=12139
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/jdiskreport/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/bittorrent/builder.sh | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/bittorrent/default.nix | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 6229ca60d4c1..da0bbf0fb877 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -3,12 +3,16 @@ #assert jdk.swingSupport; stdenv.mkDerivation { - name = "jdiskreport-1.2.3"; + name = "jdiskreport-1.3.0"; + builder = ./builder.sh; + src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_3.zip; - md5 = "4a33c5c1344ed9e0fa531e2cb1875cb8"; + url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip; + sha256 = "1vgiq797gqc6i89w4kscg57snn74wi8x566bhi9xn8r0fbphihxb"; }; + buildInputs = [unzip]; + inherit jdk; } diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh index 8097995dfbda..c074c1919ac5 100644 --- a/pkgs/tools/networking/p2p/bittorrent/builder.sh +++ b/pkgs/tools/networking/p2p/bittorrent/builder.sh @@ -1,19 +1,19 @@ source $stdenv/setup + # Workaround for: # File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join # elif path == '' or path.endswith('/'): # AttributeError: 'NoneType' object has no attribute 'endswith' export HOME=$TMP -buildPhase=buildPhase + buildPhase() { #substituteInPlace BitTorrent/GUI_wx/__init__.py --replace "'2.6'" "'2.8'" python setup.py build } -installPhase=installPhase installPhase() { python setup.py install --prefix=$out @@ -24,4 +24,5 @@ installPhase() { done } + genericBuild diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix index cfddd48a342e..980f51d37467 100644 --- a/pkgs/tools/networking/p2p/bittorrent/default.nix +++ b/pkgs/tools/networking/p2p/bittorrent/default.nix @@ -7,6 +7,7 @@ assert gui -> wxPython != null; stdenv.mkDerivation { name = "bittorrent-5.2.0"; + builder = ./builder.sh; src = fetchurl { |