diff options
55 files changed, 705 insertions, 483 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 2511f068186..691c0edd9bb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -39,6 +39,7 @@ lua-cmsgpack,,,,,, lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, +lua-protobuf,,,,,,lockejan lua-resty-http,,,,,, lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 882eea3c4a4..2e3dfea8cb6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -281,6 +281,12 @@ </listitem> <listitem> <para> + virtlyst package and <literal>services.virtlyst</literal> + module removed, due to lack of maintainers. + </para> + </listitem> + <listitem> + <para> The <literal>services.graphite.api</literal> and <literal>services.graphite.beacon</literal> NixOS options, and the <literal>python3.pkgs.graphite_api</literal>, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a2757d67e89..6bc7d1917ca 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -107,6 +107,8 @@ In addition to numerous new and upgraded packages, this release has the followin - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. +- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. + - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 616f357663c..2ae463190fb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1107,7 +1107,6 @@ ./services/web-apps/shiori.nix ./services/web-apps/snipe-it.nix ./services/web-apps/vikunja.nix - ./services/web-apps/virtlyst.nix ./services/web-apps/wiki-js.nix ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix deleted file mode 100644 index 5094367a493..00000000000 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.virtlyst; - stateDir = "/var/lib/virtlyst"; - - ini = pkgs.writeText "virtlyst-config.ini" '' - [wsgi] - master = true - threads = auto - http-socket = ${cfg.httpSocket} - application = ${pkgs.virtlyst}/lib/libVirtlyst.so - chdir2 = ${stateDir} - static-map = /static=${pkgs.virtlyst}/root/static - - [Cutelyst] - production = true - DatabasePath = virtlyst.sqlite - TemplatePath = ${pkgs.virtlyst}/root/src - - [Rules] - cutelyst.* = true - virtlyst.* = true - ''; - -in - -{ - - options.services.virtlyst = { - enable = mkEnableOption "Virtlyst libvirt web interface"; - - adminPassword = mkOption { - type = types.str; - description = lib.mdDoc '' - Initial admin password with which the database will be seeded. - ''; - }; - - httpSocket = mkOption { - type = types.str; - default = "localhost:3000"; - description = lib.mdDoc '' - IP and/or port to which to bind the http socket. - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.virtlyst = { - home = stateDir; - createHome = true; - group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; - isSystemUser = true; - }; - - systemd.services.virtlyst = { - wantedBy = [ "multi-user.target" ]; - environment = { - VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; - }; - serviceConfig = { - ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; - User = "virtlyst"; - WorkingDirectory = stateDir; - }; - }; - }; - -} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 0a1ec824986..d14c737a4bd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -35,7 +35,7 @@ let * }; * exporterTest = '' * wait_for_unit("prometheus-<exporterName>-exporter.service") - * wait_for_open_port("1234") + * wait_for_open_port(1234) * succeed("curl -sSf 'localhost:1234/metrics'") * ''; * }; @@ -1063,7 +1063,7 @@ let }; exporterTest = '' wait_for_unit("prometheus-smartctl-exporter.service") - wait_for_open_port("9633") + wait_for_open_port(9633) wait_until_succeeds( "curl -sSf 'localhost:9633/metrics'" ) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4fa666bc787..2a0d60ce5a7 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -45,7 +45,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "--clean" "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix new file mode 100644 index 00000000000..34da4fe9394 --- /dev/null +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, roboto +}: + +buildGoModule rec { + pname = "deckmaster"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "deckmaster"; + rev = "v${version}"; + sha256 = "sha256-q2rUHfAvTGXBAGrZUtHMuZr6fYWmpha+al2FG8sCC0Y="; + }; + + vendorSha256 = "sha256-kj4lRHuQ9e0TOC4p4Ak3AB3Lx0JN1jqXaVKlee9EtCg="; + + proxyVendor = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # Let the app find Roboto-*.ttf files (hard-coded file names). + postFixup = '' + wrapProgram $out/bin/deckmaster \ + --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ + ''; + + meta = with lib; { + description = "An application to control your Elgato Stream Deck on Linux"; + homepage = "https://github.com/muesli/deckmaster"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/dwdiff/default.nix b/pkgs/applications/misc/dwdiff/default.nix new file mode 100644 index 00000000000..320f8e25bcb --- /dev/null +++ b/pkgs/applications/misc/dwdiff/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +, gettext +, pkg-config +, icu +}: + +stdenv.mkDerivation rec { + pname = "dwdiff"; + version = "2.1.4"; + + src = fetchurl { + url = "https://os.ghalkes.nl/dist/dwdiff-${version}.tar.bz2"; + sha256 = "sha256-3xb+xE3LRn1lpCRqQ2KPk3QZlsF3PpMLkMbd4i3Vjgo="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gettext + icu + ]; + + meta = with lib; { + description = "Front-end for the diff program that operates at the word level instead of the line level"; + homepage = "https://os.ghalkes.nl/dwdiff.html"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; + +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 1dd8361f203..b97b20d6be6 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.4"; + version = "0.30.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AdT3qL0frsTi4R4AbmZlPDx0Q2RixC3e4AyEMgGgnlc="; + sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 53a112790ba..f24e1255d5e 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -1,14 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, cmake, folly, boost, gflags, glog, openssl, double-conversion, fmt }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, folly +, boost +, gflags +, glog +, openssl +, double-conversion +, fmt +, unstableGitUpdater +}: stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-03-24"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "43319e59d0c77092468367cdadab37d12d7a2383"; - sha256 = "sha256-MajYK2eTUbWhEql0iTlgW5yLg9xAGZQk+Dx4fNxFFqw="; + rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; + sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; }; nativeBuildInputs = [ cmake ]; @@ -24,6 +36,10 @@ stdenv.mkDerivation { "-DWDT_USE_SYSTEM_FOLLY=ON" ]; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { description = "Warp speed Data Transfer"; homepage = "https://github.com/facebook/wdt"; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 3ddcd6206d6..1acc6a287ca 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JAGS"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; - sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; + sha256 = "sha256-+SWDVbXp6xO9M8X6cg8MvrrOp9CkpCtxsPsUUB7hQik="; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 382f08f7afc..2389cd98d89 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -20,6 +20,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf" \ + --replace "scmrepo==0.0.25" "scmrepo" \ + --replace "dvc-data==0.0.16" "dvc-data" \ + --replace "dvc-render==0.0.6" "dvc-render" \ + --replace "setuptools_scm_git_archive==1.1" "setuptools_scm_git_archive" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm setuptools-scm-git-archive @@ -82,16 +93,6 @@ python3.pkgs.buildPythonApplication rec { importlib-resources ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "grandalf==0.6" "grandalf" \ - --replace "scmrepo==0.0.25" "scmrepo" \ - --replace "dvc-data==0.0.16" "dvc-data" \ - --replace "dvc-render==0.0.6" "dvc-render" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - # Tests require access to real cloud services doCheck = false; @@ -100,5 +101,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://dvc.org"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai fab ]; + # ImportError: cannot import name 'GDriveAuthError' from 'dvc_objects.fs.implementations.gdrive' + broken = true; }; } diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index ad12c222566..549f3e3c944 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index f7c02d8699d..4cffaba594a 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/bluedevil-5.25.3.tar.xz"; - sha256 = "059nm5rd5l8ql78slrjcgkjhka7g1rnh0f1nbgf57qccs7wp6qb5"; - name = "bluedevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/bluedevil-5.25.4.tar.xz"; + sha256 = "1cygnmigwqx1mqynfafcypkvf9bmz05rmrfwlxsksvll8yd9xn84"; + name = "bluedevil-5.25.4.tar.xz"; }; }; breeze = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-5.25.3.tar.xz"; - sha256 = "0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw"; - name = "breeze-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-5.25.4.tar.xz"; + sha256 = "0lw0vj07z8l19v2z31d601kfanqixy3dbsv0lf8q273xv3li9sbp"; + name = "breeze-5.25.4.tar.xz"; }; }; breeze-grub = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-grub-5.25.3.tar.xz"; - sha256 = "12l6skbbr4wv86k5f8969lg9m30x2nrgm38w0mr7fnsqavpbm7v6"; - name = "breeze-grub-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-grub-5.25.4.tar.xz"; + sha256 = "10n380h77czwgbpcjhriai43pk9q08l9j819nqm9wbwmsw7gj31s"; + name = "breeze-grub-5.25.4.tar.xz"; }; }; breeze-gtk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-gtk-5.25.3.tar.xz"; - sha256 = "1nmnxrhidv420bqm97cgmck44kzi6sdqaqg3bim07hbnzbq76d6r"; - name = "breeze-gtk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-gtk-5.25.4.tar.xz"; + sha256 = "1x9a74f2anybvgmj4yl7pzz14jckjly55sb8hhlyrd1mp2k8p4mi"; + name = "breeze-gtk-5.25.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-plymouth-5.25.3.tar.xz"; - sha256 = "1lvsr48mrfjjvs132x2bn4dpwals8k8xinddn9nxykvqw5fiw3wd"; - name = "breeze-plymouth-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-plymouth-5.25.4.tar.xz"; + sha256 = "0wfhhaknvy51zrgfkcjrgc5s3q8y3pqb4r92nr37055cdvncwz79"; + name = "breeze-plymouth-5.25.4.tar.xz"; }; }; discover = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/discover-5.25.3.tar.xz"; - sha256 = "0bdg5gxl4zymmy44pvxs9nlk71psdra3778z20ss1j1k3x8dhlrs"; - name = "discover-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/discover-5.25.4.tar.xz"; + sha256 = "154sjr7c8dwlf1m22vh3wqiyfii8xpmxmfrf36i9r0xyb0zb5zg6"; + name = "discover-5.25.4.tar.xz"; }; }; drkonqi = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/drkonqi-5.25.3.tar.xz"; - sha256 = "11g6pqxb4gjcg9jsm3z9yiqljkks30i2mvanvas5ds1y4py3q7a1"; - name = "drkonqi-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/drkonqi-5.25.4.tar.xz"; + sha256 = "06na44x22bxd94r24xkzc373d0rhmv6l1awfq0bzh9cxpy8yg3f4"; + name = "drkonqi-5.25.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kactivitymanagerd-5.25.3.tar.xz"; - sha256 = "1095rmvgc9fzflpd9l1kzwdgk5zh7wxyyx7vzzb1kpdhvg4nwx57"; - name = "kactivitymanagerd-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kactivitymanagerd-5.25.4.tar.xz"; + sha256 = "1cpz08jkmxw9576h9mkn15vwg3bxgk8k6w4f38rkiasxzj6zfamd"; + name = "kactivitymanagerd-5.25.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-cli-tools-5.25.3.tar.xz"; - sha256 = "0m8v51ngxfwjianvw1ydr2dpblgik8kv7zw8mi95361kck9jh31h"; - name = "kde-cli-tools-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-cli-tools-5.25.4.tar.xz"; + sha256 = "00p6vm9qw871hjclvw21nh93dq60r1ylb95hscx917gfx42dan8x"; + name = "kde-cli-tools-5.25.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-gtk-config-5.25.3.tar.xz"; - sha256 = "0xjb0vff7mw1kfj5b472plclk80hdqxi2858m3nmkh41bl6a523r"; - name = "kde-gtk-config-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-gtk-config-5.25.4.tar.xz"; + sha256 = "03cr5v7sr67vhcidr87min8z1ld5dm0n6yh79c1ghp1hp5ndscl8"; + name = "kde-gtk-config-5.25.4.tar.xz"; }; }; kdecoration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdecoration-5.25.3.tar.xz"; - sha256 = "0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y"; - name = "kdecoration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdecoration-5.25.4.tar.xz"; + sha256 = "1yw7qjrf0c9xl2mncasbh3c1nf3c8x1v8ccfnp540z9slqi5qfmi"; + name = "kdecoration-5.25.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdeplasma-addons-5.25.3.tar.xz"; - sha256 = "0z976qy49dbvn8nskkrwc1zfnjd3gdzbxzwkg0ini6vypfysybqm"; - name = "kdeplasma-addons-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdeplasma-addons-5.25.4.tar.xz"; + sha256 = "1lgmmqr798cfxmllalgzixf3v9xbiiazbn3vkcdqxcj6cjf730c0"; + name = "kdeplasma-addons-5.25.4.tar.xz"; }; }; kgamma5 = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kgamma5-5.25.3.tar.xz"; - sha256 = "10750h6pb98c39s6ijk353jahwjhnj2nqmsmspx9jdz8ig20ygm0"; - name = "kgamma5-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kgamma5-5.25.4.tar.xz"; + sha256 = "1m72dl1rxsh56pmacx0q0qda7lr4359azik2lnhw7nhs30z4p25a"; + name = "kgamma5-5.25.4.tar.xz"; }; }; khotkeys = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/khotkeys-5.25.3.tar.xz"; - sha256 = "1v4c7lljdvl56mkk8hgbrrx13jdsq7mg8ggrf3qnv1x48yi31rdj"; - name = "khotkeys-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/khotkeys-5.25.4.tar.xz"; + sha256 = "0hkicwkcjb4p4k5yh8d60h6khsvrqkhjx42aby6rxd3mgvrqd3xy"; + name = "khotkeys-5.25.4.tar.xz"; }; }; kinfocenter = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kinfocenter-5.25.3.tar.xz"; - sha256 = "17hkyraqk4cwrv3rnlbw5jby7v8yv4mfxign1f3n5ldq76v9van1"; - name = "kinfocenter-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kinfocenter-5.25.4.tar.xz"; + sha256 = "0ns2xsqghglg4ikq7w556y1kh20gs677km1vs0paw50xhi7jzbd2"; + name = "kinfocenter-5.25.4.tar.xz"; }; }; kmenuedit = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kmenuedit-5.25.3.tar.xz"; - sha256 = "0y374al92r0v5adi7jxj6lghbhjg07ym78xsx09qn48h5c0s34pp"; - name = "kmenuedit-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kmenuedit-5.25.4.tar.xz"; + sha256 = "1y3ml4jscb28nvadh7iq2y240qifv71dv2nkd32i69h52xdrvz27"; + name = "kmenuedit-5.25.4.tar.xz"; }; }; kscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreen-5.25.3.tar.xz"; - sha256 = "0p9pzigll9b5jj232sz05znf5syycif0dzvccxds6z0yr124jlvz"; - name = "kscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreen-5.25.4.tar.xz"; + sha256 = "1wjpyq56iw8axbjhsa82w67g54v6y3rv5nx623d1kddvlzlhh8pf"; + name = "kscreen-5.25.4.tar.xz"; }; }; kscreenlocker = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreenlocker-5.25.3.tar.xz"; - sha256 = "1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc"; - name = "kscreenlocker-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreenlocker-5.25.4.tar.xz"; + sha256 = "0zfvkdvyqxxxgpiimqjxhavwna0z94i28ky8qmvbcmn1705x5lvx"; + name = "kscreenlocker-5.25.4.tar.xz"; }; }; ksshaskpass = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksshaskpass-5.25.3.tar.xz"; - sha256 = "0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk"; - name = "ksshaskpass-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksshaskpass-5.25.4.tar.xz"; + sha256 = "0dzhddylzigaaigacynncd5q0s4884dgr4wyrrdpqj42d47wjikz"; + name = "ksshaskpass-5.25.4.tar.xz"; }; }; ksystemstats = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksystemstats-5.25.3.tar.xz"; - sha256 = "0s08mazc081wxbccmb4s35i7p57an8nlxmw25lh1j83jj06gyd4f"; - name = "ksystemstats-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksystemstats-5.25.4.tar.xz"; + sha256 = "0ray2v90vv1j1sbd7fx4x5n7s7xwlil1zynwi4pzpgnyi13zq60x"; + name = "ksystemstats-5.25.4.tar.xz"; }; }; kwallet-pam = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwallet-pam-5.25.3.tar.xz"; - sha256 = "1i345vl0sfzg8zmz6h8hsxmx9cbdb7072avc6yz42ra9yf4372jb"; - name = "kwallet-pam-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwallet-pam-5.25.4.tar.xz"; + sha256 = "14j3xngwliqhhvw60izv5kdjvv8xhqw8cjsc4l22v8jj4m8yw2xk"; + name = "kwallet-pam-5.25.4.tar.xz"; }; }; kwayland-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwayland-integration-5.25.3.tar.xz"; - sha256 = "0d45wigxspvv561fjam8yiyq6277n5wgv2sn8ymvqbal8v801bjf"; - name = "kwayland-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwayland-integration-5.25.4.tar.xz"; + sha256 = "1iqnwcp08kg91pwm3i4grd0i4bqf8h1z0n0fhcw6l0cbhdkcad39"; + name = "kwayland-integration-5.25.4.tar.xz"; }; }; kwin = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwin-5.25.3.tar.xz"; - sha256 = "1vyh5ymvkzxsgs4904ijac6xrb5fgxpypc8mlnwcca1gd9xpr4jj"; - name = "kwin-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwin-5.25.4.tar.xz"; + sha256 = "0zahw7hd3g775a6iyglvv60h9vw52jc9pg9ffkg4mpqb00f159p8"; + name = "kwin-5.25.4.tar.xz"; }; }; kwrited = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwrited-5.25.3.tar.xz"; - sha256 = "133ampgha0348m5ild1dg48jpblk4c16d6nk759yywz8125wyapc"; - name = "kwrited-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwrited-5.25.4.tar.xz"; + sha256 = "0xn20irka7adbqfc8w6gnhwp0pbv7bz7l7g16qddv1wq3xix9053"; + name = "kwrited-5.25.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/layer-shell-qt-5.25.3.tar.xz"; - sha256 = "06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0"; - name = "layer-shell-qt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/layer-shell-qt-5.25.4.tar.xz"; + sha256 = "0pd88nnp925l09gzq4cajjnx810df4n0ssd65i1bmvgnxynzh5i7"; + name = "layer-shell-qt-5.25.4.tar.xz"; }; }; libkscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libkscreen-5.25.3.tar.xz"; - sha256 = "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5"; - name = "libkscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libkscreen-5.25.4.tar.xz"; + sha256 = "17ib0sgrhmmf3f8w3fni0825xz5581av5vnz8gca41vyf12css25"; + name = "libkscreen-5.25.4.tar.xz"; }; }; libksysguard = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libksysguard-5.25.3.tar.xz"; - sha256 = "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89"; - name = "libksysguard-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libksysguard-5.25.4.tar.xz"; + sha256 = "1kzpimhkagsmqj0cky4cfav1kbzyfjaj2l5xdapnmaygbm6r8086"; + name = "libksysguard-5.25.4.tar.xz"; }; }; milou = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/milou-5.25.3.tar.xz"; - sha256 = "1xb3i5dn6r4mglci8llchjz484zsw3kqyl9ag8wch54b5cjmz4ap"; - name = "milou-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/milou-5.25.4.tar.xz"; + sha256 = "17npfn7gwiqrvy5w8vzpc38c4bgkx3vjgjkm1caizn04zfk7xar7"; + name = "milou-5.25.4.tar.xz"; }; }; oxygen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-5.25.3.tar.xz"; - sha256 = "0ynkmnmd1x36zn6x4chvpsrsi5rfqmk45qqxdx60x0w1hhi3x6bh"; - name = "oxygen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-5.25.4.tar.xz"; + sha256 = "1cd76fa2szhb3apabyvl76p8vdk97229g5sgv94xx9pr7rx8a67y"; + name = "oxygen-5.25.4.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-sounds-5.25.3.tar.xz"; - sha256 = "1hdqdq3qxpcyfs5gsmlpb3pjvixyr1ny4qwqq18givz8jbah3vkz"; - name = "oxygen-sounds-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-sounds-5.25.4.tar.xz"; + sha256 = "0v8j8kf86ri1z14mgqc1c6kkpsbih8rjph35sr5y0i4av9mh6p9b"; + name = "oxygen-sounds-5.25.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-browser-integration-5.25.3.tar.xz"; - sha256 = "1krf9fchs3w0r1irzrdrxgwcgfsyhm2384q0c5vp5xg7dh10xvz2"; - name = "plasma-browser-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-browser-integration-5.25.4.tar.xz"; + sha256 = "1l3n4psbqimfar5qsmrfp3nhgg3v9yy93rkjpvyqgdmizi44scqw"; + name = "plasma-browser-integration-5.25.4.tar.xz"; }; }; plasma-desktop = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz"; - sha256 = "134dgqqak5d3427znlj138f0k48qhkzs7pqi19yn89fbzw5vg8s8"; - name = "plasma-desktop-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-desktop-5.25.4.tar.xz"; + sha256 = "1jkjc412n1wn17qrmx0sv91pzv5xjsljms3bsln6bbxj5fkhmkfm"; + name = "plasma-desktop-5.25.4.tar.xz"; }; }; plasma-disks = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-disks-5.25.3.tar.xz"; - sha256 = "1dyxa5x4v6w8fn8956wcc9mvncnjf43cpn0algp54f9ndy1jaalw"; - name = "plasma-disks-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-disks-5.25.4.tar.xz"; + sha256 = "04hs8jg7f5bm5rjcb6i6zidyamq6cfry5sm5mj6hqdj0qmn9i396"; + name = "plasma-disks-5.25.4.tar.xz"; }; }; plasma-firewall = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-firewall-5.25.3.tar.xz"; - sha256 = "0cwk4scadk4pd7v93arkrn1wgyc4d81995znp23vd9pmlaazyikv"; - name = "plasma-firewall-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-firewall-5.25.4.tar.xz"; + sha256 = "12rmf7x8dyyb1k5ycj43kn4c0wzidig4h5wdh1igrgcvyypmjjcl"; + name = "plasma-firewall-5.25.4.tar.xz"; }; }; plasma-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-integration-5.25.3.tar.xz"; - sha256 = "1wsz0vbb0kj4542h7zca9yc6xz90ziv4lbm39d7dxr9hm94cdbjk"; - name = "plasma-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-integration-5.25.4.tar.xz"; + sha256 = "1cbcp722pzbfiqfl5rcw6py74jbxg83k96kdx2m0g3ix1f0dmkbi"; + name = "plasma-integration-5.25.4.tar.xz"; }; }; plasma-mobile = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-mobile-5.25.3.tar.xz"; - sha256 = "1dzfbqg2zmdr0dlm99c3pj9iy6yagshlfj9x018sa0bzjysf29g3"; - name = "plasma-mobile-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-mobile-5.25.4.tar.xz"; + sha256 = "0b0n3mjlj33191jgs8xqbk35y5nglfz4d8dih3qmg3kbs81qizwy"; + name = "plasma-mobile-5.25.4.tar.xz"; }; }; plasma-nano = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nano-5.25.3.tar.xz"; - sha256 = "00m95c1cb3g8v8w0d4vnbnjhjmr5hw7gljn8nc705mpxsx03c3kd"; - name = "plasma-nano-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nano-5.25.4.tar.xz"; + sha256 = "1pn6025wb3w855f3vy77879qlrb266bikw3nhar1dzv3sfgxw4w9"; + name = "plasma-nano-5.25.4.tar.xz"; }; }; plasma-nm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nm-5.25.3.tar.xz"; - sha256 = "0k8zwjjy8d5lp1slky13fx5j6kjsbs4irz3x5fm54aki15hdcjx7"; - name = "plasma-nm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nm-5.25.4.tar.xz"; + sha256 = "147p572pmkrgg52pvwhzs8lvxy3rs8y622n9lj7hjc6hrlh14qk2"; + name = "plasma-nm-5.25.4.tar.xz"; }; }; plasma-pa = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-pa-5.25.3.tar.xz"; - sha256 = "17881v0fff5mbgh6rgx4a2hk9m35flqijckwlyj2kcrcsqi3aq21"; - name = "plasma-pa-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-pa-5.25.4.tar.xz"; + sha256 = "0v92jk826jj2kf11hlxh3xrxl9nsj6835ik2pmb192xbn6gpb4lm"; + name = "plasma-pa-5.25.4.tar.xz"; }; }; plasma-sdk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-sdk-5.25.3.tar.xz"; - sha256 = "1hhffvqvxlhdyg8v7b7drb0n4fnkxlvy0xfffnnln66pknxk7s5w"; - name = "plasma-sdk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-sdk-5.25.4.tar.xz"; + sha256 = "00s345l5jj1kfdvyyfq8718khfy88n6gyajb07n582q266mry39l"; + name = "plasma-sdk-5.25.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-systemmonitor-5.25.3.tar.xz"; - sha256 = "07mxkm0ynq0xiqc1p4iqjc4c1x7198hr15r9ysajgs0sf9bcd6hx"; - name = "plasma-systemmonitor-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-systemmonitor-5.25.4.tar.xz"; + sha256 = "1fj0vyjdk6h3f4p9aagh03hyhbf69y2qwlavs2zr7d0iadih7b4c"; + name = "plasma-systemmonitor-5.25.4.tar.xz"; }; }; plasma-tests = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-tests-5.25.3.tar.xz"; - sha256 = "0d7vhb75p2rhfbysa7bg80836ycryg4jcn91grag8y7pcq6m6zzn"; - name = "plasma-tests-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-tests-5.25.4.tar.xz"; + sha256 = "0d86zmlmagik2chagsm549yg78vy2qw3kl67skrlrmbkv82dhrz2"; + name = "plasma-tests-5.25.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-thunderbolt-5.25.3.tar.xz"; - sha256 = "05bdq7vdwpyyrfgvp48m8dbsjhvnaf84zhbcyjvjygvlhzdm8j57"; - name = "plasma-thunderbolt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-thunderbolt-5.25.4.tar.xz"; + sha256 = "0hjvkss0qfmwhrsba83wfxwxhikvzf56faan325ic0iv7fdaj3ns"; + name = "plasma-thunderbolt-5.25.4.tar.xz"; }; }; plasma-vault = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-vault-5.25.3.tar.xz"; - sha256 = "1phb7rygvm2c0n0yf5xyj3xpm1apfq3knfyiasgbjl4z6aimq406"; - name = "plasma-vault-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-vault-5.25.4.tar.xz"; + sha256 = "10ym2gk46yr1vgjnm1li1shdawklvvy3yvjcanm8ic5llchbxvzq"; + name = "plasma-vault-5.25.4.tar.xz"; }; }; plasma-workspace = { - version = "5.25.3.1"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-5.25.3.1.tar.xz"; - sha256 = "09hgd1k0095s18a4147qihbsl5v8hadj7hm3zixf362sydgkal51"; - name = "plasma-workspace-5.25.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-5.25.4.tar.xz"; + sha256 = "1aw9ms6rzxrk384xzdc3sqwqs1shbnkap40vfwxp4jamjk0pyglw"; + name = "plasma-workspace-5.25.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-wallpapers-5.25.3.tar.xz"; - sha256 = "15swpsqjdxxzkjw0phs4h7p3l4lfshsqv6pk3qbfbp91dd05cplh"; - name = "plasma-workspace-wallpapers-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-wallpapers-5.25.4.tar.xz"; + sha256 = "1vjrfmzib17cb9r2q17rv4zmnqsk5mf55vy8kzx71djjif7gaqiy"; + name = "plasma-workspace-wallpapers-5.25.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plymouth-kcm-5.25.3.tar.xz"; - sha256 = "0sb0gh0sh8lc13pbqkl8icjakzk0h7r3l6v3kwg0jyvmk0if1bpj"; - name = "plymouth-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plymouth-kcm-5.25.4.tar.xz"; + sha256 = "1wbgcccc1ili3j0k1njgj1q6jl35s20gf9m25s9d3mjwd9xnxrbv"; + name = "plymouth-kcm-5.25.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.3"; + version = "1-5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/polkit-kde-agent-1-5.25.3.tar.xz"; - sha256 = "0j067ps86zk38r0spcfpv33mxiagdnrkyy033v8gnsiayhrp9pcm"; - name = "polkit-kde-agent-1-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/polkit-kde-agent-1-5.25.4.tar.xz"; + sha256 = "0skadgzv97vfl4n2x889fiy5gsr6n894fr5viq3rizs0qsqc68b5"; + name = "polkit-kde-agent-1-5.25.4.tar.xz"; }; }; powerdevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/powerdevil-5.25.3.tar.xz"; - sha256 = "1lfws0rj2kbqvgm7gb4h6gmrpa71jbqgfmvmd2n4l9bxxx73rbh2"; - name = "powerdevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/powerdevil-5.25.4.tar.xz"; + sha256 = "1nznjxi59xc6pmyh0vainznhp9ig1ini3i87iapayawpnpf8sdxx"; + name = "powerdevil-5.25.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/qqc2-breeze-style-5.25.3.tar.xz"; - sha256 = "1j714iaysfqkr997q94pv2abj433ps43myy37p8ss0v8pra9hn5c"; - name = "qqc2-breeze-style-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/qqc2-breeze-style-5.25.4.tar.xz"; + sha256 = "0sylffvbfdi44lmz6s78scf2p2iswf6p8g209wbd5fm1dgi6yi2z"; + name = "qqc2-breeze-style-5.25.4.tar.xz"; }; }; sddm-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/sddm-kcm-5.25.3.tar.xz"; - sha256 = "1mipvf25vjhdrww9cinp4v7g73swk364zfkyk4fypw8bccrbfpsd"; - name = "sddm-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/sddm-kcm-5.25.4.tar.xz"; + sha256 = "1gqz9j6vha8i6bra63pfqrpl5wsg9a7qz351z5rkj5jwnkw1dxl7"; + name = "sddm-kcm-5.25.4.tar.xz"; }; }; systemsettings = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/systemsettings-5.25.3.tar.xz"; - sha256 = "00n4r51qp03cwfsdrsza2nv5558zs8dyd6fywcycjd1ryqiyrl4r"; - name = "systemsettings-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/systemsettings-5.25.4.tar.xz"; + sha256 = "130739bfxl1jwkn3f4h7dnr7dv2i76g6sd2svmg0qy60cnwvcgcv"; + name = "systemsettings-5.25.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/xdg-desktop-portal-kde-5.25.3.tar.xz"; - sha256 = "07pcpxq7j1b62wwds6q2niyh74dc9i2lwvka77g1ii55syybm7n7"; - name = "xdg-desktop-portal-kde-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/xdg-desktop-portal-kde-5.25.4.tar.xz"; + sha256 = "13gva3mci9gawlxpw4ymdma8w6lc2b3y8z36699kmzli4vib214g"; + name = "xdg-desktop-portal-kde-5.25.4.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 6362eb952af..6740f458725 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NjdVflLapuNeYKgRgO7zJxJN1rXjGjQO1m+xUfTeEI="; + sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix deleted file mode 100644 index 51336a9e1a5..00000000000 --- a/pkgs/development/libraries/cutelyst/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, qtbase, libuuid, libcap, uwsgi, grantlee, pcre -}: - -stdenv.mkDerivation rec { - pname = "cutelyst"; - version = "2.14.2"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "cutelyst"; - rev = "v${version}"; - sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; - }; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ - qtbase - grantlee - ] ++ lib.optionals stdenv.isLinux [ - libuuid - libcap - uwsgi - pcre - ]; - - cmakeFlags = [ - "-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin - "-DPLUGIN_STATICCOMPRESSED=ON" - "-DPLUGIN_CSRFPROTECTION=ON" - "-DPLUGIN_VIEW_GRANTLEE=ON" - ]; - - meta = with lib; { - description = "C++ Web Framework built on top of Qt"; - homepage = "https://cutelyst.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 2a71b82af3c..b3bde19fed0 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.002"; + version = "2022.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; + sha256 = "sha256-IH5vJtZTL7cDc6/D7z04JVITr2He9lnCXa06MOT8o4s="; }; patches = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { preConfigure = '' export FC="mpifort" export CC="mpicc" + export CXX="mpicxx" + export CPP="cpp" # These need to be set for configure to succeed export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index cb0da5c560d..29080f119cd 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; + patches = [ + (fetchpatch { + name = "fix-build-on-darwin.patch"; + url = "https://github.com/flatpak/libportal/pull/106/commits/73f63ee57669c4fa604a7772484cd235d4fb612c.patch"; + sha256 = "sha256-c9WUQPhn4IA3X1ie7SwnxuZXdvpPkpGdU4xgDwKN/L0="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -65,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index f1bdfb9836e..265e09f436a 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -85,7 +85,7 @@ final: prev: let rec { fileVersion = "10.2"; fullVersion = "8.3.2.44"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; supportedCudaVersions = [ "10.2" ]; } diff --git a/pkgs/development/libraries/science/math/tensorrt/extension.nix b/pkgs/development/libraries/science/math/tensorrt/extension.nix new file mode 100644 index 00000000000..8e9f64885ba --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -0,0 +1,63 @@ +final: prev: let + + inherit (final) callPackage; + inherit (prev) cudatoolkit cudaVersion lib pkgs; + + ### TensorRT + + buildTensorRTPackage = args: + callPackage ./generic.nix { } args; + + toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + + majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + + tensorRTPackages = with lib; let + # Check whether a file is supported for our cuda version + isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; + # Return the first file that is supported. In practice there should only ever be one anyway. + supportedFile = files: findFirst isSupported null files; + # Supported versions with versions as keys and file as value + supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) tensorRTVersions); + # Compute versioned attribute name to be used in this package set + computeName = version: "tensorrt_${toUnderscore version}"; + # Add all supported builds as attributes + allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; + defaultBuild = { "tensorrt" = allBuilds.${computeName tensorRTDefaultVersion}; }; + in allBuilds // defaultBuild; + + tensorRTVersions = { + "8.4.0" = [ + rec { + fileVersionCuda = "11.6"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; + } + rec { + fileVersionCuda = "10.2"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "10.2" ]; + } + ]; + }; + + # Default attributes + tensorRTDefaultVersion = { + "10.2" = "8.4.0"; + "11.0" = "8.4.0"; + "11.1" = "8.4.0"; + "11.2" = "8.4.0"; + "11.3" = "8.4.0"; + "11.4" = "8.4.0"; + "11.5" = "8.4.0"; + "11.6" = "8.4.0"; + }.${cudaVersion}; + +in tensorRTPackages diff --git a/pkgs/development/libraries/science/math/tensorrt/generic.nix b/pkgs/development/libraries/science/math/tensorrt/generic.nix new file mode 100644 index 00000000000..3447087051f --- /dev/null +++ b/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, requireFile +, autoPatchelfHook +, autoAddOpenGLRunpathHook +, cudaVersion +, cudatoolkit +, cudnn +}: + +{ fullVersion +, fileVersionCudnn +, tarball +, sha256 +, supportedCudaVersions ? [ ] +}: + +assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) + "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; + +stdenv.mkDerivation rec { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; + version = fullVersion; + src = requireFile rec { + name = tarball; + inherit sha256; + message = '' + To use the TensorRT derivation, you must join the NVIDIA Developer Program and + download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from + ${meta.homepage}. + + Once you have downloaded the file, add it to the store with the following + command, and try building this derivation again. + + $ nix-store --add-fixed sha256 ${name} + ''; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cudatoolkit.cc.cc.lib # libstdc++ + cudatoolkit + cudnn + ]; + + sourceRoot = "TensorRT-${version}"; + + installPhase = '' + install --directory "$dev" "$out" + mv include "$dev" + mv targets/x86_64-linux-gnu/lib "$out" + install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec + ''; + + # Tell autoPatchelf about runtime dependencies. + # (postFixup phase is run before autoPatchelfHook.) + postFixup = + let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); + in + '' + echo 'Patching RPATH of libnvinfer libs' + patchelf --debug --add-needed libnvinfer.so \ + "$out/lib/libnvinfer.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" + ''; + + meta = with lib; { + # Check that the cudatoolkit version satisfies our min/max constraints (both + # inclusive). We mark the package as broken if it fails to satisfies the + # official version constraints (as recorded in default.nix). In some cases + # you _may_ be able to smudge version constraints, just know that you're + # embarking into unknown and unsupported territory when doing so. + broken = !(elem cudaVersion supportedCudaVersions); + description = "TensorRT: a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 1c29b85bebe..a52751af71d 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.15"; + version = "0.4.18"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY="; + sha256 = "sha256-2WNmpx6ReVmsRvKHAaZznGuugvmLxK25P1WdmorNj/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index c342ee4d70d..06579c2d473 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; + hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index e74bb9ddc32..528d545c37c 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; rev = "v${version}"; - sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas"; + sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI="; }; installPhase = '' diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 60b273f4bae..40f954a1ff8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1161,6 +1161,40 @@ buildLuarocksPackage { }; }) {}; +lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lua-protobuf"; + version = "0.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec"; + sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/starwing/lua-protobuf.git", + "rev": "832facd266366cd86ee9bf41d35327255d0033f2", + "date": "2022-07-27T14:34:12+08:00", + "path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf", + "sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/starwing/lua-protobuf"; + description = "protobuf data support for Lua"; + maintainers = with lib.maintainers; [ lockejan ]; + license.fullName = "MIT"; + }; +}) {}; + lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index bce4c0426e4..8679da592cb 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.10"; + version = "0.5.11"; pname = "num2words"; src = fetchPypi { inherit pname version; - sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q="; }; propagatedBuildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix new file mode 100644 index 00000000000..30da346c810 --- /dev/null +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -0,0 +1,52 @@ +{ lib +, python +, buildPythonPackage +, autoPatchelfHook +, unzip +, cudaPackages +}: + +let + pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}"; +in +buildPythonPackage rec { + pname = "tensorrt"; + version = cudaPackages.tensorrt.version; + + src = cudaPackages.tensorrt.src; + + format = "wheel"; + # We unpack the wheel ourselves because of the odd packaging. + dontUseWheelUnpack = true; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + cudaPackages.autoAddOpenGLRunpathHook + ]; + + preUnpack = '' + mkdir -p dist + tar --strip-components=2 -xf "$src" --directory=dist \ + "TensorRT-${version}/python/tensorrt-${version}-cp${pyVersion}-none-linux_x86_64.whl" + ''; + + sourceRoot = "."; + + buildInputs = [ + cudaPackages.cudnn + cudaPackages.tensorrt + ]; + + pythonCheckImports = [ + "tensorrt" + ]; + + meta = with lib; { + description = "Python bindings for TensorRT, a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 503d5c63049..25259ae64cd 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,20 +2,32 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.43.0"; + version = "6.47.0"; src = fetchurl { - url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; + url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; + hash = "sha256-0rOV6l5VCdBkk5+F/k2vYtHQWzwugvp3ogaTRuXUKXE="; }; nativeBuildInputs = [ unzip makeWrapper ]; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - mkdir -p $out - cp -R {bin,lib} $out - wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin + + install -Dm755 bin/run.sh $out/libexec/pmd + install -Dm644 lib/*.jar -t $out/lib/pmd + + wrapProgram $out/libexec/pmd \ + --prefix PATH : ${openjdk.jre}/bin \ + --set LIB_DIR $out/lib/pmd + + for app in pmd cpd cpdgui designer bgastviewer designerold ast-dump; do + makeWrapper $out/libexec/pmd $out/bin/$app --argv0 $app --add-flags $app + done + runHook postInstall ''; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 3fe90a3004c..174f09e8f74 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.06.22"; + version = "2022.08.03"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-g+0BYwk9bws+c7CfLGf88r2nfcDBCdDKyqRS285oIQM="; + sha256 = "sha256-tqwAC8qib7XLlHj6YD4pYnV/R5q9fW4bH5fA8Gl8G64="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index c57675efa9f..d11576a5e01 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.47.2"; + version = "1.47.3"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-ttxRVmv1Z/NOjzVN7izBJm5xQWdSAm/jTzw0klFzyck="; + sha256 = "sha256-uY8D3VqcaLEi/QChH/kfY9SF3H2wmiScm3m6OGeWTu8="; }; - vendorSha256 = "sha256-zIsvXtyC3wjfoKcOJ1MG/KSGApuVlvuHDYDmbmGEgTc="; + vendorSha256 = "sha256-F7arWygCbh9Z6zemPt+0T6wWMcP2Wg5A1qC6A7mYngI="; doCheck = false; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index ee72bc62efa..82f93cb73e6 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.1.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; + sha256 = "sha256-o7gcKJy3gDUV3WPo5vO+5Zyyz1UVC2wGRTxZL69RxNE="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 2e3075c7b12..22703a4afc3 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.0"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; + sha256 = "sha256-m7xV5sQZnRytT3QY1a9qihZV0Ub6zKjfDytZ+TDwdFg="; }; - cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; + cargoSha256 = "sha256-993XWYSUC2KuV2/dgTYAatoy5lGIveT3lL7eOYsbCig="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index e4a4ab162fa..81d7d9f0b35 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,7 +3,7 @@ }: let - generic = { version, sha256, license }: + generic = { version, sha256, broken ? false, license }: stdenv.mkDerivation rec { pname = "ragel"; inherit version; @@ -26,10 +26,9 @@ let doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; - inherit license; + inherit broken license; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; @@ -48,5 +47,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 417cdd67618..910971fbddc 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.16"; + version = "0.4.17"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE="; + sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ="; }; - cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s="; + cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 7efcfb08c47..ca40554c183 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.24.1"; + version = "0.25.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k="; + sha256 = "sha256-k+/FxVCUPQuVXZFk+FE3cAtAf/YCgk/fGVtRKIeefJ8="; }; - cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q="; + cargoSha256 = "sha256-RxpBhA5lf+mcr4VMtsrdzlxN8oDttNcWuwxQAAYN8U8="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 3c40a0c0ce8..804acffc2df 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-VHUs/trR1M5WacEA0gwKLkGtsws9GFmn1vK0kRxpNII="; + sha256 = "sha256-6o+frbLtuw+DwJiWv4x11qX4GUffhxF19pi/7FLYmHA="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoSha256 = "sha256-czXe9W+oR1UV7zGZiiHcbydzH6sowa/8upm+5lkPG1U="; + cargoSha256 = "sha256-j/i2io1JfcNA7eeAXAAKMBtHORZm4J5dOFFNnzvx2cg="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 15fc3f1a9cc..da72db16437 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-vpElkOK1ZcUBDDP68+PQCMgKglJ2SoYb55Cog23AUhg="; + sha256 = "sha256-ghWWoAySJsiYmpdoFZIQrHSV7kOQe0kDQrONwgqFMzY="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 7a3ec5fe4ae..affadf281c3 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "sha256-MC4PCjRuAqWuGvNDsZXKohb4HdSWMV0Oc0pZ0rnhG7Y="; + sha256 = "sha256-B1Fm02EHkV4mogz4PrqdZWvRQ8ixO+sRhvqW7ObzJjY="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 34a2cdddac8..e51aab519a4 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perl, fetchurl, python3, fmt, libidn +{ stdenv, lib, fetchpatch, perl, fetchurl, python3, fmt, libidn , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 @@ -50,7 +50,14 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; - patches = [ ./rootdir_env.patch ]; + patches = [ + ./rootdir_env.patch + (fetchpatch { + # fix build with gcc11 and glibc 2.35 + url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch"; + hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0="; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need. diff --git a/pkgs/games/fishfight/default.nix b/pkgs/games/jumpy/default.nix index 9e5bbde8cf7..2afba817fc0 100644 --- a/pkgs/games/fishfight/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "fishfight"; - version = "0.4.2"; + pname = "jumpy"; + version = "0.4.3"; src = fetchFromGitHub { - owner = "fishfight"; + owner = "fishfolks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q1Hh4P/huoFuW/+Mb9yKUMKaky1RshGpjrObBHRCk+8="; + sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; }; - cargoSha256 = "sha256-PEGK95eXIHv2sxSwUU4345KtxDyRJn/+aEiJIDmkq6Y="; + cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index a6994722756..ea69ecd7513 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -1,20 +1,29 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , kernel }: stdenv.mkDerivation rec { pname = "dddvb"; - version = "0.9.38-pre.4"; + version = "0.9.38-pre.6"; src = fetchFromGitHub { owner = "DigitalDevices"; repo = "dddvb"; - rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; - sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + rev = "refs/tags/${version}"; + hash = "sha256-bt/vMnqRWDDChZ6R4JbCr77cz3nlSPkx6siC9KLSEqs="; }; + patches = [ + (fetchpatch { + # pci_*_dma_mask no longer exists in 5.18 + url = "https://github.com/DigitalDevices/dddvb/commit/871821d6a0be147313bb52570591ce3853b3d370.patch"; + hash = "sha256-wY05HrsduvsIdp/KpS9NWfL3hR9IvGjuNCDljFn7dd0="; + }) + ]; + postPatch = '' sed -i '/depmod/d' Makefile ''; @@ -35,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index a1f355a849c..b9256158549 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hd-idle"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "adelolmo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LZcMwF/BhHiWWXMcrzbk8GyvwXdA3B2olmbOBxQwV5g="; + sha256 = "sha256-BHUjKvhUDeD/Xm0KKbkLH2XWn1W77E7Pm3OSPARF6Xw="; }; vendorSha256 = null; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 8c2a28affbd..173dd0caa88 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -41,7 +41,12 @@ buildGoModule { buildInputs = [ taglib zlib ]; - CGO_CFLAGS = [ "-Wno-return-local-addr" ]; + ldflags = [ + "-X github.com/navidrome/navidrome/consts.gitSha=${src.rev}" + "-X github.com/navidrome/navidrome/consts.gitTag=v${version}" + ]; + + CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ]; prePatch = '' cp -r ${ui}/* ui/build @@ -52,8 +57,6 @@ buildGoModule { --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - doCheck = false; - passthru = { inherit ui; tests.navidrome = nixosTests.navidrome; diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 46c68e349f4..e11cdad3351 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.52"; + version = "1.55"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; + sha256 = "sha256-X5+vqGhgEQqjbzSs58t1/znlhlDJHLUwgNokYV7xNhc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 64ea04d1ef9..c78459936c0 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-ngdtK8e4mLpbuY9OP1aHk99qPX/cKwnyhb/3ImTwF6M="; + sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-0MP04KpWX17Fa1WhLwF4yzIsDqGAeTUXxv81B+BTNe4="; + vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index 161a65fa663..b46241931c6 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.18.1"; + version = "0.19.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-u4XA6Jqn+p2J0sB2KabwZY/lFwZakZEvUUh/enrhtN4="; + sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch deleted file mode 100644 index e20acdb04a9..00000000000 --- a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp -index acd195d..8809e4f 100644 ---- a/src/virtlyst.cpp -+++ b/src/virtlyst.cpp -@@ -340,7 +340,8 @@ bool Virtlyst::createDB() - qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); - return false; - } -- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); -+ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", -+ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); - query.bindValue(QStringLiteral(":password"), QString::fromLatin1( - CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); - if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix deleted file mode 100644 index d6a72916fae..00000000000 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook -, qtbase, libvirt, cutelyst, grantlee }: - -stdenv.mkDerivation rec { - pname = "virtlyst"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "Virtlyst"; - rev = "v${version}"; - sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; - }; - - nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; - buildInputs = [ qtbase libvirt cutelyst grantlee ]; - - dontWrapQtApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib - cp -r ../root $out - - runHook postInstall - ''; - - patches = [ ./add-admin-password-env.patch ]; - - meta = with lib; { - description = "Web interface to manage virtual machines with libvirt"; - homepage = "https://github.com/cutelyst/Virtlyst"; - license = licenses.agpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 4a3aca9f6e9..35744ba6e3d 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "webdav"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "0jnh1bhc98vcx2vm6hmgak6zwfc0rx898qcdjcca5y9dni4120aq"; + sha256 = "sha256-4rgDO1vItmmCRXRiO24MPa9IPzrsfzCWLH6hl6oKkxk="; }; - vendorSha256 = "19nhz6z8h4fxpy4gjx7zz69si499jak7qj9yb17x32lar5m88gvb"; + vendorSha256 = "sha256-az+EasmKitFPWD5JfKaSKZGok/n/dPmIv90RiL750KY="; meta = with lib; { description = "Simple WebDAV server"; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index dbbe14cf386..9579b3fa3f5 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yank"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; rev = "v${version}"; - sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; + sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68af99b1a1d..c19acf8ce4e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases ({ firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + fishfight = jumpy; # Added 2022-08-03 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b3a9911365..39618a5187c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5508,6 +5508,8 @@ with pkgs; tk = tk-8_5; }; + dwdiff = callPackage ../applications/misc/dwdiff { }; + picoscope = callPackage ../applications/science/electronics/picoscope { }; picotts = callPackage ../tools/audio/picotts { }; @@ -7382,6 +7384,8 @@ with pkgs; bc-decaf = callPackage ../development/libraries/bc-decaf { }; + deckmaster = callPackage ../applications/misc/deckmaster { }; + deco = callPackage ../applications/misc/deco { }; decoder = callPackage ../tools/security/decoder { }; @@ -17423,8 +17427,6 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; - cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; - cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; cwiid = callPackage ../development/libraries/cwiid { }; @@ -23293,8 +23295,6 @@ with pkgs; virtiofsd = callPackage ../servers/misc/virtiofsd { }; - virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; @@ -32519,7 +32519,7 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; - fishfight = callPackage ../games/fishfight { + jumpy = callPackage ../games/jumpy { inherit (xorg) libX11 libXi; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 211540260d1..70d57672a0f 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -58,15 +58,16 @@ let }; - composedExtension = composeManyExtensions [ + composedExtension = composeManyExtensions ([ extraPackagesExtension (import ../development/compilers/cudatoolkit/extension.nix) (import ../development/compilers/cudatoolkit/redist/extension.nix) (import ../development/compilers/cudatoolkit/redist/overrides.nix) (import ../development/libraries/science/math/cudnn/extension.nix) + (import ../development/libraries/science/math/tensorrt/extension.nix) (import ../test/cuda/cuda-samples/extension.nix) (import ../test/cuda/cuda-library-samples/extension.nix) cutensorExtension - ]; + ]); in (scope.overrideScope' composedExtension) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4090bacbe43..00bdc71c0ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10520,6 +10520,8 @@ in { tensorly = callPackage ../development/python-modules/tensorly { }; + tensorrt = callPackage ../development/python-modules/tensorrt { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; termcolor = callPackage ../development/python-modules/termcolor { }; |