diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a567191f992..9b311f81be4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3711,6 +3711,12 @@ githubId = 201997; name = "Eric Seidel"; }; + gspia = { + email = "iahogsp@gmail.com"; + github = "gspia"; + githubId = 3320792; + name = "gspia"; + }; guibert = { email = "david.guibert@gmail.com"; github = "dguibert"; @@ -10572,6 +10578,12 @@ githubId = 13378502; name = "Wulfsta"; }; + wunderbrick = { + name = "Andrew Phipps"; + email = "lambdafuzz@tutanota.com"; + github = "wunderbrick"; + githubId = 52174714; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; @@ -10656,6 +10668,12 @@ githubId = 11824817; name = "Marti Serra"; }; + xworld21 = { + email = "1962985+xworld21@users.noreply.github.com"; + github = "xworld21"; + githubId = 1962985; + name = "Vincenzo Mantova"; + }; xwvvvvwx = { email = "davidterry@posteo.de"; github = "xwvvvvwx"; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a217e470954..dbe6bdeee42 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,12 +1,21 @@ -{ lib, stdenv +{ stdenv , alsaLib +, curl , fetchFromGitHub +, fftwFloat , freetype +, glib +, lib , libGL , libX11 , libXcursor , libXext +, libXinerama +, libXrandr , libXrender +, libgcc +, libglvnd +, libsecret , meson , ninja , pkg-config @@ -14,25 +23,33 @@ stdenv.mkDerivation rec { pname = "distrho-ports"; - version = "2020-07-14"; + version = "2021-03-15"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; rev = version; - sha256 = "03ji41i6dpknws1vjwfxnl8c8bgisv2ng8xa4vqy2473k7wgdw4v"; + sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; }; nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ alsaLib + curl + fftwFloat freetype + glib libGL libX11 libXcursor libXext + libXinerama + libXrandr libXrender + libgcc + libglvnd + libsecret ]; meta = with lib; { @@ -61,6 +78,7 @@ stdenv.mkDerivation rec { pitchedDelay refine stereosourceseparation + swankyamp tal-dub-3 tal-filter tal-filter-2 @@ -71,9 +89,10 @@ stdenv.mkDerivation rec { tal-vocoder-2 temper vex + vitalium wolpertinger ''; - license = with licenses; [ gpl2 gpl3 gpl2Plus lgpl3 mit ]; + license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; maintainers = [ maintainers.goibhniu ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index efb3adaaa28..cdf32744148 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.129.3"; + version = "1.131.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1sg9wg6w3w0phrnnzpj7h2g22y0x7a3dl57djzydayxmg8fnn2ys"; + sha256 = "1zq17yi5zn4hdgrrn3c3cdk6s38fv36r66dl0dqz2z8jjd6vy4p3"; }; postPatch = '' @@ -106,8 +106,8 @@ stdenv.mkDerivation rec { Config system in JSON files. Multi-carets and multi-selections. Search and replace with RegEx. Extendable by Python plugins and themes. ''; - homepage = "http://www.uvviewsoft.com/cudatext/"; - changelog = "http://uvviewsoft.com/cudatext/history.txt"; + homepage = "https://cudatext.github.io/"; + changelog = "https://cudatext.github.io/history.txt"; license = licenses.mpl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index a0044aaf833..05490b9d6fc 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.03.05", - "sha256": "1p2pzha5dd4p23j2bv6jxphj596dlb5v8ixjzg4x2zglz2hir6yz" + "rev": "2021.04.01", + "sha256": "12sncivsv6pvwflzzy12rpn1fjiq64n2n3bcj7630xxlrbygkhxb" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.03.16", - "sha256": "1sq9j2zaif019gl6nf391lyp8k9s38f5s6ci7k3z5v90hkz1dcql" + "rev": "2021.04.09", + "sha256": "1ldr2z88zywn0ccgs17vfhq55ibihjcmfjjxcqsjifrbm0y6wipp" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.03.08", - "sha256": "0xvnvx4qzp6nxi912i4zlnal91k6vbcsyfbz05ib73sz68xqd5qv" + "rev": "2021.04.01", + "sha256": "1g6zp9d7vwjisad3y1mfnk1jcbjqxp3yimm0sh1655al6qwn886m" }, "EControl": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.03.16", - "sha256": "1a4mxcwjm9naxh4piqm5y93w2xd5rgl0vcn108wy1pkr221agg2q" + "rev": "2021.04.01", + "sha256": "1hq9hbv81mcymjcms97wcwcfqfpxis6h6v5m0syyih4r53khv0az" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 451cc9a33f3..95a0e41d2ae 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython ] + ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada ++ optional spaceNavSupport libspnav; + pythonPath = with python3Packages; [ numpy requests ]; postPatch = '' # allow usage of dynamically linked embree @@ -109,6 +111,7 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" + "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON" "-DWITH_IMAGE_OPENJPEG=ON" @@ -137,10 +140,11 @@ stdenv.mkDerivation rec { blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); - # --python-expr is used to workaround https://developer.blender.org/T74304 postInstall = '' + buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ - --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ --add-flags '--python-use-system-env' ''; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 9ae6fda9fce..78cf6a07e8c 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , autoconf , automake , c-ares @@ -24,21 +25,29 @@ , unzip , wget }: - mkDerivation rec { pname = "megasync"; - version = "4.3.5.0"; + version = "4.4.0.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs"; + sha256 = "1xggca7283943070mmpsfhh7c9avy809h0kgmf7497f4ca5zkg2y"; fetchSubmodules = true; }; - nativeBuildInputs = - [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ]; + nativeBuildInputs = [ + autoconf + automake + doxygen + libtool + lsb-release + pkg-config + qttools + swig + unzip + ]; buildInputs = [ c-ares cryptopp @@ -47,7 +56,6 @@ mkDerivation rec { libmediainfo libraw libsodium - libtool libuv libzen qtbase @@ -65,7 +73,7 @@ mkDerivation rec { ]; postPatch = '' - for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do + for file in $(find src/ -type f \( -iname configure -o -iname \*.sh \) ); do substituteInPlace "$file" --replace "/bin/bash" "${stdenv.shell}" done ''; diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix new file mode 100644 index 00000000000..8226e8e38cc --- /dev/null +++ b/pkgs/applications/office/foliate/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3 +, webkitgtk, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils +, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "foliate"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "johnfactotum"; + repo = pname; + rev = version; + sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr"; + }; + + nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + postFixup = '' + echo "fixing wrapper" + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.github.johnfactotum.Foliate';" $out/bin/.com.github.johnfactotum.Foliate-wrapped + ln -s $out/bin/com.github.johnfactotum.Foliate $out/bin/foliate + ''; + + buildInputs = [ + gettext + glib + gjs + gtk3 + webkitgtk + desktop-file-utils + gobject-introspection + gsettings-desktop-schemas + ]; + + meta = with lib; { + description = "A simple and modern GTK eBook reader"; + homepage = "https://johnfactotum.github.io/foliate/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix new file mode 100644 index 00000000000..0adfa748c01 --- /dev/null +++ b/pkgs/applications/office/kitsas/default.nix @@ -0,0 +1,51 @@ +{ lib, mkDerivation, fetchFromGitHub, qmake, qtsvg, qtcreator, poppler, libzip, pkg-config }: + +mkDerivation rec { + pname = "kitsas"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "artoh"; + repo = "kitupiikki"; + rev = "v${version}"; + sha256 = "1qac6cxkb45rs5pschsf2rvpa789g27shmrwpshwahqzhw42xvgl"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ qmake qtsvg poppler libzip ]; + + # We use a separate build-dir as otherwise ld seems to get confused between + # directory and executable name on buildPhase. + preConfigure = '' + mkdir build-linux + cd build-linux + ''; + + qmakeFlags = [ + "../kitsas/kitsas.pro" + "-spec" + "linux-g++" + "CONFIG+=release" + ]; + + preFixup = '' + make clean + rm Makefile + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/applications + cp kitsas $out/bin + cp $src/kitsas.png $out/share/applications + cp $src/kitsas.desktop $out/share/applications + ''; + + meta = with lib; { + homepage = "https://github.com/artoh/kitupiikki"; + description = "An accounting tool suitable for Finnish associations and small business"; + maintainers = with maintainers; [ gspia ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 18c1b9469e7..c305c771417 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,26 +4,22 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1s0k86ldqky6avwjaxkw1y02wyf59qwqldcahy3lhjn1b5dgsb3s"; + sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; }; - checkPhase = '' - pytest -vs tests - ''; - postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; + propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix new file mode 100644 index 00000000000..0a3de27f53e --- /dev/null +++ b/pkgs/applications/video/kooha/default.nix @@ -0,0 +1,58 @@ +{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib +, gobject-introspection, gst_all_1, gtk3, libhandy, librsvg, meson, ninja +, pkg-config, python3, wrapGAppsHook }: + +python3.pkgs.buildPythonApplication rec { + pname = "kooha"; + version = "1.1.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "SeaDve"; + repo = "Kooha"; + rev = "v${version}"; + sha256 = "05515xccs6y3wy28a6lkyn2jgi0fli53548l8qs73li8mdbxzd4c"; + }; + + buildInputs = [ + glib + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk3 + libhandy + librsvg + ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + python3 + pkg-config + wrapGAppsHook + ]; + + propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; + + strictDeps = false; + + buildPhase = '' + export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + meta = with lib; { + description = "Simple screen recorder"; + homepage = "https://github.com/SeaDve/Kooha"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/development/compilers/juniper/default.nix new file mode 100644 index 00000000000..3db60dc17bc --- /dev/null +++ b/pkgs/development/compilers/juniper/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchzip, makeWrapper, mono }: + +stdenv.mkDerivation rec { + pname = "juniper"; + version = "2.3.0"; + + src = fetchzip { + url = "http://www.juniper-lang.org/installers/Juniper-${version}.zip"; + sha256 = "10am6fribyl7742yk6ag0da4rld924jphxja30gynzqysly8j0vg"; + stripRoot = false; + }; + + doCheck = true; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ mono ]; + + installPhase = '' + runHook preInstall + rm juniper # original script with regular Linux assumptions + mkdir -p $out/bin + cp -r ./* $out + makeWrapper ${mono}/bin/mono $out/bin/juniper \ + --add-flags "$out/Juniper.exe \$@" + runHook postInstall + ''; + + meta = with lib; { + description = "Functional reactive programming language for programming Arduino"; + longDescription = '' + Juniper targets Arduino and supports many features typical of functional programming languages, including algebraic data types, tuples, records, + pattern matching, immutable data structures, parametric polymorphic functions, and anonymous functions (lambdas). + Some imperative programming concepts are also present in Juniper, such as for, while and do while loops, the ability to mark variables as mutable, and mutable references. + ''; + homepage = "https://www.juniper-lang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ wunderbrick ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/arrow/1.nix b/pkgs/development/python-modules/arrow/1.nix new file mode 100644 index 00000000000..f9b830762b3 --- /dev/null +++ b/pkgs/development/python-modules/arrow/1.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, simplejson, typing-extensions, python-dateutil, pytz, pytest-mock, sphinx +, dateparser, pytestcov, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arrow"; + version = "1.0.3"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; + }; + + propagatedBuildInputs = [ python-dateutil ] + ++ lib.optionals (!pythonOlder "3.8") [ typing-extensions ]; + + checkInputs = [ + dateparser + pytestCheckHook + pytestcov + pytest-mock + pytz + simplejson + sphinx + ]; + + # ParserError: Could not parse timezone expression "America/Nuuk" + disabledTests = [ + "test_parse_tz_name_zzz" + ]; + + meta = with lib; { + description = "Python library for date manipulation"; + homepage = "https://github.com/crsmithdev/arrow"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice oxzi ]; + }; +} diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 94181def867..d4f742d97f5 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,35 +1,40 @@ { lib -, fetchFromGitHub -, buildPythonPackage -, pythonOlder -, withVoice ? true, libopus , aiohttp +, buildPythonPackage +, fetchFromGitHub +, libopus +, pynacl +, pythonOlder , websockets +, withVoice ? true }: buildPythonPackage rec { pname = "discord.py"; - version = "1.7.0"; - disabled = pythonOlder "3.5.3"; + version = "1.7.1"; + disabled = pythonOlder "3.8"; - # only distributes wheels on pypi now src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "1i5k2qb894rjksn21pk9shash1y7v4138rkk8mqr1a1yvgnr5ibg"; + sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; }; - propagatedBuildInputs = [ aiohttp websockets ]; + propagatedBuildInputs = [ + aiohttp + websockets + ] ++ lib.optionalString withVoice [ + libopus + pynacl + ]; + patchPhase = '' - substituteInPlace "requirements.txt" \ - --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets" - '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" ''; - # only have integration tests with discord + # Only have integration tests with discord doCheck = false; pythonImportsCheck = [ @@ -44,7 +49,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python wrapper for the Discord API"; + description = "Python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; maintainers = [ maintainers.ivar ]; license = licenses.mit; diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/development/tools/tf2pulumi/default.nix new file mode 100644 index 00000000000..9dc40913771 --- /dev/null +++ b/pkgs/development/tools/tf2pulumi/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tf2pulumi"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "tf2pulumi"; + rev = "v${version}"; + sha256 = "199c4hd236mfz9c44rpzpbr3w3fjj8pbw656jd9k3v2igzw942c7"; + }; + + vendorSha256 = "1cwyag67q0361szfjv1cyi51cg1bbmkpy34y33hn53aa55pkm1fw"; + + buildFlagsArray = '' + -ldflags=-s -w -X=github.com/pulumi/tf2pulumi/version.Version=${src.rev} + ''; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert Terraform projects to Pulumi TypeScript programs"; + homepage = "https://www.pulumi.com/tf2pulumi/"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch ]; + }; +} diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index 4cdca333d7f..6a7d12eadb1 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "0as3nl9qiyf9daf2n78lyish319qclf2gbhr20mdd5wnqmxpk276"; + sha256 = "13n2y9gsgb8hnr64y083x9c90j3b4awcmdn81mqmwcydpby3q848"; }; buildInputs = [ bashInteractive ]; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index fb94b14d9ea..cc37ef13d50 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: +{ lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl88x2bu-${kernel.version}-${version}"; - version = "unstable-2020-08-20"; + version = "unstable-2021-01-21"; src = fetchFromGitHub { owner = "cilynx"; repo = "rtl88x2BU"; - rev = "a1c53f43fb9995fbe3ad26567079d6384626d350"; - sha256 = "1cby66jg511zxs1i535mflafhryla9764mnrzacxppimxpancv3s"; + rev = "48e7c19c92a77554403e1347447f8e2cfd780228"; + sha256 = "0nw2kgblpq6qlr43gbfxqvq0c83664f4czfwzsyfjr47rj00iyq7"; }; - patches = [ - # https://github.com/cilynx/rtl88x2bu/pull/58 - (fetchpatch { - url = "https://github.com/cilynx/rtl88x2bu/pull/58.patch"; - sha256 = "0md9cv61nx85pk3v60y9wviyb9fgj54q9m26wiv3dc7smr70h8l6"; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ]; @@ -39,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; homepage = "https://github.com/cilynx/rtl88x2bu"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ff890629c3f..535e1c6ce83 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,6 +62,19 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # Pinned due to API changes in pyruckus>0.12 + (self: super: { + pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { + version = "0.12"; + src = fetchFromGitHub { + owner = "gabe565"; + repo = "pyruckus"; + rev = version; + sha256 = "0ykv6r6blbj3fg9fplk9i7xclkv5d93rwvx0fm5s8ms9f2s9ih8z"; + }; + }); + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -308,6 +321,7 @@ in with py.pkgs; buildPythonApplication rec { "rituals_perfume_genie" "rmvtransport" "rss_feed_template" + "ruckus_unleashed" "safe_mode" "scene" "screenlogic" diff --git a/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch deleted file mode 100644 index f78c7af9e35..00000000000 --- a/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001 -From: David Disseldorp -Date: Tue, 1 Sep 2020 13:49:21 +0200 -Subject: [PATCH] cmake: detect and use sigdescr_np() if available - -sys_siglist is deprecated with glibc 2.32. A new thread-safe and -async-signal safe sigdescr_np() function is provided, so use it if -available. - -Fixes: https://tracker.ceph.com/issues/47187 -Signed-off-by: David Disseldorp ---- - cmake/modules/CephChecks.cmake | 1 + - src/global/signal_handler.h | 8 +++++--- - src/include/config-h.in.cmake | 3 +++ - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake -index 23687283a7c6..ca86dcbc73de 100644 ---- a/cmake/modules/CephChecks.cmake -+++ b/cmake/modules/CephChecks.cmake -@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R) - check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT) - check_function_exists(pipe2 HAVE_PIPE2) - check_function_exists(accept4 HAVE_ACCEPT4) -+check_function_exists(sigdescr_np HAVE_SIGDESCR_NP) - - include(CMakePushCheckState) - cmake_push_check_state(RESET) -diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h -index 476724201aa9..c101b2e28733 100644 ---- a/src/global/signal_handler.h -+++ b/src/global/signal_handler.h -@@ -20,10 +20,12 @@ - - typedef void (*signal_handler_t)(int); - --#ifndef HAVE_REENTRANT_STRSIGNAL --# define sig_str(signum) sys_siglist[signum] --#else -+#ifdef HAVE_SIGDESCR_NP -+# define sig_str(signum) sigdescr_np(signum) -+#elif HAVE_REENTRANT_STRSIGNAL - # define sig_str(signum) strsignal(signum) -+#else -+# define sig_str(signum) sys_siglist[signum] - #endif - - void install_sighandler(int signum, signal_handler_t handler, int flags); -diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake -index 1ea3703f620c..59bd4273511a 100644 ---- a/src/include/config-h.in.cmake -+++ b/src/include/config-h.in.cmake -@@ -220,6 +220,9 @@ - /* Define to 1 if you have sched.h. */ - #cmakedefine HAVE_SCHED 1 - -+/* Define to 1 if you have sigdescr_np. */ -+#cmakedefine HAVE_SIGDESCR_NP 1 -+ - /* Support SSE (Streaming SIMD Extensions) instructions */ - #cmakedefine HAVE_SSE - diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index aaa5806d402..e923bb6132e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -110,6 +110,7 @@ let ps.jsonpatch ps.pecan ps.prettytable + ps.pyopenssl ps.pyjwt ps.webob ps.bcrypt @@ -122,10 +123,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.8"; + version = "15.2.10"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "1nmrras3g2zapcd06qr5m7y4zkymnr0r53jkpicjw2g4q7wfmib4"; + sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01"; }; in rec { ceph = stdenv.mkDerivation { @@ -134,7 +135,6 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch - ./ceph-glibc-2-32-sigdescr_np.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/tools/typesetting/tex/mftrace/default.nix new file mode 100644 index 00000000000..627b0843658 --- /dev/null +++ b/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchFromGitHub +, lib +, makeWrapper +, autoreconfHook +, buildEnv +, python3 +, fontforge +, potrace +, texlive +}: + +/* + To use with a texlive distribution, ensure that the desired fonts and + the packages kpathsea, t1utils, metafont are available at runtime. + + Possible overrides: + - potrace = autotrace + - fontforge = ghostscript (limited functionality) + - fontforge = null (limited functionality) +*/ + +let self = stdenv.mkDerivation rec { + pname = "mftrace"; + version = "1.2.20"; + + # https://lilypond.org/download/sources/mftrace/mftrace-1.2.20.tar.gz + # is incomplete, fetch repo and use autoconf instead + # see https://github.com/hanwen/mftrace/issues/13 + src = fetchFromGitHub { + owner = "hanwen"; + repo = "mftrace"; + rev = "release/${version}"; + sha256 = "02ik25aczkbi10jrjlnxby3fmixxrwm2k5r4fkfif3bjfym7nqbc"; + }; + + nativeBuildInputs = [ makeWrapper autoreconfHook python3 potrace ]; + + buildInputs = [ fontforge potrace ]; + + postInstall = '' + wrapProgram $out/bin/mftrace --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + # experimental texlive.combine support + # (note that only the bin/ folder will be combined into texlive) + passthru.tlType = "bin"; + passthru.pkgs = [ self ] ++ + (with texlive; kpathsea.pkgs ++ t1utils.pkgs ++ metafont.pkgs); + + meta = with lib; { + description = "Scalable PostScript Fonts for MetaFont"; + longDescription = '' + mftrace is a small Python program that lets you trace a TeX bitmap + font into a PFA or PFB font (A PostScript Type1 Scalable Font) or + TTF (TrueType) font. + ''; + homepage = "https://lilypond.org/mftrace/"; + license = with licenses; [ gpl2Only mit ]; + maintainers = with maintainers; [ xworld21 ]; + platforms = platforms.all; + }; +}; in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee30924e1d7..6bca83b0bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6043,6 +6043,8 @@ in mesa-demos = callPackage ../tools/graphics/mesa-demos { }; + mftrace = callPackage ../tools/typesetting/tex/mftrace { }; + mhonarc = perlPackages.MHonArc; minergate = callPackage ../applications/misc/minergate { }; @@ -8667,6 +8669,8 @@ in tex-match = callPackage ../tools/typesetting/tex/tex-match { }; + tf2pulumi = callPackage ../development/tools/tf2pulumi { }; + thc-hydra = callPackage ../tools/security/thc-hydra { }; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; @@ -10822,6 +10826,8 @@ in javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; + juniper = callPackage ../development/compilers/juniper/default.nix { }; + julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -22691,6 +22697,8 @@ in focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; + foliate = callPackage ../applications/office/foliate { }; + fondo = callPackage ../applications/graphics/fondo { }; font-manager = callPackage ../applications/misc/font-manager { }; @@ -23904,6 +23912,8 @@ in ffmpeg = ffmpeg_2; }; + kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -23920,6 +23930,8 @@ in konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + kooha = callPackage ../applications/video/kooha { }; + kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fc8843a07d..bf5777629be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -495,6 +495,8 @@ in { arrow = callPackage ../development/python-modules/arrow { }; + arrow_1 = callPackage ../development/python-modules/arrow/1.nix { }; + arviz = callPackage ../development/python-modules/arviz { }; arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };