diff options
95 files changed, 1478 insertions, 543 deletions
diff --git a/README.md b/README.md index 66025a20c4f28..3a03be0d44966 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09) +* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents) +* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index a1121efe3f071..11b49f4f235a0 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -8,12 +8,30 @@ Programs in the GNOME universe are written in various languages but they all use [GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`. -On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` GIO module to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent. +On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent. Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`. Some applications will also require `gsettings-desktop-schemas` for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for `org.gnome.desktop` and `org.gnome.system` to see if the schemas are needed. +### GIO modules {#ssec-gnome-gio-modules} + +GLib’s [GIO](https://developer.gnome.org/gio/stable/ch01.html) library supports several [extension points](https://developer.gnome.org/gio/stable/extending-gio.html). Notably, they allow: + +* implementing settings backends (already [mentioned](#ssec-gnome-settings)) +* adding TLS support +* proxy settings +* virtual file systems + +The modules are typically installed to `lib/gio/modules/` directory of a package and you need to add them to `GIO_EXTRA_MODULES` if you need any of those features. + +In particular, we recommend: + +* adding `dconf.lib` for any software on Linux that reads [GSettings](#ssec-gnome-settings) (even transitivily through e.g. GTK’s file manager) +* adding `glib-networking` for any software that accesses network using GIO or libsoup – glib-networking contains a module that implements TLS support and loads system-wide proxy settings + +To allow software to use various virtual file systems, `gvfs` package can be also added. But that is usually an optional feature so we typically use `gvfs` from the system (e.g. installed globally using NixOS module). + ### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders} GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc349cd9d5072..931fb11a08db6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7281,6 +7281,11 @@ githubId = 628342; name = "Tim Steinbach"; }; + nessdoor = { + name = "Tomas Antonio Lopez"; + email = "entropy.overseer@protonmail.com"; + githubId = 25993494; + }; netcrns = { email = "jason.wing@gmx.de"; github = "netcrns"; diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 9c97ce3834377..5be741395a08d 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -973,7 +973,7 @@ def subtest(name: str) -> Iterator[None]: if __name__ == "__main__": - arg_parser = argparse.ArgumentParser() + arg_parser = argparse.ArgumentParser(prog="nixos-test-driver") arg_parser.add_argument( "-K", "--keep-vm-state", diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 715482e873043..f5780123d6b0b 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -16,13 +16,19 @@ rec { inherit pkgs; - - mkTestDriver = + # Reifies and correctly wraps the python test driver for + # the respective qemu version and with or without ocr support + pythonTestDriver = { + qemu_pkg ? pkgs.qemu_test + , enableOCR ? false + }: let - testDriverScript = ./test-driver/test-driver.py; - in - qemu_pkg: stdenv.mkDerivation { name = "nixos-test-driver"; + testDriverScript = ./test-driver/test-driver.py; + ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; + imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; + in stdenv.mkDerivation { + inherit name; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ]; @@ -35,7 +41,7 @@ rec { buildPhase = '' python <<EOF from pydoc import importfile - with open('driver-exports', 'w') as fp: + with open('driver-symbols', 'w') as fp: fp.write(','.join(dir(importfile('${testDriverScript}')))) EOF ''; @@ -57,20 +63,17 @@ rec { # TODO: copy user script part into this file (append) wrapProgram $out/bin/nixos-test-driver \ + --argv0 ${name} \ --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \ + ${lib.optionalString enableOCR + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - install -m 0644 -vD driver-exports $out/nix-support/driver-exports + install -m 0644 -vD driver-symbols $out/nix-support/driver-symbols ''; }; # Run an automated test suite in the given virtual network. - runTests = { - # the script that runs the network - driver, - # a source position in the format of builtins.unsafeGetAttrPos - # for meta.position - pos, - }: + runTests = { driver, pos }: stdenv.mkDerivation { name = "vm-test-run-${driver.testName}"; @@ -87,10 +90,99 @@ rec { inherit driver; }; - inherit pos; + inherit pos; # for better debugging }; + # Generate convenience wrappers for running the test driver + # has vlans, vms and test script defaulted through env variables + # also instantiates test script with nodes, if it's a function (contract) + setupDriverForTest = { + testScript + , testName + , nodes + , qemu_pkg ? pkgs.qemu_test + , enableOCR ? false + , skipLint ? false + , passthru ? {} + }: + let + # FIXME: get this pkg from the module system + testDriver = pythonTestDriver { inherit qemu_pkg enableOCR;}; + + testDriverName = + let + # A standard store path to the vm monitor is built like this: + # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor + # The max filename length of a unix domain socket is 108 bytes. + # This means $name can at most be 50 bytes long. + maxTestNameLen = 50; + testNameLen = builtins.stringLength testName; + in with builtins; + if testNameLen > maxTestNameLen then + abort + ("The name of the test '${testName}' must not be longer than ${toString maxTestNameLen} " + + "it's currently ${toString testNameLen} characters long.") + else + "nixos-test-driver-${testName}"; + + vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); + vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); + + nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes); + + invalidNodeNames = lib.filter + (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) + (builtins.attrNames nodes); + + testScript' = + # Call the test script with the computed nodes. + if lib.isFunction testScript + then testScript { inherit nodes; } + else testScript; + in + if lib.length invalidNodeNames > 0 then + throw '' + Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! + All machines are referenced as python variables in the testing framework which will break the + script when special characters are used. + Please stick to alphanumeric chars and underscores as separation. + '' + else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName + { + inherit testName; + nativeBuildInputs = [ makeWrapper ]; + testScript = testScript'; + preferLocalBuild = true; + passthru = passthru // { + inherit nodes; + }; + } + '' + mkdir -p $out/bin + + echo -n "$testScript" > $out/test-script + ${lib.optionalString (!skipLint) '' + PYFLAKES_BUILTINS="$( + echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, + < ${lib.escapeShellArg "${testDriver}/nix-support/driver-symbols"} + )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script + ''} + + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ + vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) + wrapProgram $out/bin/nixos-test-driver \ + --add-flags "''${vms[*]}" \ + --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ + --set VLANS '${toString vlans}' + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms + wrapProgram $out/bin/nixos-run-vms \ + --add-flags "''${vms[*]}" \ + --set tests 'start_all(); join_all();' \ + --set VLANS '${toString vlans}' + ''); + + # Make a full-blown test makeTest = { testScript , enableOCR ? false @@ -106,128 +198,47 @@ rec { , ... } @ t: let - # A standard store path to the vm monitor is built like this: - # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor - # The max filename length of a unix domain socket is 108 bytes. - # This means $name can at most be 50 bytes long. - maxTestNameLen = 50; - testNameLen = builtins.stringLength name; - - - - ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; - - imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - - # Generate convenience wrappers for running the test driver - # interactively with the specified network, and for starting the - # VMs from the command line. - mkDriver = qemu_pkg: + nodes = qemu_pkg: let build-vms = import ./build-vms.nix { inherit system pkgs minimal specialArgs; - extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null) + extraConfigurations = extraConfigurations ++ [( { virtualisation.qemu.package = qemu_pkg; - } - ) ++ [( - { # Ensure we do not use aliases. Ideally this is only set # when the test framework is used by Nixpkgs NixOS tests. nixpkgs.config.allowAliases = false; } )]; }; - - # FIXME: get this pkg from the module system - testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg); - - nodes = build-vms.buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { }) - ); - vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); - vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - - testScript' = - # Call the test script with the computed nodes. - if lib.isFunction testScript - then testScript { inherit nodes; } - else testScript; - - testDriverName = with builtins; - if testNameLen > maxTestNameLen then - abort - ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + - "it's currently ${toString testNameLen} characters long.") - else - "nixos-test-driver-${name}"; in - lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName - { - nativeBuildInputs = [ makeWrapper ]; - testScript = testScript'; - preferLocalBuild = true; - testName = name; - passthru = passthru // { - inherit nodes; - }; - } - '' - mkdir -p $out/bin - - echo -n "$testScript" > $out/test-script - ${lib.optionalString (!skipLint) '' - PYFLAKES_BUILTINS="$( - echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, - < ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"} - )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script - ''} - - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) - wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' - ''); # " - - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or { }) // t.meta; - }; - - driver = mkDriver null; - driverInteractive = mkDriver pkgs.qemu; - - test = passMeta (runTests { inherit driver pos; }); + build-vms.buildVirtualNetwork ( + t.nodes or (if t ? machine then { machine = t.machine; } else { }) + ); - nodeNames = builtins.attrNames driver.nodes; - invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) - nodeNames; + driver = setupDriverForTest { + inherit testScript enableOCR skipLint; + testName = name; + qemu_pkg = pkgs.qemu_test; + nodes = nodes pkgs.qemu_test; + }; + driverInteractive = setupDriverForTest { + inherit testScript enableOCR skipLint; + testName = name; + qemu_pkg = pkgs.qemu; + nodes = nodes pkgs.qemu; + }; - nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes); + test = + let + passMeta = drv: drv // lib.optionalAttrs (t ? meta) { + meta = (drv.meta or { }) // t.meta; + }; + in passMeta (runTests { inherit driver pos; }); in - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as python variables in the testing framework which will break the - script when special characters are used. - - Please stick to alphanumeric chars and underscores as separation. - '' - else test // { - inherit test driver driverInteractive; - inherit (driver) nodes; + inherit test driver driverInteractive nodes; }; runInMachine = @@ -235,7 +246,7 @@ rec { , machine , preBuild ? "" , postBuild ? "" - , qemu ? pkgs.qemu_test + , qemu_pkg ? pkgs.qemu_test , ... # ??? }: let @@ -272,6 +283,8 @@ rec { client.succeed("sync") # flush all data before pulling the plug ''; + testDriver = pythonTestDriver { inherit qemu_pkg; }; + vmRunCommand = writeText "vm-run" '' xchg=vm-state-client/xchg ${coreutils}/bin/mkdir $out @@ -290,7 +303,7 @@ rec { unset xchg export tests='${testScript}' - ${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm + ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ in diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index d623e97b8b1e5..3c734a948198b 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -143,6 +143,13 @@ in { List of additional Matrix plugins to make available. ''; }; + withJemalloc = mkOption { + type = types.bool; + default = false; + description = '' + Whether to preload jemalloc to reduce memory fragmentation and overall usage. + ''; + }; no_tls = mkOption { type = types.bool; default = false; @@ -720,7 +727,11 @@ in { --keys-directory ${cfg.dataDir} \ --generate-keys ''; - environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; + environment = { + PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; + } // optionalAttrs (cfg.withJemalloc) { + LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + }; serviceConfig = { Type = "notify"; User = "matrix-synapse"; diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 1ecf9c56e8611..cc98e9fb359c4 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "helvum"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ryuukyu"; repo = pname; rev = version; - sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w="; + sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A="; }; - cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw="; + cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU="; nativeBuildInputs = [ clang copyDesktopItems pkg-config ]; buildInputs = [ glib gtk4 pipewire ]; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index f5752dd96f4ae..c5b9f2b804e84 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , nix-update-script , qmake +, pkg-config , qtbase , qtmultimedia , libvorbis @@ -12,21 +13,16 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85"; + sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w="; }; - postPatch = '' - substituteInPlace src/editor.pro \ - --replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi' - ''; - - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 4f7e43ca004b2..b27593626efb6 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, nix-update-script , autoreconfHook , perl , pkg-config @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4"; + sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; @@ -37,6 +38,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 4310f809bacd8..40f6946d14468 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -4,6 +4,7 @@ let # A list of binaries to put into separate outputs bins = [ "geth" + "clef" ]; in buildGoModule rec { diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index df53bcb52c992..a24666741e143 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I="; + hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs="; }; postPatch = '' diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 0c5a0fe6e3dab..fc6c1d55e7060 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.3"; + version = "4.4.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; + sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg="; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix new file mode 100644 index 0000000000000..eccd8b4c1896a --- /dev/null +++ b/pkgs/applications/misc/jquake/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }: + +stdenv.mkDerivation rec { + pname = "jquake"; + version = "1.6.1"; + + src = fetchurl { + url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; + sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + sourceRoot = "."; + + postPatch = '' + # JQuake emits a lot of debug-like messages in console, but I + # don't think it's in our interest to void them by default. Log them at + # the appropriate level. + sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh + + # By default, an 'errors.log' file is created in the current directory. + # cd into a temporary directory and let it be created there. + substituteInPlace JQuake.sh \ + --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \ + --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + chmod +x JQuake.sh + + mkdir -p $out/{bin,lib} + mv JQuake.sh $out/bin/JQuake + mv {JQuake.jar,JQuake_lib} $out/lib + mv sounds $out/lib + + mkdir -p $out/share/licenses/jquake + mv LICENSE* $out/share/licenses/jquake + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "JQuake"; + desktopName = "JQuake"; + exec = "JQuake"; + comment = "Real-time earthquake map of Japan"; + }) + ]; + + meta = with lib; { + description = "Real-time earthquake map of Japan"; + homepage = "http://jquake.net"; + downloadPage = "https://jquake.net/?down"; + changelog = "https://jquake.net/?docu"; + maintainers = with maintainers; [ nessdoor ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 1900b92e3bbeb..83356b9550a04 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.1.3"; + version = "0.1.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm"; + sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7d666f5ba9f0b..3414627440793 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.25.68"; + version = "1.25.72"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I="; + sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 68ca4a13e4465..8edb42470c2fa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4535.3", - "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18", - "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r", + "version": "93.0.4542.2", + "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw", + "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-06-11", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c", + "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4" } } }, diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 6070308bec697..a7a1737c14645 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.5"; + version = "4.4.6"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s="; + sha256 = "sha256-gId7zDrtkTjFN59yaFyeYwrDZV24hkkV+4dPr8Jr22E="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e486cd9de62a2..f7435aa3ae3b6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.124"; + version = "0.0.125"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91"; + sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix new file mode 100644 index 0000000000000..74449ae705e37 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -0,0 +1,62 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, extra-cmake-modules +, pkg-config +, qtquickcontrols2 +, qtmultimedia +, qtlocation +, qqc2-desktop-style +, kirigami2 +, knotifications +, zxing-cpp +, qxmpp +, gst_all_1 +}: + +mkDerivation rec { + pname = "kaidan"; + version = "0.8.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = with gst_all_1; [ + qtquickcontrols2 + qtmultimedia + qtlocation + qqc2-desktop-style + kirigami2 + knotifications + zxing-cpp + qxmpp + gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good + ]; + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "User-friendly and modern chat app, using XMPP"; + homepage = "https://www.kaidan.im"; + license = with licenses; [ + gpl3Plus + mit + asl20 + cc-by-sa-40 + ]; + maintainers = with maintainers; [ astro ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 87ffa16736e2b..89154ad939ea5 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-06-06"; + version = "unstable-2021-06-14"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "321c19b7415e837acc4e66d535e82518618bc096"; - sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625"; + rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee"; + sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 616a085710244..4217c9ec60a92 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.4.1"; # Please backport all updates to the stable channel. + version = "5.5.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6"; + sha256 = "0l12hwwv0ks2hgp1xc5nmn5rcqzwxdpjqhwysix550m26bz4jczp"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 48a212b4ffb1c..9a65bec21c203 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null -, gpgSupport ? true, sslSupport ? true }: +, gpgSupport ? true, sslSupport ? true, fetchpatch }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; @@ -15,6 +15,17 @@ stdenv.mkDerivation rec { sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; + patches = [ + (fetchpatch { + # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 + name = "patch-libsylph_ssl_c.patch"; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; + sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk="; + }) + ]; + + patchFlags = [ "-p0" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 12fd8357fc7a0..f2a5e2368b4f0 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ="; + sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g="; }; - vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw="; + vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 2610e1f0fc6a4..bf3285a78ead6 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.4"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; + sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 335b18d3eb863..4647f0a072171 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.4"; + version = "1.8.5"; src = fetchPypi { inherit pname version; - sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d"; + sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a"; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 42b376a97f807..38f082b8505a5 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git +{ lib, stdenv, fetchurl, meson, ninja, pkg-config , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland , wayland-protocols, wf-config, wlroots, mesa }: diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 51e3d5a9cdf37..803235e958434 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "40.0"; + version = "40.1.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; + sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 3d7f3e0b8356c..f5652d8c64a18 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.1"; + version = "40.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; + sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc="; }; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 6e8168a306af5..9ccaf8bd63750 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8="; + sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg="; }; patches = [ diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 2e10dbd881507..49a3a5478cffa 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; + sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q"; }; bass_fx = { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 4d0633e411fe2..4c4094987ddea 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { tampering, or message forgery." ''; - homepage = "https://www.gnu.org/software/gnutls/"; + homepage = "https://gnutls.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix new file mode 100644 index 0000000000000..7b48f150c9a14 --- /dev/null +++ b/pkgs/development/libraries/libserdes/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, perl +, boost +, rdkafka +, jansson +, curl +, avro-c +, avro-cpp }: + +stdenv.mkDerivation rec { + pname = "libserdes"; + version = "6.2.0"; + + src = fetchFromGitHub { + owner = "confluentinc"; + repo = pname; + rev = "v${version}"; + sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc"; + }; + + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ]; + + makeFlags = [ "GEN_PKG_CONFIG=y" ]; + + postPatch = '' + patchShebangs configure lds-gen.pl + ''; + + # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + "--libdir=''${!outputLib}/lib" + "--includedir=''${!outputInclude}/include" + ) + ''; + + preInstall = '' + installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig") + ''; + + # Header files get installed with executable bit for some reason; get rid of it. + postInstall = '' + chmod -x ''${!outputInclude}/include/libserdes/*.h + ''; + + meta = with lib; { + description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; + homepage = "https://github.com/confluentinc/libserdes"; + license = licenses.asl20; + maintainers = with maintainers; [ liff ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 97991a0cffbf2..fe02a96a565c4 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch +, nix-update-script , autoreconfHook , pkg-config , perl @@ -16,29 +16,16 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd"; + sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0="; }; - # https://github.com/libsidplayfp/libsidplayfp/issues/13 - # Remove on next version bump - patches = [ - (fetchpatch { - url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch"; - sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957"; - }) - (fetchpatch { - url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch"; - sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g"; - }) - ]; - postPatch = '' patchShebangs . ''; @@ -72,6 +59,12 @@ stdenv.mkDerivation rec { mv docs/html $doc/share/doc/libsidplayfp/ ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; longDescription = '' diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 48c5a4f9b4751..95ce2406223ce 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.4"; + version = "5.1.5"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f"; + sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix new file mode 100644 index 0000000000000..4867c67277d89 --- /dev/null +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, pkg-config +, withGstreamer ? true +, gst_all_1 +}: + +mkDerivation rec { + pname = "qxmpp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "qxmpp-project"; + repo = pname; + rev = "v${version}"; + sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i"; + }; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withGstreamer [ + pkg-config + ]; + buildInputs = lib.optionals withGstreamer (with gst_all_1; [ + gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good + ]); + cmakeFlags = [ + "-DBUILD_EXAMPLES=false" + "-DBUILD_TESTS=false" + ] ++ lib.optionals withGstreamer [ + "-DWITH_GSTREAMER=ON" + ]; + + meta = with lib; { + description = "Cross-platform C++ XMPP client and server library"; + homepage = "https://github.com/qxmpp-project/qxmpp"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ astro ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 848a07dc4563c..f407303d98786 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -76,6 +76,15 @@ stdenv.mkDerivation rec { sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; }; + patches = [ + # TODO: remove on the next version bump + (fetchpatch { + name = "include-schema-conversion-utils-source.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch"; + sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k"; + }) + ]; + buildInputs = [ zlib flatbuffers ]; dontConfigure = true; diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix new file mode 100644 index 0000000000000..1a4c020dc352f --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -0,0 +1,11 @@ +{ re, reason, pastel, ... }: + +{ + pname = "cli"; + + buildInputs = [ + re + reason + pastel + ]; +} diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix new file mode 100644 index 0000000000000..c11c12b46730c --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -0,0 +1,21 @@ +{ buildDunePackage, callPackage, reason, console, ... }: + +{ + pname = "console"; + + buildInputs = [ + reason + ]; + + passthru.tests = { + console = callPackage ./tests/console { + inherit buildDunePackage reason console; + }; + }; + + meta = { + description = "A library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; + homepage = "https://reason-native.com/docs/console/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix new file mode 100644 index 0000000000000..f65aa5159b9d2 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -0,0 +1,43 @@ +{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }: + +let + generic = (somePath: + let + prepkg = import somePath { + inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason; + inherit (reason-native) console file-context-printer fp pastel rely; + }; + in + buildDunePackage + ({ + version = "2021-16-16-aec0ac6"; + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "aec0ac681be7211b4d092262281689c46deb63e1"; + sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE="; + }; + useDune2 = true; + meta = with lib; { + description = "Libraries for building and testing native Reason programs"; + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + } // (prepkg.meta or {}); + } // prepkg) + ); + cli = generic ./cli.nix; # Used only by Rely. +in + lib.makeScope newScope (self: with self; { + console = generic ./console.nix; + dir = generic ./dir.nix; + file-context-printer = generic ./file-context-printer.nix; + fp = generic ./fp.nix; + pastel = generic ./pastel.nix; + pastel-console = generic ./pastel-console.nix; + qcheck-rely = generic ./qcheck-rely.nix; + refmterr = generic ./refmterr.nix; + rely = generic ./rely.nix; + rely-junit-reporter = generic ./rely-junit-reporter.nix; + }) diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix new file mode 100644 index 0000000000000..e6eb9c0c403f3 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -0,0 +1,18 @@ +{ reason, fp, ... }: + +{ + pname = "dir"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "A library that provides a consistent API for common system, user and application directories consistently on all platforms"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix new file mode 100644 index 0000000000000..749e727feeca3 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -0,0 +1,20 @@ +{ reason, re, pastel, ... }: + +{ + pname = "file-context-printer"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + re + pastel + ]; + + meta = { + description = "Utility for displaying snippets of files on the command line"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; + homepage = "https://reason-native.com/docs/file-context-printer/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix new file mode 100644 index 0000000000000..ae6ae50705d5a --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -0,0 +1,14 @@ +{ reason, ... }: + +{ + pname = "fp"; + + buildInputs = [ + reason + ]; + + meta = { + description = "A library for creating and operating on file paths consistently on multiple platforms"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix new file mode 100644 index 0000000000000..f1d2c7cc72643 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -0,0 +1,20 @@ +{ reason, console, pastel, ... }: + +{ + pname = "pastel-console"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + console + pastel + ]; + + meta = { + description = "Small library for pretty coloring to Console output"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; + homepage = "https://reason-native.com/docs/pastel/console"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix new file mode 100644 index 0000000000000..a5abc4e219c5f --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -0,0 +1,20 @@ +{ reason, re, ... }: + +{ + pname = "pastel"; + + minimalOCamlVersion = "4.05"; + + buildInputs = [ + reason + ]; + propagatedBuildInputs = [ + re + ]; + + meta = { + description = "A text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; + homepage = "https://reason-native.com/docs/pastel/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix new file mode 100644 index 0000000000000..a3d297b4f5a5e --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -0,0 +1,20 @@ +{ qcheck-core, reason, console, rely, ... }: + +{ + pname = "qcheck-rely"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + qcheck-core + console + rely + ]; + + meta = { + description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix new file mode 100644 index 0000000000000..9b14d4a8ba313 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -0,0 +1,21 @@ +{ atdgen, re, reason, pastel, ... }: + +{ + pname = "refmterr"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + atdgen + re + pastel + ]; + + meta = { + description = "An error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; + homepage = "https://reason-native.com/docs/refmterr/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix new file mode 100644 index 0000000000000..6e8b41bbd1c47 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -0,0 +1,23 @@ +{ atdgen, junit, re, reason, pastel, rely, ... }: + +{ + pname = "rely-junit-reporter"; + + buildInputs = [ + atdgen + reason + ]; + + propagatedBuildInputs = [ + junit + re + pastel + rely + ]; + + meta = { + description = "A tool providing JUnit Reporter for Rely Testing Framework"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; + homepage = "https://reason-native.com/docs/rely/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix new file mode 100644 index 0000000000000..a2230426bec1d --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -0,0 +1,22 @@ +{ re, reason, cli, file-context-printer, pastel, ... }: + +{ + pname = "rely"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + re + cli + file-context-printer + pastel + ]; + + meta = { + description = "A Jest-inspired testing framework for native OCaml/Reason"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; + homepage = "https://reason-native.com/docs/rely/"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re new file mode 100644 index 0000000000000..15685205e1bca --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re @@ -0,0 +1 @@ +Console.log(Some("Hello fellow Nixer!")); /* {"Hello fellow Nixer!"} */ diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix new file mode 100644 index 0000000000000..e1a995d33c5cf --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, console }: + +buildDunePackage rec { + pname = "console-test"; + version = "1"; + + src = ./.; + + useDune2 = true; + + buildInputs = [ + reason + console + ]; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + ''; +} diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/pkgs/development/ocaml-modules/reason-native/tests/console/dune new file mode 100644 index 0000000000000..49f2121385e28 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -0,0 +1,4 @@ +(executable + (name console-test) + (public_name console-test) + (libraries reason console.lib)) diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix new file mode 100644 index 0000000000000..4c3ff7d85a575 --- /dev/null +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, attrs +, defusedxml +, pytest-aiohttp +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arcam-fmj"; + version = "0.7.0"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "elupus"; + repo = "arcam_fmj"; + rev = version; + sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0"; + }; + + propagatedBuildInputs = [ + aiohttp + attrs + defusedxml + ]; + + checkInputs = [ + pytest-aiohttp + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arcam.fmj" + "arcam.fmj.client" + "arcam.fmj.state" + "arcam.fmj.utils" + ]; + + meta = with lib; { + description = "Python library for speaking to Arcam receivers"; + homepage = "https://github.com/elupus/arcam_fmj"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix new file mode 100644 index 0000000000000..c7abe9cfd9907 --- /dev/null +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pbr +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bimmer-connected"; + version = "0.7.15"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "bimmerconnected"; + repo = "bimmer_connected"; + rev = version; + sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90"; + }; + + nativeBuildInputs = [ + pbr + ]; + + PBR_VERSION = version; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to read data from the BMW Connected Drive portal"; + homepage = "https://github.com/bimmerconnected/bimmer_connected"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/colorthief/default.nix b/pkgs/development/python-modules/colorthief/default.nix new file mode 100644 index 0000000000000..cdb37df3e3924 --- /dev/null +++ b/pkgs/development/python-modules/colorthief/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +}: + +buildPythonPackage rec { + pname = "colorthief"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fengsp"; + repo = "color-thief-py"; + rev = version; + sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm"; + }; + + propagatedBuildInputs = [ + pillow + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "colorthief" ]; + + meta = with lib; { + description = "Python module for grabbing the color palette from an image"; + homepage = "https://github.com/fengsp/color-thief-py"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix new file mode 100644 index 0000000000000..e0e52b6702d92 --- /dev/null +++ b/pkgs/development/python-modules/goalzero/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, ratelimit +}: + +buildPythonPackage rec { + pname = "goalzero"; + version = "0.1.7"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160"; + }; + + propagatedBuildInputs = [ + aiohttp + ratelimit + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "goalzero" ]; + + meta = with lib; { + description = "Goal Zero Yeti REST Api Library"; + homepage = "https://github.com/tkdrob/goalzero"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/libpyfoscam/default.nix b/pkgs/development/python-modules/libpyfoscam/default.nix new file mode 100644 index 0000000000000..3f7eaad8ce81d --- /dev/null +++ b/pkgs/development/python-modules/libpyfoscam/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "libpyfoscam"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c274cafd2c6493ab397fe9f0f8aae0b2c35c7c661fe76dde3bd2f1cd56b8fc32"; + }; + + # tests need access to a camera + doCheck = false; + + pythonImportsCheck = [ "libpyfoscam" ]; + + meta = with lib; { + description = "Python Library for Foscam IP Cameras"; + homepage = "https://github.com/viswa-swami/python-foscam"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix new file mode 100644 index 0000000000000..93f7dcdc0a23b --- /dev/null +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, xmltodict +}: + +buildPythonPackage rec { + pname = "pycontrol4"; + version = "0.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "lawtancool"; + repo = "pyControl4"; + rev = "v${version}"; + sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d"; + }; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ + "pyControl4.account" + "pyControl4.alarm" + "pyControl4.director" + "pyControl4.light" + ]; + + meta = with lib; { + description = "Python 3 asyncio package for interacting with Control4 systems"; + homepage = "https://github.com/lawtancool/pyControl4"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix new file mode 100644 index 0000000000000..45b40ddeadb90 --- /dev/null +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pycoolmasternet-async"; + version = "0.1.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "pycoolmasternet-async"; + rev = "v${version}"; + sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pycoolmasternet_async" ]; + + meta = with lib; { + description = "Python library to control CoolMasterNet HVAC bridges over asyncio"; + homepage = "https://github.com/OnFreund/pycoolmasternet-async"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index f477da365d753..51e43555d5ea2 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; + sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; }; - cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI="; + cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix new file mode 100644 index 0000000000000..3f70f39da951d --- /dev/null +++ b/pkgs/development/tools/database/litestream/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "litestream"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "benbjohnson"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0="; + }; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM="; + + meta = with lib; { + description = "Streaming replication for SQLite"; + license = licenses.asl20; + homepage = "https://litestream.io/"; + maintainers = with maintainers; [ fbrs ]; + }; +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 6c59eaa738388..c4b0546ec368d 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw="; + sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA="; }; - vendorSha256 = null; + vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 148004de46573..5ebc9c9a0f3ce 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282", - "date": "2021-05-21T15:22:56+02:00", - "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp", - "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv", + "rev": "aa429589525bb849189a0c5ddb52267ce578f988", + "date": "2021-06-07T18:47:38+02:00", + "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", + "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 13fd968170957..9ed735f1e3faa 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae", - "date": "2021-03-28T09:12:10-07:00", - "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c", - "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif", + "rev": "008008e30a81849fca0c79291e2b480855e0e02c", + "date": "2021-05-26T09:13:01-07:00", + "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c", + "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3dc04b3b08ada..b8ca41abcf29c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b", - "date": "2021-04-19T23:45:03+02:00", - "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell", - "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1", + "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", + "date": "2021-06-05T13:41:42+02:00", + "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", + "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index c0411d15fb697..65066c66d539d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a", - "date": "2021-05-11T09:51:32-07:00", - "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript", - "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78", + "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", + "date": "2021-06-09T14:12:41-07:00", + "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", + "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 9996ac8d917ec..ce1e4f1bb38dd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/Azganoth/tree-sitter-lua", - "rev": "a943944ec09c5e96f455bb166079de4ef3534457", - "date": "2020-12-27T00:15:24-03:00", - "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua", - "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb", + "url": "https://github.com/nvim-treesitter/tree-sitter-lua", + "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23", + "date": "2021-03-05T14:55:53+01:00", + "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua", + "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 4ff38790b6f7c..49b57f4d8a391 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "6a271f4075e11815e787df9055a950fb844ee63b", - "date": "2021-05-13T12:41:22+02:00", - "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php", - "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb", + "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", + "date": "2021-06-01T20:33:20+02:00", + "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", + "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 37b0d15324085..41c63a2ce8c0e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "965948cce9a94a710b1339851e0919471ad5ee2c", - "date": "2021-03-04T14:34:34-08:00", - "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql", - "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg", + "rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810", + "date": "2021-06-02T18:46:47+02:00", + "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql", + "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index c8142974fd431..a96363af71392 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", - "date": "2021-03-03T16:54:30-08:00", - "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", - "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "rev": "391269d74d20154bbd0ac9be20b35eced6920290", + "date": "2021-05-04T14:02:32-07:00", + "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", + "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 41c4fcfe734d5..b224fa54dafe5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", - "date": "2021-03-20T16:45:11+05:30", - "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", - "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", + "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", + "date": "2021-05-02T10:05:14+05:30", + "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", + "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 168c9a0a403d8..ad064c556ad70 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -75,7 +75,7 @@ let repo = "tree-sitter-nix"; }; "tree-sitter-lua" = { - orga = "Azganoth"; + orga = "nvim-treesitter"; repo = "tree-sitter-lua"; }; "tree-sitter-fennel" = { diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix index 5db843e6f61f0..363dfcaed6120 100644 --- a/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,20 +2,19 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0="; + sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk="; }; goPackagePath = "github.com/twitchtv/twirp"; subPackages = [ "protoc-gen-twirp" - "protoc-gen-twirp_python" ]; doCheck = true; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index dee8ad0c9b847..1211440b6b436 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw="; + sha256 = "sha256-+EXkWtqJihNx5wvEhRycVpPDs1QxfoqcbMW5aLrofI8="; }; - cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ="; + cargoSha256 = "sha256-j/1NJlGRq1MuE+EU7VstwSMmRYfudBmv3nAe3bAyv+U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 8a7573dd5841f..efdcbe9b36d85 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.602.0"; + version = "2021.612.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "t9Byn3eAAkxnBQBfdvz2CGGXu8d3JzTnSz7I68Ntp3A="; + sha256 = "1hrk8sfg4bdrrrqpwb5a8dhpy0lfnrx575z3l2jygzbwgqgr4jy4"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 0b6579bae0648..d0a5717175188 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -301,8 +301,8 @@ }) (fetchNuGet { name = "Markdig"; - version = "0.22.1"; - sha256 = "1m62kjwz93h323w8qvwmld2g8dy17a3ny5wyy29pwqj7ig4y8ymj"; + version = "0.24.0"; + sha256 = "03i0mw9717xwf3pffr8ar7k7fmyhgdw222j58l4x0xr4slpg94l7"; }) (fetchNuGet { name = "MessagePack"; @@ -376,6 +376,11 @@ }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) @@ -446,13 +451,13 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; - version = "0.2.61701"; - sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; + version = "0.2.221401"; + sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r"; }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.222201"; - sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q"; + version = "2.0.226801"; + sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -571,8 +576,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.5"; - sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1"; + version = "5.0.6"; + sha256 = "0kwhcnsagwn3x9ms2sfy5js25gfnipkrakqgn7bbg0a1k35qa5xx"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -751,13 +756,13 @@ }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; - version = "2021.525.0"; - sha256 = "1h8p8d1xk03904fifhi77zrjkh4sknp4mxjqd3nbpfyikd8f7c8p"; + version = "2021.608.0"; + sha256 = "1lsb7nr2gynz7llbl22f5mrd9hlxaq48gssfcn5qfji7afv8kwql"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.601.0"; - sha256 = "0y17s60r4q0c05gm67fmp700zwb7k74xdi45hprblyxsplnbkmi0"; + version = "2021.611.0"; + sha256 = "14a2032khf2ys51rp6qs3ikp0lvqxgdqh0hbvchj34q0l3g40yv0"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -766,8 +771,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2021.525.0"; - sha256 = "15ksxv5fasfzdkmwikjbn17c1d4rssjfm2vp71b7m834ghm6pnbd"; + version = "2021.611.0"; + sha256 = "01pbxccfrwzn47xg9xgjn91l6w3d0d3gqkkx53ak7ynxbbvx9q07"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -1011,11 +1016,6 @@ }) (fetchNuGet { name = "System.Collections.Immutable"; - version = "1.7.1"; - sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) @@ -1381,11 +1381,6 @@ }) (fetchNuGet { name = "System.Reflection.Metadata"; - version = "1.8.1"; - sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; - }) - (fetchNuGet { - name = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) @@ -1446,11 +1441,6 @@ }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.7.1"; - sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) @@ -1701,6 +1691,11 @@ }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; + version = "4.5.2"; + sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix index 0d2a5b117984b..c0bf7a223a3b8 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/misc/emulators/punes/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "punes"; - version = "unstable-2021-04-25"; + version = "unstable-2021-06-05"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35"; - sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s"; + rev = "07fd123f62b2d075894a0cc966124db7b427b791"; + sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l"; }; postPatch = '' diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index bf8ad20cfcbcf..65cc5a185b991 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-06-01"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "80ddcf26eca11cf4d48a52ffec094fe5a4711f32"; - sha256 = "0kh6a5hm0ppsbfpp7yhr2k4v36mj203q59wy15sgajx08ww0jj3m"; + rev = "7587e38c32f4bba2b41516fc3aba3ddc50995e97"; + sha256 = "126fxl5krs6xkq12yjw6j9whh74msznw939hq4i0fcrhsx2f5y5m"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -269,12 +269,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-06-03"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "23b6f64c9523522dd185482c856de492476a760c"; - sha256 = "1ijm4w4nqa037vjpjgjizhzrnpj10hwjc93lhzq29qs3cx85df1q"; + rev = "33639e53d0bf69444275ed048c5bfd7e29396634"; + sha256 = "0zqc4j0nbdhap8a67529n2k4k53xnqxrjsn2a4sdqdwvm207y6r9"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-09"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525"; - sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6"; + rev = "7da6e0f36b88144a3371a07c8ccb8cc9510da9ea"; + sha256 = "18j5jj28riv7nchxlj9q4p83gkn3h1b43c4fpdqfidhbda0lxhl6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -449,12 +449,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-06-04"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "d50cd0c60ecdaffb779d2acb7ce2bb94df1ed867"; - sha256 = "0pqpvqas1z173c2ngka787d9gp49ai3x85haingkxvir3bf0nbqm"; + rev = "436cda40ec6491c68d5f995fa9da41361a3478fc"; + sha256 = "0jw07l6l273w6rs877anjdmiraawain48zs2xxzyvh4pshw8szz9"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-06-08"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11"; - sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg"; + rev = "0692698256a55c0c9c2f12988f12dc68b00890ad"; + sha256 = "0ncdjkgg0yi76rklzhvysiaczh85gwbbsyxnn6z29g5clxcar3j0"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -774,12 +774,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-06-08"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5"; - sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv"; + rev = "b55e4906a10db0f6917058aec6616075c4d06994"; + sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1014,24 +1014,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-06-06"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "a20d2376b57ca500782719f1c4f83796d160c296"; - sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas"; + rev = "2e63db65e99d2d34835e227aa6803ec6cfbde3a9"; + sha256 = "0v2lvrvlmsdpccfwjcl18ijif9appzn62cl58m6p2y4zvcz7dh0z"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-06-05"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6f3574b091d48e37599dcb356349a31472556716"; - sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh"; + rev = "5861affed0158c68b91b0bd3d9f0f4184ac5bb29"; + sha256 = "0dhhqzdr0j1zvgwsssx90b9rfcval18cr5jc9kg6xlccg492x7jl"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1304,12 +1304,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-06-08"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc"; - sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20"; + rev = "f06495b12ba47460c61e8ad1388326e3f94e5637"; + sha256 = "0lxv2c8wa0a6nknw2vfms9fzgjrmjk8klavhs8ay1qcgzis9s1iq"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1462,12 +1462,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-04-14"; + version = "2021-06-11"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "376aacc4ec6dd5495f201bc5bea0c1bcff574535"; - sha256 = "1y3r36594f6vhgi0gzszl9pf1d7jizxj6iamcpwmbqbj75i62hp3"; + rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617"; + sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1522,12 +1522,12 @@ final: prev: ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2020-12-08"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "fbcd9de1e88391d8a1ab39adb520d6a5ac29792f"; - sha256 = "068v0gj7vn3halj0mcjfnziklqcssyln61ip5zalnw7x6vm3yblk"; + rev = "ce27366ab52ef27a2307836e586b9b9c54a00ae5"; + sha256 = "1j69gd5j7bml6a8gaa8skp3z0145372pnqmqq8hfn7gvncql6l97"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -1607,12 +1607,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-05-28"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "496ccb632e1dd66ab4561304faa431125c0bf0de"; - sha256 = "1rbgji9x0bf8l7kqph77nfnpipy4d1863ml3wx75404q43nld7w8"; + rev = "22c37fd12074290561210004918a870db085ceb3"; + sha256 = "1nky1sq602vn8bwdr4h7a3djx0s8adq6jd7jbb87vqb3z63q4xl9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1739,24 +1739,24 @@ final: prev: gina-vim = buildVimPluginFrom2Nix { pname = "gina-vim"; - version = "2021-06-05"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "gina.vim"; - rev = "7069668147157d872821ebed1eee07742ece48fd"; - sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6"; + rev = "abdbe0fe33f3b6fc59e94f7cc3072768f8dfd8ac"; + sha256 = "1f3shh6jxr5i1an2dbb1vmc0l2xg03fm6ava25ahxg4b5ka59bc5"; }; meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame-nvim"; - version = "2021-04-15"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "bba913f065b7fba7150e71dc07e093c758c5ca98"; - sha256 = "1xvy5pnqcrvcs19b2b6l3n9rkj281grcgbrsg87iwvc9sw98bywl"; + rev = "125f09f3e09091fa9cc6585156e199d08989dc0e"; + sha256 = "1d6al5yrwv0wfmy39k8ky5ha1x0a6mz6djscibwz13fvgqka2730"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -1799,12 +1799,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-06-08"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469"; - sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3"; + rev = "229d9c0d387789e5aff7138a513fcd1184b0ec26"; + sha256 = "03yl9dq09l7mfal44qh16k4wav0lq4cq0ng715knnvqc0qhyk7p1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1907,12 +1907,12 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat-nvim"; - version = "2021-06-09"; + version = "2021-06-11"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "0b27de51438f62870f1558ef9c27cb20caec69cf"; - sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf"; + rev = "4e6615e601ce6861dddc6533532a7901fd0a68a4"; + sha256 = "0p4390xdf4m3n6604nvpaca4dnswayja69brg55lhs5x1nrrfsn0"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; @@ -2003,12 +2003,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram-nvim"; - version = "2021-05-21"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "593a458d04f7457669280373d98e41195c106d13"; - sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c"; + rev = "d8300f996fde96fc37c02b89f70642c1c44057a3"; + sha256 = "0g9i5mgd69kgkl27my1xnyd3yf77c8313ikbhm7cn6i6iqml1blf"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -2147,12 +2147,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-03-06"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "47691a67b690ad6ebd9df67574691822d226a5b6"; - sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a"; + rev = "5d5d2f80ec48e3f5fe7237ec17cd1587f39d3be7"; + sha256 = "005nv99jw9ricgy1xyxixl1ssyh7jai9kv7cx95g5igfvvpblz7k"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2400,12 +2400,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-06-09"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "183fa5f3203983fed87174e6f193f271133fe974"; - sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40"; + rev = "95f14d52554bc5d9e7fe1bfe92c0c542aab9125e"; + sha256 = "0isbqyi3ny0zy2npq15j4hpkhnqvf17zv39wpc62i91dqyplp4yy"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2496,24 +2496,24 @@ final: prev: lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2021-05-04"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103"; - sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8"; + rev = "a861f691ac7e40b1b359bc7a147078fa1e0570ce"; + sha256 = "0bi3pghcjdpbrp235bhkgqrsyfr1m6v40krxfb2qbc1yy9plbs9q"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-04-16"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "570e732e9e89f2a900a1e86fb3fa170c7dd201d6"; - sha256 = "0jvd7jp92qffas5hb2m6jg1vlm4g2is8q8hkj5mhyr5gnbpj2xf0"; + rev = "ce6b2e1e09654af34a80af774879eac4708cc11e"; + sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2542,6 +2542,18 @@ final: prev: meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; + lightspeed-nvim = buildVimPluginFrom2Nix { + pname = "lightspeed-nvim"; + version = "2021-06-16"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "lightspeed.nvim"; + rev = "2c9ee4d31c84835e0d929a98d9142ac9e3e9dc0c"; + sha256 = "0hc0xis0zgikf8mlsvqrn2vqjq6v1sscfihd8895wrz0hnzcmn8s"; + }; + meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; + }; + limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; version = "2020-10-13"; @@ -2604,12 +2616,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-06-08"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "88272b6d89e8140a35099ea563978172f2776dc9"; - sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq"; + rev = "3c80042ce8d9aa378698f80ea24742122ac529d7"; + sha256 = "0rrmi7q8f8s208zbbdvfr0ysag8x0xkc8j9cpljc2n8a4pyn6z0z"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3060,12 +3072,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-06-07"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098"; - sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa"; + rev = "c5c39a18b5415da175e37ce8c5c4fb8648edc9f4"; + sha256 = "1ixidbf996nrwmw81h2j5bg2npai4w5dsr2507w436ic04s9dn59"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3264,12 +3276,12 @@ final: prev: nlua-nvim = buildVimPluginFrom2Nix { pname = "nlua-nvim"; - version = "2021-04-22"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "tjdevries"; repo = "nlua.nvim"; - rev = "31e3430acb84368c0933a3e765d834e897dfca2f"; - sha256 = "0h8908x2pf139q6mxckcglb5w7zxvhp0vj97za0g8343lvlhf0v1"; + rev = "a0722bd2f6fdf54f85aaf8dcd6a1032f64c83905"; + sha256 = "1j3350hs5dhbksi7wbzaq5p2268544virj0hj41bs5iv078pjj45"; }; meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; @@ -3288,12 +3300,12 @@ final: prev: nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2020-07-06"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "57dffa746907e8ce5c4b520146ed0d89d3c29a51"; - sha256 = "0xpz71rj74514789v6x9wrg95n8bsag8f5ygd7js40qrwpxq6b4j"; + rev = "537c66ca7c1308430b00dab41d9ad9c4201555f7"; + sha256 = "18v7xgag87czxnm2mvxg273z88gc8bh4jgzl1rh10y6kbbyv9c82"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -3348,24 +3360,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-06-07"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "34a02b4f37a99b80eff03dff90c675b7374af54b"; - sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq"; + rev = "5a5c14e492638856fcd57d867be419829f158278"; + sha256 = "1pyw0y2lhhaid3ggzlnxmc3c0xhs2vgsx3pfgwm46mi5v6xl2h2l"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-06-07"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0"; - sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8"; + rev = "8715d4db49706e7c50958a56e5b14791d539c10c"; + sha256 = "1as567f3apgb9i2rh6j6d3gk6ipwm3kz694rbxzy2rpzmk4ic93h"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3384,12 +3396,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-06-08"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e"; - sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs"; + rev = "2db4a3c2c42816a31db391f30a708d976a8c679c"; + sha256 = "0az2hn4h6cjrr55l56jm3la78lip4c6frz82d731pxqypnynqg84"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3420,12 +3432,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-08"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655"; - sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58"; + rev = "9c123d662715f1346d7b51f37fc78df33fe75e2d"; + sha256 = "0zgwma3wvhq3h64apy06wpnz3gq7dgfzf4yb6llxsqb0qj032f3f"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3444,36 +3456,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-06-07"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5"; - sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv"; + rev = "d5e57dc263ab14ec5d99049f66f5a069b63837dc"; + sha256 = "02gjplbgc2lxbgvirhvk4qp0ns1xk73wf7v4iw6v9bcr6sr95iqn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-06-08"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6"; - sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8"; + rev = "40160a6d6b090339c0337c0c538f670bf9387d63"; + sha256 = "17s0l7xc9080ssv6lk0lhjvj002ccqw7p0k8xb0ps5wacndkm81v"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-05-16"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd"; - sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688"; + rev = "c07c23f52e1019b237927f9520c691e57adb9e6a"; + sha256 = "0pa1xjp6h5ny7lnql8nsqszx0gpzc1fa9xiksq3k1k5yjjj4wm1z"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -3492,24 +3504,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-05-29"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9c15a789df5af1d3c83c0d680154ca226253eb26"; - sha256 = "0dz3bbyrwgxvsdmix2h6xbgj7wv9zbj08wgy46sjhzdhaxdfjx4z"; + rev = "d0bdf0cb2d11064ac09d57bcfd48b53f0ee77124"; + sha256 = "0smkmaz36zjisnlfzjmqgvljb0xk7j07xja69va3bf7k4kcg326y"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-06-06"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "081fac590588ce0f6bcf54699658ba960a514172"; - sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv"; + rev = "dd688e37458a6fdeb050942da8c1260389c2a99a"; + sha256 = "0q4bmp3wy0miaysldpfm6646r8c0llygfnlbmk5brs4la321hjld"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3528,12 +3540,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-06-06"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318"; - sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl"; + rev = "a26e1818fa62cfbcbd9728ad11bc3fc312d6e50e"; + sha256 = "00w6jdpqfzxi9kfvwig052g8c0184pq71fs9p2dryx9klcxkcjnb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3552,12 +3564,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-08"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "f95be0c947237edb88df148dd61790988ab3a23e"; - sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg"; + rev = "f81570d1288fd974098e0f311f728469ca919155"; + sha256 = "162j51rw1gv0gwip4d82qvmgpk7ky22xhhb2sjqm43zhjv3hqy0g"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3636,24 +3648,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-09"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9"; - sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj"; + rev = "bfeaf4c8ef5ff24e93005da2561407a13ba69d4d"; + sha256 = "0sqydjvcjrqzw91b7sk7y9rrcs0l2j34hshcbwwwz8nrilfk6ak7"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-06"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178"; - sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19"; + rev = "84015ac3c7e3f6a05482a26b78a072f8242e62c7"; + sha256 = "170ldagz7d3fnd050jpz0dxjm64lr9biqr7qixc8gfgav664b5ib"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3696,24 +3708,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-06-02"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "cadb8110817884fff506043497c0f2b92026aacb"; - sha256 = "01f1913r1q1x1qwp6l6xrqxfc9lffngnc8js5n37r7naszc9r7w8"; + rev = "6cea13039db901afb75c8efa587274ebd94c875a"; + sha256 = "16bi6lzb4dl6m5kcp7z2q26a9w6sb0lb3y39wd3ai5ir3p7alix4"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-06-04"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0fffdcb37cf7d43bc138c89eb002957819c748af"; - sha256 = "0xd79f7a7zyqj6yzkjanli8r4wjhy17gsp1wl7p7vws6axrbgvjl"; + rev = "8b9def16536e459eafa9e216e05929a02244760b"; + sha256 = "0y958rn62xz2smb1z3ckf3l4pgnd6lph9wdbw52z77yj2bskcgf3"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3792,12 +3804,12 @@ final: prev: one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-06-02"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "d6e62bc7cdfae97d1ffc4f508a43955664ad5b73"; - sha256 = "0bna2kpvaxvwglgmdgp1g93bcygvnc1c25w4isawlgmsclzz9cc6"; + rev = "faf6fb3f98fccbe009c3466f657a8fff84a5f956"; + sha256 = "1ajg3vlrms2jy23sd2my0yrrng6wfjklq8fkpnkgxypd4gy6k9rv"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; @@ -3852,12 +3864,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-06-07"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "d21e0e2c157af0fad6c6752ca07a274632202710"; - sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj"; + rev = "4012bd40af350a38696a6ba92a5df9bd99b48527"; + sha256 = "0w3glp57wm7fkh0x3mqalckf8kw3x0rpbwvnafvfpsaapvmfci4h"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3960,12 +3972,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-02"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "3834d42236c155bb4240fb4008ea6e62c4a21dae"; - sha256 = "1y9aqpb6j36873kcp8dbv5mm04qccjicrs0z0z9cy53s8sgfx558"; + rev = "c4dd6e7b29e77d7d795c0f7c67a8ca9673a7b50f"; + sha256 = "1bq5myxd91pbs2malh4zglmj6bqa3jrjg4allrn9zbkvwxhylygi"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4009,12 +4021,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-08"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "f4c1e227be0a0c863c2de201155401950eda572e"; - sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883"; + rev = "65a16b25f98891e2832daa437cdd682e546a494e"; + sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4201,12 +4213,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-05-28"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "34bbf868da6ef0225739e7977a4063872cd2b1e8"; - sha256 = "0ghy760dc07xwjaf5ci2di8qfq0qip8jyrp7x0rsl820ryy7rggy"; + rev = "a80e199ad4e6e7027f2822fcbf92428606127893"; + sha256 = "0xssz0vhylxhsbr7fm5gbagp23xcbl1nv16845nmahawab6ir9ks"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4297,12 +4309,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-06-03"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "177507f1443be150250ce90c18f5f6fb8d798543"; - sha256 = "0wj6pccjbcvj42i4516y6wjrssyl3p060454yjxhgqnnnzxc2dh4"; + rev = "493202aa28b5b9e4aa378ad04de50162ec1f353c"; + sha256 = "11azahjqg6wvahchds8hanbs8qrx2kjz7g5vcxcfyajfpns1ck6r"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4550,12 +4562,12 @@ final: prev: Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2021-01-02"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "ackyshake"; repo = "Spacegray.vim"; - rev = "012ff0065eac2c149084d59e1272ec0d740051ab"; - sha256 = "0y0jlycgsc8ll5gnqmjc9blyn9ynnzrgnp280k49h4lh5b689y5m"; + rev = "0aa4e5c973413add9766689385bf9137d8c6cbc9"; + sha256 = "12lwvcm2ahwvr8gj1sdlgf42cd2f4xxjmiir68f09yimzajip7yi"; }; meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; }; @@ -4900,12 +4912,12 @@ final: prev: telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols-nvim"; - version = "2021-02-04"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "5139fdf31fdffdac75209362409d62d2b6033a20"; - sha256 = "0va4czhncw7jhirbqr7wdap4qg3i5x7g6ic8migpmv57ym2py0m9"; + rev = "e211b6aeed1f94ca660c407f3052f83ab8f4b2a9"; + sha256 = "0nd02akh5nmcnv8mqih6xpzc4pbhys6rva7v60p38kxx50ycfkvw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; @@ -4924,12 +4936,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-06"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e"; - sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa"; + rev = "6ac5ee0854fe02d651cadf2fc97a2463ff92f322"; + sha256 = "1k2glya8cd000kzfvx5fif9fcqvcq1k2vrkwyzhfm4yngz7bxm1p"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5020,12 +5032,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-05-26"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "8560546c466d1f555573d37e062e95e7ae94bbab"; - sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb"; + rev = "014959e82aabc07a16739c771bf40e7fd6de3fe9"; + sha256 = "031jyzykn9i32h8pq89571p2yrwp1d30qh2616h978l8a7bp8cyq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -5045,12 +5057,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2021-01-23"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "0f29f8e53503b8ce0bb43467064b2401cf34acd1"; - sha256 = "1xx2b59wcnbh5662j7b68maz5ccxj5xpfpnjn2r669aiv0a5snhw"; + rev = "e36a2e45791ef9078de781a781fec70e160044b0"; + sha256 = "1qndaqs38mgkl15n895nzjc98h2cy4gjgr3r72cpwhn9qmzhi5zc"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -5081,12 +5093,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-06-04"; + version = "2021-06-14"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "a7dca6204316b9be7c95d056088c67371151c8ab"; - sha256 = "0b2wha4qmn9gb5fmj57ymhn3jrajq71yk48m8gddr1hx244adknh"; + rev = "36b6813a2103d85b469a61721b030903ddd8b3b3"; + sha256 = "1wbnwa420xa9ypwr6fgfvms7f2kpk3ya0221i6vfifyx37skjkra"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5129,12 +5141,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-06-08"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e"; - sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr"; + rev = "aec91caefec10741722927cf073703a528fe7a8f"; + sha256 = "1a5527adkaawgcj1pm5qp0qiq084x70ljj7a35abjil20f3s7y85"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5765,12 +5777,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-08"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7"; - sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5"; + rev = "47eb68fc714de966b385b679d50e1c6e324a0ed4"; + sha256 = "110fvacvn0r68y4c3p07vi4iv34jjywykpmssvjzclqsia6v758h"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6269,12 +6281,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-05-16"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382"; - sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6"; + rev = "58084475c1e523caeac97ffff62c154f7f8fcc66"; + sha256 = "09nv87iqjnwpfkvbspgwxibjlf1aj4syw0nv885fyw8fjpbhf06l"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -6533,12 +6545,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-06-06"; + version = "2021-06-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "41960996e0c532069533072b3fd820fafe9ce0b3"; - sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i"; + rev = "be9ff95f27d12b7bd46ab5d36f7149cb0864c329"; + sha256 = "1j8lgf5ppp28qqqvvw2isbg4cb00l83np5y7vkqfy9346awwhwq7"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6653,12 +6665,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-06-04"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "edd8c160e54c2861a617777192a48d0a64704192"; - sha256 = "1xdggzasvv3x1h61yqp2rl30r6kppf6aqdjqsrpzihz809w5zgry"; + rev = "57e01d258804fa8a0a2f2e62b33130ecd7d1b57f"; + sha256 = "18hn9x2yfr3h1ji13rkp65lgpcljlp7agkhj3argyymzwid5bxzm"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6701,12 +6713,12 @@ final: prev: vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-05-28"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "66d58b569fdbe0ec389acb66eb4a585f3110e43e"; - sha256 = "0bggkq2p109vc67s0idplrf4sy4j12smwkx2wvsc626bzflzc2fb"; + rev = "73bd562267d3dea92b6e8dd1f0e3caca024927ad"; + sha256 = "01x0y5ma7wz2yjcq12zzlmkn8x4yz4gcmxmkyrcy127pnhjn8a23"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -6737,12 +6749,12 @@ final: prev: vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2020-05-01"; + version = "2021-06-11"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "ef06cf30fd3843e7857fdb79c6868660220b9391"; - sha256 = "0yhai27zqkdmgck1iy64fw9yy2vghmqvj4g2lbh21h50df1sa8cf"; + rev = "00fde0a5e3fe15e329bdeac5331e4b439b6972a8"; + sha256 = "1c66q7bcg0m19zjd3yz5ywhm094cr48yr6rxp8zhlavaswwx8wz7"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -6954,12 +6966,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-06-03"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "daa49da1e7a6d8c8dcbd3a40f91046d1505fd645"; - sha256 = "1qvnij7z48g1m6n2qz5lbgbiwwaqnb626sz6qvhkd5jh556pmfah"; + rev = "8fe150bd775f659da7e40ea2d3ad7473e6d29494"; + sha256 = "1y8bhfcbk5062nrscihr24p8b955c09hnbii5grb4x16jir06cbg"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -7351,12 +7363,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-06-08"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811"; - sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7"; + rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf"; + sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -7460,12 +7472,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-06-02"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "fd9f3c09b04725c8042149bfe3fd080b6f6962cb"; - sha256 = "08cqh4b01jl0iqd1nj2sw2jcwxp48m9rdh50sdnfjgdvynnpagik"; + rev = "be396a2abce5bf564e53c8a1cbef78ea37602ce9"; + sha256 = "0kn6qqry2x9s4i813bglvdpwcq6223m8zay2p77wqds2g8xxz5dk"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7844,12 +7856,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-04-30"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e"; - sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5"; + rev = "1c56693951ce81f344cff0d7c8a6f7ea62a06981"; + sha256 = "017g2cq05pfxjmcdm42qz6pv2cf2v18lnnrfnizm1cd388r9byll"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7988,12 +8000,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-06-04"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "c312d30231f136d2fbb32a2cfea554af5066e6b0"; - sha256 = "1apd860v2xfi3fjgl15j7mgn6nczx10vj324w1vf1ic5nyy4b594"; + rev = "4899585281beab51e5dff1d9ae4d3159244a8275"; + sha256 = "1518dvxf99nvky0mrvgv65if0wjhpiv3021rddhn52j04vri4pdd"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -8252,12 +8264,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-02-03"; + version = "2021-06-12"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "4788a08433c3c90e131fc7d110d82577e1234a86"; - sha256 = "1sq1li4s40xgy8ww4krsxqdqlwhcd9l67551iadccvsvjka16ynw"; + rev = "a006f67d18ce0ed6ff75c98b266eaa606dfcec30"; + sha256 = "0dhkyfignmcv9jwrszk37k7l8h2ivbv3krz5xwk17fbdd2y7jwz2"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -8528,12 +8540,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-04-19"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "2a28fc35f6848ad38681d4b509ae3f5962276b5d"; - sha256 = "05xywkyh809g7zax4wdw5vn29xcs1wg3ylbsdi9rz18phm6im41k"; + rev = "3cee4da7ef73b1c22551d00ac1fdf7f61b71d7cc"; + sha256 = "1xg6kd5nh76bq45q1za4nlmasa8plz57kvqd5ag89samdmzsjny9"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -8744,12 +8756,12 @@ final: prev: vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-05-08"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "9166d42e5dc9bc0ef7e1b9e93d52bb4c5b923560"; - sha256 = "1wr1sqxjy1dqyvkvii8jrxwagfph52z2ij8p1nz5b1kpyzvvpg7b"; + rev = "814a21db89f742c3ea492c69c5a2bfecded1aeb3"; + sha256 = "0acdq2m16mhm3g6n4saqf9fljz5qfdalw88h126z2f6mm731y6pi"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -8937,12 +8949,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-06-03"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "683cf4f2e16149c477a8f5c96b7429932a68d801"; - sha256 = "0gr5k4bzzzvn00plimpkjiavya04jvcgg322k8yblzmm01r6vcr2"; + rev = "3b0050c1079804633494c1b498bf84838c91e97c"; + sha256 = "0vmxjmpih7424k064vjnfpdb417l9gyccd1jmwa4vx33v0mlxzhj"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8997,12 +9009,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-06-07"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "d864a6b2b0f394b9371246cad226adac7507e13d"; - sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m"; + rev = "4d6d02bf940401ee103df8110b412d9ff95be2d2"; + sha256 = "12dz6r6fz3pvd62fxyl8smna88l7k8f60n9s1xnyf573xms5ka5w"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9069,12 +9081,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-06-01"; + version = "2021-06-11"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "2b9d104c57aeb612d7f00e1d071d712ed8671949"; - sha256 = "17f92pka2flwnhx8yg7skbp8kyhbb6gmvm0mni2jm7w3iq68nbmw"; + rev = "8566a3137bd51ca2f6d12a06dbc70ce831dd2d1c"; + sha256 = "0krdc2d6dxpfsy50xk3cq9m9fcmcc5bng7k6yz3qpwz05n4pbgii"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9225,12 +9237,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-06-08"; + version = "2021-06-10"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768"; - sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9"; + rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9"; + sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9417,12 +9429,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-06-07"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "1cbb400d426760a63d5383e2574e9d8905bebe51"; - sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc"; + rev = "bab81953d76f4027e78a9f85ae2ea360597588ef"; + sha256 = "0fbqayfg8pdivdg0fa4q42vb59vvwb1llq73kzh65zgwfs1k1zr1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9430,12 +9442,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-06"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd"; - sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r"; + rev = "4d3ba03b6a592c44547e3aef92489f7fb3a491ef"; + sha256 = "0kxg9kkfbfwcrpfg2vdzzgy2yy6b66y6jcym94g4q3nlj2gg130b"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9478,12 +9490,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-05-28"; + version = "2021-06-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "19cad968d2cd759e7f9de1d662ec680bd93ebebc"; - sha256 = "0r01b6mml6qgyybi6i59bflgqi03w0fnl0wfgwac96ixs2wdvl1l"; + rev = "d4f9bd468deaa9abf665288c9e179701728128bd"; + sha256 = "1v2r5vbqafrg5ay140p4z2vl1lwy6vz16zv6skwz1in0gaicwgxv"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -9708,12 +9720,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-05-12"; + version = "2021-06-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "9ec189bc76ed2850f916394ed8d6127290f51338"; - sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s"; + rev = "c339f13d9e840a9b4e392d104f9a0a2960f4a49a"; + sha256 = "1w8127zhzz74gzclg5bv4kl11cwhi48wqqc1x176rsrlac7qfpp1"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a097cbad66d1d..2013040237392 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -621,7 +621,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs="; + cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9d6ffbb301b4e..d7cf9b811dd58 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -20,7 +20,7 @@ AndrewRadev/sideways.vim@main AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim -andweeb/presence.nvim +andweeb/presence.nvim@main andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf @@ -158,6 +158,7 @@ gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax GEverding/vim-hocon gfanto/fzf-lsp.nvim@main +ggandor/lightspeed.nvim@main gibiansky/vim-textobj-haskell gioele/vim-autoswap gleam-lang/gleam.vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8f09964a2fbc3..13665b3531f4b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }: +{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -120,7 +120,6 @@ let sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; }; nativeBuildInputs = [ jq ]; - buildInputs = [ nixpkgs-fmt ]; postInstall = '' cd "$out/$installPrefix" tmp_package_json=$(mktemp) @@ -1165,9 +1164,16 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.12.3"; - sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf"; + version = "0.14.1"; + sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE="; }; + nativeBuildInputs = [ jq ]; + postInstall = '' + cd "$out/$installPrefix" + tmp_package_json=$(mktemp) + jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json" + mv "$tmp_package_json" package.json + ''; meta = { license = lib.licenses.mit; }; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 8a41cd126dfcb..60e597685e429 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.40"; + version = "0.41"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8="; + sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 63692149f3dcc..3b7cc7d3d4060 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.14"; + version = "1.15"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE="; + sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94="; }; outputs = [ "out" "man" ] diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 04abaab961a90..0672c2904cc7b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -45,7 +45,7 @@ "aprs" = ps: with ps; [ aprslib geopy ]; "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc - "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj + "arcam_fmj" = ps: with ps; [ arcam-fmj ]; "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ]; @@ -94,7 +94,7 @@ "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 - "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected + "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; "bond" = ps: with ps; [ bond-api ]; "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ]; "braviatv" = ps: with ps; [ bravia-tv ]; @@ -130,7 +130,7 @@ "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief + "color_extractor" = ps: with ps; [ colorthief ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ pycomfoconnect ]; "command_line" = ps: with ps; [ ]; @@ -138,9 +138,9 @@ "concord232" = ps: with ps; [ ]; # missing inputs: concord232 "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; - "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 + "control4" = ps: with ps; [ pycontrol4 ]; "conversation" = ps: with ps; [ aiohttp-cors ]; - "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async + "coolmaster" = ps: with ps; [ pycoolmasternet-async ]; "coronavirus" = ps: with ps; [ coronavirus ]; "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; @@ -278,7 +278,7 @@ "foobot" = ps: with ps; [ foobot-async ]; "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi ]; - "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam + "foscam" = ps: with ps; [ libpyfoscam ]; "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; @@ -312,7 +312,7 @@ "glances" = ps: with ps; [ glances-api ]; "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher - "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero + "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ac84462d9f399..5ef4e59a35fea 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -292,6 +292,7 @@ in with py.pkgs; buildPythonApplication rec { "apple_tv" "apprise" "aprs" + "arcam_fmj" "arlo" "asuswrt" "atag" @@ -310,6 +311,7 @@ in with py.pkgs; buildPythonApplication rec { "blink" "blueprint" "bluetooth_le_tracker" + "bmw_connected_drive" "bond" "bosch_shc" "braviatv" @@ -327,12 +329,15 @@ in with py.pkgs; buildPythonApplication rec { "climate" "cloud" "cloudflare" + "color_extractor" "comfoconnect" "command_line" "compensation" "config" "configurator" + "control4" "conversation" + "coolmaster" "coronavirus" "counter" "cover" @@ -386,6 +391,7 @@ in with py.pkgs; buildPythonApplication rec { "folder" "folder_watcher" "foobot" + "foscam" "freebox" "freedns" "fritz" @@ -405,6 +411,7 @@ in with py.pkgs; buildPythonApplication rec { "geonetnz_volcano" "gios" "glances" + "goalzero" "gogogate2" "google" "google_assistant" diff --git a/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/pkgs/tools/misc/hdf4/darwin-aarch64.patch new file mode 100644 index 0000000000000..cff81e5811768 --- /dev/null +++ b/pkgs/tools/misc/hdf4/darwin-aarch64.patch @@ -0,0 +1,11 @@ +--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200 ++++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200 +@@ -1343,7 +1343,7 @@ + #endif /* IA64 */ + + /* Linux AArch64 */ +-#if defined __aarch64__ ++#if defined __aarch64__ && !defined __APPLE__ + + #ifdef GOT_MACHINE + If you get an error on this line more than one machine type has been defined. diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 5373c64d647c3..99acda6b78830 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs"; }) + ./darwin-aarch64.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 0d684b16be580..b268b170ebbfb 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "22"; + version = "23"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr"; + sha256 = "sha256-rwKTumletIN4OzvA2VzYh++vioUftvtKYAZoaEL5P7U="; }; - vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw"; + vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU="; nativeBuildInputs = [ installShellFiles ]; @@ -35,6 +35,6 @@ buildGoModule rec { changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index ebe1f056f4e2b..e6fc7bf3f7fe4 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -2,13 +2,14 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.3"; + version = "0.1.4"; + tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; - rev = "v${version}"; - sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4"; + rev = tag; + sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao="; }; vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; @@ -18,12 +19,19 @@ buildGoModule rec { "-ldflags=" "-s" "-w" - "-X main.toolVersion=${version}" + "-X main.toolVersion=${tag}" "-X main.builtBy=nixpkgs" ]; + doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/tfk8s --version | grep ${tag} > /dev/null + ''; + meta = with lib; { - description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format."; + description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format"; license = licenses.mit; longDescription = '' tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider. diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index ae9a8714b852b..5da02aa771ba8 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.62.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g="; + sha256 = "sha256-+D1KosfeoEzRgAE6WheO0Vo/1oq7+1tWPa7rRemyZYo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index bc6ca60a9e7bd..5b49cbf023bf4 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z"; + sha256 = "0didqsbvrn06aylp71jl3hqb4rd95d8s613xz6jw6mngyjqv0hq2"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index 31b76727cddc0..5d634630128dd 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -5,23 +5,24 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vT+SiSt9QoOkGbnPdKkzE8yehNJMa/3jYC+4h4QeNmw="; + sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4="; }; vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc="; - # Tests wants to download additional files + # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; meta = with lib; { description = "Security risk analysis tool for Kubernetes resources"; homepage = "https://github.com/controlplaneio/kubesec"; + changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9f1bcdc205f..e5668a3a84c0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -946,9 +946,7 @@ in flavour = "git"; }; - logseq = callPackage ../applications/misc/logseq { - electron = electron_12; - }; + logseq = callPackage ../applications/misc/logseq { }; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -13663,6 +13661,8 @@ in litecli = callPackage ../development/tools/database/litecli {}; + litestream = callPackage ../development/tools/database/litestream {}; + lsof = callPackage ../development/tools/misc/lsof { }; ltrace = callPackage ../development/tools/misc/ltrace { }; @@ -15291,6 +15291,8 @@ in qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; + qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {}; + gnet = callPackage ../development/libraries/gnet { }; gnu-config = callPackage ../development/libraries/gnu-config { }; @@ -16226,6 +16228,8 @@ in libsecret = callPackage ../development/libraries/libsecret { }; + libserdes = callPackage ../development/libraries/libserdes { }; + libserialport = callPackage ../development/libraries/libserialport { }; libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; @@ -24779,6 +24783,8 @@ in kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { }; + kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; @@ -30638,6 +30644,8 @@ in j2cli = with python3Packages; toPythonApplication j2cli; + jquake = callPackage ../applications/misc/jquake { }; + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; keynav = callPackage ../tools/X11/keynav { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9168661a75b91..07191c8e96f1e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1144,6 +1144,8 @@ let reason = callPackage ../development/compilers/reason { }; + reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + rope = callPackage ../development/ocaml-modules/rope { }; rpclib = callPackage ../development/ocaml-modules/rpclib { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 528d5dffbf762..e5f55b22c3585 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -499,6 +499,8 @@ in { arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + arcam-fmj = callPackage ../development/python-modules/arcam-fmj { }; + archinfo = callPackage ../development/python-modules/archinfo { }; area = callPackage ../development/python-modules/area { }; @@ -1055,6 +1057,8 @@ in { billiard = callPackage ../development/python-modules/billiard { }; + bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; @@ -1563,6 +1567,8 @@ in { colorspacious = callPackage ../development/python-modules/colorspacious { }; + colorthief = callPackage ../development/python-modules/colorthief { }; + colour = callPackage ../development/python-modules/colour { }; commandparse = callPackage ../development/python-modules/commandparse { }; @@ -2866,6 +2872,8 @@ in { gnureadline = callPackage ../development/python-modules/gnureadline { }; + goalzero = callPackage ../development/python-modules/goalzero { }; + goobook = callPackage ../development/python-modules/goobook { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -3962,6 +3970,8 @@ in { libpurecool = callPackage ../development/python-modules/libpurecool { }; + libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -5222,6 +5232,10 @@ in { pyatag = callPackage ../development/python-modules/pyatag { }; + pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; + + pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; + pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; pyflick = callPackage ../development/python-modules/pyflick { }; |