diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-28 11:55:54 +0000 |
commit | 66097104090e06c43a784193809bc8843a2ec052 (patch) | |
tree | 021d726cde3c2dec5d4341340b37589feef3b15c /pkgs/applications/misc | |
parent | b4a3f99c7812a6c8bc34979200693b7010afffcc (diff) | |
download | nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.gz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.bz2 nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.lz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.xz nixpkgs-66097104090e06c43a784193809bc8843a2ec052.tar.zst nixpkgs-66097104090e06c43a784193809bc8843a2ec052.zip |
* Get rid of many instances of "args: with args;", and other coding
guidelines violations. * Updated libsamplerate to 0.1.7. svn path=/nixpkgs/trunk/; revision=22782
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/audio/wavesurfer/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/misc/flite/default.nix | 29 | ||||
-rw-r--r-- | pkgs/applications/misc/i810/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/misc/pgadmin/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/procmail/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/pstree/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/misc/sbagen/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/misc/thinking-rock/default.nix | 14 |
8 files changed, 65 insertions, 83 deletions
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 24429cfddad..ab22312e903 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,13 +1,14 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }: + +stdenv.mkDerivation { name = "wavesurfer-1.8.5"; - src = args.fetchurl { + src = fetchurl { url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; - buildInputs =(with args; [snack tcl tk makeWrapper]); + buildInputs = [ snack tcl tk makeWrapper ]; installPhase = '' ensureDir $out/{bin,nix-support,share/wavesurfer/} @@ -15,13 +16,13 @@ args.stdenv.mkDerivation { mv * $out/nix-support ln -s $out/{nix-support,bin}/wavesurfer.tcl wrapProgram "$out/nix-support/wavesurfer.tcl" \ - --set TCLLIBPATH "${args.snack}/lib" \ - --prefix PATH : "${args.tcl}/bin:${args.tk}/bin" + --set TCLLIBPATH "${snack}/lib" \ + --prefix PATH : "${tcl}/bin:${tk}/bin" ''; meta = { - description = "tool for recording, playing, editing, viewing and labeling of audio"; - homepage = http://www.speech.kth.se/wavesurfer/; - license = "BSD"; + description = "Tool for recording, playing, editing, viewing and labeling of audio"; + homepage = http://www.speech.kth.se/wavesurfer/; + license = "BSD"; }; } diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix index ad3b9df164d..8a2414ec885 100644 --- a/pkgs/applications/misc/flite/default.nix +++ b/pkgs/applications/misc/flite/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "flite-1.3-release"; @@ -7,20 +8,22 @@ stdenv.mkDerivation { sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj"; }; - buildPhase = " - unset buildPhase - ensureDir \$out/lib - buildPhase - "; + buildPhase = + '' + unset buildPhase + ensureDir $out/lib + buildPhase + ''; - installPhase = " - ensureDir \$out/share/flite - cp -r bin \$out - "; + installPhase = + '' + ensureDir $out/share/flite + cp -r bin $out + ''; meta = { - description = "Flite text to speech engine"; - homepage = http://www.speech.cs.cmu.edu/flite/download.html; - license = "BSD as-is"; + description = "Flite text to speech engine"; + homepage = http://www.speech.cs.cmu.edu/flite/download.html; + license = "BSD as-is"; }; } diff --git a/pkgs/applications/misc/i810/default.nix b/pkgs/applications/misc/i810/default.nix deleted file mode 100644 index 9407b8137d1..00000000000 --- a/pkgs/applications/misc/i810/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "i810switch-0.6.5"; - - phases = "unpackPhase installPhase"; - - installPhase = " - sed -i -e 's+/usr++' Makefile - sed -i -e 's+^\\(.*putenv(\"PATH=\\).*$+\\1${pciutils}/sbin\");+' i810switch.c - make clean - make install DESTDIR=\${out} - "; - - inherit pciutils; - - src = fetchurl { - url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz; - sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3"; - }; - - meta = { - description = "i810switch is a utility for switching the LCD and external VGA display."; - homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = "GPL2"; - }; -} diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 94b68fc6bc9..6d4fa97c8cb 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }: + stdenv.mkDerivation rec { name = "pgadmin3-1.10.0"; @@ -7,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16"; }; - buildInputs = [postgresql wxGTK libxml2 libxslt openssl]; + buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; meta = { - description = "postgresql admin gui tool"; - homepage = http://www.pgadmin.org; - license = "GPL2"; - }; + description = "PostgreSQL administration GUI tool"; + homepage = http://www.pgadmin.org; + license = "GPL2"; + }; } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1ccbfd41728..15bcc477bdd 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,6 +1,7 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { - name="procmail-3.22"; + name = "procmail-3.22"; buildInputs = [ stdenv.gcc.libc ]; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 71cac8eefa7..67d3f32d53f 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { name = "pstree-2.33"; @@ -7,15 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg"; }; - unpackPhase="unpackFile \$src; sourceRoot=."; + unpackPhase = "unpackFile \$src; sourceRoot=."; - buildPhase="pwd; gcc -o pstree pstree.c"; - installPhase="ensureDir \$out/bin; cp pstree \$out/bin"; + buildPhase = "pwd; gcc -o pstree pstree.c"; + installPhase = "ensureDir \$out/bin; cp pstree \$out/bin"; meta = { - description = "show the running processes as tree"; - # don't know the correct homepage.. - homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz; - license = "GPL"; - }; + description = "Show the set of running processes as a tree"; + license = "GPL"; + }; } diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 6bf28580b35..c14f6080b8c 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,18 +1,18 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "sbagen-1.4.4"; - buildPhases="buildPhase installPhase"; + buildPhases = "buildPhase installPhase"; - buildPhase="./mk"; + buildPhase = "./mk"; - installPhase=" - ensureDir \$out/{bin,share/sbagen/doc} - cp -r --target-directory=\$out/share/sbagen examples scripts river1.ogg river2.ogg + installPhase = '' + ensureDir $out/{bin,share/sbagen/doc} + cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg cp sbagen $out/bin - cp --target-directory=\$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt - - "; + cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt + ''; src = fetchurl { url = http://uazu.net/sbagen/sbagen-1.4.4.tgz; @@ -20,8 +20,8 @@ stdenv.mkDerivation { }; meta = { - description = "binaural sound generator"; - homepage = http://uazu.net/sbagen; - license = "GPL"; - }; + description = "Binaural sound generator"; + homepage = http://uazu.net/sbagen; + license = "GPL"; + }; } diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 553e297cf7f..2faed53b7a5 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,8 +1,9 @@ -args: -args.stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "thinkingrock-2.2.1-binary"; - src = args.fetchurl { + src = fetchurl { url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -28,11 +29,12 @@ args.stdenv.mkDerivation { EOF chmod +x $out/bin/thinkingrock ''; + installPhase = ":"; meta = { - description = "task managing system"; - homepage = http://www.thinkingrock.com.au/; - license = "CDDL"; # Common Development and Distribution License + description = "Task management system"; + homepage = http://www.thinkingrock.com.au/; + license = "CDDL"; # Common Development and Distribution License }; } |