summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/clisp/2.44.1.nix47
-rw-r--r--pkgs/development/libraries/fltk/default.nix33
-rw-r--r--pkgs/development/libraries/fltk/fltk11.nix33
-rw-r--r--pkgs/development/libraries/geos/default.nix20
-rw-r--r--pkgs/development/libraries/openexr/default.nix22
-rw-r--r--pkgs/development/libraries/openexr_ctl/default.nix21
-rw-r--r--pkgs/development/libraries/rubberband/default.nix12
-rw-r--r--pkgs/development/misc/avr-gcc-with-avr-libc/default.nix17
-rw-r--r--pkgs/development/tools/selenium/remote-control/default.nix4
9 files changed, 111 insertions, 98 deletions
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 7b0c3674002..3b881558aed 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -1,31 +1,36 @@
-args: with args;
+{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi, libffcall, coreutils }:
+        
 stdenv.mkDerivation rec {
   v = "2.44.1";
   name = "clisp-${v}";
-  src =
-	fetchurl {
-		url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
-		sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
-	};
+  
+  src = fetchurl {
+    url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
+    sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
+  };
 
-  inherit libsigsegv gettext coreutils;
-  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
-	libXt pcre zlib libXpm xproto libXext xextproto libffi
-	libffcall];
+  buildInputs =
+    [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
+      zlib libXpm xproto libXext xextproto libffi libffcall ];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
   # anything rememberable).
   patchPhase = ''
-  sed -e 's@9090@64237@g' -i tests/socket.tst
-  sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
-  find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+    sed -e 's@9090@64237@g' -i tests/socket.tst
+    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags = "--with-readline builddir --with-dynamic-ffi
-  --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
-  --with-module=pcre --with-module=rawsock --with-module=readline
-  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+  configureFlags =
+    ''
+      --with-readline builddir --with-dynamic-ffi
+      --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
+      --with-module=pcre --with-module=rawsock --with-module=readline
+      --with-module=syscalls --with-module=wildcard --with-module=zlib
+    '';
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -38,9 +43,9 @@ stdenv.mkDerivation rec {
   doCheck = 1;
 
   meta = {
-	  description = "ANSI Common Lisp Implementation";
-	  homepage = http://clisp.cons.org;
-	  maintainers = [stdenv.lib.maintainers.raskin];
-	  platforms = stdenv.lib.platforms.linux;
+    description = "ANSI Common Lisp Implementation";
+    homepage = http://clisp.cons.org;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index 1fb1cda3353..6b6cb2ba879 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} rec {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
 
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} rec {
   name = "fltk-2.0.x-r6970";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
     sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3";
   };
 
-  propagatedBuildInputs=[x11 inputproto libXi freeglut];
+  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ args.pkgconfig ];
+  buildInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} rec {
     // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } #       turn on Xinerama support default=no
     // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } #            turn on Xft support default=no
     // edf { name = "xdbe"; };  #           turn on Xdbe support default=no
+
   cfg = {
-      largefileSupport = true; # is default
-      glSupport = true; # doesn't build without it. Why?
-      localjpegSupport = false;
-      localzlibSupport = false;
-      localpngSupport = false;
-      sharedSupport = true;
-      threadsSupport = true;
+    largefileSupport = true; # is default
+    glSupport = true; # doesn't build without it. Why?
+    localjpegSupport = false;
+    localzlibSupport = false;
+    localpngSupport = false;
+    sharedSupport = true;
+    threadsSupport = true;
   };
 
   meta = {
-      description = "a C++ cross platform lightweight gui library binding";
-      homepage = http://www.fltk.org;
+    description = "a C++ cross platform lightweight gui library binding";
+    homepage = http://www.fltk.org;
   };
 }
diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix
index 41733862c17..118b24ec317 100644
--- a/pkgs/development/libraries/fltk/fltk11.nix
+++ b/pkgs/development/libraries/fltk/fltk11.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
 
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
   name = "fltk-1.1.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
     sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
   };
 
-  propagatedBuildInputs=[x11 inputproto libXi freeglut];
+  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ args.pkgconfig ];
+  buildInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} {
     // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } #       turn on Xinerama support default=no
     // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } #            turn on Xft support default=no
     // edf { name = "xdbe"; };  #           turn on Xdbe support default=no
+
   cfg = {
-      largefileSupport = true; # is default
-      glSupport = true; # doesn't build without it. Why?
-      localjpegSupport = false;
-      localzlibSupport = false;
-      localpngSupport = false;
-      sharedSupport = true;
-      threadsSupport = true;
+    largefileSupport = true; # is default
+    glSupport = true; # doesn't build without it. Why?
+    localjpegSupport = false;
+    localzlibSupport = false;
+    localpngSupport = false;
+    sharedSupport = true;
+    threadsSupport = true;
   };
 
   meta = {
-      description = "a C++ cross platform lightweight gui library binding";
-      homepage = http://www.fltk.org;
+    description = "A C++ cross-platform light-weight GUI library binding";
+    homepage = http://www.fltk.org;
   };
 }
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index cbb0c23e311..734bde71338 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,8 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, python }:
 
-  buildInputs = [ "which" ]; # which is needed for the autogen.sh
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   flags =
   # python and ruby untested 
@@ -13,8 +13,8 @@ composableDerivation {} {
   name = "geos-3.2.2";
 
   src = fetchurl {
-      url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
-      sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+    url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
+    sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
   };
 
   # for development version. can be removed ?
@@ -26,10 +26,8 @@ composableDerivation {} {
   #";
 
   meta = {
-      description = "C++ port of the Java Topology Suite (JTS)"
-        + "- all the OpenGIS \"Simple Features for SQL\" spatial predicate functions and spatial operators,"
-        + " as well as specific JTS topology functions such as IsValid";
-      homepage = http://geos.refractions.net/;
-      license = "GPL";
+    description = "C++ port of the Java Topology Suite (JTS)";
+    homepage = http://geos.refractions.net/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index de4672ceb5e..386b92f2684 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,16 +1,18 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }:
 
-stdenv.mkDerivation {
-  inherit version;
-  name = "openexr-${version}";
+stdenv.mkDerivation rec {
+  name = "openexr-1.6.1";
+  
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/openexr/openexr-${version}.tar.gz";
-    sha256 = if (version == "1.6.1") then "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"
-             else if (version == "1.4.0") then "1y3dxakpg9651dgbj2xp6r4044b5gi74g23w3sr5cs6xi7cywv7m"
-               else abort "not supported version";
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
   };
-  buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
-  propagatedBuildInputs = [pkgconfig zlib ilmbase];
+  
+  buildInputs = [ pkgconfig ctl ];
+  
+  propagatedBuildInputs = [ zlib ilmbase ];
+  
   configureFlags = "--enable-imfexamples";
+  
   patches = [ ./stringh.patch ];
 }
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
index 288067a4bf2..1b15fdb6c9e 100644
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ b/pkgs/development/libraries/openexr_ctl/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openexr, ilmbase, ctl }:
+
 stdenv.mkDerivation {
   name = "openexr_ctl-1.0.1";
 
@@ -7,18 +8,14 @@ stdenv.mkDerivation {
     sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
   };
 
-  propagatedBuildInputs = [ilmbase];
-  buildInputs = [openexr ctl];
-  configureFlags="--with-ilmbase-prefix=${ilmbase}";
-  #configurePhase = "
-    #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
-    #echo $CXXFLAGS
-    #unset configurePhase; configurePhase
-  #";
+  propagatedBuildInputs = [ ilmbase ];
+  
+  buildInputs = [ openexr ctl ];
+  
+  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
 
   meta = {
-      description = "Color Transformation Language";
-      homepage = http://ampasctl.sourceforge.net;
-      license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+    description = "Color Transformation Language";
+    homepage = http://ampasctl.sourceforge.net;
   };
 }
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 40e15866099..90031c92fe4 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw
+, vampSDK, ladspaH }:
+
 stdenv.mkDerivation {
   name = "rubberband-1.3";
 
@@ -7,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "0g1bihjzagp9mx9zppjyd9566dfdqh38a1ghwsd7c245hv2syri8";
   };
 
-  buildInputs = [pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH];
+  buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ];
 
   meta = { 
-    description = "high quality software library for audio time-stretching and pitch-shifting";
+    description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = http://www.breakfastquay.com/rubberband/index.html;
     license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index ef1482d7a54..06063db491e 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -1,18 +1,19 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2, gnugrep, gnused, gawk }:
+
+stdenv.mkDerivation {
   name = "avr-gcc-libc";
 
-  srcBinutils = args.fetchurl {
+  srcBinutils = fetchurl {
     url = ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2;
     sha256 = "0pm20n2l9ddgdpgzk3zhnbb8nbyb4rb2kvcw21pkd6iwybk3rhz2";
   };
 
-  srcGCC = args.fetchurl {
+  srcGCC = fetchurl {
     url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
     sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv";
   };
 
-  srcAVRLibc = args.fetchurl {
+  srcAVRLibc = fetchurl {
     url = http://www.very-clever.com/download/nongnu/avr-libc/avr-libc-1.4.5.tar.bz2;
     sha256 = "058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l";
   };
@@ -20,12 +21,12 @@ args.stdenv.mkDerivation {
   phases = "doAll";
 
   # don't call any wired $buildInputs/nix-support/* scripts or such. This makes the build fail 
-  builder = args.writeTextFile {
+  builder = writeTextFile {
     name = "avrbinutilsgccavrlibc-builder-script";
     text =  ''
-    PATH=${args.coreutils}/bin:${args.gnumake}/bin:${args.gcc}/bin:${args.gnutar}/bin:${args.bzip2}/bin:${args.gnugrep}/bin:${args.gnused}/bin:${args.gawk}/bin
+    PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin
     # that's all a bit too hacky...!
-    for i in `cat ${args.gcc}/nix-support/propagated-user-env-packages`; do
+    for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do
       echo adding $i
       PATH=$PATH:$i/bin
     done
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index a5d7ea84ebf..0a7a12a6e17 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -1,6 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, jre }:
+
 # let version = "1.0-beta-2";
 let version = "1.0-SNAPSHOT-standalone";
+
 in stdenv.mkDerivation {
     /*
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-16 11:25:01 +0000