diff options
Diffstat (limited to 'pkgs/development')
60 files changed, 861 insertions, 235 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index da1332127eb3..7c50872ebe59 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "131"; - build = "11"; + update = "141"; + build = "15"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1k401wsickbdy50yxjd26v8qm9519kxayaj3b103cr6ygp2rd9s6"; + sha256 = "0b2nf1x2wcjn0ijyxhnrhcap4vq43sbblh5kf0qcqmx83cs3z6yh"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1qj75bb17a9czvxz7rm246w97cavglrssx0l1mkbickx0i0wamm8"; + sha256 = "1mirjjywv7mnirrxj5sx3zg6j2864vjvphkn9mxx1pad49by7157"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0kh8rk5y3n4g3hyjzflc8nwc0kyakjivpwlpj1bncsm1sykw8lr8"; + sha256 = "0hhvsrclx58i7ns2v7la2wncnndblppwjncniwcvhnhgl5zhpp31"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0gqa58mwwyf6mbgp48j1akv1y8yq55zpwfziqrbdbpkcsaf603n7"; + sha256 = "1brr72rlpaz70ihymdyp808vw433cr8b11l5qdc76aic2ywbwjyp"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0ymvvi7srr9qkss20s1yg3x2mjw178bscrnxa6s8y82gsw02y820"; + sha256 = "1d4q531jswzk00kdskzfkgr0f4qmxpc7pg9w8p1gq84yz93wz11k"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0507mxvir4s536pdz45pvmahwa6s3h2yhg6rwdzrb568ab06asmi"; + sha256 = "0haw5095p45w33m8pafnp5r5j2lif8c1271chad5sp4gbbk40ai4"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0igbg8axk028kqs9q11m8hb5bg2fa0qcwffbpfbhilyw5gmf7cy8"; + sha256 = "0pm2cccy31d9rnkgc2hcxbpjjhf4wbayx18qn736nncvwcwa76bj"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0l63zm5a7ql3xvfxy5kzazq2184mpx0zyqzinjmq7v0q573g8xak"; + sha256 = "1g05vfggjjg51dki28zby27pnd4z1b23fv9kyc3hdmc4bcj306x0"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 1c761d586035..bc556bdfcade 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "131"; + patchVersion = "141"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; - sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5"; + sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784"; sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 1c761d586035..bc556bdfcade 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "131"; + patchVersion = "141"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; - sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5"; + sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784"; sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix new file mode 100644 index 000000000000..b01914afc295 --- /dev/null +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, coreutils }: + +stdenv.mkDerivation rec { + name = "owl-lisp-${version}"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "aoh"; + repo = "owl-lisp"; + rev = "v${version}"; + sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz"; + }; + + prePatch = '' + substituteInPlace Makefile --replace /usr $out + + for f in tests/run tests/exec.sh ; do + substituteInPlace $f --replace /bin/echo ${coreutils}/bin/echo + done + ''; + + # tests are already run as part of the compilation process + doCheck = false; + + meta = with stdenv.lib; { + descripton = "A functional lisp"; + homepage = https://github.com/aoh/owl-lisp; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix new file mode 100644 index 000000000000..c7aaf2a2e329 --- /dev/null +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-CoLoR-1.3.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/36399/color.1.3.0.tar.gz; + sha256 = "0n7431mc4a5bn9fsyk5167j2vnbxz4vgggjch4pm0x58lda8mxv1"; + }; + + buildInputs = [ coq ]; + enableParallelBuilding = true; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = http://color.inria.fr/; + description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index e12327a347f4..0e7549623e7a 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchFromGitHub, coq }: +{ stdenv, fetchurl, coq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-math-classes-2016-06-08"; + name = "coq${coq.coq-version}-math-classes-1.0.6"; - src = fetchFromGitHub { - owner = "math-classes"; - repo = "math-classes"; - rev = "751e63b260bd2f78b280f2566c08a18034bd40b3"; - sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + src = fetchurl { + url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz; + sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02"; }; + # src = fetchFromGitHub { + # owner = "math-classes"; + # repo = "math-classes"; + # rev = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c"; + # sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + # }; + buildInputs = [ coq ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; @@ -17,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://math-classes.github.io; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2833d5c4b872..8fa2cbcf713f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -274,7 +274,6 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw camfort = dontCheck super.camfort; - cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw cjk = dontCheck super.cjk; CLI = dontCheck super.CLI; # Upstream has no issue tracker. command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw @@ -376,7 +375,6 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; - symengine = dontCheck super.symengine; tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; @@ -876,4 +874,7 @@ self: super: { # Needs a newer version of hsyslog than lts-8.x provides. logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; }; + # Has a dependency on outdated versions of directory. + cautious-file = doJailbreak (dontCheck super.cautious-file); + } diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index add21c15a2d6..0c3c0304a9b4 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.0-rc.1"; - sha256 = "1aqbhyzwjqg57f99kwqzxkk4gjaqgwb7nmgpgdp7psa0ly742i9q"; + version = "1.5.0-rc.2"; + sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 74203eca3807..0ea1bf19231f 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, callPackage, fetchurl, makeWrapper, jre }: -stdenv.mkDerivation rec { +let +# The version number here is whatever is reported by the RUBY_VERSION string +rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; +jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; version = "9.1.12.0"; @@ -18,16 +21,42 @@ stdenv.mkDerivation rec { rm $out/bin/*.{bat,dll,exe,sh} mv $out/COPYING $out/LICENSE* $out/docs - for i in $out/bin/*; do + for i in $out/bin/jruby{,.bash}; do wrapProgram $i \ --set JAVA_HOME ${jre} done + + ln -s $out/bin/jruby $out/bin/ruby + + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook <<EOF + addGemPath() { + addToSearchPath GEM_PATH \$1/${passthru.gemPath} + } + + envHooks+=(addGemPath) + EOF ''; + passthru = rec { + rubyEngine = "jruby"; + gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}"; + libPath = "lib/${rubyEngine}/${rubyVersion.libDir}"; + }; + meta = { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; platforms = stdenv.lib.platforms.unix; }; -} +}; +in jruby.overrideAttrs (oldAttrs: { + passthru = oldAttrs.passthru // { + devEnv = callPackage ../ruby/dev.nix { + ruby = jruby; + }; + }; +}) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 9bc714c5538b..42988e334b07 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.2"; + version = "6.4.3"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73"; + sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index d5a601f09ba0..514c73f5e0fc 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -12,9 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openblasCompat superlu hdf5 ]; - cmakeFlags = [ "-DDETECT_HDF5=ON" ]; + cmakeFlags = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in [ + "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}" + "-DDETECT_HDF5=ON" + ]; - patches = [ ./use-unix-config-on-OS-X.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 482cf9fdfadd..025e11e0755b 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.12.0"; + name = "c-ares-1.13.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; + sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 07f323699b1b..3d6d1c22605b 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext kerberos ] + ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isFreeBSD autoreconfHook ++ lib.optional stdenv.isLinux pam ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -29,12 +30,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-openssl=${openssl.dev}" - ]; + ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"; # Set this variable at build-time to make sure $out can be evaluated. preConfigure = '' configureFlagsArray=( --with-plugindir=$out/lib/sasl2 - --with-configdir=$out/lib/sasl2 --with-saslauthd=/run/saslauthd --enable-login ) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 89abd93180d9..07efe42b99db 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchurl, unzip, m4, bison, flex, openssl, zlib }: +{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: -stdenv.mkDerivation rec { +let + majorVersion = "2.8"; + +in stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.42"; + version = "${majorVersion}.49"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; - sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7"; + url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; + sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj"; }; - buildInputs = [ unzip m4 bison flex openssl zlib ]; + buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ autoreconfHook bison flex m4 unzip ]; + # Parallel building doesn't work as of 2.8.49 + enableParallelBuilding = false; + + # Future versions of automake require subdir-objects if the source is structured this way + # As of 2.8.49 (maybe earlier) this is needed to silence warnings + prePatch = '' + substituteInPlace configure.ac \ + --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' + ''; meta = with stdenv.lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; @@ -27,6 +40,6 @@ stdenv.mkDerivation rec { # restrictions) license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 09b829695c4c..cc6f5205d92a 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.95"; + version = "0.7.97"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23"; + sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix deleted file mode 100644 index c5642635b0f0..000000000000 --- a/pkgs/development/libraries/libressl/2.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.4.5"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix deleted file mode 100644 index 6ab072486553..000000000000 --- a/pkgs/development/libraries/libressl/2.5.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.5.4"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix new file mode 100644 index 000000000000..4ce1b664725a --- /dev/null +++ b/pkgs/development/libraries/libressl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +let + + generic = { version, sha256 }: stdenv.mkDerivation rec { + name = "libressl-${version}"; + inherit version; + + src = fetchurl { + url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + inherit sha256; + }; + + enableParallelBuilding = true; + + outputs = [ "bin" "dev" "out" "man" ]; + + dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong + + meta = with stdenv.lib; { + description = "Free TLS/SSL implementation"; + homepage = "http://www.libressl.org"; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + }; + }; + +in { + + libressl_2_5 = generic { + version = "2.5.5"; + sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"; + }; + + libressl_2_6 = generic { + version = "2.6.0"; + sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4"; + }; +} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9c11081843c7..805a4c0b63db 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.1.0"; + version = "3.5.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq"; + sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9"; }; patches = [ ./build-on-bsd.patch ]; @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { "--with-virtualport" "--with-init-script=systemd+redhat" "--with-storage-disk" + ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 5bb3f79f790e..ab473bbe85c1 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.34"; + version = "0.4.35"; name = "libzen-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3"; + sha256 = "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 9f9b6aa44829..b4ec850b491a 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -2,33 +2,18 @@ stdenv.mkDerivation rec { name = "lucene++-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "https://github.com/luceneplusplus/LucenePlusPlus/" + "archive/rel_${version}.tar.gz"; - sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y"; + sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc"; }; - patches = let - baseurl = "https://github.com/luceneplusplus/LucenePlusPlus"; - in [ - (fetchpatch { - url = "${baseurl}/pull/62.diff"; - sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw"; - }) - (fetchpatch { - url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff"; - sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz"; - }) - ]; - postPatch = '' sed -i -e '/Subversion *REQUIRED/d' \ -e '/include.*CMakeExternal/d' \ CMakeLists.txt - # not using -f because we want it to fail for the next release - rm CMakeExternal.txt ''; cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e07583fccb5b..e568e1597972 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, lhapdf, root, yoda }: +{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { name = "fastnlo_toolkit-${version}"; - version = "2.3.1pre-2212"; + version = "2.3.1pre-2402"; src = fetchurl { url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; - sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp"; + sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; - buildInputs = [ boost lhapdf root yoda ]; + buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ]; + propagatedBuildInputs = [ zlib ]; - CXXFLAGS="-std=c++11"; # for yoda + preConfigure = '' + substituteInPlace ./fastnlotoolkit/Makefile.in \ + --replace "-fext-numeric-literals" "" + ''; configureFlags = [ "--with-yoda=${yoda}" diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 737565d298e0..407be5c5e4a4 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.0.4"; + version = "7.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; + sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; }; - patches = [ - # Otherwise it causes an error - # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_ - (fetchpatch { - url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw"; - sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83"; - }) - ]; - nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] # There is a bug that requires for MMHT PDF's to be presend during the build ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); - preConfigure = '' - # needed for the patch above - autoreconf -i + postPatch = '' + patchShebangs ./cat_with_cpplines ''; configureFlags = [ diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 90a6d17f09aa..1a203172d2c8 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, boost, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.1.6"; + version = "6.2.0"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2"; + sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; }; - buildInputs = [ boost python2 ]; - - patches = [ ./distutils-c++.patch ]; - - configureFlags = "--with-boost=${boost.dev}"; + buildInputs = [ python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch deleted file mode 100644 index 822c3e382724..000000000000 --- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/wrappers/python/Makefile.am -+++ b/wrappers/python/Makefile.am -@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES) - - if WITH_PYTHON - --PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - - ## Always force setup.py, it's not good at guessing what needs to rebuild - all-local: fix-out-of-source -diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in -index 925460c..fdc8888 100644 ---- a/wrappers/python/Makefile.in -+++ b/wrappers/python/Makefile.in -@@ -266,7 +266,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd - FIXSOURCES = $(EXTRA_DIST) --@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index b0ced3b24e0c..a8518d340b76 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,7 +2,7 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/" +BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do echo -n " \"${pdf_set%.tar.gz}\" = \"" diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index c2a0babb4d5b..b0f831f11dab 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz"; inherit sha256; }; @@ -21,8 +21,26 @@ let }; in stdenv.lib.mapAttrs mkPdfSet { - "ATLAS-epWZ12-EIG" = "01nj0zn19sk2ir4fk1202jsz457yrpqrsm99gn60a6rbamjybk73"; - "ATLAS-epWZ12-VAR" = "13kra15c5ahjldprdvp343c7gd875g8hca7r1bx9ccz6nffxram6"; + "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; + "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; + "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; + "ABMP16_3_nnlo" = "0bwirm3wqyjj6i3asya7kjmmjhqi69l1rnc6gnq7v136ajmv96y0"; + "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca"; + "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0"; + "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8"; + "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9"; + "ABMP16als114_5_nnlo" = "1gd41d8ay8i8m35qfqsm96jcv8vx6hpdsrdzsj415f4zpw5j29fm"; + "ABMP16als115_5_nnlo" = "0i70z8i0qgzr875szdh8sa6x3xcdkvrfsba97a6ha7b6km4p1yjk"; + "ABMP16als116_5_nnlo" = "11rph6vmmvvsi8msfp2agb7747n7xjgxb7z766i5jkvnggbmz75m"; + "ABMP16als117_5_nnlo" = "1sz9hy2m983aiwyssg60v4kq1zvz4xxvbzrgsdik1qv13bj4wx9w"; + "ABMP16als118_5_nnlo" = "1slvr5ygwwryk63mah45xp5x31qwrf0gkrnh4p9fvl4rdkji6z0z"; + "ABMP16als119_5_nnlo" = "1iqs1bi8r22awflf698cj39q8s2w86fwvdfgqb6sr8csm36ih6qp"; + "ABMP16als120_5_nnlo" = "051bqfyh2017vnvlisvkm1ik6x7n829p8205f5algsw7wi1s7b9v"; + "ATLAS-epWZ12-EIG" = "010ddmyfrmscgd1xdjsxsjc773jlvbh3s6mjbwk9zd298i3bf4kx"; + "ATLAS-epWZ12-VAR" = "1r9ip8549dzhs02skm8v00g6nsh7q1rwd3syz3bd6cl4sqhs0k37"; + "ATLAS-epWZ16-EIG" = "0b1zzp8p0kh4xjn76nm6waqlvdpqvnwyqsnnqdp2n7b9r9ssryyf"; + "ATLAS-epWZ16-THEO" = "0b0wqa203b2x159y54xhf9yh34lkchp48vp9693k51g9aznx8gjm"; + "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b"; "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag"; "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v"; "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9"; @@ -99,6 +117,10 @@ in "CT10wnlo_as_0127" = "1svmgs55kg74rifjyns38lggv1c18mzmpmvsv116rrllklb19pfp"; "CT10wnlo_nf3" = "1m13if0d9xijq695x41snpwwrsgs5a0jvil6j2ww8cspc33d7vr3"; "CT10wnlo_nf4" = "1b9lz23rn2w7fqwxxgf6fcg620ac58dnb1ssj3ml3vfn7z88yx43"; + "CT14MC1nlo" = "0z82q7xr9agq8iyw7w2rcclh27mry5snn5jswn3cxpgnalls50rx"; + "CT14MC1nnlo" = "0fj6hjdv82fp4iv7iyk9gna7sksnpkgqx0bsrl2wjbigm4ys031g"; + "CT14MC2nlo" = "1x6a6js1jpvkykagz6w3klh6hb2wf56r3kh65i6qlnzak4m7b8sq"; + "CT14MC2nnlo" = "0hbdz8agjm16mm51hclpl2nsa5ji88zpqdsn682xgihq64kahsnb"; "CT14llo" = "0sz2ni8xcjjg8034qjrhb77ak1akzlf5fwq00qs9c196lk5b2x7s"; "CT14llo_NF3" = "07zzs3jprh0haqx5bcsii213m99m2nh9vki76d9cbhicyzx23pc1"; "CT14llo_NF4" = "0bxkw5qms6dpab0zf1hhd8dllrjip2izbv23aqpg72d5rqxb6ny4"; @@ -146,6 +168,20 @@ in "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0"; "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k"; "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7"; + "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg"; + "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8"; + "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i"; + "EPPS16nlo_CT14nlo_Be9" = "0zxsdmvz919ajwwb917613byshhpr876jcg9kik0pkz8c4ddr2z0"; + "EPPS16nlo_CT14nlo_C12" = "0mjmjk9n36aikhm8i6zwzfszyb5zcy1syn13vs2rm12x535j6dm5"; + "EPPS16nlo_CT14nlo_Ca40" = "18vd67splj75sjijfvhyq0q6068yr8l083sczamwpmy8z3l798ih"; + "EPPS16nlo_CT14nlo_Cu64" = "0g64gpc5cssmwl1sn7cl0ramsg2zfq7snr9bzr41q2dznbvqahgd"; + "EPPS16nlo_CT14nlo_Fe56" = "0dxfzpx99ha9g27bxx6xzxxh87va91qqwq6hnz1qsligjfx7q4yz"; + "EPPS16nlo_CT14nlo_He4" = "1ln5kz3270kyx6m3ji6q5xyp5a23f3kbwh9z9dmdwwsw7q9n8way"; + "EPPS16nlo_CT14nlo_Li6" = "04rviiml0rnym9qppsczcydw37r923ljx8hj63vv6dxng0g617qb"; + "EPPS16nlo_CT14nlo_Pb208" = "1b2zibpigdvvkg29zh7zm32jpdr2prm35jasafh17pfpwlfc55mb"; + "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc"; + "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k"; + "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7"; "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf"; "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p"; "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2"; @@ -213,7 +249,7 @@ in "HERAPDF20_NNLO_ALPHAS_115" = "0nlimqmfhx2ijx48ylciih5diwlsb5zzkli82rgnnxci3r4ycjq4"; "HERAPDF20_NNLO_ALPHAS_116" = "0nr8svx60zrf42nxg74v0h759y9lwg54892xpdmswg7mw0nwcrm9"; "HERAPDF20_NNLO_ALPHAS_117" = "0xiqdr2r5dyyp5q56b3w04wy3raqrh1mjsv1fm05xswxn2xwyhlq"; - "HERAPDF20_NNLO_ALPHAS_118" = ""; + "HERAPDF20_NNLO_ALPHAS_118" = "0d0w0f077g11s4clx1556y9xx5nn1dgm8zcp0bk92v4lapngf33c"; "HERAPDF20_NNLO_ALPHAS_119" = "1w9nl0pnfc1cii4knmqdq4cnh6shhhgj8pg4a42bx20lvqc3aqgb"; "HERAPDF20_NNLO_ALPHAS_120" = "1lksn0rcxq2scwpnps8dawlzijhvwbg0pn2is4r29igbqck2jvb3"; "HERAPDF20_NNLO_ALPHAS_121" = "03d58rbibvgcvmsw86q3030qnw5nnvq8p6diqscd9srb8br06p8m"; @@ -234,7 +270,7 @@ in "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; - "LUXqed_plus_PDF4LHC15_nnlo_100" = "009wb1ibh4yfbqh5fsznc2g9g50rl6g0pq0x9qf7iiq2vd40rzsz"; + "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16"; "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj"; "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg"; @@ -341,6 +377,33 @@ in "MSTW2008nnlo_mcrange_fixasmz" = "05c8z2q2866550clx2mwb1jvhpn0agkyg82vvrswi3h4hgkvlfjx"; "MSTW2008nnlo_mcrange_fixasmz_nf3" = "0r86xsl1wfphwdj2hhlilkwc2949m7bcn42dms14g7w45i24g6id"; "MSTW2008nnlo_mcrange_nf3" = "1c9lsggncwghvw9mgd18h50ljrnlpp1p5r2zlzf8z3g8i4f3aaih"; + "NNFF10_KAm_lo" = "19wn44svz61lhk33kzc6id18w6qbkw4bfnwncar19phrjjp965v6"; + "NNFF10_KAm_nlo" = "191db9pj5yspiqc7598r147j9wvfc4s6cm0q805m5vmzpfg2cgr6"; + "NNFF10_KAm_nnlo" = "1hm8vhk1p31zdn72bgcyyq0w5qii1ba0cf81wjlbhwv4fadfd4sy"; + "NNFF10_KAp_lo" = "13yas11c7xxij45zrd3r6njjvx33kn9lg8i28ki0y4nw6ss21w3b"; + "NNFF10_KAp_nlo" = "1jza83klbcb3j2pcg2xhgj2imh4llb6hsfkbfj294q0isqypgzsv"; + "NNFF10_KAp_nnlo" = "0xwl34a31ajxwlgx6bhzzyf9b2xiq7bpv51p4zi6k1xihs91vwzc"; + "NNFF10_KAsum_lo" = "128cj81qp09hn99dnkm9q06wf2dr7xjq9qmwvrmdizrd8cwfa4l1"; + "NNFF10_KAsum_nlo" = "19pglfl1i5qg8sj3hg0qnhr1f66isfbrv7f901hnxniibbdjxib2"; + "NNFF10_KAsum_nnlo" = "1769ybc49a94appmiw0bbn3kkvcpw82sggxgvvda5jq9m36m9yzb"; + "NNFF10_PIm_lo" = "095xl0cs6p5z44hydfa963ylxvzqxdwwj1n8jn7n0c48rwssx357"; + "NNFF10_PIm_nlo" = "1fn8863092fn4aqacprbsdxlgz27q6pam08pccwq9ps0dwjn7cc5"; + "NNFF10_PIm_nnlo" = "0j4p50k821pphy8i6s73h3c29d7jb3bp5s4l8rl3bfb0nfx4p6hq"; + "NNFF10_PIp_lo" = "0hhw2ympx1a8d3sl953k27yzww0j2f5m9b865gv1ybb3l9ccv1i6"; + "NNFF10_PIp_nlo" = "18k3s7i1xvh8717n5cdllbb6zs8svh2bkw0k2zf4ql5ijiypvc10"; + "NNFF10_PIp_nnlo" = "16mywhpc3439dpk2c1i6gxrv9khyyg0kl4gsc41qyi3r4d7k6n2c"; + "NNFF10_PIsum_lo" = "1yh3hxfmgzgpwqidmzlc189syjbsj4vyswc4kch7yykxw4dqf6sa"; + "NNFF10_PIsum_nlo" = "12rgg0nc9rjvwfpf0y9kl1w9814a4pv4b17p46h8qm6kfyqqwjia"; + "NNFF10_PIsum_nnlo" = "19iz4q31apgm2il9478c7zmmc6kgz2wyp84qja761jvyl6z0img5"; + "NNFF10_PRm_lo" = "0c5pavhf5flx2nmld2dprgp1lsbvsrjw5mqdzvgkks7ibvq0ap5j"; + "NNFF10_PRm_nlo" = "0nfwhp9hacnm95w2qa5hvmfwaj7drc0w7lxqw1lrdp074bpd0ma3"; + "NNFF10_PRm_nnlo" = "084dz4xxmydf71vkhcrmj03jkwyj56jxvmbzm22mdh2dxmkz3l1g"; + "NNFF10_PRp_lo" = "014m0vjzrr4rbi84qxzmrym07kc4wax29fs66mfxkmrimxpb9l21"; + "NNFF10_PRp_nlo" = "0lrzw2618kgk7vsksbr1qxqc4h9lza573bz6208hwdgkmh7awasc"; + "NNFF10_PRp_nnlo" = "0bv07hh5rxvqw58jcam3piiiy19w325nrwivrifyv5wii8sybz8r"; + "NNFF10_PRsum_lo" = "1a9m77rl49wzzgdkr6x618bzcm2p50f915bbggknx5xjw550dqd1"; + "NNFF10_PRsum_nlo" = "1qambqywda7lvvkd6kx2r1g60v6lnqcamdd51396id33fvw3k45h"; + "NNFF10_PRsum_nnlo" = "1kijaxw6v1w33q6l89raz7ic59zcmd3nx5djp83lyg134a15crmw"; "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v"; "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv"; "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4"; @@ -465,7 +528,7 @@ in "NNPDF30_nlo_as_0118_atlas" = "034h2wgakbm3mx70034nwb44ii38rca7xv3az3fhcnjbpg9vnf0p"; "NNPDF30_nlo_as_0118_cms" = "08g9315fpc4khwfjf76vvyqa9nannvwq0bpc42f9f7yc0pck71qa"; "NNPDF30_nlo_as_0118_cons" = "1lw0fhy9gwk3zr7vq7qh9p6zprbyd4faln3npnxs2snncic1mnz6"; - "NNPDF30_nlo_as_0118_hera" = "0ndgfpxl9mrf1fk6w5q9ag3qm9rr4q3jkymfnr4frkmzcdxjnvzn"; + "NNPDF30_nlo_as_0118_hera" = "1833gd9h3gg75hblxf5qh5hp61k7n9vavb91ll9lbqmcbfr34aas"; "NNPDF30_nlo_as_0118_hera_1000" = "0lljb96d3q25yw3fz3cbk2in90q6srpc4alkz95nyrvgp25xgbgy"; "NNPDF30_nlo_as_0118_hessian" = "0h8d2zc02ccr1rmlsf4xd5a41irbs9q9wx68caj2xy0i7qr8rsmp"; "NNPDF30_nlo_as_0118_mc" = "12nnyzh2f6mv4gq4x4b8nlqx34lbj5y2y60zivfdbcpyg2spj5y8"; @@ -510,7 +573,7 @@ in "NNPDF30_nnlo_as_0118_atlas" = "013jm6f2hnmzc2di7spf6zp31fwhm6c9sddwql36hww63w8sys71"; "NNPDF30_nnlo_as_0118_cms" = "1w0ax68rg5877s35zlg13c451fcz2rij4adzwhz4yf4skkbgflng"; "NNPDF30_nnlo_as_0118_cons" = "1qniswwj6cmcs7bm4n11jx2disqcwszl08cb7im824nvrcjka2pg"; - "NNPDF30_nnlo_as_0118_hera" = "07k4wlfd63zmhnxq06avdpfrgfnc2ziqhsgyy3w4lvara9i27il0"; + "NNPDF30_nnlo_as_0118_hera" = "05j5yrra93dxh1nah19hszd0q3pj4zfica8a7vm5akbfn02rccj6"; "NNPDF30_nnlo_as_0118_hera_1000" = "0ssiw9fk5fqwg77rbycrxrclldws35n6gj4a4sj6d9yc87vz1g7z"; "NNPDF30_nnlo_as_0118_hessian" = "1hb32bamwlx5il8g2sf5gy6xjr7r4rky7xgvdhf5ndq7v3n1ncx1"; "NNPDF30_nnlo_as_0118_mc" = "1gxl4c5z2vh382y8l2kpr8vy4fqvbxvrw6xjc6dp229ak89cd6c2"; @@ -536,6 +599,72 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; + "NNPDF31_lo_as_0118" = "0xdxn21k08vrb1pdpafkb7cqrjq7z08ydmbxplgl9dyn4mcqk4jg"; + "NNPDF31_lo_as_0130" = "0xkljqnkrq542vjxapnzx5ba5m6ixyqqkfdcn73m576zlkslx0md"; + "NNPDF31_lo_pch_as_0118" = "1y6nidprll6as4ygpvxld71b9ksn5mjci3dc6cjamijarcdpgpsq"; + "NNPDF31_lo_pch_as_0130" = "0lbb7906lx7fxj346h7apdmhi85biaknh8vzkf8z11mh1dy7hm3w"; + "NNPDF31_nlo_as_0116" = "00qlx5xdl0g99hb0vycpmflbsw73i952w1qpf84hraqd9xs9wq0w"; + "NNPDF31_nlo_as_0118" = "01jsfvd3bl0lca93hwlm5lngarlgkn8nmj048yj3qjj5vs98w7rx"; + "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; + "NNPDF31_nlo_as_0118_C1p6" = "0xig1dyf9sr72c2daksy6wicgfj8gxnyjbvxz1w8f1m0ww0mlwkx"; + "NNPDF31_nlo_as_0118_hessian" = "11kc9waf3c28ncb4irwvpnlbp5p6bzs6l9hfkix6v9c4z5d804rq"; + "NNPDF31_nlo_as_0118_mc" = "0xjrv6p4qanvx7l44cggj4jc29pnnf3lrnsa7sijzfardwsp60az"; + "NNPDF31_nlo_as_0118_nf_4" = "0ciasq6r5j424b1qgz6z4s1s9zycj8z9syws9cjc6c65warjcca7"; + "NNPDF31_nlo_as_0118_nf_6" = "0li61z1c83cjxgnsqp5hnd272w5wljj06ad73w1jmxv8jplb1l2m"; + "NNPDF31_nlo_as_0120" = "18b3acwhykwacf4av0a5cn77d0wvwxbjljh96nxmj0pdg8rs2v9s"; + "NNPDF31_nlo_hessian_pdfas" = "0yffdh37sxxfhaylg5rczyggx2313h4wzhig4j37nby35cj13dmr"; + "NNPDF31_nlo_pch_as_0116" = "04wl2n4iil8svxk6k970dc2c0gpbyvw23lvl5w522imahrc0kmph"; + "NNPDF31_nlo_pch_as_0118" = "0hcaaxd01769pvjqp92wqch6hqlnf3wddik13gp3rr9rcg8rf31l"; + "NNPDF31_nlo_pch_as_0118_1000" = "1mnfyvlnwz0ga985nkn7px0b7mzai6jx74j8pyy8mdpjbgkmwpq6"; + "NNPDF31_nlo_pch_as_0118_hessian" = "13z0icvq1ryix0kg7p5c4569v4hiv2mins2b2ai88jf16rj99n4r"; + "NNPDF31_nlo_pch_as_0118_mc" = "1wg1wlzf8qi1h83y9aajglacvhs9zm68p9dvn4w6fmqrj0hppd3g"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "0xvqms66myq84bpszs04apfbc66i4jq2qdkkbp4cy3pq573bpvmr"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "0yylm6zbrm4j9lh05vmwxbkdn6b83zxbpj7s43ygi1bl7jnsxmnh"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "1j3a3blikmz36a8nraaak9ax6rykirx14lghvszs6zjnfxr44h5m"; + "NNPDF31_nlo_pch_as_0120" = "1hmzaar0ri15w37hagpn9jzq4kxs1231cwqn9zz2pr6a9rk99k8m"; + "NNPDF31_nlo_pch_hessian_pdfas" = "19fc6fyp4i761nl3f4vxrcy0rpgnhvaqh4w0sq44j1dfnsn0y4lr"; + "NNPDF31_nlo_pch_pdfas" = "1ql7j0xb49id82ab51ppphyrkag2m39jpsb3whna88bal3jh1710"; + "NNPDF31_nlo_pdfas" = "1xdzrwbfax9q492a63agx7a4jd4jp5r3pwgyyyqagvfxi4f1q17n"; + "NNPDF31_nnlo_as_0108" = "0gjwk058lbhmkmfmxkvxndnda10nih7zc711wp4c5gk70nhp1m6k"; + "NNPDF31_nnlo_as_0110" = "1lmi58ljspxs04zwx6bax6gf9221y1algrz7hjv63glc4j23q9h5"; + "NNPDF31_nnlo_as_0112" = "0qz79ljj9javl940bvpidiy9fqv91d53g1l9i2gbxd72rgr52h1w"; + "NNPDF31_nnlo_as_0114" = "1wjvwdl8mp36x5cqrgny15lnm696k5nxpwax0ry1win3gy7mb2kp"; + "NNPDF31_nnlo_as_0116" = "1zkxzdfgklpxy3bwvjlhpqq2s2g40q2f9wzibf9qb294c69wm886"; + "NNPDF31_nnlo_as_0117" = "1vwqqxwzx1cwy9ndr0aav6xxi4n18px6n0rsvwbrz0v4gsyr6mh1"; + "NNPDF31_nnlo_as_0118" = "0mi9ln96xy3pjifrjmw9mvgwlb81229spa9x1df084rpy8hab80f"; + "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; + "NNPDF31_nnlo_as_0118_collider" = "071ddwk53axsg7zdyf287nyqk3g3ayr95irp8kh8fsql3kvaw5hn"; + "NNPDF31_nnlo_as_0118_hessian" = "1g4cp3y54yn38c9kiljrqvq4201pikwd58sa4ngw0vbasp8hn612"; + "NNPDF31_nnlo_as_0118_mc" = "1x8ai1a8gv1if0l66596fwi4qdwla3aci27c23n5i60g83lf6hza"; + "NNPDF31_nnlo_as_0118_mc_138" = "0jbwmiqfcf36p5mbqp7gzvrr8s9k7a7wrkbhr8nymipr9yczd51h"; + "NNPDF31_nnlo_as_0118_mc_164" = "1myybl60kkdxaxlij9r3i3l090m4m4709g1dnp85k90vjryafwkc"; + "NNPDF31_nnlo_as_0118_nf_4" = "05hglnfv1d9gl4m34c2hwzf96pl39mihwly6sffq7dxsjdbr8yhw"; + "NNPDF31_nnlo_as_0118_nf_6" = "1bzfgcyphhpdizd307d91syg0xf0ki5cv0n9kij9a366ixf3m14z"; + "NNPDF31_nnlo_as_0118_noLHC" = "0ibvp81ys8dajhxbv7cjdsybvgs258yh45a99xskm3jknzg90a36"; + "NNPDF31_nnlo_as_0118_noZpt" = "0xszskydvzaw7ipyzslirimfys9vnm3nsyrimb8kzcnwnhviq7p7"; + "NNPDF31_nnlo_as_0118_nojets" = "0kci82bxd8njgb6w9zr7mcy8sswg6ldfvs0jclqm09yjl05nl3p2"; + "NNPDF31_nnlo_as_0118_notop" = "15wl949pdmfp3ikxkzcaqgqqmifs6d81z2smxg4m7hq1hg56y5lf"; + "NNPDF31_nnlo_as_0118_proton" = "1gx94jhavk9fvs0klqnkq152b23mvd2y68jpvfzhg7jvcl10fqal"; + "NNPDF31_nnlo_as_0118_wEMC" = "1z3yv8i7yb2ng1ap3qqy5qxkkq7ds19dzp76qrivrcfqh0ymdq8m"; + "NNPDF31_nnlo_as_0119" = "1c4ymkshqp70713p6n9kjmrqr1pjsb1gjw20pmy47azr0a6pcryy"; + "NNPDF31_nnlo_as_0120" = "12bgvx6kk5bw30ng81b6hcqdqn2vi3zc60xn21z6nv1995ky44mm"; + "NNPDF31_nnlo_as_0122" = "0kmaxwxrk5yrrj00z8fkl4y7n08yrx1159zp6p450vcnwx512p10"; + "NNPDF31_nnlo_as_0124" = "01gxfwsxqvng8d6kbmz6jq05l00d2gw4snjmcsj76lk9xcmkjmwi"; + "NNPDF31_nnlo_hessian_pdfas" = "1dd4yzh5vhr11qh5w1wfb1ppda4sk9f78h781p1ds165qsw2vcqj"; + "NNPDF31_nnlo_pch_as_0116" = "0zaigf1dhcidlqyyffjq193p1xcc94dbkqjfppmpdzwd4q283ydz"; + "NNPDF31_nnlo_pch_as_0118" = "0x2s5v0p7k3a3v01wr8rvp2al0x4l2bx9wwmvfjcm4k2f2m011s5"; + "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "15wb8yap14mqbawbifgl57dkn8iwvby7pkn0yvrb0rrpgyivgxhr"; + "NNPDF31_nnlo_pch_as_0118_mc" = "0f2ymg5sd78531pxyvprqaw1dg9sbys5di46zjz1qycs8r3kcznm"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "0mzwhsp3xid0s32cpzq5z6vq7w90v3xr5nfdvhgbpqvl992gxbvb"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "13a4wsn2pv5w7847asjk30nzm9kcscsxcnjx4ygzdvk9938z7rxb"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "07v7n9yxbnmnyxngncfiy9v1k2njsy1bqvzchjqpzd9l3w751dpk"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "0lsa5zjyg0qx23fjx6lyi0bwkq7did4lbxwbi3d5gibnrr917lnq"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "0drb8ylkfs18sc5k3ynwrydwgcyv55f7la2m6cl412gbrwkbhina"; + "NNPDF31_nnlo_pch_as_0120" = "0ckflm3s97c9vgf5klnscf51dyhqcjsm83a7kqxq4085q1rwwixj"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "010yzzhqay4mkyn5had3sdrfwd9qfm65y6w0riiamdcx561mwjcv"; + "NNPDF31_nnlo_pch_pdfas" = "1yp113p6kzqw8cizxawgnhmkz6xw27mqi76jy417c9lvmy4mq43p"; + "NNPDF31_nnlo_pdfas" = "0ixj0bmwv1hjg2kvmpyd8r2jykh7a5ng1d469wd3amqkc4ww9kcq"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; @@ -567,10 +696,10 @@ in "abm11_5n_as_nnlo" = "0091vwjkc686d1dnfn2dpa7jb56p8gli2z687fpx5f8yhjzpbh80"; "abm11_5n_nlo" = "1bpf37mg5wgcf1id2am98l5mj162xrnb8k16ppfx3qxlakp0iabl"; "abm11_5n_nnlo" = "1mpk322mqs078pk2nxxk8fa29ka6cxzsf65ffiny38678djmfqd2"; - "abm12lhc_3_nnlo" = "0hwgspbp6dpw5lz211i0vjgg45hag7zr3djfdk16gkr86sra7ba6"; - "abm12lhc_4_nnlo" = "161qdm0axsqhg6lizx0h4kdg714kl2d6mb8y7wrvanr0v0db9zkl"; - "abm12lhc_5_nnlo" = "0vshq0fx5nigzdf0vryr2v4kggc37byalzfjswm70l3nnjhxp6xs"; - "cteq6" = "0wk6fmajvbdh8wmx1wmyd9n53m82vvh2gj4iric4b4ig9ssmbjx9"; + "abm12lhc_3_nnlo" = "09k90vhjq7p0i0aaq2697pq2dc86bkmnv4q8zyqxjp3wnqx1v95f"; + "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; + "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; + "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index f68c2ea877d5..454c868dfcd2 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr"; + sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp"; }; postPatch = "patchShebangs ./src/Analyses/cat_with_lines"; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 1216c34cdb8e..7989eb518c78 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5"; + sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index e6d0f3c500ea..dd1b33056468 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,26 +2,15 @@ stdenv.mkDerivation rec { name = "yoda-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "088xx4q6b03bnj6xg5189m8wsznhal8aj3jk40sbj24idm4jl5yg"; + sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra"; }; pythonPath = []; # python wrapper support - patches = [ - (fetchpatch { - url = "https://yoda.hepforge.org/hg/yoda/rev/3dbc8927e715?style=raw"; - sha256 = "02rm34z9lbab66p7gpij12qwdph5fddpksg80qz0m537wjwy2ddy"; - }) - (fetchpatch { - url = "https://yoda.hepforge.org/hg/yoda/rev/669c2be582ef?style=raw"; - sha256 = "0s705cl3bazpvpvy46vv1k223knwxq2yy5na1c6lv217sq9w86wj"; - }) - ]; - buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] ++ stdenv.lib.optional withRootSupport root; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 856c7bac8ce1..e8edee3ba183 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -10,8 +10,8 @@ }: let # beware: updates often break cups-filters build - version = "0.50.0"; - sha256 = "0dmwnh59m75vhii6dw63x8l0qa0ha733pb8bdqzr7lw9nwc37jf9"; + version = "0.56.0"; + sha256 = "0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 55647713e6ee..06550372ba8a 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://elastix.isi.uu.nl/; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 1d19b4417404..0f1f87b9bd64 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "v${version}"; - sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw"; + rev = "v${version}-stable"; + sha256 = "0s4s9adni2q1sgqpavbmxhkl8i98bmlw6gla6dnifgsm1dirv75w"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix new file mode 100644 index 000000000000..9558febec735 --- /dev/null +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, python, openssl }: + +buildPythonPackage rec { + pname = "acme-tiny"; + version = "2016-03-26"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; + rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971"; + repo = "acme-tiny"; + owner = "diafygi"; + }; + + # source doesn't have any python "packaging" as such + configurePhase = " "; + buildPhase = " "; + # the tests are... complex + doCheck = false; + + patchPhase = '' + substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl" + ''; + + installPhase = '' + mkdir -p $out/${python.sitePackages}/ + cp acme_tiny.py $out/${python.sitePackages}/ + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny + chmod +x $out/bin/acme_tiny + ''; + + meta = with stdenv.lib; { + description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; + homepage = https://github.com/diafygi/acme-tiny; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix new file mode 100644 index 000000000000..064e5e6c11a3 --- /dev/null +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, nose, unittest2, docutils, blockdiag }: + +buildPythonPackage rec { + pname = "actdiag"; + version = "0.5.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # One test fails: + # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix new file mode 100644 index 000000000000..982e63882ad3 --- /dev/null +++ b/pkgs/development/python-modules/adal/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, pyjwt }: + +buildPythonPackage rec { + pname = "adal"; + version = "0.1.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09"; + }; + + propagatedBuildInputs = [ requests pyjwt ]; + + meta = with stdenv.lib; { + description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; + homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python; + license = licenses.mit; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix new file mode 100644 index 000000000000..4a2d4a0f7224 --- /dev/null +++ b/pkgs/development/python-modules/afew/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, isPy3k , dbacl, notmuch, chardet, subprocess32 }: + +buildPythonPackage rec { + pname = "afew"; + version = "git-2017-02-08"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; + }; + + buildInputs = [ dbacl ]; + + propagatedBuildInputs = [ + notmuch + chardet + ] ++ stdenv.lib.optional (!isPy3k) subprocess32; + + doCheck = false; + + preConfigure = '' + substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${dbacl}/bin/dbacl'" + ''; + + postInstall = '' + wrapProgram $out/bin/afew \ + --prefix LD_LIBRARY_PATH : ${notmuch}/lib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/teythoon/afew; + description = "An initial tagging script for notmuch mail"; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix new file mode 100644 index 000000000000..4265a7488f66 --- /dev/null +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, isPy33, isPy26, isPy27, isPyPy, python, pycares, asyncio, trollius }: + +buildPythonPackage rec { + pname = "aiodns"; + version = "1.0.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d"; + }; + + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional isPy33 asyncio + ++ optional (isPy26 || isPy27 || isPyPy) trollius; + + checkPhase = '' + ${python.interpreter} tests.py + ''; + + # 'Could not contact DNS servers' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/saghul/aiodns; + license = licenses.mit; + description = "Simple DNS resolver for asyncio"; + }; +} diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix new file mode 100644 index 000000000000..69bcaa1fc06e --- /dev/null +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pygments }: + +buildPythonPackage rec { + pname = "alabaster"; + version = "0.7.7"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71"; + }; + + propagatedBuildInputs = [ pygments ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bitprophet/alabaster; + description = "A Sphinx theme"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix new file mode 100644 index 000000000000..bc49e991b4fa --- /dev/null +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, dateutil }: + +buildPythonPackage rec { + pname = "aniso8601"; + version = "1.2.0"; + name = "${pname}-${version}"; + + meta = with stdenv.lib; { + description = "Parses ISO 8601 strings."; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = licenses.bsd3; + }; + + propagatedBuildInputs = [ dateutil ]; + + src = fetchPypi { + inherit pname version; + sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; + }; +} diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix new file mode 100644 index 000000000000..bc0701806544 --- /dev/null +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ansicolors"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/verigak/colors/"; + description = "ANSI colors for Python"; + license = licenses.isc; + maintainers = with maintainers; [ copumpkin ]; + }; +} diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix new file mode 100644 index 000000000000..a85987a95b16 --- /dev/null +++ b/pkgs/development/python-modules/arrow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, chai, simplejson +, dateutil }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "arrow"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + }; + + checkPhase = '' + nosetests --cover-package=arrow + ''; + + buildInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil ]; + + meta = with stdenv.lib; { + description = "Python library for date manipulation"; + license = "apache"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix new file mode 100644 index 000000000000..98ed980588e3 --- /dev/null +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.4"; + pname = "python-editor"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4"; + }; + + meta = with stdenv.lib; { + description = "A library that provides the `editor` module for programmatically"; + homepage = "https://github.com/fmoo/python-editor"; + }; +} diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix new file mode 100644 index 000000000000..28870d3db853 --- /dev/null +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-gnupg"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + }; + + propagatedBuildInputs = [ gnupg1 ]; + + # Let's make the library default to our gpg binary + patchPhase = '' + substituteInPlace gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'" + substituteInPlace test_gnupg.py \ + --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" + ''; + + meta = with stdenv.lib; { + description = "A wrapper for the Gnu Privacy Guard"; + homepage = https://pypi.python.org/pypi/python-gnupg; + license = licenses.bsd3; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix new file mode 100644 index 000000000000..93b67fe4782e --- /dev/null +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, udev }: + +buildPythonPackage rec { + pname = "python-uinput"; + version = "0.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; + }; + + buildInputs = [ udev ]; + + NIX_CFLAGS_LINK = [ "-ludev" ]; + + meta = with stdenv.lib; { + description = "Pythonic API to Linux uinput kernel module"; + homepage = "http://tjjr.fi/sw/python-uinput/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 37369b8f0bde..c8958f9dd1f0 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -14,6 +14,8 @@ buildPythonApplication rec { inherit pname version; sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; }; + # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise + # workaround: sudo chmod 777 /dev/shm checkPhase = '' py.test testcases ''; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix new file mode 100644 index 000000000000..aa90bf0ce1a6 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, zope_testrunner +}: + +buildPythonPackage rec { + pname = "ZConfig"; + version = "3.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; + }; + + patches = [ ./skip-broken-test.patch ]; + + propagatedBuildInputs = [ zope_testrunner ]; + + meta = with stdenv.lib; { + description = "Structured Configuration Library"; + homepage = http://pypi.python.org/pypi/ZConfig; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch new file mode 100644 index 000000000000..ee3fcff49036 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/skip-broken-test.patch @@ -0,0 +1,12 @@ +diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py +index 838cf7c..52daf4e 100644 +--- a/ZConfig/tests/test_schema2html.py ++++ b/ZConfig/tests/test_schema2html.py +@@ -74,6 +74,7 @@ else: + + class TestSchema2HTML(unittest.TestCase): + ++ @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)') + def test_no_schema(self): + self.assertRaises(SystemExit, + run_transform) diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix new file mode 100644 index 000000000000..bfde1f0a2151 --- /dev/null +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_event +}: + +buildPythonPackage rec { + pname = "zope.interface"; + version = "4.4.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0"; + }; + + propagatedBuildInputs = [ zope_event ]; + + meta = with stdenv.lib; { + description = "Zope.Interface"; + homepage = http://zope.org/Products/ZopeInterface; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix new file mode 100644 index 000000000000..fc1a3c4c9028 --- /dev/null +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, zope_interface +, zope_exceptions +, zope_testing +, six +, subunit +}: + + +buildPythonPackage rec { + pname = "zope.testrunner"; + version = "4.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0"; + extension = "zip"; + }; + + propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit; + + meta = with stdenv.lib; { + description = "A flexible test runner with layer support"; + homepage = http://pypi.python.org/pypi/zope.testrunner; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 0caa8b226f08..17f09724d189 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,8 +1,8 @@ -{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix, +{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, nix-prefetch-git }: buildRubyGem rec { - inherit ruby; + inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index ee36a9be43b2..1ce0ca161536 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, why3 }: +, ltl2ba, coq, alt-ergo, why3, autoconf +}: let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; @@ -8,12 +9,12 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20161101"; - slang = "Silicon"; + version = "20170501"; + slang = "Phosphorus"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh"; + sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; }; why2 = fetchurl { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoconf makeWrapper ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff index 7ab2b32de1e7..737cad0cda4f 100644 --- a/pkgs/development/tools/analysis/frama-c/dynamic.diff +++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff @@ -1,12 +1,12 @@ --- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200 -@@ -287,7 +287,8 @@ - (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ; - let pkgs = ref [] in - List.iter (scan_directory pkgs) !load_path ; -- let findlib_path = String.concat ":" !load_path in -+ let findlib_path = String.concat ":" (!load_path @ -+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in - Klog.debug ~dkey "setting findlib path to %s" findlib_path; - Findlib.init ~env_ocamlpath:findlib_path (); - load_packages (List.rev !pkgs) ; +@@ -270,7 +270,8 @@ + load_path := + List.fold_right (add_dir ~user:true) path + (List.fold_right (add_dir ~user:false) Config.plugin_dir []); +- let findlib_path = String.concat ":" !load_path in ++ let findlib_path = String.concat ":" (!load_path @ ++ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in + Klog.debug ~dkey "setting findlib path to %s" findlib_path; + Findlib.init ~env_ocamlpath:findlib_path () + diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix new file mode 100644 index 000000000000..eaae51f726bb --- /dev/null +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +with lib; + +buildGoPackage rec { + name = "ct-${version}"; + version = "0.4.1"; + + goPackagePath = "github.com/coreos/container-linux-config-transpiler"; + + src = fetchFromGitHub { + owner = "coreos"; + repo = "container-linux-config-transpiler"; + rev = "v${version}"; + sha256="1017xkinja30jcam8p1x2d9q4vkgkfn7gvkad004jkbbmd2216sa"; + }; + + buildFlagsArray = '' + -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} + ''; + + postInstall = '' + mv $bin/bin/{internal,ct} + rm $bin/bin/tools + ''; + + meta = { + description = "Convert a Container Linux Config into Ignition"; + license = licenses.asl20; + homepage = https://github.com/coreos/container-linux-config-transpiler; + maintainers = with maintainers; [elijahcaine]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 51bdf772adbb..a351c325ea24 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "FlameGraph-2017-05-11"; + name = "FlameGraph-2017-07-01"; src = fetchFromGitHub { owner = "brendangregg"; repo = "FlameGraph"; - rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247"; - sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2"; + rev = "a93d905911c07c96a73b35ddbcb5ddb2f39da4b6"; + sha256 = "07z2ffnab41dz833wwgr875vjccqyh0238357g7ml1yg5445x2jy"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 81707a6bfc3e..ed6c7d73fdbe 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2017-05-24"; + version = "git-2017-07-26"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "c1dcbcbcd3eadcc63adeac65d63497885b422a44"; - sha256 = "12xss8wgsqs2fghrfl4h6g5wli6wn274zmdsq5zdcib2m7da5yw2"; + rev = "800980d76f7a74f3cdfd76b3dff351d52d2c84ee"; + sha256 = "03y8b4iz5ly9vkjc551c1bxalg1vl4k2sic327s3vh00jmjgvhz6"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hvr/multi-ghc-travis"; license = licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 peti ]; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d1cb4a8cd2e1..b79d7e0670da 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin cp -p target/release/racer $out/bin/ - wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src" + wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 7aaa62fef590..166e3320d9c7 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -18,7 +18,7 @@ buildRustPackage rec { buildInputs = [ makeWrapper ]; - RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src''; + RUST_SRC_PATH = rustPlatform.rustcSrc; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index d32ea74cf7b4..3caec9a75c15 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,18 +4,18 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.4.7"; + version = "4.4.8"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0n7x9mvv6sww0h77k3d8rms78vah0j48ndsv4vnxq9znwjiglmva"; + sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1vwp8iqc5sk5kf7r86dld4767w4sm36hympnh1n2qza57ni7vy0g"; + sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1dwjysj3kjydz096bm5x0s1g3jm4a7y0qkgbsc6bwl44vxz81f66"; + sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg"; } ); diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 49da505e4392..593e9d1e5622 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.1.4"; + version = "8.2.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "00f38bif8f6ws6pcfpfy5cdvanry39l4wb2gzm39qx3rbx28cg58"; + sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; |