diff options
Diffstat (limited to 'pkgs/applications')
32 files changed, 281 insertions, 143 deletions
diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index 9b9649cf9f8a8..3eff818cca903 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -1,68 +1,76 @@ -{ alsa-lib -, curl -, fetchFromGitHub -, freeglut -, freetype -, libGL -, libXcursor -, libXext -, libXinerama -, libXrandr -, libjack2 -, pkg-config -, python3 -, stdenv -, lib -}: +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext +, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux +, libsepol, libsysprof-capture, libthai, libxkbcommon, lv2, pcre, pkg-config +, python3, sqlite, stdenv }: stdenv.mkDerivation rec { pname = "CHOWTapeModel"; - version = "unstable-2020-12-12"; + version = "2.10.0"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; - rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70"; - sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661"; + rev = "v${version}"; + sha256 = "sha256-iuT7OBRBtMkjcTHayCcne1mNqkcxzKnEYl62n65V7Z4="; fetchSubmodules = true; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ alsa-lib + at-spi2-core curl + dbus + libepoxy freeglut freetype + gtk3 libGL libXcursor + libXdmcp libXext libXinerama libXrandr + libXtst + libdatrie libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + lv2 + pcre python3 + sqlite + gcc-unwrapped ]; - buildPhase = '' - cd Plugin/ - ./build_linux.sh - ''; + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + postPatch = "cd Plugin"; installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/ - cd Builds/LinuxMakefile/build/ - cp CHOWTapeModel.a $out/lib - cp -r CHOWTapeModel.lv2 $out/lib/lv2 - cp -r CHOWTapeModel.vst3 $out/lib/vst3 - cp CHOWTapeModel $out/bin + cd CHOWTapeModel_artefacts/Release + cp libCHOWTapeModel_SharedCode.a $out/lib + cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 + cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 + cp Standalone/CHOWTapeModel $out/bin cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/ ''; meta = with lib; { homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; - description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone"; + description = + "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 2bf47786ef534..f6f3237d6f07f 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.30"; + version = "1.1.31"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = version; - sha256 = "0g0nx05dyjwz2149v3pj6sa9divr26jyqvg2kk1qk48s2n4najkz"; + sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 25371302dfff7..30011b2be3eac 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-m8sKu2QuEyCWQ975vDfLVWKgU7ydEp5/vRYRO3z1yio="; + sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index fa6a317c41e83..16ef4ed6e45e6 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , qmake , pkg-config @@ -14,25 +13,15 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.5.0.1"; + version = "0.5.0.3"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "10v310smm0df233wlh1kqv8i36lsg1m36v0flrhs2202k50d69ri"; + sha256 = "sha256-8bgi621psvUlhiLyZ15tKGmGOs6HTf5/6Ru2Z9l8QIo="; }; - patches = [ - # Lifts macOS version restriction - # Remove when version > 0.5.0.1 - (fetchpatch { - name = "0001-ptcollab-lift-10.14-deployment-target-limitation.patch"; - url = "https://github.com/yuxshao/ptcollab/commit/a9664b5953e1046e1f7da3b38744f33a7ff0ea24.patch"; - sha256 = "0qgpv5hmb4504kamdgxalrhc4zb9rdxln23s7qwc7ikafg54h1fm"; - }) - ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index ee64b7907aa02..2c8526c6292e6 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh"; + sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80="; }; - cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045"; + cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 463865d26bf79..e17fb402ed38f 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }: stdenv.mkDerivation rec { - version = "2017-10-27"; pname = "deadpixi-sam-unstable"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "deadpixi"; repo = "sam"; - rev = "51693780fb1457913389db6634163998f9b775b8"; - sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr"; + rev = "5d8acb35d78c327d76f00a54857cbd566ed9bc11"; + sha256 = "sha256-+vRh6nDPc3UnmEdqROHRel5Te0h5m4eiaERs492xciQ="; }; postPatch = '' substituteInPlace config.mk.def \ --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \ - --replace "CC=gcc" "" + --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" ''; CFLAGS = "-D_DARWIN_C_SOURCE"; @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/deadpixi/sam"; description = "Updated version of the sam text editor"; - license = with licenses; lpl-102; + license = licenses.lpl-102; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index b828df6d8d411..7d060a972cdc5 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-NPuwT0msFvGyS33X7lefdPZZ3AC4pZb1tvmOzzlQlgc="; + hash = "sha256-w4qCJgfBnN1PpPfhdsLdBpCRAWai9RrwU3LZl8DdEcw="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 2207618d9b500..54f8384999561 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libtool +{ lib, stdenv, fetchurl, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -18,13 +18,11 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-17"; + version = "7.1.0-19"; - src = fetchFromGitHub { - owner = "ImageMagick"; - repo = "ImageMagick"; - rev = version; - sha256 = "sha256-P6w7dDDvY8r55qN3hnsuzO8kp85gxp2t6vShmhoPOgs="; + src = fetchurl { + url = "https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${version}.tar.xz"; + hash = "sha256-P9eRdKsPMLwWQ68+ZU8dL/zDqVVCY5gRVWiLT0n3/Xc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index f722b2315c00c..841b943e8634d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -78,6 +79,14 @@ python3.pkgs.buildPythonApplication { --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" ''; + patches = [ + # trezorlib 0.13 compatibility + (fetchpatch { + url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch"; + sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E="; + }) + ]; + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 88086ef136315..f66bb4a3b7750 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook , boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme -, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg +, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.3.3"; + version = "2.4.0"; nativeBuildInputs = [ cmake @@ -38,9 +38,19 @@ stdenv.mkDerivation rec { xorg.libX11 ] ++ checkInputs; + patches = [ + # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; + sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; + }) + ]; + doCheck = true; checkInputs = [ gtest ]; + separateDebugInfo = true; + # The build system uses custom logic - defined in # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt # library, which doesn't pick up the package in the nix store. We @@ -56,11 +66,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-ludev"; prePatch = '' - # In nix ioctls.h isn't available from the standard kernel-headers package - # like in other distributions. The copy in glibc seems to be identical to the - # one in the kernel though, so we use that one instead. - sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp - # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx # now seems to be integrated into the main lib. sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake @@ -69,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm"; + sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 2cbcd4c2cea66..384ca820d5056 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -20,6 +20,8 @@ let fetchSubmodules = true; }; + patches = null; + # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index f16807ba2666a..f7d3173b0f2a4 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skate"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - sha256 = "sha256-Z+7unYmwPLOhJAMAhMwjapAmslTNxmP01myjgEOBfu8="; + sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; }; - vendorSha256 = "sha256-CdYyiUiy2q2boEHjdXkgRzVI+6fEb+fBrlInl6IrFjk="; + vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk="; doCheck = false; diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index f3743d33c3642..8d1e1910cbc94 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, vala }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tiramisu"; - version = "unstable-2021-05-20"; + version = "2.0.20211107"; src = fetchFromGitHub { owner = "Sweets"; - repo = "tiramisu"; - rev = "e53833d0b5b0ae41ceb7dc434d8e25818fe62291"; - sha256 = "sha256-F4oaTOAQQfOkEXeBVbGH+0CHc9v9Ac08GyzHliOdAfc="; + repo = pname; + rev = version; + sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw"; }; buildInputs = [ glib ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config vala ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 7317fbb95a8cb..3af96d828ad9d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.14"; + version = "0.35.16"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bK1xWzIowNF5gS4feRkCbTB1je/ttbmrqweaHplk8n8="; + sha256 = "sha256-m32QhQUG3Dkh0odfqYhNmJ5Rrt0qf5wCvxePPusyRyI="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index f1b2df658a6b6..abd50868e0304 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; - version = "1.4.4"; + version = "1.4.5"; src = fetchgit { url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; rev = "v${version}"; - sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; + sha256 = "sha256-8vmq/YstuBYUxe00P4NrxD/eMYI++R9uvn1sCcMTr7I="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 100a26692da04..1e7a78e4d4351 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jmeter"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; - sha256 = "sha256-rtv68ACqLRnjU0zEBirLn5cwhxGy03upZWQyIqeECxA="; + sha256 = "sha256-clISFMDLh9rFuXTBxug6F6AJx/03e1W/I1JcckA7He4="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 483d13b689500..c4d014530cc33 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -5,13 +5,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "Nicotine-Plus"; repo = "nicotine-plus"; rev = version; - hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ="; + hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak="; }; nativeBuildInputs = [ gettext wrapGAppsHook ]; @@ -23,6 +23,12 @@ python3Packages.buildPythonApplication rec { mv $out/bin/nicotine $out/bin/nicotine-plus ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; + doCheck = false; meta = { diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 429042f3ee4b3..9759516eddc25 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.51.4"; + version = "2.51.5"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo="; + sha256 = "sha256-pi5uYwPpIy0lERmgATWQCO3EA3Pg5pnn7gxv49FaPug="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 4deada8d7b3bc..535f5ce6d9d55 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "1.1.4"; + version = "1.1.9"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; rev = "v${version}"; - sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y="; + sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg="; }; dontConfigure = true; diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 27ce5bb07a793..165ddfe8b372f 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.5.2"; + version = "2.5.3"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "sha256-4KSJYhfUya8nH1KTsZ7JRgh0KnKdqrgSfofsjWaX7/M="; + sha256 = "sha256-Dd99JBPn1TgPF8Yvqk+AZX8ZUuQjYS0Tx3y5A3VZsHw="; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 41a2f006e8325..72958898428a7 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.18.0"; + version = "21.20.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-h/fwP4HyelE1jZ8GrW1nKuDNuFAchms3cKSCGiRe7gU="; + sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 05d1f780bf30e..f7dc2a344e185 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl -, enableGui ? false, qt5 -, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, perl +, enableGui ? false +, qtbase +, wrapQtAppsHook +, qtwebengine +, enableJupyter ? true +, boost +, jsoncpp +, openssl +, zmqpp +, enableJava ? false +, openjdk +, gtest }: stdenv.mkDerivation rec { @@ -19,21 +34,53 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}" "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}" + "-DENABLE_JYACAS=${if enableJava then "ON" else "OFF"}" + "-DENABLE_CYACAS_UNIT_TESTS=ON" ]; + patches = [ + # upstream issue: https://github.com/grzegorzmazur/yacas/issues/340 + # Upstream patch which doesn't apply on 1.9.1 is: + # https://github.com/grzegorzmazur/yacas/pull/342 + ./jsoncpp-fix-include.patch + # Fixes testing - https://github.com/grzegorzmazur/yacas/issues/339 + # PR: https://github.com/grzegorzmazur/yacas/pull/343 + (fetchpatch { + url = "https://github.com/grzegorzmazur/yacas/commit/8bc22d517ecfdde3ac94800dc8506f5405564d48.patch"; + sha256 = "sha256-aPO5T8iYNkGtF8j12YxNJyUPJJPKrXje1DmfCPt317A="; + }) + ]; + preCheck = '' + patchShebangs ../tests/test-yacas + ''; + checkInputs = [ + gtest + ]; + doCheck = true; - # Perl is only for the documentation - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ + cmake + # Perl is only for the documentation + perl + ] ++ lib.optionals enableJava [ + openjdk + ]; buildInputs = [ - ] ++ lib.optionals enableGui (with qt5; [ qtbase qtwebkit ]) - ++ lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ] - ; + ] ++ lib.optionals enableGui [ + qtbase + wrapQtAppsHook + qtwebengine + ] ++ lib.optionals enableJupyter [ + boost + jsoncpp + openssl + zmqpp + ]; meta = { - description = "Easy to use, general purpose Computer Algebra System"; + description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}"; homepage = "http://www.yacas.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; - broken = enableGui || enableJupyter; }; } diff --git a/pkgs/applications/science/math/yacas/fix-test-script.patch b/pkgs/applications/science/math/yacas/fix-test-script.patch new file mode 100644 index 0000000000000..da85f0dc0e1bc --- /dev/null +++ b/pkgs/applications/science/math/yacas/fix-test-script.patch @@ -0,0 +1,26 @@ +diff --git i/tests/test-yacas w/tests/test-yacas +index b375d78b..0e3a616b 100755 +--- i/tests/test-yacas ++++ w/tests/test-yacas +@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests + FAILURES=0 # number of failed tests + TOTALTESTS=0 # total number of tests + +-TESTFILE=/tmp/test-yacas.$$ +-TIMEFILE=/tmp/time-yacas.$$ +-VERSIONF=/tmp/version-yacas-$$.ys ++TESTFILE="$(mktemp -t test-yacas.XXX)" ++TIMEFILE="$(mktemp -t time-yacas.XXX)" ++VERSIONF="$(mktemp -t version-yacas-XXX.ys)" + LOGFILE=yacas-logfile.txt + echo "Print(Version());" > $VERSIONF + VERSION=`$CMD $VERSIONF` +@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do + # fi + echo "Running $scr" + if [ -f $TESTFILE ]; then rm $TESTFILE ; fi +- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ ++ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ + 2> $TIMEFILE \ + || (echo "Error -- User interrupt" > $TESTFILE) + # cat $TIMEFILE diff --git a/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch b/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch new file mode 100644 index 0000000000000..8fe914e55be34 --- /dev/null +++ b/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch @@ -0,0 +1,63 @@ +diff --git i/cyacas/yacas-kernel/CMakeLists.txt w/cyacas/yacas-kernel/CMakeLists.txt +index fe1600aa..dcc329f8 100644 +--- i/cyacas/yacas-kernel/CMakeLists.txt ++++ w/cyacas/yacas-kernel/CMakeLists.txt +@@ -22,8 +22,9 @@ find_library (ZEROMQ_LIBRARY NAMES zmq) + find_path (ZMQPP_INCLUDE_DIR zmqpp.hpp) + find_library (ZMQPP_LIBRARY NAMES zmqpp) + +-find_path (JSONCPP_INCLUDE_DIR json.h) +-find_library (JSONCPP_LIBRARY NAMES jsoncpp) ++# https://github.com/open-source-parsers/jsoncpp/wiki/Building#another-approach-for-cmake ++find_package(jsoncpp REQUIRED) ++get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES) + + find_package (OpenSSL) + find_package (Boost REQUIRED date_time filesystem) +@@ -31,6 +32,6 @@ find_package (Boost REQUIRED date_time filesystem) + include_directories (include) + + add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp src/base64.cpp) +-target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS}) ++target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} jsoncpp_lib ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS}) + + install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git i/cyacas/yacas-kernel/include/yacas_kernel.hpp w/cyacas/yacas-kernel/include/yacas_kernel.hpp +index 91d36ac0..d12f905c 100644 +--- i/cyacas/yacas-kernel/include/yacas_kernel.hpp ++++ w/cyacas/yacas-kernel/include/yacas_kernel.hpp +@@ -29,7 +29,7 @@ + #include "yacas_engine.hpp" + + #include <boost/uuid/random_generator.hpp> +-#include <jsoncpp/json/json.h> ++#include <json/json.h> + #include <zmqpp/zmqpp.hpp> + + #include <map> +diff --git i/cyacas/yacas-kernel/src/main.cpp w/cyacas/yacas-kernel/src/main.cpp +index c31f17f2..832e9128 100644 +--- i/cyacas/yacas-kernel/src/main.cpp ++++ w/cyacas/yacas-kernel/src/main.cpp +@@ -24,7 +24,7 @@ + + #include "yacas_kernel.hpp" + +-#include <jsoncpp/json/json.h> ++#include <json/json.h> + + #include <boost/dll/runtime_symbol_info.hpp> + +diff --git i/cyacas/yacas-kernel/src/yacas_engine.cpp w/cyacas/yacas-kernel/src/yacas_engine.cpp +index 6ed60ca3..18e9b3fd 100644 +--- i/cyacas/yacas-kernel/src/yacas_engine.cpp ++++ w/cyacas/yacas-kernel/src/yacas_engine.cpp +@@ -22,7 +22,7 @@ + * Created on November 7, 2015, 12:52 PM + */ + +-#include <jsoncpp/json/writer.h> ++#include <json/writer.h> + + #include "yacas_engine.hpp" + diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 4ac416908132e..225a81f1f66a4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index cd9b7430b99fa..63dfe6c283730 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elmerfem"; - version = "8.4"; + version = "9.0"; src = fetchFromGitHub { owner = "elmercsc"; repo = "elmerfem"; rev = "release-${version}"; - sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; + sha256 = "VK7jvu4s5d7k0c39XqY9dEzg/vXtX5Yr/09VcuZVQ9A="; }; hardeningDisable = [ "format" ]; @@ -32,15 +32,11 @@ stdenv.mkDerivation rec { "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" ]; - patches = [ - ./fix-cmake.patch - ]; - meta = with lib; { homepage = "https://elmerfem.org/"; description = "A finite element software for multiphysical problems"; platforms = platforms.unix; - maintainers = [ maintainers.wulfsta ]; + maintainers = with maintainers; [ wulfsta broke ]; license = licenses.lgpl21; }; diff --git a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch deleted file mode 100644 index 098f65207330d..0000000000000 --- a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt ---- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400 -+++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400 -@@ -14,7 +14,7 @@ - SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D") - - MACRO(SUBDIRLIST result curdir depth) - set(glob_pattern "*") -- FOREACH(D RANGE 1 depth) -+ FOREACH(D RANGE 1 ${depth}) - FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) - FOREACH(child ${children}) - IF(IS_DIRECTORY ${curdir}/${child}) diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/git-and-tools/gitty/default.nix index 45c0f2635a070..bc27c4eb90947 100644 --- a/pkgs/applications/version-management/git-and-tools/gitty/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitty/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitty"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "muesli"; repo = "gitty"; rev = "v${version}"; - sha256 = "1byjcvzimwn6nmhz0agicq7zq0xhkj4idi9apm1mgd3m2l509ivj"; + sha256 = "sha256-BlYZe8bLyr6QQmBwQQ0VySHohKLRVImECxfzAOPm8Xg="; }; - vendorSha256 = "1mbl585ja82kss5p8vli3hbykqxa00j8z63ypq6vi464qkh5x3py"; + vendorSha256 = "sha256-LINOjjKicnr0T9RiOcSWWDl0bdY3c6EHHMTBA9LTOG4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 176efb799541a..4f09fc14d9f85 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "clapper"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = pname; rev = version; - sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr"; + sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index e029bd9742956..9fc59b2d329e2 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "19.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-o3tiNEVc17RIlEgf3V2oOK04da0DpmexT9m8m/xtI4I="; + sha256 = "sha256-KMEo7kXyFMEeUR/HRvXpUhwDFlWsuwYZFA6bA3W1AmY="; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 093322b231c45..1ff78164ddc07 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "19.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-KaT+BPRrkhw5R18aUNdnA9PKXF87EzwQLaY9ep86OvE="; + sha256 = "sha256-WeokXU4HY22SzL1djORzru5Hju58Ix0+InwZDr++FC8="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a77db7069f162..c53eb25af39f5 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation rec { dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; - separateDebugInfo = true; + # On aarch64-linux we would shoot over the Hydra's 2G output limit. + separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux); patches = [ ./fix-qemu-ga.patch |