diff options
Diffstat (limited to 'pkgs')
34 files changed, 361 insertions, 105 deletions
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix new file mode 100644 index 000000000000..e7e4744eea2f --- /dev/null +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "GxPlugins.lv2"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = pname; + rev = "v${version}"; + sha256 = "16r5bj7w726d9327flg530fn0bli4crkxjss7i56yhb1bsi39mbv"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + xorg.libX11 xproto cairo lv2 + ]; + + installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/brummer10/GxPlugins.lv2; + description = "A set of extra lv2 plugins from the guitarix project"; + maintainers = [ maintainers.magnetophon ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix new file mode 100644 index 000000000000..562fdc1be8b6 --- /dev/null +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: + +stdenv.mkDerivation rec { + name = "wolf-shaper-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "pdesaulniers"; + repo = "wolf-shaper"; + rev = "v${version}"; + sha256 = "01h5dm1nrr0i54ancwznr7wn4vpw08dw0b69v3axy32r5j7plw6s"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor ]; + + makeFlags = [ + "BUILD_LV2=true" + "BUILD_DSSI=true" + "BUILD_VST2=true" + "BUILD_JACK=true" + ]; + + patchPhase = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 + mkdir -p $out/lib/dssi + mkdir -p $out/lib/vst + mkdir -p $out/bin/ + cp -r bin/wolf-shaper.lv2 $out/lib/lv2/ + cp -r bin/wolf-shaper-dssi* $out/lib/dssi/ + cp -r bin/wolf-shaper-vst.so $out/lib/vst/ + cp -r bin/wolf-shaper $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://pdesaulniers.github.io/wolf-shaper/; + description = "Waveshaper plugin with spline-based graph editor"; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index bf9c7b7e129b..e97e22e4a9ef 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r"; }; betaVersion = { - version = "3.3.0.13"; # "Android Studio 3.3 Beta 1" - build = "182.5073496"; - sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px"; + version = "3.3.0.14"; # "Android Studio 3.3 Beta 2" + build = "182.5078385"; + sha256Hash = "10jw508fzxbknfl1l058ksnnli2nav91wmh2x2p0mz96lkf5bvhn"; }; latestVersion = { # canary & dev version = "3.4.0.1"; # "Android Studio 3.4 Canary 2" diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 072b66e55638..16c3a47431c9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -129,6 +129,7 @@ let kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; konquest = callPackage ./konquest.nix {}; + konqueror = callPackage ./konqueror.nix {}; korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix new file mode 100644 index 000000000000..e6442fea2f9d --- /dev/null +++ b/pkgs/applications/kde/konqueror.nix @@ -0,0 +1,20 @@ +{ lib +, mkDerivation +, extra-cmake-modules, kdoctools +, kdelibs4support, kcmutils, khtml, kdesu +, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland +}: + +mkDerivation { + name = "konqueror"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kdelibs4support kcmutils khtml kdesu + qtwebkit qtwebengine qtx11extras qtscript qtwayland + ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 29b6e41a90df..22badfc8cdd1 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "hugo-${version}"; - version = "0.49.2"; + version = "0.50"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,16 +10,9 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is"; + sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; }; - patches = [ - (fetchpatch { - url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff"; - sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll"; - }) - ]; - goDeps = ./deps.nix; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 002fb6351b8b..d5c24d69048a 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -555,8 +555,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "4a4406e478ca"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + rev = "94f6ae3ed3bc"; + sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } @@ -605,8 +605,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.5"; - sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + rev = "v2.3.6"; + sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; }; } @@ -615,8 +615,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "v2.3.3"; - sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + rev = "fced451e0bed"; + sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; }; } @@ -625,8 +625,8 @@ fetch = { type = "git"; url = "https://github.com/tdewolff/test"; - rev = "265427085153"; - sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0"; + rev = "v1.0.0"; + sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3c2109f14c5d..ca6ee04d370b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.17.2"; + version = "1.17.3"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1ibci07w4dh7r0dkwb3nbqm470rgak2a98rlqf8390rxrinfli3p"; + sha256 = "1k0gj24562jfj748s7qcn1f7brr1c0zn2dppxvfv2ka2r2n0z1h4"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 77ca7afe871e..29ec8158099c 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "tribler-${version}"; - version = "7.0.2"; + version = "7.1.2"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42"; + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.gz"; + sha256 = "1ayzqx4358qlx56hsnsn5s8xl6mzdb6nw4kwsalmp86dw6vmmis8"; }; buildInputs = [ @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { pythonPackages.psutil pythonPackages.meliae pythonPackages.sip + pythonPackages.pillow + pythonPackages.networkx ]; postPatch = '' diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index a4a127db73bf..3e74fbfb66af 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.0.6-1"; + version = "1.1.0-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; + sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -38,10 +38,10 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,lib,share/applications} - # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib - # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 962ddf98d6ce..dd080799557b 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGo19Package, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }: let - version = "0.2.0"; + version = "0.3.0"; in buildGo19Package { name = "grv-${version}"; @@ -14,10 +14,14 @@ buildGo19Package { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a"; + sha256 = "00v502mwnpv09l7fsbq3s72i5fz5dxbildwxgw0r8zzf6d54xrgl"; fetchSubmodules = true; }; + postPatch = '' + rm util/update_latest_release.go + ''; + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 113d7f78b905..e01101c6a662 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hub-${version}"; - version = "2.5.1"; + version = "2.6.0"; goPackagePath = "github.com/github/hub"; @@ -10,10 +10,11 @@ buildGoPackage rec { owner = "github"; repo = "hub"; rev = "v${version}"; - sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg"; + sha256 = "0hxmbpyv2yjxg4v3z50x5ikgcz7mgv5prya8jcpi277vq2s0wwa1"; }; - buildInputs = [ groff ronn ruby utillinux ] ++ + nativeBuildInputs = [ groff ronn utillinux ]; + buildInputs = [ ruby ] ++ stdenv.lib.optional stdenv.isDarwin Security; postPatch = '' @@ -29,7 +30,7 @@ buildGoPackage rec { install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" make man-pages - cp -r share/man $bin/share/man + cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 106b66bcfecb..d6ae37c3f7fa 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "18_1_4"; + version = "18_1_5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "18gyfcs5g7xq8fqnn1zjzx350jaynrniain0giay8sxych12p4cm"; + sha256 = "0f2aj3259jvn7n0x6m8sbwliikln9lqffd00jg75dblhxwl8adg3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 63b31c60d986..d26f731c21f9 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20180805"; + version = "20180910"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26"; + sha256 = "12k4cp9f8g03k3zf2g70pn6ybx8gk0hfh81ypiyb5hkfij95bi9k"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index e44c21abe946..7a062a552150 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -149,8 +149,7 @@ let }; }; -in { - +in rec { cudatoolkit_6 = common { version = "6.0.37"; url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; @@ -199,8 +198,8 @@ in { gcc = gcc6; }; - cudatoolkit_9 = common { - version = "9.1.85.1"; + cudatoolkit_9_1 = common { + version = "9.1.85.3"; url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; runPatches = [ @@ -208,9 +207,40 @@ in { url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; }) + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux"; + sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym"; + }) + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux"; + sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422"; + }) ]; gcc = gcc6; }; -} + cudatoolkit_9_2 = common { + version = "9.2.148.1"; + url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux"; + sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux"; + sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw"; + }) + ]; + gcc = gcc6; + }; + + cudatoolkit_9 = cudatoolkit_9_2; + + cudatoolkit_10_0 = common { + version = "10.0.130"; + url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; + sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj"; + gcc = gcc6; + }; + + cudatoolkit_10 = cudatoolkit_10_0; +} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 334ecbb168ba..1ef6dd065705 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -5,17 +5,20 @@ # Note that the created binaries still need `patchelf --set-interpreter ...` # to get rid of ${glibc} dependency. , purgeNixReferences ? false +, texinfo }: stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.12"; + version = "1.4.13"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a"; + sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm"; }; + buildInputs = [texinfo]; + patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr echo " @@ -46,11 +49,6 @@ stdenv.mkDerivation rec { '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' # Fix the tests - sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp - sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp @@ -83,6 +81,7 @@ stdenv.mkDerivation rec { buildPhase = '' sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" + (cd doc/manual ; make info) ''; installPhase = '' diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index ca9aa8fc36e8..687e1e8a1deb 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -71,12 +71,12 @@ in { saxon-he = common { pname = "saxon-he"; - version = "9.8.0.6"; + version = "9.9.0.1"; prog = "saxon-he"; jar = "saxon9he"; src = fetchurl { - url = mirror://sourceforge/saxon/Saxon-HE/9.8/SaxonHE9-8-0-6J.zip; - sha256 = "03r4djm298rxz8q7jph63h9niglrl3rifxskq1b3bclx5rgxi2lk"; + url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip; + sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60"; }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; }; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 0a0b4c8d5498..c8208ce27bae 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "openh264-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cisco"; repo = "openh264"; rev = "v${version}"; - sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a"; + sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4"; }; buildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index c89e9e4296cf..b41469c215e2 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,13 +1,11 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { inherit (args) cudatoolkit; }; -in - -{ +in rec { cudnn_cudatoolkit_7 = generic rec { # Old URL is v4 instead of v4.0 for some reason... version = "4"; @@ -38,16 +36,34 @@ in }; cudnn_cudatoolkit_9_0 = generic rec { - version = "7.0.5"; + version = "7.3.0"; cudatoolkit = cudatoolkit_9_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs"; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz"; + sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0"; }; - cudnn_cudatoolkit_9 = generic rec { - version = "7.0.5"; - cudatoolkit = cudatoolkit_9; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; + cudnn_cudatoolkit_9_1 = generic rec { + version = "7.1.3"; + cudatoolkit = cudatoolkit_9_1; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz"; + sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx"; }; + + cudnn_cudatoolkit_9_2 = generic rec { + version = "7.2.1"; + cudatoolkit = cudatoolkit_9_2; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz"; + sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y"; + }; + + cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2; + + cudnn_cudatoolkit_10_0 = generic rec { + version = "7.3.1"; + cudatoolkit = cudatoolkit_10_0; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.1.20.tgz"; + sha256 = "1yp35mng4ym40g5rqp63dcpa6jg4q1pnjkspnhlakzzdy8is65af"; + }; + + cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0; } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index be9aafe47415..f7d3e3c908f8 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -86,6 +86,10 @@ nodePackages // { ''; }; + scuttlebot = nodePackages.scuttlebot.override { + buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ]; + }; + statsd = nodePackages.statsd.override { # broken with node v8, dead upstream, # see #45946 and https://github.com/etsy/statsd/issues/646 diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix new file mode 100644 index 000000000000..fdeb5fb0082e --- /dev/null +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, h2, priority }: + +buildPythonPackage rec { + pname = "aioh2"; + version = "0.2.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd"; + }; + + propagatedBuildInputs = [ h2 priority ]; + + doCheck = false; # https://github.com/decentfox/aioh2/issues/17 + + meta = with lib; { + homepage = https://github.com/decentfox/aioh2; + description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; + license = licenses.bsd3; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix new file mode 100644 index 000000000000..51120d07121c --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchpatch, buildPythonPackage, fetchPypi +, aiohttp, pytest, pytestcov, pytest-aiohttp +}: + +buildPythonPackage rec { + pname = "aiohttp_remotes"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc"; + }; + + patches = [ + (fetchpatch { + url = https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch; + sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs"; + }) + ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkPhase = '' + python -m pytest + ''; + + meta = with lib; { + homepage = https://github.com/wikibusiness/aiohttp-remotes; + description = "A set of useful tools for aiohttp.web server"; + license = licenses.mit; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 0a8826934089..0c7fa8db01c5 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -4,18 +4,18 @@ buildPythonPackage rec { pname = "gplaycli"; - version = "3.21"; + version = "3.25"; src = fetchFromGitHub { owner = "matlink"; repo = "gplaycli"; rev = version; - sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2"; + sha256 = "1rygx5cg4b1vwpkiaq6jcpbc1ly7cspslv3sy7x8n8ba61ryq6h4"; }; - disabled = !isPy3k; + disabled = !isPy3k; - propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; + propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; meta = with stdenv.lib; { homepage = https://github.com/matlink/gplaycli; diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix new file mode 100644 index 000000000000..90b58b665de8 --- /dev/null +++ b/pkgs/development/python-modules/priority/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: + +buildPythonPackage rec { + pname = "priority"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; + }; + + checkInputs = [ pytest hypothesis ]; + checkPhase = '' + PYTHONPATH="src:$PYTHONPATH" pytest + ''; + + meta = with lib; { + homepage = https://python-hyper.org/priority/; + description = "A pure-Python implementation of the HTTP/2 priority tree"; + license = licenses.mit; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 31b08d0a9e0b..71243ef6f76e 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytest , tornado -, zeromq3 +, zeromq , py , python }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest tornado ]; - buildInputs = [ zeromq3]; + buildInputs = [ zeromq ]; propagatedBuildInputs = [ py ]; # test_socket.py seems to be hanging diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 33a46e16a3ab..e2022156870d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.24"; + version = "4.25"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz"; + sha256 = "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index fc9cb2f238b2..8ad96f4f1bfb 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.73-149"; + version = "4.14.78-150"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.73"; + modDirVersion = "4.14.78"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1zc5py6v3xyvy6dwghnqb7nsn9l1aib3d96i5bqy9dd56vyiy5m2"; + sha256 = "0139qciaf1vlz41s9idjbcx20c1svrp1l7qaazfkwfx52ghb4pvv"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix new file mode 100644 index 000000000000..ac44dbbf04d1 --- /dev/null +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "doh-proxy"; + version = "0.0.8"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c"; + }; + + propagatedBuildInputs = with python3Packages; + [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ]; + doCheck = false; # Trouble packaging unittest-data-provider + + meta = with lib; { + homepage = https://facebookexperimental.github.io/doh-proxy/; + description = "A proof of concept DNS-Over-HTTPS proxy"; + license = licenses.bsd3; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 36bc2a9bc284..73eaa07ac8ff 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa"; + sha256 = "0fq9a1fn0c77wfpypl3z7y23gbkw295ksy97wi9lhb5zj2m3dkq0"; }; nativeBuildInputs = [ cmake ninja ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; - homepage = https://mistertea.github.io/EternalTCP/; + homepage = https://mistertea.github.io/EternalTerminal/; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.dezgeg ]; }; diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index 90f2ad71fc21..dd7d88ff848c 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "197kbr7q7aqzv5l8xilz60m50rbkmfwfswyd6ka7w83j5bi88jw3"; + sha256 = "0vr1mv8ns67kslxgwkvic8w86fvmqasxs6yd4yn21j49zg23866k"; }; - cargoSha256 = "1v84cj42ch49jrigrkivg99hzxa79jii8s3fddjk23hi1xx1c35y"; + cargoSha256 = "0924bpcwz15zlp4vjaqap05s4nynw9mqz0np1kph3vx7aj9rsaw6"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 047706cd8a68..e90517f1581b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "saml2aws-${version}"; - version = "2.6.1"; + version = "2.10.0"; goPackagePath = "github.com/versent/saml2aws"; goDeps = ./deps.nix; @@ -15,7 +15,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "Versent"; repo = "saml2aws"; - sha256 = "0sg5qm1gyrisna247lmxfgpa22y6rnz9vd6yg92kxlcwr4ji8l1j"; + sha256 = "00m8x57fgry601w5f9dxnxdqbbqjiv7c0rsx47iv9qsp0w7l50c5"; }; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 938838dd1c2d..477a3c84e735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2062,8 +2062,12 @@ with pkgs; cudatoolkit_7 cudatoolkit_7_5 cudatoolkit_8 + cudatoolkit_9 cudatoolkit_9_0 - cudatoolkit_9; + cudatoolkit_9_1 + cudatoolkit_9_2 + cudatoolkit_10 + cudatoolkit_10_0; cudatoolkit = cudatoolkit_9; @@ -2073,7 +2077,11 @@ with pkgs; cudnn6_cudatoolkit_8 cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0; + cudnn_cudatoolkit_9_0 + cudnn_cudatoolkit_9_1 + cudnn_cudatoolkit_9_2 + cudnn_cudatoolkit_10 + cudnn_cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_9; @@ -6188,6 +6196,8 @@ with pkgs; wol = callPackage ../tools/networking/wol { }; + wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -13185,6 +13195,8 @@ with pkgs; dex-oidc = callPackage ../servers/dex { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { }; + dgraph = callPackage ../servers/dgraph { }; dico = callPackage ../servers/dico { }; @@ -17156,6 +17168,8 @@ with pkgs; gxmessage = callPackage ../applications/misc/gxmessage { }; + gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; + hackrf = callPackage ../applications/misc/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index ee1b94c8638d..bcfef9bdad88 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -210,8 +210,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpFont = fetchNuGet { baseName = "SharpFont"; - version = "3.1.0"; - sha256 = "137y514i4zi0i0qsx7nv4ibl4kifbr8xr23rqdkwf7yxf88jjmh2"; + version = "4.0.1"; + sha256 = "1yd3cm4ww0hw2k3aymf792hp6skyg8qn491m2a3fhkzvsl8z7vs8"; outputFiles = [ "lib/*" "config/*" ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb69c554de89..c25f80a25406 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -708,12 +708,16 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; + aioh2 = callPackage ../development/python-modules/aioh2 { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; ajpy = callPackage ../development/python-modules/ajpy { }; @@ -1858,6 +1862,8 @@ in { poyo = callPackage ../development/python-modules/poyo { }; + priority = callPackage ../development/python-modules/priority { }; + prov = callPackage ../development/python-modules/prov { }; pudb = callPackage ../development/python-modules/pudb { }; @@ -2288,20 +2294,8 @@ in { grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; - pytorch = let - # Fails with CUDA 9.1 and GCC 6.4: - # https://github.com/pytorch/pytorch/issues/5831 - # https://devtalk.nvidia.com/default/topic/1028112 - # We should be able to remove this when CUDA 9.2 is released. - cudatoolkit_9 = pkgs.cudatoolkit_9.override { - gcc6 = pkgs.gcc5; - }; - in callPackage ../development/python-modules/pytorch { + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = cudatoolkit_9; - cudnn = pkgs.cudnn_cudatoolkit_9.override { - inherit cudatoolkit_9; - }; }; pytorchWithCuda = self.pytorch.override { |