diff options
59 files changed, 909 insertions, 325 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index afecbf6f539..ef102e3a7a3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2571,6 +2571,12 @@ githubId = 4708206; name = "Daniel Fox Franke"; }; + dgliwka = { + email = "dawid.gliwka@gmail.com"; + github = "dgliwka"; + githubId = 33262214; + name = "Dawid Gliwka"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -7592,6 +7598,16 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + nkje = { + name = "Niels Kristian Lyshøj Jensen"; + email = "n@nk.je"; + github = "NKJe"; + githubId = 1102306; + keys = [{ + longkeyid = "nistp256/0xDE3BADFECD31A89D"; + fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; + }]; + }; nkpvk = { email = "niko.pavlinek@gmail.com"; github = "nkpvk"; @@ -9644,6 +9660,16 @@ githubId = 819413; name = "Benedict Aas"; }; + shreerammodi = { + name = "Shreeram Modi"; + email = "shreerammodi10@gmail.com"; + github = "Shrimpram"; + githubId = 67710369; + keys = [{ + longkeyid = "rsa4096/0x163B16EE76ED24CE"; + fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; + }]; + }; shyim = { email = "s.sayakci@gmail.com"; github = "shyim"; @@ -10868,6 +10894,16 @@ githubId = 1607770; name = "Ulrik Strid"; }; + unclechu = { + name = "Viacheslav Lotsmanov"; + email = "lotsmanov89@gmail.com"; + github = "unclechu"; + githubId = 799353; + keys = [{ + longkeyid = "rsa4096/0xD276FF7467007335"; + fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; + }]; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index be640f53eb6..f510f395161 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -388,6 +388,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix + ./services/hardware/ddccontrol.nix ./services/hardware/fancontrol.nix ./services/hardware/freefall.nix ./services/hardware/fwupd.nix diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix new file mode 100644 index 00000000000..766bf12ee9f --- /dev/null +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -0,0 +1,36 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.ddccontrol; +in + +{ + ###### interface + + options = { + services.ddccontrol = { + enable = lib.mkEnableOption "ddccontrol for controlling displays"; + }; + }; + + ###### implementation + + config = lib.mkIf cfg.enable { + # Give users access to the "gddccontrol" tool + environment.systemPackages = [ + pkgs.ddccontrol + ]; + + services.dbus.packages = [ + pkgs.ddccontrol + ]; + + systemd.packages = [ + pkgs.ddccontrol + ]; + }; +} diff --git a/nixos/modules/services/networking/smartdns.nix b/nixos/modules/services/networking/smartdns.nix index f1888af7041..f84c727f034 100644 --- a/nixos/modules/services/networking/smartdns.nix +++ b/nixos/modules/services/networking/smartdns.nix @@ -54,6 +54,7 @@ in { systemd.packages = [ pkgs.smartdns ]; systemd.services.smartdns.wantedBy = [ "multi-user.target" ]; + systemd.services.smartdns.restartTriggers = [ confFile ]; environment.etc."smartdns/smartdns.conf".source = confFile; environment.etc."default/smartdns".source = "${pkgs.smartdns}/etc/default/smartdns"; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 6be7b7e6846..abd8ab29cae 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -755,7 +755,7 @@ in default = []; example = [ "d /tmp 1777 root root 10d" ]; description = '' - Rules for creating and cleaning up temporary files + Rules for creation, deletion and cleaning of volatile and temporary files automatically. See <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> for the exact format. diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index c17d1953894..d2a8f276f12 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -30,7 +30,10 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; machine.virtualisation.memorySize = 2047; machine.test-support.displayManager.auto.user = user; - machine.environment.systemPackages = [ chromiumPkg ]; + machine.environment = { + systemPackages = [ chromiumPkg ]; + variables."XAUTHORITY" = "/home/alice/.Xauthority"; + }; startupHTML = pkgs.writeText "chromium-startup.html" '' <!DOCTYPE html> @@ -63,8 +66,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec { return "su - ${user} -c " + shlex.quote(cmd) - def get_browser_call(): - """Returns the name of the browser binary as well as CLI options.""" + def launch_browser(): + """Launches the web browser with the correct options.""" # Determine the name of the binary: pname = "${getName chromiumPkg.name}" if pname.find("chromium") != -1: @@ -76,12 +79,19 @@ mapAttrs (channel: chromiumPkg: makeTest rec { else: # For google-chrome-beta and as fallback: binary = pname # Add optional CLI options: - options = "" + options = [] major_version = "${versions.major (getVersion chromiumPkg.name)}" if major_version > "91": # To avoid a GPU crash: - options += "--use-gl=angle --use-angle=swiftshader" - return f"{binary} {options}" + options += ["--use-gl=angle", "--use-angle=swiftshader"] + options.append("file://${startupHTML}") + # Launch the process: + machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown')) + if binary.startswith("google-chrome"): + # Need to click away the first window: + machine.wait_for_text("Make Google Chrome the default browser") + machine.screenshot("google_chrome_default_browser_prompt") + machine.send_key("ret") def create_new_win(): @@ -132,24 +142,32 @@ mapAttrs (channel: chromiumPkg: makeTest rec { @contextmanager - def test_new_win(description): + def test_new_win(description, url, window_name): create_new_win() + machine.wait_for_window("New Tab") + machine.send_chars(f"{url}\n") + machine.wait_for_window(window_name) + machine.screenshot(description) + machine.succeed( + ru( + "${xdo "copy-all" '' + key --delay 1000 Ctrl+a Ctrl+c + ''}" + ) + ) + clipboard = machine.succeed( + ru("${pkgs.xclip}/bin/xclip -o") + ) + print(f"{description} window content:\n{clipboard}") with machine.nested(description): - yield + yield clipboard # Close the newly created window: machine.send_key("ctrl-w") machine.wait_for_x() - url = "file://${startupHTML}" - machine.succeed(ru(f'ulimit -c unlimited; {get_browser_call()} "{url}" & disown')) - - if get_browser_call().startswith("google-chrome"): - # Need to click away the first window: - machine.wait_for_text("Make Google Chrome the default browser") - machine.screenshot("google_chrome_default_browser_prompt") - machine.send_key("ret") + launch_browser() machine.wait_for_text("startup done") machine.wait_until_succeeds( @@ -172,49 +190,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.screenshot("startup_done") - with test_new_win("check sandbox"): - machine.succeed( - ru( - "${xdo "type-url" '' - search --sync --onlyvisible --name "New Tab" - windowfocus --sync - type --delay 1000 "chrome://sandbox" - ''}" - ) - ) - - machine.succeed( - ru( - "${xdo "submit-url" '' - search --sync --onlyvisible --name "New Tab" - windowfocus --sync - key --delay 1000 Return - ''}" - ) - ) - - machine.screenshot("sandbox_info") - - machine.succeed( - ru( - "${xdo "find-window" '' - search --sync --onlyvisible --name "Sandbox Status" - windowfocus --sync - ''}" - ) - ) - machine.succeed( - ru( - "${xdo "copy-sandbox-info" '' - key --delay 1000 Ctrl+a Ctrl+c - ''}" - ) - ) - - clipboard = machine.succeed( - ru("${pkgs.xclip}/bin/xclip -o") - ) - + with test_new_win("sandbox_info", "chrome://sandbox", "Sandbox Status") as clipboard: filters = [ "layer 1 sandbox.*namespace", "pid namespaces.*yes", @@ -261,6 +237,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { machine.screenshot("after_copy_from_chromium") + + with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"): + pass + + machine.shutdown() ''; }) channelMap diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 7851000a7a0..71907fc80b1 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -24,13 +24,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "0mvf2603d9b0s6rh7sl7mg4ipbh0nk05xgh1078mwvx31qjsmq1i"; + sha256 = "1iijggdgj36v7d2zm45c00nrbzxaaah2azflpca0f6fjaaxh3lr2"; }; propagatedBuildInputs = [ @@ -76,12 +76,6 @@ buildPythonApplication rec { rm tests/graph-cursor-nosave.vd # http rm tests/messenger-nosave.vd # dns - # disable some tests which expect Python == 3.6 (not our current version) - # see https://github.com/saulpw/visidata/issues/1014 - rm tests/describe.vd - rm tests/describe-error.vd - rm tests/edit-type.vd - # tests use git to compare outputs to references git init -b "test-reference" git config user.name "nobody"; git config user.email "no@where" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 61e42ce22ec..b898ce33742 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,12 +1,13 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - pname = "FlexGet"; - version = "3.1.127"; + pname = "flexget"; + version = "3.1.131"; src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "25a973eb54f2f9ccd422d536b29038c570de3584b8174d993119e3c6b434cc54"; + pname = "FlexGet"; + inherit version; + sha256 = "sha256-wjMtCrffRhk7NL+Z0PeljuDc3WjVWSMsjWLbqo8qUjU="; }; postPatch = '' @@ -61,9 +62,9 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://flexget.com/"; + homepage = "https://flexget.com/"; description = "Multipurpose automation tool for all of your media"; - license = licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index c180cdb4e01..c9b4c7e5292 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "psi-plus"; - version = "1.5.1520"; + version = "1.5.1549"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0cj811qv0n8xck2qrnps2ybzrpvyjqz7nxkyccpaivq6zxj6mc12"; + sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m"; }; cmakeFlags = [ @@ -45,7 +45,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client"; - maintainers = with maintainers; [ orivej misuzu ]; + maintainers = with maintainers; [ orivej misuzu unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index b212ae05a9d..74e06d4311c 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -2,8 +2,23 @@ with pythonPackages; -buildPythonApplication rec { +let + # Watson is currently not compatible with Click 8. See the following + # upstream issues / MRs: + # + # https://github.com/TailorDev/Watson/issues/430 + # https://github.com/TailorDev/Watson/pull/432 + # + # Workaround the issue by providing click 7 explicitly. + click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {}; + click7-didyoumean = click-didyoumean.override { + click = click7; + }; +in buildPythonApplication rec { pname = "watson"; + + # When you update Watson, please check whether the Click 7 + # workaround above can go away. version = "2.0.1"; src = fetchFromGitHub { @@ -19,7 +34,7 @@ buildPythonApplication rec { ''; checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 0fc85cea05c..e950fcfb1cd 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib -, future, psutil, setuptools +, defusedxml, future, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.0"; + version = "3.2.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "126xpx8i85giy3hkhqh0qcln9i1qj5bfciaqh9486rkl54xm8zsr"; + sha256 = "0m2cxmlyay2rr9hnc08s5q9xwdqy0nhzsl10by4f9ji0kiahnpl6"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -37,6 +37,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ bottle + defusedxml future netifaces psutil diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ca1a98dcdc3..e8330ee2936 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }: let - rpath = lib.makeLibraryPath [ libXinerama libX11 ]; + rpathLibs = [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { @@ -17,15 +17,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE="; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libX11 libXinerama ]; + buildInputs = rpathLibs; postInstall = '' - wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + for p in $out/bin/leftwm*; do + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p + done ''; + dontPatchELF = true; + meta = with lib; { description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index a3d473045e9..bb825c8044e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-06-24"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-YEa84y7ZhLqmN0kNSJR2/Txm5pZvSwuqnmckL4XnyjM="; + sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw="; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 87bf767f5bd..b21f0196d4b 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.4.5"; + name = "gprolog-1.5.0"; src = fetchurl { urls = [ "mirror://gnu/gprolog/${name}.tar.gz" "http://www.gprolog.org/${name}.tar.gz" ]; - sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z"; + sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; hardeningDisable = lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix new file mode 100644 index 00000000000..6ed01d9bbcf --- /dev/null +++ b/pkgs/development/compilers/inklecate/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, unzip, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "inklecate"; + version = "1.0.0"; + + src = + if stdenv.isLinux then + fetchurl { + url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_linux.zip"; + sha256 = "6e17db766222998ba0ae5a5da9857e34896e683b9ec42fad528c3f8bea7398ea"; + name = "${pname}-${version}"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_mac.zip"; + sha256 = "b6f4dd1f95c180637ce193dbb5fa6d59aeafe49a2121a05b7822e6cbbaa6931f"; + name = "${pname}-${version}"; + } + else throw "Not supported on ${stdenv.hostPlatform.system}."; + + # Work around the "unpacker appears to have produced no directories" + # case that happens when the archive doesn't have a subdirectory. + setSourceRoot = "sourceRoot=$(pwd)"; + + nativeBuildInputs = [ unzip makeWrapper ]; + + unpackPhase = '' + unzip -qq -j $src -d $pname-$version + + rm $pname-$version/ink-engine-runtime.dll + rm $pname-$version/ink_compiler.dll + ''; + + installPhase = '' + mkdir -p $out/bin/ + + cp $pname-$version/inklecate $out/bin/inklecate + ''; + + + meta = with lib; { + description = "Compiler for ink, inkle's scripting language"; + longDescription = '' + Inklecate is a command-line compiler for ink, inkle's open source + scripting language for writing interactive narrative + ''; + homepage = "https://www.inklestudios.com/ink/"; + downloadPage = "https://github.com/inkle/ink/releases"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ shreerammodi ]; + }; +} diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 6502890af2b..0af98bbfc07 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -10,8 +10,7 @@ }: let deps = import ./deps.nix { inherit fetchurl; }; - - version = "2020-10-08"; + version = "2021-05-20"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +48,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67"; - sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg"; + rev = "86825796eae15d4d46919bc6e32f1197196ba1b3"; + sha256 = "sha256-izDE7Oil9g47Jf3eHPtW5coNixF71t9i0oYSuelakCo="; }; buildInputs = [dotnet-sdk_3 openssl icu]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 3ca359b3da5..d8356056812 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.2.2"; + version = "5.3"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo="; + sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 9e7beb0a4f8..50a74088f2a 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.6"; + version = "1.1.7"; outputs = [ "out" "dev" ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; + sha256 = "sha256-pqpJ6Uo50BouBU0wGaL21VH5rDiVHKAvJtfzL0YInXU="; }; depsBuildBuild = [ diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 86686d2055e..88c793f9cb5 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -5,6 +5,7 @@ , fetchPypi , minikerberos , prompt_toolkit +, pycryptodomex , pythonOlder , six , tqdm @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.48"; + version = "0.2.49"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f5518987e3d41d213a4ffc4dd38362465b5d2cf99417014cb5402f8ee8c5abac"; + sha256 = "sha256-XCaAaY7a6Gdddm9B0ET+rVzFra5W0GTI/HUMuvpyhzM="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { colorama minikerberos prompt_toolkit + pycryptodomex six tqdm winacl @@ -35,6 +37,7 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; + pythonImportsCheck = [ "aiosmb" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index aecc904af50..d035e413351 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.12.0"; + version = "0.12.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk="; + sha256 = "1va9138igcgbpsnzgr90qwprmhr9h8lryqslc22jxra4r56a502a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index dcd6caaffa2..3c24d5f3192 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps="; + sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw="; }; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 154c67bb379..9521d3ee03b 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -1,14 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-xprocess +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "cachelib"; - version = "0.1.1"; + version = "0.2.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "47e95a67d68c729cbad63285a790a06f0e0d27d71624c6e44c1ec3456bb4476f"; + src = fetchFromGitHub { + owner = "pallets"; + repo = pname; + rev = version; + sha256 = "1jh1ghvrv1mnw6mdq19s6x6fblz9qi0vskc6mjp0cxjpnxxblaml"; }; + checkInputs = [ + pytest-xprocess + pytestCheckHook + ]; + + pythonImportsCheck = [ "cachelib" ]; + meta = with lib; { homepage = "https://github.com/pallets/cachelib"; description = "Collection of cache libraries in the same API interface"; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 5167b986604..5ebaac9cea5 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "geographiclib"; - version = "1.50"; + version = "1.52"; src = fetchPypi { inherit pname version; - sha256 = "0cn6ap5fkh3mkfa57l5b44z3gvz7j6lpmc9rl4g2jny2gvp4dg8j"; + sha256 = "sha256-rEANZyuJVLAwa8qJCwiLuLoqdX3IEzzKC4ePNLM7J0A="; }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "geographiclib" ]; + meta = with lib; { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; maintainers = with maintainers; [ va1entin ]; }; - } diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix new file mode 100644 index 00000000000..67930bcd034 --- /dev/null +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkgs +, python +}: + +buildPythonPackage rec { + pname = "gruut-ipa"; + version = "0.9.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = pname; + rev = "df74f7dff562d868ad8088b7251f9e7206271d37"; + sha256 = "0b2znvjngffxc0mlmqmcai8l22ff09kc39bj6f0lkjw735vclnzh"; + }; + + postPatch = '' + patchShebangs bin/speak-ipa + substituteInPlace bin/speak-ipa \ + --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ + --replace "do espeak" "do ${pkgs.espeak}/bin/espeak" + ''; + + postInstall = '' + install -m0755 bin/speak-ipa $out/bin/speak-ipa + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "gruut_ipa" + ]; + + meta = with lib; { + description = "Library for manipulating pronunciations using the International Phonetic Alphabet (IPA)"; + homepage = "https://github.com/rhasspy/gruut-ipa"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix new file mode 100644 index 00000000000..c922d0b52d4 --- /dev/null +++ b/pkgs/development/python-modules/gruut/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, callPackage +, pythonOlder +, fetchFromGitHub +, Babel +, gruut-ipa +, jsonlines +, num2words +, python-crfsuite +, dataclasses +, python +}: + +let + langPkgs = [ + "cs" + "de" + "es" + "fr" + "it" + "nl" + "pt" + "ru" + "sv" + "sw" + ]; +in +buildPythonPackage rec { + pname = "gruut"; + version = "1.2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = pname; + rev = "v${version}"; + sha256 = "1763qmcd1gxap27jppqaywx03k5cagcl62z2p2qdiqigdksplm2g"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "Babel~=2.8.0" "Babel" + ''; + + propagatedBuildInputs = [ + Babel + gruut-ipa + jsonlines + num2words + python-crfsuite + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ] ++ (map (lang: callPackage ./language-pack.nix { + inherit lang version format src; + }) langPkgs); + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "gruut" + ]; + + meta = with lib; { + description = "A tokenizer, text cleaner, and phonemizer for many human languages"; + homepage = "https://github.com/rhasspy/gruut"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/gruut/language-pack.nix b/pkgs/development/python-modules/gruut/language-pack.nix new file mode 100644 index 00000000000..2d3cfa9cc51 --- /dev/null +++ b/pkgs/development/python-modules/gruut/language-pack.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage + +, lang +, version +, format +, src +}: + +buildPythonPackage rec { + pname = "gruut-lang-${lang}"; + inherit version format src; + + prePatch = '' + cd "${pname}" + ''; + + pythonImportsCheck = [ + "gruut_lang_${lang}" + ]; + + doCheck = false; + + meta = with lib; { + description = "Language files for gruut tokenizer/phonemizer"; + homepage = "https://github.com/rhasspy/gruut"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index a1cd76cd38e..888dbf45342 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.18.1"; + version = "0.18.3"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = version; - sha256 = "0mv4af2y9d1y97bsda94f21nis2jm1zkzv7c806vmvzh5s4r8nfn"; + sha256 = "sha256-10KHUG6WacYzqna97vEhSQWDmJDvDmD5QxLhPW5NQSs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix new file mode 100644 index 00000000000..5f384283536 --- /dev/null +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, pythonOlder +, typing-extensions +, wsproto +, toml +, h2 +, priority +, mock +, pytest-asyncio +, pytest-cov +, pytest-sugar +, pytest-trio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "Hypercorn"; + version = "0.11.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "pgjones"; + repo = pname; + rev = version; + sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh"; + }; + + propagatedBuildInputs = [ wsproto toml h2 priority ] + ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-sugar + pytest-trio + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; + + pythonImportsCheck = [ "hypercorn" ]; + + meta = with lib; { + homepage = "https://pgjones.gitlab.io/hypercorn/"; + description = "The ASGI web server inspired by Gunicorn"; + license = licenses.mit; + maintainers = with maintainers; [ dgliwka ]; + }; +} diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 15850707b18..7e753e2e059 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si"; + sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 61ec91075b5..1fc5f695831 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,22 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +}: -buildPythonPackage { +buildPythonPackage rec { pname = "iso3166"; - version = "0.8"; + version = "1.0.1"; src = fetchFromGitHub { owner = "deactivated"; repo = "python-iso3166"; - # repo has no version tags - rev = "f04e499447bbff10af701cf3dd81f6bcdf02f7d7"; + rev = "v${version}"; sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "iso3166" ]; meta = with lib; { homepage = "https://github.com/deactivated/python-iso3166"; diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 5a2b5f7284a..5e07d6331ac 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.8"; + version = "0.9.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8="; + sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index b5acf6c0543..3d3af7f4669 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,22 +4,22 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.5"; + version = "1.6.3"; src = fetchFromGitHub { - owner = "bebraw"; + owner = "NicklasTegner"; repo = pname; rev = version; - sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld"; + sha256 = "163wkcm06klr68dadr9mb8gblj0ls26w097bjrg4f5j0533ysdpp"; }; patches = [ (substituteAll { src = ./static-pandoc-path.patch; pandoc = "${lib.getBin pandoc}/bin/pandoc"; + pandocVersion = pandoc.version; }) ./skip-tests.patch - ./new-pandoc-headings.patch ]; checkInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Thin wrapper for pandoc"; - homepage = "https://github.com/bebraw/pypandoc"; + homepage = "https://github.com/NicklasTegner/pypandoc"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann bennofs ]; }; diff --git a/pkgs/development/python-modules/pypandoc/new-pandoc-headings.patch b/pkgs/development/python-modules/pypandoc/new-pandoc-headings.patch deleted file mode 100644 index 6716bf57d1b..00000000000 --- a/pkgs/development/python-modules/pypandoc/new-pandoc-headings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tests.py b/tests.py -index aede281..c400888 100755 ---- a/tests.py -+++ b/tests.py -@@ -295,7 +295,7 @@ class TestPypandoc(unittest.TestCase): - - def test_unicode_input(self): - # make sure that pandoc always returns unicode and does not mishandle it -- expected = u'üäöîôû{0}======{0}{0}'.format(os.linesep) -+ expected = u'# üäöîôû'.format(os.linesep) - written = pypandoc.convert_text(u'<h1>üäöîôû</h1>', 'md', format='html') - self.assertTrue(isinstance(written, unicode_type)) - self.assertEqualExceptForNewlineEnd(expected, written) -@@ -305,7 +305,7 @@ class TestPypandoc(unittest.TestCase): - self.assertTrue(isinstance(written, unicode_type)) - - # Only use german umlauts in th next test, as iso-8859-15 covers that -- expected = u'üäö€{0}===={0}{0}'.format(os.linesep) -+ expected = u'# üäö€'.format(os.linesep) - bytes = u'<h1>üäö€</h1>'.encode("iso-8859-15") - - # Without encoding, this fails as we expect utf-8 per default diff --git a/pkgs/development/python-modules/pypandoc/skip-tests.patch b/pkgs/development/python-modules/pypandoc/skip-tests.patch index d8f7f972177..201c5105c53 100644 --- a/pkgs/development/python-modules/pypandoc/skip-tests.patch +++ b/pkgs/development/python-modules/pypandoc/skip-tests.patch @@ -10,11 +10,3 @@ index deb50e0..aede281 100755 def test_basic_conversion_from_http_url(self): url = 'https://raw.githubusercontent.com/bebraw/pypandoc/master/README.md' received = pypandoc.convert_file(url, 'html') -@@ -247,6 +248,7 @@ class TestPypandoc(unittest.TestCase): - - self.assertRaises(RuntimeError, f) - -+ @unittest.skip("pandoc-citeproc has been deprecated") - def test_conversion_with_citeproc_filter(self): - # we just want to get a temp file name, where we can write to - filters = ['pandoc-citeproc'] diff --git a/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch b/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch index bb495e78bea..8f992185d61 100644 --- a/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch +++ b/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch @@ -5,6 +5,7 @@ index 6d5b79b..65437aa 100644 @@ -582,4 +582,4 @@ def clean_pandocpath_cache(): - __version = None +-__version = None ++__version = "@pandocVersion@" -__pandoc_path = None +__pandoc_path = "@pandoc@" diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix new file mode 100644 index 00000000000..cd2adc48c6f --- /dev/null +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-crfsuite"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ryfcdfpqbrf8rcd2rlay2gfiba3px3q508543jf81shrv93hi9v"; + }; + + preCheck = '' + # make sure import the built version, not the source one + rm -r pycrfsuite + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pycrfsuite" + ]; + + meta = with lib; { + description = "Python binding for CRFsuite"; + homepage = "https://github.com/scrapinghub/python-crfsuite"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 412b032db7f..229ac69259d 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.19.1"; + version = "2.20.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4="; + sha256 = "sha256-Wq15JU6sbXPZSk/vAX6fTuc3vxZeRy9dSCNGGv2utY4="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 599908b4931..8ac0958ffdd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.154.0"; + version = "0.155.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QqTHhcEgMfq4+1G3aSAvcyU26kNKiFc3vOTyFRo8l40="; + sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index da0e0554bf7..2d266ffb90b 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.41.0"; + version = "0.45.3"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MK5cWRPGty7S4pkRZJRZF5qitoPM3im8JJW2J3yQqFo="; + sha256 = "sha256-I0TOddYO++tw26gS/h15FSATqCjdQfQXVYSTkV+r5HM="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 9ebc04ca63a..aa7c7c8ca05 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.61.0"; + version = "1.62.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg="; + sha256 = "sha256-5YqGNuC1mmsIsEtnbgumaLuZGy3k6L9jZNbVwZln8WY="; }; meta = with lib; { diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/development/tools/profiling/malt/default.nix new file mode 100644 index 00000000000..fa3810cab67 --- /dev/null +++ b/pkgs/development/tools/profiling/malt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib +, fetchFromGitHub +, cmake, nodejs, libelf, libunwind +}: + +stdenv.mkDerivation rec { + pname = "malt"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "memtt"; + repo = "malt"; + rev = "v${version}"; + sha256 = "1yh9gmf7cggf3mx15cwmm99dha34aibkzhnpd0ckl0fkc6w17xqg"; + }; + + postPatch = '' + sed -i s,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@,@CMAKE_INSTALL_LIBDIR@, \ + src/integration/malt.sh.in + sed -i -e 's,^NODE=""$,NODE=${nodejs}/bin/node,' -e s,^detectNodeJS$,, \ + src/integration/malt-{webview,passwd}.sh.in + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libelf libunwind ]; + + meta = with lib; { + description = "Memory tool to find where you allocate your memory"; + homepage = "https://github.com/memtt/malt"; + license = licenses.cecill-c; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 0f596a0327d..5499a937b28 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, unzip }: let - version = "3.3.115"; + version = "3.5.15"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "104h3b9cvmz2m27a94cfc00xm8wa2p1pvrfs92hrz59hcs8vdldf"; + sha256 = "sha256-JrDAF/3yPGJXwonWIvaKf0dw4GQf3U2wbf5iF4QUXco="; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "0rs2vmdz8c9zs53pjbzy27ir0p5v752cpsnqfaqf0ilx7k6fpnnm"; + sha256 = "sha256-fgVVJ+J4w+Z3Kmryixp844xlLFiRs5PSAcD/wrcXF1w="; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in @@ -31,10 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; installPhase = '' + runHook preInstall install -Dm755 TabNine $out/bin/TabNine install -Dm755 TabNine-deep-cloud $out/bin/TabNine-deep-cloud install -Dm755 TabNine-deep-local $out/bin/TabNine-deep-local install -Dm755 WD-TabNine $out/bin/WD-TabNine + runHook postInstall ''; meta = with lib; { @@ -42,5 +44,6 @@ stdenv.mkDerivation rec { description = "Smart Compose for code that uses deep learning to help you write code faster"; license = licenses.unfree; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix new file mode 100644 index 00000000000..ce3f5b9bf55 --- /dev/null +++ b/pkgs/games/powermanga/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, SDL +, SDL_mixer +, libpng +}: + +stdenv.mkDerivation rec { + pname = "powermanga"; + version = "0.93.1"; + + src = fetchurl { + url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz"; + sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g="; + }; + + nativeBuildInputs = [ + autoconf + automake + ]; + + buildInputs = [ + SDL + SDL_mixer + libpng + ]; + + preConfigure = '' + ./bootstrap + ''; + + installFlags = [ + # Default is $(out)/games + "gamesdir=$(out)/bin" + # We set the scoredir to $TMPDIR. + # Otherwise it will try to write in /var/games at install time + "scoredir=$(TMPDIR)" + ]; + + meta = with lib; { + homepage = "https://linux.tlk.fr/games/Powermanga/"; + downloadPage = "https://linux.tlk.fr/games/Powermanga/download/"; + description = "An arcade 2D shoot-em-up game"; + longDescription = '' + Powermanga is an arcade 2D shoot-em-up game with 41 levels and more than + 200 sprites. It runs in 320x200 or 640x400 pixels, with Window mode or + full screen and support for 8, 15, 16, 24, and 32 bpp. As you go through + the levels, you will destroy enemy spaceships and bosses, collect gems to + power up your ship and get special powers, helpers and weapons. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix new file mode 100644 index 00000000000..d13468b78e0 --- /dev/null +++ b/pkgs/games/tecnoballz/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, SDL +, SDL_mixer +, SDL_image +, libmikmod +, tinyxml +}: + +stdenv.mkDerivation rec { + pname = "tecnoballz"; + version = "0.93.1"; + + src = fetchurl { + url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz"; + sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug="; + }; + + nativeBuildInputs = [ + autoconf + automake + ]; + + buildInputs = [ + SDL + SDL_mixer + SDL_image + libmikmod + tinyxml + ]; + + # Newer compilers introduced warnings + postPatch = '' + substituteInPlace configure.ac \ + --replace "-Werror" "" + ''; + + preConfigure = '' + ./bootstrap + ''; + + installFlags = [ + # Default is $(out)/games + "gamesdir=$(out)/bin" + # We set the scoredir to $TMPDIR at install time. + # Otherwise it will try to write in /var/games at install time + "scoredir=$(TMPDIR)" + ]; + + meta = with lib; { + homepage = "https://linux.tlk.fr/games/TecnoballZ/"; + downloadPage = "https://linux.tlk.fr/games/TecnoballZ/download/"; + description = "A brick breaker game with a sophisticated system of weapons and bonuses"; + longDescription = '' + A exciting Brick Breaker with 50 levels of game and 11 special levels, + distributed on the 2 modes of game to give the player a sophisticated + system of attack weapons with an enormous power of fire that can be build + by gaining bonuses. Numerous decors, musics and sounds complete this great + game. This game was ported from the Commodore Amiga. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 6d9deb022e7..307138c03aa 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.13.12-patch1"; + version = "3.15.9"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-SgDfa3henwUb+oKybFJhvo1GkmC24wWz3U78etk+Dsk="; + sha256 = "sha256-ONp7M6nMlVjxNnsIveDpqV7/WahydphP16DFDrcjY4E="; }; dontUnpack = true; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d82dc8013c2..470faa66b93 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "e230f07465be5b05446da30a098b4a666463503f"; - sha256 = "0kijn7ki8r00gpb3hhxqmbs80qxlsdkwxl9x563rg4frqbz74cd2"; + rev = "2a5a7baffc3b5530a2f167d241b87a3f09ed12e6"; + sha256 = "1dp69c3a1dhiz43cf4p34n2mja44dbfhxxn9y1p18ijvqmsbm2qm"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-06-17"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "99e9370291857c74d9aa7b4a91553ab838c28d95"; - sha256 = "0wckm7829f5gmcjvbh5rfbig5724k3wlb2xbn06k1hcbnv76pyvh"; + rev = "e40bd7e5d08818380b244916c9dbd6bc9c5657a2"; + sha256 = "03qb5ziwpd1x1jwvwsdipindlc0izwlmgnhinxyabhb17shsay7r"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-08"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b7ca56a48d52b0b3c167bbeabe35f0fbf0aa5ac6"; - sha256 = "1c5vc1d0bhlaadrzad27z9y3k96mhfpj27mynci2g4fl73fhwdyg"; + rev = "4ddb9df5d8e7b041aac7183a827b860e6d3433fd"; + sha256 = "1drr4rs8xcpfdsb6xj6577s72k2jmd9a6xamhnqw7k9w4qi8srwk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -521,12 +521,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-06-22"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "dcf506e0cd37bf4929f23bb1faae779895811ea8"; - sha256 = "113p982rm8jp3krxyszmr6zyp586xyyinxqmhfjf14h0v515kklh"; + rev = "0b3967864c7d5cf94682f07d1cdb8afec3c8753f"; + sha256 = "0jpjarg6fjlkwwk69pl44f1r8racb0fzf5dqr58fgn31l7zcvrak"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "443b5e3c026532bf2f593415d55f38237e8646e1"; - sha256 = "0i0nci1pss419jvms7ncjzqbcg00d1hbf1c4v3cvvdssdnrh8gql"; + rev = "acc2b95be6652d79f86d586e52c7566557608476"; + sha256 = "1cp6sqvy3xwssr6dn7nzbxb4a2jpskqdbivpaf7984zd2sx8sqrq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -966,12 +966,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "b3a0d8f5c85567ddfdefc7736336c211cb5ea899"; - sha256 = "0dzyyfgd8dxkn94677afydjclxgb75l0skxcwnfn71hmx7dikjkw"; + rev = "c27b4c93fd117dcfec24894d30aeca0acdfb61c9"; + sha256 = "1q7l3iy90sy02bgrl3bkxk9591h05hha5icyhj48g8rh57s5rxhx"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1014,12 +1014,12 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "ce94c33d78005a1ebe8700a5e81f155b9ca5e797"; - sha256 = "0272pnn3ygi3525sgsvh8s5nbrazvp42ic4v9hqdlnbdcy5ndqrz"; + rev = "2a1760982049f5687e5529f686def375f3fc71d4"; + sha256 = "1pl976sv1y5c50xa4lnj3xnpzk08kycpsh88pq0w3v4kfhqlfdyi"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1256,12 +1256,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-06-27"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "6fc33bed8f5c75a08b14af285d7775d893037cc4"; - sha256 = "1cg4lvb1py6q838rvd2z3kvcr3xa9cziz0wgsjlg7392ivkss8hd"; + rev = "8433287fbebf0574ce0114ede52bdd2e4b87b530"; + sha256 = "05lnq0x1jbmms3adwp89vz2n0j5bqvlqb4siw6ajkylajakfz1zb"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1364,24 +1364,24 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-06-05"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "d02232ff17517f9bc048f0d4a668ef00d57b5f6c"; - sha256 = "17m9nph5xk1dcd5l89asp2fw6jd97hsmr78ni67id23v9mjyqslk"; + rev = "9288bef70cda903edc2561c7612fe2d6a3c73aa5"; + sha256 = "1s6glmc489dfz750d3xikwxm84qqa89qza1jp3vfj7jn47h1r826"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-08"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "ee266d4eda7c57ddb1db460c85e41bc52415e0ea"; - sha256 = "03r4mvg3jysypc4xid13hcysxxbc23n1xw0vrya7i2gygiwjh37b"; + rev = "a29caf1b4926b9595a5a2ed3c83a140e05b8fe22"; + sha256 = "17g8vxww5diys5jllhj151ip4a7pjm9rpi285nzy33v009ixcp30"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1534,12 +1534,12 @@ final: prev: ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2021-06-12"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "ce27366ab52ef27a2307836e586b9b9c54a00ae5"; - sha256 = "1j69gd5j7bml6a8gaa8skp3z0145372pnqmqq8hfn7gvncql6l97"; + rev = "d33fcf7b773b5ddb9ace508e3e77fd716f8d5c36"; + sha256 = "19lpfyp6xbz4ydsl6zn2q8c52lf7s0qbc1f6ksmpps896njpilcm"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -1643,12 +1643,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-07-07"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "21b6ffd6d79cc16272c889e17ae7db3eb2cf8199"; - sha256 = "088gl77k8mzwrzdyc3d0lp68fxi88npz4pvq6xyspb9cfx982x1a"; + rev = "f3ca66b6a2a42eb01ffc255ac03039177b888951"; + sha256 = "08wzq5i86wxdyhl2yrl9ggfhng92pfx5d7rhmxfcm4abnnl9sj07"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1835,12 +1835,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9940d8bef15e2050fbe27e6cfdfdd8dc64e3593c"; - sha256 = "09159xcyxl6hgz6wn02g582gjsf7inrpqib3wpazjldc0fcx1k4p"; + rev = "acbf54d357ddb2c558d7f536a8da409d6e357dff"; + sha256 = "0kvgfvabgg992309xw15slpk0klvzlcjdlnbvgva0bkwkybagnja"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2412,12 +2412,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-05-10"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "acc383d1eab516318816f43e3e380fead8249acb"; - sha256 = "0w777was4z7yk3z6fn55phqzxmsbzbz0v4959h52yi91pdbb4qfc"; + rev = "622d867706697c92016f79ea731be750a36693fa"; + sha256 = "1gs452xkcgr4h0iq6nradirl6arxwv1b61gxqldfmnlpz6lqyd34"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2640,12 +2640,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "bb57b0fd6ce497b42b3f63443c4ee9ae980bcfcb"; - sha256 = "0aln69gkk5b0zmlbh31rf80vc6hnv6bnk4xrmwrpsf7yi16qa1ky"; + rev = "4596cf854b26b14a1fcb720ea0f724bd02ce7b0d"; + sha256 = "1lc29yya4lfzjz8y2rg2inkfdb1khbzqr4z4bfzy6m9g1sbq5krb"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2688,12 +2688,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-07"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "24e8972514124a493f22a27c1e2b7df45dd1e6dc"; - sha256 = "14rr6p4xhm1ibszpm0xj20gnsxqcpqys1dwws239hwwb22y6yd8k"; + rev = "72323c10fe2d91695f7593e572496ab9f004afee"; + sha256 = "05j9qbx43mpa3yn686xa9604lr4v829400iq09nh8h0l48xznjkk"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -2784,12 +2784,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-06-29"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "8ff65412c76eb25731d96089660c9591b87f104b"; - sha256 = "1r2n1mvs5zxxz0khg2dsy6m2w6d3wj7jds9swg5n08wa4m8zl05w"; + rev = "3e3630d8de902904dc6f4f059132a1d4a65be1e1"; + sha256 = "19n6qmq6hms5582dam1d5psywg9mcvfx6ichh5nkj7calgwzb73y"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3108,12 +3108,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-07-03"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c91d18fa8743860d4fe547faef4a3671d428b422"; - sha256 = "16bjicmy9m10cq6gsxlzdsib5qwjj6w1k27wrr07zb01finhj658"; + rev = "7a133c83b174bb40019f42ecc2a80c09bff53f33"; + sha256 = "0y78h67m7jq65ngc8jd8qdlxsb4rhsxz21dxjyy5bx7ic73kqv1v"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3360,12 +3360,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "f576bea507648be342336f7a3f08b5e561792292"; - sha256 = "1r5xpp186nd7wm5xncd7g7q08i3mbxzvfws43220zaywvx06yddm"; + rev = "7afd14b657bc8930e4446d4cec4e51511d04dd33"; + sha256 = "0l23g43b2vinl29x60qn30ax8k2x53x8v2zf3q57sg50csw56avj"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3384,12 +3384,12 @@ final: prev: numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; - version = "2021-07-05"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "ec916bc8db72f576a83d47fc63e09a1c8687bb38"; - sha256 = "0d8m9rh51ibwy1cxsagi78774lrg92iwjwinhk04i3i3smc6z7ja"; + rev = "0ef6d11bd94bc2ef6f311d8f05bd2a4d6471dff6"; + sha256 = "1li62nffx0jq1w97mra4hgfzphvna9m1qgi1fqc4r0vp54dxv3y9"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "83b33e70f4b210ebfae86a2ec2d054ca31f467dd"; - sha256 = "0zgyvqsmc33k9m7ckgs0s8wi365w5xlywz5xh7idlvhzw4r29y5c"; + rev = "4365453208d646276b28d66a6498e6f85b014b93"; + sha256 = "1gr77222dlv085392y03azbksr5hxlygrjw0nrki2v6k2xhisq0a"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3528,12 +3528,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-04"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6767b438023d63a42149ad5a79960504c9c67bd7"; - sha256 = "14backs66fmfznrl86dxpvq7ipcawdql2ky30k9kisllpgzccaw6"; + rev = "aa1d278069ffaff83c9ee10f18e80c5070dc5aae"; + sha256 = "1xnhxpp4g6lfqgrvjfa9333asjs60799qj9ysvx0230a3fnwwjg0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3636,12 +3636,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e01b305a03f0b43899d31c5bdbfa2f972cf19bbf"; - sha256 = "1s45z3pz50czyhffxcv67m7rc4jak4hvx69b9ilc37j6hb1l3l9a"; + rev = "e5e06b4254ccf720c981cbfc4c2733548b4d88c5"; + sha256 = "1afmb701y4gmv447sfqsx74c8zn24d1rxb54svgw6iyk3iq0jjyl"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3708,12 +3708,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-04"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "fbf502a997db9bb97765cf5e69bd8749110e9139"; - sha256 = "14w9xn2ns8zpsyiydqyia34dcdgvk1lhzvbvwriprrp0bhgzmq57"; + rev = "1f1bf3b3efd9b3d4bc1a47bcdee980ff554fbce4"; + sha256 = "0kbxxzh0qpr9cwnk61iyf9hl45kshm21mv8zybi53pi2hygr99k0"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3732,12 +3732,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "61411b27c5e7a9539d0974583df8b6522eb89140"; - sha256 = "1xmzapyryb7l4h0f7wfyvi4znbr032h9xw9mfqq8503c90dzb8nq"; + rev = "08c6a3fb555288250523faf652f2d225f4aceeba"; + sha256 = "09jcxdvk5zdpw9wkrww5g8m68nb48mywjnp5x3ql1kpxd189gpw3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3780,12 +3780,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-07-07"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "321d9870d08bf7205d1088b1bee2a963727b5cc5"; - sha256 = "1rdpxsdvlh8pf20755fz1sfkcpggfalzj6nynilk0bs943pigq9j"; + rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f"; + sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3886,6 +3886,18 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; + onedark-nvim = buildVimPluginFrom2Nix { + pname = "onedark-nvim"; + version = "2021-06-18"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "onedark.nvim"; + rev = "1304235686bc682e744ba9691c7545e0b27762ea"; + sha256 = "0ygy9hl171qa9zp8gmj80azp4vxxn5ba3v19mgy36qf390jgrwc4"; + }; + meta.homepage = "https://github.com/olimorris/onedark.nvim/"; + }; + onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; version = "2021-06-22"; @@ -3936,12 +3948,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3fdea07bec6cb733d2f82e50a10829528b0ed4a9"; - sha256 = "022klki8hgv1i5h91r1ag5jnk37iq6awgfijjzb47z2k525nh0nc"; + rev = "c03bdafcaf000ffe422a31c7b450641ebd644041"; + sha256 = "1c01i6z9kafm5pv9p1j6g5jhg13ynixzwq8g14pcvjsdnzbphffd"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4610,12 +4622,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-08"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "f9320976cee24af73d92a99eac1758c17b897d80"; - sha256 = "1s2zxkgd4hzn5sw6fbf8ba42cvqxpz7rrwf7kidhchzjk9lgf06y"; + rev = "446acd165dcb75b145c2f818aebdb492ff179640"; + sha256 = "0xzpp020w52jfpzpb63jw6495dfkafjlkzdri4dzx8ip2l05wa4g"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5033,12 +5045,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-03"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "38907ce7d74f26d123bfbb8ecf55bc9616b5ece5"; - sha256 = "1dhjpcc6y6vxrlx9333hnjb6w20zmgs536s4kz6yzvn3w9mgk1kq"; + rev = "1dd6f8408b6e3334ddba695a7c4e0fd500f9bff6"; + sha256 = "1jkfaln6m21a1vb44qf6aj1xzl3acfx6d22lzhxn2br2n5ljm5cg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5081,12 +5093,12 @@ final: prev: thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query-vim"; - version = "2019-11-09"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "ron89"; repo = "thesaurus_query.vim"; - rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89"; - sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g"; + rev = "65e67a2dc3290d1fbed59db2a3f58944a73e7251"; + sha256 = "1hak0ncsq43j0vblcgy9y4ylx2lazhij71sm3471cgini42klmgp"; }; meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; @@ -5129,12 +5141,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-07-04"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "d5f9bfc164c7ea306710d1a0a9d2db255387b1db"; - sha256 = "1rrfbdhkgmnyxfk3fjmkk7f5sjdq9mrcw346lrjldgfih5qbaycj"; + rev = "9b276ebeeced9e15707c27e0b2588e7b3e19d9c5"; + sha256 = "1h0gyay7z28q7rdmv6kz8nkn4mxg7m0h99fd767l5rjrzimyxgms"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -5886,12 +5898,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-06"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7b4d7f9f140bbb0860b37d23a16d6bb20797c06a"; - sha256 = "04vws8szlynv0s35xs3w98li89wd48ps6hlssscmk59dmdmjg1m4"; + rev = "1dab6a823a492f5e000b8db18542b36a26bdb3b8"; + sha256 = "1vhnjzx8d7r4ayid9gkrf1pmh3d4x862114wdbk7bha7r5kb01r0"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6666,12 +6678,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-05"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b498607aa79cc7099d02c30ae72812c245cc7091"; - sha256 = "1g20y3p5f99w20fkf2bfsliy9p5isml04ybxf8mmgzivcy1wpbrj"; + rev = "f920245d6b1f34619cf0b971ca433c2dc49b6131"; + sha256 = "0h9l2zk1p15azhvy4lfzi5blsdz69jldh1y1ljhl79jj3dgla0xp"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7677,12 +7689,12 @@ final: prev: vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2020-07-29"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "1460aa915c521864c926aa51fe20bf6bb8eaa065"; - sha256 = "0sbdd1z8nlwpac1n4234pnczavxr1kazvj86xp4a8aa7vggdm9xa"; + rev = "a051646d8528799fa2c0668b35eab756d14605aa"; + sha256 = "0b03mfwihb8swqm2wgw2s1zlszjj1fcs05p84yvfvq8m7lyivgnd"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -7713,12 +7725,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-07-06"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "2a12e25c4236a46d09e4d038560f0412bbdb117f"; - sha256 = "0spq5gw61mxdhrqa1lcj7b9f52cqw7g0aiizjqnskl9915xsjmp2"; + rev = "b662ebc5fb5f995d8565aa3f2cb5c48fa018bbd7"; + sha256 = "0l2a5cl6j1bmxc536893dfy7dcgrmzb70lh4wj1bd4nms409wrqx"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -8121,12 +8133,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-06-27"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4f5388350be1052f610b830c8fce8fbc17370ec6"; - sha256 = "04cljqrywz3y3r336ahri2b2jig9a6pvxljkkjnlssgjlx0azvv9"; + rev = "554a6ac7575f87b5b85d1b2bf60e7071c4164cbc"; + sha256 = "0qh3gzvv3y4fjjk9cqz8nqqh87181rq9pxp4j4ly52jpk7hca7qc"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -8745,12 +8757,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-07-07"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "3d0d1617cf1bfef35c647531aa6d14e057fd5cc1"; - sha256 = "07y060046y6mph1i2qnhrfz8hw3j7i85sp3xq3cwxxssb19rh1g9"; + rev = "ea2ed4bdcd4facaa83d1a44ccdb3d614ad62fec0"; + sha256 = "1zbbr4fbqn36b63mi9wfjl125b8ml9361vin6hpv4zjhhf8xn06w"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8902,12 +8914,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-06-17"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "237c463f40f7b7fe2e4e01518e62bfc00c85ff32"; - sha256 = "1v5kfccjls8bi7h3gs1nq5h68n6d2wc79hqrwkvlvbp2sqwmvrz3"; + rev = "849d378a499ada59d3326c166d44f0a118e4bdbf"; + sha256 = "161a3nh1ggd2ff2d6bllssfds6kcab3z7sckr2q2bbipggl33lkd"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -9563,12 +9575,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-07"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ab62800ea987bcbf3bb53ace9280148a132594cf"; - sha256 = "1rcyhiss26zfkfzs8cb44z7d60098qjvvp1silyb5435agx58h1k"; + rev = "ba23a80f0762852127927becf223d4a011e2388f"; + sha256 = "1jv04ja5c2q7wpbkf5f3kndr1n5aspyddvwpwhran2ffjxnjaqk6"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 54648236a61..7ddb273cd52 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -496,6 +496,7 @@ ojroques/nvim-bufdel@main ojroques/vim-oscyank@main Olical/aniseed Olical/conjure +olimorris/onedark.nvim onsails/lspkind-nvim OrangeT/vim-csharp osyo-manga/shabadou.vim diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 4f58c9f3f2a..4c14d2ecae3 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxptp"; - version = "3.1"; + version = "3.1.1"; src = fetchurl { url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - sha256 = "0zff502w3nlycgv2ad8cy8nd0hqf34kzpzcygi7prp0lrw8mp3zm"; + sha256 = "1nf0w4xyzg884v8blb81zkk6q8p6zbiq9lx61jdqwbbzkdgqbmll"; }; postPatch = '' diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index c5c27f53004..8370dfb16a5 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 -, nodejs-12_x, libsecret, xorg, ripgrep +, moreutils, jq, git, zip, rsync, pkg-config, yarn, python3 +, nodejs-14_x, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-12_x; - python = python2; + nodejs = nodejs-14_x; + python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.8.0"; - commit = "c4610f7829701aadb045d450013b84491c30580d"; + version = "3.9.0"; + commit = "fc6d123da59a4e5a675ac8e080f66e032ba01a1b"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "1snc7dbqfz53337h6av2zhkrn54ypanxljs5by4jqczq96c2v6yk"; + sha256 = "0jgmf8d7hki1iv6yy1z0s5qjyxchxnwj8kv53jrwkllim08swbi3"; }; cloudAgent = buildGoModule rec { @@ -62,9 +62,9 @@ in stdenv.mkDerivation rec { # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = { - x86_64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; - aarch64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; - x86_64-darwin = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + x86_64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; + aarch64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; + x86_64-darwin = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; }.${system} or (throw "Unsupported system ${system}"); }; @@ -210,7 +210,7 @@ in stdenv.mkDerivation rec { ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent # create wrapper - makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \ + makeWrapper "${nodejs-14_x}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" ''; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix new file mode 100644 index 00000000000..1a01ffe954b --- /dev/null +++ b/pkgs/servers/headscale/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "headscale"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "juanfont"; + repo = "headscale"; + rev = "v${version}"; + sha256 = "0iij4hdbdplai5c8kvcwiw11idrk04xbpwb3njdhqcg6pdyx3216"; + }; + + vendorSha256 = "sha256-8MCSN8wn2Y9ejHAIEwTdIXGITaa+FqX7WUMJEr0RcIk="; + + # Ldflags are same as build target in the project's Makefile + # https://github.com/juanfont/headscale/blob/main/Makefile + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + + meta = with lib; { + description = "An implementation of the Tailscale coordination server"; + homepage = "https://github.com/juanfont/headscale"; + license = licenses.bsd3; + maintainers = with maintainers; [ nkje ]; + }; +} diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index c16391a3c50..84df46605fa 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "21.1.1"; + version = "21.1.2"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84="; + sha256 = "sha256-uBy91a1guLetjD7MfsKijJvwIUSGcHNc67UB8Ivr0Ys="; }; depsBuildBuild = [ diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index b157d4b8f79..7906c92ba88 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -11,7 +11,7 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.15.1 +# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 @@ -20,7 +20,7 @@ let python3 = python38; in python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.0.15.1"; + version = "0.1.2"; # https://github.com/coqui-ai/TTS/issues/570 disabled = python3.pythonAtLeast "3.9"; @@ -29,12 +29,11 @@ in python3.pkgs.buildPythonApplication rec { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0z6sbzspgmw5ja8r2zysyhdk4jzlv88a0ihkvxvvwxslkyncdb89"; + sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4"; }; postPatch = '' sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt - sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt sed -i -e 's!numba==[^"]*!numba!' requirements.txt sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt @@ -48,6 +47,7 @@ in python3.pkgs.buildPythonApplication rec { anyascii coqpit flask + gruut gdown inflect jieba diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 888a9a1e3a7..6c5da89b85b 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -46,14 +46,14 @@ let }; in stdenv.mkDerivation rec { pname = "mangohud"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "S7FtO/VLZp6Al13i6IrEbIzsgP3kZ3VSNBLhwReZLqM="; + sha256 = "sha256-RRtti0VnB6SXrpFYaEqANvpgvP/Dkvc+x/I40AXaspU="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b7d0f2c3aad..2a85c0dc2b8 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + ]; + prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 58a43c30a93..3aacb0da6a2 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, automake }: stdenv.mkDerivation rec { - name = "corkscrew-2.0"; + pname = "corkscrew"; + version = "2.0"; src = fetchurl { - url = "http://agroman.net/corkscrew/${name}.tar.gz"; + url = "http://agroman.net/corkscrew/corkscrew-${version}.tar.gz"; sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; }; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 992ee324cc5..7e2eef70b8a 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "19c449h60b2m1d8kawnhpi4y9y4ddm24jmlh8kilqmx8m5l2khr6"; + sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index af83d04e811..e12bed7d925 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "1s0nlbn5fcgqfns8gpx3i87k5qivd8ar59rklvd7fbn6ckrmzi6m"; + sha256 = "0yx5y90shdjwihbjrvv2m3bycgpdalafc9q4acfczfaymag8ggad"; }; doCheck = true; @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0xmw3fyic0fcg7a6z8dr3lv367bxqdhdrlrl2hhlz59xg5kq8b3f"; + cargoSha256 = "11bcn111j4iqwqwpp26w7rnycasbhiixaqb1rq4ry2402hvl90j7"; meta = with lib; { description = "An interactive Nix documentation tool"; longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = [ maintainers.lf- ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 697fdead5bf..bf48184f53a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2881,6 +2881,8 @@ in ink = callPackage ../tools/misc/ink { }; + inklecate = callPackage ../development/compilers/inklecate {}; + interlock = callPackage ../servers/interlock {}; iotools = callPackage ../tools/misc/iotools { }; @@ -5554,6 +5556,10 @@ in stdenv = stdenv_32bit; }; + gruut = with python3.pkgs; toPythonApplication gruut; + + gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; + gx = callPackage ../tools/package-management/gx { }; gx-go = callPackage ../tools/package-management/gx/go { }; @@ -5751,6 +5757,8 @@ in heimdall-gui = heimdall.override { enableGUI = true; }; + headscale = callPackage ../servers/headscale { }; + heisenbridge = callPackage ../servers/heisenbridge { }; helio-workstation = callPackage ../applications/audio/helio-workstation { }; @@ -13805,6 +13813,8 @@ in stdenv = overrideCC stdenv llvmPackages_latest.clang; }); + malt = callPackage ../development/tools/profiling/malt {}; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; mastodon-archive = callPackage ../tools/backup/mastodon-archive { }; @@ -29099,6 +29109,8 @@ in pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + powermanga = callPackage ../games/powermanga { }; + prboom = callPackage ../games/prboom { }; pysolfc = python3Packages.callPackage ../games/pysolfc { }; @@ -29313,6 +29325,8 @@ in tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; + tecnoballz = callPackage ../games/tecnoballz { }; + teetertorture = callPackage ../games/teetertorture { }; teeworlds = callPackage ../games/teeworlds { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec91db5aba5..e5f353cc332 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3131,6 +3131,10 @@ in { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + gruut = callPackage ../development/python-modules/gruut { }; + + gruut-ipa = callPackage ../development/python-modules/gruut-ipa { }; + gsd = callPackage ../development/python-modules/gsd { }; gspread = callPackage ../development/python-modules/gspread { }; @@ -3386,6 +3390,8 @@ in { hypchat = callPackage ../development/python-modules/hypchat { }; + hypercorn = callPackage ../development/python-modules/hypercorn { }; + hyperframe = callPackage ../development/python-modules/hyperframe { }; hyperion-py = callPackage ../development/python-modules/hyperion-py { }; @@ -5379,6 +5385,8 @@ in { python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; + python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; |