diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 37bc1e372acf..41b8a7d0b6c2 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,37 +1,31 @@ -{ lib, stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ lib, stdenv, fetchurl, ocamlPackages, zlib }: -stdenv.mkDerivation ({ - name = "mldonkey-3.1.6"; +stdenv.mkDerivation rec { + pname = "mldonkey"; + version = "3.1.7-2"; src = fetchurl { - url = "https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2"; - sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; + url = "https://ygrek.org/p/release/mldonkey/mldonkey-${version}.tar.bz2"; + sha256 = "b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794"; }; - preConfigure = lib.optionalString (ocamlPackages.camlp4 != null) '' + preConfigure = '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; - buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++ - (with ocamlPackages; [ ocaml camlp4 ]); - configureFlags = [ "--disable-gui" ]; + buildInputs = (with ocamlPackages; [ + ocaml + camlp4 + num + ]) ++ [ + zlib + ]; meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = "http://mldonkey.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} // (if !ocamlPackages.ocaml.nativeCompilers then -{ - # Byte code compilation (the ocaml opt compiler is not supported in some platforms) - buildPhase = "make mlnet.byte"; - installPhase = '' - mkdir -p $out/bin - cp mlnet.byte $out/bin/mlnet - ''; - - # ocaml bytecode selfcontained binaries loose the bytecode if stripped - dontStrip = true; -} else {})) +} diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 342e4225a3c2..8f2ef30d37cc 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,9 +3,10 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = if versions.range "8.7" "8.12" coq.coq-version + defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.1.2+coq${coq.coq-version}" else null; displayVersion = { paramcoq = "1.1.2"; }; + release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22"; release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; release."1.1.2+coq8.10".sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 0e8e402ab3b0..5334429fbbac 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.1"; - sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq"; + version = "23.3.2"; + sha256 = "eU3BmBJqrcg3FmkuAIfB3UoSNfQQfvGNyC2jBffwm/w="; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index ad53e7558350..13fd811c4ea8 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -192,7 +192,7 @@ let "--with-libxml-dir=${libxml2.dev}" ] ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional phpdbgSupport "--enable-phpdbg" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" # Misc flags diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 5a9bbd5a49db..1d8f35cd01c0 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.5.1"; + version = "4.5.7"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1mm3v01jz2mp8vajsl45s23gw90zafbgg3br5n5yz03aan08f395"; + sha256 = "sha256-JQ2HgFVqgO+LLXmN95ZTHyT+htCFUC3VRreKLwPYo9Y="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index db36ed38a953..5ff0dcd29e7e 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, autoconf, automake, libtool, texinfo, mpfr}: +{lib, stdenv, fetchurl, autoreconfHook, texinfo, mpfr}: stdenv.mkDerivation rec { pname = "mpfi"; version = "1.5.4"; @@ -12,13 +12,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ozk4WV1yCvF5c96vcnz8DdQcixbCCtwQOpcPSkOuOlY="; }; - nativeBuildInputs = [ autoconf automake libtool texinfo ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ mpfr ]; - preConfigure = '' - ./autogen.sh - ''; - meta = { inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 46b2748cad98..2df08426368d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.1.0"; + version = "4.1.1"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; + sha256 = "1nkwq123vvmggcay48snm9qqmrh0bdzpln0l1jnp26niidvplkz2"; }; postPatch = '' diff --git a/pkgs/development/tools/kgt/default.nix b/pkgs/development/tools/kgt/default.nix new file mode 100644 index 000000000000..94f72ceac10b --- /dev/null +++ b/pkgs/development/tools/kgt/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchFromGitHub, bmake, cleanPackaging }: + +stdenv.mkDerivation { + pname = "kgt"; + version = "2021-04-07"; + + src = fetchFromGitHub { + owner = "katef"; + repo = "kgt"; + # 2021-04-07, no version tags (yet) + rev = "a7cbc52d368e413a3f1212c0fafccc05b2a42606"; + sha256 = "1x6q30xb8ihxi26rzk3s2hqd827fim4l4wn3qq252ibrwcq6lqyj"; + fetchSubmodules = true; + }; + + outputs = [ "bin" "doc" "out" ]; + + nativeBuildInputs = [ bmake ]; + enableParallelBuilding = true; + + makeFlags = [ "-r" "PREFIX=$(bin)" ]; + + installPhase = '' + runHook preInstall + + ${cleanPackaging.commonFileActions { + docFiles = [ + "README.md" + "LICENCE" + "examples" + # TODO: this is just a docbook file, not a mangpage yet + # https://github.com/katef/kgt/issues/50 + "man" + "examples" + "doc" + ]; + noiseFiles = [ + "build/src" + "build/lib" + "Makefile" + "src/**/*.c" + "src/**/*.h" + "src/**/Makefile" + "src/**/lexer.lx" + "src/**/parser.sid" + "src/**/parser.act" + "share/git" + "share/css" + "share/xsl" + ".gitignore" + ".gitmodules" + ".gitattributes" + ".github" + ]; + }} $doc/share/doc/kgt + + install -Dm755 build/bin/kgt $bin/bin/kgt + rm build/bin/kgt + + runHook postInstall + ''; + + postFixup = '' + ${cleanPackaging.checkForRemainingFiles} + ''; + + meta = with lib; { + description = "BNF wrangling and railroad diagrams"; + longDescription = '' + KGT: Kate's Grammar Tool + + Input: Various BNF-like syntaxes + Output: Various BNF-like syntaxes, AST dumps, and Railroad Syntax Diagrams + ''; + homepage = "https://github.com/katef/kgt"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ Profpatsch ]; + }; + +} diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/misc/emulators/maiko/default.nix new file mode 100644 index 000000000000..e78b680d617a --- /dev/null +++ b/pkgs/misc/emulators/maiko/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: + +stdenv.mkDerivation rec { + pname = "maiko"; + version = "2021-04-14"; + src = fetchFromGitHub { + owner = "Interlisp"; + repo = "maiko"; + rev = "91fe7d51f9d607bcedde0e78e435ee188a8c84c0"; + hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 ]; + installPhase = '' + runHook preInstall + find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; + runHook postInstall + ''; + meta = with lib; { + description = "Medley Interlisp virtual machine"; + homepage = "https://interlisp.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry ]; + inherit (libX11.meta) platforms; + }; +} diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 062520a3d13e..38a4bd9cdf44 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -1,10 +1,13 @@ -{ callPackage, fetchhg, boringssl, ... } @ args: +{ callPackage +, fetchhg +, ... +} @ args: callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "47a43b011dec"; # branch=quic - sha256 = "1d4d1v4zbnf5qlfl79pi7sficn1h7zm6kk7llm24yyhlsvssz10x"; + rev = "12f18e0bca09"; # branch=quic + sha256 = "1lr6zlny26kamczgk8ddscmy5fp5mzxqcppwhjhvq1a029a0r4b7"; }; preConfigure = '' diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 7d2cb5c7ff2c..22278cb9a4d4 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, clangStdenv, fetchFromGitHub, opencl-headers, @@ -8,6 +9,7 @@ boost, makeWrapper, cudatoolkit, + cudaSupport, mesa, ethash, opencl-info, @@ -15,22 +17,22 @@ openssl, pkg-config, cli11 -}: +}@args: # Note that this requires clang < 9.0 to build, and currently # clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = clangStdenv; +let stdenv = if cudaSupport then clangStdenv else args.stdenv; in stdenv.mkDerivation rec { pname = "ethminer"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ethereum-mining"; repo = "ethminer"; rev = "v${version}"; - sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707"; + sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; fetchSubmodules = true; }; @@ -41,6 +43,8 @@ in stdenv.mkDerivation rec { "-DAPICORE=ON" "-DETHDBUS=OFF" "-DCMAKE_BUILD_TYPE=Release" + ] ++ lib.optionals (!cudaSupport) [ + "-DETHASHCUDA=OFF" # on by default ]; nativeBuildInputs = [ @@ -54,12 +58,13 @@ in stdenv.mkDerivation rec { boost opencl-headers mesa - cudatoolkit ethash opencl-info ocl-icd openssl jsoncpp + ] ++ lib.optionals cudaSupport [ + cudatoolkit ]; preConfigure = '' @@ -71,10 +76,11 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Ethereum miner with OpenCL, CUDA and stratum support"; + description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p ]; - license = licenses.gpl2; + maintainers = with maintainers; [ nand0p atemu ]; + license = licenses.gpl3Only; + broken = cudaSupport; }; } diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index f10c3f628b86..ca53a1956e0b 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, makeWrapper +}: stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.63"; + version = "1.0.64"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw="; + sha256 = "sha256-BwpMBPTWSrfmz7SHYa1+SZ79V2YZdIkZcOTLtlVlgr8="; }; nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3Packages; [ python psutil ]; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 472e7674672c..1f7a5f760acd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3485,7 +3485,9 @@ in ethash = callPackage ../development/libraries/ethash { }; - ethminer = callPackage ../tools/misc/ethminer { }; + ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; + ethminer-cuda = ethminer.override { cudaSupport = true; }; + ethminer-free = ethminer.override { cudaSupport = false; }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; @@ -24132,6 +24134,10 @@ in kexi = libsForQt514.callPackage ../applications/office/kexi { }; + kgt = callPackage ../development/tools/kgt { + inherit (skawarePackages) cleanPackaging; + }; + khronos = callPackage ../applications/office/khronos { }; keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; @@ -24613,7 +24619,7 @@ in mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; MMA = callPackage ../applications/audio/MMA { }; @@ -29983,6 +29989,8 @@ in loop = callPackage ../tools/misc/loop { }; + maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; };