diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-10-11 18:33:08 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-10-11 18:33:17 +0200 |
| commit | 14df9ad4969f45e7c6d787b9da162da665618f9a (patch) | |
| tree | f6904210083b6c3a491f3785e3d75c614078a1bf /pkgs/development | |
| parent | f9e025429047c3e81b117712974e8c78eea871e7 (diff) | |
| parent | 733c706c91a83698ddd6c050dddf1d814bbd60bc (diff) | |
| download | nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar.gz nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar.bz2 nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar.lz nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar.xz nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.tar.zst nixlib-14df9ad4969f45e7c6d787b9da162da665618f9a.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development')
127 files changed, 961 insertions, 491 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f89947d7d61f..ccf6dac895c9 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -16,14 +16,14 @@ let ncurses5 = ncurses.override { abiVersion = "5"; }; in stdenv.mkDerivation rec { - version = "1.6.9"; + version = "1.6.12"; name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0ksd6mkcf41114n0h37q80y1bz3a2q3z8kg6m9i11c3wrj8n80np"; + sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; }; buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; @@ -43,13 +43,8 @@ stdenv.mkDerivation rec { cp -v $file_src $file_dst done - # Loop above creates library_index.json.gz, package_index.json.gz and package_index.json.sig in - # current directory. And now we can inject them into build process. - library_index_url=file://$(pwd)/library_index.json - package_index_url=file://$(pwd)/package_index.json - cd ./arduino-core && ant - cd ../build && ant -Dlibrary_index_url=$library_index_url -Dpackage_index_url=$package_index_url + cd ../build && ant cd .. ''; diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 5057d5ac6b5b..9d3ed56bee99 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,22 +1,6 @@ {fetchurl, optionalAttrs, system}: { - # Following 3 files are snapshots of files that were downloaded from http://download.arduino.cc/ - # Because original URLs update daily. https://github.com/binarin/arduino-indexes also contains script - # for updating those snapshots. - "package_index.json.gz" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.gz"; - sha256 = "11y16864bca6h5n03xbk8cw3v9b4xwvjz5mkirkcxslkkf7cx5yg"; - }; - "package_index.json.sig" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.sig"; - sha256 = "14ky3qb81mvqswaw9g5cpg5jcjqx6knfm75mzx1si7fbx576amls"; - }; - "library_index.json.gz" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/library_index.json.gz"; - sha256 = "19md4yf4m4wh9vnc3aj0gm3jak1qa591z5yhg0x8lsxx5hr2v85z"; - }; - "build/shared/reference-1.6.6-3.zip" = fetchurl { url = "http://downloads.arduino.cc/reference-1.6.6-3.zip"; sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3"; @@ -29,13 +13,13 @@ url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; }; - "build/Firmata-2.5.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.2.zip"; - sha256 = "1r75bxvpr17kwhpks9nxxpm5d5qbw0qnhygakv06whan9s0dc5cz"; + "build/Firmata-2.5.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip"; + sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v"; }; - "build/Bridge-1.6.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Bridge/archive/1.6.2.zip"; - sha256 = "10v557bsxasq8ya09m9157nlk50cbkb0wlzrm54cznzmwc0gx49a"; + "build/Bridge-1.6.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; + sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; }; "build/Robot_Control-1.0.2.zip" = fetchurl { url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip"; @@ -49,13 +33,13 @@ url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; }; - "build/SpacebrewYun-1.0.0.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0.zip"; - sha256 = "1sklyp92m8i31rfb9b9iw0zvvab1zd7jdmg85fr908xn6k05qhmp"; + "build/SpacebrewYun-1.0.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; + sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90"; }; - "build/Temboo-1.1.5.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Temboo/archive/1.1.5.zip"; - sha256 = "1ak9b2wrd42n3ak7kcqwg28ianq01acsi5jv4cc031wr0kpq4507"; + "build/Temboo-1.1.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip"; + sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50"; }; "build/Esplora-1.0.4.zip" = fetchurl { url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip"; @@ -73,64 +57,68 @@ url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip"; sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; }; - "build/liblistSerials-1.1.0.zip" = fetchurl { - url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip"; - sha256 = "12n3y9y3gfi7i3x6llbwvi59jram02v8yyilv2kd38dm7wrqpw16"; + "build/liblistSerials-1.1.4.zip" = fetchurl { + url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip"; + sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0"; + }; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip"; + sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2"; - sha256 = "0xbzcmvfa1h22dlvym8v4s68w4r1vdq8pj086sk1iwlkfiq0y4zq"; + "build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2"; + sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7"; }; - "build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "1k793qsv1jdc0m4i9k40l2k7blnarfzy2k3clndl2yirfk0zqm4h"; + "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr"; }; - "build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "0xm4hfr4binny9f5affnmyrrq3lhrxr66s6ymplgfq9l72kwq9nq"; + "build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p"; }; } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.18.tar.bz2"; - sha256 = "0b6ls31gaagni929v4isr8ivyviid37721ffhgw6mnb8vshcws2d"; + "build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2"; + sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj"; }; - "build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"; - sha256 = "07ql6apml1w5gy3ygd1wmj12yr8vg6p3pr8b1gd92wdk97svfj3n"; + "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i"; }; - "build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1vmzqvkg8z2xp3j5qypzyg26hgymy6vshs4vpax6mr5w4xlxccsr"; + "build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz"; }; } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.18.tar.bz2"; - sha256 = "01m21r2blh3rwzmjgjn65hivlbj95ddqkjq5xm1yb4b5h3i03mfj"; + "build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2"; + sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l"; }; - "build/linux/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"; - sha256 = "00d9i1vg1zngcd3f52c6d7j2iffb0qs97a1pnag0czbk1pq3w6qi"; + "build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"; + sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii"; }; - "build/linux/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"; - sha256 = "1rf3dwb4534qzn0gdpbh3155knx07hbbakvv67456s2q18xqvbs1"; + "build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2"; + sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r"; }; } // optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-arm-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.18.tar.bz2"; - sha256 = "1v4vrmv24cajl7hxmyz5nh2y007kmwrcgl6180dlfwpc9526s4p1"; + "build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2"; + sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4"; }; - "build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "0jqmyamvvwiab6ag580h09zkxbpv6i5xn6ganj5b8ld6nwnwvzy8"; + "build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp"; }; - "build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "1d7n0jcc6670n803q57hzw8pvp9bmnca9c9fgw3fq5y1vd0i7si3"; + "build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4"; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index ba546f6f51fc..f0f8fa3b7ff2 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "15ywjv46i2d7zgg2b3vdklc6agr62nvn0gkz7k9hql78ccfmyq9p"; + sha512 = "39mcyw3rdgrhfkxl0xygh74idl2pvw3dy0n9d3z4aj6hq4pxkn1dclmpfbrfa333vjpzfhlqwl578vmly9vah7m6z6g4j12gkdijiyf"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 8128bfd23925..d0d5a2dea142 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -39,7 +39,10 @@ let ln -sv $out/bin/clang $out/bin/cpp mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view,set-xcode-analyzer} $python/bin + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi mv $out/share/clang/*.py $python/share/clang rm $out/bin/c-index-test diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 67e7c932e555..79dc479fae83 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: let check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml); @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; }; - buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ]; + buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ]; # Sets warning 3 as non-fatal prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") '' diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix new file mode 100644 index 000000000000..f1f9a38a198f --- /dev/null +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}: +stdenv.mkDerivation rec { + name = "obliv-c-${version}"; + version = "0.0pre20161001"; + buildInputs = [ ocaml ocamlPackages.findlib perl ]; + propagatedBuildInputs = [ libgcrypt ]; + src = fetchFromGitHub { + owner = "samee"; + repo = "obliv-c"; + rev = "32d71fb46983aded604045e8cda7874d8fb160a2"; + sha256 = "05bicvalsfabngvf41q02bcyzkibmyihj7naqd53kdq75xa1yf37"; + }; + preInstall = '' + mkdir -p "$out/bin" + cp bin/* "$out/bin" + mkdir -p "$out/share/doc/obliv-c" + cp -r doc/* README* CHANGE* Change* LICEN* TODO* "$out/share/doc/obliv-c" + mkdir -p "$out/share/obliv-c" + cp -r test "$out/share/obliv-c" + mkdir -p "$out/include" + cp src/ext/oblivc/*.h "$out/include" + mkdir -p "$out/lib" + gcc $(ar t _build/libobliv.a | sed -e 's@^@_build/@') --shared -o _build/libobliv.so + cp _build/lib*.a _build/lib*.so* "$out/lib" + ''; + meta = { + inherit version; + description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs''; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 50199852ae2f..2969dab92260 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, cpio, pkgconfig, file, which, unzip, zip, xorg, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib +{ stdenv, lib, fetchurl, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libjpeg, giflib , setJavaClassPath , minimal ? false , enableInfinality ? true # font rendering patch +, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf }: let @@ -65,10 +68,11 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cpio file which unzip zip - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - cups freetype alsaLib perl liberation_ttf fontconfig bootjdk zlib + cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk2 gnome_vfs GConf glib ]; prePatch = '' @@ -82,10 +86,12 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ] ++ (if enableInfinality then [ + ] ++ lib.optionals (!minimal && enableInfinality) [ ./004_add-fontconfig.patch ./005_enable-infinality.patch - ] else []); + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk.patch + ]; preConfigure = '' chmod +x configure @@ -101,21 +107,22 @@ let "--enable-unlimited-crypto" "--disable-debug-symbols" "--disable-freetype-bundling" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" - ] ++ (if minimal then [ - "--disable-headful" - "--with-zlib=bundled" - "--with-giflib=bundled" - ] else [ - "--with-zlib=system" - ]); + ] ++ lib.optional minimal "--disable-headful"; - NIX_LDFLAGS= if minimal then null else "-lfontconfig"; + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; - buildFlags = "all"; + buildFlags = [ "all" ]; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk @@ -135,12 +142,19 @@ let # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + ${lib.optionalString minimal '' + rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so + rm $out/lib/openjdk/jre/bin/policytool + rm $out/lib/openjdk/bin/{policytool,appletviewer} + ''} # Move the JRE to a separate output and setup fallback fonts mv $out/lib/openjdk/jre $jre/lib/openjdk/ mkdir $out/lib/openjdk/jre - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ${lib.optionalString (!minimal) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre rm -rf $out/lib/openjdk/jre/bina diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk.patch b/pkgs/development/compilers/openjdk/swing-use-gtk.patch new file mode 100644 index 000000000000..9538aade6726 --- /dev/null +++ b/pkgs/development/compilers/openjdk/swing-use-gtk.patch @@ -0,0 +1,26 @@ +diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java +--- a/jdk/src/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 ++++ b/jdk/src/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 +@@ -607,11 +607,9 @@ + if (osType == OSInfo.OSType.WINDOWS) { + return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; + } else { +- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); + Toolkit toolkit = Toolkit.getDefaultToolkit(); +- if ("gnome".equals(desktop) && +- toolkit instanceof SunToolkit && +- ((SunToolkit) toolkit).isNativeGTKAvailable()) { ++ if (toolkit instanceof SunToolkit && ++ ((SunToolkit) toolkit).isNativeGTKAvailable()) { + // May be set on Linux and Solaris boxs. + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } +@@ -1341,7 +1339,7 @@ + lafName = (String) lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); + diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch new file mode 100644 index 000000000000..2d1f92af81df --- /dev/null +++ b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch @@ -0,0 +1,21 @@ +diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh +--- pakcs-1.11.4-upstream/scripts/pakcs.sh 2014-10-24 05:06:07.000000000 -0430 ++++ pakcs-1.11.4/scripts/pakcs.sh 2015-01-05 16:26:15.697982791 -0430 +@@ -16,7 +16,7 @@ + # use readline wrapper rlwrap if it is installed and we have tty as stdin: + USERLWRAP=no + if tty -s ; then +- RLWRAP=`which rlwrap` ++ RLWRAP=`type -P rlwrap` + if [ -x "$RLWRAP" ] ; then + USERLWRAP=yes + fi +@@ -29,7 +29,7 @@ + done + + if [ $USERLWRAP = yes ] ; then +- exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} ++ exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} + else + exec "$REPL" ${1+"$@"} + fi diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix new file mode 100644 index 000000000000..92b916ccb8e1 --- /dev/null +++ b/pkgs/development/compilers/pakcs/default.nix @@ -0,0 +1,156 @@ +{ stdenv, fetchurl, swiProlog, haskellPackages +, glibcLocales, makeWrapper, rlwrap, tk, which }: + +let + fname = "pakcs-1.14.0"; + + fsrc = fetchurl { + url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; + sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s"; + }; + + swiPrologLocked = stdenv.lib.overrideDerivation swiProlog (oldAttrs: rec { + version = "6.6.6"; + name = "swi-prolog-${version}"; + src = fetchurl { + url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; + sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + }; + }); + +in +stdenv.mkDerivation rec { + + name = fname; + + curryBase = haskellPackages.callPackage ( + { mkDerivation, base, Cabal, containers, directory, either + , filepath, mtl, pretty, stdenv, syb, time + }: + mkDerivation { + pname = "curry-base"; + version = "0.4.1"; + src = fsrc; + libraryHaskellDepends = [ + base containers directory either filepath mtl pretty syb time + ]; + testHaskellDepends = [ base Cabal filepath mtl ]; + homepage = "http://curry-language.org"; + description = "Functions for manipulating Curry programs"; + license = "unknown"; + + postUnpack = '' + mv ${name} ${name}.orig + ln -s ${name}.orig/frontend/curry-base ${name} + ''; + doCheck = false; + } + ) {}; + + curryFront = haskellPackages.callPackage ( + { mkDerivation, base, Cabal, containers, directory + , filepath, mtl, network-uri, process, stdenv, syb, transformers + }: + mkDerivation { + pname = "curry-frontend"; + version = "0.4.1"; + src = fsrc; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers curryBase directory filepath mtl network-uri + process syb transformers + ]; + executableHaskellDepends = [ + base containers curryBase directory filepath mtl network-uri + process syb transformers + ]; + testHaskellDepends = [ base Cabal curryBase filepath ]; + homepage = "http://curry-language.org"; + description = "Compile the functional logic language Curry to several intermediate formats"; + license = "unknown"; + + postUnpack = '' + mv ${name} ${name}.orig + ln -s ${name}.orig/frontend/curry-frontend ${name} + ''; + doCheck = false; + } + ) {}; + + src = fsrc; + + buildInputs = [ swiPrologLocked makeWrapper glibcLocales rlwrap tk which ]; + + patches = [ ./adjust-buildsystem.patch ]; + + configurePhase = '' + # Phony HOME. + mkdir phony-home + export HOME=$(pwd)/phony-home + + # SWI Prolog + sed -i 's@SWIPROLOG=@SWIPROLOG='${swiPrologLocked}/bin/swipl'@' scripts/pakcsinitrc.sh + ''; + + buildPhase = '' + # Some comments in files are in UTF-8, so include the locale needed by GHC runtime. + export LC_ALL=en_US.UTF-8 + + # PAKCS must be build in place due to embedded filesystem references placed by swi. + + # Prepare PAKCSHOME directory. + mkdir -p $out/pakcs/bin + + # Set up link to cymake, which has been built already. + ln -s ${curryFront}/bin/cymake $out/pakcs/bin/ + rm -r frontend + + # Prevent embedding the derivation build directory as temp. + export TEMP=/tmp + + # Copy to in place build location and run the build. + cp -r * $out/pakcs + (cd $out/pakcs ; make) + ''; + + installPhase = '' + # Install bin. + mkdir -p $out/bin + for b in $(ls $out/pakcs/bin) ; do + ln -s $out/pakcs/bin/$b $out/bin/ ; + done + + # Place emacs lisp files in expected locations. + mkdir -p $out/share/emacs/site-lisp/curry-pakcs + for e in "$out/pakcs/tools/emacs/"*.el ; do + cp $e $out/share/emacs/site-lisp/curry-pakcs/ ; + done + + # Wrap for rlwrap and tk support. + wrapProgram $out/pakcs/bin/pakcs \ + --prefix PATH ":" "${rlwrap}/bin" \ + --prefix PATH ":" "${tk}/bin" \ + ''; + + meta = { + homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; + description = "An implementation of the multi-paradigm declarative language Curry"; + license = stdenv.lib.licenses.bsd3; + + longDescription = '' + PAKCS is an implementation of the multi-paradigm declarative language + Curry jointly developed by the Portland State University, the Aachen + University of Technology, and the University of Kiel. Although this is + not a highly optimized implementation but based on a high-level + compilation of Curry programs into Prolog programs, it is not a toy + implementation but has been used for a variety of applications (e.g., + graphical programming environments, an object-oriented front-end for + Curry, partial evaluators, database applications, HTML programming + with dynamic web pages, prototyping embedded systems). + ''; + + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index e7cc7b15627e..454b67b8151b 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -17,13 +17,13 @@ let # fetch hashes by running `print-hashes.sh 1.9.0` bootstrapHash = if stdenv.system == "i686-linux" - then "be93dd2b80a97f2877679950d56990628c6547b953294f16bf6d69c18a39edc0" + then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" else if stdenv.system == "x86_64-linux" - then "f189303d52b37c8bb694b9d9739ae73ffa926cbdeffde1d5d6a5c6e811940293" + then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" else if stdenv.system == "i686-darwin" - then "40d4782a58dd5bef22dbbaa7a363f3b42f844628db07205f6435ac934f350061" + then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" else if stdenv.system == "x86_64-darwin" - then "4bb71249f4afd7cee07f63d681f9fcb1b525ee3dfd49722adab7a40024e45af7" + then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.10.0"; + version = "1.11.0"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index b7e992c916d3..1dbc6c13e0bf 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.11.0"; + shortVersion = "1.12.0"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "9b21dcd6a89f38e8ceccb2ede8c9027cb409f6e3"; - srcSha = "12djpxhwqvq3262ai9vd096bvriynci2mrwn0dfjrd0w6s0i8viy"; + srcRev = "3191fbae9da539442351f883bdabcad0d72efcb6"; + srcSha = "1mpw6c5jfxy60g786wl8g0ncwikqfbcj67jrdpj3jacywxsxzlby"; patches = [ ./patches/disable-lockfile-check.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.12.0"; - srcRev = "6b98d1f8abf5b33c1ca2771d3f5f3bafc3407b93"; - srcSha = "0pq6l3yzmh2il6320f6501hvp9iikdxzl34i5b52v93ncpim36bk"; - depsSha256 = "1jrwzm9fd15kf2d5zb17q901hx32h711ivcwdpxpmzwq08sjlcvl"; + version = "0.13.0"; + srcRev = "109cb7c33d426044d141457049bd0fffaca1327c"; + srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs"; + depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 44964f53a44c..e1bff12f398e 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -90,6 +90,9 @@ stdenv.mkDerivation { # Disable fragile linker-output-non-utf8 test rm -vr src/test/run-make/linker-output-non-utf8/ + # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 + rm -vr src/test/run-pass/issue-36023.rs + # Useful debugging parameter # export VERBOSE=1 '' + diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a130772297c4..be7cf7302b70 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -269,12 +269,14 @@ self: super: { snowball = dontCheck super.snowball; sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; + texrunner = dontCheck super.texrunner; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; + wai-cors = dontCheck super.wai-cors; # These packages try to access the network. amqp = dontCheck super.amqp; @@ -641,6 +643,11 @@ self: super: { ''; })); + # Requires optparse-applicative 0.13.0.0 + diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch; @@ -1019,4 +1026,10 @@ self: super: { # https://github.com/fpco/store/issues/77 store = dontCheck super.store; + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = doJailbreak super.applicative-quoters; + + # https://github.com/vshabanov/HsOpenSSL/issues/11 + HsOpenSSL = doJailbreak super.HsOpenSSL; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index a0f8056c081c..00f6f3770d5f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -179,9 +179,6 @@ self: super: { vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; - # Trigger rebuild to mitigate broken packaes on Hydra. - amazonka-core = triggerRebuild super.amazonka-core 1; - # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; @@ -190,6 +187,7 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); Glob = addBuildDepends super.Glob (with self; [semigroups]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; @@ -212,6 +210,6 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; - generic-deriving = self.generic-deriving_1_10_5; + } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 19940bd70bea..9020f1ee4671 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -6,12 +6,13 @@ let - allCabalFiles = pkgs.fetchFromGitHub { - owner = "commercialhaskell"; - repo = "all-cabal-hashes"; - rev = "72f1318540eff69544eb8c14a16f630d0c5448b8"; - sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m"; - }; + allCabalFiles = stdenv.mkDerivation { + name = "all-cabal-hashes-0"; + buildCommand = '' + mkdir -p $out + tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"} + ''; + }; inherit (stdenv.lib) fix' extends; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e4fcd09c0e03..2b597532b44d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -180,11 +180,6 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - ${optionalString (stdenv.lib.versionOlder "8" ghc.version) '' - ipid=$(echo $(basename "$out") | cut -d- -f1) - configureFlags+=" --ipid=$ipid" - ''} - local inputClosure="" for i in $propagatedNativeBuildInputs $nativeBuildInputs; do findInputs $i inputClosure propagated-native-build-inputs diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 566d7025e5c9..9fc25ad46fdc 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, menhir, which }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; }; - buildInputs = [ ocaml findlib menhir which ]; + buildInputs = [ ocaml findlib ocamlbuild menhir which ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f79ef61d36a2..ae8256dfaeaf 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -271,7 +271,7 @@ let done [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags ''; postInstall = '' diff --git a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch deleted file mode 100644 index f5d9e5695026..000000000000 --- a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001 -From: Alexander Ried <ried@mytum.de> -Date: Wed, 1 Jun 2016 12:49:48 +0200 -Subject: [PATCH] Add nixbld* to user blacklist - ---- - src/user-classify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/user-classify.c b/src/user-classify.c -index 69e6809..0e152b6 100644 ---- a/src/user-classify.c -+++ b/src/user-classify.c -@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username) - return TRUE; - } - -+ if (g_str_has_prefix (username, "nixbld")) { -+ return TRUE; -+ } -+ - return FALSE; - } - --- -2.7.4 - diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 2dc6b57c339f..1a49913727d8 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.42"; + version = "0.6.43"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; + sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./no-create-dirs.patch - ./Add-nixbld-to-user-blacklist.patch ./Disable-methods-that-change-files-in-etc.patch ]; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index eb68a7b9a910..482cf9fdfadd 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "c-ares-1.10.0"; + name = "c-ares-1.12.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 80f858254ffb..97a975232602 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cmake }: +{ stdenv, fetchurl, bash }: stdenv.mkDerivation rec { name = "capstone-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; }; - buildInputs = [ cmake ]; + configurePhase = '' patchShebangs make.sh ''; + buildPhase = '' ./make.sh ''; + installPhase = '' env PREFIX=$out ./make.sh install ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 5b824e3c5753..ecc730597c31 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, openssl }: +{ stdenv, fetchurl, cmake, boost, openssl, asio }: stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost openssl ]; + # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629 + propagatedBuildInputs = [ asio ]; + cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 551d18d17f19..8acc773a46c8 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gpgStorePath}/bin" ]; + NIX_CFLAGS_COMPILE = + with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index a24005487bee..5a3085ba7285 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.8"; + name = "jansson-2.9"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "0v7v82mv7x44rpcxmrpnmb8hqimx67qwsp2cz9mv3y0f37iykwnf"; + sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index c9fa9b10f938..e2061df88f09 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,37 +1,17 @@ -{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.1"; + name = "jasper-1.900.2"; src = fetchurl { - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; - sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; + url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; + sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a"; }; patches = [ - ./jasper-CVE-2016-1867.diff ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff - ./jasper-CVE-2014-8138.diff - ./jasper-CVE-2014-8157.diff - ./jasper-CVE-2014-8158.diff - ./jasper-CVE-2014-9029.diff - (fetchpatch { # CVE-2016-2116 - url = "https://github.com/mdadams/jasper/commit/142245b9bbb33274a7c620aa7a8f85bc00b2d68e.patch"; - sha256 = "06dkplqfb3swmdfqb9i2m6r13q0ivn538xfvinxz0agandxyc9yr"; - }) - (fetchpatch { # CVE-2016-1577 - url = "https://github.com/mdadams/jasper/commit/74ea22a7a4fe186e0a0124df25e19739b77c4a29.patch"; - sha256 = "1xgvhfhv8r77z0a07ick2w3217mypnkaqjwzxbk1g1ym8lsy5r13"; - }) - (fetchpatch { # CVE-2015-5221 - url = "https://github.com/mdadams/jasper/commit/df5d2867e8004e51e18b89865bc4aa69229227b3.patch"; - sha256 = "0qsiymm59dkj843dbi43ijqdyy3rrzf193ndm9ynj3cfhqghi10l"; - }) - (fetchpatch { # CVE-2008-3522 - url = "https://github.com/mdadams/jasper/commit/d678ccd27b8a062e3bfd4c80d8ce2676a8166a27.patch"; - sha256 = "0dapf8h4s3zijbgd8vmap3blpnc78h7jqm5ydv8j0krrs5dv5672"; - }) + (fetchpatch { # CVE-2016-2089 url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; @@ -43,7 +23,7 @@ stdenv.mkDerivation rec { ]; # newer reconf to recognize a multiout flag - nativeBuildInputs = [ unzip autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 5ff3157272ee..04e1af2326b6 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }: +{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]; + propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] + ++ stdenv.lib.optional stdenv.isDarwin libXext; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix new file mode 100644 index 000000000000..aba06d861078 --- /dev/null +++ b/pkgs/development/libraries/libgee/0.8.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +let + ver_maj = "0.8"; + ver_min = "6"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + homepage = "http://live.gnome.org/Libgee"; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index aa5d858d82cf..c40e54e09cb6 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.12.2"; + name = "libmbim-1.14.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; + url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; + sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index c47076014c43..be60612a4ff2 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; - md5 = "98927583d2016a9fb1936fed992e2c5e"; + sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; meta = { diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index cfce5e0fd713..d0b46722ff35 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.12.6"; + name = "libqmi-1.16.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; + url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; + sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7f32f37a704d..ad6d99473555 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; - propagatedBuildInputs = [ libiconv ]; + buildInputs = [ libiconv ]; configureFlags = [ "--with-libiconv-prefix=${libiconv}" diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index d59ceb9f7a9d..00cd4103c8f7 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.1"; + version = "2.1.2"; branch = "2.1"; - revision = "v2.1.1"; - sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601"; + revision = "v2.1.2"; + sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; }) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 42a8d00eec01..b9762e284e68 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix new file mode 100644 index 000000000000..2ee3a61aacfc --- /dev/null +++ b/pkgs/development/libraries/quickder/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchurl, hexio, python, which, asn2quickder, bash }: + +stdenv.mkDerivation rec { + pname = "quickder"; + name = "${pname}-${version}"; + version = "1.0-RC1"; + + src = fetchFromGitHub { + sha256 = "05gw5dqkw3l8kwwm0044zpxhcp7sxicx9wxbfyr49c91403p870w"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "quick-der"; + }; + + buildInputs = [ which asn2quickder bash ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace 'lib tool test rfc' 'lib test rfc' + substituteInPlace ./rfc/Makefile \ + --replace 'ASN2QUICKDER_CMD = ' 'ASN2QUICKDER_CMD = ${asn2quickder}/bin/asn2quickder #' + ''; + + installFlags = "ASN2QUICKDER_DIR=${asn2quickder}/bin ASN2QUICKDER_CMD=${asn2quickder}/bin/asn2quickder"; + installPhase = '' + mkdir -p $out/lib $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Quick (and Easy) DER, a Library for parsing ASN.1"; + homepage = https://github.com/vanrein/quick-der; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix new file mode 100644 index 000000000000..61ac651256a2 --- /dev/null +++ b/pkgs/development/libraries/uri/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation { + name = "uri-2016-09-04"; + + src = fetchFromGitHub { + owner = "cpp-netlib"; + repo = "uri"; + rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c"; + sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d"; + }; + + buildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + + postBuild = '' + make doc + ''; + + # https://github.com/cpp-netlib/uri/issues/90 + postInstall = '' + mv $out/include $out/include2 + mv $out/include2/include $out/ + rmdir $out/include2 + mkdir -p $out/share/doc + mv html $out/share/doc/uri + ''; + + meta = { + description = "C++ URI library"; + homepage = http://cpp-netlib.org; + license = stdenv.lib.licenses.boost; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index fca358ed4305..7439d72151dd 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - #NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; nativeBuildInputs = [ cmake perl python ruby bison gperf sqlite diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 615e1d1b6739..7edd0ddda5eb 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index aabb9f8a76a1..8128dc1cb6f5 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "2.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 0c01a946e5ad..904a214c34f5 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, qtest }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: let version = "2.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; }; - buildInputs = [ ocaml findlib qtest ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index cf8b21edb50e..5d1fe8aa0d11 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, which, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib which camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; patchPhase = '' patch myocamlbuild.ml <<EOF diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 1753084910b9..99b5f92b3405 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ocaml, findlib }: +{ stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-cil-1.7.3"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; - buildInputs = [ perl ocaml findlib ]; + buildInputs = [ perl ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index d72ff6d93d4b..8be36a2a408f 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "cmdliner"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index fbbf0fc74149..4719cd300c19 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result , qcheck }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw"; }; - buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index be61ad70b3df..461e2b887084 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: +{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, ncurses }: assert stdenv.lib.versionAtLeast ocaml.version "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; }; - buildInputs = [zlib ocaml findlib ncurses]; + buildInputs = [ zlib ocaml findlib ocamlbuild ncurses ]; buildFlags = "setup.data build"; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 760b981dd2ca..95199f16dcc2 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "05s8py2qr3889c72g1q07r15pzch3j66xdphxi2sd93h5lvnpi4j"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 5987c53898fc..318353168336 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index a9475649ff66..557f2f88d8d2 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ecfdb846ff1e..ae264b657d87 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.3"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "19znk5w0qiw3wij4n6w3h5bcr221yy57jf815fr8k9m8kin710g3"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index efa239f6c332..c6027ce11ce5 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocamlbuild, erm_xml, cryptokit, camlp4 }: let version = "0.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ disable-tests ]; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml cryptokit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 0ecb135b4e8f..5fcc317d9408 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { substituteInPlace "unittest.ml" \ --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}" substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \ - substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ + --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ + --replace "gcc" "\$(CC)" ''; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 3ffcfada3d5d..9dfffbf48c55 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ounit }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml-fileutils-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configureFlags = "--enable-tests"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 77e2461bda04..76cb6d088440 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 06a67e9cb8b6..224f3537a2e0 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { name = "gapi-ocaml-0.2.10"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 90f74b2c6026..c023b590f7a7 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.3"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 9351bfa7520e..0839ff361aea 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 0aad6f7b13bb..8a11d22c2c11 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.2.4"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index e5efb786a943..9bc1cbb59e46 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,10 +1,10 @@ {stdenv, buildOcamlJane, - ppx_core, ppx_tools, ppx_type_conv, sexplib}: + ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: buildOcamlJane rec { name = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; - propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; meta = with stdenv.lib; { description = "Generation of accessor and iteration functions for ocaml variant types"; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index cc5de781beec..f473527c15c8 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf }: let version = "0.9.1"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ uutf ]; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 026f67d8ef44..4638748160a2 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 60afad57b57b..f66773d426af 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; }; - buildInputs = [ libev ocaml findlib ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ zed ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 2f58c41ba355..351a773a6f7b 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' mkdir build cd build - ../configure CC=gcc CXX=g++ --disable-compiler-version-checks --prefix=$out \ + ../configure --disable-compiler-version-checks --prefix=$out \ --disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \ --enable-static ''; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 4c99ff2b6859..9eeed1285dcc 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let inherit (stdenv.lib) optional getVersion versionAtLeast; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index a24859892fa1..3d015e26275b 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, pgocaml, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }: stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ pgocaml ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9c42aed37df2..9a8a6259a778 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "1.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index d4a38d9bd9e4..a177ae240d14 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf, lwt }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }: stdenv.mkDerivation rec { pname = "ocaml-markup"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; installPhase = "make ocamlfind-install"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 5b2fd400cd7f..839a49615cd8 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild , version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" }@args: diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index c182d2100490..9d4615a006b5 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib }: +{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 204adeb9451e..5b902afcb6db 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk2, +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, enableGtkSupport ? true # Whether to compile with support for Gtk # integration (library file cairo2_gtk). Depends # on lablgtk and gtk2. @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; }; - buildInputs = [ ocaml findlib pkgconfig cairo ] + buildInputs = [ ocaml findlib ocamlbuild pkgconfig cairo ] ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 64e0bb5ba010..d90fda954ba3 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libiconv, ocaml, findlib, ncurses }: +{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { name = "ocaml-text-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11jamdfn5s19a0yvl012q1xvdk1grkp4rkrn819imqrvdplqkn1y"; }; - buildInputs = [ocaml findlib ncurses libiconv]; + buildInputs = [ ocaml findlib ocamlbuild ncurses libiconv ]; configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 73351ea633f4..fc7640cc0c94 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -2,11 +2,11 @@ , gnutls, nettle }: stdenv.mkDerivation { - name = "ocamlnet-4.1.1"; + name = "ocamlnet-4.1.2"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-4.1.1.tar.gz; - sha256 = "1z0j542dfzfimsn4asw1ycb4ww561pv92cz6s6kxazvgx60c5rb1"; + url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz; + sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; }; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 351f667a8c90..b7d897b38531 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cppo }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: let version = "0.8"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12xjvzw245mj4s02dgi4k2sx5gam7wxi4mbxmz6k18zg64n48yjd"; }; - buildInputs = [ ocaml findlib cppo ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index b3c7ddb84331..f30fea2c4192 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib type_conv ounit camlp4]; + buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 120751454151..7afbf3a4b407 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; meta = { diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index a2047a0fe786..30946da1c0b2 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uutf }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; propagatedBuildInputs = [ uutf ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 47f15f8c1225..7179b8408a00 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ounit-2.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f1bc4849a7f5..6b9ae97ad54e 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml-pgocaml-2.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ calendar csv ocaml_pcre ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index e28f85b475cc..83732eb1f75f 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 7d904e576336..158c69ef11a8 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, oasis, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; }; - buildInputs = [ ocaml findlib oasis ounit ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; configureFlags = "--enable-tests --enable-ounit"; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 05b9c06af0fe..6d5f8ecc6833 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: let version = "2.2"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ounit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 072754fc60fd..1ea2310bf9fa 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocaml-re-1.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index f9fe95b89dc2..66c2533853e6 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: stdenv.mkDerivation { name = "ocaml-react-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ocaml findlib opam]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 4b335496500b..cd64e6578c16 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_react, camlp4, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }: let ocamlVersion = stdenv.lib.getVersion ocaml; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq"; }; - buildInputs = [ocaml findlib opam camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ]; propagatedBuildInputs = [ocaml_react]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 2f941b923e33..44a74b3fa2f0 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-safepass-1.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index c689aec1904f..a87a13fd3960 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.6"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; configureFlags = [ "--enable-tests" diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 804e33fc7386..cfa90226678a 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }: +{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { name = "ocaml-sqlite3-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ ocaml findlib pkgconfig sqlite ]; + buildInputs = [ ocaml findlib ocamlbuild pkgconfig sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index a6ff9f44116c..0a5c04ce7aa9 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748"; }; - buildInputs = [ ocaml findlib twt ]; + buildInputs = [ ocaml findlib ocamlbuild twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 05aa2c2da683..9eb9ad514f72 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit, qcheck +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck # Optionally enable tests; test script use OCaml-4.01+ features , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; }; - buildInputs = [ ocaml findlib ounit qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + stdenv.lib.optionalString doCheck " --enable-tests"; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 4fd6589cfb58..1b1a127c5361 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, result, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: let ocaml-version = stdenv.lib.getVersion ocaml; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ opam ]; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 79a696632e1b..d47d5d3169b6 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ctypes, result, SDL2, pkgconfig, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }: let inherit (stdenv.lib) getVersion; @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm"; }; - buildInputs = [ ocaml findlib result pkgconfig opam ]; + buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 4f9644ea5be0..b8c415b75669 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: stdenv.mkDerivation rec { pname = "tyxml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [uutf re ppx_tools markup]; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index a5b9349cbe08..fa26b305da2d 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: let pname = "ulex"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ camlp4 ]; buildFlags = "all all.opt"; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 7d4e4b42efb4..73a0ccdacfe7 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }: let pname = "uucd"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6"; }; - buildInputs = [ ocaml findlib opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 4e4dd67e2105..456fc8a19761 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 07ba10a74a97..0391cd5033fd 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { version = "0.9.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $prefix"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index a407410907e3..11ff9a36a41c 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 5946fd2a70df..3c7a4ff5c58b 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; propagatedBuildInputs = [ uucp uutf ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 897630ccac6f..fda630114ed6 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 2f2d5b0b8be0..d94a3eac873a 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "xmlm"; webpage = "http://erratique.ch/software/${pname}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index f9bf65cf8141..410d5c0c612b 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, camomile, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; }; - buildInputs = [ ocaml findlib ocaml_react ]; + buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ camomile ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 7c1b8b503a3a..5ba813deba60 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -18,11 +18,11 @@ assert enableTk -> (tcl != null) buildPythonPackage rec { name = "matplotlib-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40"; + sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix new file mode 100644 index 000000000000..69051714ab4c --- /dev/null +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "asn2quickder"; + name = "${pname}-${version}"; + version = "0.7-RC1"; + + src = fetchFromGitHub { + sha256 = "0ynajhbml28m4ipbj5mscjcv6g1a7frvxfimxh813rhgl0w3sgq8"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "${pname}"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ]; + + patchPhase = with pythonPackages; '' + substituteInPlace Makefile \ + --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \ + ''; + + installPhase = '' + mkdir -p $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "An ASN.1 compiler with a backend for Quick DER"; + homepage = https://github.com/vanrein/asn2quickder; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 002d3bde201e..5d57c9b4579a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,35 +1,70 @@ -{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf3_0, pkgconfig, libarchive, unzip, which, makeWrapper }: -stdenv.mkDerivation rec { - version = "0.3.1"; - name = "bazel-${version}"; - - src = fetchFromGitHub { - owner = "google"; - repo = "bazel"; - rev = version; - sha256 = "1cm8zjxf8y3ai6h9wndxvflfsijjqhg87fll9ar7ff0hbbbdf6l5"; +{ stdenv, fetchFromGitHub, buildFHSUserEnv, writeScript, jdk, zip, unzip, + which, makeWrapper, binutils }: + +let + + version = "0.3.2"; + + meta = with stdenv.lib; { + homepage = http://github.com/bazelbuild/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.philandstuff ]; + platforms = platforms.linux; }; - buildInputs = [ pkgconfig protobuf3_0 zlib zip libarchive unzip which makeWrapper jdk ]; + bootstrapEnv = buildFHSUserEnv { + name = "bazel-bootstrap-env"; - buildPhase = '' - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + targetPkgs = pkgs: [ ]; - bash compile.sh - ''; + inherit meta; + }; - installPhase = '' - mkdir -p $out/bin $out/share - cp -R output $out/share/bazel - ln -s $out/share/bazel/bazel $out/bin/bazel - wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}" - ''; + bazelBinary = stdenv.mkDerivation rec { + name = "bazel-${version}"; - meta = { - homepage = http://github.com/google/bazel/; - description = "Build tool that builds code quickly and reliably"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.philandstuff ]; - platforms = [ "x86_64-linux" ]; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel"; + rev = version; + sha256 = "085cjz0qhm4a12jmhkjd9w3ic4a67035j01q111h387iklvgn6xg"; + }; + patches = [ ./java_stub_template.patch ]; + + packagesNotFromEnv = [ + stdenv.cc stdenv.cc.cc.lib jdk which zip unzip binutils ]; + buildInputs = packagesNotFromEnv ++ [ bootstrapEnv makeWrapper ]; + + buildTimeBinPath = stdenv.lib.makeBinPath packagesNotFromEnv; + buildTimeLibPath = stdenv.lib.makeLibraryPath packagesNotFromEnv; + + runTimeBinPath = stdenv.lib.makeBinPath [ jdk stdenv.cc.cc ]; + runTimeLibPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + + buildWrapper = writeScript "build-wrapper.sh" '' + #! ${stdenv.shell} -e + export PATH="${buildTimeBinPath}:$PATH" + export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH" + ./compile.sh + ''; + + buildPhase = '' + bazel-bootstrap-env ${buildWrapper} + ''; + + installPhase = '' + mkdir -p $out/bin + cp output/bazel $out/bin/ + wrapProgram $out/bin/bazel \ + --suffix PATH ":" "${runTimeBinPath}" \ + --suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}" + ''; + + dontStrip = true; + dontPatchELF = true; + + inherit meta; }; -} + +in bazelBinary diff --git a/pkgs/development/tools/build-managers/bazel/java_stub_template.patch b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch new file mode 100644 index 000000000000..4e456a78d800 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch @@ -0,0 +1,16 @@ +commit 5525326e3287243e0e7417de96bf7d58d04b4c8b +Author: Irene Knapp <ireneista@google.com> +Date: Sat Oct 8 19:36:12 2016 -0700 + + Change #!/bin/bash to #!/usr/bin/env bash. + +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +index f77051f..fbf367a 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +@@ -1,4 +1,4 @@ +-#!/bin/bash --posix ++#!/usr/bin/env bash + # Copyright 2014 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 4431105d18f8..d16b83a2831c 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,16 +1,12 @@ -{ stdenv -, pythonPackages -, fetchurl -, plugins ? [] -}: +{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb"; + sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc"; }; buildInputs = with pythonPackages; [ @@ -61,16 +57,17 @@ pythonPackages.buildPythonApplication (rec { preInstall = '' # writes out a file that can't be read properly sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py + + # re-hardcode path to tail + sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' - buildPythonPath "$out" - patchPythonScript "$out/bin/buildbot" mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot - echo "#!/bin/bash" > $out/bin/buildbot - echo "export PYTHONPATH=$out/lib/python2.7/site-packages:$PYTHONPATH" >> $out/bin/buildbot + echo "#!/bin/sh" > $out/bin/buildbot + echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot - chmod -c 755 $out/bin/buildbot + chmod -c 555 $out/bin/buildbot ''; meta = with stdenv.lib; { @@ -78,5 +75,6 @@ pythonPackages.buildPythonApplication (rec { description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 384452e27d9c..09f8b1e750a5 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,17 +1,14 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm"; + sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -21,6 +18,7 @@ let description = "Buildbot Packaging Helper"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; @@ -29,13 +27,14 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; + src = fetchurl { - url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl"; - sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6"; + url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl"; + sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -45,17 +44,18 @@ in { description = "Buildbot UI"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07"; + sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -65,17 +65,18 @@ in { description = "Buildbot Console View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81"; + sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -85,6 +86,7 @@ in { description = "Buildbot Waterfall View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 2c8e17a37c00..01b2051aaa6d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,16 +1,13 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0rc3"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1"; + sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; @@ -21,5 +18,6 @@ pythonPackages.buildPythonApplication (rec { description = "Buildbot Worker Daemon"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 47c6e12a5860..558b8acf70f1 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,10 +1,11 @@ { lib, python3Packages, fetchurl }: python3Packages.buildPythonPackage rec { - name = "meson-0.32.0"; + version = "0.35.0"; + name = "meson-${version}"; src = fetchurl { url = "mirror://pypi/m/meson/${name}.tar.gz"; - sha256 = "1i5m4q53sr55aw8kx761kh0rsfwkpq0gfa0c0k3jf66y4aml6n54"; + sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3"; }; meta = with lib; { diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix new file mode 100644 index 000000000000..6d75c7256ee0 --- /dev/null +++ b/pkgs/development/tools/hexio/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth, glibc }: + +stdenv.mkDerivation rec { + pname = "hexio"; + name = "${pname}-${version}"; + version = "201605"; + + src = fetchFromGitHub { + sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq"; + rev = "f6f963bd0fcd2808977e0ad82dcb3100691cdd7c"; + owner = "vanrein"; + repo = "hexio"; + }; + + buildInputs = [ python pcsclite pth glibc ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \ + --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; + homepage = https://github.com/vanrein/hexio; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index f54b409efb6d..ca8c2de9630f 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.9"; src = fetchurl { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; - md5 = "08c96baa4b99dd9d25190dd15fe415a5"; + sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; buildInputs = [ intltool pkgconfig glib ]; postInstall = '' diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 48e74cf2631d..60218bbb1ad4 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -12,7 +12,7 @@ let - basename = "gdb-7.11.1"; + basename = "gdb-7.12"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9"; + sha256 = "152g2qa8337cxif3lkvabjcxfd9jphfb2mza8f1p2c4bjk2z6kw3"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index da5da2e5ab9a..37e5ae6f7105 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; + buildInputs = [ ncurses ]; + src = fetchurl { urls = ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] @@ -22,14 +24,19 @@ stdenv.mkDerivation rec { }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - preBuild = "sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;';"; + + patches = [ ./dfile.patch ]; configurePhase = '' # Stop build scripts from searching global include paths - export LSOF_INCLUDE=/$(md5sum <(echo $name) | awk '{print $1}') + export LSOF_INCLUDE=${stdenv.cc.libc}/include ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} ''; + + preBuild = '' + sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + ''; + installPhase = '' mkdir -p $out/bin $out/man/man8 diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch new file mode 100644 index 000000000000..47202d5ebeab --- /dev/null +++ b/pkgs/development/tools/misc/lsof/dfile.patch @@ -0,0 +1,18 @@ +--- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 ++++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 +@@ -286,13 +286,13 @@ + + #if defined(PROC_FP_GUARDED) + if (extra > 1) +- putchar(`,'); ++ putchar(','); + if (lf->guardflags) { + struct pff_tab *tp; + long gf; + + (void) printf("guard="); +- tp = Pgf_tab; ++ tp = Pff_tab; + gf = lf->guardflags; + while (gf && !FsvFlagX) { + while (tp->nm) { diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix index 3e4cd49a2cee..1382883e5a3b 100644 --- a/pkgs/development/tools/nimble/default.nix +++ b/pkgs/development/tools/nimble/default.nix @@ -12,22 +12,20 @@ stdenv.mkDerivation rec { sha256 = "12znxzj1j5fflw2mkkrns9n7qg6sf207652zrdyf7h2jdyzzb73x"; }; - buildInputs = [ nim ]; + buildInputs = [ nim openssl ]; patchPhase = '' substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share" + echo "--clib:crypto" >> src/nimble.nim.cfg ''; buildPhase = '' - nim c src/nimble + cd src && nim c -d:release nimble ''; installPhase = '' mkdir -p $out/bin - cp src/nimble $out/bin - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.cc.libc openssl]}" \ - --add-needed libcrypto.so \ - "$out/bin/nimble" + cp nimble $out/bin ''; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 093e90dd47f3..feedd8835485 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}: +{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }: let pname = "camlidl"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl - substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp + substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml ''; diff --git a/pkgs/development/tools/ocaml/camlp4/4_03.nix b/pkgs/development/tools/ocaml/camlp4/4_03.nix deleted file mode 100644 index a92f2491e468..000000000000 --- a/pkgs/development/tools/ocaml/camlp4/4_03.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchzip, which, ocaml, ocamlbuild}: - -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; - -stdenv.mkDerivation { - name = "camlp4-${version}"; - version = "4.03+1"; - - src = fetchzip { - url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; - sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; - }; - - buildInputs = [ which ocaml ocamlbuild ]; - - dontAddPrefix = true; - - preConfigure = '' - configureFlagsArray=( - --bindir=$out/bin - --libdir=$out/lib/ocaml/${ocaml.version}/site-lib - --pkgdir=$out/lib/ocaml/${ocaml.version}/site-lib - ) - ''; - - postConfigure = '' - substituteInPlace camlp4/META.in \ - --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 - ''; - - - makeFlags = "all"; - - installTargets = "install install-META"; - - meta = with stdenv.lib; { - description = "A software system for writing extensible parsers for programming languages"; - homepage = https://github.com/ocaml/camlp4; - platforms = ocaml.meta.platforms or []; - }; -} - diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 145a3a2b54a9..1e1d2eb68eab 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,17 +1,25 @@ -{stdenv, fetchzip, which, ocaml}: - -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +{ stdenv, fetchzip, which, ocaml, ocamlbuild }: + +let param = { + "4.02.3" = { + version = "4.02+6"; + sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; }; + "4.03.0" = { + version = "4.03+1"; + sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; }; + }."${ocaml.version}"; +in stdenv.mkDerivation rec { name = "camlp4-${version}"; - version = "4.02+6"; + inherit (param) version; src = fetchzip { url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz"; - sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; + inherit (param) sha256; }; - buildInputs = [ which ocaml ]; + buildInputs = [ which ocaml ocamlbuild ]; dontAddPrefix = true; @@ -28,7 +36,6 @@ stdenv.mkDerivation rec { --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; - makeFlags = "all"; installTargets = "install install-META"; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 38b97c006cde..59130bec50e4 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: let pname = "cppo"; version = "1.3.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix index 6dcf05222320..b5e977d623b3 100644 --- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix +++ b/pkgs/development/tools/ocaml/oasis/0.4.6.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect +}: stdenv.mkDerivation { name = "ocaml-oasis-0.4.6"; @@ -13,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index eb6cd35b2561..214a2239688a 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 +, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect +}: stdenv.mkDerivation rec { version = "0.4.7"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ - ocaml findlib type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index f3caa42b8fd7..d5dd0c19d987 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocamlify-0.0.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 19ac4701252e..0b92a45153c1 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { name = "ocamlmod-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 45888924a2ef..b8740bc37932 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, - ocaml_react, camomile, zed, cppo, camlp4, ppx_tools +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh"; }; - buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix new file mode 100644 index 000000000000..823f93f9ac4f --- /dev/null +++ b/pkgs/development/tools/simavr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, avrgcclibc, libelf, which, git, pkgconfig, freeglut +, mesa }: + +stdenv.mkDerivation rec { + name = "simavr-${version}"; + version = "1.3"; + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "buserror"; + repo = "simavr"; + rev = "51d5fa69f9bc3d62941827faec02f8fbc7e187ab"; + sha256 = "0k8xwzw9i6xsmf98q43fxhphq0wvflvmzqma1n4jd1ym9wi48lfx"; + }; + + buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}"; + installFlags = buildFlags + " DESTDIR=$(out)"; + + postFixup = '' + target="$out/bin/simavr" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + ''; + + buildInputs = [ which git avrgcclibc libelf pkgconfig freeglut mesa ]; + + meta = with stdenv.lib; { + description = "A lean and mean Atmel AVR simulator"; + homepage = https://github.com/buserror/simavr; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ goodrone ]; + }; + +} + diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c9987aea8325..cf4f34cbdfee 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.8.5"; + version = "1.8.6"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -13,8 +13,8 @@ let }; sha256 = { - "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; - "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -28,24 +28,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; - # Remove the patchFlags/patches when 1.8.6 is released - patchFlags = [ - "-p1" - "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" - ]; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; - name = "fix_incorrect_ssh_keys_permissions.patch"; - sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; - }) - ]; - meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds ]; + maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix new file mode 100644 index 000000000000..7d4e61c87995 --- /dev/null +++ b/pkgs/development/tools/valadoc/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: +stdenv.mkDerivation rec { + version = "2016-10-09"; + name = "valadoc-unstable-${version}"; + + src = fetchgit { + url = "git://git.gnome.org/valadoc"; + rev = "37756970379d1363453562e9f2af2c354d172fb4"; + sha256 = "1s9sf6f0srh5sqqikswnb3bgwv5s1r9bd4n10hs2lzfmh7z227qb"; + }; + + nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ]; + buildInputs = [ graphviz glib gnome3.libgee expat ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "valadoc is a documentation generator for generating API documentation from Vala source code"; + homepage = http://valadoc.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ sternenseemann ]; + platforms = with platforms; linux; + }; +} |