diff options
164 files changed, 2533 insertions, 2478 deletions
diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 94d97a970dbb1..159347008e80c 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -72,7 +72,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions: * `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well. -* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs. +* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. A script to fetch these is available as `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs. * `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`. * `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well. For example, your project has a local dependency: @@ -99,6 +99,8 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila * `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`. * `dotnetFlags` can be used to pass flags to all of the above phases. +When packaging a new application, you need to fetch it's dependencies. You can set `nugetDeps` to an empty string to make the derivation temporarily evaluate, and then run `nix-build -A package.passthru.fetch-deps` to generate it's dependency fetching script. After running the script, you should have the location of the generated lockfile printed to the console. This can be copied to a stable directory. Note that if either `projectFile` or `nugetDeps` are unset, this script cannot be generated! + Here is an example `default.nix`, using some of the previously discussed arguments: ```nix { lib, buildDotnetModule, dotnetCorePackages, ffmpeg }: @@ -112,7 +114,8 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`. + nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`. + projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 500f5fa41f355..4d70409a20cbb 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -995,18 +995,18 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: ```nix -{ lib, python3Packages }: +{ lib, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "2.7.9"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; }; - propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; + propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ]; meta = with lib; { ... diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 7959685af6d50..56faf636df10e 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -293,7 +293,7 @@ Test flags, e.g., `--package foo`, can be passed to `cargo test` via the Another attribute, called `checkFlags`, is used to pass arguments to the test binary itself, as stated -(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html]. +[here](https://doc.rust-lang.org/cargo/commands/cargo-test.html). #### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68cf8b30d546a..e003fc95ed326 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12130,6 +12130,12 @@ githubId = 122319; name = "Renato Alves"; }; + unrooted = { + name = "Konrad Klawikowski"; + email = "konrad.root.klawikowski@gmail.com"; + github = "unrooted"; + githubId = 30440603; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -12579,6 +12585,12 @@ githubId = 78392041; name = "Winter"; }; + wintrmvte = { + name = "Jakub Lutczyn"; + email = "kubalutczyn@gmail.com"; + github = "wintrmvte"; + githubId = 41823252; + }; wirew0rm = { email = "alex@wirew0rm.de"; github = "wirew0rm"; @@ -12657,6 +12669,12 @@ githubId = 28888242; name = "WORLDofPEACE"; }; + wr0belj = { + name = "Jakub Wróbel"; + email = "wrobel.jakub@protonmail.com"; + github = "wr0belj"; + githubId = 40501814; + }; wscott = { email = "wsc9tt@gmail.com"; github = "wscott"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 377fc02fef5a9..0743c80ec4f62 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -247,6 +247,15 @@ with lib.maintainers; { scope = "Maintain Podman and CRI-O related packages and modules."; }; + redcodelabs = { + members = [ + unrooted + wr0belj + wintrmvte + ]; + scope = "Maintain Red Code Labs related packages and modules."; + }; + sage = { members = [ timokau diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 716b91c3c536f..52b2b38061f3f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -167,6 +167,16 @@ using this default will print a warning when rebuilt. </para> </listitem> + <listitem> + <para> + The option + <link linkend="opt-services.ssh.enableAskPassword">services.ssh.enableAskPassword</link> + was added, decoupling the setting of + <literal>SSH_ASKPASS</literal> from + <literal>services.xserver.enable</literal>. This allows easy + usage in non-X11 environments, e.g. Wayland. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 7610cfb732d8f..27491e7837c6c 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -68,3 +68,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. + +- The option + [services.ssh.enableAskPassword](#opt-services.ssh.enableAskPassword) was + added, decoupling the setting of `SSH_ASKPASS` from + `services.xserver.enable`. This allows easy usage in non-X11 environments, + e.g. Wayland. diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 5da15b68cf7d7..c680063a47c34 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -33,6 +33,13 @@ in programs.ssh = { + enableAskPassword = mkOption { + type = types.bool; + default = config.services.xserver.enable; + defaultText = literalExpression "config.services.xserver.enable"; + description = "Whether to configure SSH_ASKPASS in the environment."; + }; + askPassword = mkOption { type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; @@ -287,7 +294,7 @@ in # Allow ssh-agent to ask for confirmation. This requires the # unit to know about the user's $DISPLAY (via ‘systemctl # import-environment’). - environment.SSH_ASKPASS = optionalString config.services.xserver.enable askPasswordWrapper; + environment.SSH_ASKPASS = optionalString cfg.enableAskPassword askPasswordWrapper; environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS }; @@ -298,7 +305,7 @@ in fi ''; - environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword; + environment.variables.SSH_ASKPASS = optionalString cfg.enableAskPassword askPassword; }; } diff --git a/nixos/modules/services/hardware/spacenavd.nix b/nixos/modules/services/hardware/spacenavd.nix index 74725dd23d25c..69ca6f102efe7 100644 --- a/nixos/modules/services/hardware/spacenavd.nix +++ b/nixos/modules/services/hardware/spacenavd.nix @@ -15,7 +15,6 @@ in { config = mkIf cfg.enable { systemd.user.services.spacenavd = { description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion"; - after = [ "syslog.target" ]; wantedBy = [ "graphical.target" ]; serviceConfig = { ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog"; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index e1908cf44d148..a683c537f05b2 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -7,7 +7,6 @@ let @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ - ${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \ -jar ${stateDir}/lib/ace.jar ''; in diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 3296b72204856..980a6b939d5a4 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -227,9 +227,9 @@ in environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; - xdg.portal.extraPortals = with pkgs; [ - pantheon.elementary-files - pantheon.elementary-settings-daemon + xdg.portal.extraPortals = with pkgs.pantheon; [ + elementary-files + elementary-settings-daemon xdg-desktop-portal-pantheon ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5c8342f0bb7b0..80645283c872d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -485,6 +485,7 @@ in ucarp = handleTest ./ucarp.nix {}; udisks2 = handleTest ./udisks2.nix {}; unbound = handleTest ./unbound.nix {}; + unifi = handleTest ./unifi.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; usbguard = handleTest ./usbguard.nix {}; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 19ebed3ebd0bd..8a240ddb17f24 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -215,6 +215,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { f"docker run --rm ${examples.layersOrder.imageName} cat /tmp/layer{index}" ) + with subtest("Ensure layers unpacked in correct order before runAsRoot runs"): + assert "abc" in docker.succeed( + "docker load --input='${examples.layersUnpackOrder}'", + "docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order" + ) + with subtest("Ensure environment variables are correctly inherited"): docker.succeed( "docker load --input='${examples.environmentVariables}'" diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix new file mode 100644 index 0000000000000..34284811abfb0 --- /dev/null +++ b/nixos/tests/unifi.nix @@ -0,0 +1,35 @@ +# Test UniFi controller + +{ system ? builtins.currentSystem +, config ? { allowUnfree = true; } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + makeAppTest = unifi: makeTest { + name = "unifi-controller-${unifi.version}"; + meta = with pkgs.lib.maintainers; { + maintainers = [ zhaofengli ]; + }; + + nodes.server = { + services.unifi = { + enable = true; + unifiPackage = unifi; + openFirewall = false; + }; + }; + + testScript = '' + server.wait_for_unit("unifi.service") + server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300) + ''; + }; +in with pkgs; { + unifiLTS = makeAppTest unifiLTS; + unifi5 = makeAppTest unifi5; + unifi6 = makeAppTest unifi6; +} diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 1393ae943028c..540c59586a6ea 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -46,6 +46,7 @@ , stdenv , systemd , unzip +, usbutils , which , runCommand , xkeyboard_config @@ -102,6 +103,7 @@ let # Runtime stuff git ps + usbutils ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f30138c2fe0d4..cf2f36372a0b5 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.150.0"; + version = "1.152.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-6XG4v2S7InKA6OVrV+q1lT/CzNxmzVQfmAAo2cqbqBY="; + sha256 = "sha256-LwPlWfna+/LsQxOBuTFpE7e7Qr5g9NN14rVasMZVImQ="; }; postPatch = '' @@ -99,6 +99,8 @@ stdenv.mkDerivation rec { fi '') additionalLexers; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Cross-platform code editor"; longDescription = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 8e677458a476c..6b52a065359ae 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.11.25", - "sha256": "sha256-CbH0C+UOJ9X2wKG5IEbgitda06lazujYM8l961k7C7g=" + "rev": "2021.12.12", + "sha256": "sha256-glP2Srw3Lw1JNQO+DIwixf4Xdbo5M6pBdYufwGERPW4=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2021.10.21", - "sha256": "sha256-RyRpHihmmr/EeVWk9CR0S3pvKy0FzqLZNGti33+4fkI=" + "rev": "2021.12.07", + "sha256": "sha256-givCklAHao26psWLI2qK246igxcAQEeIYTGH61FX6Xo=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.11.25", - "sha256": "sha256-6hk9wNdoz1d3VpuW7yHyIQnnYseEAfgjCNGl6+o0Hjs=" + "rev": "2021.12.07", + "sha256": "sha256-/2Fv/vrpbHSiJro11cjbziUaT4gfwa6y5aQBoYgq3OQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/applications/editors/cudatext/update.sh new file mode 100755 index 0000000000000..8389b3e8a7d4c --- /dev/null +++ b/pkgs/applications/editors/cudatext/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq nix-prefetch moreutils + +set -euo pipefail +cd "$(dirname "$0")" + +version=$(curl -s https://api.github.com/repos/Alexey-T/CudaText/releases/latest | jq -r '.tag_name') +url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" +hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) +sriHash=$(nix hash to-sri --type sha256 $hash) + +sed -i "s#version = \".*\"#version = \"$version\"#" default.nix +sed -i "s#sha256 = \".*\"#sha256 = \"$sriHash\"#" default.nix + +while IFS=$'\t' read repo owner rev; do + latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name') + if [ "$latest" != "$rev" ]; then + url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz" + hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) + sriHash=$(nix hash to-sri --type sha256 $hash) + jq ".${repo}.rev = \"${latest}\" | .${repo}.sha256 = \"${sriHash}\"" deps.json | sponge deps.json + fi +done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0cf3ba1bd2c89..8990ef75a8507 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9"; - x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig"; - aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3"; - aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz"; - armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l"; + x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4"; + x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y"; + aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22"; + aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my"; + armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.1"; + version = "1.63.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a224c88b761b9..0ca39a728424a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq"; - x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk"; - aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5"; - armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn"; + x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0"; + x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46"; + aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai"; + armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.1"; + version = "1.63.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 45b3c55637710..79540466e291a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "464"; + version = "466"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA="; + sha256 = "sha256-ih2BctOC9cuTYP8A9ikhGBqNP0SToSAkqmZhtBvgpIo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index f4e4c82235096..e656d36a1c9b4 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -36,4 +36,11 @@ mkDerivation { ''-DNIX_OUT=\"${placeholder "out"}\"'' ''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory ]; + + # compatibility symlinks for kmymoney, can probably be removed in next kde bump + postInstall = '' + ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection + ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope + ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob + ''; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index f4eb1b85965dc..0049b3de8ab7f 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.0/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index cc71307f1acb3..f69e705bb2f92 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,6 +1,5 @@ -{ - mkDerivation, lib, extra-cmake-modules -, qtbase, qtdeclarative, ki18n, kmime, kpkpass +{ mkDerivation, lib, extra-cmake-modules +, qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info }: @@ -16,8 +15,13 @@ mkDerivation { shared-mime-info # for update-mime-database ]; buildInputs = [ - qtbase qtdeclarative ki18n kmime kpkpass poppler + qtdeclarative kmime kpkpass poppler kcontacts kcalendarcore ]; + + CXXFLAGS = [ + "-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory + ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 15835bc61071f..807b3508b95ab 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,10 +1,9 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, - libvncserver, libXtst, libXdamage, - qtx11extras +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet +, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland +, libvncserver, libXtst, libXdamage +, qtx11extras }: mkDerivation { @@ -19,7 +18,7 @@ mkDerivation { buildInputs = [ libvncserver libXtst libXdamage kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons - kwindowsystem kxmlgui + kwindowsystem kxmlgui kwayland qtx11extras ]; propagatedBuildInputs = [ kdnssd ]; diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 4358eb5ffac5b..205f1bd5d12fa 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib +{ mkDerivation, lib, fetchpatch , libkdegames, extra-cmake-modules , kdeclarative, knewstuff }: @@ -15,6 +15,17 @@ mkDerivation { license = licenses.gpl2Plus; platforms = platforms.linux; }; + + patches = [ + # fix compile error due to usage of deprecated things + # probably can be removed with the next kde bump + (fetchpatch { + url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch"; + revert = true; + sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 73032655fc439..7e4ff2eb75d93 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1811 +4,1843 @@ { akonadi = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-21.08.3.tar.xz"; - sha256 = "1yqlgzni7kj0n7k2wvi65wfz4il75j7qvmrdjw3a0ld6115j2vqs"; - name = "akonadi-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-21.12.0.tar.xz"; + sha256 = "1wxqkhqlvjidr7j5g4hcqykvys27snc2cp2k077dixdnp4v71gr3"; + name = "akonadi-21.12.0.tar.xz"; }; }; akonadi-calendar = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-21.08.3.tar.xz"; - sha256 = "17pl7viz89zn43iyp6hk9q2dix1mzfxmxf08jk5wcciphabyj2sc"; - name = "akonadi-calendar-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-calendar-21.12.0.tar.xz"; + sha256 = "0jkzq071f2w3ysra87clxa63ykg8ywr92mqc57fxzc9hydkg0pbs"; + name = "akonadi-calendar-21.12.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-calendar-tools-21.08.3.tar.xz"; - sha256 = "0wc3yfb8riijmmwqbny7vpfav24w8id4s2ysbcljrvypv420ii2g"; - name = "akonadi-calendar-tools-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-calendar-tools-21.12.0.tar.xz"; + sha256 = "0nxcgv1vwr60706sd3hipmxx22nf3sxxif8li2r0pqnfqf542hcy"; + name = "akonadi-calendar-tools-21.12.0.tar.xz"; }; }; akonadi-contacts = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-contacts-21.08.3.tar.xz"; - sha256 = "1i5mwjf8vp40mmdfkafhhbcmvdd2sihd6aa4z1wnhnbg59cjvp8i"; - name = "akonadi-contacts-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-contacts-21.12.0.tar.xz"; + sha256 = "0al4v2yv9hf1lidk135m45ckr0hgvvlb0px9wqa2zqkrykpm0qz4"; + name = "akonadi-contacts-21.12.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-import-wizard-21.08.3.tar.xz"; - sha256 = "1splq2fgifk4mh00j4dd1lmgyc4bvz8sbsw0fznmafg76k1fvama"; - name = "akonadi-import-wizard-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-import-wizard-21.12.0.tar.xz"; + sha256 = "0lrvmkaphrk4sad83nc2pm3qy5q7jgp13dqh5mvqk2sb3mlpv5xi"; + name = "akonadi-import-wizard-21.12.0.tar.xz"; }; }; akonadi-mime = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-mime-21.08.3.tar.xz"; - sha256 = "19dbgl9940wwsiyhysh1lm5ks9xb6a5m53p9qmdr5siid9karq64"; - name = "akonadi-mime-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-mime-21.12.0.tar.xz"; + sha256 = "07rmlsgrghy38j8nahpml5yp5zaxdwjjk77ydp2nn10fprr6ssyq"; + name = "akonadi-mime-21.12.0.tar.xz"; }; }; akonadi-notes = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-notes-21.08.3.tar.xz"; - sha256 = "0g1kdhj4qjl29x70dl4fl30f4r67s6ldpmqrf0xnj7zwz008r0fn"; - name = "akonadi-notes-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-notes-21.12.0.tar.xz"; + sha256 = "0p1gn9rl5hyh14kx7p461l9a2va4kc44a1xr2xlk392bpyi7zn22"; + name = "akonadi-notes-21.12.0.tar.xz"; }; }; akonadi-search = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadi-search-21.08.3.tar.xz"; - sha256 = "1fvfd1410zy9dbcjl21463wj91s5vly00l53ixaizylnjbj67lm0"; - name = "akonadi-search-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadi-search-21.12.0.tar.xz"; + sha256 = "07fazr0hq9ndpvgjvrh606qbkgk429ikmk62bp8lz161n6hxw19k"; + name = "akonadi-search-21.12.0.tar.xz"; }; }; akonadiconsole = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akonadiconsole-21.08.3.tar.xz"; - sha256 = "1id1l6ifc1b8qsx16badhww33idk7c8qnn4lh3bg6mg1whmvy4k2"; - name = "akonadiconsole-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akonadiconsole-21.12.0.tar.xz"; + sha256 = "0ld1z3vidpqhrj2hmbhsiwmfn10za0jvfkg79vbdv8x0gmbyjynd"; + name = "akonadiconsole-21.12.0.tar.xz"; }; }; akregator = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/akregator-21.08.3.tar.xz"; - sha256 = "1jb2vd43pn7i1b7ylhm74q0jkk3hwbjxh6nc2hqpl9c0ic20arf2"; - name = "akregator-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/akregator-21.12.0.tar.xz"; + sha256 = "0w51ndga17v7xj98r9i944v42py2qqrsg2p7q69r2ip9k73m56cv"; + name = "akregator-21.12.0.tar.xz"; }; }; analitza = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/analitza-21.08.3.tar.xz"; - sha256 = "04g1l9q80j5rigz0667js35zjm3as0dpfkjhcm997bna1yb0d92z"; - name = "analitza-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/analitza-21.12.0.tar.xz"; + sha256 = "0nr84vr20aq3v3k28vx3xk4la8ff1hw7nm930vvjw8vkhpdkm03m"; + name = "analitza-21.12.0.tar.xz"; }; }; ark = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ark-21.08.3.tar.xz"; - sha256 = "1wrxv8csj1irrwcddkjgbcivpxi2v3nj06lvayzr32b29i85h637"; - name = "ark-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ark-21.12.0.tar.xz"; + sha256 = "1krhxhhab4m0z4ni8dbgraymbawc85rf3b3q8zcm799zk4hphr6x"; + name = "ark-21.12.0.tar.xz"; }; }; artikulate = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/artikulate-21.08.3.tar.xz"; - sha256 = "14g5wcw1bxxmbc9vvy07zbk2ma2cj1zbb5fdcwdf4ybaal9r43jq"; - name = "artikulate-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/artikulate-21.12.0.tar.xz"; + sha256 = "13jvbgvqrcrhvcnb2j3dh9r7m50b2m0nf9479ayqkp2cirm77k61"; + name = "artikulate-21.12.0.tar.xz"; }; }; audiocd-kio = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/audiocd-kio-21.08.3.tar.xz"; - sha256 = "0fp29igj87pff8jya230j67vcz9pv7g27g4dv2pl3r6gm2kv8c9i"; - name = "audiocd-kio-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/audiocd-kio-21.12.0.tar.xz"; + sha256 = "12nxyy16pc4a8kwag39bmyl055f1izfsrwiblm1l5567m0v93vd1"; + name = "audiocd-kio-21.12.0.tar.xz"; }; }; baloo-widgets = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/baloo-widgets-21.08.3.tar.xz"; - sha256 = "1pjlw22ivqhpd6bf50d8s9jaq6h2k0l2szwnh841qq7bwwkp9kcb"; - name = "baloo-widgets-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/baloo-widgets-21.12.0.tar.xz"; + sha256 = "19f9as73cim6f3h5qcirr88h0cmi3w0r3gcy5hdc6ghyx37wj87p"; + name = "baloo-widgets-21.12.0.tar.xz"; }; }; blinken = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/blinken-21.08.3.tar.xz"; - sha256 = "03s3pv61jhkx3lm5rik25fglhda9l4w43blpwh78rbdk3c3s3ijg"; - name = "blinken-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/blinken-21.12.0.tar.xz"; + sha256 = "01542z383xkhjznmf220qvgbg902ky5jdpj1p8shbzaij5yxv847"; + name = "blinken-21.12.0.tar.xz"; }; }; bomber = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/bomber-21.08.3.tar.xz"; - sha256 = "0h5iwpmpw8xnqh6xcm4zqqcp1ia5wir0ghwsbcgrz9ka59dfdh4z"; - name = "bomber-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/bomber-21.12.0.tar.xz"; + sha256 = "1iwk0b5fnv328bjd7mxhs46rmbkrchpdxk7q8mmysn8z6vyscisc"; + name = "bomber-21.12.0.tar.xz"; }; }; bovo = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/bovo-21.08.3.tar.xz"; - sha256 = "0p5pi6rnnmikhg72gagld67r022bq3nsrhls0gglx14zfj6pgln3"; - name = "bovo-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/bovo-21.12.0.tar.xz"; + sha256 = "0nfzqmqfb6kwprhv4dbp3lpv8hf51rw12ib21hpx9s1jknqs6179"; + name = "bovo-21.12.0.tar.xz"; }; }; calendarsupport = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/calendarsupport-21.08.3.tar.xz"; - sha256 = "1kial8x8sw0039n2s3nl9i0wadf8xda1bv2g9kws0kp29k58lyfy"; - name = "calendarsupport-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/calendarsupport-21.12.0.tar.xz"; + sha256 = "1a3rxy5g2illphi61x90b6sijkiqyfw458br5cbxj7c1q98y2p1l"; + name = "calendarsupport-21.12.0.tar.xz"; }; }; cantor = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/cantor-21.08.3.tar.xz"; - sha256 = "1l3z0aikrfjdpcfq6apmwla9k7dqymvysi275kpx0dqi5sfgi9lb"; - name = "cantor-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/cantor-21.12.0.tar.xz"; + sha256 = "04413152yhg1s6iyp3a8ihjs41ni3wbv7kgqx9sz0zmn7vyfl859"; + name = "cantor-21.12.0.tar.xz"; }; }; cervisia = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/cervisia-21.08.3.tar.xz"; - sha256 = "0a7g3g849vf0c0222944iwqhymnxcn9qj0v85m2b0bfxgdf0fgk7"; - name = "cervisia-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/cervisia-21.12.0.tar.xz"; + sha256 = "17b116y4bvs2d40m2m7xbwjsnf2wffv921lw5f6nwgmxqfdinacp"; + name = "cervisia-21.12.0.tar.xz"; }; }; dolphin = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/dolphin-21.08.3.tar.xz"; - sha256 = "19yrgfliqabmymrh3sx2i5129rcc14nxb86f21wd616b3pcby5rv"; - name = "dolphin-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/dolphin-21.12.0.tar.xz"; + sha256 = "0s96ggzkwjs8pyad4mp8x2z2hiajxwpb2fzwsjzzkicjwa7c03z7"; + name = "dolphin-21.12.0.tar.xz"; }; }; dolphin-plugins = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/dolphin-plugins-21.08.3.tar.xz"; - sha256 = "098i2zydzi95i860pk6p0g0wx1bryyxanawhcis5d5h3xra66s0p"; - name = "dolphin-plugins-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/dolphin-plugins-21.12.0.tar.xz"; + sha256 = "150kfhm3qh6x4qq3b5s5fbm7q9z7i9asmnmwqfppcqz3fjc5pg7j"; + name = "dolphin-plugins-21.12.0.tar.xz"; }; }; dragon = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/dragon-21.08.3.tar.xz"; - sha256 = "0zfh5kmw2mvnwpcbh9i6xzzdigkglr6y0y7acw2dw6bi2cqx5cc7"; - name = "dragon-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/dragon-21.12.0.tar.xz"; + sha256 = "147m5rki2s8xc9i09fan37c16yicbkwz1v95li2ihjah43kgq78h"; + name = "dragon-21.12.0.tar.xz"; }; }; elisa = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/elisa-21.08.3.tar.xz"; - sha256 = "0w3sk52ghkka305hagld5ia6z6czavbqgc0abqdz442bgnk1f1vb"; - name = "elisa-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/elisa-21.12.0.tar.xz"; + sha256 = "0rs81kbgsd7412sz7h6xax1c83n9lp21k062m2h50ccf4lzx7fyw"; + name = "elisa-21.12.0.tar.xz"; }; }; eventviews = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/eventviews-21.08.3.tar.xz"; - sha256 = "08bcw79iag71yiaf7ck27b2ja4pg18ah04rxa1c6g5fr9x6kkk46"; - name = "eventviews-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/eventviews-21.12.0.tar.xz"; + sha256 = "1667ck9na8ajqaagxks7rlrwb6w04mxdci7mc5ash8l57icdgp6y"; + name = "eventviews-21.12.0.tar.xz"; }; }; ffmpegthumbs = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ffmpegthumbs-21.08.3.tar.xz"; - sha256 = "10l9592f2l63rfak3f0knvzapsaa8nyx3dl82n724359qj43m530"; - name = "ffmpegthumbs-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ffmpegthumbs-21.12.0.tar.xz"; + sha256 = "14mimxgml627lkq7gw24j62hs5iglvbwnlbv879p7zlsg46fjg1b"; + name = "ffmpegthumbs-21.12.0.tar.xz"; }; }; filelight = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/filelight-21.08.3.tar.xz"; - sha256 = "0j5106x93ljkcxk90cs1yvd9dw3pnr007cd4plsw5z7kgmch3zww"; - name = "filelight-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/filelight-21.12.0.tar.xz"; + sha256 = "1w3n550smqnq1vwsizrcry3rnpk8f3xmiabdzkx9bggrk5p07jnj"; + name = "filelight-21.12.0.tar.xz"; }; }; granatier = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/granatier-21.08.3.tar.xz"; - sha256 = "1igia7fxll361np76763nw915d90f5hklgqii9iyld8si99amy4y"; - name = "granatier-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/granatier-21.12.0.tar.xz"; + sha256 = "19r5lilgjapz7bdam55cxs3z40rclczmzklp5ns348f2rqh36chg"; + name = "granatier-21.12.0.tar.xz"; }; }; grantlee-editor = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/grantlee-editor-21.08.3.tar.xz"; - sha256 = "04yry04cdysh4a1y6nznxmfw2pww956xan0dnf77yjzssri9p2fq"; - name = "grantlee-editor-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/grantlee-editor-21.12.0.tar.xz"; + sha256 = "1lyv3c6801pv3mgxn8i9k6g319ggxg0mxk85nzq1w74m56ywkx12"; + name = "grantlee-editor-21.12.0.tar.xz"; }; }; grantleetheme = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/grantleetheme-21.08.3.tar.xz"; - sha256 = "11c72jp9ywpmsc3d92cj2c9xvwmqbilsfddmlxlwnpnp2rf8q933"; - name = "grantleetheme-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/grantleetheme-21.12.0.tar.xz"; + sha256 = "1agkqrr29ib314x48jl4yfybnq10nk45976g7yjlfp6r8qib4pal"; + name = "grantleetheme-21.12.0.tar.xz"; }; }; gwenview = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/gwenview-21.08.3.tar.xz"; - sha256 = "06hg20sygi6xfbifgi1d6s5zba5qqpm949xa7gyxi1vsq0kbvrq4"; - name = "gwenview-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/gwenview-21.12.0.tar.xz"; + sha256 = "1y484f7fvnj217qrdfva0k3359n7mz4pvxw54xar2xa9z18iqw8g"; + name = "gwenview-21.12.0.tar.xz"; }; }; incidenceeditor = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/incidenceeditor-21.08.3.tar.xz"; - sha256 = "0p45x5qkzbfklxk22kzp9zlvl8ggdjgniq889q8hzb1s89ia1cck"; - name = "incidenceeditor-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/incidenceeditor-21.12.0.tar.xz"; + sha256 = "1rrda32h004gfqvvxh74wlr9ym3zbgf6a7nd2ldmn7z852z7gpsp"; + name = "incidenceeditor-21.12.0.tar.xz"; }; }; itinerary = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/itinerary-21.08.3.tar.xz"; - sha256 = "0w7kb4wvy1sfhlkikvq1ajckizf7k2bzy2wcjdz5is69rrd5cab5"; - name = "itinerary-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/itinerary-21.12.0.tar.xz"; + sha256 = "1dwpaznzklxbyaj6fvgm416vbz5fyw78c5bx10z9ygmj88jv6dls"; + name = "itinerary-21.12.0.tar.xz"; }; }; juk = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/juk-21.08.3.tar.xz"; - sha256 = "19g1dpvrssip8vysds3j4wa599ivapznz10p0p1254gkjyxdxdm3"; - name = "juk-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/juk-21.12.0.tar.xz"; + sha256 = "0gsdiysld5mk2k2c34d883hlgcn3ad2qkvbf4ba6iikn2kbsdhw2"; + name = "juk-21.12.0.tar.xz"; }; }; k3b = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/k3b-21.08.3.tar.xz"; - sha256 = "1k5xn33sggx3a7lns8y64sa3schqvg476q81rig9mylh68x8rr5y"; - name = "k3b-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/k3b-21.12.0.tar.xz"; + sha256 = "1g6slra4bwbsr282p7xzbldq4j366x03fv99icfj9xj5kargp3jq"; + name = "k3b-21.12.0.tar.xz"; }; }; kaccounts-integration = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-integration-21.08.3.tar.xz"; - sha256 = "0hyaygrsdp6s96s4wa9z5l1w5w5hxwbw432zs6a2fkgq5dpa3wn4"; - name = "kaccounts-integration-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kaccounts-integration-21.12.0.tar.xz"; + sha256 = "0dlan1gjzci3f3xfr3gr6wb4k7qvdm3r91ihxza9bravn2pkf4n7"; + name = "kaccounts-integration-21.12.0.tar.xz"; }; }; kaccounts-providers = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kaccounts-providers-21.08.3.tar.xz"; - sha256 = "0chajl87w3gp1a8l7h6bxf93js6jxdkx90ir82glgh45p5qhdhcr"; - name = "kaccounts-providers-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kaccounts-providers-21.12.0.tar.xz"; + sha256 = "0y3hirzs0q1pkrfi3k41lyxbylc0zahaky9zar5262w36wcc28ai"; + name = "kaccounts-providers-21.12.0.tar.xz"; }; }; kaddressbook = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kaddressbook-21.08.3.tar.xz"; - sha256 = "1c16pcbjd5w04xbkjalvf697nqi751f4g8ldaing3k2rmdvhsqwg"; - name = "kaddressbook-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kaddressbook-21.12.0.tar.xz"; + sha256 = "126sf8agg2j8dkq4vbpd28bkg2smmkb0q3ynmxz2llifrzfxz1is"; + name = "kaddressbook-21.12.0.tar.xz"; }; }; kajongg = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kajongg-21.08.3.tar.xz"; - sha256 = "15i5vdcwm7a5amrxxbi0f4c3ls7ly1ccg88hff2wc960wwc6nvqb"; - name = "kajongg-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kajongg-21.12.0.tar.xz"; + sha256 = "15fj2bmkwz9la4d44w5qpk9fwzb8y77gvybv5rqxpmaknzan2b76"; + name = "kajongg-21.12.0.tar.xz"; }; }; kalarm = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kalarm-21.08.3.tar.xz"; - sha256 = "0zcmaf4x9jvpyri1kirnm2rij3886z9k1vx6wxxxmx6sbllpb669"; - name = "kalarm-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kalarm-21.12.0.tar.xz"; + sha256 = "0hl1xk6zch2ji4lgh74qpd0j8i00y0vmw6xfmhpzkri6hk3shgrm"; + name = "kalarm-21.12.0.tar.xz"; }; }; kalarmcal = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kalarmcal-21.08.3.tar.xz"; - sha256 = "03zmw8pxhfmrm7xl5h2k42xyqwn4cllhrp43sv7pjbym9ya41wyk"; - name = "kalarmcal-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kalarmcal-21.12.0.tar.xz"; + sha256 = "0rk078dnr7a3x73n7sfd06p7mr2r84hbv8lvknimfdy3i2c63hhx"; + name = "kalarmcal-21.12.0.tar.xz"; }; }; kalgebra = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kalgebra-21.08.3.tar.xz"; - sha256 = "0w2n3nyds9069c4cj1ap2b14w8nw5dc3yb62j5y6yj9qz9ip7cdk"; - name = "kalgebra-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kalgebra-21.12.0.tar.xz"; + sha256 = "0qibj81w8l0g144yplhy7wmh3zwws865xhih4vp6n3apa8h3a5bk"; + name = "kalgebra-21.12.0.tar.xz"; }; }; kalzium = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kalzium-21.08.3.tar.xz"; - sha256 = "0x7dn0f2bwzplzxal2wvnc3qh2qs522626ksp6ajgf16jwf7d4kl"; - name = "kalzium-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kalzium-21.12.0.tar.xz"; + sha256 = "04inkz95qm3s6yh6j4aaa2vja0zkls7f9i3y5zykx665jr90bl87"; + name = "kalzium-21.12.0.tar.xz"; }; }; kamera = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kamera-21.08.3.tar.xz"; - sha256 = "1yv87rmb8k6yh5150915fsnh8rdj1d4k8zpc8k54hxa9gjw5wqm7"; - name = "kamera-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kamera-21.12.0.tar.xz"; + sha256 = "1vhc5b0ry1344dh4swfbw4r9in08i297p1x0nfv28v989bf15axn"; + name = "kamera-21.12.0.tar.xz"; }; }; kamoso = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kamoso-21.08.3.tar.xz"; - sha256 = "1k2kis36a6dlsnh85qc01yd6qnz8kwrv4hvzpkpqvvp3m4ik17wx"; - name = "kamoso-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kamoso-21.12.0.tar.xz"; + sha256 = "0fixk5zc647r56z1vigaj5m0xkp7n56lmda248zh54x0n5prhd8d"; + name = "kamoso-21.12.0.tar.xz"; }; }; kanagram = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kanagram-21.08.3.tar.xz"; - sha256 = "1rxirjrw6dj23awv6gbypv0jlwfdh4baz86l32rx8pnmd9icg7s3"; - name = "kanagram-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kanagram-21.12.0.tar.xz"; + sha256 = "0j7agapb1byd28fn49c3j02gl108n8skk95spyi998rnm9zm2wc6"; + name = "kanagram-21.12.0.tar.xz"; }; }; kapman = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kapman-21.08.3.tar.xz"; - sha256 = "0v8ay2s868l7dxasq0rhy065rp9sfb4fzldcqs46lxy7jmk3ws93"; - name = "kapman-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kapman-21.12.0.tar.xz"; + sha256 = "11vnm8ajrckg0ix5xc7mpbwqisbsqy3wivf9y18m5qkz5bvis4g4"; + name = "kapman-21.12.0.tar.xz"; }; }; kapptemplate = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kapptemplate-21.08.3.tar.xz"; - sha256 = "02dp4qwrv3gylri936c82imh4lv1a3vfzlphmwadyhiy7j9ic5fa"; - name = "kapptemplate-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kapptemplate-21.12.0.tar.xz"; + sha256 = "022rrgb8bak62q253x14gk5grsimwhilwkb4rlm2scq84m4lwil7"; + name = "kapptemplate-21.12.0.tar.xz"; }; }; kate = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kate-21.08.3.tar.xz"; - sha256 = "1gdz0wxkh34a2zi9vks9qw70g7dvkbvrbp6y68rjg7720sdb0gp2"; - name = "kate-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kate-21.12.0.tar.xz"; + sha256 = "0yvg2j4ijx3zq0v0djidjp5w3lj8j7qpfh9ax2ym7a3qf1y2w4ml"; + name = "kate-21.12.0.tar.xz"; }; }; katomic = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/katomic-21.08.3.tar.xz"; - sha256 = "1sgrpqbv4zz22qijm00lzv1cv4rwjh7bbf4gz9xmnfmhyw0n88i1"; - name = "katomic-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/katomic-21.12.0.tar.xz"; + sha256 = "1k8aivpn9fmzwn5nzcbn2zym7m65xganxx43drk8mhx5m2lgvs0c"; + name = "katomic-21.12.0.tar.xz"; }; }; kbackup = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kbackup-21.08.3.tar.xz"; - sha256 = "1cjb2invbc60i2lahn01kd28q3wb6s35grwglgmx2cgqqkmgl42s"; - name = "kbackup-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kbackup-21.12.0.tar.xz"; + sha256 = "1ki86g18mc7m9cywjpjcx1i83b5ff9dbjx7qa5fqmy5n16b85l5m"; + name = "kbackup-21.12.0.tar.xz"; }; }; kblackbox = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kblackbox-21.08.3.tar.xz"; - sha256 = "1i4c5v5w42akf4b44sqrl9x4rhqgyjljr7k5i440ahch9qkf93pj"; - name = "kblackbox-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kblackbox-21.12.0.tar.xz"; + sha256 = "09lafayr6fl50dm272qph0j0qvznqsg7jkfmkq06wwm2sxxlabc9"; + name = "kblackbox-21.12.0.tar.xz"; }; }; kblocks = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kblocks-21.08.3.tar.xz"; - sha256 = "0326fxv1nvh37h8xhvv5x4fy3l4gbrzmwsgcwslma1hakys9dhrs"; - name = "kblocks-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kblocks-21.12.0.tar.xz"; + sha256 = "0lc4wmgb07x87y4hyaajqkd3sw5afk1yby46wywak3m8v8scyvwg"; + name = "kblocks-21.12.0.tar.xz"; }; }; kbounce = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kbounce-21.08.3.tar.xz"; - sha256 = "00d9m7c564qrifpaldvjk6ahclrjk1aawhypjj9sls2sisx2mip4"; - name = "kbounce-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kbounce-21.12.0.tar.xz"; + sha256 = "1qb3n03cl1qbnrbm2cqk20zxkpilddr8j67ca22mipp0md67c0fv"; + name = "kbounce-21.12.0.tar.xz"; }; }; kbreakout = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kbreakout-21.08.3.tar.xz"; - sha256 = "1h3s4cr4bxi24j55anks946h7iba2wda5kbglsyfqw1ifrsq13vz"; - name = "kbreakout-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kbreakout-21.12.0.tar.xz"; + sha256 = "12zd36zv7qbdavism2kzbmx78vx66laykhkskaz66z1qxw1wls6y"; + name = "kbreakout-21.12.0.tar.xz"; }; }; kbruch = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kbruch-21.08.3.tar.xz"; - sha256 = "15bfqxz4j5f5ix55fsk780p7ddrzqzmk55gmbjy796sgh8b71wcr"; - name = "kbruch-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kbruch-21.12.0.tar.xz"; + sha256 = "1xk8g3zp8qpqz893nnj50h1ypqzbalj57x6m4g7xy77dmwdjqgnd"; + name = "kbruch-21.12.0.tar.xz"; }; }; kcachegrind = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcachegrind-21.08.3.tar.xz"; - sha256 = "188m15y7sj17jyr9963gblgkknhgf32331kvzz4cwqzk14b9krr2"; - name = "kcachegrind-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcachegrind-21.12.0.tar.xz"; + sha256 = "1k5fgqyd76679ay53dlksp46a0f54qyk9av5z0bq4l2ldna5k2ly"; + name = "kcachegrind-21.12.0.tar.xz"; }; }; kcalc = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcalc-21.08.3.tar.xz"; - sha256 = "1d7716law49cwmis4w9ij1xmi4g2wrv4mnc78xcms8kmgba5gs7v"; - name = "kcalc-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcalc-21.12.0.tar.xz"; + sha256 = "1ih0xmldzm39li93xiprr4wm6xqwwkqc15bnmvy846p0b1kqg2s5"; + name = "kcalc-21.12.0.tar.xz"; }; }; kcalutils = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcalutils-21.08.3.tar.xz"; - sha256 = "0l209pyi866mf1pr4rkq7g3pgjvyss5sqhpy9vb2b2w66w3f66ri"; - name = "kcalutils-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcalutils-21.12.0.tar.xz"; + sha256 = "09i4kbfgwpzw55rdlvl0hi1bvra0796b2d18n97lf2idafiz6bny"; + name = "kcalutils-21.12.0.tar.xz"; }; }; kcharselect = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcharselect-21.08.3.tar.xz"; - sha256 = "0fk06whwi4h43sw3adcs4b2s9ycwjamzrwr23m33c31mlpcb3i8z"; - name = "kcharselect-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcharselect-21.12.0.tar.xz"; + sha256 = "1nbys46mbrsb1j5migpap5x11hz54vmfwxcrgcrr5l74g2gr33ks"; + name = "kcharselect-21.12.0.tar.xz"; }; }; kcolorchooser = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcolorchooser-21.08.3.tar.xz"; - sha256 = "07fvl4rfzhgz4kh9dhqkq6kf4913jv9cw9abfdb7k3pbr0r26qgz"; - name = "kcolorchooser-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcolorchooser-21.12.0.tar.xz"; + sha256 = "0dy6p6yg1rki3bnhvskphha3v72lbw70h4x9aazkiczfyb19iyjk"; + name = "kcolorchooser-21.12.0.tar.xz"; }; }; kcron = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kcron-21.08.3.tar.xz"; - sha256 = "1374agj9qc5ifm0yckq8m94gq7sjd42n4wwb59p756736asan8k5"; - name = "kcron-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kcron-21.12.0.tar.xz"; + sha256 = "1j5jcfamb3srxfli7wd32j194f51y5x60p21hkgprwmj7k8l7nia"; + name = "kcron-21.12.0.tar.xz"; }; }; kde-dev-scripts = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-scripts-21.08.3.tar.xz"; - sha256 = "152n6iir4xzx1a5d5bi4lb42rgl222pi6jz0hfkchk7swfgpvdfs"; - name = "kde-dev-scripts-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kde-dev-scripts-21.12.0.tar.xz"; + sha256 = "0b8xnkk0xmkw7jjhi9ilvgsn41p1f5ni6008nl1vf2ys76iv8ccq"; + name = "kde-dev-scripts-21.12.0.tar.xz"; }; }; kde-dev-utils = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kde-dev-utils-21.08.3.tar.xz"; - sha256 = "1xs4fybbqlxji2py06hxabsisfb3bkvbfb3vy9lyj2k5vnnmpkf8"; - name = "kde-dev-utils-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kde-dev-utils-21.12.0.tar.xz"; + sha256 = "1jfdadirgpw4cd7apvzxk5ql0hljyqqmpzak0v395q6nhyflpa54"; + name = "kde-dev-utils-21.12.0.tar.xz"; }; }; kdebugsettings = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdebugsettings-21.08.3.tar.xz"; - sha256 = "1d47igv0xg1hlxzyfg10h5g7s79yq44d3ixpr82risyrslbwvll4"; - name = "kdebugsettings-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdebugsettings-21.12.0.tar.xz"; + sha256 = "0jasjhhfyaakgawzhw7dqbxhc7pzfrcbpghg03pw0ld54ma69s0f"; + name = "kdebugsettings-21.12.0.tar.xz"; }; }; kdeconnect-kde = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdeconnect-kde-21.08.3.tar.xz"; - sha256 = "1gfsbg6rwqv3cpfxcayn3q9i99mnhjz666p9x9ih205idlrn6iij"; - name = "kdeconnect-kde-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdeconnect-kde-21.12.0.tar.xz"; + sha256 = "0jlx6rlg2sspfxq9fsl1416b7229vbx0fydy0a4vdj7nrq1iv7ji"; + name = "kdeconnect-kde-21.12.0.tar.xz"; }; }; kdeedu-data = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdeedu-data-21.08.3.tar.xz"; - sha256 = "15qqcl6gws6ddyv373dfql3wj2fryvr5b6d66q4l1xwc1mg6wnqs"; - name = "kdeedu-data-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdeedu-data-21.12.0.tar.xz"; + sha256 = "11wqcli3dvalkpvbzx271nmxmv825crd5bn03gl9606366q94vin"; + name = "kdeedu-data-21.12.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-mobipocket-21.08.3.tar.xz"; - sha256 = "1bli0ld2mymgppjsjjvkyk7ldpz787p30d7lf6lpafrf64di2bhm"; - name = "kdegraphics-mobipocket-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdegraphics-mobipocket-21.12.0.tar.xz"; + sha256 = "04rcjlhmqhgaclg0hv5mjjaq5r5nx2pi7ngj5rvh1c14001ip8y2"; + name = "kdegraphics-mobipocket-21.12.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdegraphics-thumbnailers-21.08.3.tar.xz"; - sha256 = "1hbjmkjymb3pi1lz43bl5clgdyy6kr928q7fniwiwmak3k1xrng5"; - name = "kdegraphics-thumbnailers-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdegraphics-thumbnailers-21.12.0.tar.xz"; + sha256 = "0zli49aa2zljly10fzhzj60mjjdikfn6fsxspgx48y0vfcqb1p3h"; + name = "kdegraphics-thumbnailers-21.12.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdenetwork-filesharing-21.08.3.tar.xz"; - sha256 = "19c3my0i9xb3salf7sk870nhv797wkk83dyrczw672skwl8xcnd9"; - name = "kdenetwork-filesharing-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdenetwork-filesharing-21.12.0.tar.xz"; + sha256 = "15svxqkynw9k6zzdjx9b8bwwy5v76lngw9hvygrfjhif8nr2np6m"; + name = "kdenetwork-filesharing-21.12.0.tar.xz"; }; }; kdenlive = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdenlive-21.08.3.tar.xz"; - sha256 = "00ss9i9gw112vc3bjayp193qnfd3dq47bij9mv429azl20ff0y0c"; - name = "kdenlive-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdenlive-21.12.0.tar.xz"; + sha256 = "083lswdllznyj33qzfbzvy7lp73fwbrhn8xvp33x36nqb3h2w7g1"; + name = "kdenlive-21.12.0.tar.xz"; }; }; kdepim-addons = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdepim-addons-21.08.3.tar.xz"; - sha256 = "1ham9yzmj89lp3zwxwpyh0qy7fxrlhgmhphn9crrkx9gsy77ddsf"; - name = "kdepim-addons-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdepim-addons-21.12.0.tar.xz"; + sha256 = "00xn3l54n9c1znp2k5bll04rqsqazr24mx1hg0vk3gqi6fnff2ph"; + name = "kdepim-addons-21.12.0.tar.xz"; }; }; kdepim-runtime = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdepim-runtime-21.08.3.tar.xz"; - sha256 = "1d2208pwalc6mjfnn4gfq2f2fqgxp9w3g8igx6r6l9qsgybh1msx"; - name = "kdepim-runtime-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdepim-runtime-21.12.0.tar.xz"; + sha256 = "1mmp8wlhm6avwkzs81vfvqidxxagv14ll10bg4pyy2mafnm0q31a"; + name = "kdepim-runtime-21.12.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-kioslaves-21.08.3.tar.xz"; - sha256 = "0frw2zxwckmqmffxn5gszdxz61zc0k8xpbhbiyfxsqprh3ck4a2y"; - name = "kdesdk-kioslaves-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdesdk-kioslaves-21.12.0.tar.xz"; + sha256 = "1zj1xz6b0hrjvslw00vs3rgcnrhcm50as7d481zgky385j3c5i8r"; + name = "kdesdk-kioslaves-21.12.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdesdk-thumbnailers-21.08.3.tar.xz"; - sha256 = "06s7i85g5gpknxlrq59i5w8czpaz5wl1b8kfx9flzx0x6ibm5s9q"; - name = "kdesdk-thumbnailers-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdesdk-thumbnailers-21.12.0.tar.xz"; + sha256 = "1m471h9c8lsd5jchmdjynjwj85i163qq0m6jxcl9pppsn3hvb6a3"; + name = "kdesdk-thumbnailers-21.12.0.tar.xz"; + }; + }; + kdev-php = { + version = "21.12.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.12.0/src/kdev-php-21.12.0.tar.xz"; + sha256 = "02s116xbdhpvk14y8rgb6icmccy77d0mwrriqv2fxwgl2d26g57z"; + name = "kdev-php-21.12.0.tar.xz"; + }; + }; + kdev-python = { + version = "21.12.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.12.0/src/kdev-python-21.12.0.tar.xz"; + sha256 = "02nfdvbwj4arkx4z5i148n7mxfb4r2f605wjhc2iddkvdmpbgpcx"; + name = "kdev-python-21.12.0.tar.xz"; + }; + }; + kdevelop = { + version = "21.12.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.12.0/src/kdevelop-21.12.0.tar.xz"; + sha256 = "17v1347ljvr6wif1lihv6vbd5h2n6pi1nb5v43lin5s165d7scv4"; + name = "kdevelop-21.12.0.tar.xz"; }; }; kdf = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdf-21.08.3.tar.xz"; - sha256 = "061xclwkhmc9m8f113hlb46dwk5zvqlmgahz13yfbvyrpj810a7k"; - name = "kdf-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdf-21.12.0.tar.xz"; + sha256 = "1q5w741kvyy7bkbm4xiif7ac1cyc02v8wrwr7h10fvcvbvyca50a"; + name = "kdf-21.12.0.tar.xz"; }; }; kdialog = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdialog-21.08.3.tar.xz"; - sha256 = "1ibqz8s8p90rxy843f1wn3jnyzrm54srhfpr4ix48amf86afj2gp"; - name = "kdialog-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdialog-21.12.0.tar.xz"; + sha256 = "1klz70xw43rb89mi1dql0rmjpnzz4hp5dmdwybbby8zd7vkwkp07"; + name = "kdialog-21.12.0.tar.xz"; }; }; kdiamond = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kdiamond-21.08.3.tar.xz"; - sha256 = "1vkflwvi1wa2kd6hq647g9skxg6c7jdk9hakzfphlq2jw6daml94"; - name = "kdiamond-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kdiamond-21.12.0.tar.xz"; + sha256 = "003qaf5nyv098f6ap86gjiqmr3a84vqjxjn40jd2g09vsn717xpf"; + name = "kdiamond-21.12.0.tar.xz"; }; }; keditbookmarks = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/keditbookmarks-21.08.3.tar.xz"; - sha256 = "0v9grm385zyxpsqjp287cz8lvrvfzkk7b4blvdr1hi66sng7nr2n"; - name = "keditbookmarks-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/keditbookmarks-21.12.0.tar.xz"; + sha256 = "1pglks8hh1h7lhgzqai4jahy5zgw7j5si4ijbnk02s8zi1prjn21"; + name = "keditbookmarks-21.12.0.tar.xz"; }; }; kfind = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kfind-21.08.3.tar.xz"; - sha256 = "04qdxqa8gfipjm5akplxrjbnlaky2djkx8nkvcqzqfhvw5i9rxqp"; - name = "kfind-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kfind-21.12.0.tar.xz"; + sha256 = "1a5p8673c544w1587pp49ra8xwj80hg8v6vgxh88xs5fjdxwzgf5"; + name = "kfind-21.12.0.tar.xz"; }; }; kfloppy = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kfloppy-21.08.3.tar.xz"; - sha256 = "14l53a0mrzhnfrhalr71fv0j0ksz6c1zqj8j33nayhqz386yrccx"; - name = "kfloppy-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kfloppy-21.12.0.tar.xz"; + sha256 = "1sk7gaywq90nc54n18vfls5lc6pb780ggljdgn1mr9qyz98brf4v"; + name = "kfloppy-21.12.0.tar.xz"; }; }; kfourinline = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kfourinline-21.08.3.tar.xz"; - sha256 = "0w2zdl0yfhwdwbnlqd4l9pdx7q9mr0xq7kw49h9wiajy1zmh8vls"; - name = "kfourinline-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kfourinline-21.12.0.tar.xz"; + sha256 = "18nl5gik49gmamdfv21ihg2fvsbx8fviwqzvfqpqjwmf7hmdn854"; + name = "kfourinline-21.12.0.tar.xz"; }; }; kgeography = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kgeography-21.08.3.tar.xz"; - sha256 = "03wchz3bd4vlijywp9r2xilmhw4gc3ka54ilf2w60baazslhlnr3"; - name = "kgeography-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kgeography-21.12.0.tar.xz"; + sha256 = "0dqv45aaqdw9sf7knrsm1r8bj3vf14vvra41gsi19g6ksv245xzq"; + name = "kgeography-21.12.0.tar.xz"; }; }; kget = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kget-21.08.3.tar.xz"; - sha256 = "0zpzh7bf65kz469viff794zdwc54aq84ndafx6g07nhqs3jhnmjp"; - name = "kget-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kget-21.12.0.tar.xz"; + sha256 = "0dd57942mv0rlgsdr2hm75x4g1hbkjnzy11fkczhdb2hy49ylmaz"; + name = "kget-21.12.0.tar.xz"; }; }; kgoldrunner = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kgoldrunner-21.08.3.tar.xz"; - sha256 = "0c566c83a7kdc4kvzn37q4kdmr373hfrjgmq7mvn9bji5gcaqzch"; - name = "kgoldrunner-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kgoldrunner-21.12.0.tar.xz"; + sha256 = "1y5119jxg1fx0wpi9b50gc9h1im1ixzyzhsjcrp0rzqqcdyajm17"; + name = "kgoldrunner-21.12.0.tar.xz"; }; }; kgpg = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kgpg-21.08.3.tar.xz"; - sha256 = "0q8da9mzqxg0xmclcpgjh8c744l1sm180ga6hxbasan47wwq67as"; - name = "kgpg-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kgpg-21.12.0.tar.xz"; + sha256 = "0i6iqnjplms1rv2f8h3p4z56z20apyw45hmp1mf45pgadwjvs59v"; + name = "kgpg-21.12.0.tar.xz"; }; }; khangman = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/khangman-21.08.3.tar.xz"; - sha256 = "1iq4njq0fa7all8zm2q585i1grmv2nfb5qnpr8xpyn13np39q8sr"; - name = "khangman-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/khangman-21.12.0.tar.xz"; + sha256 = "1jvw3d743s41b1kq9vpa8l3063br4asbc9spffqlrx09d748w14n"; + name = "khangman-21.12.0.tar.xz"; }; }; khelpcenter = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/khelpcenter-21.08.3.tar.xz"; - sha256 = "1pn5822yxqw62hynkf05a33gzs9xvrwwrxam024g6gs0y0v5nsfp"; - name = "khelpcenter-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/khelpcenter-21.12.0.tar.xz"; + sha256 = "0mashc7kkmq2hnsbc8cdb3jh5l3q3rynqxvdl2hqwgla83pnfs5c"; + name = "khelpcenter-21.12.0.tar.xz"; }; }; kidentitymanagement = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kidentitymanagement-21.08.3.tar.xz"; - sha256 = "00fhw2c7jmv0xqyd1jlrlkahszw163a7cbljn83msws8m5mrnlcb"; - name = "kidentitymanagement-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kidentitymanagement-21.12.0.tar.xz"; + sha256 = "0gjdhxqzshc82hkhsmypyq9sgrnppq6r33zcz31c1d1g0bgklrgw"; + name = "kidentitymanagement-21.12.0.tar.xz"; }; }; kig = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kig-21.08.3.tar.xz"; - sha256 = "1l4zap7lm1pigyldbqy20jaqysid0r4a6y71qalxk3f565jsqfx5"; - name = "kig-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kig-21.12.0.tar.xz"; + sha256 = "00i7ng9csgf6h2db2g6vxnhipqhhhbrnvw4zx6qz7y4f6ik3qxlc"; + name = "kig-21.12.0.tar.xz"; }; }; kigo = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kigo-21.08.3.tar.xz"; - sha256 = "1cdrmlwpzbkz1mi2f72z9dh1pvkdkjn885zqqybhqbqicn3w3qch"; - name = "kigo-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kigo-21.12.0.tar.xz"; + sha256 = "1r90hxxzd36aphjhkn46q965wmsghqraiwq68x14w1kzgwkh5a7x"; + name = "kigo-21.12.0.tar.xz"; }; }; killbots = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/killbots-21.08.3.tar.xz"; - sha256 = "1mwa46r7yvxhavprc6yjh773gjhz5ks0znsvpzambn6hk23r11p8"; - name = "killbots-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/killbots-21.12.0.tar.xz"; + sha256 = "19dr1n4hzhzqnhfc1sbgyimb3dr0gnfch031f1wgybg94avdk7yx"; + name = "killbots-21.12.0.tar.xz"; }; }; kimagemapeditor = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kimagemapeditor-21.08.3.tar.xz"; - sha256 = "0vzy028cgq0ai4f9rgkc32w09yz5836y280nck2wxk2dajjc5k6x"; - name = "kimagemapeditor-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kimagemapeditor-21.12.0.tar.xz"; + sha256 = "0f07k4fwbp7nniky88s5h3p96g60m6zh1shkhndiv1zpznlgiaba"; + name = "kimagemapeditor-21.12.0.tar.xz"; }; }; kimap = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kimap-21.08.3.tar.xz"; - sha256 = "11xwkgxm0ghbpcy6bmvkw1hlsfkdrlyyfbblv5m4s881ky7h4aim"; - name = "kimap-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kimap-21.12.0.tar.xz"; + sha256 = "0fasq0lk6w477bqg1mfpslxpclwd5jrgayfxi6qxh8pfi486c8fd"; + name = "kimap-21.12.0.tar.xz"; }; }; kio-extras = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kio-extras-21.08.3.tar.xz"; - sha256 = "0lx0b9q68mfb96jfwsf0awcx9wn47nmnqqnk57wrbx8zx880q0j2"; - name = "kio-extras-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kio-extras-21.12.0.tar.xz"; + sha256 = "15lws6d794rqyxnyp812f58agd1ydgg7vka6gc2d92ks3m438qi4"; + name = "kio-extras-21.12.0.tar.xz"; }; }; kio-gdrive = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kio-gdrive-21.08.3.tar.xz"; - sha256 = "1h781cksqq5qana80rlc0x3cfz5prl1g3il4282vf2yqihl3zgrd"; - name = "kio-gdrive-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kio-gdrive-21.12.0.tar.xz"; + sha256 = "0ysd1368gal4fc92jilvshj4mxr7babsqmlhx0623q2jm20f5hxj"; + name = "kio-gdrive-21.12.0.tar.xz"; }; }; kipi-plugins = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kipi-plugins-21.08.3.tar.xz"; - sha256 = "1vscmljcadz11m4jsbkkx5f8ywbyvmfxnw1g7x5ks8d8hqsrcgd0"; - name = "kipi-plugins-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kipi-plugins-21.12.0.tar.xz"; + sha256 = "04abfilhlrh9lf1ayg4pc87qc5i6adxwmw1gyq9yjjg5zg7vksz9"; + name = "kipi-plugins-21.12.0.tar.xz"; }; }; kirigami-gallery = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kirigami-gallery-21.08.3.tar.xz"; - sha256 = "0d2psfq5q7zjmd4k1jz0fgwi3gnhi78jn10hrwvc7f8fb6pw4rzc"; - name = "kirigami-gallery-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kirigami-gallery-21.12.0.tar.xz"; + sha256 = "1c2dyncjm6nsv4zra3h6pks808xbvgma4g7hjqlivb35snf32ky7"; + name = "kirigami-gallery-21.12.0.tar.xz"; }; }; kiriki = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kiriki-21.08.3.tar.xz"; - sha256 = "19qvbxc0dpjq0vb5kh3qsrkv1793bz5ii958a4yqfmmc8xb26v2x"; - name = "kiriki-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kiriki-21.12.0.tar.xz"; + sha256 = "1a82091b66rxbfbaqls52q34gxg1jvxkjcangwgs6rq8gk624siq"; + name = "kiriki-21.12.0.tar.xz"; }; }; kiten = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kiten-21.08.3.tar.xz"; - sha256 = "0ly44w9y4ha5nw6lqpm5gavxc3ywqc4wh04nl7wpg0m2rm624mci"; - name = "kiten-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kiten-21.12.0.tar.xz"; + sha256 = "1c5dh2xip3g7144rbrzaxi15lgw6x1c12aa40svjm29c7xayhac4"; + name = "kiten-21.12.0.tar.xz"; }; }; kitinerary = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kitinerary-21.08.3.tar.xz"; - sha256 = "066rq42g5l1rmzf5c7xg21p35ln60ir92d0sp2wg9s5li0l0azbf"; - name = "kitinerary-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kitinerary-21.12.0.tar.xz"; + sha256 = "0dzgvijgm7f5zywpalpf9rj47jfi6dzd7j7qnq5k9sdbm9q9bw9k"; + name = "kitinerary-21.12.0.tar.xz"; }; }; kjumpingcube = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kjumpingcube-21.08.3.tar.xz"; - sha256 = "0iya370m6n9g6m6rzfkdsb9ypwdd0ksfddiy2g0yvjf1xdxr7im9"; - name = "kjumpingcube-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kjumpingcube-21.12.0.tar.xz"; + sha256 = "1y0q6hzjqwaky3vjnx9wrb7glx29ffgv22d5kplgsdzg6pfz890m"; + name = "kjumpingcube-21.12.0.tar.xz"; }; }; kldap = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kldap-21.08.3.tar.xz"; - sha256 = "1jb1k5xpicsmazc6c57z203w75h8klja7jp7p8934nvj9dgqqcd1"; - name = "kldap-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kldap-21.12.0.tar.xz"; + sha256 = "0q6p7r6h4xad341whg0njgq0cm9z76csdphdpg2adiqbdvgyly3g"; + name = "kldap-21.12.0.tar.xz"; }; }; kleopatra = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kleopatra-21.08.3.tar.xz"; - sha256 = "1gpn0kpxrw4jn214k5swg2frkfgp9clr99n45z3mzjdccl8zfsbi"; - name = "kleopatra-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kleopatra-21.12.0.tar.xz"; + sha256 = "0q8qn4zxaphlakd2biv19fma7p4zxpc7qliz4n0yxmnkj8mhr2l7"; + name = "kleopatra-21.12.0.tar.xz"; }; }; klettres = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/klettres-21.08.3.tar.xz"; - sha256 = "0w4fynbvnvlizz0qjkn2qcnn3xs1b0jjfmy9a01wff93a4nw2cj8"; - name = "klettres-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/klettres-21.12.0.tar.xz"; + sha256 = "0wz894rcgpcag23k37w7h4ddaniismvaw7ymfdwz2gzfki7mj8w7"; + name = "klettres-21.12.0.tar.xz"; }; }; klickety = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/klickety-21.08.3.tar.xz"; - sha256 = "00dl0c6si302mprdwdngxa4361qmr27ii5kvk38vrdlq0cynzgzv"; - name = "klickety-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/klickety-21.12.0.tar.xz"; + sha256 = "1z0z4hb52ahzar7v5y2ap722dbz1mgil33iv6jcny1zazh7ddr5i"; + name = "klickety-21.12.0.tar.xz"; }; }; klines = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/klines-21.08.3.tar.xz"; - sha256 = "0n3mdnwlyl0q09bz7dkb3796ki3l181085rb2r1k2mjnjwmn8zya"; - name = "klines-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/klines-21.12.0.tar.xz"; + sha256 = "1hjyq1n2bmdgm7v3kqw405gxvnsrf1x0i7278lz2w10x8ab6yzsk"; + name = "klines-21.12.0.tar.xz"; }; }; kmag = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmag-21.08.3.tar.xz"; - sha256 = "09jvp1hhdam31qwljzpflcnm1mczsai6xlxlks6q0qi2n52cxkhb"; - name = "kmag-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmag-21.12.0.tar.xz"; + sha256 = "099mzwlgkc8zjp6nkakp73968kjimbb49wsg1ah9qmmairc0amdf"; + name = "kmag-21.12.0.tar.xz"; }; }; kmahjongg = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmahjongg-21.08.3.tar.xz"; - sha256 = "0afjg3svj1sg47xrz3fgvgkd74lvl71sy26br7jjyxjbq1ag9sin"; - name = "kmahjongg-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmahjongg-21.12.0.tar.xz"; + sha256 = "0givhpisv19il3g4if14b4a8dkmspf90bw5h3ys0ybwnk7nyqj77"; + name = "kmahjongg-21.12.0.tar.xz"; }; }; kmail = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmail-21.08.3.tar.xz"; - sha256 = "02kina7xn10f963xb7jgzrf15z6akzgl8ba4c9a7yb46ra4w2707"; - name = "kmail-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmail-21.12.0.tar.xz"; + sha256 = "11la8c8l6b612qwhqiiahi1nd249lsk9k9s9lihm7sjcqzhii070"; + name = "kmail-21.12.0.tar.xz"; }; }; kmail-account-wizard = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmail-account-wizard-21.08.3.tar.xz"; - sha256 = "1wfzbkipdhmbsj1q5c79ssij1sz57mapg1kkypw10p0nlriklz89"; - name = "kmail-account-wizard-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmail-account-wizard-21.12.0.tar.xz"; + sha256 = "08bl6v4fs955yk3hb0a3csb644r2qpy687nakv8msqkjkm8bkjvj"; + name = "kmail-account-wizard-21.12.0.tar.xz"; }; }; kmailtransport = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmailtransport-21.08.3.tar.xz"; - sha256 = "0xn4imfb4085wx5czxb3yiigslwfxwdi2dmgv7ng01wbphpg0chw"; - name = "kmailtransport-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmailtransport-21.12.0.tar.xz"; + sha256 = "161z6bd4j87c4qksgf5hnsfhip614j0lkvb11dlgnjfn99jfl8gh"; + name = "kmailtransport-21.12.0.tar.xz"; }; }; kmbox = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmbox-21.08.3.tar.xz"; - sha256 = "19dkc5l5h5x4h5nq924clc06vz5abll2ki70pc6r9py33rfjs11j"; - name = "kmbox-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmbox-21.12.0.tar.xz"; + sha256 = "1052hpr6qgqdzhy7ja2bnfqzfd2mj402vbz46rsc1zghzx5vx7qk"; + name = "kmbox-21.12.0.tar.xz"; }; }; kmime = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmime-21.08.3.tar.xz"; - sha256 = "1bmgnsslhfzyix85c5p3mym6r9f2sjw5ajd5kzw9yxzyvzyc7kv6"; - name = "kmime-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmime-21.12.0.tar.xz"; + sha256 = "0n6qya2j5aa8vv6iqn5rxb5jdd3zyk7p5qwp8yza5fjzvb4mrfvm"; + name = "kmime-21.12.0.tar.xz"; }; }; kmines = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmines-21.08.3.tar.xz"; - sha256 = "0x2ligjxam6aaxpzl1zj5circ0ssn9ycafl3ydvhk9pz9j3c9cx1"; - name = "kmines-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmines-21.12.0.tar.xz"; + sha256 = "0jp4d6lfy07iv8ancbd22m8kmy9dx1ip8kl97zsjydzy5jz3ys7z"; + name = "kmines-21.12.0.tar.xz"; }; }; kmix = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmix-21.08.3.tar.xz"; - sha256 = "0smfvkw8svg4fd3sf3f3l5my516jjh2n203kffkg6nr2pgscfw58"; - name = "kmix-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmix-21.12.0.tar.xz"; + sha256 = "02wrbh4g0xic3q7f9x51nb094xgfvsjp19dfx0phq33mcc6257b0"; + name = "kmix-21.12.0.tar.xz"; }; }; kmousetool = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmousetool-21.08.3.tar.xz"; - sha256 = "0fyhni1m96xh7ir7zhggszfvn7rsf5dp8l065pzvla73w7l6iqwy"; - name = "kmousetool-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmousetool-21.12.0.tar.xz"; + sha256 = "0xrrhycdmjc2izrgmlr2c6nb2fd6ilhbgzsq816g5rnn85n2yd66"; + name = "kmousetool-21.12.0.tar.xz"; }; }; kmouth = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmouth-21.08.3.tar.xz"; - sha256 = "0d30r0kyq260pmbk4n9ild0zibwf1sdqwpszvi2j8y5v3gn2bg69"; - name = "kmouth-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmouth-21.12.0.tar.xz"; + sha256 = "15g8b7xjca9klvjlfnpp61n3i4dpr77c7cx3vpm7lhm672vnb6am"; + name = "kmouth-21.12.0.tar.xz"; }; }; kmplot = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kmplot-21.08.3.tar.xz"; - sha256 = "0az7krs0m7xly9v2aclfh4schw9hj99qmv6qmqwa1qvdhhhxd52p"; - name = "kmplot-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kmplot-21.12.0.tar.xz"; + sha256 = "0jhq983b4sfx57ld7b05z6i81bqbink5v5fcym56l8c7clm7jbwn"; + name = "kmplot-21.12.0.tar.xz"; }; }; knavalbattle = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/knavalbattle-21.08.3.tar.xz"; - sha256 = "0ydbkfi1n1j9fv0rjxpvh6nsjp20zwmb5ii47pv77z6a3rk5sqf4"; - name = "knavalbattle-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/knavalbattle-21.12.0.tar.xz"; + sha256 = "1rh8v5m05zpvra955y3hgrral5dn0ac0vdgsbs881nj2g2md66gr"; + name = "knavalbattle-21.12.0.tar.xz"; }; }; knetwalk = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/knetwalk-21.08.3.tar.xz"; - sha256 = "0nplhxvqiw9ap12hxyk1z247f31jqwg59d5q75jiqi1xr1gf27n2"; - name = "knetwalk-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/knetwalk-21.12.0.tar.xz"; + sha256 = "0akkc92s44ddak7k2arrh986pzfan3k9ccxb1b91qv2cr3ma004c"; + name = "knetwalk-21.12.0.tar.xz"; }; }; knights = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/knights-21.08.3.tar.xz"; - sha256 = "0ajnn8jaa1h97k89qj5c7i51c2wr3zgbsiiz9bxhhmb6gwrwjqpi"; - name = "knights-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/knights-21.12.0.tar.xz"; + sha256 = "179c17zs4nvhwmbi04fshcww4s2lg9nzlx7f2zmg3cnbw905h939"; + name = "knights-21.12.0.tar.xz"; }; }; knotes = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/knotes-21.08.3.tar.xz"; - sha256 = "0v5kg8gi2wmz4dhwg6pmq5pd6kh91ha9hg64z21p38b3nc4z07l4"; - name = "knotes-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/knotes-21.12.0.tar.xz"; + sha256 = "0qdwfnbp79jh6anvk6laj02zikvwjj1xh33phmbja2g69x9igsxg"; + name = "knotes-21.12.0.tar.xz"; }; }; kolf = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kolf-21.08.3.tar.xz"; - sha256 = "1mz30vzdcsa9nhwqmcr6kxwvi9843b876kzpmqrlrxc19ixqbyq4"; - name = "kolf-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kolf-21.12.0.tar.xz"; + sha256 = "10qknxia43dh6cxarwdfgfm8qricydginxmv1y9an6v8p1mafpvm"; + name = "kolf-21.12.0.tar.xz"; }; }; kollision = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kollision-21.08.3.tar.xz"; - sha256 = "1m46xrik0ppp6nhrsx264zzy0fdvryamcj0w5m6bm0hnyj75c4rk"; - name = "kollision-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kollision-21.12.0.tar.xz"; + sha256 = "0bji11sqnz3bkaa85kap2lz3sksy68gbg6062rn6nvwgwvq80fsw"; + name = "kollision-21.12.0.tar.xz"; }; }; kolourpaint = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kolourpaint-21.08.3.tar.xz"; - sha256 = "11ciijpr8aa8nd3zgxrikdnx1gk1w78h1v1nhgqn399lxn3vkchi"; - name = "kolourpaint-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kolourpaint-21.12.0.tar.xz"; + sha256 = "167b9zishg4z51i2hcdq0ig9wasmmqsgr0hmj6xh8vs7bi6hdfam"; + name = "kolourpaint-21.12.0.tar.xz"; }; }; kompare = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kompare-21.08.3.tar.xz"; - sha256 = "1988y00mb5wz9c6h4kchkyda4vas44bhiqd1zc4i0fkyl5wi5vp0"; - name = "kompare-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kompare-21.12.0.tar.xz"; + sha256 = "05g9i6nh7bgdxbf1i6w1g5rjbwblgj83xd7vx2l8381db2f0p6ks"; + name = "kompare-21.12.0.tar.xz"; }; }; konqueror = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/konqueror-21.08.3.tar.xz"; - sha256 = "1ls9avkwcf7c9qnmxasbi933sjw9q3hnjyys5zf69v7p5hqvg0dz"; - name = "konqueror-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/konqueror-21.12.0.tar.xz"; + sha256 = "1cy0n04nnrfwms0clj5p7q6m3aayijg5nkr3n9rgbhaia050sdk7"; + name = "konqueror-21.12.0.tar.xz"; }; }; konquest = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/konquest-21.08.3.tar.xz"; - sha256 = "0vsvzz47yn5wyl8zjnbfs1g97466l5ldxcc7mpg1q4y28fxb4jiv"; - name = "konquest-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/konquest-21.12.0.tar.xz"; + sha256 = "0wyzgs89xii7pcgkq6x99dfajbwhjma6va4lp58pfrrg7ysisdxw"; + name = "konquest-21.12.0.tar.xz"; }; }; konsole = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/konsole-21.08.3.tar.xz"; - sha256 = "1w802g95s8hrlpkilxs2mh7fsg7xq3x9vzw48766kpl9ri3ppx91"; - name = "konsole-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/konsole-21.12.0.tar.xz"; + sha256 = "0wvgwcpp8wg6c08s95nc09ypm915741118ggy88ilz3vxf3rjlpk"; + name = "konsole-21.12.0.tar.xz"; }; }; kontact = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kontact-21.08.3.tar.xz"; - sha256 = "0rwi34avk98m0jjbaij895ganfcz5c8l926nr399j5qnv9r6j82l"; - name = "kontact-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kontact-21.12.0.tar.xz"; + sha256 = "17jrj21jbxp121jmkvdzw05fbkjb6035pz38d982bkwpgc4sv5j9"; + name = "kontact-21.12.0.tar.xz"; }; }; kontactinterface = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kontactinterface-21.08.3.tar.xz"; - sha256 = "1284f6cndf3l4il4mw1qrqvf9jmww6nmhh6fx7asw7mfc32r5zaj"; - name = "kontactinterface-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kontactinterface-21.12.0.tar.xz"; + sha256 = "01wz9ifmf6d8m0ggmbqyphnm05hi07zgqypy0safy9kvn3m4jj3v"; + name = "kontactinterface-21.12.0.tar.xz"; }; }; kontrast = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kontrast-21.08.3.tar.xz"; - sha256 = "1yy4gfckabb175apvm7fcj77nxdc2fdszz1f1zrikrss20r7dc79"; - name = "kontrast-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kontrast-21.12.0.tar.xz"; + sha256 = "1dv79n5792pd4fs9f8i7528zy8a7xyaygyzhf3311v9dbi14arg8"; + name = "kontrast-21.12.0.tar.xz"; }; }; konversation = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/konversation-21.08.3.tar.xz"; - sha256 = "0wfjhp6scrq9a5llr5f9fcz2k7b5jnid8m8hrp520ai4wg4ll7zv"; - name = "konversation-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/konversation-21.12.0.tar.xz"; + sha256 = "1lmfmw9nizp4y35w216ykxp9yz2bbds9hyw8bzy51qjk0k8lw3jl"; + name = "konversation-21.12.0.tar.xz"; }; }; kopeninghours = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kopeninghours-21.08.3.tar.xz"; - sha256 = "090rp2qpsbsyqm4nipq398c3pkr0rx46rwmr4393wffzmnbiwcb9"; - name = "kopeninghours-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kopeninghours-21.12.0.tar.xz"; + sha256 = "1p0ql8amxaf7j36y5qajy341aa90lb9q5667jw1zbvfc7kf3myq7"; + name = "kopeninghours-21.12.0.tar.xz"; }; }; kopete = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kopete-21.08.3.tar.xz"; - sha256 = "105zwy4k7idkdmjjx754x7acszd4yw3y3r7lrf61f44wsm9dv2wr"; - name = "kopete-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kopete-21.12.0.tar.xz"; + sha256 = "0m47h44b4xxva5qg6iw09a52ildfgwgz8c7z3wjc09r88akiarsy"; + name = "kopete-21.12.0.tar.xz"; }; }; korganizer = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/korganizer-21.08.3.tar.xz"; - sha256 = "00r7abidj71yqgx4g0kd09dfnq0ilqh3kyzq47ms912gp1dkr5b9"; - name = "korganizer-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/korganizer-21.12.0.tar.xz"; + sha256 = "1qfc43llhw9941k9lh9g03bal4hzp80m5yapklcnd6smq2z0kk98"; + name = "korganizer-21.12.0.tar.xz"; }; }; kosmindoormap = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kosmindoormap-21.08.3.tar.xz"; - sha256 = "15qq6w14yxfprzzj3267z15zkalsb8y0igq772hwyz4v7f6xhydp"; - name = "kosmindoormap-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kosmindoormap-21.12.0.tar.xz"; + sha256 = "1li3jz8b6kqxwivdmcfjgyxc4kvldi6i8n7ik4kllvljv67zqch3"; + name = "kosmindoormap-21.12.0.tar.xz"; }; }; kpat = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kpat-21.08.3.tar.xz"; - sha256 = "0s8k8q12hvciz2c38gn5w7miz0i97pqn4jrs69sm294nw7wh1xi4"; - name = "kpat-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kpat-21.12.0.tar.xz"; + sha256 = "032advwlagv52nkfd2dv6ri6hq3i8wdmffcgcb2879fvdix6jkz2"; + name = "kpat-21.12.0.tar.xz"; }; }; kpimtextedit = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kpimtextedit-21.08.3.tar.xz"; - sha256 = "18bjvhlvjn5a1gnzw478l15mgda4c7qba0qqk9rrbh2ryr1ksf7h"; - name = "kpimtextedit-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kpimtextedit-21.12.0.tar.xz"; + sha256 = "17yhh63cjpjdxynqflb33cdkfy047zq7d4f1xjx3kczcm5is2ms1"; + name = "kpimtextedit-21.12.0.tar.xz"; }; }; kpkpass = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kpkpass-21.08.3.tar.xz"; - sha256 = "0l6n358gng24fqhwjmfpxfmmcw8x80di120k72zahiqplk2arcf5"; - name = "kpkpass-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kpkpass-21.12.0.tar.xz"; + sha256 = "02kpwyh169swlvf0dn0n64xn4r3hbzjj6ls2jncnjwlzyrpa56xn"; + name = "kpkpass-21.12.0.tar.xz"; }; }; kpmcore = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kpmcore-21.08.3.tar.xz"; - sha256 = "0y9bpw71dn9c39rjsl44az3y2bdczrj833dvwmrwaz6jbnhxl1kj"; - name = "kpmcore-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kpmcore-21.12.0.tar.xz"; + sha256 = "0czjkxv8mzf3j7kjrzncb81binvscf2vmzjv19aiaa8nq9gx9i55"; + name = "kpmcore-21.12.0.tar.xz"; }; }; kpublictransport = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kpublictransport-21.08.3.tar.xz"; - sha256 = "06jbc0qgi5dgx9jwhdnimw1k480whbqw5x75jrx9bspv5y5br16j"; - name = "kpublictransport-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kpublictransport-21.12.0.tar.xz"; + sha256 = "1dzr6b404bg8f2zzphy75pr265kqpyv5bivia9p779s27vc4456a"; + name = "kpublictransport-21.12.0.tar.xz"; }; }; kqtquickcharts = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kqtquickcharts-21.08.3.tar.xz"; - sha256 = "0kyznsq7bjzj5c091kpgn443zvkn3qbmn2b0sppj78a7b8ica5ca"; - name = "kqtquickcharts-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kqtquickcharts-21.12.0.tar.xz"; + sha256 = "0bnwzpawb7160vi2n10nihgb5r5dqsc5fdzwxyympl37r4l9jxin"; + name = "kqtquickcharts-21.12.0.tar.xz"; }; }; krdc = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/krdc-21.08.3.tar.xz"; - sha256 = "0jcbbq9vd4f1kp76fanwnp6q4hq10w3z7ygrb8makpa0daa96vx4"; - name = "krdc-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/krdc-21.12.0.tar.xz"; + sha256 = "0v59fdf5nkgbd27nkgpynqvj0ga8a36ii2h8x3kz47rrw9xvr961"; + name = "krdc-21.12.0.tar.xz"; }; }; kreversi = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kreversi-21.08.3.tar.xz"; - sha256 = "1ifcckbf9lr4pr9n2ggqjvv6xz747k9hk7m43y5ij0bixi6cq474"; - name = "kreversi-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kreversi-21.12.0.tar.xz"; + sha256 = "1s2gh544l1knwg2yl3wm3mkq1d229kp0hb376pi0lzg94cvwhwzw"; + name = "kreversi-21.12.0.tar.xz"; }; }; krfb = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/krfb-21.08.3.tar.xz"; - sha256 = "17q0hpwqbwqg4xbq5lmk5g1fl5jplzpx1acyhcbx7il0j06cfcn4"; - name = "krfb-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/krfb-21.12.0.tar.xz"; + sha256 = "11vlzk0kimqnqlxcwam1j8hkd7r20lvclaflv0fr8wv5jgy5jikd"; + name = "krfb-21.12.0.tar.xz"; }; }; kross-interpreters = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kross-interpreters-21.08.3.tar.xz"; - sha256 = "0z9lmazpw5389sgvhsjsm1219ys3fybr7hg95nrz8a334vw39nqv"; - name = "kross-interpreters-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kross-interpreters-21.12.0.tar.xz"; + sha256 = "1p836hhvz37gk84n2z12j49y206q525agvm1gpbf8zvizjiii12g"; + name = "kross-interpreters-21.12.0.tar.xz"; }; }; kruler = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kruler-21.08.3.tar.xz"; - sha256 = "0rjxy4ipxxk91wlzhrw9mg5avz18l4p01in29l1ccfz278b97lqm"; - name = "kruler-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kruler-21.12.0.tar.xz"; + sha256 = "1ki5g7hzpxzv9fqk6xv368rzsj1pbbgnf7nfsksla0xjb7ixm4mi"; + name = "kruler-21.12.0.tar.xz"; }; }; kshisen = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kshisen-21.08.3.tar.xz"; - sha256 = "1fnd2qck51gxnw6ncq52rd1q08abh70azs0apjnh9qk0dyjk91wh"; - name = "kshisen-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kshisen-21.12.0.tar.xz"; + sha256 = "1l37an6blv1a9ka8hq3nhf83nbb15mzqqgyza3g80cfziafdiy73"; + name = "kshisen-21.12.0.tar.xz"; }; }; ksirk = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksirk-21.08.3.tar.xz"; - sha256 = "03v8sghnipkpca3c71s3008m3psawinj90a7637r19h7gyvlyws7"; - name = "ksirk-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksirk-21.12.0.tar.xz"; + sha256 = "01amnrk3apxk8i081pr2rpnra5akl751j3x9y61qh248jvh856px"; + name = "ksirk-21.12.0.tar.xz"; }; }; ksmtp = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksmtp-21.08.3.tar.xz"; - sha256 = "0diz01z8gczkwy8c8gvjd583w02vma7kpngzg1ax0wx640vbjq50"; - name = "ksmtp-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksmtp-21.12.0.tar.xz"; + sha256 = "0p85a8svywbli6579zm931lk1nq199lfad7vf23q5qjmlg2hmnic"; + name = "ksmtp-21.12.0.tar.xz"; }; }; ksnakeduel = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksnakeduel-21.08.3.tar.xz"; - sha256 = "0gmcn31dg3isv5dxv01rg8w6cbfdhwsz5rpp98lrr0qx4abphva7"; - name = "ksnakeduel-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksnakeduel-21.12.0.tar.xz"; + sha256 = "0gry8fl74wfs5l2qdhs9qg03l174fw207c24v9fiyhr1hjg18f9w"; + name = "ksnakeduel-21.12.0.tar.xz"; }; }; kspaceduel = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kspaceduel-21.08.3.tar.xz"; - sha256 = "0099rc25zvbl2zg1gpmxdhnphl32bd0cxlgikyfvanigq3mx8zkd"; - name = "kspaceduel-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kspaceduel-21.12.0.tar.xz"; + sha256 = "1fvw18n8bq18k5n0g4a3p5b15aiwbgbwb67bz0i8p30pr969lsks"; + name = "kspaceduel-21.12.0.tar.xz"; }; }; ksquares = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksquares-21.08.3.tar.xz"; - sha256 = "1mgs9yapz8fm2nmv0zg2x9qfd0ijj518s43dqmss41zrjr0g3mv2"; - name = "ksquares-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksquares-21.12.0.tar.xz"; + sha256 = "16kmw5c8gnfdlssh97z3g24snh7gg1hr9nb1ynszwpazvbrga7mm"; + name = "ksquares-21.12.0.tar.xz"; }; }; ksudoku = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksudoku-21.08.3.tar.xz"; - sha256 = "09s91xvkbybhwdkf80d7kvjj2jvii938vf650fqicypki2vf0zyx"; - name = "ksudoku-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksudoku-21.12.0.tar.xz"; + sha256 = "1rymwcs0klzg6nb9jjckdcw70pv4w8x9scvlvbdyy8n54yflzrw6"; + name = "ksudoku-21.12.0.tar.xz"; }; }; ksystemlog = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ksystemlog-21.08.3.tar.xz"; - sha256 = "1m20nvvvfbgzd3aay7hsb5pm1bgjngc36ixqs0hrklhrcmwjq9g6"; - name = "ksystemlog-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ksystemlog-21.12.0.tar.xz"; + sha256 = "01mqbk6gzfv1mc1b3g75ia5cb3szx02vbxykjq80icmz4x96nl2g"; + name = "ksystemlog-21.12.0.tar.xz"; }; }; kteatime = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kteatime-21.08.3.tar.xz"; - sha256 = "175vmcbhhlan6smhagli0jpa3ik0y0wwiijigfk2srm8cyk29ymn"; - name = "kteatime-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kteatime-21.12.0.tar.xz"; + sha256 = "0ywr3cyijzv20qjdiyq5v4wkxhk9a7z38dv450w63v19b309gb28"; + name = "kteatime-21.12.0.tar.xz"; }; }; ktimer = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktimer-21.08.3.tar.xz"; - sha256 = "1nr116cxw81c2bh32l2xrzmrglk36qkzycbfcffxnm7ka4flwzbm"; - name = "ktimer-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktimer-21.12.0.tar.xz"; + sha256 = "0qb9vlr5mvf0dnwdbz375wn8nrqvawlvsbf01g8ad43x67q7yqi7"; + name = "ktimer-21.12.0.tar.xz"; }; }; ktnef = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktnef-21.08.3.tar.xz"; - sha256 = "0vfsy894hs3538ssbqky6nfnjzhyn8yjlmvh0mb6gg69952gcvqa"; - name = "ktnef-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktnef-21.12.0.tar.xz"; + sha256 = "03b5zjmfl6gmsc9pg6a8ig15gqvh2l6513yaix7ib4qxm1dmdrh8"; + name = "ktnef-21.12.0.tar.xz"; }; }; ktorrent = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktorrent-21.08.3.tar.xz"; - sha256 = "0y1vpfc8xsm98lrf119r5clmb6xwq2a8adb347ksyvvr4l7rdkwm"; - name = "ktorrent-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktorrent-21.12.0.tar.xz"; + sha256 = "1jn029494vl2aj9y0c2bgpzkk1f07if904f27j83jv28fv5ynl24"; + name = "ktorrent-21.12.0.tar.xz"; }; }; ktouch = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktouch-21.08.3.tar.xz"; - sha256 = "0i0ph52k2zw6q37qam2s09msxsdxr5v8qiqwxirjab8ad7g9z0gf"; - name = "ktouch-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktouch-21.12.0.tar.xz"; + sha256 = "09ayp6infp1xhh411mrqsfj31n89gyq191rgjcwajn97190kd3ch"; + name = "ktouch-21.12.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-accounts-kcm-21.08.3.tar.xz"; - sha256 = "1ymq8cnvvw62xd4va969imm2g62fw7fhbs8rw3wqrc2lal9d5l1g"; - name = "ktp-accounts-kcm-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-accounts-kcm-21.12.0.tar.xz"; + sha256 = "1vhygwh5lx1pxc1qxskc4v87fqhrwnk53a0k1xz5nymighcyxdvy"; + name = "ktp-accounts-kcm-21.12.0.tar.xz"; }; }; ktp-approver = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-approver-21.08.3.tar.xz"; - sha256 = "0z9kw2gamgdz425aw6li6nvv1g0b1ffil0rmjh0b0z89bbpbc6jx"; - name = "ktp-approver-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-approver-21.12.0.tar.xz"; + sha256 = "1qsfcfym7pbihyb82sh12ziibf9hp73qwhy0hr81h2z5ijg05a7r"; + name = "ktp-approver-21.12.0.tar.xz"; }; }; ktp-auth-handler = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-auth-handler-21.08.3.tar.xz"; - sha256 = "1z89ycwpq46w82hylwq1sizd7a563g5a22jdc1chhhlwp9dqmdc2"; - name = "ktp-auth-handler-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-auth-handler-21.12.0.tar.xz"; + sha256 = "0m3lwqlykx3dqd77hww7x9rmnwdwxbyl279h6mdjjr0bgnf1ypm1"; + name = "ktp-auth-handler-21.12.0.tar.xz"; }; }; ktp-call-ui = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-call-ui-21.08.3.tar.xz"; - sha256 = "1nr064h0f4rqjka030xflhrmq0l8g87fwyi853plk7y0473fy6h2"; - name = "ktp-call-ui-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-call-ui-21.12.0.tar.xz"; + sha256 = "0z6v68xlg89i29zr9ldg5hlqzykwrsw1yvmi5q25rhaamqbcbhy8"; + name = "ktp-call-ui-21.12.0.tar.xz"; }; }; ktp-common-internals = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-common-internals-21.08.3.tar.xz"; - sha256 = "0ndfdggs4j2jc93pf998r0fyj7fjnc2pz98acc1l6laq8d8aawd2"; - name = "ktp-common-internals-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-common-internals-21.12.0.tar.xz"; + sha256 = "1wah79byc6f5w8c0xa0z7iwjbg628m1v18nfqqs2d6mdb0wlclz4"; + name = "ktp-common-internals-21.12.0.tar.xz"; }; }; ktp-contact-list = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-list-21.08.3.tar.xz"; - sha256 = "0pdl3w1vj6f4nms4cs91yagfyf5ssqms0bzmcnjf53pcpyf8rhjs"; - name = "ktp-contact-list-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-contact-list-21.12.0.tar.xz"; + sha256 = "0r654q55x27m6cd9jsxgf574wd4r4b8wajj30h6mah317kpfnxg4"; + name = "ktp-contact-list-21.12.0.tar.xz"; }; }; ktp-contact-runner = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-contact-runner-21.08.3.tar.xz"; - sha256 = "0zjw9f66rn5nc37q3q54qy8m09qlama949ksfrvyyh3qhsxp17pm"; - name = "ktp-contact-runner-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-contact-runner-21.12.0.tar.xz"; + sha256 = "1kbwf4pikgiym58g8hksai011braa32r1n6s20dnj2r637fywprd"; + name = "ktp-contact-runner-21.12.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-desktop-applets-21.08.3.tar.xz"; - sha256 = "1wlls0rhynfq9cfn48g31avviy067r409c5pcvasfwgzcv5hjan5"; - name = "ktp-desktop-applets-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-desktop-applets-21.12.0.tar.xz"; + sha256 = "007wa3mas3cdh2cxw5k1rwhc9bdr96jk3lb0ka82viqz0fiyxlcv"; + name = "ktp-desktop-applets-21.12.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-filetransfer-handler-21.08.3.tar.xz"; - sha256 = "1vnwgcmn3j18spcn2dl468n2y073mk9nsc3557hid5mmg7byp8ng"; - name = "ktp-filetransfer-handler-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-filetransfer-handler-21.12.0.tar.xz"; + sha256 = "19pb90zihhrsqb0nkdwan1w7mb4w65apm9ghsp9zb0j6d7sjj1yx"; + name = "ktp-filetransfer-handler-21.12.0.tar.xz"; }; }; ktp-kded-module = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-kded-module-21.08.3.tar.xz"; - sha256 = "0mgw2w812306w04w1xgv9ngd31zj0m4v9hv3cyyk2dz1hi97g9hz"; - name = "ktp-kded-module-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-kded-module-21.12.0.tar.xz"; + sha256 = "18n4b3a6fyf3vwyw8pp6ilj34gbcd1s778m4b03xnm5110nrkplv"; + name = "ktp-kded-module-21.12.0.tar.xz"; }; }; ktp-send-file = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-send-file-21.08.3.tar.xz"; - sha256 = "1c0yrir3z6p6ravizaqhdgjiwcj2cyzd61n4zcx2mrr4mfq7wr4l"; - name = "ktp-send-file-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-send-file-21.12.0.tar.xz"; + sha256 = "1a33cbgczivqlxksjq4a0z0qc5nml8mlkip7g9cx40vly495cj8d"; + name = "ktp-send-file-21.12.0.tar.xz"; }; }; ktp-text-ui = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktp-text-ui-21.08.3.tar.xz"; - sha256 = "0xk9lcdp99rd1n6gg9a4ix5bdfk229y1ddf115ldjsk30ksfv0r0"; - name = "ktp-text-ui-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktp-text-ui-21.12.0.tar.xz"; + sha256 = "1xi4nkvcp13yzf2hdpk77icmvxsf8598njlkq72x5dw9hx6hzxfd"; + name = "ktp-text-ui-21.12.0.tar.xz"; }; }; ktuberling = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/ktuberling-21.08.3.tar.xz"; - sha256 = "1i0ykflfr2q3043z5j5h1m093n103la8zbax7cacid109d0kca5g"; - name = "ktuberling-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/ktuberling-21.12.0.tar.xz"; + sha256 = "0n2hlj7v225c58j6xkqkcvk3a246l4wcmqp9fhqlanmagsn2vq2l"; + name = "ktuberling-21.12.0.tar.xz"; }; }; kturtle = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kturtle-21.08.3.tar.xz"; - sha256 = "1fw7hgx0zxsl1l9ymjhf3k3w5999ijj8vdagnyiz01y2i2hlnvhc"; - name = "kturtle-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kturtle-21.12.0.tar.xz"; + sha256 = "1macqjp0b5iqvpi83d95rzzzyvmcxzfiw99g042hga48na3zz50p"; + name = "kturtle-21.12.0.tar.xz"; }; }; kubrick = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kubrick-21.08.3.tar.xz"; - sha256 = "1fq2icsfbd6k4gm9w25aml2rigzami934vvkvb30222vbhs86qr4"; - name = "kubrick-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kubrick-21.12.0.tar.xz"; + sha256 = "1v9x3zf80y0aj7nhwi8r14mcxb67fav6ww7cnw6m7czyxwrpmx82"; + name = "kubrick-21.12.0.tar.xz"; }; }; kwalletmanager = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kwalletmanager-21.08.3.tar.xz"; - sha256 = "0cbq0md317fipd4lfqvcgan1jm5n0zyilzbrkjymbnl7cy276ajq"; - name = "kwalletmanager-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kwalletmanager-21.12.0.tar.xz"; + sha256 = "0n8m46kvax12ji1nd3c42yqa6cznx374yzr569ilm523m1lp74hy"; + name = "kwalletmanager-21.12.0.tar.xz"; }; }; kwave = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kwave-21.08.3.tar.xz"; - sha256 = "08qs33mi047jcqaavglgxk3i6gq4h73aygn6gj8xpcpqhq82kjl5"; - name = "kwave-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kwave-21.12.0.tar.xz"; + sha256 = "1cgp55c75v200b7l5q8jhvirf1pkfllgk7c2fzv7axzyg4vr2d4v"; + name = "kwave-21.12.0.tar.xz"; }; }; kwordquiz = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/kwordquiz-21.08.3.tar.xz"; - sha256 = "066v2w8i2fvrrqb1aakscwcd6rchlm4m5pwsql0s6k59mn7wab6b"; - name = "kwordquiz-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/kwordquiz-21.12.0.tar.xz"; + sha256 = "0ycsy753msm50x5p938lw3mp8cxcdcbvq85f8az9f8x3y7qmnxlm"; + name = "kwordquiz-21.12.0.tar.xz"; }; }; libgravatar = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libgravatar-21.08.3.tar.xz"; - sha256 = "0ni2lgrfpx8vx9mmm43gsn1kw4jj8j52yq4ylfam89q6mhpxcnix"; - name = "libgravatar-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libgravatar-21.12.0.tar.xz"; + sha256 = "1c27azlwp0yfsf4nv33n2nsrb7w9m2shqp9pv09i8hqfv7prm5sq"; + name = "libgravatar-21.12.0.tar.xz"; }; }; libkcddb = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkcddb-21.08.3.tar.xz"; - sha256 = "00wivb6viw5w1ylcsx3m9ps7j00z7fzjh2s7nap95xnprraihcmv"; - name = "libkcddb-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkcddb-21.12.0.tar.xz"; + sha256 = "0qipr0399hw5vdlgyw6kp4msi4jlk4z4m8rhgsihp6qdmszhav6d"; + name = "libkcddb-21.12.0.tar.xz"; }; }; libkcompactdisc = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkcompactdisc-21.08.3.tar.xz"; - sha256 = "1rsmibz9mamqvhppnxwn2db6jmsipvjx2kj8ikpsp9bx8h421n2g"; - name = "libkcompactdisc-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkcompactdisc-21.12.0.tar.xz"; + sha256 = "03qb8w03qhh5b9y0cm8jx8amfiv7j2ijjjd8wqxih66rda8sj11m"; + name = "libkcompactdisc-21.12.0.tar.xz"; }; }; libkdcraw = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkdcraw-21.08.3.tar.xz"; - sha256 = "0gm8nfc6ayg1ipba4yvhy5nzfrpdwx6l434bg9y7yqvbm3lm1g86"; - name = "libkdcraw-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkdcraw-21.12.0.tar.xz"; + sha256 = "0czwigf1w1k9643flfh4ri1xlbn9k9gkfma3x1qkqa14g4dpm2if"; + name = "libkdcraw-21.12.0.tar.xz"; }; }; libkdegames = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkdegames-21.08.3.tar.xz"; - sha256 = "0ysc5g6ap207c5yq3ryiaxmvkrh6wzqzdgccdffs0lncd24g641a"; - name = "libkdegames-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkdegames-21.12.0.tar.xz"; + sha256 = "09llvfssc2msidjlh3mf188ayfv0vm0c5bicnxd3m2lfwr7mw6w2"; + name = "libkdegames-21.12.0.tar.xz"; }; }; libkdepim = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkdepim-21.08.3.tar.xz"; - sha256 = "1776fjzd88kj2crr8lcrwxmkvjsxxyll2gy21wlbmqy4h04bi130"; - name = "libkdepim-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkdepim-21.12.0.tar.xz"; + sha256 = "1kd67k7n4rkdblfzx8xl671dyjhxrzrw1cfi13s83538sa0hfcyi"; + name = "libkdepim-21.12.0.tar.xz"; }; }; libkeduvocdocument = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkeduvocdocument-21.08.3.tar.xz"; - sha256 = "1qyi5y5v1zp3qid58sdfpcp83rkmz2s1hsvir4f9j5ngir0czcq1"; - name = "libkeduvocdocument-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkeduvocdocument-21.12.0.tar.xz"; + sha256 = "1gyv8524xvlgx7h0sh79aziwj9169f8wm0d309839hacwxmz7llb"; + name = "libkeduvocdocument-21.12.0.tar.xz"; }; }; libkexiv2 = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkexiv2-21.08.3.tar.xz"; - sha256 = "15d8d3mzp0yhj6lm5799mfncqkxnw0cvfxcgpkz0lf9askv2cq8n"; - name = "libkexiv2-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkexiv2-21.12.0.tar.xz"; + sha256 = "1mpy194pfgxdbhyb8h30f04r8pv90896ppdnyaypsa5dvc0ajr4h"; + name = "libkexiv2-21.12.0.tar.xz"; }; }; libkgapi = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkgapi-21.08.3.tar.xz"; - sha256 = "101yb495k5bxq402qdvyqd0sdhzc5z3r8szymfmrlilgk35wy9rs"; - name = "libkgapi-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkgapi-21.12.0.tar.xz"; + sha256 = "11f5kn6hc3whhpppgh78m7a47sdhxi13498p447cbnpfgwzjgxw9"; + name = "libkgapi-21.12.0.tar.xz"; }; }; libkipi = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkipi-21.08.3.tar.xz"; - sha256 = "12qjvd7ynab33qid2d4j06z8fbfziaxdlrpq0h3ywd2drks0ykvf"; - name = "libkipi-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkipi-21.12.0.tar.xz"; + sha256 = "1pkf14y97xwl4r9fjv4b8czb0ygwlqn37616gwmvd5zr8c0kkmpc"; + name = "libkipi-21.12.0.tar.xz"; }; }; libkleo = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkleo-21.08.3.tar.xz"; - sha256 = "0ivyqmc1hv1cljbpxr5xrzyf9z96dbaa48ak54cxxpanphpialrl"; - name = "libkleo-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkleo-21.12.0.tar.xz"; + sha256 = "1mm5ypnq2847fijp986j9si504mfszlvap1zlama2mkcgfiyjbap"; + name = "libkleo-21.12.0.tar.xz"; }; }; libkmahjongg = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkmahjongg-21.08.3.tar.xz"; - sha256 = "0rh61491dl90rrlmqmqjdj7vlrjhayhkk5i50zb6jfvrysq9axkc"; - name = "libkmahjongg-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkmahjongg-21.12.0.tar.xz"; + sha256 = "03v2jszin48mbxd7h8gh76az4j5ns3g9cy832rii6dbwwilakgad"; + name = "libkmahjongg-21.12.0.tar.xz"; }; }; libkomparediff2 = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libkomparediff2-21.08.3.tar.xz"; - sha256 = "0a3980kiigc5kqkyxf4glcxvgr3f4rnc43gcx9vj9mk2qhfcsiqy"; - name = "libkomparediff2-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libkomparediff2-21.12.0.tar.xz"; + sha256 = "1kbj86s7lf3bvjihgmhgrh08b2dcivs5h1amx3lc5qw7nvfqa38d"; + name = "libkomparediff2-21.12.0.tar.xz"; }; }; libksane = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libksane-21.08.3.tar.xz"; - sha256 = "086zrddpammihia888nrx2p18if1fyzvhs3igkxq9q2p551vk9fy"; - name = "libksane-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libksane-21.12.0.tar.xz"; + sha256 = "0r8npxzi8dij4lvi27ycnz51y9cax5agsjcf2rg1zafg4gq3zgcl"; + name = "libksane-21.12.0.tar.xz"; }; }; libksieve = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libksieve-21.08.3.tar.xz"; - sha256 = "1snli2yvq2n567vgi1xs6iiqgn4zp31cid17aqpxllyw8a3xa0l7"; - name = "libksieve-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libksieve-21.12.0.tar.xz"; + sha256 = "0wda6waxqhsffhn7akxbmklq7i6rp57kj13ghm3lyfwccsxf38z0"; + name = "libksieve-21.12.0.tar.xz"; }; }; libktorrent = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/libktorrent-21.08.3.tar.xz"; - sha256 = "1zjnnxhd0mv9if61rr28h35wban7sif61dmgc3wsixp4dz1xfrm6"; - name = "libktorrent-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/libktorrent-21.12.0.tar.xz"; + sha256 = "0lzb3vnw500bqll7nvz5r5cwbh2fh11c1a845rarnsyrfsvbdh2y"; + name = "libktorrent-21.12.0.tar.xz"; }; }; lokalize = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/lokalize-21.08.3.tar.xz"; - sha256 = "0m084mayd9b0iwm4j5cckw22ix1mc4zcwxjfk0cdapm3g2ls1rzd"; - name = "lokalize-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/lokalize-21.12.0.tar.xz"; + sha256 = "11rw0g63zcdlqs5649yn1rx327l19ia0pf3yag2g42r5ssdv4znf"; + name = "lokalize-21.12.0.tar.xz"; }; }; lskat = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/lskat-21.08.3.tar.xz"; - sha256 = "09l209fz82ibsxzg2f53lhbcsaq6zpwllpyklj2988xzn7h49cqg"; - name = "lskat-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/lskat-21.12.0.tar.xz"; + sha256 = "0glg9ql6kldy0cyypsn7z01dv7l5i3h26l8b7andzp8i5345p9yp"; + name = "lskat-21.12.0.tar.xz"; }; }; mailcommon = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/mailcommon-21.08.3.tar.xz"; - sha256 = "0vpbp88pl462d1j9f3ww22zybrmz92zx3b5cj4gsl7gmb7ijwb19"; - name = "mailcommon-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/mailcommon-21.12.0.tar.xz"; + sha256 = "16i0vzg94ni5hr8ax1r8cc1vfb9s8q47fbk65r7z4svqqwvxhpvw"; + name = "mailcommon-21.12.0.tar.xz"; }; }; mailimporter = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/mailimporter-21.08.3.tar.xz"; - sha256 = "00vm445i5c7vjfmbfgzdj3xildqbnlzpi5i16w4c47wyg5kvpj2c"; - name = "mailimporter-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/mailimporter-21.12.0.tar.xz"; + sha256 = "0ns2cwq32aymljn9mbkcr5ac8qgkbblcc75b5dbm42cvyjb3a8iz"; + name = "mailimporter-21.12.0.tar.xz"; }; }; marble = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/marble-21.08.3.tar.xz"; - sha256 = "0bapnmm2x0ihms5gd12brqb2yx7g5h4c8ky70l1czd4a8d95ha0a"; - name = "marble-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/marble-21.12.0.tar.xz"; + sha256 = "1c01v6k8l04vlnm9pslfpmmk2jb3h0wk29n9zcgjigc00klfjrmw"; + name = "marble-21.12.0.tar.xz"; }; }; markdownpart = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/markdownpart-21.08.3.tar.xz"; - sha256 = "1cqkwvs1ssg203fkaiibcmqjm2viaq3iq880cjlkx9irh0bv9q9h"; - name = "markdownpart-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/markdownpart-21.12.0.tar.xz"; + sha256 = "1ndnr2hlp1njwxf2pcjws3vxl3s3x1qfxhv014msnhll6k1l3lyz"; + name = "markdownpart-21.12.0.tar.xz"; }; }; mbox-importer = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/mbox-importer-21.08.3.tar.xz"; - sha256 = "19i5a1rax3xfkcz0hv0vqq9iavggqrliwpqsqnx6zvwjzgjrvsif"; - name = "mbox-importer-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/mbox-importer-21.12.0.tar.xz"; + sha256 = "0r9z09yaifj45q1igyh890kzpdazy72rc6q78lisgnslllc22fv1"; + name = "mbox-importer-21.12.0.tar.xz"; }; }; messagelib = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/messagelib-21.08.3.tar.xz"; - sha256 = "0q9mligkkvbwb92ghv5g66rkn0vpbw2xfbgsdnn4jajjxsixipg7"; - name = "messagelib-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/messagelib-21.12.0.tar.xz"; + sha256 = "1r2p4inav6shbjlnfkxnkpsak58cflzj0ra2c2930gszhyfyc6b1"; + name = "messagelib-21.12.0.tar.xz"; }; }; minuet = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/minuet-21.08.3.tar.xz"; - sha256 = "1g2chj23dw9p2lgf094mn9cd26wnhwgslwdwzwax2a23p42j7kb8"; - name = "minuet-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/minuet-21.12.0.tar.xz"; + sha256 = "0rglwxfbmh4hl9kf8h8krx42jamzv9i6k5i99gwlaz63rsylh4w6"; + name = "minuet-21.12.0.tar.xz"; }; }; okular = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/okular-21.08.3.tar.xz"; - sha256 = "00ghh7z39904d5x5sa39adkavkhl09hzib6fpwjn14f6sz925f9r"; - name = "okular-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/okular-21.12.0.tar.xz"; + sha256 = "08vybplc0bhf9bh9jbwddh9x98f3jdrha2wd1yp53nbcz3jqgm68"; + name = "okular-21.12.0.tar.xz"; }; }; palapeli = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/palapeli-21.08.3.tar.xz"; - sha256 = "084nvavgzkmrv77rsg2zf2vykfjwwsvn2i2y24jsh63hs7i5xqhb"; - name = "palapeli-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/palapeli-21.12.0.tar.xz"; + sha256 = "1sypyhidjn2cv1nly54r85a4v331z0mazg19bby1lfn5rn2sg34r"; + name = "palapeli-21.12.0.tar.xz"; }; }; parley = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/parley-21.08.3.tar.xz"; - sha256 = "0wyv5qx4g0941kg870qb9rc9npdw39ggvndjk7ywaad9nkvdj73g"; - name = "parley-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/parley-21.12.0.tar.xz"; + sha256 = "0y5lby0jqlsj7cf62hwka1l449na7f1nazq63a6vxng9wf22fl4x"; + name = "parley-21.12.0.tar.xz"; }; }; partitionmanager = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/partitionmanager-21.08.3.tar.xz"; - sha256 = "0im782ggbnkyzcczxx3mv5qi4nlqmcyhwkbf0mzh8cz56qkfvzhr"; - name = "partitionmanager-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/partitionmanager-21.12.0.tar.xz"; + sha256 = "0g17y1c4fj6c9hr1xac3qp4yllrr666nh3mxhlgl9qkxa9lyh7jp"; + name = "partitionmanager-21.12.0.tar.xz"; }; }; picmi = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/picmi-21.08.3.tar.xz"; - sha256 = "0h208sy2r2jzy7a6rmla349d8lydvfvdb2vahdfxrqql0m15s07s"; - name = "picmi-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/picmi-21.12.0.tar.xz"; + sha256 = "1l91i7mmj60zawkpv2s14l8qajk84gcyxm8x4zzlx7pf9pizbyps"; + name = "picmi-21.12.0.tar.xz"; }; }; pim-data-exporter = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/pim-data-exporter-21.08.3.tar.xz"; - sha256 = "0l6gkwh6pxp6px50n8i0374by3n7nv0gjkb2qy0s4hsvfz8nwlwk"; - name = "pim-data-exporter-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/pim-data-exporter-21.12.0.tar.xz"; + sha256 = "19qssd032x4ma12i8hmd42s7904n8x5z8dydwccc32ma29s5hw0p"; + name = "pim-data-exporter-21.12.0.tar.xz"; }; }; pim-sieve-editor = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/pim-sieve-editor-21.08.3.tar.xz"; - sha256 = "1z01c0wsxzl69kr0cxfq23l56dgi0xfjak5qbpfd9p4b2kr095s7"; - name = "pim-sieve-editor-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/pim-sieve-editor-21.12.0.tar.xz"; + sha256 = "1fpkf5lksy8irzs3bfv1b6g53hs2s575pi02rnps33cpr6lxn8q7"; + name = "pim-sieve-editor-21.12.0.tar.xz"; }; }; pimcommon = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/pimcommon-21.08.3.tar.xz"; - sha256 = "1hj49spfjwqrwh7h86kw7ydcx13rknagj54mhcn60kawz639533l"; - name = "pimcommon-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/pimcommon-21.12.0.tar.xz"; + sha256 = "02xpw6n1k030hqivqw10xvq6s279712wyy58snn3x2i2a1bzyjaq"; + name = "pimcommon-21.12.0.tar.xz"; }; }; poxml = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/poxml-21.08.3.tar.xz"; - sha256 = "0yrn2dbdhm3ap55w401ma8z64b7pgs57lzgakzkdpcf69bww9xkw"; - name = "poxml-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/poxml-21.12.0.tar.xz"; + sha256 = "0hvwhg4z5f6m9vr0hpvvnpyxhy6zp8yprbh3qkw1216nfpfaw0md"; + name = "poxml-21.12.0.tar.xz"; }; }; print-manager = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/print-manager-21.08.3.tar.xz"; - sha256 = "0dmd1wp6c5f58fssnyc977d29gqcr6pmzplvq5pj97xq0i8fq15z"; - name = "print-manager-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/print-manager-21.12.0.tar.xz"; + sha256 = "10glinq92m08kwsgk9hijangz7grbj7l2vd7p3rxivrbk8q6jms5"; + name = "print-manager-21.12.0.tar.xz"; }; }; rocs = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/rocs-21.08.3.tar.xz"; - sha256 = "0mdn58wbv5rhljp7ai0282h5z5j7m9yly6q9s6c8vm5kaxhbwg58"; - name = "rocs-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/rocs-21.12.0.tar.xz"; + sha256 = "1h94da4qqs1qcnc5rz4lk5vwfwwhpb8ww7bpj40fg0fpdd3w5anw"; + name = "rocs-21.12.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/signon-kwallet-extension-21.08.3.tar.xz"; - sha256 = "1m3wyyndlwk4snjzz45j377hz5plx01bl69y39aw1y53rsx0baln"; - name = "signon-kwallet-extension-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/signon-kwallet-extension-21.12.0.tar.xz"; + sha256 = "0a8amssfwxsb9acjaw7lw1m812yma1lw2c21x5if35ivgwagnjdx"; + name = "signon-kwallet-extension-21.12.0.tar.xz"; }; }; skanlite = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/skanlite-21.08.3.tar.xz"; - sha256 = "1llvq89vdsypbak8lmhnyfr61s72c4lra1yypxmgw0hwqvwqzyjk"; - name = "skanlite-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/skanlite-21.12.0.tar.xz"; + sha256 = "0q1sqf2h9y4q0bmy88pnmm0dxlnbwpq7h7plkv9hbkka8k6yk9w1"; + name = "skanlite-21.12.0.tar.xz"; }; }; spectacle = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/spectacle-21.08.3.tar.xz"; - sha256 = "0l1p565y2d04fw9mz1ns11bwc9z5apkjd4llgdihz4qwq5j0ri5y"; - name = "spectacle-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/spectacle-21.12.0.tar.xz"; + sha256 = "0s196rjphwhsafwqb3vdl3flxkan6a2y9250v2v9m5dkphll13sn"; + name = "spectacle-21.12.0.tar.xz"; }; }; step = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/step-21.08.3.tar.xz"; - sha256 = "1pznz6hxj1h0vcsidsyjm9zgzx4pla47yckykc3mxb9biraalhi5"; - name = "step-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/step-21.12.0.tar.xz"; + sha256 = "0cjqxyazlrq88nhfz7ha4p9lc06iimpjc439w37qq3030kx3257r"; + name = "step-21.12.0.tar.xz"; }; }; svgpart = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/svgpart-21.08.3.tar.xz"; - sha256 = "1zpzmhgvxlyalq4nn446k7plz5fw2pl4r7zv7q3hjrzla1wgcqx8"; - name = "svgpart-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/svgpart-21.12.0.tar.xz"; + sha256 = "1qqvkrw3frncs9jni99w0vrsjrzjw9wgdg35qzp2svfaxmyczin1"; + name = "svgpart-21.12.0.tar.xz"; }; }; sweeper = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/sweeper-21.08.3.tar.xz"; - sha256 = "0sa8dfx26m9ry3pvqryx41w51l76r8l2xh16b783ixqln7x08z5j"; - name = "sweeper-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/sweeper-21.12.0.tar.xz"; + sha256 = "17rkp2dwnyyh4ywx7xhnswvbh3mwgnd6y9ylrw37q5r3m35ym89i"; + name = "sweeper-21.12.0.tar.xz"; }; }; umbrello = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/umbrello-21.08.3.tar.xz"; - sha256 = "025qds7nahm6kpi94j4blk8xpv6vh2alrbgwby20vvn3h678z26x"; - name = "umbrello-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/umbrello-21.12.0.tar.xz"; + sha256 = "0s6ld4da8hj48xqzk5fwrw23wmyh05d8540m2w1pzp4wiba7d32f"; + name = "umbrello-21.12.0.tar.xz"; }; }; yakuake = { - version = "21.08.3"; + version = "21.12.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.12.0/src/yakuake-21.12.0.tar.xz"; + sha256 = "1wrmzjn317fdv3lp8sgdhzvgxf6n0pdnsbhidh5qw33fr53n8zc1"; + name = "yakuake-21.12.0.tar.xz"; + }; + }; + zanshin = { + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/yakuake-21.08.3.tar.xz"; - sha256 = "1za4vhnr495dadrarqqanavmyn1mmzm3y8jx05cpbjyqmlm353dk"; - name = "yakuake-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/zanshin-21.12.0.tar.xz"; + sha256 = "07bs2zh12jbwjxrjq2qz6fmfq0vpr5qiz024gqxvxaxvskpbiicp"; + name = "zanshin-21.12.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.08.3"; + version = "21.12.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.08.3/src/zeroconf-ioslave-21.08.3.tar.xz"; - sha256 = "1dkig267znwyw03fq6mpdb5g1xnkhr0brnvxskjm44a4d5ipbv2g"; - name = "zeroconf-ioslave-21.08.3.tar.xz"; + url = "${mirror}/stable/release-service/21.12.0/src/zeroconf-ioslave-21.12.0.tar.xz"; + sha256 = "1s1vrfifz11z4bqrz8860rkd5fxa1qqvaxaka67gs2yrb788m0ii"; + name = "zeroconf-ioslave-21.12.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 156cc7188dcf9..653ac79267e54 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.0"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.1"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "iKxnuMm5hpreP706N+XxaBrDVVwVFRWKNmiCyXkOUCQ="; + sha256 = "ePy3uS+LpyDzweLocSk3O/G2zFPISKbMbci9fdELrpE="; }; fetchedMavenDeps = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 53c0a96060e7d..4f411f105ce98 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-DEV2107"; + version = "3.6-DEV2111"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "v${version}"; - sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d"; + sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa"; }; buildInputs = [ diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 9aed6daa5c313..c840f7c72a072 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.7"; + version = "4.2.8"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-PVG4KZX6KxkrooywgEmqOItyLt5hGs+b/KCaguduGyc="; + sha256 = "sha256-bbGFSy2ZuUtFWyAgje6s+RSQ6S7NZGAhjvZMbIWfYhE="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 5e4b0017da9bd..2f42f6be9b590 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YMVB9nKsHYy65McYs1w/ETy+1b8GkjuWFk6PZs4HFko="; + sha256 = "sha256-Ht+EDCoPn1dA8VHTEiq5xPm34lcsiug8jQHvQdCG2yg="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 248352015a36a..1ca7fcff31b70 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": "98.0.4750.0", - "sha256": "0qygnmb1wlbarni2pdfs1xl50ggvf0211c6mj7341wwsbd0bpkgr", - "sha256bin64": "1psbh5xwlgr4ain4s9vk7d0kdbbd14v29f95ai5i4d2d3cpj2319", + "version": "98.0.4758.9", + "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj", + "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04", "deps": { "gn": { - "version": "2021-12-03", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "e0afadf7a743d5b14737bd454df45d5f1caf0d23", - "sha256": "00pxhfikscghgm79zckh9j00jgjmdy6hixkpfq5vmgc0xpxif78v" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" } } }, diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 087a0bf6c4e31..92b52770e3355 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -197,8 +197,8 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.1"; - sha256 = "sha256-JHwHxFpAUVnm9QlfSYrBELrgct0RkjS7OQb6gKEAsCA="; + version = "1.1.2"; + sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww="; vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index bf0b6c7225738..92421b33a21c7 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XBpdNQHG90rJWGfXpJgXsj5AR2VhK/3+1U7Zl8XDlsw="; + sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg="; }; - vendorSha256 = "sha256-Ob4ZPtP14TsNOnGVfR5lFAKpJsjoJDKmiE++DqY32QA="; + vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index cdd7eba2332a0..58fb7aa269639 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.4"; + version = "3.2.6"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-kwvZvIu+uACI2vBBy9eVuLLJlv1evUJ/4gI6rx1NW/g="; + sha256 = "0cwzhk1w2wpf33cqbnrzckqy91b58qqpnkmh5nxv02z6fl7psmbh"; }; postPatch = '' diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 64f58daec7659..5252fe59c0984 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; - sha512 = "1rjxs77a5k2mgpwr2ln1czn64fmss9yw59g0k60r25c2ny2la6ddfcl5zclawcikk346na6m96jrfwssmka0axr2spwpl61wm0lijnk"; + url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; + sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1"; }; inherit patches; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 5344e52048019..c807573841099 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -4,6 +4,7 @@ , cmake , qtbase , qtmultimedia +, qtimageformats , qtx11extras , qttools , libidn @@ -67,6 +68,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia + qtimageformats qtx11extras libidn qca-qt5 diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 8cc2ec83cd509..8ea5c4904f119 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ngoduykhanh"; repo = "PowerDNS-Admin"; rev = "v${version}"; - sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw"; + sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E="; }; python = python3.override { @@ -22,7 +22,7 @@ let }; pythonDeps = with python.pkgs; [ - flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify + flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core @@ -125,6 +125,6 @@ in stdenv.mkDerivation rec { description = "A PowerDNS web interface with advanced features"; homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin"; license = licenses.mit; - maintainers = with maintainers; [ zhaofengli ]; + maintainers = with maintainers; [ Flakebi zhaofengli ]; }; } diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json index cb21306308cfc..84f495920744e 100644 --- a/pkgs/applications/networking/powerdns-admin/package.json +++ b/pkgs/applications/networking/powerdns-admin/package.json @@ -12,5 +12,5 @@ "multiselect": "^0.9.12" }, "name": "powerdns-admin-assets", - "version": "0.2.3" + "version": "0.2.4" } diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix index 02d9eb0046e30..7dcd54b53c214 100644 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -114,11 +114,11 @@ }; } { - name = "bn.js___bn.js_4.11.9.tgz"; + name = "bn.js___bn.js_4.12.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.9.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; - sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; }; } { @@ -530,11 +530,11 @@ }; } { - name = "elliptic___elliptic_6.5.3.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; - sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 82debe6f8a1a1..20b850328875b 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , glib , libX11 @@ -16,22 +17,23 @@ , gtk3 , libselinux , libxml2 +, libffi , python3Packages , cpio , autoPatchelfHook +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "nice-dcv-client"; - version = "2020.2.1737-1"; - + version = "2021.2.3797-1"; src = fetchurl { - url = "https://d1uj6qtbmh3dt5.cloudfront.net/2020.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm"; - sha256 = "sha256-SUpfHd/Btc07cfjc3zx5I5BiNatr/c4E2/mfJuU4R1E="; + url = "https://d1uj6qtbmh3dt5.cloudfront.net/2021.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm"; + sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU="; }; - nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ]; unpackPhase = '' rpm2cpio $src | ${cpio}/bin/cpio -idm ''; @@ -57,31 +59,28 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ mkdir -p $out/lib64/ - mv usr/bin/dcvviewer $out/bin/dcvviewer mv usr/lib64/* $out/lib64/ - mkdir -p $out/libexec/dcvviewer mv usr/libexec/dcvviewer/dcvviewer $out/libexec/dcvviewer/dcvviewer patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $out/libexec/dcvviewer/dcvviewer - # Fix the wrapper script to have the right basedir. sed -i "s#basedir=/usr#basedir=$out#" $out/bin/dcvviewer - mv usr/share $out/ + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - # broken symlink, seems to give a warning message if i don't delete it - rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so + # we already ship libffi.so.7 + ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib64/libffi.so.6 ''; meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 1aa6f7f78e937..2f1bcab0649da 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,40 +2,42 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon +, desktop-file-utils +, meson +, ninja , pkg-config +, python3 , vala -, cmake -, ninja +, wrapGAppsHook +, discount +, glib , gtk3 -, gtksourceview3 -, webkitgtk +, gtksourceview4 , gtkspell3 -, glib , libgee -, pcre +, pantheon , sqlite -, discount -, wrapGAppsHook -, withPantheon ? false +, webkitgtk }: stdenv.mkDerivation rec { pname = "notes-up"; - version = "unstable-2020-12-29"; + version = "2.0.6"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; - rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f"; - sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk="; + rev = version; + sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk="; }; nativeBuildInputs = [ - cmake + desktop-file-utils + meson ninja - vala pkg-config + python3 + vala wrapGAppsHook ]; @@ -43,17 +45,18 @@ stdenv.mkDerivation rec { discount glib gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libgee pantheon.granite - pcre sqlite webkitgtk ]; - # Whether to build with contractor support (Pantheon specific) - cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes"; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; passthru = { updateScript = nix-update-script { @@ -62,12 +65,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Markdown notes editor and manager designed for elementary OS" - + lib.optionalString withPantheon " - built with Contractor support"; + description = "Markdown notes editor and manager designed for elementary OS"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2Only; maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; - mainProgram = "com.github.philip-scott.notes-up"; + mainProgram = "com.github.philip_scott.notes-up"; }; } diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index f1740b326dcfa..639823dacd6a3 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "4.0.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1"; + sha256 = "ce3caa481d923e91da9b492b46509810a754e2d3ef857f5d20bc5a8e362b50c8"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0f07dd0efd3e3..8782b2288e681 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.48.7"; + version = "0.48.8"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad"; + sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l"; + sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j"; }; in { @@ -40,15 +40,6 @@ in { src = fetchurl desktopSource; - # Fetch from source repo, no longer included in release. - # (they did special-case icon.png but we want the scalable svg) - # Use the version here to ensure we get any changes. - trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/icon.svg"; - sha256 = "0sz3piskdlx267whx8r6afrdadn25bf0zmxplj1599zqkf7w7n0x"; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -61,12 +52,12 @@ in { runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/share/{applications,icons/hicolor/128x128/apps} cp -r ./* $out/share/trilium ln -s $out/share/trilium/trilium $out/bin/trilium - ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg + ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png cp ${desktopItem}/share/applications/* $out/share/applications runHook postInstall ''; diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 843e7ec0145eb..57947e23baa02 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,55 +1,31 @@ { mkDerivation , lib , fetchurl -, fetchpatch , extra-cmake-modules -, qtbase , boost , akonadi-calendar -, akonadi-notes -, akonadi-search -, kidentitymanagement , kontactinterface -, kldap , krunner -, kwallet -, kcalendarcore }: mkDerivation rec { pname = "zanshin"; - version = "0.5.71"; + version = "21.12.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; + url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; + sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0="; }; - patches = [ - # Build with kontactinterface >= 5.14.42. - # Remove after next release. - (fetchpatch { - url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; - sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - qtbase boost akonadi-calendar - akonadi-notes - akonadi-search - kidentitymanagement kontactinterface - kldap krunner - kwallet - kcalendarcore ]; meta = with lib; { diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 460ea1408ecaa..05304ef6a9e27 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let - majorVersion = "7.14"; - minorVersion = "2"; + majorVersion = "7.18"; + minorVersion = "1"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd"; + sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; @@ -37,10 +37,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-server" ]; - meta = { + postInstall = '' + install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service" + ''; + + meta = with lib; { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.linux; # arbitrary choice + license = licenses.lgpl2Plus; + platforms = platforms.linux; # arbitrary choice + maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index a92c6b5d52716..188976da35948 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -11,19 +11,19 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.1.1"; + version = "8.2.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc="; + sha256 = "sha256-id8pdkTphi3J0ZG88K7oc/O6OwAvmWyFEs9kMbleSFs="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8="; + sha256 = "sha256-dwPKIXOQB3lixvMBJJRrRSamYRoC9n1rjcqi542dA44="; }; aarch64-darwin = srcs.x86_64-darwin; diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix index 7e56e70bf8b9f..93077f438bffb 100644 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }: +{ lib, stdenvNoCC, linkFarmFromDrvs, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }: { name ? "${args.pname}-${args.version}" , enableParallelBuilding ? true @@ -28,7 +28,7 @@ # The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well. , projectFile ? null # The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. -# This can be generated using the `nuget-to-nix` tool. +# This can be generated by running the `passthru.fetch-deps` script. , nugetDeps ? null # A list of derivations containing nupkg packages for local project references. # Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag. @@ -63,7 +63,7 @@ assert projectFile == null -> throw "Defining the `projectFile` attribute is req # TODO: Automatically generate a dependency file when a lockfile is present. # This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories. -assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated using the `nuget-to-nix` tool."; +assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; let _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { @@ -113,6 +113,41 @@ let DOTNET_NOLOGO = true; # This disables the welcome message. DOTNET_CLI_TELEMETRY_OPTOUT = true; + passthru.fetch-deps = args.passthru.fetch-deps or writeScript "fetch-${args.pname}-deps" '' + set -euo pipefail + cd "$(dirname "''${BASH_SOURCE[0]}")" + + export HOME=$(mktemp -d) + deps_file="/tmp/${args.pname}-deps.nix" + + store_src="${package.src}" + src="$(mktemp -d /tmp/${args.pname}.XXX)" + cp -rT "$store_src" "$src" + chmod -R +w "$src" + + trap "rm -rf $src $HOME" EXIT + pushd "$src" + + export DOTNET_NOLOGO=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + + mkdir -p "$HOME/nuget_pkgs" + + for project in "${lib.concatStringsSep "\" \"" (lib.toList projectFile)}"; do + ${dotnet-sdk}/bin/dotnet restore "$project" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$HOME/nuget_pkgs" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + done + + echo "Writing lockfile..." + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + echo "Succesfully wrote lockfile to: $deps_file" + ''; + configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9a20df57777cd..1b6c340f7f0c8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -240,7 +240,7 @@ rec { # Unpack all of the parent layers into the image. lowerdir="" extractionID=0 - for layerTar in $(tac layer-list); do + for layerTar in $(cat layer-list); do echo "Unpacking layer $layerTar" extractionID=$((extractionID + 1)) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f2d4f809ae4e3..941ee048666d0 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -405,6 +405,29 @@ rec { created = "now"; }; + # 23. Ensure that layers are unpacked in the correct order before the + # runAsRoot script is executed. + layersUnpackOrder = + let + layerOnTopOf = parent: layerName: + pkgs.dockerTools.buildImage { + name = "layers-unpack-order-${layerName}"; + tag = "latest"; + fromImage = parent; + contents = [ pkgs.coreutils ]; + runAsRoot = '' + #!${pkgs.runtimeShell} + echo -n "${layerName}" >> /layer-order + ''; + }; + # When executing the runAsRoot script when building layer C, if layer B is + # not unpacked on top of layer A, the contents of /layer-order will not be + # "ABC". + layerA = layerOnTopOf null "a"; + layerB = layerOnTopOf layerA "b"; + layerC = layerOnTopOf layerB "c"; + in layerC; + # buildImage without explicit tag bashNoTag = pkgs.dockerTools.buildImage { name = "bash-no-tag"; diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 70cacaf7fa676..3d87e9577d5c7 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-L8bkO2zGEXfwqoWZRDCm/PdBxwedkx57kduwlMoyAME="; + sha256 = "1c317ac43ff70sxn1syx20qhs4nkccv6hbf69fmi3acswqsll1z4"; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index c0a41a39cd2b4..e3385983f0409 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ stdenv, pkgsBuildBuild, fetchFromGitHub, lib }: let - generator = buildGoModule rec { + generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; version = "20211119143108"; src = fetchFromGitHub { diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index faeaab7ece181..f7286c9108a6a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -21,15 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.8.0"; - - repoName = "videos"; + version = "2.8.1"; src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "videos"; rev = version; - sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug="; + sha256 = "sha256-Ki6i9u+oXOBTH+dVJ9RgBxszD7Wvdrfahd9abyjFYJY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 3300dd2ec8c4c..f4e847b03e0cc 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -4,23 +4,37 @@ lib.makeScope pkgs.newScope (self: with self; { switchboardPlugs = [ - switchboard-plug-a11y switchboard-plug-about - switchboard-plug-applications switchboard-plug-bluetooth - switchboard-plug-datetime switchboard-plug-display - switchboard-plug-keyboard switchboard-plug-mouse-touchpad - switchboard-plug-network switchboard-plug-notifications - switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell - switchboard-plug-power switchboard-plug-printers - switchboard-plug-security-privacy switchboard-plug-sharing - switchboard-plug-sound switchboard-plug-wacom + switchboard-plug-a11y + switchboard-plug-about + switchboard-plug-applications + switchboard-plug-bluetooth + switchboard-plug-datetime + switchboard-plug-display + switchboard-plug-keyboard + switchboard-plug-mouse-touchpad + switchboard-plug-network + switchboard-plug-notifications + switchboard-plug-onlineaccounts + switchboard-plug-pantheon-shell + switchboard-plug-power + switchboard-plug-printers + switchboard-plug-security-privacy + switchboard-plug-sharing + switchboard-plug-sound + switchboard-plug-wacom ]; wingpanelIndicators = [ - wingpanel-applications-menu wingpanel-indicator-a11y - wingpanel-indicator-bluetooth wingpanel-indicator-datetime - wingpanel-indicator-keyboard wingpanel-indicator-network - wingpanel-indicator-nightlight wingpanel-indicator-notifications - wingpanel-indicator-power wingpanel-indicator-session + wingpanel-applications-menu + wingpanel-indicator-a11y + wingpanel-indicator-bluetooth + wingpanel-indicator-datetime + wingpanel-indicator-keyboard + wingpanel-indicator-network + wingpanel-indicator-nightlight + wingpanel-indicator-notifications + wingpanel-indicator-power + wingpanel-indicator-session wingpanel-indicator-sound ]; @@ -33,8 +47,6 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; - notes-up = pkgs.notes-up.override { withPantheon = true; }; - touchegg = pkgs.touchegg.override { withPantheon = true; }; #### APPS @@ -129,6 +141,8 @@ lib.makeScope pkgs.newScope (self: with self; { pantheon-agent-polkit = callPackage ./services/pantheon-agent-polkit { }; + xdg-desktop-portal-pantheon = callPackage ./services/xdg-desktop-portal-pantheon { }; + #### WINGPANEL INDICATORS wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { }; @@ -211,6 +225,13 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { }; + ### THIRD-PARTY + + # Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party, + # specfically third party switchboard plugins and wingpanel indicators. + # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. + # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 + } // lib.optionalAttrs (config.allowAliases or true) { ### ALIASES @@ -223,4 +244,6 @@ lib.makeScope pkgs.newScope (self: with self; { extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 + inherit (pkgs) notes-up; # added 2021-12-18 + }) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 3ebc38138795e..ceabac94a2360 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U="; + sha256 = "sha256-tIpR/WIhE0Mmt2EploNNDVlAX4OUNI3VnEflTLVkfSo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 68a187418343f..3ceff2095d2bf 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -8,9 +8,9 @@ , vala , wrapGAppsHook , glib +, granite , gtk3 , libhandy -, pantheon , systemd , vte }: @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib + granite gtk3 libhandy - pantheon.granite systemd vte ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/applications/system/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index af6bf54fd7152..af6bf54fd7152 100644 --- a/pkgs/applications/system/pantheon-tweaks/default.nix +++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix diff --git a/pkgs/applications/system/pantheon-tweaks/fix-paths.patch b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch index b2e0e0a7b4c8b..b2e0e0a7b4c8b 100644 --- a/pkgs/applications/system/pantheon-tweaks/fix-paths.patch +++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix new file mode 100644 index 0000000000000..6acb1fe36f44d --- /dev/null +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, meson +, ninja +, pkg-config +, vala +, gtk3 +, libindicator-gtk3 +, pantheon +, indicator-application-gtk3 +}: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-ayatana"; + version = "unstable-2021-12-01"; + + src = fetchFromGitHub { + owner = "Lafydev"; + repo = pname; + rev = "53dc05919cdba772c787620a4bee5821e38c53cd"; + sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU="; + }; + + patches = [ + # Fixes install path for wingpanel indicator + # https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30 + ./fix-indicator-dir.patch + # Tells the indicator the path for libapplication.so + (substituteAll { + src = ./fix-libapplication-dir.patch; + indicator_application = indicator-application-gtk3; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + gtk3 + libindicator-gtk3 + pantheon.granite + pantheon.wingpanel + ]; + + meta = with lib; { + description = "Ayatana Compatibility Indicator for Wingpanel"; + homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch new file mode 100644 index 0000000000000..e6f71558e3e41 --- /dev/null +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch @@ -0,0 +1,16 @@ +diff --git a/meson.build b/meson.build +index 4aeab2b..dc44e6c 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,8 +25,10 @@ dependencies = { + 'wingpanel': wingpanel + } + ++libdir = join_paths(get_option('prefix'), get_option('libdir')) ++ + indicator_name = 'ayatana' +-indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir') ++indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) + + # ---------------------------------------------------------------------------------------------------------------------- + # Bindings: diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch new file mode 100644 index 0000000000000..2d9a510b751e2 --- /dev/null +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch @@ -0,0 +1,13 @@ +diff --git a/src/IndicatorFactory.vala b/src/IndicatorFactory.vala +index 9411de0..632d83b 100644 +--- a/src/IndicatorFactory.vala ++++ b/src/IndicatorFactory.vala +@@ -24,7 +24,7 @@ public class AyatanaCompatibility.IndicatorFactory : Object, IndicatorLoader { + public Gee.Collection<IndicatorIface> get_indicators () { + if (indicators == null) { + indicators = new Gee.LinkedList<IndicatorIface> (); +- load_indicator (File.new_for_path (Constants.AYATANA_INDICATOR_DIR), "libapplication.so"); ++ load_indicator (File.new_for_path ("@indicator_application@/lib/indicators3/7/"), "libapplication.so"); + } + + return indicators.read_only_view; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 91031ac618fb8..180092076b0e7 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.23.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 70cb748709e93..3bcfca507ab4d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/bluedevil-5.23.3.tar.xz"; - sha256 = "1n6h2m4z67vl0mv0hs0g5xff1vcj03w0nhx4hkhy66hly556nq8x"; - name = "bluedevil-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/bluedevil-5.23.4.tar.xz"; + sha256 = "13sxwsks7gnws13jhk8428npzdyhvv5yhczzayi5yd3856d3g4av"; + name = "bluedevil-5.23.4.tar.xz"; }; }; breeze = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/breeze-5.23.3.tar.xz"; - sha256 = "1514y4k52bc71nljihj655d7swk2qvr168i0j2xqcm0w4aiz4jmv"; - name = "breeze-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/breeze-5.23.4.tar.xz"; + sha256 = "1wbhir9g2gfwcvw0ib50qhqk0rgfji8wjipqqp7ddsm463ykp472"; + name = "breeze-5.23.4.tar.xz"; }; }; breeze-grub = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/breeze-grub-5.23.3.tar.xz"; - sha256 = "1nwhjw0nkdg94znh7h80byrq8vpa1f20ph1m4fhlj233nfskw0zy"; - name = "breeze-grub-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/breeze-grub-5.23.4.tar.xz"; + sha256 = "1zkl8ddbdnckz4glaf0j6vkxf1z63d5q9nx0w64d17qydp1fwxjq"; + name = "breeze-grub-5.23.4.tar.xz"; }; }; breeze-gtk = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/breeze-gtk-5.23.3.tar.xz"; - sha256 = "0wq313laj7nlsw3d6p1prq1d4gic5lz2ipklj4dq4vsvsh99ggvn"; - name = "breeze-gtk-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/breeze-gtk-5.23.4.tar.xz"; + sha256 = "0jv064y7wlvglk0w2yx1zwnxjhczi9gq6cfnz004z18rlqwnz9pq"; + name = "breeze-gtk-5.23.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/breeze-plymouth-5.23.3.tar.xz"; - sha256 = "047clfgqcrplwi3158pw1r868yyqlxs7iqqy861wzlsmjz9qzqdl"; - name = "breeze-plymouth-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/breeze-plymouth-5.23.4.tar.xz"; + sha256 = "1qc8pnhhl89bqwyh215cn92qahw8k8gx7zr14rwxqjn9hxf9jxxy"; + name = "breeze-plymouth-5.23.4.tar.xz"; }; }; discover = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/discover-5.23.3.tar.xz"; - sha256 = "056wcvk44r11rycnn12xf8r5psxqnm0f6i6z6nc5100sqkhip6p0"; - name = "discover-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/discover-5.23.4.tar.xz"; + sha256 = "0z5bp7p3f470i4x5796raawx7kjg1ca453y63wn9papdbiyl4iiz"; + name = "discover-5.23.4.tar.xz"; }; }; drkonqi = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/drkonqi-5.23.3.tar.xz"; - sha256 = "14yc6nq3z6jm8siq2r15nzsqxpawk5iqy9ghmmwy9xa4vf18dxy5"; - name = "drkonqi-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/drkonqi-5.23.4.tar.xz"; + sha256 = "073vdclybx83dpvvqb3rc413k3nh50nil8rcig4kqm0gzjhp3qdb"; + name = "drkonqi-5.23.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kactivitymanagerd-5.23.3.tar.xz"; - sha256 = "0rizk05v19qqymrjh7vswcp80a4rpyffmq7kg88pv5k11fcjqw5b"; - name = "kactivitymanagerd-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kactivitymanagerd-5.23.4.tar.xz"; + sha256 = "1m0rbv8pkswkzfvbf231vn2c8x507ymc07kd0dw03np8h8zs5vbz"; + name = "kactivitymanagerd-5.23.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kde-cli-tools-5.23.3.tar.xz"; - sha256 = "0f8wab6n4klxj4yy4l4k3q3pdqlz9718mbjydnsmn1jgn20shsa0"; - name = "kde-cli-tools-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kde-cli-tools-5.23.4.tar.xz"; + sha256 = "0ay320b3ixlicd8d1rjngkbxspmpk7rd8g562dv0c54hk73q61gj"; + name = "kde-cli-tools-5.23.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kde-gtk-config-5.23.3.tar.xz"; - sha256 = "12w2jv0mi39c2g1w3g3c68m80ailcm98hibk1mg885r36gx9kskb"; - name = "kde-gtk-config-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kde-gtk-config-5.23.4.tar.xz"; + sha256 = "0537vk4wdvgz7jl0qkksf38bra5fdk6d0z6lnwm5v4fapdysbry9"; + name = "kde-gtk-config-5.23.4.tar.xz"; }; }; kdecoration = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kdecoration-5.23.3.tar.xz"; - sha256 = "134jmp5l2bvl042a5a1f1d66mqi4g7vrpmrn3gi7ysi34w1ylfc8"; - name = "kdecoration-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kdecoration-5.23.4.tar.xz"; + sha256 = "0s80dhbba458yr85m6yfv7m5jkkn0xqzp42nhhaj4m9hh36bbd9s"; + name = "kdecoration-5.23.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kdeplasma-addons-5.23.3.tar.xz"; - sha256 = "139wzfj21k32m36014sas3ad5qdc0df4131ckj1shlz882w4l3dw"; - name = "kdeplasma-addons-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kdeplasma-addons-5.23.4.tar.xz"; + sha256 = "1j7xd2p8a8xi69sh91hldyajqg77lx5bla1vjg65f7yqz903bp4h"; + name = "kdeplasma-addons-5.23.4.tar.xz"; }; }; kgamma5 = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kgamma5-5.23.3.tar.xz"; - sha256 = "06wzcpsjqy5pw3s6qg32l6qg9jf61bbpjwh802182balfq2jl0y5"; - name = "kgamma5-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kgamma5-5.23.4.tar.xz"; + sha256 = "1b3m812xxcya0gf665m8crpmwq91mkq28jkcjaavknr9dd22dkyk"; + name = "kgamma5-5.23.4.tar.xz"; }; }; khotkeys = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/khotkeys-5.23.3.tar.xz"; - sha256 = "1ccjlr3q1lsmmdmh30wbrdaardvhivdzm9vrd46d301rdz6gyv86"; - name = "khotkeys-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/khotkeys-5.23.4.tar.xz"; + sha256 = "1fsll3cp6z763wp65iwqz244hzq0qlm4007jpxgd4gasbrd5zfg8"; + name = "khotkeys-5.23.4.tar.xz"; }; }; kinfocenter = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kinfocenter-5.23.3.tar.xz"; - sha256 = "09yz5grzwzgs1cg39j18zy7af8azy2lbg4bkkmh7wayv8pngj4gv"; - name = "kinfocenter-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kinfocenter-5.23.4.tar.xz"; + sha256 = "0z3hwq5qjkrcxn0smgi7x49mcyixm1apjd4f16q0z40sn7sdybad"; + name = "kinfocenter-5.23.4.tar.xz"; }; }; kmenuedit = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kmenuedit-5.23.3.tar.xz"; - sha256 = "006kkg7jzwp4icik1hv95wcpw5sb1l1s94wnljvxdfdjkgzjxq55"; - name = "kmenuedit-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kmenuedit-5.23.4.tar.xz"; + sha256 = "1iildwnhkvg2i2yhp6zl7m77fpa8vs7hhv8wjma3vbr2gh808nck"; + name = "kmenuedit-5.23.4.tar.xz"; }; }; kscreen = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kscreen-5.23.3.tar.xz"; - sha256 = "1x4qlycb1dxw36s3zyyrjfmfvwvwk8f8r0jls6hq8gqkl810abhw"; - name = "kscreen-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kscreen-5.23.4.tar.xz"; + sha256 = "0sa9xvyz42c69aqnn2bm3j1hq87n2nk5yawppl7csxyz91iyv3n5"; + name = "kscreen-5.23.4.tar.xz"; }; }; kscreenlocker = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kscreenlocker-5.23.3.tar.xz"; - sha256 = "0wjcrikx3q533qz9wi0z3jm4k0lc09w2xsxr4iw1hh3afsd6jr34"; - name = "kscreenlocker-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kscreenlocker-5.23.4.tar.xz"; + sha256 = "1n4gkcf74hk60fvbkb9940q5r89jbj4kwc4byi51523n038pvymf"; + name = "kscreenlocker-5.23.4.tar.xz"; }; }; ksshaskpass = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/ksshaskpass-5.23.3.tar.xz"; - sha256 = "0dcych5zcv8fqmy1lhwpbfzj75ihs648d8ppfr0nj15mm2pgnvhx"; - name = "ksshaskpass-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/ksshaskpass-5.23.4.tar.xz"; + sha256 = "1s9wbfl867fgr5md51f63fc57626zw2b637xh7qy8sn563l8y1lk"; + name = "ksshaskpass-5.23.4.tar.xz"; }; }; ksystemstats = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/ksystemstats-5.23.3.tar.xz"; - sha256 = "13jic16480rxhdwz0z49di19sxdi7rgvg61lg5i00w9mm6mbph3l"; - name = "ksystemstats-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/ksystemstats-5.23.4.tar.xz"; + sha256 = "00vs71jxqlv52absh16jyj1zryk2ib0bpd21c4qja11a3hw7j3gz"; + name = "ksystemstats-5.23.4.tar.xz"; }; }; kwallet-pam = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kwallet-pam-5.23.3.tar.xz"; - sha256 = "0axxk7szp5kn5hhlxh2mjzbwzaj4g1yn40ymgb6dga10h1nfdkd8"; - name = "kwallet-pam-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kwallet-pam-5.23.4.tar.xz"; + sha256 = "08ycniyna3hzdgzi3m61iamwid32hajb1k1m27kw16abh3ds4vx7"; + name = "kwallet-pam-5.23.4.tar.xz"; }; }; kwayland-integration = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kwayland-integration-5.23.3.tar.xz"; - sha256 = "01gm3xbaih22v33bd9142xnrli13yxmib42pj8rnczhczrpnc3z3"; - name = "kwayland-integration-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kwayland-integration-5.23.4.tar.xz"; + sha256 = "14j6iwakkmdyhf3796ap2dnfi0vdbrl3813x4ygzjyb8068a7k9g"; + name = "kwayland-integration-5.23.4.tar.xz"; }; }; kwayland-server = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kwayland-server-5.23.3.tar.xz"; - sha256 = "1hjh278iaz3ydf9bqy2fmm4hsvc60hrqw4hlc3ddcadp28dhg3gx"; - name = "kwayland-server-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kwayland-server-5.23.4.tar.xz"; + sha256 = "13cvw4i1ysw4ncdnx7c4qw29zc350wbmc29dy06b574idm5rbnrm"; + name = "kwayland-server-5.23.4.tar.xz"; }; }; kwin = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kwin-5.23.3.tar.xz"; - sha256 = "04w8vnz3rzd9g1j1f4fbgyxjvxqrhasx6f2vqkrrh4cd56ndmcbz"; - name = "kwin-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kwin-5.23.4.tar.xz"; + sha256 = "0rqim6p0r7k886mwvqy4zpz18scnah9zvjjbgx0p77f1086azvsc"; + name = "kwin-5.23.4.tar.xz"; }; }; kwrited = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/kwrited-5.23.3.tar.xz"; - sha256 = "0156syandkq0s76xrrcz6nkxa6jgpf1a6nbkdw0a8biyxs5md644"; - name = "kwrited-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/kwrited-5.23.4.tar.xz"; + sha256 = "15sixbk5i5i1jv07hj820xi4fh0b6fmb4jkv2917911wpdkdnyik"; + name = "kwrited-5.23.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/layer-shell-qt-5.23.3.tar.xz"; - sha256 = "15y7p0a59779aqxnsryqirsxslbvbig733i5s3n5jmg98y40712a"; - name = "layer-shell-qt-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/layer-shell-qt-5.23.4.tar.xz"; + sha256 = "0a74s7wx3jxxi1dp4j0a5dz7k45il4wjf7hf9j6cw2m5pdni1i2k"; + name = "layer-shell-qt-5.23.4.tar.xz"; }; }; libkscreen = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/libkscreen-5.23.3.tar.xz"; - sha256 = "0kazvsahnk7ngld12lp1c07c34x9kal03fy8g7w9bgdha3j7xmdq"; - name = "libkscreen-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/libkscreen-5.23.4.tar.xz"; + sha256 = "0n1xghmabhn7sb99k0zsyrbx05mbaf926hyyw9qp5rf07r8yzk2p"; + name = "libkscreen-5.23.4.tar.xz"; }; }; libksysguard = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/libksysguard-5.23.3.tar.xz"; - sha256 = "0ma4b0w08j0f46ivh9grci7wfh4z5j8nml83kcvnain1nwzprha0"; - name = "libksysguard-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/libksysguard-5.23.4.tar.xz"; + sha256 = "1xik5qaww9m26nkg804akaxbn7i7bd8ibc2v93h3p8ihkb5hh7lw"; + name = "libksysguard-5.23.4.tar.xz"; }; }; milou = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/milou-5.23.3.tar.xz"; - sha256 = "0myvm9bkq189cfla7yqiwmbb5z2cm90rq5ll655n2c7zk3lqnn0d"; - name = "milou-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/milou-5.23.4.tar.xz"; + sha256 = "15wniaj9zprhvly6krxl5847q8kh8m8z5sr2wj816n70hh1y58f8"; + name = "milou-5.23.4.tar.xz"; }; }; oxygen = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/oxygen-5.23.3.tar.xz"; - sha256 = "0r79xadvg7l4nsziy78wydhn4f0223fjc2xd60zih1dwmgapgf0z"; - name = "oxygen-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/oxygen-5.23.4.tar.xz"; + sha256 = "0b4rhf9500jhx73xw4ghqifgkfr527n2isiiys8g7m23ya38pbxz"; + name = "oxygen-5.23.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-browser-integration-5.23.3.tar.xz"; - sha256 = "0r3sq6w73qn246nddf4f8lbym8k4wp2ycfr2laz888b5cjf9df97"; - name = "plasma-browser-integration-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-browser-integration-5.23.4.tar.xz"; + sha256 = "004406s80i0gv1ga151ws7sny4l3y74swawdgd1swmvkjg2ii909"; + name = "plasma-browser-integration-5.23.4.tar.xz"; }; }; plasma-desktop = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-desktop-5.23.3.tar.xz"; - sha256 = "01259pqncx3gcpanrmhal51dn4y8xcrs16pl5bjnasdn9r8mlhs3"; - name = "plasma-desktop-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-desktop-5.23.4.tar.xz"; + sha256 = "1p48sl6zyra1iyri9zrx88wka9fbzgyhkd9m7r4nqa8h0v5p12as"; + name = "plasma-desktop-5.23.4.tar.xz"; }; }; plasma-disks = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-disks-5.23.3.tar.xz"; - sha256 = "1qwxhasmycn6ah2pv46z8vvls85lfwxm4z61q13l63a50489a05b"; - name = "plasma-disks-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-disks-5.23.4.tar.xz"; + sha256 = "0sgfwqyn539nd6s23nix3igf7z87sn3dn9zp8w2fy488vmm1pdmi"; + name = "plasma-disks-5.23.4.tar.xz"; }; }; plasma-firewall = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-firewall-5.23.3.tar.xz"; - sha256 = "0kqb7sxysh6gq143rmmznv95mx4275bp1xfrlys518yn97clnwqq"; - name = "plasma-firewall-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-firewall-5.23.4.tar.xz"; + sha256 = "040w85ml5rh0l95l744576s3kb00niyr72q4pvf5xj98df1h89aw"; + name = "plasma-firewall-5.23.4.tar.xz"; }; }; plasma-integration = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-integration-5.23.3.tar.xz"; - sha256 = "0q53b43yl5s1pvlqpmic2x8q5inawk66n8wng7rzgcfv9d3imhrn"; - name = "plasma-integration-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-integration-5.23.4.tar.xz"; + sha256 = "0b4rvfnd40xgvgab81p9qjgdpjww673nlaiklwrkrqmv41m0yy33"; + name = "plasma-integration-5.23.4.tar.xz"; }; }; plasma-nano = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-nano-5.23.3.tar.xz"; - sha256 = "0ijygajn78c97s8ys8m2zn52zx45kxhk857hppkxp4jqpd5psf34"; - name = "plasma-nano-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-nano-5.23.4.tar.xz"; + sha256 = "1kw77w00261dmp2w0jvaslamia215mlhd3nnl0wr39p5vhlym70p"; + name = "plasma-nano-5.23.4.tar.xz"; }; }; plasma-nm = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-nm-5.23.3.tar.xz"; - sha256 = "157almdi3br1qdfr0lwfdwc60fbizkwmpw3j2czk2sdsvm58rhgf"; - name = "plasma-nm-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-nm-5.23.4.tar.xz"; + sha256 = "0c4gfdyzac67yxjvz75mxd61wacnsa01liaajdyj853bn7wkx294"; + name = "plasma-nm-5.23.4.tar.xz"; }; }; plasma-pa = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-pa-5.23.3.tar.xz"; - sha256 = "0md3vb2iffn4qdnj4msyn6j3hvidnsxzp2dfsnb3n0yp29niwxqk"; - name = "plasma-pa-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-pa-5.23.4.tar.xz"; + sha256 = "0g4q0y4sr14xsi71mv5qgn6qj8svmd045ff73hf34pb15qvdq0a7"; + name = "plasma-pa-5.23.4.tar.xz"; }; }; plasma-phone-components = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-phone-components-5.23.3.tar.xz"; - sha256 = "1w8yqczr0933vhca5id32vg1k2np6n6hkh58n4x3z3xpdxpb5d4c"; - name = "plasma-phone-components-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-phone-components-5.23.4.tar.xz"; + sha256 = "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9"; + name = "plasma-phone-components-5.23.4.tar.xz"; }; }; plasma-sdk = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-sdk-5.23.3.tar.xz"; - sha256 = "0fb9g6vhsaxd6h6889jyhnxp86g7rwkmyiafq72hx6ikv69wyvbi"; - name = "plasma-sdk-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-sdk-5.23.4.tar.xz"; + sha256 = "1cbsksjy9x3jlk8bzd9m1zgr83rzkwv0jd015fap707ysdil1ypk"; + name = "plasma-sdk-5.23.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-systemmonitor-5.23.3.tar.xz"; - sha256 = "1jlgfrkdw785x9bib2hzxjyd70b9aqgcp1w6lk75bhgkrz85kz8p"; - name = "plasma-systemmonitor-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-systemmonitor-5.23.4.tar.xz"; + sha256 = "16kfpzm8bhxyl9jx5xqbas4cm99sny4b2n6i27hc7ggjgx9r3j31"; + name = "plasma-systemmonitor-5.23.4.tar.xz"; }; }; plasma-tests = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-tests-5.23.3.tar.xz"; - sha256 = "1fgl09c0ir8w128z4l0bggszjsvsqncb42k44vn6i6d0qdisxdgh"; - name = "plasma-tests-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-tests-5.23.4.tar.xz"; + sha256 = "1vnihnrxgbrk224xxpisqj84hjbllyk32vsra2rbgrwp2g58fh69"; + name = "plasma-tests-5.23.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-thunderbolt-5.23.3.tar.xz"; - sha256 = "0vzdzsl6isg24j0830lg7is47kpmpvsni7gf4vri2l8a6fy7ibav"; - name = "plasma-thunderbolt-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-thunderbolt-5.23.4.tar.xz"; + sha256 = "0g5n24qwm6yd78rg14d6j2hn0krn0z0fm6bpyzr54ycrgiv850zz"; + name = "plasma-thunderbolt-5.23.4.tar.xz"; }; }; plasma-vault = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-vault-5.23.3.tar.xz"; - sha256 = "061zq00mz1aamam4pc4kbbzdx4mi07iiach6w52n0c9d1bz16ym2"; - name = "plasma-vault-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-vault-5.23.4.tar.xz"; + sha256 = "1ay9x7kbgb5qg7w1m1rp9xbp8dzsxdj7zh2ifk3lff1g5f3yh9y6"; + name = "plasma-vault-5.23.4.tar.xz"; }; }; plasma-workspace = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-5.23.3.tar.xz"; - sha256 = "0mz2aanm46s88lwm1s2nwm8yfanj78rnx1y14ppzm4dx0lrjx046"; - name = "plasma-workspace-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-5.23.4.tar.xz"; + sha256 = "0kd37sfg8hbf8biia3ip89nx0jgrdgfprmda392gx5xfzbnlxv0k"; + name = "plasma-workspace-5.23.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-wallpapers-5.23.3.tar.xz"; - sha256 = "1kz4xqzgwnhp1wmqmgadn0jjc9033i2bm8hiycqkahhj603k552s"; - name = "plasma-workspace-wallpapers-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-wallpapers-5.23.4.tar.xz"; + sha256 = "157kbi40bv9arxq7cvgxypk1qmrpd52d76xq99rsfbzdfrggx9nc"; + name = "plasma-workspace-wallpapers-5.23.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/plymouth-kcm-5.23.3.tar.xz"; - sha256 = "1fa26h19g4f2fhpisp1jsl1niis50fbkdss7j1nqg44jih0g0qyf"; - name = "plymouth-kcm-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/plymouth-kcm-5.23.4.tar.xz"; + sha256 = "11f2r4nq7pi8xn3z6zjc58ix5hj3das16xqvq7m82p8zvw2qs44p"; + name = "plymouth-kcm-5.23.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.23.3"; + version = "1-5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/polkit-kde-agent-1-5.23.3.tar.xz"; - sha256 = "1r5sqxzj5r9xqn3iwsfj06f1w69q41j4wq2z11kndnjad0pwrf3r"; - name = "polkit-kde-agent-1-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/polkit-kde-agent-1-5.23.4.tar.xz"; + sha256 = "06qjz87c2h0vgpk0jpf24194rahdrwpc274k6vmfkmbr5232w48h"; + name = "polkit-kde-agent-1-5.23.4.tar.xz"; }; }; powerdevil = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/powerdevil-5.23.3.tar.xz"; - sha256 = "0hcb22dy4hslzrk3md6amzm51hlmv08747f34x5drdl10cg98mzb"; - name = "powerdevil-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/powerdevil-5.23.4.tar.xz"; + sha256 = "1sl62vm25libbx2l2kw7s9p44kdq561gh8an03vkf1q1qgrnpwsf"; + name = "powerdevil-5.23.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/qqc2-breeze-style-5.23.3.tar.xz"; - sha256 = "0716mw6dgpzwkaiinp8vphvxj3vrb95v7zckh4pgdky8ahxv655l"; - name = "qqc2-breeze-style-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/qqc2-breeze-style-5.23.4.tar.xz"; + sha256 = "1wl8zxq7bca6v40mnwjnpxc3pzz30khc223y9dwpgy8ampvy2ghr"; + name = "qqc2-breeze-style-5.23.4.tar.xz"; }; }; sddm-kcm = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/sddm-kcm-5.23.3.tar.xz"; - sha256 = "0sb9sjdbhafjcx2nf2ffzjh14gyambj1w32gjz29fl15xjbmvqnr"; - name = "sddm-kcm-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/sddm-kcm-5.23.4.tar.xz"; + sha256 = "148vf9af4fhma0w6v7wwlxpq8v8a858yx3qx7w0pg8jq5zd1k6g2"; + name = "sddm-kcm-5.23.4.tar.xz"; }; }; systemsettings = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/systemsettings-5.23.3.tar.xz"; - sha256 = "0i8vc1y95jd3g5vcgzixd73mn1r9s2jg9ix5nwfq4i5ihi0a0ph1"; - name = "systemsettings-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/systemsettings-5.23.4.tar.xz"; + sha256 = "0naw5zxgs47nx5wwg1li35salyg2cfpaphhn5m20plwqfi43zbdw"; + name = "systemsettings-5.23.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.23.3"; + version = "5.23.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.3/xdg-desktop-portal-kde-5.23.3.tar.xz"; - sha256 = "1aajlgccl1z9m49a016ixr2hiy231wyx6xnmpbvjx9h1b52b3rpz"; - name = "xdg-desktop-portal-kde-5.23.3.tar.xz"; + url = "${mirror}/stable/plasma/5.23.4/xdg-desktop-portal-kde-5.23.4.tar.xz"; + sha256 = "17n5d4rjm28in7jpsq2qg2d7lv3qcnlpmgi9kclx81miih9rjwan"; + name = "xdg-desktop-portal-kde-5.23.4.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 3ebe6ca40dd49..21cc6c8227cdc 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -4,7 +4,8 @@ }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; -{ lib, stdenv +{ lib +, stdenv , fetchurl , libunwind , openssl @@ -42,9 +43,8 @@ in stdenv.mkDerivation rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. - rpath = lib.makeLibraryPath [ + rpath = lib.makeLibraryPath ([ stdenv.cc.cc - lttng-ust_2_12 zlib curl @@ -52,7 +52,9 @@ in stdenv.mkDerivation rec { libunwind libuuid openssl - ]; + ] ++ lib.optionals stdenv.isLinux [ + lttng-ust_2_12 + ]); src = fetchurl { url = builtins.getAttr type urls; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index c4be7c27d85c1..06b19b547b678 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.0"; + version = "1.6.2"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-UgZdSNcqcnAuwa/l96mDHhFnNTHiec3/nK7AGgfuxj0="; + hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index da63df43d59b8..6cb5c6dcc1058 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, unstableGitUpdater # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false @@ -11,14 +12,14 @@ stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2021-11-30"; + version = "unstable-2021-12-10"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "982c958eb4840e1c6a98773ba0600f652500f5a7"; - sha256 = "18dp9nd1gjnpd1870149v67vzxbna25l6zi052z1r51xvaqwc3cx"; + rev = "ca685c1b780149f7210426f0bb78dd7b67b19e6d"; + sha256 = "1nmmj94z5hips2426rcdqdcsm8015jjj51rm9fnx81qagdj52j5d"; }; postPatch = '' @@ -82,6 +83,10 @@ stdenv.mkDerivation rec { # Stripping breaks many tools dontStrip = true; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/open-watcom/open-watcom-v2.git"; + }; + meta = with lib; { description = "The v2 fork of the Open Watcom suite of compilers and tools"; longDescription = '' diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index 423ce4b264729..94cca7ab34ce7 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -123,6 +123,8 @@ let ''; }; }; + + inherit (open-watcom) meta; }; in lib.makeOverridable wrapper diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 764ab29e919b0..49dfe0e4644ee 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -20,7 +20,15 @@ let envs = let inherit python; pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + pythonVirtualEnv = if python.isPy3k + then + python.withPackages(ps: with ps; [ virtualenv ]) + else + python.buildEnv.override { + extraLibs = with python.pkgs; [ virtualenv ]; + # Collisions because of namespaces __init__.py + ignoreCollisions = true; + }; in { # Plain Python interpreter plain = rec { diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index d6424575a7641..30f71bd3e520e 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_image"; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { "--disable-tif-shared" ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ]; meta = with lib; { diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 291e9790e4423..91e9f0a3edf0b 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl , SDL, libogg, libvorbis, smpeg, libmikmod -, fluidsynth +, fluidsynth, pkg-config , enableNativeMidi ? false }: @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ] diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index f55332a0ee0e0..e902213c9710f 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL }: +{ lib, stdenv, fetchurl, SDL, pkg-config }: stdenv.mkDerivation rec { pname = "SDL_net"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ SDL ]; meta = with lib; { diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index b5323464630f0..6c9650cacca94 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchRepoProject +, writeScript , cmake , ninja , patchelf @@ -21,17 +22,18 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q4.1"; + version = "2021.Q4.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "sha256-yvpHLreBNhiSxnZis5+XcTOSZPRLq5K8YNJsjpYqD6s="; + sha256 = "DpylZjIqWmCnUI0lEvd/HQcY+lr8asMurt1K9MI3qQw="; }; buildInputs = [ expat + libdrm ncurses openssl wayland @@ -66,16 +68,36 @@ in stdenv.mkDerivation rec { cmakeDir = "../drivers/xgl"; installPhase = '' + runHook preInstall + install -Dm755 -t $out/lib icd/amdvlk${suffix}.so install -Dm644 -t $out/share/vulkan/icd.d icd/amd_icd${suffix}.json install -Dm644 -t $out/share/vulkan/implicit_layer.d icd/amd_icd${suffix}.json patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so + + runHook postInstall ''; # Keep the rpath, otherwise vulkaninfo and vkcube segfault dontPatchELF = true; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p coreutils curl gnused jq common-updater-scripts + + function setHash() { + sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's,sha256 = "[^.'"'"']*",sha256 = "'"$1"'",' + } + + version="$(curl -sL "https://api.github.com/repos/GPUOpen-Drivers/AMDVLK/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's/version = "[^.'"'"']*"/version = "'"$version"'"/' + + setHash "$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" + hash="$(nix to-base64 $(nix-build -A amdvlk 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))" + setHash "$hash" + ''; + meta = with lib; { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 81f4bb6c2dce0..c0d9d87aa4223 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -41,10 +41,14 @@ let stdenv.mkDerivation ({ name = "aspell-dict-${shortName}"; - buildInputs = [aspell which]; + strictDeps = true; + + nativeBuildInputs = [ aspell which ]; dontAddPrefix = true; + configurePlatforms = [ ]; + preBuild = "makeFlagsArray=(dictdir=$out/lib/aspell datadir=$out/lib/aspell)"; meta = { diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index dec2125974d71..9cc27ef489843 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html - doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; + doCheck = stdenv.hostPlatform.system != "i686-linux"; meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index bbf20d6097020..396366324d3a5 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -4,7 +4,7 @@ , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa -, fetchpatch +, fetchpatch, buildPackages }: with lib; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; + nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; patches = [ @@ -72,6 +73,9 @@ stdenv.mkDerivation rec { "--disable-glibtest" "--disable-introspection" "--disable-visibility" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache" + "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; doCheck = false; # needs X11 diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 3aed0d2885273..7fe1dc33134bc 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw"; + sha256 = "1msg5i2mcmjix5pvpa84dwmlqpqm3206frl1060k342i62gxhm41"; }; configureFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index cf02589792f3d..54680152248d4 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -10,7 +10,6 @@ , docutils , doxygen , graphviz -, valgrind , glib , dbus , alsa-lib @@ -28,28 +27,30 @@ , makeFontsConf , callPackage , nixosTests +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind +, valgrind , withMediaSession ? true , libcameraSupport ? true , libcamera , libdrm , gstreamerSupport ? true -, gst_all_1 ? null +, gst_all_1 , ffmpegSupport ? true -, ffmpeg ? null +, ffmpeg , bluezSupport ? true -, bluez ? null -, sbc ? null -, libfreeaptx ? null -, ldacbt ? null -, fdk_aac ? null +, bluez +, sbc +, libfreeaptx +, ldacbt +, fdk_aac , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true , pulseTunnelSupport ? true -, libpulseaudio ? null +, libpulseaudio , zeroconfSupport ? true -, avahi ? null +, avahi }: let @@ -121,7 +122,6 @@ let vulkan-headers vulkan-loader webrtc-audio-processing - valgrind SDL2 systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] @@ -131,6 +131,9 @@ let ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi; + # Valgrind binary is required for running one optional test. + checkInputs = lib.optional withValgrind valgrind; + mesonFlags = [ "-Ddocs=enabled" "-Dudevrulesdir=lib/udev/rules.d" diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 5420eb204e3d9..7a27cd1fd678b 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ]; + nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ]; + buildInputs = [ glib libsoup ]; - preConfigure = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index 6c7aafd22c81e..acf67b9f8977b 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (attrs // { nim_builder --phase:configure runHook postConfigure '' else - buildPhase; + configurePhase; buildPhase = if isNull buildPhase then '' runHook preBuild diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 72ba6c38f847a..1c491cb5de0f7 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub -, fetchpatch , setuptools-scm , substituteAll , cmake @@ -14,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.6"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sULXnecEs8VI687pR9EK9jjYWlrB4tV4dt7Kzekaxb4="; + hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso="; }; patches = [ @@ -40,12 +39,12 @@ buildPythonPackage rec { sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; fetchSubmodules = true; }; - }) - - # avoid dynamic linking error at import time - (fetchpatch { - url = "https://github.com/Chia-Network/bls-signatures/pull/287/commits/797241e9dae1c164c862cbdb38c865d4b124a601.patch"; - sha256 = "sha256-tlc4aA75gUxt5OaSNZqIlO//PXjmddVgVLYuVEFNmkE="; + catch2_src = fetchFromGitHub { + owner = "catchorg"; + repo = "Catch2"; + rev = "v2.13.7"; # pinned by blspy + sha256 = "NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + }; }) ]; diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index a480c6d37083f..337c8df3c4e51 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -48,3 +48,17 @@ index 5a8c381..d9aa940 100644 ) FetchContent_MakeAvailable(pybind11 relic) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 449164a..15a955e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib) + if(BUILD_BLS_TESTS) + FetchContent_Declare( + Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG v2.13.7 ++ URL @catch2_src@ + ) + FetchContent_MakeAvailable(Catch2) + add_executable(runtest test.cpp) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 53bebb6affa29..815bc8ae36cb3 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww"; + sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 04885072c6788..039a75aacee24 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.9.1"; + version = "2.10.0"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910"; + sha256 = "ae6a3fdf1ffa7a9ef6fd2f0a59c1a68c96b29f7f00f5166375658ef392f1ed32"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 678c2ce6329e9..81bc807a13470 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.16.0"; + version = "7.16.1"; src = fetchPypi { inherit pname version; - sha256 = "d7f8665715ad80e3e99e42388bcc49c1b06162f72acfa1f8febe2baf5570b0ed"; + sha256 = "c024ee2e7e2509c842c4e3c5e2b99a92ceecfde06d6dac2d32a19bf566c3e175"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/filelock/3.2.nix b/pkgs/development/python-modules/filelock/3.2.nix index 3929361f7d8c1..401fdf582ffb1 100644 --- a/pkgs/development/python-modules/filelock/3.2.nix +++ b/pkgs/development/python-modules/filelock/3.2.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "filelock"; @@ -9,6 +9,10 @@ buildPythonPackage rec { sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + meta = with lib; { homepage = "https://github.com/benediktschmitt/py-filelock"; description = "A platform independent file lock for Python"; diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix new file mode 100644 index 0000000000000..a9433fe0b871e --- /dev/null +++ b/pkgs/development/python-modules/flask-session/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, flask, cachelib }: + +buildPythonPackage rec { + pname = "Flask-Session"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ye1UMh+oxMoBMv/TNpWCdZ7aclL7SzvuSA5pDRukH0Y="; + }; + + propagatedBuildInputs = [ flask cachelib ]; + + checkInputs = [ pytestCheckHook ]; + + # The rest of the tests require database servers and optional db connector dependencies + pytestFlagsArray = [ "-k" "'null_session or filesystem_session'" ]; + + pythonImportsCheck = [ "flask_session" ]; + + meta = with lib; { + description = "A Flask extension that adds support for server-side sessions"; + homepage = "https://github.com/fengsp/flask-session"; + license = licenses.bsd3; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 923f639feb96f..567eeaf69698c 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.5"; + version = "1.16.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v7lYaZLHxQs3/2uJnj+9y0xCXfPO1C38jLwzF7IMbb0="; + sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/2.nix b/pkgs/development/python-modules/platformdirs/2.nix new file mode 100644 index 0000000000000..6fe2bcbde60a6 --- /dev/null +++ b/pkgs/development/python-modules/platformdirs/2.nix @@ -0,0 +1,43 @@ +{ lib +, appdirs +, buildPythonPackage +, fetchFromGitHub +, platformdirs +, pytest-mock +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "platformdirs"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-yCvfOPuX9hbQO9gbFHfeu+dGH+Vb9FM7wng1XU2D8hE="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + appdirs + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "platformdirs" ]; + + meta = with lib; { + description = "Python module for determining appropriate platform-specific directories"; + homepage = "https://platformdirs.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 24ac0e37ca7e0..40a4bf497f461 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "sha256-FyDsTqDQTI/Xxu4Sl4eHqwmgwN+ip+8WKGJs/h/kl2Y="; + sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index ecb87d951b312..a5d0ea849bb3d 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "NicklasTegner"; repo = pname; rev = "v${version}"; - sha256 = "0rssjig3nwdi4qvsjq7v7k8jyv6l9szfl5dp1a8s54c4j4dw37nh"; + sha256 = "00r88qcvc9jpi8jvd6rpizz9gm33aq8hc3mf8lrarrjiq2fsxmk9"; }; patches = [ diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index fda5fc5d68ee8..16a72550ffd0d 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.15"; + version = "0.4.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ud6/aLvAWqTcvCJTiprkj9yG6DXdDOPzFEr+T0/qnBw="; + sha256 = "sha256-Da5hkmzGJtfqiDPV9X02opv54Ry6sGiSbDnej9a2QDA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 08a87a2f7c023..8b8cb4cdbb53e 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -2,24 +2,29 @@ , buildPythonPackage , fetchFromGitHub , sphinx +, pytestCheckHook +, beautifulsoup4 }: buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY="; + sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc="; }; propagatedBuildInputs = [ sphinx ]; - doCheck = false; # no tests + checkInputs = [ + pytestCheckHook + beautifulsoup4 + ]; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index 56a3b27e7b965..06a445450e5c7 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.7"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0"; + sha256 = "0c7d01f01758dd6e50ff2fc915c6087c0da17298635e6635581aaf25c934d6ce"; }; # tests not inclued with release diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ae55ac637e97c..776fbaa180191 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -6,13 +6,13 @@ , numpy, tensorflow-tensorboard, absl-py , setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator , dill, flatbuffers-python, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp -, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib +, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core # Upsteam by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See @@ -90,7 +90,7 @@ let keras-preprocessing numpy opt-einsum - protobuf + protobuf-python setuptools six tblib @@ -188,11 +188,16 @@ let sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c="; }; + patches = [ + # Patch the sources to compile with protobuf >= 3.16. + ./system-protobuf.patch + ]; + # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - which pythonEnv cython perl + which pythonEnv cython perl protobuf-core ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -241,12 +246,7 @@ let # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" "com_github_grpc_grpc" - # Multiple issues with custom protobuf. - # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis` - # and related functionality, but then the next error is about "dangling symbolic link", and in general - # looks like that's only the beginning: see - # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf - # "com_google_protobuf" + "com_google_protobuf" # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)' # "com_googlesource_code_re2" "curl" @@ -281,6 +281,11 @@ let INCLUDEDIR = "${includes_joined}/include"; + # This is needed for the Nix-provided protobuf dependency to work, + # as otherwise the rule `link_proto_files` tries to create the links + # to `/usr/include/...` which results in build failures. + PROTOBUF_INCLUDE_PATH = "${protobuf-core}/include"; + PYTHON_BIN_PATH = pythonEnv.interpreter; TF_NEED_GCP = true; @@ -356,12 +361,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-GIBs1BAUuefwlavu7dr9rFb4n1A3uwnvvCAvsBnSSqQ=" + "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg=" else if stdenv.isDarwin then - "sha256-156eOnnjk+wzIiGLd6k/+SAgm4AyImsV/qBsHFlxe+k=" + "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs=" else - "sha256-Fj/wWapsre55VctJ1k1kcYKAn3uDCMPN5rVX8y76ypM="; + "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538="; }; buildAttrs = { @@ -454,7 +459,7 @@ in buildPythonPackage { keras-preprocessing numpy opt-einsum - protobuf + protobuf-python six tblib tensorflow-estimator diff --git a/pkgs/development/python-modules/tensorflow/system-protobuf.patch b/pkgs/development/python-modules/tensorflow/system-protobuf.patch new file mode 100644 index 0000000000000..dce6df810464f --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/system-protobuf.patch @@ -0,0 +1,13 @@ +diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc +index a1265cfb5c6..ada919bbd7b 100644 +--- a/tensorflow/core/kernels/example_parsing_ops.cc ++++ b/tensorflow/core/kernels/example_parsing_ops.cc +@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel { + resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out); + OP_REQUIRES(ctx, status.ok(), + errors::InvalidArgument("Error while parsing JSON: ", +- string(status.error_message()))); ++ string(status.message()))); + } + } + diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index d17eabb8c35bc..4774e09f0b6ed 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf"; + sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i"; }; nativeBuildInputs = [ libpng ninja which ] diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 6e89d2edd2ac5..527893aed0053 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.26.1"; + version = "2.26.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CJPhEuFRC7tn9TeUHJIZLedHLlG/fyNuDlg4ZvDtkz4="; + sha256 = "0e22d9cdeff4c3eb068eb883d59b127c98d80525f3d0412a1c4499c6ae1f711e"; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index c5aa9f0bac94c..f23764a5107d4 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -74,6 +74,9 @@ buildPythonPackage rec { disabledTests = [ # Permission Error "test_bad_exe_py_info_no_raise" + ] ++ lib.optionals isPy27 [ + "test_python_via_env_var" + "test_python_multi_value_prefer_newline_via_env_var" ]; pythonImportsCheck = [ "virtualenv" ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a43b450e7b75b..f47543b08681d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.668"; + version = "2.0.672"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-kCqhNxqI+9F9nQvZDOYjC2Bb5a1x4a9b9aqvDe/siP0="; + sha256 = "sha256-bxJQYCAQnSOaXXczvLxdpMzlBAehgctwMNvItR6FsgM="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 00852a4c90f17..2ba077fa9439c 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8="; + sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI="; }; - vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU="; + vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/0.57/allow-dirs-outside-of-prefix.patch index 4eb292a2e529e..4eb292a2e529e 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/allow-dirs-outside-of-prefix.patch diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/0.57/boost-Do-not-add-system-paths-on-nix.patch index 5b9020b3d5402..5b9020b3d5402 100644 --- a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/boost-Do-not-add-system-paths-on-nix.patch diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/development/tools/build-managers/meson/0.57/clear-old-rpath.patch index f1e3c76e8b53b..f1e3c76e8b53b 100644 --- a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/clear-old-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/0.57/default.nix index de82609a5486f..6fd93e8f86b15 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/0.57/default.nix @@ -1,6 +1,5 @@ { lib , python3 - , writeTextDir , substituteAll , fetchpatch diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/0.57/fix-rpath.patch index d34b6c4c43457..d34b6c4c43457 100644 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/fix-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/0.57/gir-fallback-path.patch index 0c924bacf73f5..0c924bacf73f5 100644 --- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/gir-fallback-path.patch diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/0.57/more-env-vars.patch index 4b2606e2d694a..4b2606e2d694a 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/0.57/more-env-vars.patch diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/0.57/setup-hook.sh index 3d946fcffd522..3d946fcffd522 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/0.57/setup-hook.sh diff --git a/pkgs/development/tools/build-managers/meson/0.60/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/0.60/allow-dirs-outside-of-prefix.patch new file mode 100644 index 0000000000000..4eb292a2e529e --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/allow-dirs-outside-of-prefix.patch @@ -0,0 +1,19 @@ +--- a/mesonbuild/coredata.py ++++ b/mesonbuild/coredata.py +@@ -506,7 +506,6 @@ class CoreData: + return value + if option.name.endswith('dir') and value.is_absolute() and \ + option not in BULITIN_DIR_NOPREFIX_OPTIONS: +- # Value must be a subdir of the prefix + # commonpath will always return a path in the native format, so we + # must use pathlib.PurePath to do the same conversion before + # comparing. +@@ -518,7 +517,7 @@ class CoreData: + try: + value = value.relative_to(prefix) + except ValueError: +- raise MesonException(msg.format(option, value, prefix)) ++ pass + if '..' in str(value): + raise MesonException(msg.format(option, value, prefix)) + return value.as_posix() diff --git a/pkgs/development/tools/build-managers/meson/0.60/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/0.60/boost-Do-not-add-system-paths-on-nix.patch new file mode 100644 index 0000000000000..0a2eda9de9ac6 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/boost-Do-not-add-system-paths-on-nix.patch @@ -0,0 +1,21 @@ +diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py +--- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300 ++++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300 +@@ -682,16 +682,7 @@ + else: + tmp = [] # type: T.List[Path] + +- # Add some default system paths +- tmp += [Path('/opt/local')] +- tmp += [Path('/usr/local/opt/boost')] +- tmp += [Path('/usr/local')] +- tmp += [Path('/usr')] +- +- # Cleanup paths +- tmp = [x for x in tmp if x.is_dir()] +- tmp = [x.resolve() for x in tmp] +- roots += tmp ++ # Remove such spurious, non-explicit "system" paths for Nix&Nixpkgs + + self.check_and_set_roots(roots, use_system=True) + diff --git a/pkgs/development/tools/build-managers/meson/0.60/clear-old-rpath.patch b/pkgs/development/tools/build-managers/meson/0.60/clear-old-rpath.patch new file mode 100644 index 0000000000000..f1e3c76e8b53b --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/clear-old-rpath.patch @@ -0,0 +1,20 @@ +diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py +index 4176b9a03..faaabf616 100644 +--- a/mesonbuild/scripts/depfixer.py ++++ b/mesonbuild/scripts/depfixer.py +@@ -336,6 +336,15 @@ class Elf(DataSizes): + if not new_rpath: + self.remove_rpath_entry(entrynum) + else: ++ # Clear old rpath to avoid stale references, ++ # not heeding the warning above about de-duplication ++ # since it does not seem to cause issues for us ++ # and not doing so trips up Nix’s reference checker. ++ # See https://github.com/NixOS/nixpkgs/pull/46020 ++ # and https://github.com/NixOS/nixpkgs/issues/95163 ++ self.bf.seek(rp_off) ++ self.bf.write(b'\0'*len(old_rpath)) ++ + self.bf.seek(rp_off) + self.bf.write(new_rpath) + self.bf.write(b'\0') diff --git a/pkgs/development/tools/build-managers/meson/0.60/default.nix b/pkgs/development/tools/build-managers/meson/0.60/default.nix new file mode 100644 index 0000000000000..79870cd4d128a --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/default.nix @@ -0,0 +1,109 @@ +{ lib +, fetchpatch +, installShellFiles +, ninja +, pkg-config +, python3 +, substituteAll +}: + +python3.pkgs.buildPythonApplication rec { + pname = "meson"; + version = "0.60.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-ZOaWhWW/G4FS9PnWyoFU77nhTKqaq/eyLnHmxdBT6SE="; + }; + + patches = [ + # Upstream insists on not allowing bindir and other dir options + # outside of prefix for some reason: + # https://github.com/mesonbuild/meson/issues/2561 + # We remove the check so multiple outputs can work sanely. + ./allow-dirs-outside-of-prefix.patch + + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. Taken from + # https://github.com/mesonbuild/meson/pull/6827 + ./more-env-vars.patch + + # Unlike libtool, vanilla Meson does not pass any information + # about the path library will be installed to to g-ir-scanner, + # breaking the GIR when path other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with + # library install_dir to g-ir-scanner. + ./gir-fallback-path.patch + + # In common distributions, RPATH is only needed for internal libraries so + # meson removes everything else. With Nix, the locations of libraries + # are not as predictable, therefore we need to keep them in the RPATH. + # At the moment we are keeping the paths starting with /nix/store. + # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 + (substituteAll { + src = ./fix-rpath.patch; + inherit (builtins) storeDir; + }) + + # When Meson removes build_rpath from DT_RUNPATH entry, it just writes + # the shorter NUL-terminated new rpath over the old one to reduce + # the risk of potentially breaking the ELF files. + # But this can cause much bigger problem for Nix as it can produce + # cut-in-half-by-\0 store path references. + # Let’s just clear the whole rpath and hope for the best. + ./clear-old-rpath.patch + + # Patch out default boost search paths to avoid impure builds on + # unsandboxed non-NixOS builds, see: + # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 + ./boost-Do-not-add-system-paths-on-nix.patch + ]; + + setupHook = ./setup-hook.sh; + + # Meson included tests since 0.45, however they fail in Nixpkgs because they + # require a typical building environment (including C compiler and stuff). + # Just for the sake of documentation, the next lines are maintained here. + doCheck = false; + checkInputs = [ ninja pkg-config ]; + checkPhase = '' + python ./run_project_tests.py + ''; + + postFixup = '' + pushd $out/bin + # undo shell wrapper as meson tools are called with python + for i in *; do + mv ".$i-wrapped" "$i" + done + popd + + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson + ''; + + meta = with lib; { + homepage = "https://mesonbuild.com"; + description = "An open source, fast and friendly build system made in Python"; + longDescription = '' + Meson is an open source build system meant to be both extremely fast, and, + even more importantly, as user friendly as possible. + + The main design point of Meson is that every moment a developer spends + writing or debugging build definitions is a second wasted. So is every + second spent waiting for the build system to actually start compiling + code. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar mbe AndersonTorres ]; + inherit (python3.meta) platforms; + }; +} +# TODO: a more Nixpkgs-tailoired test suite diff --git a/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch new file mode 100644 index 0000000000000..d34b6c4c43457 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch @@ -0,0 +1,24 @@ +--- a/mesonbuild/backend/backends.py ++++ b/mesonbuild/backend/backends.py +@@ -456,6 +456,21 @@ class Backend: + args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) + except Exception: + pass ++ ++ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split() ++ next_is_path = False ++ # Try to add rpaths set by user or ld-wrapper so that they are not removed. ++ # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177 ++ for flag in nix_ldflags: ++ if flag == '-rpath' or flag == '-L': ++ next_is_path = True ++ elif next_is_path or flag.startswith('-L/'): ++ if flag.startswith('-L/'): ++ flag = flag[2:] ++ if flag.startswith('@storeDir@'): ++ dirs.add(flag) ++ next_is_path = False ++ + # Match rpath formats: + # -Wl,-rpath= + # -Wl,-rpath, diff --git a/pkgs/development/tools/build-managers/meson/0.60/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/0.60/gir-fallback-path.patch new file mode 100644 index 0000000000000..e6d7402652778 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/gir-fallback-path.patch @@ -0,0 +1,21 @@ +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 1c6952df7..9466a0b7d 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -923,6 +923,16 @@ class GnomeModule(ExtensionModule): + if fatal_warnings: + scan_command.append('--warn-error') + ++ if len(set(girtarget.get_custom_install_dir()[0] for girtarget in girtargets if girtarget.get_custom_install_dir())) > 1: ++ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) ++ ++ if girtargets[0].get_custom_install_dir(): ++ fallback_libpath = girtargets[0].get_custom_install_dir()[0] ++ else: ++ fallback_libpath = None ++ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/": ++ scan_command += ['--fallback-library-path=' + fallback_libpath] ++ + generated_files = [f for f in libsources if isinstance(f, (GeneratedList, CustomTarget, CustomTargetIndex))] + + scan_target = self._make_gir_target(state, girfile, scan_command, generated_files, depends, kwargs) diff --git a/pkgs/development/tools/build-managers/meson/0.60/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/0.60/more-env-vars.patch new file mode 100644 index 0000000000000..e4ad43550423d --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/more-env-vars.patch @@ -0,0 +1,12 @@ +diff -Naur meson-0.60.2-old/mesonbuild/environment.py meson-0.60.2-new/mesonbuild/environment.py +--- meson-0.60.2-old/mesonbuild/environment.py 2021-11-02 16:58:13.000000000 -0300 ++++ meson-0.60.2-new/mesonbuild/environment.py 2021-12-12 17:44:00.350499307 -0300 +@@ -68,7 +68,7 @@ + # compiling we fall back on the unprefixed host version. This + # allows native builds to never need to worry about the 'BUILD_*' + # ones. +- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), ++ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), + # Always just the unprefixed host versions + [var_name] + )[for_machine] diff --git a/pkgs/development/tools/build-managers/meson/0.60/setup-hook.sh b/pkgs/development/tools/build-managers/meson/0.60/setup-hook.sh new file mode 100644 index 0000000000000..3d946fcffd522 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/0.60/setup-hook.sh @@ -0,0 +1,37 @@ +mesonConfigurePhase() { + runHook preConfigure + + if [ -z "${dontAddPrefix-}" ]; then + mesonFlags="--prefix=$prefix $mesonFlags" + fi + + # See multiple-outputs.sh and meson’s coredata.py + mesonFlags="\ + --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ + --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ + --includedir=${!outputInclude}/include \ + --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ + --localedir=${!outputLib}/share/locale \ + -Dauto_features=${mesonAutoFeatures:-enabled} \ + -Dwrap_mode=${mesonWrapMode:-nodownload} \ + $mesonFlags" + + mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" + + echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" + + meson build $mesonFlags "${mesonFlagsArray[@]}" + cd build + + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "meson: enabled parallel building" + fi + + runHook postConfigure +} + +if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then + setOutputFlags= + configurePhase=mesonConfigurePhase +fi diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 00529c265ee3d..baadebe53a07b 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.9.3"; + version = "2.9.5"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WjHNiFfa0YXuRq/FfWcamBwAVqRqLv9Qf+vy74rsCS4="; + sha256 = "sha256-YXAUDICQhZFeafP/wezd+dLpXpd7waz3wUCVCwVb12I="; }; - vendorSha256 = "sha256-X2qxoq6bCQJH0B/jq670WWuTkDEurFI+Zx/5bcvXtVY="; + vendorSha256 = "sha256-Mob8XxTALtuG9q7gMWKvp1k2cUDKI0QHAeXfQK47NDo="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index fdc91503ff5cf..d08f2acb9dec4 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,20 +11,23 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-11-29"; - cargoSha256 = "sha256-UgYR0e3Pt3lcbkSDnizlwtwjnqTaqGlXRgR724U4rSU="; + version = "2021-12-13"; + cargoSha256 = "sha256-VF4pwSl3Wei7KxyQFOPj7hVX/NG2zImRLv4iN+ijAs8="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; + sha256 = "sha256-xt7iDfIoaBhStgqsgttyOFF4NYPQ8jeVwDoYUwrvtrA="; }; patches = [ # Code format and git history check require more dependencies but don't really matter for packaging. # So just ignore them. ./ignore-git-and-rustfmt-tests.patch + + # Remove when we have rustc >= 1.57.0. + ./no-1-57-map-while.patch ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/no-1-57-map-while.patch b/pkgs/development/tools/rust/rust-analyzer/no-1-57-map-while.patch new file mode 100644 index 0000000000000..6114f51831bef --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-1-57-map-while.patch @@ -0,0 +1,20 @@ +--- a/crates/ide_db/src/helpers.rs ++++ b/crates/ide_db/src/helpers.rs +@@ -309,7 +309,7 @@ pub fn lint_eq_or_in_group(lint: &str, lint_is: &str) -> bool { + pub fn parse_tt_as_comma_sep_paths(input: ast::TokenTree) -> Option<Vec<ast::Path>> { + let r_paren = input.r_paren_token(); + let tokens = +- input.syntax().children_with_tokens().skip(1).map_while(|it| match it.into_token() { ++ input.syntax().children_with_tokens().skip(1).map(|it| match it.into_token() { + // seeing a keyword means the attribute is unclosed so stop parsing here + Some(tok) if tok.kind().is_keyword() => None, + // don't include the right token tree parenthesis if it exists +@@ -317,7 +317,7 @@ pub fn parse_tt_as_comma_sep_paths(input: ast::TokenTree) -> Option<Vec<ast::Pat + // only nodes that we can find are other TokenTrees, those are unexpected in this parse though + None => None, + Some(tok) => Some(tok), +- }); ++ }).take_while(|tok| tok.is_some()).map(|tok| tok.unwrap()); + let input_expressions = tokens.into_iter().group_by(|tok| tok.kind() == T![,]); + let paths = input_expressions + .into_iter() diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index add400e4d0e86..920b36a5131e5 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -28,50 +28,8 @@ sed -e "s#version = \".*\"#version = \"$ver\"#" \ -e "/fetchFromGitHub/,/}/ s#sha256 = \".*\"#sha256 = \"$sha256\"#" \ -e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \ --in-place ./default.nix -node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" - -# Check vscode compatibility -req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" -req_vscode_ver="${req_vscode_ver#^}" -cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')" -if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then - echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" - exit 1 -fi echo "Prebuilding for cargoSha256" cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \ --in-place ./default.nix - -# Update vscode extension - -extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer.vsix" -L | - bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip). - jq --raw-output '.version') -echo "Extension version: $extension_ver" - -build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" -# We need devDependencies to build vsix. -# `esbuild` is a binary package an is already in nixpkgs so we omit it here. -jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \ - --arg ver "$extension_ver" \ - >"$build_deps/package.json.new" - -old_deps="$(jq '.dependencies' "$build_deps"/package.json)" -new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)" -if [[ "$old_deps" == "$new_deps" ]]; then - echo "package.json dependencies not changed, do simple version change" - - sed -E '/^ "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \ - --in-place ../../../node-packages/node-packages.nix - mv "$build_deps"/package.json{.new,} - -else - echo "package.json dependencies changed, updating nodePackages" - mv "$build_deps"/package.json{.new,} - - pushd "../../../node-packages" - ./generate.sh - popd -fi diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 947b4721b0a3f..2839c2287f898 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B/xh0eYRJxjjIEXdxmLz6usQvo4v/HQK5VNnnjcDBjM="; + sha256 = "sha256-CYeTt6PzVGu62/GJB+gUlOXG2bs4RV0LWECF4CN3Uic="; }; - cargoSha256 = "sha256-7qMrrs6K+mJVDHNkGQDb6abM18RyBPToseTNM7ogdQ0="; + cargoSha256 = "sha256-IUzaVeOTBAOo/jkDytk6qc7VatKX75l1yZy99iSIqyE="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 174f2273edfc7..bd297154cc36c 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "sha256-hnrMy8iYoaeWxZlhO9L1kQW3OgL6jHL1MxJpbNFLHZk="; + sha256 = "sha256-PTT87Na4KpyN6a7T49vHHhSqSOF6JSWr5/jiys1Uzko="; }; - cargoSha256 = "sha256-O7Ma6+Vniil5hIDd5JCWecTvkAjq7wMuuyfrzePDDq4="; + cargoSha256 = "sha256-Gvr6Zjd9Gvn2CyjNHlJaKPFYUViPezRwoDBeVelRlkU="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 5ed93c85ff0ed..0c4f2a3537257 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; preInstall = '' - find ./target -name libswc_common.${stdenv.hostPlatform.extensions.sharedLibrary} -delete + find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete ''; postInstall = '' diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 54f077e71821d..f69915ddfa69b 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.7"; - sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc"; + version = "12.22.8"; + sha256 = "0g0ihjzbd02izhmb4jzkdsr5788982wy8q2b4a1h04q8l4fwp197"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index 38d5a12a712e4..62db8e9f87d2f 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "17.2.0"; - sha256 = "16k5kqanfvsnickkrv0vz072qg4ddzrk4is56yvdg2f1brxwqirb"; + version = "17.3.0"; + sha256 = "00sx046xmh75va7jh810npphnz3yrixifjhlj0jqysal93kc9r74"; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index e92836ae34d50..c8363b8d60417 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -4,8 +4,7 @@ , autoreconfHook , pkg-config , mednafen -, gtk2 ? null -, gtk3 ? null +, gtk3 , wrapGAppsHook }: @@ -21,16 +20,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; - buildInputs = [ gtk2 gtk3 mednafen ]; - - configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ]; - - dontWrapGApps = true; + buildInputs = [ gtk3 mednafen ]; postInstall = '' wrapProgram $out/bin/mednaffe \ - --prefix PATH ':' "${mednafen}/bin" \ - "''${gappsWrapperArgs[@]}" + --prefix PATH ':' "${mednafen}/bin" ''; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 555f9f34689fc..60019b374e853 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -135,8 +135,8 @@ let mktplcRef = { publisher = "antfu"; name = "slidev"; - version = "0.3.2"; - sha256 = "sha256-vzmByEiKZIkd707Bs4RGQrMII5sghYlkQI6aAJOHFcY="; + version = "0.3.3"; + sha256 = "0pqiwcvn5c8kwqlmz4ribwwra69gbiqvz41ig4fh29hkyh078rfk"; }; meta = with lib; { license = licenses.mit; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 668d877678037..0580fc7d56ae0 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ -# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh { lib +, fetchFromGitHub , vscode-utils , jq , rust-analyzer @@ -15,14 +15,26 @@ let pname = "rust-analyzer"; publisher = "matklad"; + # Use the plugin version as in vscode marketplace, updated by update script. + inherit (vsix) version; + + releaseTag = "2021-11-29"; + + src = fetchFromGitHub { + owner = "rust-analyzer"; + repo = "rust-analyzer"; + rev = releaseTag; + sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; + }; + build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { - src = "${rust-analyzer.src}/editors/code"; + src = "${src}/editors/code"; outputs = [ "vsix" "out" ]; - releaseTag = rust-analyzer.version; + inherit releaseTag; nativeBuildInputs = [ jq moreutils esbuild @@ -46,9 +58,6 @@ let ''; }; - # Use the plugin version as in vscode marketplace, updated by update script. - inherit (vsix) version; - in vscode-utils.buildVscodeExtension { inherit version vsix; @@ -68,7 +77,7 @@ vscode-utils.buildVscodeExtension { description = "An alternative rust language server to the RLS"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix index 6f305c5d6ebb5..cfde703cd6744 100644 --- a/pkgs/os-specific/linux/greetd/default.nix +++ b/pkgs/os-specific/linux/greetd/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "greetd"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI="; + sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ="; }; - cargoHash = "sha256-YSC7osyBPwx+lo7P1ftI72mRWeQlDc2srRPzTFqVTxM="; + cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g="; nativeBuildInputs = [ scdoc diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index faeff2148e18f..1242aa8eba5a0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.257-hardened1.patch", - "sha256": "1jqd7drkjpfs9ajkvz0m0l6p0hp74ffchffcrkivqqc99cgzi666", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.257-hardened1/linux-hardened-4.14.257-hardened1.patch" + "name": "linux-hardened-4.14.258-hardened1.patch", + "sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch" }, - "sha256": "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv", - "version": "4.14.257" + "sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi", + "version": "4.14.258" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.220-hardened1.patch", - "sha256": "0i2vcwcan23h6vq9xy2fpi95saw6cgk2l2sfmy7xspkff1avhnns", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.220-hardened1/linux-hardened-4.19.220-hardened1.patch" + "name": "linux-hardened-4.19.221-hardened1.patch", + "sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch" }, - "sha256": "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq", - "version": "4.19.220" + "sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3", + "version": "4.19.221" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.84-hardened1.patch", - "sha256": "1hl213iwf3gv81w68win2z4zwbkq6vxpg3dwy9h8md3kdm9pnhzr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.84-hardened1/linux-hardened-5.10.84-hardened1.patch" + "name": "linux-hardened-5.10.87-hardened1.patch", + "sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch" }, - "sha256": "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf", - "version": "5.10.84" + "sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3", + "version": "5.10.87" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.7-hardened1.patch", - "sha256": "0s3lh59lgl5ki5wvpigiv0n3psa9k0aq058aiyxykaw36qdwahy6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.7-hardened1/linux-hardened-5.15.7-hardened1.patch" + "name": "linux-hardened-5.15.10-hardened1.patch", + "sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch" }, - "sha256": "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x", - "version": "5.15.7" + "sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8", + "version": "5.15.10" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.164-hardened1.patch", - "sha256": "1kynk3979jx7b03gkan7b92vf3719wvkdzn5dmdrliy1g5pzx87k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.164-hardened1/linux-hardened-5.4.164-hardened1.patch" + "name": "linux-hardened-5.4.167-hardened1.patch", + "sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch" }, - "sha256": "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r", - "version": "5.4.164" + "sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l", + "version": "5.4.167" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 1fd9c6f6bbb7b..3d306725075f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.257"; + version = "4.14.258"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv"; + sha256 = "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 1b649138911b2..c1247c995aa72 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.220"; + version = "4.19.221"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq"; + sha256 = "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ef4448021a286..a3c1bb1131d6a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.294"; + version = "4.4.295"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0k0h5m1ng2049d5ggrq4q81vgsfmdpkqla73vg2a3bf2v6ycjmc7"; + sha256 = "1h3i2lgm2sy325f58jildip7m6sb4hr2n9pm3gc3h2gash65kc2r"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 2b1b53adb01b8..f9c9226831e1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.292"; + version = "4.9.293"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y3b6qqv6vrh2p5wwv5bicvbqrvxf1y5xm4myy5pk6yp2igws3kd"; + sha256 = "0l64rz6ly5ls23lqq0cv98xb4z2mimp2jrsjrs6kq3zm4k2mm4gs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 43b0d7d1a3230..908b863d145ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.84"; + version = "5.10.87"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf"; + sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 603182325bb9f..38405032e0d50 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.7"; + version = "5.15.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x"; + sha256 = "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 9587229daa60f..1307286571875 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.164"; + version = "5.4.167"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r"; + sha256 = "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 98ab557cc113d..2af6db7faf38f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "495.44"; - sha256_64bit = "0j4agxfdswadxkd9hz9j5cq4q3jmhwdnvqclxxkhl5jvh5knm1zi"; - settingsSha256 = "0v8gqbhjsjjsc83cqacikj9bvs10bq6i34ca8l07zvsf8hfr2ziz"; - persistencedSha256 = "19rv7vskv61q4gh59nyrfyqyqi565wzjbcfddp8wfvng4dcy18ld"; + version = "495.46"; + sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU="; + settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk="; + persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI="; } else legacy_390; @@ -54,10 +54,10 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.86"; - sha256_64bit = "sha256:0krwcxc0j19vjnk8sv6mx1lin2rm8hcfhc2hg266846jvcws1dsg"; - settingsSha256 = "sha256:1lnj5hwmfkzs664fxlhljqy323394s1i7qzlpsjyrpm07sa93bky"; - persistencedSha256 = "sha256:0apj764zc81ayb8nm9bf7cdicfinarv0gfijy2dxynbwz2xdlyvq"; + version = "470.94"; + sha256_64bit = "lYWqKTMOutm98izjyiusICbIWpoy8D18WfcUp3mFAOs="; + settingsSha256 = "blJNKuFu/Th/ceexkKhTH/eYk8miUlTT+ESrcIyJNn0="; + persistencedSha256 = "xnccQ/EgafwnReBlk5Y7iClAj4hwXyFq9gUmwqyEuwE="; }; # Last one supporting x86 diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 5fa96c91c5ef0..ed3c0dcc7f9de 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.8"; + version = "3.3.9"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "sha256-YxTJ3XEbBgOQqUJGGsjba2PjyTudWZiH9FqXlnvlsp0="; + sha256 = "sha256-JLgnsLjswj0qus1Vd5ZtPQbbIp3dp2pI7OfQG4JrdW8="; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index a707a4b98714b..677ea7b70a190 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.4"; + version = "2.5.5"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-OMzLRgpTUIosmlAdMiNplOx/Oj28gcqamsOPJdoFkN0="; + sha256 = "sha256-Y7gYUe7vFC672f3U8QOA8NdGcZ2zGp0UjnvKFOci/vs="; stripRoot = false; }; - vendorSha256 = "sha256-BSempfKgRCj87XM8qPNEUs+sMILVS6bWwWgf7wWQviI="; + vendorSha256 = "sha256-fiODtiw7mxMshdwywW4esBYM1GEa2CS7+X80KxkzImE="; doCheck = false; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b4c1d9739efd5..33f5044cb7640 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -1,10 +1,9 @@ -{ lib, stdenv, dpkg, fetchurl }: +{ lib, stdenv, dpkg, fetchurl, zip, nixosTests }: let - generic = { version, sha256, suffix ? "" }: - stdenv.mkDerivation { + generic = { version, sha256, suffix ? "", ... } @ args: + stdenv.mkDerivation (args // { pname = "unifi-controller"; - inherit version; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb"; @@ -29,6 +28,10 @@ let runHook postInstall ''; + passthru.tests = { + unifi = nixosTests.unifi; + }; + meta = with lib; { homepage = "http://www.ubnt.com/"; description = "Controller for Ubiquiti UniFi access points"; @@ -36,7 +39,7 @@ let platforms = platforms.unix; maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; }; - }; + }); in rec { # see https://community.ui.com/releases / https://www.ui.com/download/unifi @@ -49,6 +52,11 @@ in rec { unifi5 = generic { version = "5.14.23"; sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; + + postInstall = '' + # Remove when log4j is updated to 2.12.2 or 2.16.0. + ${zip}/bin/zip -q -d $out/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class + ''; }; unifi6 = generic { diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index d5ecdf2f5d41f..5a511da72a480 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -4,13 +4,13 @@ let sources = { - "@financial-times/polyfill-useragent-normaliser-1.10.0" = { + "@financial-times/polyfill-useragent-normaliser-1.10.1" = { name = "_at_financial-times_slash_polyfill-useragent-normaliser"; packageName = "@financial-times/polyfill-useragent-normaliser"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.0.tgz"; - sha512 = "OQYm8qoegUzHZgpNjw0QSmcoH8Tu+fbY9/wTOqbK/2lj3qWNZpGdBimTV1qp8xwF+SVyL2vNzZEjTxSlbjNOSA=="; + url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.1.tgz"; + sha512 = "u+VCD2ISgkh6eoxdyb0L8bTApdU8t3fvHLS9ZXokC02b8iQD8nkRcpui5BIbuF+aYkWkTpaJhUInCueAGDBVAw=="; }; }; "@financial-times/useragent_parser-1.6.0" = { @@ -22,103 +22,13 @@ let sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g=="; }; }; - "@formatjs/ecma402-abstract-1.8.0" = { - name = "_at_formatjs_slash_ecma402-abstract"; - packageName = "@formatjs/ecma402-abstract"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.8.0.tgz"; - sha512 = "X+nxZcIQr0YfYNtw1ZkHjN3YSyi0fEmdAJqRzk24KwNvqLv7GmVfw70mf7ADnwOvkcrSaAdx24GfAqckGTv9ww=="; - }; - }; - "@formatjs/intl-datetimeformat-4.1.0" = { - name = "_at_formatjs_slash_intl-datetimeformat"; - packageName = "@formatjs/intl-datetimeformat"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-4.1.0.tgz"; - sha512 = "rEAPnIIsiOpjXMqoMdxClJ4Q2uhKTN1WH2fQUCJrg4FYdqfevJeymSowdLcOi1AYARIoTXTmlqS8pHIJx62VEw=="; - }; - }; - "@formatjs/intl-displaynames-5.1.0" = { - name = "_at_formatjs_slash_intl-displaynames"; - packageName = "@formatjs/intl-displaynames"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.1.0.tgz"; - sha512 = "2pwIlHcNBZ281ySsz/E6JURVDxWsIxHn/HyxmylxBQMeW2HeFq1YuP6ycAxSMfp+EtWAN4v8TgWJQM+YBI22FA=="; - }; - }; - "@formatjs/intl-getcanonicallocales-1.6.0" = { - name = "_at_formatjs_slash_intl-getcanonicallocales"; - packageName = "@formatjs/intl-getcanonicallocales"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.6.0.tgz"; - sha512 = "1967VujZeow0K0NpzerdNOaskcE0KwnnchxT8TzlkLs4RjXx7Uz0bjQPtUYGV7kvbgMJ9qb6tWmCqIwe3sBKUw=="; - }; - }; - "@formatjs/intl-listformat-6.1.0" = { - name = "_at_formatjs_slash_intl-listformat"; - packageName = "@formatjs/intl-listformat"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.1.0.tgz"; - sha512 = "NsDKO0U1mVFZmoyZ0ztFL+biqztDKv1qdSvPA1S5yOYZddDy6G9SpnBZgNjhxUFIBqycNW95ibO/jrI5Ou4s5Q=="; - }; - }; - "@formatjs/intl-locale-2.4.26" = { - name = "_at_formatjs_slash_intl-locale"; - packageName = "@formatjs/intl-locale"; - version = "2.4.26"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.26.tgz"; - sha512 = "f5NyHb5qdfA0oO2IGLhNU0k9BWq8xI26VqxzZqjTfEKnn8xJ+SBE9drwRfTqlRz6pmvztPmkDg3FSflmGdDKGw=="; - }; - }; - "@formatjs/intl-numberformat-7.1.0" = { - name = "_at_formatjs_slash_intl-numberformat"; - packageName = "@formatjs/intl-numberformat"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-7.1.0.tgz"; - sha512 = "zwjacMSn+Ide2RXK2PN0veB7N7ay10tQ1Pb8eXeMB7zjRjJXHROi8O1ZA0dpJid0lw/5+5G2/lEdYvsPWLkaZA=="; - }; - }; - "@formatjs/intl-pluralrules-4.0.20" = { - name = "_at_formatjs_slash_intl-pluralrules"; - packageName = "@formatjs/intl-pluralrules"; - version = "4.0.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.20.tgz"; - sha512 = "ayyjvIh9ShXQxo0Y9GhUTyW9zyB3jiBFRIEhMmGowpIlTVRhOwl57XZ+YuUgo/yCvtJqnvGPu/4/fQTouxHuGw=="; - }; - }; - "@formatjs/intl-relativetimeformat-9.1.0" = { - name = "_at_formatjs_slash_intl-relativetimeformat"; - packageName = "@formatjs/intl-relativetimeformat"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-9.1.0.tgz"; - sha512 = "F4HmAk/ZYy9VNbrNOayGfPKEnj2ey6M9kMKf+UKL6QL21FOxLyY6e4okSG6VbAjZ0cYgKvEiNDjSuWP86qSo0g=="; - }; - }; - "@juggle/resize-observer-3.3.1" = { - name = "_at_juggle_slash_resize-observer"; - packageName = "@juggle/resize-observer"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz"; - sha512 = "zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="; - }; - }; - "@types/component-emitter-1.2.10" = { + "@types/component-emitter-1.2.11" = { name = "_at_types_slash_component-emitter"; packageName = "@types/component-emitter"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; - sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz"; + sha512 = "SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="; }; }; "@types/cookie-0.4.1" = { @@ -139,40 +49,13 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/node-16.4.11" = { + "@types/node-17.0.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.11.tgz"; - sha512 = "nWSFUbuNiPKJEe1IViuodSI+9cM+vpM8SWF/O6dJK7wmGRNq55U7XavJHrlRrPkSMuUZUFzg1xaZ1B+ZZCrRWw=="; - }; - }; - "@webcomponents/template-1.5.0" = { - name = "_at_webcomponents_slash_template"; - packageName = "@webcomponents/template"; - version = "1.5.0"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.5.0.tgz"; - sha512 = "DPQgBAedzjsFD7rgv7b6OKmpHq5VTBUCLmYfDiov2FC2C79QGaz+4iNmlVAem5iSicvN8DWTwU1kZ48XYLtuqg=="; - }; - }; - "Base64-1.1.0" = { - name = "Base64"; - packageName = "Base64"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/Base64/-/Base64-1.1.0.tgz"; - sha512 = "qeacf8dvGpf+XAT27ESHMh7z84uRzj/ua2pQdJg483m3bEXv/kVFtDnMgvf70BQGqzbZhR9t6BmASzKvqfJf3Q=="; - }; - }; - "abort-controller-3.0.0" = { - name = "abort-controller"; - packageName = "abort-controller"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz"; + sha512 = "eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw=="; }; }; "accept-language-parser-1.5.0" = { @@ -193,49 +76,22 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "async-mutex-0.3.1" = { + "async-mutex-0.3.2" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.1.tgz"; - sha512 = "vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw=="; - }; - }; - "audio-context-polyfill-1.0.0" = { - name = "audio-context-polyfill"; - packageName = "audio-context-polyfill"; - version = "1.0.0"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/audio-context-polyfill/-/audio-context-polyfill-1.0.0.tgz"; - sha1 = "4b728faf0a19555194d4fbd05582f833fdcd137b"; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz"; + sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA=="; }; }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-arraybuffer-0.1.4" = { + "base64-arraybuffer-1.0.1" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; - version = "0.1.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; - sha1 = "9818c79e059b1355f97e0428a017c838e90ba812"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz"; + sha512 = "vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="; }; }; "base64id-2.0.0" = { @@ -247,51 +103,6 @@ let sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; }; }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "cldr-core-38.1.0" = { - name = "cldr-core"; - packageName = "cldr-core"; - version = "38.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.1.0.tgz"; - sha512 = "Da9xKjDp4qGGIX0VDsBqTan09iR5nuYD2a/KkfEaUyqKhu6wFVNRiCpPDXeRbpVwPBY6PgemV8WiHatMhcpy4A=="; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; "component-emitter-1.3.0" = { name = "component-emitter"; packageName = "component-emitter"; @@ -301,15 +112,6 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; "cookie-0.4.1" = { name = "cookie"; packageName = "cookie"; @@ -319,13 +121,13 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; - "core-util-is-1.0.2" = { + "core-util-is-1.0.3" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; "cors-2.8.5" = { @@ -337,15 +139,6 @@ let sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; }; }; - "current-script-polyfill-1.0.0" = { - name = "current-script-polyfill"; - packageName = "current-script-polyfill"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz"; - sha1 = "f31cf7e4f3e218b0726e738ca92a02d3488ef615"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -355,40 +148,13 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.1.1" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; "depd-1.1.2" = { @@ -409,15 +175,6 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "diff-4.0.2" = { - name = "diff"; - packageName = "diff"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; - }; - }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -436,22 +193,22 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "engine.io-5.1.1" = { + "engine.io-6.1.0" = { name = "engine.io"; packageName = "engine.io"; - version = "5.1.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; - sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz"; + sha512 = "ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw=="; }; }; - "engine.io-parser-4.0.2" = { + "engine.io-parser-5.0.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "4.0.2"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; - sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.2.tgz"; + sha512 = "wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g=="; }; }; "escape-html-1.0.3" = { @@ -472,33 +229,6 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-source-polyfill-1.0.24" = { - name = "event-source-polyfill"; - packageName = "event-source-polyfill"; - version = "1.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.24.tgz"; - sha512 = "aEtMhrH5ww3X6RgbsNcwu0whw8zjOoeRnwPqRKqKuxWS5KlAZhCY+rTm6wMlHOXbxmLGn8lW6Xox7rfpBExzGA=="; - }; - }; - "event-target-shim-5.0.1" = { - name = "event-target-shim"; - packageName = "event-target-shim"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; - }; - }; - "fastestsmallesttextencoderdecoder-1.0.22" = { - name = "fastestsmallesttextencoderdecoder"; - packageName = "fastestsmallesttextencoderdecoder"; - version = "1.0.22"; - src = fetchurl { - url = "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz"; - sha512 = "Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="; - }; - }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -526,31 +256,13 @@ let sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a"; }; }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "glob-7.1.7" = { - name = "glob"; - packageName = "glob"; - version = "7.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; - }; - }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "handlebars-4.7.7" = { @@ -562,31 +274,13 @@ let sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; - "html5shiv-3.7.3" = { - name = "html5shiv"; - packageName = "html5shiv"; - version = "3.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz"; - sha1 = "d78a84a367bcb9a710100d57802c387b084631d2"; - }; - }; - "http-errors-1.7.3" = { + "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; "inherits-2.0.4" = { @@ -598,42 +292,6 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ip-regex-2.1.0" = { - name = "ip-regex"; - packageName = "ip-regex"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - }; - "is-url-1.2.4" = { - name = "is-url"; - packageName = "is-url"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; - sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; - }; - }; - "is2-2.0.1" = { - name = "is2"; - packageName = "is2"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is2/-/is2-2.0.1.tgz"; - sha512 = "+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA=="; - }; - }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -643,51 +301,6 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-polyfills-0.1.43" = { - name = "js-polyfills"; - packageName = "js-polyfills"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/js-polyfills/-/js-polyfills-0.1.43.tgz"; - sha512 = "wWCJcw7uMA12uk7qcqZlIQy9nj+Evh1wVUmn5MOlJ7GPC8HT5PLjB9Uiqjw9ldAbbOuNOWJ6ENb7NwU6qqf48g=="; - }; - }; - "json3-3.3.3" = { - name = "json3"; - packageName = "json3"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -715,31 +328,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.49.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.49.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; - sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.32" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; - sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "minimist-1.2.5" = { @@ -751,22 +355,13 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "mnemonist-0.38.3" = { + "mnemonist-0.38.5" = { name = "mnemonist"; packageName = "mnemonist"; - version = "0.38.3"; + version = "0.38.5"; src = fetchurl { - url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.3.tgz"; - sha512 = "2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw=="; + url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz"; + sha512 = "bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg=="; }; }; "ms-2.0.0" = { @@ -778,15 +373,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - }; "ms-2.1.2" = { name = "ms"; packageName = "ms"; @@ -805,15 +391,6 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mutationobserver-shim-0.3.7" = { - name = "mutationobserver-shim"; - packageName = "mutationobserver-shim"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"; - sha512 = "oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ=="; - }; - }; "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; @@ -841,13 +418,13 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "obliterator-1.6.1" = { + "obliterator-2.0.1" = { name = "obliterator"; packageName = "obliterator"; - version = "1.6.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; - sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + url = "https://registry.npmjs.org/obliterator/-/obliterator-2.0.1.tgz"; + sha512 = "XnkiCrrBcIZQitJPAI36mrrpEUvatbte8hLcTcQwKA1v9NkCKasSi+UAguLsLDs/out7MoRzAlmz7VXvY6ph6w=="; }; }; "on-finished-2.3.0" = { @@ -859,15 +436,6 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -877,31 +445,13 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "picturefill-3.0.3" = { - name = "picturefill"; - packageName = "picturefill"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz"; - sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; - }; - }; - "polyfill-library-3.107.1" = { + "polyfill-library-3.110.1" = { name = "polyfill-library"; packageName = "polyfill-library"; - version = "3.107.1"; + version = "3.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.107.1.tgz"; - sha512 = "HrN61Tp8Wjz1xcmYmstm0m6ySeiVSVqadDFhFMZmoiWlRoPQRfdeVWv88IqZKmxYITZ85z26wmOJdGYrGs6tjw=="; + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.110.1.tgz"; + sha512 = "OTgQPd6If8DQSrAXcFU2soHXrCHAJpGkBgWRSqEEcydauxzmuU3T1s15wOPfSd1gj8mXbiIrPaDndt0zy4hFTA=="; }; }; "process-nextick-args-2.0.1" = { @@ -940,33 +490,6 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -976,15 +499,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "seamless-scroll-polyfill-1.2.3" = { - name = "seamless-scroll-polyfill"; - packageName = "seamless-scroll-polyfill"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/seamless-scroll-polyfill/-/seamless-scroll-polyfill-1.2.3.tgz"; - sha512 = "emnwZtu6NrlBlvT6HrlbAOs024JX4orWew8H5owBOyUJ7eFXn8lGe4bsXTBD6AAWzP/p7LL86AjVIH8Apqec5w=="; - }; - }; "semver-7.3.5" = { name = "semver"; packageName = "semver"; @@ -994,49 +508,49 @@ let sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "send-0.17.1" = { + "send-0.17.2" = { name = "send"; packageName = "send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; - "serve-static-1.14.1" = { + "serve-static-1.14.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; - "setprototypeof-1.1.1" = { + "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "socket.io-4.1.3" = { + "socket.io-4.4.0" = { name = "socket.io"; packageName = "socket.io"; - version = "4.1.3"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; - sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz"; + sha512 = "bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ=="; }; }; - "socket.io-adapter-2.3.1" = { + "socket.io-adapter-2.3.3" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz"; - sha512 = "8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz"; + sha512 = "Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="; }; }; "socket.io-parser-4.0.4" = { @@ -1048,15 +562,6 @@ let sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -1066,15 +571,6 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "spdx-licenses-1.0.0" = { - name = "spdx-licenses"; - packageName = "spdx-licenses"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-licenses/-/spdx-licenses-1.0.0.tgz"; - sha512 = "BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw=="; - }; - }; "statsd-client-0.4.7" = { name = "statsd-client"; packageName = "statsd-client"; @@ -1120,13 +616,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "toidentifier-1.0.0" = { + "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; "toposort-2.0.2" = { @@ -1138,58 +634,22 @@ let sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; }; - "tslib-2.3.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; - sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; - }; - }; - "uglify-js-2.8.29" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.29"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; - sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; - "uglify-js-3.14.1" = { + "uglify-js-3.14.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.1"; + version = "3.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; - sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "unorm-1.6.0" = { - name = "unorm"; - packageName = "unorm"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz"; - sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="; - }; - }; - "usertiming-0.1.8" = { - name = "usertiming"; - packageName = "usertiming"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/usertiming/-/usertiming-0.1.8.tgz"; - sha1 = "35378e7f41a248d40e658d05f80423469a7b0650"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; + sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; }; }; "util-deprecate-1.0.2" = { @@ -1210,51 +670,6 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "web-animations-js-2.3.2" = { - name = "web-animations-js"; - packageName = "web-animations-js"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz"; - sha512 = "TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="; - }; - }; - "whatwg-fetch-3.6.2" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - }; - "wicg-inert-3.1.1" = { - name = "wicg-inert"; - packageName = "wicg-inert"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.1.tgz"; - sha512 = "PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A=="; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; "wordwrap-1.0.0" = { name = "wordwrap"; packageName = "wordwrap"; @@ -1264,31 +679,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "ws-7.4.6" = { + "ws-8.2.3" = { name = "ws"; packageName = "ws"; - version = "7.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"; - sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; - }; - }; - "yaku-1.0.1" = { - name = "yaku"; - packageName = "yaku"; - version = "1.0.1"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/yaku/-/yaku-1.0.1.tgz"; - sha512 = "uZCrhA5DEytGnFfw9XZKIoWRG43v6oCA20vInFS4anPJb3G5Hy+PKuaKSMTJ+aChvFdNDxY5K8jFx5wmlLbTjQ=="; + url = "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz"; + sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; }; "yallist-4.0.0" = { @@ -1300,198 +697,112 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; }; in { - "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.14.6" = nodeEnv.buildNodePackage { + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.16.0" = nodeEnv.buildNodePackage { name = "whitebophir"; packageName = "whitebophir"; - version = "1.14.6"; + version = "1.16.0"; src = fetchgit { url = "https://github.com/lovasoa/whitebophir.git"; - rev = "37d1d6811af911739d57520dc20dae6cac154464"; - sha256 = "bda4e0077ef64861146e073c91b7488edfc0290f37478da6563e9ea16e6e4824"; + rev = "8a3997b26419b3d510ad92c18071c4ce007b0081"; + sha256 = "8aab3d89c72589d60f956f83a8e33d9d52a5b4da3c13004f9ab75b6dcbdaadcc"; }; dependencies = [ - sources."@financial-times/polyfill-useragent-normaliser-1.10.0" + sources."@financial-times/polyfill-useragent-normaliser-1.10.1" sources."@financial-times/useragent_parser-1.6.0" - sources."@formatjs/ecma402-abstract-1.8.0" - sources."@formatjs/intl-datetimeformat-4.1.0" - sources."@formatjs/intl-displaynames-5.1.0" - sources."@formatjs/intl-getcanonicallocales-1.6.0" - sources."@formatjs/intl-listformat-6.1.0" - sources."@formatjs/intl-locale-2.4.26" - sources."@formatjs/intl-numberformat-7.1.0" - sources."@formatjs/intl-pluralrules-4.0.20" - sources."@formatjs/intl-relativetimeformat-9.1.0" - sources."@juggle/resize-observer-3.3.1" - sources."@types/component-emitter-1.2.10" + sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.11" - sources."@webcomponents/template-1.5.0" - sources."Base64-1.1.0" - sources."abort-controller-3.0.0" + sources."@types/node-17.0.0" sources."accept-language-parser-1.5.0" sources."accepts-1.3.7" - sources."align-text-0.1.4" - sources."async-mutex-0.3.1" - sources."audio-context-polyfill-1.0.0" - sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" + sources."async-mutex-0.3.2" + sources."base64-arraybuffer-1.0.1" sources."base64id-2.0.0" - sources."brace-expansion-1.1.11" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" - sources."cldr-core-38.1.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" sources."cookie-0.4.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" - sources."current-script-polyfill-1.0.0" - sources."debug-4.1.1" - sources."decamelize-1.2.0" - sources."deep-is-0.1.3" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diff-4.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-5.1.1" // { + (sources."engine.io-6.1.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.2" + sources."engine.io-parser-5.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-source-polyfill-1.0.24" - sources."event-target-shim-5.0.1" - sources."fastestsmallesttextencoderdecoder-1.0.22" sources."fresh-0.5.2" sources."from2-2.3.0" sources."from2-string-1.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" - sources."html5shiv-3.7.3" - sources."http-errors-1.7.3" - sources."inflight-1.0.6" + sources."http-errors-1.8.1" sources."inherits-2.0.4" - sources."ip-regex-2.1.0" - sources."is-buffer-1.1.6" - sources."is-url-1.2.4" - sources."is2-2.0.1" sources."isarray-1.0.0" - sources."js-polyfills-0.1.43" - sources."json3-3.3.3" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."longest-1.0.1" sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" - sources."minimatch-3.0.4" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.5" - sources."mkdirp-1.0.4" - sources."mnemonist-0.38.3" + sources."mnemonist-0.38.5" sources."ms-2.1.3" - sources."mutationobserver-shim-0.3.7" sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."object-assign-4.1.1" - sources."obliterator-1.6.1" + sources."obliterator-2.0.1" sources."on-finished-2.3.0" - sources."once-1.4.0" sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."picturefill-3.0.3" - (sources."polyfill-library-3.107.1" // { - dependencies = [ - sources."source-map-0.5.7" - sources."uglify-js-2.8.29" - ]; - }) + sources."polyfill-library-3.110.1" sources."process-nextick-args-2.0.1" sources."promise-polyfill-1.1.6" sources."range-parser-1.2.1" sources."readable-stream-2.3.7" - sources."repeat-string-1.6.1" - sources."right-align-0.1.3" - sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."seamless-scroll-polyfill-1.2.3" sources."semver-7.3.5" - (sources."send-0.17.1" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.1" - ]; - }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" - (sources."socket.io-4.1.3" // { + sources."send-0.17.2" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" + (sources."socket.io-4.4.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.3.1" + sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."source-map-0.6.1" - sources."spdx-licenses-1.0.0" sources."statsd-client-0.4.7" sources."statuses-1.5.0" sources."stream-from-promise-1.0.0" sources."stream-to-string-1.2.0" sources."string_decoder-1.1.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."toposort-2.0.2" - sources."tslib-2.3.0" - sources."uglify-js-3.14.1" - sources."uglify-to-browserify-1.0.2" - sources."unorm-1.6.0" - sources."usertiming-0.1.8" + sources."tslib-2.3.1" + sources."uglify-js-3.14.5" sources."util-deprecate-1.0.2" sources."vary-1.1.2" - sources."web-animations-js-2.3.2" - sources."whatwg-fetch-3.6.2" - sources."wicg-inert-3.1.1" - sources."window-size-0.1.0" sources."wordwrap-1.0.0" - sources."wrappy-1.0.2" - sources."ws-7.4.6" - sources."yaku-1.0.1" + sources."ws-8.2.3" sources."yallist-4.0.0" - sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.json b/pkgs/servers/web-apps/whitebophir/node-packages.json index 72eabcc7ec119..0d0615804f5a1 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.json +++ b/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -1,3 +1,3 @@ [ - { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.14.6" } + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.16.0" } ] diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index 126ed8e67c610..9946d7d0c3a5c 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { #TODO:doc output meta = with lib; { - homepage = "https://github.com/zdharma/zinit"; + homepage = "https://github.com/zdharma-continuum/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; maintainers = with maintainers; [ pasqui23 sei40kr ]; diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 11fe1a20a1956..e1e5c36ee8bcc 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -6,6 +6,7 @@ , fpc , lazarus-qt , wrapQtAppsHook +, breeze-qt5 , libGL , libGLU , libqt5pas @@ -37,13 +38,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - sha256 = "sha256-LdpgEfCNbf0/sY8v8D3KiapYEd23tVy4nQ7RuGwl7jM="; + sha256 = "sha256-oXkGrMHjs8uui0pzGYW8jnttet/5IX0r8eat0n5saFk="; }; outputs = [ "out" "man" ]; @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + breeze-qt5 libGL libGLU libqt5pas diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 86f31a68dc707..17ba9ed1140ed 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index 537491b..744f604 100644 +index 97a088d..4c42414 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -5011,7 +5011,7 @@ begin +@@ -5007,7 +5007,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index 537491b..744f604 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -5020,7 +5020,7 @@ begin +@@ -5016,7 +5016,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index 537491b..744f604 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -5029,7 +5029,7 @@ begin +@@ -5025,7 +5025,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index 537491b..744f604 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -5038,7 +5038,7 @@ begin +@@ -5034,7 +5034,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 5473fa0e78ce2..a6c2ca77c5a76 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.5"; + version = "2.29.6"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-eIqq4ehUB4lF89ikrHeN5Akq14nxYMxREZzPSVnv+nU="; + sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/tools/misc/fbcat/default.nix index 532d87de669f6..d90ec77b6d5e4 100644 --- a/pkgs/tools/misc/fbcat/default.nix +++ b/pkgs/tools/misc/fbcat/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub } : +{ lib +, stdenv +, fetchFromGitHub +, netpbm +}: stdenv.mkDerivation rec { pname = "fbcat"; @@ -11,17 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk="; }; - # hardcoded because makefile target "install" depends on libxslt dependencies from network - # that are just too hard to monkeypatch here - # so this is the simple fix. - installPhase = '' - mkdir -p $out - install -d $out/bin - install -m755 fbcat $out/bin/ - install -m755 fbgrab $out/bin/ - install -d $out/share/man/man1 + postPatch = '' + substituteInPlace fbgrab \ + --replace 'pnmtopng' '${netpbm}/bin/pnmtopng' \ + --replace 'fbcat' "$out/bin/fbcat" ''; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + meta = with lib; { homepage = "http://jwilk.net/software/fbcat"; description = "Framebuffer screenshot tool"; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 5ba4164346f66..3ee4de082bd38 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.18"; + version = "0.9.19"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-8ALY3dsUEJxGsDnYTOxNAmJbwmmZIV8GuHjNg0vPFUQ="; + sha256 = "sha256-0ZA8Op1IMZMJ7g1waK2uOYOCDfqPfiqnnjopGtBW1w8="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 20869ac4d7928..cce7cbb36c6bd 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.06.06"; + version = "2021.12.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw"; + sha256 = "sha256-nzuZyLd4RVFltFJfIVBehsf/Vl86wxnhlzPYEBlBNd8="; }; patches = [ diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index b37b98d7efc6d..5990eae184097 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, fetchurl, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests -, assetOverrides ? {} +{ lib, fetchFromGitHub, fetchurl, symlinkJoin, buildGoModule, runCommand, makeWrapper, nixosTests +, v2ray-geoip, v2ray-domain-list-community, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: let @@ -14,30 +14,10 @@ let vendorSha256 = "sha256-7zSIAKcMwtaTvokKuLJ8orqJc2jGuaw5FglEJadeZ9I="; - assets = { - # MIT licensed - "geoip.dat" = let - geoipRev = "202109300030"; - geoipSha256 = "1d2z3ljs0v9rd10cfj8cpiijz3ikkplsymr44f7y90g4dmniwqh0"; - in fetchurl { - url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; - sha256 = geoipSha256; - }; - - # MIT licensed - "geosite.dat" = let - geositeRev = "20211001023210"; - geositeSha256 = "02d55i1pdndwvmi4v42hnncjng517s0k06gr3yn5krnj2qfjli2w"; - in fetchurl { - url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; - sha256 = geositeSha256; - }; - - } // assetOverrides; - - assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { - inherit name path; - }) assets); + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; core = buildGoModule rec { pname = "v2ray-core"; @@ -84,6 +64,6 @@ in runCommand "v2ray-${version}" { } '' for file in ${core}/bin/*; do makeWrapper "$file" "$out/bin/$(basename "$file")" \ - --set-default V2RAY_LOCATION_ASSET ${assetsDrv} + --set-default V2RAY_LOCATION_ASSET ${assetsDrv}/share/v2ray done '' diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh index f645b8ea09396..9b8e4cef13a48 100755 --- a/pkgs/tools/networking/v2ray/update.sh +++ b/pkgs/tools/networking/v2ray/update.sh @@ -8,10 +8,8 @@ deps_nix=./deps.nix nixpkgs=../../../.. old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix") -old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix") -old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix") echo "Current version:" >&2 -echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2 +echo "core: $old_core_rev" >&2 function fetch_latest_rev { curl "https://api.github.com/repos/v2fly/$1/releases" | @@ -20,10 +18,8 @@ function fetch_latest_rev { core_rev=$(fetch_latest_rev 'v2ray-core') core_rev=${core_rev:1} -geoip_rev=$(fetch_latest_rev 'geoip') -geosite_rev=$(fetch_latest_rev 'domain-list-community') echo "Latest version:" >&2 -echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2 +echo "core: $core_rev" >&2 if [[ $core_rev != $old_core_rev ]]; then echo "Prefetching core..." >&2 @@ -38,24 +34,6 @@ if [[ $core_rev != $old_core_rev ]]; then "$version_nix" fi -if [[ $geoip_rev != $old_geoip_rev ]]; then - echo "Prefetching geoip..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat") - sed --in-place \ - -e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \ - -e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \ - "$version_nix" -fi - -if [[ $geosite_rev != $old_geosite_rev ]]; then - echo "Prefetching geosite..." >&2 - hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat") - sed --in-place \ - -e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \ - -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \ - "$version_nix" -fi - echo "Prebuilding..." >&2 set +o pipefail vendorSha256=$( diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/tools/security/gosh/default.nix index 5c5ad25e6d9e4..20cdd25e72849 100644 --- a/pkgs/tools/security/gosh/default.nix +++ b/pkgs/tools/security/gosh/default.nix @@ -26,6 +26,6 @@ buildGoModule rec { description = "Reverse/bind shell generator"; homepage = "https://github.com/redcode-labs/GoSH"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; }; } diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index ae42d0390bf8d..8241851d53281 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.26.1"; + version = "0.27.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+b+Fb5nUBLSGeZ+ZUpvcZ+jOIotskXEPFoaQ48ob34="; + sha256 = "sha256-W1HP+bzsLY8SaZQK+H33mibM7lfxoGnKnOvsStwzv4E="; }; - vendorSha256 = "sha256-w4mN9O5FKZNCksS8OwF3Ty9c1V552MAbMhqisQDK9GY="; + vendorSha256 = "sha256-IwEQkdspSjdlm4siwhaBZsIaRz8oKKG6d6PAK1MvHlw="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix new file mode 100644 index 0000000000000..4ae3f800e6afa --- /dev/null +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "log4j-sniffer"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "palantir"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5KoZ0QiHqyy0Zn1K0kLCYAaszD6hkng260WYSeZN0Ac="; + }; + + vendorSha256 = null; + + checkInputs = [ + git + ]; + + preCheck = '' + export HOME=$(mktemp -d); + cd $HOME + git init + ''; + + meta = with lib; { + description = "Tool that scans archives to check for vulnerable log4j versions"; + homepage = "https://github.com/palantir/log4j-sniffer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sammler/default.nix b/pkgs/tools/security/sammler/default.nix index f5bfab987a17b..f9567147e4e60 100644 --- a/pkgs/tools/security/sammler/default.nix +++ b/pkgs/tools/security/sammler/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { description = "Tool to extract useful data from documents"; homepage = "https://github.com/redcode-labs/Sammler"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; }; } diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/tools/security/snowcrash/default.nix index cd85ff90bf910..18325e4094a34 100644 --- a/pkgs/tools/security/snowcrash/default.nix +++ b/pkgs/tools/security/snowcrash/default.nix @@ -28,6 +28,6 @@ buildGoModule rec { description = "Polyglot payload generator"; homepage = "https://github.com/redcode-labs/SNOWCRASH"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; }; } diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d6cc09acb7987..a4f4f830c4725 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.8"; + version = "0.4.6.9"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0sj7qn6d6js6gk4vjfkc7p9g021czbfaq00yfq3mn5ycnhvimkhm"; + sha256 = "1ad99k4wysxrnlaprv7brxr2nc0h5zdnrh0rma10pqlck2037sf7"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 46a1fdfd8d3ef..c49d662a0229c 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchFromGitHub , attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib }: stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.13.03"; + version = "0.13.08"; - src = fetchurl { - url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PmDWBeN42GqFkaMNblV77XCdgqWxlhY3gALNj/ADeos="; + src = fetchFromGitHub { + owner = "ColinIanKing"; + repo = pname; + rev = "V${version}"; + sha256 = "sha256-LHGtx7H8Cv9ZM5hRNrC1mjsl1k9lNx/5k7V8lqvJ7yw="; }; postPatch = '' @@ -62,9 +64,9 @@ stdenv.mkDerivation rec { hardware. However, it has never been intended to be used as a precise benchmark test suite, so do NOT use it in this manner. ''; - homepage = "https://kernel.ubuntu.com/~cking/stress-ng/"; - downloadPage = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/"; - changelog = "https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/debian/changelog?h=V${version}"; + homepage = "https://github.com/ColinIanKing/stress-ng"; + downloadPage = "https://github.com/ColinIanKing/stress-ng/tags"; + changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index aaea9090b72ef..e29447011bc30 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.12"; + version = "1.9.13"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0"; + sha256 = "sha256-wAqH3BKNYbOXMbnaRhz4QZ/49stxC2Qf+yatKBv0i68="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index c1f04616729c8..354ac0af01729 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -2,13 +2,13 @@ let pname = "pdftk"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitLab { owner = "pdftk-java"; repo = "pdftk"; rev = "v${version}"; - sha256 = "056db8rjczdfkq7fm3bv5g15y042rc9hb4zh5qccjrdw630vk9y4"; + sha256 = "1bah0y7nj4r0xwj74lxixhcsc51c93s6m6agkgciv4p1z69y0m66"; }; deps = stdenv.mkDerivation { @@ -32,7 +32,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0p59myc5m3ds7fh0zdz3n7l7hx6dj8bpyqxzlhdrqybsyxwpw4w3"; + outputHash = "06i2la72ag26phlcl52qnjnkscg6adyydwbdylnwbij73q5g15v4"; }; # Point to our local deps repo diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 301afaac82ee9..4bd1380e027dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3381,7 +3381,9 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - meson = callPackage ../development/tools/build-managers/meson { }; + # TODO: call a sprintable to deprecate Meson 0.57 as soon as possible + meson = callPackage ../development/tools/build-managers/meson/0.57 { }; + meson_0_60 = callPackage ../development/tools/build-managers/meson/0.60 { }; meson-tools = callPackage ../misc/meson-tools { }; @@ -6008,6 +6010,7 @@ with pkgs; goverlay = callPackage ../tools/graphics/goverlay { inherit (qt5) wrapQtAppsHook; + inherit (plasma5Packages) breeze-qt5; }; gpart = callPackage ../tools/filesystems/gpart { }; @@ -7480,6 +7483,8 @@ with pkgs; log4j-scan = callPackage ../tools/security/log4j-scan { }; + log4j-sniffer = callPackage ../tools/security/log4j-sniffer { }; + log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { }; log4jcheck = callPackage ../tools/security/log4jcheck { }; @@ -7673,9 +7678,7 @@ with pkgs; mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { - gtk2 = null; - }; + mednaffe = callPackage ../misc/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -8512,7 +8515,7 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; - pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { }; + pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; paperless-ng = callPackage ../applications/office/paperless-ng { }; @@ -10994,6 +10997,8 @@ with pkgs; chase = callPackage ../tools/system/chase { }; + wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; + wimlib = callPackage ../tools/archivers/wimlib { }; wipe = callPackage ../tools/security/wipe { }; @@ -29485,8 +29490,6 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; - xdg-desktop-portal-pantheon = callPackage ../development/libraries/xdg-desktop-portal-pantheon { }; - xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b56c7119a3104..14b4f9fd6653e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2877,6 +2877,8 @@ in { flask-seasurf = callPackage ../development/python-modules/flask-seasurf { }; + flask-session = callPackage ../development/python-modules/flask-session { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; flask-socketio = callPackage ../development/python-modules/flask-socketio { }; @@ -9390,6 +9392,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; + protobuf-core = pkgs.protobuf; + protobuf-python = self.protobuf; lmdb-core = pkgs.lmdb; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index df66908d51356..64e8abd224b6a 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -396,6 +396,8 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; + platformdirs = callPackage ../development/python-modules/platformdirs/2.nix { }; + pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; postorius = disabled super.postorius; |