diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c6c5db0c0d3..0aa94408de9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2272,6 +2272,7 @@ fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; }]; name = "ckie"; + matrix = "@ckie:ckie.dev"; }; clkamp = { email = "c@lkamp.de"; @@ -6834,12 +6835,6 @@ githubId = 99639; name = "Pawel Kruszewski"; }; - ktosiek = { - email = "tomasz.kontusz@gmail.com"; - github = "ktosiek"; - githubId = 278013; - name = "Tomasz Kontusz"; - }; kubukoz = { email = "kubukoz@gmail.com"; github = "kubukoz"; diff --git a/nixos/doc/manual/administration/declarative-containers.section.md b/nixos/doc/manual/administration/declarative-containers.section.md index 0d9d4017ed8..00fd244bb91 100644 --- a/nixos/doc/manual/administration/declarative-containers.section.md +++ b/nixos/doc/manual/administration/declarative-containers.section.md @@ -40,7 +40,7 @@ section for details on container networking.) To disable the container, just remove it from `configuration.nix` and run `nixos-rebuild switch`. Note that this will not delete the root directory of the -container in `/var/lib/containers`. Containers can be destroyed using +container in `/var/lib/nixos-containers`. Containers can be destroyed using the imperative method: `nixos-container destroy foo`. Declarative containers can be started and stopped using the diff --git a/nixos/doc/manual/administration/imperative-containers.section.md b/nixos/doc/manual/administration/imperative-containers.section.md index 05196bf5d81..f45991780c4 100644 --- a/nixos/doc/manual/administration/imperative-containers.section.md +++ b/nixos/doc/manual/administration/imperative-containers.section.md @@ -10,8 +10,8 @@ You create a container with identifier `foo` as follows: # nixos-container create foo ``` -This creates the container's root directory in `/var/lib/containers/foo` -and a small configuration file in `/etc/containers/foo.conf`. It also +This creates the container's root directory in `/var/lib/nixos-containers/foo` +and a small configuration file in `/etc/nixos-containers/foo.conf`. It also builds the container's initial system configuration and stores it in `/nix/var/nix/profiles/per-container/foo/system`. You can modify the initial configuration of the container on the command line. For diff --git a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml index 7b35520d567..b8179dca1f8 100644 --- a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml +++ b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml @@ -48,8 +48,8 @@ containers.database = { configuration.nix and run nixos-rebuild switch. Note that this will not delete the root directory of the container in - /var/lib/containers. Containers can be destroyed - using the imperative method: + /var/lib/nixos-containers. Containers can be + destroyed using the imperative method: nixos-container destroy foo. diff --git a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml index 59ecfdee5af..865fc468939 100644 --- a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml +++ b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml @@ -14,8 +14,9 @@ This creates the container’s root directory in - /var/lib/containers/foo and a small configuration - file in /etc/containers/foo.conf. It also builds + /var/lib/nixos-containers/foo and a small + configuration file in + /etc/nixos-containers/foo.conf. It also builds the container’s initial system configuration and stores it in /nix/var/nix/profiles/per-container/foo/system. You can modify the initial configuration of the container on the 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 c806bc64f5f..b10b30146d7 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 @@ -475,6 +475,28 @@ Existing 3rd party modules that provided similar functionality, like pu new versions will release. + + + The configuration and state directories used by + nixos-containers have been moved from + /etc/containers and + /var/lib/containers to + /etc/nixos-containers and + /var/lib/nixos-containers. + + + If you are changing system.stateVersion to + "22.05" manually on an existing + system you are responsible for migrating these directories + yourself. + + + This is to improve compatibility with + libcontainer based software such as Podman + and Skopeo which assumes they have ownership over + /etc/containers. + + security.klogd was removed. Logging of diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index d62494fcbfc..147512e67a5 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -154,6 +154,16 @@ In addition to numerous new and upgraded packages, this release has the followin org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and `pkgs.emacsPackages.nongnuPackages` where the new versions will release. +- The configuration and state directories used by `nixos-containers` have been + moved from `/etc/containers` and `/var/lib/containers` to + `/etc/nixos-containers` and `/var/lib/nixos-containers`. + + If you are changing `system.stateVersion` to `"22.05"` manually on an existing + system you are responsible for migrating these directories yourself. + + This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo + which assumes they have ownership over `/etc/containers`. + - `security.klogd` was removed. Logging of kernel messages is handled by systemd since Linux 3.5. diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix index c4977e3fd70..fa6f0b8fc84 100644 --- a/nixos/modules/hardware/raid/hpsa.nix +++ b/nixos/modules/hardware/raid/hpsa.nix @@ -8,7 +8,10 @@ let version = "2.40-13.0"; src = pkgs.fetchurl { - url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb"; + urls = [ + "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb" + "http://apt.netangels.net/pool/main/h/hpssacli/${pname}-${version}_amd64.deb" + ]; sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw"; }; diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 321793882f4..cf01005fdc8 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -39,6 +39,12 @@ # Supported in newer board revisions arm_boost=1 + [cm4] + # Enable host mode on the 2711 built-in XHCI USB controller. + # This line should be removed if the legacy DWC2 controller is required + # (e.g. for USB device mode) or if USB support is not required. + otg_mode=1 + [all] # Boot in 64-bit mode. arm_64bit=1 @@ -65,6 +71,9 @@ cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/ ''; populateRootCommands = '' mkdir -p ./files/boot diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 25f68123a1d..8347453d403 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -40,6 +40,9 @@ in # SD cards. "sdhci_pci" + # NVMe drives + "nvme" + # Firewire support. Not tested. "ohci1394" "sbp2" diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index dc58c634523..85ac0fb2a89 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -36,12 +36,12 @@ let # register new services ${concatStringsSep "\n" (mapAttrsToList (name: service: '' - if echo "$NEW_SERVICES" | grep -xq ${name}; then + if echo "$NEW_SERVICES" | grep -xq "${name}"; then bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ "set -a && source ${service.registrationConfigFile} &&" "gitlab-runner register" "--non-interactive" - "--name ${name}" + (if service.description != null then "--description \"${service.description}\"" else "--name '${name}'") "--executor ${service.executor}" "--limit ${toString service.limit}" "--request-concurrency ${toString service.requestConcurrency}" @@ -365,6 +365,13 @@ in with RUNNER_ENV variable set. ''; }; + description = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name/description of the runner. + ''; + }; executor = mkOption { type = types.str; default = "docker"; diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index eb24130e519..8df450a11c6 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -43,7 +43,7 @@ let path = [ pkgs.coreutils ]; preStart = '' - ${optionalString (suppl.configFile.path!=null) '' + ${optionalString (suppl.configFile.path!=null && suppl.configFile.writable) '' (umask 077 && touch -a "${suppl.configFile.path}") ''} ${optionalString suppl.userControlled.enable '' diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index d1513a596b9..654079023cb 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -92,6 +92,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; services.dbus.packages = [ e.efl ]; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 1bc6c906c47..3c912d72611 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -62,6 +62,9 @@ in services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.lxqt.xdg-desktop-portal-lxqt ]; }; } diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 0838a57f0f3..23228a109bc 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -4,6 +4,11 @@ with lib; let + configurationPrefix = optionalString (versionAtLeast config.system.stateVersion "22.05") "nixos-"; + configurationDirectoryName = "${configurationPrefix}containers"; + configurationDirectory = "/etc/${configurationDirectoryName}"; + stateDirectory = "/var/lib/${configurationPrefix}containers"; + # The container's init script, a small wrapper around the regular # NixOS stage-2 init script. containerInit = (cfg: @@ -77,7 +82,7 @@ let startScript = cfg: '' mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers if ! [ -e "$root/etc/os-release" ]; then touch "$root/etc/os-release" fi @@ -249,11 +254,11 @@ let SyslogIdentifier = "container %i"; - EnvironmentFile = "-/etc/containers/%i.conf"; + EnvironmentFile = "-${configurationDirectory}/%i.conf"; Type = "notify"; - RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i"; + RuntimeDirectory = lib.optional cfg.ephemeral "${configurationDirectoryName}/%i"; # Note that on reboot, systemd-nspawn returns 133, so this # unit will be restarted. On poweroff, it returns 0, so the @@ -737,15 +742,21 @@ in config = mkIf (config.boot.enableContainers) (let + warnings = flatten [ + (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") '' + Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported. + '') + ]; + unit = { description = "Container '%i'"; - unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; + unitConfig.RequiresMountsFor = "${stateDirectory}/%i"; path = [ pkgs.iproute2 ]; environment = { - root = "/var/lib/containers/%i"; + root = "${stateDirectory}/%i"; INSTANCE = "%i"; }; @@ -782,8 +793,8 @@ in script = startScript containerConfig; postStart = postStartScript containerConfig; serviceConfig = serviceDirectives containerConfig; - unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i"; - environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i"; + unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i"; + environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i"; } // ( if containerConfig.autoStart then { @@ -792,7 +803,7 @@ in after = [ "network.target" ]; restartTriggers = [ containerConfig.path - config.environment.etc."containers/${name}.conf".source + config.environment.etc."${configurationDirectoryName}/${name}.conf".source ]; restartIfChanged = true; } @@ -800,12 +811,12 @@ in )) config.containers) )); - # Generate a configuration file in /etc/containers for each + # Generate a configuration file in /etc/nixos-containers for each # container so that container@.target can get the container # configuration. environment.etc = let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); - in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf" + in mapAttrs' (name: cfg: nameValuePair "${configurationDirectoryName}/${name}.conf" { text = '' SYSTEM_PATH=${cfg.path} @@ -854,7 +865,11 @@ in ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" ''; - environment.systemPackages = [ pkgs.nixos-container ]; + environment.systemPackages = [ + (pkgs.nixos-container.override { + inherit stateDirectory configurationDirectory; + }) + ]; boot.kernelModules = [ "bridge" diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix index c9fe2778cac..cb4b7d4eba0 100644 --- a/nixos/tests/containers-ephemeral.nix +++ b/nixos/tests/containers-ephemeral.nix @@ -33,10 +33,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed("nixos-container start webserver") with subtest("Container got its own root folder"): - machine.succeed("ls /run/containers/webserver") + machine.succeed("ls /run/nixos-containers/webserver") with subtest("Container persistent directory is not created"): - machine.fail("ls /var/lib/containers/webserver") + machine.fail("ls /var/lib/nixos-containers/webserver") # Since "start" returns after the container has reached # multi-user.target, we should now be able to access it. @@ -49,6 +49,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null") with subtest("Container's root folder was removed"): - machine.fail("ls /run/containers/webserver") + machine.fail("ls /run/nixos-containers/webserver") ''; }) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 44d2e50288b..a21ce97a23b 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -69,8 +69,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest(f"Put the root of {id2} into a bind mount"): machine.succeed( - f"mv /var/lib/containers/{id2} /id2-bindmount", - f"mount --bind /id2-bindmount /var/lib/containers/{id1}", + f"mv /var/lib/nixos-containers/{id2} /id2-bindmount", + f"mount --bind /id2-bindmount /var/lib/nixos-containers/{id1}", ) ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip() @@ -88,7 +88,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { "Create a directory with a dummy file and bind-mount it into both containers." ): for id in id1, id2: - important_path = f"/var/lib/containers/{id}/very/important/data" + important_path = f"/var/lib/nixos-containers/{id}/very/important/data" machine.succeed( f"mkdir -p {important_path}", f"mount --bind /nested-bindmount {important_path}", @@ -154,13 +154,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed("grep -qF 'important data' /nested-bindmount/dummy") with subtest("Ensure that the container path is gone"): - print(machine.succeed("ls -lsa /var/lib/containers")) - machine.succeed(f"test ! -e /var/lib/containers/{id1}") + print(machine.succeed("ls -lsa /var/lib/nixos-containers")) + machine.succeed(f"test ! -e /var/lib/nixos-containers/{id1}") with subtest("Ensure that a failed container creation doesn'leave any state"): machine.fail( "nixos-container create b0rk --config-file ${brokenCfg}" ) - machine.succeed("test ! -e /var/lib/containers/b0rk") + machine.succeed("test ! -e /var/lib/nixos-containers/b0rk") ''; }) diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 7a2c835b120..cf5b81656af 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -62,7 +62,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed( tmpfs_cmd("touch /root/test.file"), tmpfs_cmd("ls -l /root | grep -q test.file"), - "test -e /var/lib/containers/tmpfs/root/test.file", + "test -e /var/lib/nixos-containers/tmpfs/root/test.file", ) with subtest( @@ -73,7 +73,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { tmpfs_cmd("touch /some/random/path/test.file"), tmpfs_cmd("test -e /some/random/path/test.file"), ) - machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file") + machine.fail("test -e /var/lib/nixos-containers/tmpfs/some/random/path/test.file") with subtest( "files created in the hosts container dir in a path where a tmpfs " @@ -81,9 +81,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { + "the do not exist in the tmpfs" ): machine.succeed( - "touch /var/lib/containers/tmpfs/var/test.file", - "test -e /var/lib/containers/tmpfs/var/test.file", - "ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null", + "touch /var/lib/nixos-containers/tmpfs/var/test.file", + "test -e /var/lib/nixos-containers/tmpfs/var/test.file", + "ls -l /var/lib/nixos-containers/tmpfs/var/ | grep -q test.file 2>/dev/null", ) machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file")) ''; diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index b778b7f2696..f1da043d598 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -18,20 +18,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.3.0"; + version = "0.4.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-+9lrSkjk7V+ZnIhmhw7lEiEywDp5adoAW+5PEAlhpSI="; + sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-ZJiD6RshEjZ7h+/KYcY+ZjL5fHRb5+RKgIdgbD6LdkA="; + sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4="; }; postPatch = '' diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 61f8907f99c..944d40cd3ef 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -40,6 +40,11 @@ in url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch"; hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E="; }) + # compatibility fix for PipeWire 0.3.44+, remove on version bump + (fetchpatch { + url = "https://github.com/Audio4Linux/JDSP4Linux/commit/e04c55735cc20fc3c3ce042c5681ec80f7df3c96.patch"; + hash = "sha256-o6AUtQzugykALSdkM3i3lYqRmzJX3FzmALSi0TrWuRA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/viper4linux-gui/default.nix b/pkgs/applications/audio/viper4linux-gui/default.nix new file mode 100644 index 00000000000..be495aa9c93 --- /dev/null +++ b/pkgs/applications/audio/viper4linux-gui/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, pkg-config +, qtbase +, qtsvg +, qtmultimedia +, qmake +, gst_all_1 +, libpulseaudio +, makeDesktopItem +, viper4linux +, wrapQtAppsHook +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux-gui"; + version = "unstable-2022-04-23"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux-GUI"; + rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a"; + sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM="; + }; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "viper-gui"; + icon = "viper"; + desktopName = "viper4linux"; + genericName = "Equalizer"; + comment = meta.description; + categories = [ "AudioVideo" "Audio" ]; + startupNotify = false; + }) + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ + qtbase + qtmultimedia + qtsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-viperfx + libpulseaudio + viper4linux + ]; + + qmakeFlags = [ "V4L_Frontend.pro" ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ viper4linux gst_all_1.gstreamer ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}" + ]; + + installPhase = '' + runHook preInstalli + install -D V4L_Frontend $out/bin/viper-gui + install -D icons/viper.png $out/share/icons/viper.png + runHook postInstall + ''; + + meta = with lib; { + description = "Official UI for Viper4Linux2"; + homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix new file mode 100644 index 00000000000..118af6853e5 --- /dev/null +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gst_all_1 +, libviperfx +, makeWrapper +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux"; + version = "unstable-2022-03-13"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux"; + rev = "5da25644824f88cf0db24378d2c84770ba4f6816"; + sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-viperfx + libviperfx + ]; + + dontBuild = true; + + postPatch = '' + substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux" + ''; + + installPhase = '' + runHook preInstall + install -D viper -t $out/bin + mkdir -p $out/etc/viper4linux + cp -r viper4linux/* $out/etc/viper4linux + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/viper" \ + --prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]} + ''; + + meta = with lib; { + description = "An Adaptive Digital Sound Processor"; + homepage = "https://github.com/Audio4Linux/Viper4Linux"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 35ab9791ec7..5ecbf4fc979 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -25,7 +25,7 @@ with lib; let - version = "22.0"; + version = "23.0"; majorVersion = versions.major version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b"; + sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index b58524d1eee..2ac761edd00 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.2"; + version = "0.11.0.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; + sha256 = "e2ad6eead19a0cd8869e291c27d318cf553bb015339c1f0e8d8b30e7bc0910d8"; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index c775a493f16..aee98d9a612 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -26,6 +26,8 @@ mkDerivation rec { kcrash ]; + outputs = [ "out" "dev" ]; + meta = with lib; { license = licenses.gpl2; description = "A hex editor"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f528d587a41..088b0de158f 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -43,6 +43,7 @@ , pcre , threadweaver , x265 +, jasper # For panorama and focus stacking , enblend-enfuse @@ -55,13 +56,21 @@ mkDerivation rec { pname = "digikam"; - version = "7.4.0"; + version = "7.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo="; + sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE="; }; + patches = [ + (fetchpatch { + name = "akonadi-22.04.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch"; + sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko="; + }) + ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ @@ -86,6 +95,7 @@ mkDerivation rec { opencv pcre x265 + jasper qtbase qtxmlpatterns @@ -115,6 +125,7 @@ mkDerivation rec { "-DENABLE_MEDIAPLAYER=1" "-DENABLE_QWEBENGINE=on" "-DENABLE_APPSTYLES=on" + "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include ` ]; dontWrapGApps = true; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d8838587d76..8bd3dcb8704 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -86,6 +86,7 @@ let dragon = callPackage ./dragon.nix {}; elisa = callPackage ./elisa.nix {}; eventviews = callPackage ./eventviews.nix {}; + falkon = callPackage ./falkon.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; granatier = callPackage ./granatier.nix {}; @@ -97,7 +98,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalarmcal = callPackage ./kalarmcal.nix {}; + kalendar = callPackage ./kalendar.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; @@ -219,6 +220,7 @@ let print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; skanlite = callPackage ./skanlite.nix {}; + skanpage = callPackage ./skanpage.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; zanshin = callPackage ./zanshin.nix {}; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/kde/falkon.nix similarity index 70% rename from pkgs/applications/networking/browsers/falkon/default.nix rename to pkgs/applications/kde/falkon.nix index 6b525fbca9f..94cf6f5cfd2 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/kde/falkon.nix @@ -1,21 +1,13 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkg-config, qmake +, cmake, extra-cmake-modules, pkg-config , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook -, kwallet +, kwallet, kpurpose, karchive, kio }: mkDerivation rec { pname = "falkon"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "falkon"; - rev = "v${version}"; - sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; - }; preConfigure = '' export NONBLOCK_JS_DIALOGS=true @@ -27,21 +19,20 @@ mkDerivation rec { buildInputs = [ libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras - kwallet + kwallet kpurpose karchive kio ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config - qmake qttools wrapQtAppsHook ]; meta = with lib; { description = "QtWebEngine based cross-platform web browser"; - homepage = "https://community.kde.org/Incubator/Projects/Falkon"; + homepage = "https://www.falkon.org"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index a24ef563f3e..28d0371cd8c 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.12.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 7a2a319c655..6080ad5db34 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -21,4 +21,8 @@ mkDerivation { kdbusaddons ki18n kontactinterface kparts kpimtextedit kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 87bc95a2494..b99098c56f9 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -7,7 +7,7 @@ kio, knotifications, knotifyconfig, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, - kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils, + kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, pimcommon, kpimtextedit, messagelib, @@ -31,7 +31,7 @@ mkDerivation { kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem kxmlgui phonon - kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore + kimap akonadi akonadi-contacts akonadi-mime kcalendarcore kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime pimcommon kpimtextedit messagelib diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix deleted file mode 100644 index 9296fe024e9..00000000000 --- a/pkgs/applications/kde/kalarmcal.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi, kcalendarcore, kholidays, kidentitymanagement, - kpimtextedit, kcalutils -}: - -mkDerivation { - pname = "kalarmcal"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils - ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/kde/kalendar.nix similarity index 85% rename from pkgs/applications/office/kalendar/default.nix rename to pkgs/applications/kde/kalendar.nix index 32cc2f5de57..a762d605a32 100644 --- a/pkgs/applications/office/kalendar/default.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -39,15 +39,6 @@ mkDerivation rec { pname = "kalendar"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "pim"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM="; - }; nativeBuildInputs = [ cmake @@ -95,7 +86,7 @@ mkDerivation rec { meta = with lib; { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://invent.kde.org/pim/kalendar/"; + homepage = "https://apps.kde.org/kalendar/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 10280be3c30..f0d9fea5d0e 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchpatch, - extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw + extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket }: mkDerivation { @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kio libkexiv2 libkdcraw ]; + buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ]; } diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 42532644a1a..2baf991f2fb 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -5,7 +5,7 @@ incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, - kitinerary, kontactinterface + kitinerary, kontactinterface, kaddressbook, discount }: mkDerivation { @@ -20,6 +20,6 @@ mkDerivation { incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass - kitinerary kontactinterface + kitinerary kontactinterface kaddressbook discount ]; } diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 16ec7ccd213..5c64d8826f6 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, - kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement, + kholidays, kcalutils, kcontacts, kdav, kidentitymanagement, kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, pimcommon, libkgapi, libsecret, qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns, @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes - kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap + kholidays kcalutils kcontacts kdav kidentitymanagement kimap kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi libsecret qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 205f1bd5d12..30ee9fa8436 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch +{ mkDerivation, lib , libkdegames, extra-cmake-modules , kdeclarative, knewstuff }: @@ -16,16 +16,6 @@ mkDerivation { 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/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index dff5e883cb5..40153af70e8 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -16,11 +16,11 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/kde/skanpage.nix similarity index 74% rename from pkgs/applications/graphics/skanpage/default.nix rename to pkgs/applications/kde/skanpage.nix index bee04cbad52..d06ff7746bb 100644 --- a/pkgs/applications/graphics/skanpage/default.nix +++ b/pkgs/applications/kde/skanpage.nix @@ -6,16 +6,11 @@ , ktextwidgets , libksane , qtquickcontrols2 +, kpurpose }: mkDerivation rec { pname = "skanpage"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; - }; nativeBuildInputs = [ extra-cmake-modules ]; @@ -24,6 +19,7 @@ mkDerivation rec { ktextwidgets libksane qtquickcontrols2 + kpurpose ]; meta = with lib; { diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 3d5948c290d..2e5c70fb4c4 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1843 +4,1859 @@ { akonadi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-21.12.3.tar.xz"; - sha256 = "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g"; - name = "akonadi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-22.04.0.tar.xz"; + sha256 = "1v4bpnd7335f6rf7sy7xv3pjgay28lf9cbhy6g63v1sv2vicrih7"; + name = "akonadi-22.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-21.12.3.tar.xz"; - sha256 = "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq"; - name = "akonadi-calendar-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-22.04.0.tar.xz"; + sha256 = "0pnr2bzw7kl2mj88d75alzrsrwanrc28z7jbkmi2wqbw9jz0icy1"; + name = "akonadi-calendar-22.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-tools-21.12.3.tar.xz"; - sha256 = "1idh6kf8h9158rgw3b5lld7z9mvvif00jrvpz891cziblvr19p4a"; - name = "akonadi-calendar-tools-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-tools-22.04.0.tar.xz"; + sha256 = "1q727irnq0gi86ynp62wlmmd9zkpywcnfrazlv2zvp1gyfnlhira"; + name = "akonadi-calendar-tools-22.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-contacts-21.12.3.tar.xz"; - sha256 = "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm"; - name = "akonadi-contacts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-contacts-22.04.0.tar.xz"; + sha256 = "0yl8rj4sbcd8nc2fjk2xgyp5mr6y39d2qdb3ig3aklkl5czbg2ml"; + name = "akonadi-contacts-22.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-import-wizard-21.12.3.tar.xz"; - sha256 = "1fbxx53zdcqp98mzdx45ccncppnxqfhc7j9qwwxcik0ygrmg9wcj"; - name = "akonadi-import-wizard-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-import-wizard-22.04.0.tar.xz"; + sha256 = "025sm93dm01msjlxsp8p364nqix9cpwy0zk86774w5lq0m7q3cmr"; + name = "akonadi-import-wizard-22.04.0.tar.xz"; }; }; akonadi-mime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-mime-21.12.3.tar.xz"; - sha256 = "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv"; - name = "akonadi-mime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-mime-22.04.0.tar.xz"; + sha256 = "0rr8zi8xczfbmy83ds7r3gv08s5cck5w3wyz3h42b96vr7wkxbri"; + name = "akonadi-mime-22.04.0.tar.xz"; }; }; akonadi-notes = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-notes-21.12.3.tar.xz"; - sha256 = "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb"; - name = "akonadi-notes-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-notes-22.04.0.tar.xz"; + sha256 = "0w0d7m5q5n56772yhixdfzmijlvd5l490z59mhidvcxl72iz8ka1"; + name = "akonadi-notes-22.04.0.tar.xz"; }; }; akonadi-search = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-search-21.12.3.tar.xz"; - sha256 = "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p"; - name = "akonadi-search-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-search-22.04.0.tar.xz"; + sha256 = "1ra4vgmxghyi6j6v5nmw579ms4xiw4wcgqcm2gdq29cax7yaw5w2"; + name = "akonadi-search-22.04.0.tar.xz"; }; }; akonadiconsole = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadiconsole-21.12.3.tar.xz"; - sha256 = "1chb0ars9w05pq6ij2l8qfj1ac7pmzwg2mq1i4z8syhdklyryir1"; - name = "akonadiconsole-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadiconsole-22.04.0.tar.xz"; + sha256 = "10x3dg83fvsjvv652gi4c3zn6cq0c86j1p00aajxr4ailk72f3l0"; + name = "akonadiconsole-22.04.0.tar.xz"; }; }; akregator = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akregator-21.12.3.tar.xz"; - sha256 = "1yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8"; - name = "akregator-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akregator-22.04.0.tar.xz"; + sha256 = "12caw8ms5gzkda0ac8yx1swpsb0rqa01igqnfbn5l2z42mb511zi"; + name = "akregator-22.04.0.tar.xz"; }; }; analitza = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/analitza-21.12.3.tar.xz"; - sha256 = "0rgims4c80nficibg3lh764csh0kjsfnf7h303kyfd9yk59xa3in"; - name = "analitza-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/analitza-22.04.0.tar.xz"; + sha256 = "0npi7x9x9s24jdzqjkrycxvjxnn43hbak5mjzrmifx98k1k3caqc"; + name = "analitza-22.04.0.tar.xz"; }; }; ark = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ark-21.12.3.tar.xz"; - sha256 = "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8"; - name = "ark-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ark-22.04.0.tar.xz"; + sha256 = "1pjz0y0863daf4qcn9m1sf6z68a7f8asdald8vcgw0p2c5yln1yb"; + name = "ark-22.04.0.tar.xz"; }; }; artikulate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/artikulate-21.12.3.tar.xz"; - sha256 = "0fbgmd3yfyv1pzz24874a0v7cl4yk6wlfryn8sn21smi054wqz6z"; - name = "artikulate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/artikulate-22.04.0.tar.xz"; + sha256 = "0ly407s60q8mi6li3n84hcpcxzdw0a55v6wnvr5ibnw6g6xxd01q"; + name = "artikulate-22.04.0.tar.xz"; }; }; audiocd-kio = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/audiocd-kio-21.12.3.tar.xz"; - sha256 = "1alyn7w0v1by3fkb6xfnwj0hayjrrnmwnajnrnpvn8skbqsbzlgc"; - name = "audiocd-kio-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/audiocd-kio-22.04.0.tar.xz"; + sha256 = "103c1168g83jj6q4azyzc45766alci52r9y43p0068s3p57v94fr"; + name = "audiocd-kio-22.04.0.tar.xz"; }; }; baloo-widgets = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/baloo-widgets-21.12.3.tar.xz"; - sha256 = "0cfcfmsgbaxi53a3r0f013lskm5yll7zaxw98nlj6r8fsq2slrhv"; - name = "baloo-widgets-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/baloo-widgets-22.04.0.tar.xz"; + sha256 = "0ngiwlnjmk2arclf2kbs97vkmz0rn34daxv3s1vvbjc19mb0g9iq"; + name = "baloo-widgets-22.04.0.tar.xz"; }; }; blinken = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/blinken-21.12.3.tar.xz"; - sha256 = "1pbwb7q4p705k31kd62gira0x9qccjsn07d6h1w44wydc3lfdjnc"; - name = "blinken-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/blinken-22.04.0.tar.xz"; + sha256 = "18bbpp6n92i6fx6dk9s9cy3v9rnw8wnaiywamaal4xg2qk4dkj63"; + name = "blinken-22.04.0.tar.xz"; }; }; bomber = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/bomber-21.12.3.tar.xz"; - sha256 = "1mlxs2dbsycq7mw9g1hl2l17gl0z33mrry5r0zmz74i67nfijg8w"; - name = "bomber-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/bomber-22.04.0.tar.xz"; + sha256 = "13rnxc4dmgspcacslgw8ikzzha7la0591nsnfwf0kjnqskh13kyz"; + name = "bomber-22.04.0.tar.xz"; }; }; bovo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/bovo-21.12.3.tar.xz"; - sha256 = "1jzvazqy5vcwkyhnbzw7sh8ngff5clclq98vbbhzd9dmnacirdbq"; - name = "bovo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/bovo-22.04.0.tar.xz"; + sha256 = "0lv6zzsaan3wfj7l3gdc7ksh2lbhmkkaksgs20mrh2mhwd8xz0gn"; + name = "bovo-22.04.0.tar.xz"; }; }; calendarsupport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/calendarsupport-21.12.3.tar.xz"; - sha256 = "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp"; - name = "calendarsupport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/calendarsupport-22.04.0.tar.xz"; + sha256 = "0hnsrmwy3422azd13v70gkfaj02gwd7h1q568qhyaipdfbwb3sjl"; + name = "calendarsupport-22.04.0.tar.xz"; }; }; cantor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/cantor-21.12.3.tar.xz"; - sha256 = "0v0xcgaz3rag044wmpiq8gs7pp6n7wcca0q1hzav7i651pgqjjks"; - name = "cantor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/cantor-22.04.0.tar.xz"; + sha256 = "1rs7w6vzm8kir348j63jrhld888ivdl2i7vb27yh7lrdgiydlkmp"; + name = "cantor-22.04.0.tar.xz"; }; }; cervisia = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/cervisia-21.12.3.tar.xz"; - sha256 = "106x0xrscc6xvgijmqy892r1hrirjh32nj8lqhc7g7dzjaa7lhsj"; - name = "cervisia-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/cervisia-22.04.0.tar.xz"; + sha256 = "02dgvvqag96fr2dhz50pa6g4v2mn7msviqzg8ih6sr30hv6qa9v9"; + name = "cervisia-22.04.0.tar.xz"; }; }; dolphin = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dolphin-21.12.3.tar.xz"; - sha256 = "0m5nqa8j0mcsrx9wxfcf8z39kxas51k03lschr721vm4x65j64jq"; - name = "dolphin-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dolphin-22.04.0.tar.xz"; + sha256 = "007ilkgmg4wzqg1m0q9k8n60qf4jmln358jy1s443b5qsg8cvijq"; + name = "dolphin-22.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dolphin-plugins-21.12.3.tar.xz"; - sha256 = "0rbz6fw98c71h10ry1xjc0pgzvphajmj18lnjm4hf7bbrizsmdb5"; - name = "dolphin-plugins-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dolphin-plugins-22.04.0.tar.xz"; + sha256 = "0l41h8f21rnwx5a00mkr2dfkgp0wpgf5si2ygc725ryzr00jkl8w"; + name = "dolphin-plugins-22.04.0.tar.xz"; }; }; dragon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dragon-21.12.3.tar.xz"; - sha256 = "09iwwlbv4jmxs92dz20z9fqg1sfnqih54izz8459ibl8vydfgfp1"; - name = "dragon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dragon-22.04.0.tar.xz"; + sha256 = "0haavk3igyfw9c4q3jc972q9h6ziwazpzfwjr0658n68qmqyg4lh"; + name = "dragon-22.04.0.tar.xz"; }; }; elisa = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/elisa-21.12.3.tar.xz"; - sha256 = "0cg9v438fclqnv1rgx2k86mzfp5ggfcp7d5kr8xh4kjbmy17rzca"; - name = "elisa-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/elisa-22.04.0.tar.xz"; + sha256 = "0gm3llind6v6g4biy5mn7ks6pcr5vviasg1ksgvh51af5ah7kcxq"; + name = "elisa-22.04.0.tar.xz"; }; }; eventviews = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/eventviews-21.12.3.tar.xz"; - sha256 = "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2"; - name = "eventviews-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/eventviews-22.04.0.tar.xz"; + sha256 = "1b9lk3xnjky9k04jcad1w3iynd57c3jfjzlz798qhz8pfvbkwd39"; + name = "eventviews-22.04.0.tar.xz"; + }; + }; + falkon = { + version = "22.04.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/22.04.0/src/falkon-22.04.0.tar.xz"; + sha256 = "1vwgifx0g2ih23l0pvpfg46khyb69sa39mnvdap6hk0ayx6x4094"; + name = "falkon-22.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ffmpegthumbs-21.12.3.tar.xz"; - sha256 = "0x2gpx30azkz61p3xj1nm7hckyrmyh0qhs29ah30z6a5xw7336ws"; - name = "ffmpegthumbs-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ffmpegthumbs-22.04.0.tar.xz"; + sha256 = "1gp13sn95wq487fxpj3z928ppjcc4mblpwp627s8s1d5d1pmvjmn"; + name = "ffmpegthumbs-22.04.0.tar.xz"; }; }; filelight = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/filelight-21.12.3.tar.xz"; - sha256 = "1w3q0l9p5ry2crwdzcyb1d4ms2y4gp3y0a3j5drpy8clmxn0gz18"; - name = "filelight-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/filelight-22.04.0.tar.xz"; + sha256 = "11z5wjl1f2a02vd6zvkiag65ysp8i4n6sdycam35r41jjx1sfks3"; + name = "filelight-22.04.0.tar.xz"; }; }; granatier = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/granatier-21.12.3.tar.xz"; - sha256 = "16yriharl66frglmdy6750nixczh0l4c19nnr6dav15m8qfb3g6b"; - name = "granatier-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/granatier-22.04.0.tar.xz"; + sha256 = "18bjz42bqg65k9ddyn5170fq1yngw92q1j0fr09q2bn3gxqh5654"; + name = "granatier-22.04.0.tar.xz"; }; }; grantlee-editor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/grantlee-editor-21.12.3.tar.xz"; - sha256 = "00qy1ncgwylc995g051x5l679s16wjpcj7il62ck7d0j02rah0n2"; - name = "grantlee-editor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/grantlee-editor-22.04.0.tar.xz"; + sha256 = "00ycnjh4dh4xqbf5nbmlqnmlzyv66shdhq2p5625x85bkdx7fvih"; + name = "grantlee-editor-22.04.0.tar.xz"; }; }; grantleetheme = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/grantleetheme-21.12.3.tar.xz"; - sha256 = "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7"; - name = "grantleetheme-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/grantleetheme-22.04.0.tar.xz"; + sha256 = "1ldx62lw20qj8k04vrm1p4sfr2bv9qxv5cp8g225iw8wwhhmzx2q"; + name = "grantleetheme-22.04.0.tar.xz"; }; }; gwenview = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/gwenview-21.12.3.tar.xz"; - sha256 = "0zbsyrwlwbc9zmdxcgk02dvcb0f8izhlcbbzqw8cgr4l2c90xl98"; - name = "gwenview-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/gwenview-22.04.0.tar.xz"; + sha256 = "01dbf8ij7wc2bxnjmd1a5ard0zv7sxqqzk36sn63hncci6b30s3k"; + name = "gwenview-22.04.0.tar.xz"; }; }; incidenceeditor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/incidenceeditor-21.12.3.tar.xz"; - sha256 = "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa"; - name = "incidenceeditor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/incidenceeditor-22.04.0.tar.xz"; + sha256 = "19p9jyp6ygisvzsvcbzcwly22kyhxvmw6wsjnm7jaw3iwbr6276i"; + name = "incidenceeditor-22.04.0.tar.xz"; }; }; itinerary = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/itinerary-21.12.3.tar.xz"; - sha256 = "0gvkhwnxichvpwrsb6wjiv5q80v8k2yqvgpvfdapxnd7sx6qp7fp"; - name = "itinerary-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/itinerary-22.04.0.tar.xz"; + sha256 = "0qa0rzm6anaiilmfiy714zvs6iy2h1mjjrc0f4n6qkfzmbzhls71"; + name = "itinerary-22.04.0.tar.xz"; }; }; juk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/juk-21.12.3.tar.xz"; - sha256 = "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"; - name = "juk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/juk-22.04.0.tar.xz"; + sha256 = "05sj9pj032havlp68zk8x2mri3i56aw2j14pvk7xk31iipvly5yx"; + name = "juk-22.04.0.tar.xz"; }; }; k3b = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/k3b-21.12.3.tar.xz"; - sha256 = "0igqb6zw76j2hl9xclcwfny2831phdg9s2msa1y87zyc3c7g9nxc"; - name = "k3b-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/k3b-22.04.0.tar.xz"; + sha256 = "0135gck2fd4zghji2d6zk6nb8s8qa9pgf1v1ckmi8zygslgxfmjq"; + name = "k3b-22.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-integration-21.12.3.tar.xz"; - sha256 = "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb"; - name = "kaccounts-integration-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-integration-22.04.0.tar.xz"; + sha256 = "1f089p9i8wbldqy787iwir33ripkj9ac1p6wbgfr5knxqz0rfl9y"; + name = "kaccounts-integration-22.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-providers-21.12.3.tar.xz"; - sha256 = "0kcyvpa0b872q7s4amagqcrzpl8cxlb91nwc9yg91wg56mmfv7m0"; - name = "kaccounts-providers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-providers-22.04.0.tar.xz"; + sha256 = "0d0fr8f3m1aj02mazcq8v4zy4jla4gd1f3xp06arwdr6zay5ayi9"; + name = "kaccounts-providers-22.04.0.tar.xz"; }; }; kaddressbook = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaddressbook-21.12.3.tar.xz"; - sha256 = "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md"; - name = "kaddressbook-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaddressbook-22.04.0.tar.xz"; + sha256 = "0va36dsa8yy35zi4rkvwdvm5ga45nwwyyh366nhzymm4ni6fwlf0"; + name = "kaddressbook-22.04.0.tar.xz"; }; }; kajongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kajongg-21.12.3.tar.xz"; - sha256 = "1sffssfpzsd83ippkwpmqdx8rfh9cpd7i22nsv8asnaylylvy3zd"; - name = "kajongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kajongg-22.04.0.tar.xz"; + sha256 = "1k595k1vqd3fqw985193g7wf5pyl9d3ar4fwi79ai08xwk6rf4nm"; + name = "kajongg-22.04.0.tar.xz"; }; }; kalarm = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalarm-21.12.3.tar.xz"; - sha256 = "1miwcxim46hiabp2rbs874np544ip4x5nl1dc62h9li9784a9k3i"; - name = "kalarm-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalarm-22.04.0.tar.xz"; + sha256 = "150zj57bl528xyjs0lvdyr425q8da3l24xz1wn44w1w29i3i3m8q"; + name = "kalarm-22.04.0.tar.xz"; }; }; - kalarmcal = { - version = "21.12.3"; + kalendar = { + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz"; - sha256 = "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr"; - name = "kalarmcal-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalendar-22.04.0.tar.xz"; + sha256 = "0bma75va1nkyinmkjhm3bknrp880ngklz0c21rsgykmbb8sa0zvz"; + name = "kalendar-22.04.0.tar.xz"; }; }; kalgebra = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalgebra-21.12.3.tar.xz"; - sha256 = "0870kdqha0nk2cm8hq8d9l2fqfw6hn0rx2qc9f9w8l4014rcn127"; - name = "kalgebra-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalgebra-22.04.0.tar.xz"; + sha256 = "17mfjv3xbn02f9jzhpw2xd1rp6rvjqzksa3cqlwjjd06k3l1q414"; + name = "kalgebra-22.04.0.tar.xz"; }; }; kalzium = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalzium-21.12.3.tar.xz"; - sha256 = "1qha1dh638ms785j1b73j19pj8y3c7v1n4jd1m93026a292m8jll"; - name = "kalzium-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalzium-22.04.0.tar.xz"; + sha256 = "07glndlclws8kq3jkfsh4a12zh7ly2w4m2ws77mc4a8zsjc33hdv"; + name = "kalzium-22.04.0.tar.xz"; }; }; kamera = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kamera-21.12.3.tar.xz"; - sha256 = "1xwxmlnra9qdhvf1hhy04v72ar02pqxkg0l16a53809ilyss2wrm"; - name = "kamera-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kamera-22.04.0.tar.xz"; + sha256 = "06xfls262p8x7p8j04y6c59ssjcbq4f2aqiw381k5pyam81hhrah"; + name = "kamera-22.04.0.tar.xz"; }; }; kamoso = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kamoso-21.12.3.tar.xz"; - sha256 = "1q98f6ni4p19pk0svbfw4mbfwnc9i5p9csms2aj76mp2dn78xpib"; - name = "kamoso-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kamoso-22.04.0.tar.xz"; + sha256 = "01ghfjrl97x4kn9g7wlgwi9wmplwqgayxqma8ywhbaf2wafqbsgs"; + name = "kamoso-22.04.0.tar.xz"; }; }; kanagram = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kanagram-21.12.3.tar.xz"; - sha256 = "131flw9pjvin4w1m36qkwgzna3llvxp1vq0ynzwfnvhs49i3g5gc"; - name = "kanagram-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kanagram-22.04.0.tar.xz"; + sha256 = "0laa9vnrh7k8f2800gz64zxr8hx0qrgypg8jh3iccmg8v53b38lz"; + name = "kanagram-22.04.0.tar.xz"; }; }; kapman = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kapman-21.12.3.tar.xz"; - sha256 = "1974z7g3ylvf48xh3xhf3gr7iphgmj83ir9hss1a2ba0hpgg463k"; - name = "kapman-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kapman-22.04.0.tar.xz"; + sha256 = "0a5k1jdh9qrm5bdx3z1f97sa92i781d1myp7pjc7s0hvjxprz5wy"; + name = "kapman-22.04.0.tar.xz"; }; }; kapptemplate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kapptemplate-21.12.3.tar.xz"; - sha256 = "16jgybcq3ixqwi7wli11ns7w4zdlj8rgw4chzsjcqxn6c0sqy8zq"; - name = "kapptemplate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kapptemplate-22.04.0.tar.xz"; + sha256 = "0qbaa1ndqq7fk2azbj2rwlakg8amg572ji86vijf2f0fd26jbv2p"; + name = "kapptemplate-22.04.0.tar.xz"; }; }; kate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kate-21.12.3.tar.xz"; - sha256 = "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg"; - name = "kate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kate-22.04.0.tar.xz"; + sha256 = "1jy87zliqh9j4r0xy5gd3q1zklphmyvbzdp6brqlda0kf4isv46a"; + name = "kate-22.04.0.tar.xz"; }; }; katomic = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/katomic-21.12.3.tar.xz"; - sha256 = "1y4mnvkd6ajk0m0j2xph5zbw3a14clm2sswc4y8c9r4ipk3hqsgh"; - name = "katomic-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/katomic-22.04.0.tar.xz"; + sha256 = "02s4v4clylf2wq7ifpb786m11vmvfrfj6wr6rszn77h116ckfs3j"; + name = "katomic-22.04.0.tar.xz"; }; }; kbackup = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbackup-21.12.3.tar.xz"; - sha256 = "0r1cqkfzpdqpwv5pds8l0p7lxlwpv0mr7rjys1icsp8gl4hbpv60"; - name = "kbackup-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbackup-22.04.0.tar.xz"; + sha256 = "122g4bn2cs4vyj30lf0nd603sibjdycwkiz5b9lh42kcnkjghs8l"; + name = "kbackup-22.04.0.tar.xz"; }; }; kblackbox = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kblackbox-21.12.3.tar.xz"; - sha256 = "10j8rnpr3gjaqspx4mxqj9cncqj6v2jn5rkldr46bv7yxgjb5rw3"; - name = "kblackbox-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kblackbox-22.04.0.tar.xz"; + sha256 = "08gjg0abp1c58m7b6xb99ynz8fkl537bcmz4iryyd3v7ibswdr91"; + name = "kblackbox-22.04.0.tar.xz"; }; }; kblocks = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kblocks-21.12.3.tar.xz"; - sha256 = "1n3jc96ws8078gk1il61dc96p3pzvj3z9brnwi274pk4cif63bli"; - name = "kblocks-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kblocks-22.04.0.tar.xz"; + sha256 = "18n9vy3xv1g4wafwiwnf5ghh3irrxlm1jxn19m322ajs8qk53qcg"; + name = "kblocks-22.04.0.tar.xz"; }; }; kbounce = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbounce-21.12.3.tar.xz"; - sha256 = "1am4j11cjzlmav2zh5802kasy0kdcx78slycadnf96bmhxs8hvyv"; - name = "kbounce-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbounce-22.04.0.tar.xz"; + sha256 = "0xk41pja2kxzrmrrza23xnfnxk9k4ag3xcjjp6c8hj6brzd6g9a9"; + name = "kbounce-22.04.0.tar.xz"; }; }; kbreakout = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbreakout-21.12.3.tar.xz"; - sha256 = "0vqlxaggzvvrb439ybsvd5kr9j2jzpwk4xy3yni83y830h1mmhhc"; - name = "kbreakout-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbreakout-22.04.0.tar.xz"; + sha256 = "0z8x0i5yh6hcn2b296mx05b0lm6wv4gkwk20g82ypzbwanj269pl"; + name = "kbreakout-22.04.0.tar.xz"; }; }; kbruch = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbruch-21.12.3.tar.xz"; - sha256 = "1kcwbpa5lawkqqwn40r6d7savwvi7kkdgdxfxqxkviwnif2qkssx"; - name = "kbruch-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbruch-22.04.0.tar.xz"; + sha256 = "1kpl9zk88sm4l17ndx25anlff6f1l13h4k4m39pryi5ywpsajjk9"; + name = "kbruch-22.04.0.tar.xz"; }; }; kcachegrind = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcachegrind-21.12.3.tar.xz"; - sha256 = "1cssjywnhfbnsvly4mralpx3af2pqkmhg1jj2q3cjiqx44i3gkyx"; - name = "kcachegrind-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcachegrind-22.04.0.tar.xz"; + sha256 = "03c9r0zwslsv6sb5i91bk59pzi0ia7pyssgdfr6f5b01vjjrxl5f"; + name = "kcachegrind-22.04.0.tar.xz"; }; }; kcalc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcalc-21.12.3.tar.xz"; - sha256 = "15yqzhrlzcix8wvgaah8wf12msylgzyqwk58f58k5agxh97ahv4q"; - name = "kcalc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcalc-22.04.0.tar.xz"; + sha256 = "1gg7wqm1vb22pa1a791sdvg1pf4l6pnzq1wsvxa8ih6dkdplcmrg"; + name = "kcalc-22.04.0.tar.xz"; }; }; kcalutils = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcalutils-21.12.3.tar.xz"; - sha256 = "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs"; - name = "kcalutils-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcalutils-22.04.0.tar.xz"; + sha256 = "0wn9mc4myi8mj9qc3lmswqj9y3lfgfpxg0vdzxsa0ai8i3g3g0j7"; + name = "kcalutils-22.04.0.tar.xz"; }; }; kcharselect = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcharselect-21.12.3.tar.xz"; - sha256 = "1aaiz9f9y2fmf284617pfnncgxjjjyfvdv08h900sc0bdlfmh4y7"; - name = "kcharselect-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcharselect-22.04.0.tar.xz"; + sha256 = "1av1w906cy2dcdn0k7xjc1s897bgm9f8b79k97pk6x5f3rfnvy71"; + name = "kcharselect-22.04.0.tar.xz"; }; }; kcolorchooser = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcolorchooser-21.12.3.tar.xz"; - sha256 = "0jnnbwaj9xb0ifcc95xay8yc4bx9f29wqkj3h4kffzdlwvw3vp7s"; - name = "kcolorchooser-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcolorchooser-22.04.0.tar.xz"; + sha256 = "0cn5zgrsf3xji7y5ipa9zv5njyx94rg617d6l0qxjh4n94x2d4yj"; + name = "kcolorchooser-22.04.0.tar.xz"; }; }; kcron = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcron-21.12.3.tar.xz"; - sha256 = "0ffc71inp1kyd4xh39x6vbfggz0kpipd6r6vabfn187lpnpwcmpm"; - name = "kcron-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcron-22.04.0.tar.xz"; + sha256 = "0j067izv16646hjaw5swnxyf4gbg1gz5wxjcnrvscfv3hryf9b6q"; + name = "kcron-22.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-scripts-21.12.3.tar.xz"; - sha256 = "04w4kk7vpfkjj2fzylmq590kk7xskw3a0id3wndw8066pfafsfg3"; - name = "kde-dev-scripts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-scripts-22.04.0.tar.xz"; + sha256 = "0a7vsdizayl53dadcs3aiki8pl2wmibn9rjink97jl20pj8m22dx"; + name = "kde-dev-scripts-22.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-utils-21.12.3.tar.xz"; - sha256 = "1jdqv5zdigwazh3m580rmnylr6h6a6l5g2cpxy54v9sdvh3qb1yr"; - name = "kde-dev-utils-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-utils-22.04.0.tar.xz"; + sha256 = "12ci9aw82hb6z651r1jsgrkc5ywq6dcas8j12gbxllcd0033pfkp"; + name = "kde-dev-utils-22.04.0.tar.xz"; }; }; kdebugsettings = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdebugsettings-21.12.3.tar.xz"; - sha256 = "19ng7hvqpyh3kh0pahrknh89c113mqx1kxjq4r26xbww1ypkz8zq"; - name = "kdebugsettings-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdebugsettings-22.04.0.tar.xz"; + sha256 = "1jh3syvy0k611jmk615ba74zl62l5nw9fhb8y8mk6mgw23i16c21"; + name = "kdebugsettings-22.04.0.tar.xz"; }; }; kdeconnect-kde = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdeconnect-kde-21.12.3.tar.xz"; - sha256 = "1n9km7czif19cvrsdfcjbb02i1xgpa1z4ycn20d3g8azmli4zj4g"; - name = "kdeconnect-kde-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdeconnect-kde-22.04.0.tar.xz"; + sha256 = "17zza0s5lnk8rvklv4hpl877jviwv8q6y5zp7an4h12lqni3f8cv"; + name = "kdeconnect-kde-22.04.0.tar.xz"; }; }; kdeedu-data = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdeedu-data-21.12.3.tar.xz"; - sha256 = "11mxxcca6jxz4qcmba12p6xbv845xa16b8ag529409f3276w4915"; - name = "kdeedu-data-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdeedu-data-22.04.0.tar.xz"; + sha256 = "025qmwsm9h957sfa230ah2kgdsj8gs09p0nb7xpvs6wr8fhfwn1l"; + name = "kdeedu-data-22.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-mobipocket-21.12.3.tar.xz"; - sha256 = "091ix343p9vs4iyj8abq6mw9lbm1fx5167gykhm4g8bjk5vdri2q"; - name = "kdegraphics-mobipocket-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-mobipocket-22.04.0.tar.xz"; + sha256 = "0jinblf52nkr4jgr53szqz1l9dx9xgnwrilvzvdz2yfkyv70yr1k"; + name = "kdegraphics-mobipocket-22.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-thumbnailers-21.12.3.tar.xz"; - sha256 = "0shdrl6n1724i8jrkmy8z6ayhflg93401jia87mcc1apaw9s8y83"; - name = "kdegraphics-thumbnailers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-thumbnailers-22.04.0.tar.xz"; + sha256 = "1ywdd0dfcsssnwp5x450bhwjwjgkbhqdckk0mnf2zmw8rrspkcii"; + name = "kdegraphics-thumbnailers-22.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdenetwork-filesharing-21.12.3.tar.xz"; - sha256 = "1y6sa22j2165j3x6ql1cfm30vv9ifb94mczbqbcjzmhqsypp5pw2"; - name = "kdenetwork-filesharing-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdenetwork-filesharing-22.04.0.tar.xz"; + sha256 = "1njjfvc5wlmdl3gsdv3ms4cx0z1dahnabjjn3hkls91ipd0gbgfl"; + name = "kdenetwork-filesharing-22.04.0.tar.xz"; }; }; kdenlive = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdenlive-21.12.3.tar.xz"; - sha256 = "1hamdi2v3rx5zjmvpx1bximdppmzgsk9gbjxwgr691lkybkgx8vs"; - name = "kdenlive-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdenlive-22.04.0.tar.xz"; + sha256 = "0ybd5ixjrsldsz3fr1y1phnns4lvklzcrr0mv9gg1xic38ppn536"; + name = "kdenlive-22.04.0.tar.xz"; }; }; kdepim-addons = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdepim-addons-21.12.3.tar.xz"; - sha256 = "1pv780z29ccx05z12l2w5zdmby9d1q993jr0cyzvpapnmck9146h"; - name = "kdepim-addons-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdepim-addons-22.04.0.tar.xz"; + sha256 = "0x4ja60ywrhp7qjhpb8iakhz39kxpi98iwnsfvd6drrmm1291ql1"; + name = "kdepim-addons-22.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdepim-runtime-21.12.3.tar.xz"; - sha256 = "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m"; - name = "kdepim-runtime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdepim-runtime-22.04.0.tar.xz"; + sha256 = "1ra39060yr8nplr855sjgwfp874vi8g76k6iyi1wh9fsxvsrnbj2"; + name = "kdepim-runtime-22.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-kioslaves-21.12.3.tar.xz"; - sha256 = "1nhsvx5pznm3adf0scrcqqb2ibl52a241ki2gbwvxk2qpwwwx6jd"; - name = "kdesdk-kioslaves-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-kioslaves-22.04.0.tar.xz"; + sha256 = "1055gdimlaxklf93670134sf3js220wg4iv074bx3022dbvirws5"; + name = "kdesdk-kioslaves-22.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-thumbnailers-21.12.3.tar.xz"; - sha256 = "0337rhgil42wychi5anq2v61xq8mbcvma4gb50smapcrjfl7fkdy"; - name = "kdesdk-thumbnailers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-thumbnailers-22.04.0.tar.xz"; + sha256 = "1nk0asq2ff267jvb44v7j9lpnnzrmq21fmwh2wvbiwb4mibnwh44"; + name = "kdesdk-thumbnailers-22.04.0.tar.xz"; }; }; kdev-php = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdev-php-21.12.3.tar.xz"; - sha256 = "0z5iqgsh7w0hw0pw2522zlh5sd88zlplrxm3vjp3yvmza65471aa"; - name = "kdev-php-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdev-php-22.04.0.tar.xz"; + sha256 = "00jmyrbnzar1afalx7byb3jbjqa0w0fa8aq669j6h3j52vsnr15y"; + name = "kdev-php-22.04.0.tar.xz"; }; }; kdev-python = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdev-python-21.12.3.tar.xz"; - sha256 = "1iyg1cfldf5mk62anw8schiw3ii0gp20qwg6ljk1r9hv583iwrq6"; - name = "kdev-python-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdev-python-22.04.0.tar.xz"; + sha256 = "1p28lld358c1wyqqb50v8bh6y5k3wzbkryhyhbspr40a1ym2gr8i"; + name = "kdev-python-22.04.0.tar.xz"; }; }; kdevelop = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdevelop-21.12.3.tar.xz"; - sha256 = "1shp8zlxr7iyysn1c8d3fp6rg6g2krj2v3zw5apalxcnal16bww6"; - name = "kdevelop-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdevelop-22.04.0.tar.xz"; + sha256 = "05jamqizsbfx5bj3p5d4s4320xps8nr3lq2gv22mqiv7mcl1hymb"; + name = "kdevelop-22.04.0.tar.xz"; }; }; kdf = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdf-21.12.3.tar.xz"; - sha256 = "179ygy4kxkapfyxqj8h5xlvp1160vd72af34vd0a4r5az7wfd1m7"; - name = "kdf-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdf-22.04.0.tar.xz"; + sha256 = "1xy0pm7sggcwf5mf0n9514n7skbaz9w1kwahgd135s7cxw3wd9aw"; + name = "kdf-22.04.0.tar.xz"; }; }; kdialog = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdialog-21.12.3.tar.xz"; - sha256 = "04d1dqc5f02s867lllx1ix0nc55xw9hrpg7jxiy3v4c8vlzg0w53"; - name = "kdialog-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdialog-22.04.0.tar.xz"; + sha256 = "1285jdcv2bbnq3292qx08i5bashvjj2vdx325nlfi1vbaydlfixc"; + name = "kdialog-22.04.0.tar.xz"; }; }; kdiamond = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdiamond-21.12.3.tar.xz"; - sha256 = "1d3c4pckddnri9i19g2pi2ygpqakllrgy6azgvnh5hn20kgsw7d9"; - name = "kdiamond-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdiamond-22.04.0.tar.xz"; + sha256 = "1qvjrklq2vdbq26k531ddwgjjfgnj77qc9c84c7x4bjyv3j2jhry"; + name = "kdiamond-22.04.0.tar.xz"; }; }; keditbookmarks = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/keditbookmarks-21.12.3.tar.xz"; - sha256 = "0wfb7j1lhhdfw2x03p692mglmy9i9qys8mn4f3gxlb5imrd2hmnk"; - name = "keditbookmarks-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/keditbookmarks-22.04.0.tar.xz"; + sha256 = "09vkp0ingzf8naa7d5hvsj7nxab5z4ci1nh12jn9ri6f1bvapnnn"; + name = "keditbookmarks-22.04.0.tar.xz"; }; }; kfind = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfind-21.12.3.tar.xz"; - sha256 = "1v1yxsbmzv4q5m5rbvl9n095d9fq0b1zphnl6vrzff5r8i53pzx0"; - name = "kfind-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfind-22.04.0.tar.xz"; + sha256 = "0db9iclzq89ykb9lw90wycb1057qrys02sv6z71kzyv4pv8clcsi"; + name = "kfind-22.04.0.tar.xz"; }; }; kfloppy = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfloppy-21.12.3.tar.xz"; - sha256 = "1phkigxd6bkwlcjrsfhlhn44ra9imfq0flcvp4vmza6c9ylsx6m8"; - name = "kfloppy-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfloppy-22.04.0.tar.xz"; + sha256 = "07vixy0fdvvvjwchci77a32lz2bam02smnyvl5jx446gxra3kbxd"; + name = "kfloppy-22.04.0.tar.xz"; }; }; kfourinline = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfourinline-21.12.3.tar.xz"; - sha256 = "0rb5jcmmf19bidwywj56dn0wfrnrfi5kc75c20d7mxnlgygfdnkg"; - name = "kfourinline-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfourinline-22.04.0.tar.xz"; + sha256 = "1kvpilvsfb4zz59jmz8qk688xf9j4v8xijahxnsfrx3a216nd5wx"; + name = "kfourinline-22.04.0.tar.xz"; }; }; kgeography = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgeography-21.12.3.tar.xz"; - sha256 = "1s1xyfffqkhmf4n74a4ksjz62rdiyl1fk1v57s9gnr6qw71wqql0"; - name = "kgeography-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgeography-22.04.0.tar.xz"; + sha256 = "1f75av03iw1glsxar6ipbch2xvb9if59r3h85ndkpd7f8azdmam5"; + name = "kgeography-22.04.0.tar.xz"; }; }; kget = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kget-21.12.3.tar.xz"; - sha256 = "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l"; - name = "kget-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kget-22.04.0.tar.xz"; + sha256 = "01s73qb2658hryq639yiqjl696z6k4c6m7vmm0x9iglacl0qihdd"; + name = "kget-22.04.0.tar.xz"; }; }; kgoldrunner = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgoldrunner-21.12.3.tar.xz"; - sha256 = "0gzz58407zjmk311kyyj5l2c1ciczcq9i8ckpwbd341dvwaww27q"; - name = "kgoldrunner-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgoldrunner-22.04.0.tar.xz"; + sha256 = "1d6z2fslxpjdnixh372p78zk1apavnn9pvhdhnz9isq1yyvbwabx"; + name = "kgoldrunner-22.04.0.tar.xz"; }; }; kgpg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgpg-21.12.3.tar.xz"; - sha256 = "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3"; - name = "kgpg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgpg-22.04.0.tar.xz"; + sha256 = "0g78r1lya4vv09yiq9jmhcy4d3824n70ps71x1z6dvrpf6fnri49"; + name = "kgpg-22.04.0.tar.xz"; }; }; khangman = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/khangman-21.12.3.tar.xz"; - sha256 = "000vn11pp4hwfh2689rmnwrrssrmrhx5569k02h4ynswkiykvbv6"; - name = "khangman-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/khangman-22.04.0.tar.xz"; + sha256 = "0dl4rdifgxbxcxslnjcgl8ni3fw30zkp90mzdrp4hbg1rql8pav9"; + name = "khangman-22.04.0.tar.xz"; }; }; khelpcenter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/khelpcenter-21.12.3.tar.xz"; - sha256 = "1fj1c57bqs009rx9db4ifvfmhhl4b35r5sfly3wvbfr4dapjqfqr"; - name = "khelpcenter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/khelpcenter-22.04.0.tar.xz"; + sha256 = "1nfa9q688l151196mbfdn5i7k2x2a5sz1kn07j8flxhwpkcbyrgm"; + name = "khelpcenter-22.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kidentitymanagement-21.12.3.tar.xz"; - sha256 = "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4"; - name = "kidentitymanagement-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kidentitymanagement-22.04.0.tar.xz"; + sha256 = "1xw5q12la5p34lg8pwndx4pnr1cf5pv36611209v2qcfwjfk5570"; + name = "kidentitymanagement-22.04.0.tar.xz"; }; }; kig = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kig-21.12.3.tar.xz"; - sha256 = "0rl0z1djsf9ha0q94v0cnj5qm4ij6yjsil2s57r3v666h64yradn"; - name = "kig-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kig-22.04.0.tar.xz"; + sha256 = "0rbrvkflm0199vz4zpqs08dqzsrqw7r8xzgr034s9g7hwf0f5nbd"; + name = "kig-22.04.0.tar.xz"; }; }; kigo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kigo-21.12.3.tar.xz"; - sha256 = "14pp73b9mbf0ny75b90vs7z9l61m7zp8cll7hl4bplqh1kig1szf"; - name = "kigo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kigo-22.04.0.tar.xz"; + sha256 = "0whiza2xqzi33ppaz1d72aicg53f1zmwg47drg1s42sx5rj7jmpg"; + name = "kigo-22.04.0.tar.xz"; }; }; killbots = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/killbots-21.12.3.tar.xz"; - sha256 = "1ncr55xq04vrx6bss1ahk86c3l9ckhv4zjbc6gq4krhjw0lkdfiv"; - name = "killbots-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/killbots-22.04.0.tar.xz"; + sha256 = "0aaip213gc6ngan122r2rm7mc794mlir3qx1krhsg6gh8i1qvj91"; + name = "killbots-22.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kimagemapeditor-21.12.3.tar.xz"; - sha256 = "0qdmyrlf0jp3737p7x31wk428676xv77lx0mgyd9h2hdl0ipnbvr"; - name = "kimagemapeditor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kimagemapeditor-22.04.0.tar.xz"; + sha256 = "0yh7sb5pk31q1pksb74yg94mrf752baj767gq0kgmp6ymmw83i6x"; + name = "kimagemapeditor-22.04.0.tar.xz"; }; }; kimap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kimap-21.12.3.tar.xz"; - sha256 = "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px"; - name = "kimap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kimap-22.04.0.tar.xz"; + sha256 = "12n0fjqh9mpwdii3gkvfvg33b6lzdrl2n3v94j29hq4nk8k1y8gf"; + name = "kimap-22.04.0.tar.xz"; }; }; kio-extras = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kio-extras-21.12.3.tar.xz"; - sha256 = "11zpnjdri7z4sz6zx26d9iv52aj4vf5lr9c114gg4pvz2l4h4h5i"; - name = "kio-extras-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kio-extras-22.04.0.tar.xz"; + sha256 = "1ikjhimw12c9kvq15zjwxvmrd4mfx66dxl9scfvkh6pvw8l9hy76"; + name = "kio-extras-22.04.0.tar.xz"; }; }; kio-gdrive = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kio-gdrive-21.12.3.tar.xz"; - sha256 = "0bm3c7g6q7z2ydnha2x5c456x9wlgachi9453mlrd2zcsc7c5h87"; - name = "kio-gdrive-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kio-gdrive-22.04.0.tar.xz"; + sha256 = "1v445kclcdnb6ajjrjmkqzvr5f84n7qx79cxikrd21zphym0p4cz"; + name = "kio-gdrive-22.04.0.tar.xz"; }; }; kipi-plugins = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kipi-plugins-21.12.3.tar.xz"; - sha256 = "1h6107d2a6jcyjsd191cg2ykgwm580j7wr0blg328ff6wwk1aizy"; - name = "kipi-plugins-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kipi-plugins-22.04.0.tar.xz"; + sha256 = "0cxn6h5vglip14ydap0wnnwm5y33x9lha4r05kwyjlvi754dx4qs"; + name = "kipi-plugins-22.04.0.tar.xz"; }; }; kirigami-gallery = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kirigami-gallery-21.12.3.tar.xz"; - sha256 = "0pjd9bq965v9x433p8rbhd7w3fj0808qd7x4c11ziyhy4cg9gwml"; - name = "kirigami-gallery-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kirigami-gallery-22.04.0.tar.xz"; + sha256 = "1ggg4ak997ax03zaspx09z0jxh0lf10sm5hh262p1v96xnlc7kz3"; + name = "kirigami-gallery-22.04.0.tar.xz"; }; }; kiriki = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kiriki-21.12.3.tar.xz"; - sha256 = "0qbm0zjjqnbcdm39zi8h240nblpa1pa7g1ls9mghzbqrdrh7n3a0"; - name = "kiriki-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kiriki-22.04.0.tar.xz"; + sha256 = "041xiw7s7r94115wvlnzk1443af9gb06scsvbqj92hdc9a2p6318"; + name = "kiriki-22.04.0.tar.xz"; }; }; kiten = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kiten-21.12.3.tar.xz"; - sha256 = "0z0haqxxkh7m2510b5qfwbx8s45vcahbk503jp1x0bwz03mrwflw"; - name = "kiten-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kiten-22.04.0.tar.xz"; + sha256 = "0n19a4ch2rgzq7s2f6dnhgbcqdi22xqd8vhy5hnbw4mw4xa9f6xm"; + name = "kiten-22.04.0.tar.xz"; }; }; kitinerary = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kitinerary-21.12.3.tar.xz"; - sha256 = "0kccrjiyib2zljr6rnc89y29jgi8cnhwfh1yq8psyzmca2n8lpxi"; - name = "kitinerary-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kitinerary-22.04.0.tar.xz"; + sha256 = "1q2dwdycajab3w7w4898s3s2jcy541qgsandfzi7yapplw238gm7"; + name = "kitinerary-22.04.0.tar.xz"; }; }; kjumpingcube = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kjumpingcube-21.12.3.tar.xz"; - sha256 = "1wlk6my6pawmdv3zgcpnyyzpjwz0wii0h8i1z0gxhbpg9nc8iy1r"; - name = "kjumpingcube-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kjumpingcube-22.04.0.tar.xz"; + sha256 = "1q8wnyympajijzsnddrf21pzwshbvkj4r5diydgavd23zgspfkp3"; + name = "kjumpingcube-22.04.0.tar.xz"; }; }; kldap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kldap-21.12.3.tar.xz"; - sha256 = "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a"; - name = "kldap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kldap-22.04.0.tar.xz"; + sha256 = "1z6kmkryc9sz3g0hf0dh7plmv59w03rzxyrnacrc94bjkbf56y1i"; + name = "kldap-22.04.0.tar.xz"; }; }; kleopatra = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kleopatra-21.12.3.tar.xz"; - sha256 = "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls"; - name = "kleopatra-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kleopatra-22.04.0.tar.xz"; + sha256 = "0aaz3mwyyr2i8lbkrfz9hbz8358bqhf2zzxla1i9p177cfrdv60i"; + name = "kleopatra-22.04.0.tar.xz"; }; }; klettres = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klettres-21.12.3.tar.xz"; - sha256 = "0l4zgfqd6l2bk67s2a0zldbcy8v7nwbv7yahvnyw4jf4jyv9q9rv"; - name = "klettres-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klettres-22.04.0.tar.xz"; + sha256 = "1ih7q2rd6ajky719dikyfhy03dyw4x4bm9032l8vd51rv9zcjbp3"; + name = "klettres-22.04.0.tar.xz"; }; }; klickety = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klickety-21.12.3.tar.xz"; - sha256 = "03liv3fax764ngfkwp3ga96irn8qb509b08ljnhz5aw5v9yrssnk"; - name = "klickety-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klickety-22.04.0.tar.xz"; + sha256 = "1fl76vj1qrlp8giy6ing3qnm76i4scx0q5sn7dflwix5cjvsjyss"; + name = "klickety-22.04.0.tar.xz"; }; }; klines = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klines-21.12.3.tar.xz"; - sha256 = "1ypi64wdsw1zsj03wcxj02v27y1by113v89as8dyk9wr0pfmbpqf"; - name = "klines-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klines-22.04.0.tar.xz"; + sha256 = "0s7vqsg5lh7znxij0fygawww8fhga3rn0dv5k147jbvrzhfn01yn"; + name = "klines-22.04.0.tar.xz"; }; }; kmag = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmag-21.12.3.tar.xz"; - sha256 = "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl"; - name = "kmag-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmag-22.04.0.tar.xz"; + sha256 = "1bwp7psf2vdl7q0s8ymji9zhmrfp6vxilwmf9cw1bhl0wjislnp6"; + name = "kmag-22.04.0.tar.xz"; }; }; kmahjongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmahjongg-21.12.3.tar.xz"; - sha256 = "02yvvpwkk5gbj445zv5xhfragk8220rlx0pkxf32pj0jsv7dnz1x"; - name = "kmahjongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmahjongg-22.04.0.tar.xz"; + sha256 = "1hs0pv8bvxbk8c4ag7kbmylddh0wqzzi953xggpi86fzinpgzmq9"; + name = "kmahjongg-22.04.0.tar.xz"; }; }; kmail = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmail-21.12.3.tar.xz"; - sha256 = "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0"; - name = "kmail-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmail-22.04.0.tar.xz"; + sha256 = "1rp65m1y4rynzxc0497d4kbppqj9gz5r1kd769msq01v72if7xvr"; + name = "kmail-22.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmail-account-wizard-21.12.3.tar.xz"; - sha256 = "0ar2rm6viissfipbak07fxivrgqgsdfilsprsqmvab44inw2g4pg"; - name = "kmail-account-wizard-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmail-account-wizard-22.04.0.tar.xz"; + sha256 = "0pvbq8x16m08v3fdmd7gjnsh5p7c77fgz1f0d11hkbnpza9x72d7"; + name = "kmail-account-wizard-22.04.0.tar.xz"; }; }; kmailtransport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmailtransport-21.12.3.tar.xz"; - sha256 = "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6"; - name = "kmailtransport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmailtransport-22.04.0.tar.xz"; + sha256 = "1bglr299xn5z65zl49kp6ahcf229aga5fwn6ij2bv3cm9xa4f6iv"; + name = "kmailtransport-22.04.0.tar.xz"; }; }; kmbox = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmbox-21.12.3.tar.xz"; - sha256 = "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr"; - name = "kmbox-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmbox-22.04.0.tar.xz"; + sha256 = "1ysjjz8v338l8n47dxg5jskbilsybwx6vd3lmlajw5iqfwpjk6k1"; + name = "kmbox-22.04.0.tar.xz"; }; }; kmime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmime-21.12.3.tar.xz"; - sha256 = "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw"; - name = "kmime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmime-22.04.0.tar.xz"; + sha256 = "0h9dsw3jl2jpfsb19yh4v8rzjd930xbglgzasl87f0f2nawkmdik"; + name = "kmime-22.04.0.tar.xz"; }; }; kmines = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmines-21.12.3.tar.xz"; - sha256 = "1wxy0cyz733wvnxfjhirqf41wnda4f6aqdiqmb5r1ngzzllgbglc"; - name = "kmines-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmines-22.04.0.tar.xz"; + sha256 = "1dzfi9r2zrn0rn96l42g12srqgmz8gkw6glyjadzay1mkhin7zp4"; + name = "kmines-22.04.0.tar.xz"; }; }; kmix = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmix-21.12.3.tar.xz"; - sha256 = "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"; - name = "kmix-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmix-22.04.0.tar.xz"; + sha256 = "0yjykslaynf6vcv33s3hwm2s03acp2k97dljmq8dwgq3nwyaah9z"; + name = "kmix-22.04.0.tar.xz"; }; }; kmousetool = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmousetool-21.12.3.tar.xz"; - sha256 = "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj"; - name = "kmousetool-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmousetool-22.04.0.tar.xz"; + sha256 = "0a0gcq0295x3ckdhxv77lnvv8yms04xg5pkza5612k3zr386f0b5"; + name = "kmousetool-22.04.0.tar.xz"; }; }; kmouth = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmouth-21.12.3.tar.xz"; - sha256 = "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim"; - name = "kmouth-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmouth-22.04.0.tar.xz"; + sha256 = "05v0frgl6im5yv6ah8qsrgqcrjziiycnnnqq2z859psxnysvmsiz"; + name = "kmouth-22.04.0.tar.xz"; }; }; kmplot = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmplot-21.12.3.tar.xz"; - sha256 = "1vmrzfcdyaxgvyp9la2gvy3h5fhksmn24lsnrpvr6alj880mh8bq"; - name = "kmplot-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmplot-22.04.0.tar.xz"; + sha256 = "063bxm619jkd63jv70a4g6bj2q4fcg5a7lxjkwas9qm1qhlz2vzy"; + name = "kmplot-22.04.0.tar.xz"; }; }; knavalbattle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knavalbattle-21.12.3.tar.xz"; - sha256 = "1mpj1783za6b7a7cjawy4v0z24dvcd34gdb25qch4gi9cx1lc28z"; - name = "knavalbattle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knavalbattle-22.04.0.tar.xz"; + sha256 = "1hdgmjvsv7skck64w4j4sxyq7b8c7f5i2vcvkfbqxrrzf3wcq649"; + name = "knavalbattle-22.04.0.tar.xz"; }; }; knetwalk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knetwalk-21.12.3.tar.xz"; - sha256 = "0ahms3imvkdknp1z2h6j42k9g1i20ygd2633icjv37d2cbij128m"; - name = "knetwalk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knetwalk-22.04.0.tar.xz"; + sha256 = "0ws9sgn3ygl4012irkjk82j7b08cbhpq7ca7sncw9il7lfxbis6l"; + name = "knetwalk-22.04.0.tar.xz"; }; }; knights = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knights-21.12.3.tar.xz"; - sha256 = "1m2big16rdw3w347m5vi0qhypnb2rgz6804kkxs7ln0yx658y4x4"; - name = "knights-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knights-22.04.0.tar.xz"; + sha256 = "0dfxk811f9yjklfr01djppms86fqj3112cfh41z2zwsl4wgbyrma"; + name = "knights-22.04.0.tar.xz"; }; }; knotes = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knotes-21.12.3.tar.xz"; - sha256 = "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7"; - name = "knotes-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knotes-22.04.0.tar.xz"; + sha256 = "023rv1cvy2ykpv9p0862csixxn65fkhis8jjf9vmdq33j7mmflsm"; + name = "knotes-22.04.0.tar.xz"; }; }; kolf = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kolf-21.12.3.tar.xz"; - sha256 = "00dhjy82d9964z94nn4vkkwynql3bfa6djwrgsq93f9d7grgkd7g"; - name = "kolf-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kolf-22.04.0.tar.xz"; + sha256 = "0i3j9wbhjgxd1j58brjnbyb7862h6iz8kvb6vnnqwgzybwy09n88"; + name = "kolf-22.04.0.tar.xz"; }; }; kollision = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kollision-21.12.3.tar.xz"; - sha256 = "0avin6s1lglfps6qlvz19i27nb0x0hgrl4q2brpq4kax7azs1nc3"; - name = "kollision-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kollision-22.04.0.tar.xz"; + sha256 = "18vp7iqkm9pbrcl5cppwb6qngfbw75d2vjqngm5kjz124jn6hxxa"; + name = "kollision-22.04.0.tar.xz"; }; }; kolourpaint = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kolourpaint-21.12.3.tar.xz"; - sha256 = "0kbz8jz33bk4zr7kk6mb1y42mdq6nykdfqm2cs08sxldd3nrs6fj"; - name = "kolourpaint-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kolourpaint-22.04.0.tar.xz"; + sha256 = "0qwibnpr5zgpwdk44xl43xlr02w75j8c01z8arsiv6rdycwy9cmf"; + name = "kolourpaint-22.04.0.tar.xz"; }; }; kompare = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kompare-21.12.3.tar.xz"; - sha256 = "097aawmziplsndj42bdjf3x3smal1fy67c2y7cik9p1qw9wgn24h"; - name = "kompare-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kompare-22.04.0.tar.xz"; + sha256 = "1381kih1ywd5k2wslasp0ap69kmbd05nm8jy67cric1f9d4fxq72"; + name = "kompare-22.04.0.tar.xz"; }; }; konqueror = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konqueror-21.12.3.tar.xz"; - sha256 = "0z3zq71n0lnpx5ggfg835zbmgf2ly4zsmz01yyyxn9n9d9b6d3px"; - name = "konqueror-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konqueror-22.04.0.tar.xz"; + sha256 = "0s0cf41p2ciwmgywv5g59cnw9fzy2065grk9g058d522qqadcmfv"; + name = "konqueror-22.04.0.tar.xz"; }; }; konquest = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konquest-21.12.3.tar.xz"; - sha256 = "0lrahq9s70rx24dw4cgpvchr4s6pcl565vh343ggg24s1rd3ly80"; - name = "konquest-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konquest-22.04.0.tar.xz"; + sha256 = "0kpjakww8kaqf7b18v5r7xhg9z07c22959gygcq22b0dahqsgy1w"; + name = "konquest-22.04.0.tar.xz"; }; }; konsole = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konsole-21.12.3.tar.xz"; - sha256 = "06sqm2xmairicrdcxnf7imvyvw0wyknrrym334scx2w7mfhjg5qs"; - name = "konsole-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konsole-22.04.0.tar.xz"; + sha256 = "1wyvfwky8p5ryc101bfxfbzrbvhw6sl9yaqk057wkqvav2h6k6xz"; + name = "konsole-22.04.0.tar.xz"; }; }; kontact = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontact-21.12.3.tar.xz"; - sha256 = "16p17b4llral0g48l3s9yg838x6hhc4dprlcpd00b8sy58c27f90"; - name = "kontact-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontact-22.04.0.tar.xz"; + sha256 = "19jpwazr553bb1qw9lkp89gbxabjbalc1f31sf6j074zxjn7p29v"; + name = "kontact-22.04.0.tar.xz"; }; }; kontactinterface = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontactinterface-21.12.3.tar.xz"; - sha256 = "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78"; - name = "kontactinterface-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontactinterface-22.04.0.tar.xz"; + sha256 = "1v0yyb81dq98dgmlzc3ry36nhsl29sh1dj7c9y3y926dkv6s3khp"; + name = "kontactinterface-22.04.0.tar.xz"; }; }; kontrast = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontrast-21.12.3.tar.xz"; - sha256 = "1rp279mfq18p5kzw3788m8w6kkj8w7zfdv97rnl3n5jir4j94yxl"; - name = "kontrast-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontrast-22.04.0.tar.xz"; + sha256 = "1nznd3ir87r3rhmpqxdcnvivczfybqdqzabwa0f6zlryixcvqmqb"; + name = "kontrast-22.04.0.tar.xz"; }; }; konversation = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konversation-21.12.3.tar.xz"; - sha256 = "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80"; - name = "konversation-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konversation-22.04.0.tar.xz"; + sha256 = "12lvgxzdchcyg0jy3qcvfssdad5c6asiadkszz7brnnnxma3i77q"; + name = "konversation-22.04.0.tar.xz"; }; }; kopeninghours = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz"; - sha256 = "0pfkrns576ll6wc33c8i6pgzd9wf543w2isbvh393zyb1rr3bzgd"; - name = "kopeninghours-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kopeninghours-22.04.0.tar.xz"; + sha256 = "17yxbr86dqyxpgdr35lfvfal1qf38hx8alk2p0j7l8k9yd5zgw5h"; + name = "kopeninghours-22.04.0.tar.xz"; }; }; kopete = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kopete-21.12.3.tar.xz"; - sha256 = "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k"; - name = "kopete-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kopete-22.04.0.tar.xz"; + sha256 = "1hy9z5148c9grh56pr4865hq62x85lnn83kg9f7kx6dnbkwyq408"; + name = "kopete-22.04.0.tar.xz"; }; }; korganizer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/korganizer-21.12.3.tar.xz"; - sha256 = "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r"; - name = "korganizer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/korganizer-22.04.0.tar.xz"; + sha256 = "12qdp5wwii55prc7wih70r1sw7c3dnrwmczhsm3m6gsf4p2px4si"; + name = "korganizer-22.04.0.tar.xz"; }; }; kosmindoormap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz"; - sha256 = "06i616c873lkkpy2iwdjcgwnm6adjrr6rcain2rrb1j4pgzmmbvw"; - name = "kosmindoormap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kosmindoormap-22.04.0.tar.xz"; + sha256 = "1gxw614nydmqc8s83wi6aranw4jd24zvbjky2sdfryph0gr14zg1"; + name = "kosmindoormap-22.04.0.tar.xz"; }; }; kpat = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpat-21.12.3.tar.xz"; - sha256 = "1jd9457hf15d2l6njkfyj9a7lfyabcm80vz3zjb2cykm16x3sdb8"; - name = "kpat-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpat-22.04.0.tar.xz"; + sha256 = "0kd4cxgwg7336q27api51g2xa7d20nypm32rpm9vq3cq112jwpi7"; + name = "kpat-22.04.0.tar.xz"; }; }; kpimtextedit = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpimtextedit-21.12.3.tar.xz"; - sha256 = "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl"; - name = "kpimtextedit-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpimtextedit-22.04.0.tar.xz"; + sha256 = "0j01yn28j58y05v9cf6fyjal79n0rydddsga00aqkbksf80pd93p"; + name = "kpimtextedit-22.04.0.tar.xz"; }; }; kpkpass = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpkpass-21.12.3.tar.xz"; - sha256 = "05f88hlqxfak94jy8afiv91dgzxd9qgrkarnqi9rv1f5a3j7k3k7"; - name = "kpkpass-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpkpass-22.04.0.tar.xz"; + sha256 = "0fk789wgx9ks99cfd7b8w62nw7820s53mb9zv9vkzy9mma4640q3"; + name = "kpkpass-22.04.0.tar.xz"; }; }; kpmcore = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpmcore-21.12.3.tar.xz"; - sha256 = "19h0ag54xzv4hwh950hshjghd4fb9xkdg8rlx6lvqa0w9b8admva"; - name = "kpmcore-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpmcore-22.04.0.tar.xz"; + sha256 = "1fwdyr37q8bk7mwr2v7q9704q4ykwgg6ak08ss3vvlzsj981dvxh"; + name = "kpmcore-22.04.0.tar.xz"; }; }; kpublictransport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz"; - sha256 = "1jcba5bq320afzfs5ly3vyyicdix8fprpr02x67v8p7mdzg58cq6"; - name = "kpublictransport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpublictransport-22.04.0.tar.xz"; + sha256 = "1nc7z7czr24wbwdpgj9vv8p3kn2hdqpf88q7q2776zh64ghi1mrc"; + name = "kpublictransport-22.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kqtquickcharts-21.12.3.tar.xz"; - sha256 = "0gl9c8zfn440202l82y4nfng0hyhivby8a4hf91rphi8f1xfxxmr"; - name = "kqtquickcharts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kqtquickcharts-22.04.0.tar.xz"; + sha256 = "1pn0c8wpbd88g26g65yd0pv5xzz27k5bmx7k6as7k3s41y96lpn5"; + name = "kqtquickcharts-22.04.0.tar.xz"; }; }; krdc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/krdc-21.12.3.tar.xz"; - sha256 = "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j"; - name = "krdc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/krdc-22.04.0.tar.xz"; + sha256 = "1rykh19g4fb7kadzg2i3kgf1s1qdm31z5hdq4yx60v009lmsa2r5"; + name = "krdc-22.04.0.tar.xz"; }; }; kreversi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kreversi-21.12.3.tar.xz"; - sha256 = "0lbypkh6lc5af43c2p19gs2c53icxd26abxf5rhs2c8182gr39b8"; - name = "kreversi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kreversi-22.04.0.tar.xz"; + sha256 = "0mzwjkgzv3f8y7wkbfy5gvww2gl6kww8wq2s1kwayv8cimvxmlzq"; + name = "kreversi-22.04.0.tar.xz"; }; }; krfb = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/krfb-21.12.3.tar.xz"; - sha256 = "1r8lvvh2z8xi0l3pizlpl12nm4fnbpgiwqmx18w8i51x4j27dv0n"; - name = "krfb-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/krfb-22.04.0.tar.xz"; + sha256 = "145wi252ah38c45p08jjwzd7f07d993mvn7nq30xc6vvs5mwgmia"; + name = "krfb-22.04.0.tar.xz"; }; }; kross-interpreters = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kross-interpreters-21.12.3.tar.xz"; - sha256 = "0wyr3xwdkb2fiadzh5lhjli1g0mbxjw353q7k1vbi2wxg5b9042g"; - name = "kross-interpreters-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kross-interpreters-22.04.0.tar.xz"; + sha256 = "0nff5k9372yj8aqnbgfb4ljcmdg598jkfwrcpkay9vf51krimspp"; + name = "kross-interpreters-22.04.0.tar.xz"; }; }; kruler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kruler-21.12.3.tar.xz"; - sha256 = "0jmb3a907jx0s80865lmd7in8ggdf30gdbgykpalzfrv7nkjamzr"; - name = "kruler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kruler-22.04.0.tar.xz"; + sha256 = "0ifd32x0xwrzx6whjja71qhwvzgsv956dxs05vsb4gw10sv8kwgl"; + name = "kruler-22.04.0.tar.xz"; }; }; kshisen = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kshisen-21.12.3.tar.xz"; - sha256 = "1i11gh87gfza58rpdd44pjb423an9a44cls117ba9gznxm67cph5"; - name = "kshisen-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kshisen-22.04.0.tar.xz"; + sha256 = "0p1bxyayl5nlik9ksssqy1sa543zv9chi6cq10sic46gwz6cxbhr"; + name = "kshisen-22.04.0.tar.xz"; }; }; ksirk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksirk-21.12.3.tar.xz"; - sha256 = "1ipnkg2mgj37g5s5ihlys176kn2c11f3d57xr9zhqf8fvkvrkfm0"; - name = "ksirk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksirk-22.04.0.tar.xz"; + sha256 = "1ys3k3y4gkyd7691yd7r7pr1csm05hmfvm60iwkv6g1a7imsanp7"; + name = "ksirk-22.04.0.tar.xz"; }; }; ksmtp = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksmtp-21.12.3.tar.xz"; - sha256 = "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2"; - name = "ksmtp-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksmtp-22.04.0.tar.xz"; + sha256 = "15v7bqx6y2cvj71v30zdscddv5xc1vqxq2h6r1f2c1i1ppg0x91d"; + name = "ksmtp-22.04.0.tar.xz"; }; }; ksnakeduel = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksnakeduel-21.12.3.tar.xz"; - sha256 = "06rill73xhhxra7kmbvwwriv9vbi91641z334ry1m4rr1qm2cdd6"; - name = "ksnakeduel-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksnakeduel-22.04.0.tar.xz"; + sha256 = "0d03ixx8fid3wagcajasasd1h9j87wxxix7521fmnq5qhdd77nyl"; + name = "ksnakeduel-22.04.0.tar.xz"; }; }; kspaceduel = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kspaceduel-21.12.3.tar.xz"; - sha256 = "0dv539jlpkj8hr4cz0ncqm3scg6ja3s41p37bpqd94zicfvzxw84"; - name = "kspaceduel-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kspaceduel-22.04.0.tar.xz"; + sha256 = "0gyblvlcrbdspdf740mp4587f04lnl8jm5qq0gl5gmfads7l90bh"; + name = "kspaceduel-22.04.0.tar.xz"; }; }; ksquares = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksquares-21.12.3.tar.xz"; - sha256 = "1wbrakq1wnwp558y140j9vbid3g0k332rwbilky7z11c0giiv76x"; - name = "ksquares-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksquares-22.04.0.tar.xz"; + sha256 = "122i3wwbvvc66i8mzmql3z4s23nmjc9k9rfbl9v0202hcalgzhv8"; + name = "ksquares-22.04.0.tar.xz"; }; }; ksudoku = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksudoku-21.12.3.tar.xz"; - sha256 = "1gw0ybwhvg1z8pcs72f73y52jvzvrw367g275axf2rw50iik6jwv"; - name = "ksudoku-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksudoku-22.04.0.tar.xz"; + sha256 = "088bkzx1n81al774h2n9nvkhsg42alc5n4fffh490lx3ys8ckdgq"; + name = "ksudoku-22.04.0.tar.xz"; }; }; ksystemlog = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksystemlog-21.12.3.tar.xz"; - sha256 = "0jkd0rx0xlzwsxa3s40sp5x4r19a9rg1x9klpnjfw0b326vgf2m9"; - name = "ksystemlog-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksystemlog-22.04.0.tar.xz"; + sha256 = "1927515lh64qk041d5qpshx4fy3k5hsnzv6c2jqdsa39fll5wli5"; + name = "ksystemlog-22.04.0.tar.xz"; }; }; kteatime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kteatime-21.12.3.tar.xz"; - sha256 = "0i3ps1a8y8crmxf1631q4zjfa0zglqhq1rk6id5v2xx8f10rkh54"; - name = "kteatime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kteatime-22.04.0.tar.xz"; + sha256 = "1xhxz2x1a35vsibgn8myqg976gqdhipsw48c961f0vfzyw9q62gk"; + name = "kteatime-22.04.0.tar.xz"; }; }; ktimer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktimer-21.12.3.tar.xz"; - sha256 = "0s6zbygxnk69dciyz1iv1d6whfcv637licsd07n7fc8bsygqjl5p"; - name = "ktimer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktimer-22.04.0.tar.xz"; + sha256 = "0zg5hk69wz395b8faz7s8sxl3ncr6vkybz0zd3m70cm85cxv5jwv"; + name = "ktimer-22.04.0.tar.xz"; }; }; ktnef = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktnef-21.12.3.tar.xz"; - sha256 = "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl"; - name = "ktnef-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktnef-22.04.0.tar.xz"; + sha256 = "0kk50qf8k7q9qsdqwr2fy580adw3a4a6x0q4a825smch1m35wih0"; + name = "ktnef-22.04.0.tar.xz"; }; }; ktorrent = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktorrent-21.12.3.tar.xz"; - sha256 = "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd"; - name = "ktorrent-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktorrent-22.04.0.tar.xz"; + sha256 = "1yclmg4hjvss0l2q0pzc1j9gz2nqwgj37kcvacxa38n6l5clfxb2"; + name = "ktorrent-22.04.0.tar.xz"; }; }; ktouch = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktouch-21.12.3.tar.xz"; - sha256 = "0wi01gr85sxs4qhvnwkkp1230wnvz7gdr74zar03rc3wzwgv22nd"; - name = "ktouch-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktouch-22.04.0.tar.xz"; + sha256 = "03qr1q4nhayklkwyskh3wf5c101l90b9h8lp9v11y63gpzicsxhh"; + name = "ktouch-22.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-accounts-kcm-21.12.3.tar.xz"; - sha256 = "1ydsfiw67avgwswvpy85s3siggyi4w610yqz5dyl535i6my1kl5n"; - name = "ktp-accounts-kcm-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-accounts-kcm-22.04.0.tar.xz"; + sha256 = "0crhb1p09varma77awfq0a4dx9cjyqra5h7inlv0d4bb7vm7zd43"; + name = "ktp-accounts-kcm-22.04.0.tar.xz"; }; }; ktp-approver = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-approver-21.12.3.tar.xz"; - sha256 = "0mvczpc0dy2m0dn25r2h2js3hw7s0qr8zl3syvqbyqqs51s59xnl"; - name = "ktp-approver-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-approver-22.04.0.tar.xz"; + sha256 = "1zgii0sclcxi1dhainpcbqyadcwmks84clmchld47kq1wjm5w0xa"; + name = "ktp-approver-22.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-auth-handler-21.12.3.tar.xz"; - sha256 = "0lgg0ify9mbsd8has8ingkq3m0g91r9gvfq85s2xf90cwc1s429c"; - name = "ktp-auth-handler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-auth-handler-22.04.0.tar.xz"; + sha256 = "0cf6swv24pp7s5hf5nv3c6ipk2zmr6w6ikg16wzwcyva56h8izq8"; + name = "ktp-auth-handler-22.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-call-ui-21.12.3.tar.xz"; - sha256 = "1npr8qbpxx25pm9mky9sd0qngc5wphmy5blvl6qy7nvs2rqszgam"; - name = "ktp-call-ui-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-call-ui-22.04.0.tar.xz"; + sha256 = "0gy6sw403j129i81nhvcnvahlymvj5k8y8p37w935lzws0vr0r0p"; + name = "ktp-call-ui-22.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-common-internals-21.12.3.tar.xz"; - sha256 = "0spr2gs5d561agvipkipwcxk2zjlhzvp6swdh8rcv23qr6igqjq6"; - name = "ktp-common-internals-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-common-internals-22.04.0.tar.xz"; + sha256 = "1fd5wvmirlaxv43c72d3z7hncf434nb8fvr4g5nxiw69i0il8mvr"; + name = "ktp-common-internals-22.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-list-21.12.3.tar.xz"; - sha256 = "1qn3bmwl4kvm5ikbr0ycy2znm4c2yv4m5863d4vakr8xhhappamp"; - name = "ktp-contact-list-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-list-22.04.0.tar.xz"; + sha256 = "1nqr6qq12rg1vf20v89q7qvp9b7karybk4662ci7qbjyj9s2xgj9"; + name = "ktp-contact-list-22.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-runner-21.12.3.tar.xz"; - sha256 = "0bwi0j733jnwiqlxv8nik1whdvk4aggfayy2bcwwpj5zdzr3mbga"; - name = "ktp-contact-runner-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-runner-22.04.0.tar.xz"; + sha256 = "1s1dkp5cybia28k07xwa7180h8m2cm8y381kkpkg4pi6izadqfn8"; + name = "ktp-contact-runner-22.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-desktop-applets-21.12.3.tar.xz"; - sha256 = "01h26jsdb7mkw8isxpy4sfpdn11q209xqhhpnk7xvchs8fpl5fni"; - name = "ktp-desktop-applets-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-desktop-applets-22.04.0.tar.xz"; + sha256 = "1n5vlhlh1jasc87zdm9k8srpr7y67lzal36vdc4jbl9jlc96gm8n"; + name = "ktp-desktop-applets-22.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-filetransfer-handler-21.12.3.tar.xz"; - sha256 = "0aq5ii7b2kk0qan4qph9glapp81sgqm2zzbdknggxz7vkhj5y6lk"; - name = "ktp-filetransfer-handler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-filetransfer-handler-22.04.0.tar.xz"; + sha256 = "01b1xid6zbvgnyp5fm5sp7gli0hhpa3a538pn469i50d61rhhnrv"; + name = "ktp-filetransfer-handler-22.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-kded-module-21.12.3.tar.xz"; - sha256 = "0921lahpqjx094ngk68pphkv306ajgxbp6yb0hkckmlic4f2hm37"; - name = "ktp-kded-module-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-kded-module-22.04.0.tar.xz"; + sha256 = "0m1rslk778j1kvx3f4cgiz925sd72kg4b3dhg3hjlmm95ypnf8d0"; + name = "ktp-kded-module-22.04.0.tar.xz"; }; }; ktp-send-file = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-send-file-21.12.3.tar.xz"; - sha256 = "0vvg0qz2zxckqqwfibsl88w0mpa7a0lzskwhzbvzir03x14rwjlc"; - name = "ktp-send-file-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-send-file-22.04.0.tar.xz"; + sha256 = "1v7gzq2pivbxf4ypqg8k3ihya7cpyw3bmxda3f7a8x1n60z7pfx7"; + name = "ktp-send-file-22.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-text-ui-21.12.3.tar.xz"; - sha256 = "046611abkdn7qqh6n4v8ssdzg10q4g14rji7klypmccfng0px2xg"; - name = "ktp-text-ui-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-text-ui-22.04.0.tar.xz"; + sha256 = "1v25qqclqssdq2v9h010jib3cm5an5h7cyyrlmc4f5jx76d82rzj"; + name = "ktp-text-ui-22.04.0.tar.xz"; }; }; ktuberling = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktuberling-21.12.3.tar.xz"; - sha256 = "1awsn285j9nggyypkra9ladgi46w2m7m09d8364w5d0sygpzmgsg"; - name = "ktuberling-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktuberling-22.04.0.tar.xz"; + sha256 = "19cxpxwyzcy3vif7q5rmzzr1qa1bhql2l309psi66b4yndxs1n8q"; + name = "ktuberling-22.04.0.tar.xz"; }; }; kturtle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kturtle-21.12.3.tar.xz"; - sha256 = "1689skwk2dwm4mrl2mrakb1cn74nyxd6xa8ipxsip5zhjgkkvg23"; - name = "kturtle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kturtle-22.04.0.tar.xz"; + sha256 = "09w4wf7w5bck2ca59gsszjdyvyfwir9vwk5wwp0xciky1qwb2hpx"; + name = "kturtle-22.04.0.tar.xz"; }; }; kubrick = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kubrick-21.12.3.tar.xz"; - sha256 = "0hx81cp1lql74c9067dw7mi78c6sp6p1a035j2nzjn9drpxal6p2"; - name = "kubrick-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kubrick-22.04.0.tar.xz"; + sha256 = "0k624kl2cv06r04b7y1dp7zyhcqampqa10cy77df6am20v6n0za3"; + name = "kubrick-22.04.0.tar.xz"; }; }; kwalletmanager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwalletmanager-21.12.3.tar.xz"; - sha256 = "01xif44iz1ik32swlrzzjycizy4hjlis1f336qc9p7affjyv2797"; - name = "kwalletmanager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwalletmanager-22.04.0.tar.xz"; + sha256 = "05zc9aib2wnzn45mrcg59qkyfrwzxanddnnpv7z74ydw1ap28f6k"; + name = "kwalletmanager-22.04.0.tar.xz"; }; }; kwave = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwave-21.12.3.tar.xz"; - sha256 = "07xbbii5gpllbpmkxfv5kwxawd390zp0angh94xjk0yq71lvdav2"; - name = "kwave-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwave-22.04.0.tar.xz"; + sha256 = "17a2gzawp9pg5aqmj3433qrqrh03yj5ldivnzr7alf5qdvj7p1c6"; + name = "kwave-22.04.0.tar.xz"; }; }; kwordquiz = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwordquiz-21.12.3.tar.xz"; - sha256 = "1p06ki75zy4il6k9siavqddpr9j02z3lbnd14pxwk42fhfmbx057"; - name = "kwordquiz-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwordquiz-22.04.0.tar.xz"; + sha256 = "0pss1vz890hmv03g9gl1v6bmf73ga484qzp2j5x3mp1w3ks93s73"; + name = "kwordquiz-22.04.0.tar.xz"; }; }; libgravatar = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libgravatar-21.12.3.tar.xz"; - sha256 = "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7"; - name = "libgravatar-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libgravatar-22.04.0.tar.xz"; + sha256 = "0zkbs3zniahfbhzf7qghm7d478vbhm1ifvv44xl4m596rhm18ibs"; + name = "libgravatar-22.04.0.tar.xz"; }; }; libkcddb = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkcddb-21.12.3.tar.xz"; - sha256 = "14f1mzsfm0vyqzsyja0p8ln1105sw5dr6fssj25j0qw4rnf9yw32"; - name = "libkcddb-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkcddb-22.04.0.tar.xz"; + sha256 = "0x87pg6djih6sssd7zjqarnry9v9n6kbk2zirjgp8nic272irjfx"; + name = "libkcddb-22.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkcompactdisc-21.12.3.tar.xz"; - sha256 = "1vmaf3b41sj0sm4k9zdliy5ba4ps5z0cwabggfish152wzw34kgn"; - name = "libkcompactdisc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkcompactdisc-22.04.0.tar.xz"; + sha256 = "152zq2c23cf13lmc6895pcw36plhb8is4hilf9jvcgx0jmzgs5kz"; + name = "libkcompactdisc-22.04.0.tar.xz"; }; }; libkdcraw = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdcraw-21.12.3.tar.xz"; - sha256 = "1pyqsaaficwxbg6hk8xg8srq79i6xdxvghkn2rf54zj1435d9kva"; - name = "libkdcraw-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdcraw-22.04.0.tar.xz"; + sha256 = "0y9yvdfhbn0fy81y6d16r1vjcfxiq8g4wy6y5gqmkvzxhydfwb7r"; + name = "libkdcraw-22.04.0.tar.xz"; }; }; libkdegames = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdegames-21.12.3.tar.xz"; - sha256 = "0x5mw25c8hmnxhcxc2xm19xmgdxfbx89nrxfl6mzfrh8myr3ybsb"; - name = "libkdegames-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdegames-22.04.0.tar.xz"; + sha256 = "0xif6jpdm9x0c6f4p8wy7lkyhxd1ckgw5vxn1d16v06jpw6xin2d"; + name = "libkdegames-22.04.0.tar.xz"; }; }; libkdepim = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdepim-21.12.3.tar.xz"; - sha256 = "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww"; - name = "libkdepim-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdepim-22.04.0.tar.xz"; + sha256 = "14cq8zm2ldhql91v8cc9g9v81ny0g1x06qfj2jwlqjccmphywncd"; + name = "libkdepim-22.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkeduvocdocument-21.12.3.tar.xz"; - sha256 = "16kk7ij2qxy5abgv9hgk1ycbx0f2gnpc9lxqbhl5sq9vxd4nblv0"; - name = "libkeduvocdocument-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkeduvocdocument-22.04.0.tar.xz"; + sha256 = "0d4pxjvnnri45q8dn7r7qi9vv7kd8g35mhkc9jh80mqw5817pl5h"; + name = "libkeduvocdocument-22.04.0.tar.xz"; }; }; libkexiv2 = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkexiv2-21.12.3.tar.xz"; - sha256 = "0r2m6d9rw0r6rm6xqpj1i3w0hplhivy8h90zggqynfzvfyr9c529"; - name = "libkexiv2-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkexiv2-22.04.0.tar.xz"; + sha256 = "0h3zjldpjz2jvkwp6scpxwjmxm5l0bcs25ivrl8s3yjjggil53wx"; + name = "libkexiv2-22.04.0.tar.xz"; }; }; libkgapi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkgapi-21.12.3.tar.xz"; - sha256 = "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx"; - name = "libkgapi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkgapi-22.04.0.tar.xz"; + sha256 = "0gvr1ins5sbf8q10waqgjpricvz5v5d8q0i6q4q3r0hncg7i21rw"; + name = "libkgapi-22.04.0.tar.xz"; }; }; libkipi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkipi-21.12.3.tar.xz"; - sha256 = "0w2kwi6djwp8mhmpfrr16v8fgmwjmsc89rcwpfhgii1p68xia8gc"; - name = "libkipi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkipi-22.04.0.tar.xz"; + sha256 = "0xcwjx5kidqbf64b2pd4vlf9vzyjwm1jbbm89pyb2myiadkngzkj"; + name = "libkipi-22.04.0.tar.xz"; }; }; libkleo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkleo-21.12.3.tar.xz"; - sha256 = "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l"; - name = "libkleo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkleo-22.04.0.tar.xz"; + sha256 = "1vwfa38wh0di2q4999bnw8dfyn8ckph5b88z0v218gl1iwwsxgsf"; + name = "libkleo-22.04.0.tar.xz"; }; }; libkmahjongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkmahjongg-21.12.3.tar.xz"; - sha256 = "114viyqq7zlwsdnm96iyyvj8ma4p06m69hs641yv42xlbkspwbal"; - name = "libkmahjongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkmahjongg-22.04.0.tar.xz"; + sha256 = "0g50qks245zw9g9inzkk9n9bbzambi3pf5sd0m4qcd4hlkq494q3"; + name = "libkmahjongg-22.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkomparediff2-21.12.3.tar.xz"; - sha256 = "1j93lf9adyw581a9i8kc1pj6vadscibw49wvwfs750f0kxn5p0d2"; - name = "libkomparediff2-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkomparediff2-22.04.0.tar.xz"; + sha256 = "0487grz2q8g3cxmirp2mzzk87xljdnakh0lqvjqc0773siwg97ww"; + name = "libkomparediff2-22.04.0.tar.xz"; }; }; libksane = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libksane-21.12.3.tar.xz"; - sha256 = "0ci2284ysh4q8sbhqcg5bis2v02bp5x64h8n0qik14yy24x852zg"; - name = "libksane-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libksane-22.04.0.tar.xz"; + sha256 = "055x396jhkzqzfk54flig4cpn12hfvmsm5x5ini2vhjfdc986fkk"; + name = "libksane-22.04.0.tar.xz"; }; }; libksieve = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libksieve-21.12.3.tar.xz"; - sha256 = "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd"; - name = "libksieve-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libksieve-22.04.0.tar.xz"; + sha256 = "0ybmccxrsfvlsxrhbk4f1szj6y2gz520j5a7mdqwarwj2ba2fnvy"; + name = "libksieve-22.04.0.tar.xz"; }; }; libktorrent = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libktorrent-21.12.3.tar.xz"; - sha256 = "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0"; - name = "libktorrent-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libktorrent-22.04.0.tar.xz"; + sha256 = "0xgh27yi06sx4jc6bfdayc2jx4fbf66939k9amg7m728sgd3yq1h"; + name = "libktorrent-22.04.0.tar.xz"; }; }; lokalize = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/lokalize-21.12.3.tar.xz"; - sha256 = "1gzfiajy377kx0iar85z72zqxh7y9vhp1hs03zzqymazawm9lqnn"; - name = "lokalize-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/lokalize-22.04.0.tar.xz"; + sha256 = "1r6r3bkcnqaj7r398pl30plzs81bwj83lzbmch8pl25v8vksd0w0"; + name = "lokalize-22.04.0.tar.xz"; }; }; lskat = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/lskat-21.12.3.tar.xz"; - sha256 = "1cfs1lfwgxwpn2g56y7jb2c6ijd81bi8ba8ap0yyx6nhv6na072b"; - name = "lskat-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/lskat-22.04.0.tar.xz"; + sha256 = "0nr78krgf6hy3brn94g0lcwkw6bif5ivhhmmx62b4p3iqy6155c0"; + name = "lskat-22.04.0.tar.xz"; }; }; mailcommon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mailcommon-21.12.3.tar.xz"; - sha256 = "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af"; - name = "mailcommon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mailcommon-22.04.0.tar.xz"; + sha256 = "0yx2j9j3pylgliadbc1j2w4jmqb3ydciy7x9swhgf0zm8a0gj0k6"; + name = "mailcommon-22.04.0.tar.xz"; }; }; mailimporter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mailimporter-21.12.3.tar.xz"; - sha256 = "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk"; - name = "mailimporter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mailimporter-22.04.0.tar.xz"; + sha256 = "07rkcnylpalhd774dsvsyv1lg5i8ya2wkn3zmgswvsnlxiymlv2s"; + name = "mailimporter-22.04.0.tar.xz"; }; }; marble = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/marble-21.12.3.tar.xz"; - sha256 = "0v6qd9cl6g8k55mjq2lswsfcxzf88w33nlm1193ps3ac0awjaaa4"; - name = "marble-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/marble-22.04.0.tar.xz"; + sha256 = "0qlrg5vy2rvvgimg1bxlyia5czygqn5gwf1nfkjdm1xk6scj2fgb"; + name = "marble-22.04.0.tar.xz"; }; }; markdownpart = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/markdownpart-21.12.3.tar.xz"; - sha256 = "1drvjrvmd2c36xj3x7kxb7lvk23cmaw8mi976pdfnxn5pdamv6wl"; - name = "markdownpart-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/markdownpart-22.04.0.tar.xz"; + sha256 = "130vm0h07phzg7rdcdijcnr8nlyif7gcf80a7pfxjirxszy3l5zw"; + name = "markdownpart-22.04.0.tar.xz"; }; }; mbox-importer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mbox-importer-21.12.3.tar.xz"; - sha256 = "01bh0yzv23vkicc7lj217rp8c36kyyjlxmkwylss3hakr4b3afan"; - name = "mbox-importer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mbox-importer-22.04.0.tar.xz"; + sha256 = "1j4l6lziyj1vb7m3m6cxlydk3k66iy2ivmrqarl040r2c2xp36wa"; + name = "mbox-importer-22.04.0.tar.xz"; }; }; messagelib = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/messagelib-21.12.3.tar.xz"; - sha256 = "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw"; - name = "messagelib-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/messagelib-22.04.0.tar.xz"; + sha256 = "0ny9qv26a8vi0vg5990bw82jz25balk3j0419ssbgakwybgfgkkb"; + name = "messagelib-22.04.0.tar.xz"; }; }; minuet = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/minuet-21.12.3.tar.xz"; - sha256 = "0r68z3j0j2gbwzj77wvsx1idrfkagj0pjai9j7fbqa0r6q833flr"; - name = "minuet-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/minuet-22.04.0.tar.xz"; + sha256 = "1q74jkkc0yd03xar6bpg62kvwh6kfpvipqvramg91sdi5k77rr56"; + name = "minuet-22.04.0.tar.xz"; }; }; okular = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/okular-21.12.3.tar.xz"; - sha256 = "054rzdqsqkjx2sncyfcnfdvm9bp45sdw3rycmpzicnwpn5j4hcb3"; - name = "okular-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/okular-22.04.0.tar.xz"; + sha256 = "1gz3nal7m0jlcblrzy4d3fszcj03h7z2wmvyj12v459l1k0vmvj7"; + name = "okular-22.04.0.tar.xz"; }; }; palapeli = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/palapeli-21.12.3.tar.xz"; - sha256 = "076igql89sx55hfxjb79248ih4cjbkr1s1jnz46y3dk793rscm8g"; - name = "palapeli-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/palapeli-22.04.0.tar.xz"; + sha256 = "0wixgr17z0mwmb78wn126bvg512z9dbd5gm6k1x9wikhlfi91mkd"; + name = "palapeli-22.04.0.tar.xz"; }; }; parley = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/parley-21.12.3.tar.xz"; - sha256 = "10hv885l0gz5aymf72f42bhkncfarj768nb12q9fxqk4x5rviiw0"; - name = "parley-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/parley-22.04.0.tar.xz"; + sha256 = "0wkjkyddx95rai0p5q6hd47swrykk20g62c5n5hh5picr9yacr98"; + name = "parley-22.04.0.tar.xz"; }; }; partitionmanager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/partitionmanager-21.12.3.tar.xz"; - sha256 = "0x0k3vsbngcb7kvcgqj2w025fn9xvfd2232lx51xfar5r3jb7h1p"; - name = "partitionmanager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/partitionmanager-22.04.0.tar.xz"; + sha256 = "06lhxgwal3fjxyb2v4vvd67r6dyd5hf08hz7lnyp0b0xx7f6fa3q"; + name = "partitionmanager-22.04.0.tar.xz"; }; }; picmi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/picmi-21.12.3.tar.xz"; - sha256 = "0gk1yq5ac55k6lxbxszxpd393fb9k6yphisb71lx2zv9gchl44n6"; - name = "picmi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/picmi-22.04.0.tar.xz"; + sha256 = "0q2wrn323wwwfnf0w6cvw0fhv3fsxhqj3a2qdki9yzz5rb5mc2y9"; + name = "picmi-22.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pim-data-exporter-21.12.3.tar.xz"; - sha256 = "0qcwsbb4zsjgc15fhq9pp341wwm35y9v1lq8gnpjdsvfq2pczq5q"; - name = "pim-data-exporter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pim-data-exporter-22.04.0.tar.xz"; + sha256 = "02h76ividjadlmfmxnc1x2bif3mmgrc4q7yjxzf2jpjqdha80xyq"; + name = "pim-data-exporter-22.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pim-sieve-editor-21.12.3.tar.xz"; - sha256 = "1gp4gpagv6pfiy6gyfh14z1rb16iqm1npmngw6ybjlhh6d424n90"; - name = "pim-sieve-editor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pim-sieve-editor-22.04.0.tar.xz"; + sha256 = "1c9w4bnh3a9w79lakqsv780zqdpl8g6wsax994p6lglzs56xs299"; + name = "pim-sieve-editor-22.04.0.tar.xz"; }; }; pimcommon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pimcommon-21.12.3.tar.xz"; - sha256 = "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517"; - name = "pimcommon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pimcommon-22.04.0.tar.xz"; + sha256 = "0iqmyb9xx8h8ay6yzf9xbrg7c67jlsrywwlljynj7lh4n2wjg3sc"; + name = "pimcommon-22.04.0.tar.xz"; }; }; poxml = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/poxml-21.12.3.tar.xz"; - sha256 = "19hrb75fbh102fw8ajflj4777s7hq7vxv6kbwjir6wzsvdfanwdb"; - name = "poxml-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/poxml-22.04.0.tar.xz"; + sha256 = "15m55qb2wn66nxg0j7jwz0r4zg180dbm1ynnx1yj39iprra9j9k7"; + name = "poxml-22.04.0.tar.xz"; }; }; print-manager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/print-manager-21.12.3.tar.xz"; - sha256 = "1q9vv5v9hivm583hcx8qa7xik9yv4zicrd02abcsn6hvgwmdav8b"; - name = "print-manager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/print-manager-22.04.0.tar.xz"; + sha256 = "0fq4q57nxiingwmkj6hsgvg3gaix6rkgfskpg442vbhc70s280q9"; + name = "print-manager-22.04.0.tar.xz"; }; }; rocs = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/rocs-21.12.3.tar.xz"; - sha256 = "1fgjap71qnaydar9q155is7vwjlkpa8wi1162dsqxr5ywy464wrg"; - name = "rocs-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/rocs-22.04.0.tar.xz"; + sha256 = "1x80ln8px5fywb1zhc569nrpnpv5iyr73vxl1ckh3s337xn44pd7"; + name = "rocs-22.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/signon-kwallet-extension-21.12.3.tar.xz"; - sha256 = "0sv0g50bxxd442ia7wzk2lkqwr8lsjxk5wm3zsskxhql851y0ybm"; - name = "signon-kwallet-extension-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/signon-kwallet-extension-22.04.0.tar.xz"; + sha256 = "1s6jjhqkz2pv2ki87ka8y4b4gqv8wmlc332hrrlfa8cafldrpl9k"; + name = "signon-kwallet-extension-22.04.0.tar.xz"; }; }; skanlite = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/skanlite-21.12.3.tar.xz"; - sha256 = "06dwmdjrss7cqqigg4rwsy5dya35577qwdaxj2jbvs2pkzp9rq3p"; - name = "skanlite-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/skanlite-22.04.0.tar.xz"; + sha256 = "155d62q26xfba7ihbj6mz5vyydl6bkcxzwa6fxn62kgnpq8axdxf"; + name = "skanlite-22.04.0.tar.xz"; + }; + }; + skanpage = { + version = "22.04.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/22.04.0/src/skanpage-22.04.0.tar.xz"; + sha256 = "1n72796546x9fh0bhnlc43mlcrpdqlkph605f8nb7vznkpdnb8zq"; + name = "skanpage-22.04.0.tar.xz"; }; }; spectacle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/spectacle-21.12.3.tar.xz"; - sha256 = "155xin26lkjr0swb281afha906nqy2821lf2spmzzxa3xalzq3sv"; - name = "spectacle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/spectacle-22.04.0.tar.xz"; + sha256 = "07dx9jg9i5s1cg0zsz9s06qipz80dv0bq2q1dfy82p6xrji30pdc"; + name = "spectacle-22.04.0.tar.xz"; }; }; step = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/step-21.12.3.tar.xz"; - sha256 = "0j3w63bxj3b4lrfb0mnchlvsr987v5zwwjw5jrgvqidrhv1rh7dc"; - name = "step-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/step-22.04.0.tar.xz"; + sha256 = "007zbkg8gg56f733wp2dbb0xskja5c6pm3n181lirqq831ai9rnb"; + name = "step-22.04.0.tar.xz"; }; }; svgpart = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/svgpart-21.12.3.tar.xz"; - sha256 = "0yg8sn1z9zfb7a6y61nw7vya516sfaydkgxh7cfwiz7sljl87z8j"; - name = "svgpart-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/svgpart-22.04.0.tar.xz"; + sha256 = "16nz12sc1zgyaa6rilqymfcw0waj0ha8xydlsbgv83v1wqlxlfwj"; + name = "svgpart-22.04.0.tar.xz"; }; }; sweeper = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/sweeper-21.12.3.tar.xz"; - sha256 = "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246"; - name = "sweeper-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/sweeper-22.04.0.tar.xz"; + sha256 = "1fvjq1pcqnadpvkh5jdlb62l54x7r99zshd59jdxy6h7fji3pkbs"; + name = "sweeper-22.04.0.tar.xz"; }; }; umbrello = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/umbrello-21.12.3.tar.xz"; - sha256 = "1i94l5hnn8hl0dgdq8sj5xm2vk372zfcnch9qvf9gcvhg08gdif6"; - name = "umbrello-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/umbrello-22.04.0.tar.xz"; + sha256 = "1n3jvsrzmfzm7x9f125hsf8i80r0iiqzv80ddc7fpzdyxpd83xpl"; + name = "umbrello-22.04.0.tar.xz"; }; }; yakuake = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/yakuake-21.12.3.tar.xz"; - sha256 = "10mkr8svkjf2s023mf21cil2c5v986s5b2yp1hm0fzdgmawpwrh9"; - name = "yakuake-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/yakuake-22.04.0.tar.xz"; + sha256 = "01i0ddgz81mzqlnj6cvslzv2h1nbz238hg75izfpbajvzm46pydp"; + name = "yakuake-22.04.0.tar.xz"; }; }; zanshin = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/zanshin-21.12.3.tar.xz"; - sha256 = "1cwawpmx5hc60zkdkyh484lp3bwiipn6c3yh164gzw769vz9zr71"; - name = "zanshin-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/zanshin-22.04.0.tar.xz"; + sha256 = "1d0sn9km4xdxs28avhxpc1xpkm5bcmg8i06x97xvls4cxh3nbgm9"; + name = "zanshin-22.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/zeroconf-ioslave-21.12.3.tar.xz"; - sha256 = "09jmf233njbqam1swzvpzfgdplpjzdx48vjy6kcpmjvg2qlm7i2l"; - name = "zeroconf-ioslave-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/zeroconf-ioslave-22.04.0.tar.xz"; + sha256 = "0nppr0qm5aqail1y370b26ky9snz033j3ij9sykc1yq9il8kkpp4"; + name = "zeroconf-ioslave-22.04.0.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index 10bf27038ae..7c98275b917 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -23,6 +23,8 @@ mkDerivation { extra-cmake-modules kdoctools ]; + outputs = [ "out" "dev" ]; + meta = { homepage = "https://yakuake.kde.org"; description = "Quad-style terminal emulator for KDE"; diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix new file mode 100644 index 00000000000..eb4f812767a --- /dev/null +++ b/pkgs/applications/logging/sosreport/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, gettext +, pexpect +}: + +buildPythonPackage rec { + pname = "sosreport"; + version = "4.3"; + + src = fetchFromGitHub { + owner = "sosreport"; + repo = "sos"; + rev = version; + sha256 = "sha256-fLEYRRQap7xqSyUU9MAV8cxxYKydHjn8J147VTXSf78="; + }; + + patches = [ + (fetchpatch { + # fix sos --help + url = "https://github.com/sosreport/sos/commit/ac4eb48fa35c13b99ada41540831412480babf8d.patch"; + sha256 = "sha256-6ZRoDDZN2KkHTXOKuHTAquB/HTIUppodmx83WxxYFP0="; + }) + ]; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = [ + pexpect + ]; + + # requires avocado-framework 94.0, latest version as of writing is 96.0 + doCheck = false; + + preCheck = '' + export PYTHONPATH=$PWD/tests:$PYTHONPATH + ''; + + pythonImportsCheck = [ "sos" ]; + + meta = with lib; { + description = "Unified tool for collecting system logs and other debug information"; + homepage = "https://github.com/sosreport/sos"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 62b2b1fefdd..ffd4103e214 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.0.2"; + version = "2.1.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-DhKxY4Ry1IpT16UC3HbbUSKWzhGm/0R7rYrvqupg/Zo=" "zip"; - i686-linux = fetch "linux_386" "sha256-ANoOYjG4+mci6TdF4HC9fP8e5eAckrbZITRuA1fqtCA=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-uPudElKu30smsupSIvGAmrF/f9TXoTzyUfSrUAvTDWw=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-P5qsy4kiE/DMJnJr3EUHMcb0KoUZyO2BQ5PIosPbnI8=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-DTYWqhawyAQBIxMUksZheyN8WSVPyhCghZC8orxKsBk=" "zip"; + i686-linux = fetch "linux_386" "sha256-JBjiKxbJnFILSOVnOUIcY3GpbOT2UOJlasTSPRyYz4I=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-PfVOvUF8Rls29VzfIj1U6/VFv1H6lj2K3Dz6DWmh2fs=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-Cn3/+Dvk5hW9rvxu4I9ghHSS1yWSAeQq3gx+6dvFiIk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 698925220aa..afdfc6c905e 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0"; + version = "1.5.0c"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A="; + sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 8ea024320c3..87c43628c4f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g9GaCc/IWKtih0/A2AZEPImjj7ymJIdYwC5I/6GUh5c="; + sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index d34770051d0..8daf50f82e7 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.14.2"; + version = "0.14.6"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; + sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 7e320e5f367..fa4b5457e4f 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.03.23-4-android"; + version = "2022.04.27-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; - rev = version; - sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo="; + rev = "${version}-android"; + sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ mkDerivation rec { echo "exit 0" > tools/unix/check_cert.sh # crude fix for https://github.com/organicmaps/organicmaps/issues/1862 - echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh + echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh ''; nativeBuildInputs = [ @@ -64,19 +64,14 @@ mkDerivation rec { bash ./configure.sh ''; + # Tell the program that the read-only and the read-write data locations + # are different, and create the read-write one. + # https://github.com/organicmaps/organicmaps/issues/2387 postInstall = '' - install -Dm755 OMaps $out/bin/OMaps - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. wrapProgram $out/bin/OMaps \ --add-flags "-resources_path $out/share/organicmaps/data" \ --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - - mkdir -p $out/share/organicmaps - cp -r ../data $out/share/organicmaps/data - install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png - install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop ''; meta = with lib; { diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 20b944efd5d..928a71b6904 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,17 +1,19 @@ -{ lib, python3Packages, ffmpeg }: +{ lib +, python3 +, ffmpeg +}: -python3Packages.buildPythonApplication rec { - version = "2.2"; - pname = "sigal"; +python3.pkgs.buildPythonApplication rec { + pname = "sigal"; + version = "2.3"; + format = "setuptools"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version pname; - sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo="; + hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q="; }; - disabled = !(python3Packages.pythonAtLeast "3.6"); - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ # install_requires jinja2 markdown @@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec { checkInputs = [ ffmpeg - ] ++ (with python3Packages; [ + ] ++ (with python3.pkgs; [ pytestCheckHook ]); - makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; meta = with lib; { description = "Yet another simple static gallery generator"; - homepage = "http://sigal.saimon.org/en/latest/index.html"; - license = licenses.mit; + homepage = "http://sigal.saimon.org/"; + license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 39eadc84370..230abcf2851 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -13,19 +13,20 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "1yqxk6nfxc1xhk59qbz9m3wqkxv446g17pazvanpavriiysjzbrs"; + hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s="; }; nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; buildInputs = [ libappindicator librsvg ]; propagatedBuildInputs = with python3Packages; [ + evdev gobject-introspection gtk3 psutil diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 14b57d5dd13..5f54f70c113 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -191,6 +191,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno + ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8abd8fbdad5..24e5264aeb4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "100.0.4896.127", - "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427", - "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh", + "version": "101.0.4951.41", + "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", + "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } }, "chromedriver": { - "version": "100.0.4896.60", - "sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31", - "sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9", - "sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y" + "version": "101.0.4951.15", + "sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24", + "sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b", + "sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9" } }, "beta": { @@ -32,9 +32,9 @@ } }, "dev": { - "version": "102.0.5005.12", - "sha256": "11n03hz3g8h7srywxrjwrdrxybdjvmdjrnigjlrwjkydprg1l7ab", - "sha256bin64": "0hc56a98ikkbgdw36dpz9k6r15jmjmnm7faml8z59vixxlvkrw7y", + "version": "102.0.5005.22", + "sha256": "12s4w8qs71a7r13mm28w6kld2q21srwalsy2yfcys4kjmfp4gqfa", + "sha256bin64": "07jj7nvgalzvxacx6srccc82ggckzj4x10w1k2zskcyxpblnd7fc", "deps": { "gn": { "version": "2022-04-14", diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 517ab55d9d2..2b80dfc6815 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }: buildGoModule rec { pname = "kompose"; @@ -26,7 +26,7 @@ buildGoModule rec { done ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = kompose; command = "kompose version"; }; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 936e7682348..acc3370ce83 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0="; + sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U="; }; - vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk="; + vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index db7771bc3c9..d678e3b517b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA="; + sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 234d4910288..e18c0f21ae3 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -30,7 +30,23 @@ mkDerivation rec { sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; excludes = [ "CMakeLists.txt" ]; }) + # Fixes for building calligra with modern poppler[-qt5] + (fetchpatch { + name = "poppler-22.03.0.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch"; + sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY="; + }) + # Fixes for building calligra with gcc11/c++17 + (fetchpatch { + name = "build_c++17_poppler.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch"; + sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA="; + }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + ''; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index c9bf60a1eb9..ced8244256a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; + sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o="; }; - cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; + cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 58b3fb1d20f..577d7b5b08e 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.24"; + version = "2.24.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-p5zAehhqOUlKay3/Oy8hbBo5nQRIyE7o4bnaX/TabYc="; + sha256 = "sha256-mYCKmvI15a0ohQwxPIG8IuzNt4QvEs6Q35oMO+e5hbg="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 5a3e76ffcaf..6ae5759f6d1 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -16,7 +16,7 @@ , xkeyboard_config , glib , libarchive -, python +, python2 }: let @@ -155,7 +155,7 @@ buildFHSUserEnv { glib libarchive xdg-utils # xdg-open needed to open URLs - python + python2 # currently they want python 3.6 which is EOL #python3 ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 367f43deb80..b6318dae7bb 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-l/9jOvZ4nn/wy+XPRoT1lojfGvPEXhPz2FJjLpZ/EE8="; + sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5855eee6379..2d35b1c4a03 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o="; + sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index db3ed3500e3..c937cce79b1 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,19 +8,24 @@ buildGoModule rec { pname = "lima"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GS/mzBoVL78U7vMxkbnQfb89U640w8YdA8YhPH4Iwrc="; + sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w="; }; - vendorSha256 = "sha256-funVyM0RhDzGQPyzsABzXu3ETPYJwRosqkQreGBADZc="; + vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA="; nativeBuildInputs = [ makeWrapper installShellFiles ]; + # clean fails with read only vendor dir + postPatch = '' + substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + ''; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 99c31edd2fd..ed87d6a8ad8 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -5,17 +5,18 @@ , breeze-icons , hicolor-icon-theme , pantheon +, gitUpdater }: stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.9.1"; + version = "2.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-ZUSG9lui07ICG/4M6LBEAhJo9KuKd+wMb2VoKu5Ifmg="; + sha256 = "sha256-aNN7ZoD4hZTw39Rwef4HRHzNzCM6O8Ev+37jZOfzN7s="; }; nativeBuildInputs = [ @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Icon pack based on marwaita and papirus icons"; homepage = "https://github.com/darkomarko42/Luna-Icons"; diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 3cbc2b2cfdd..5a0722af21c 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "42.1"; + version = "42.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8QMj08MvvRqDFU+/0qJ+yj7pDZwbJSNfGxX+3l+xE6M="; + sha256 = "Rd6Oa4ofMd5amRC+GMB/CaMo2HU434BAOuxa+IF8ljE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 10267a6c870..058984ca747 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao="; + sha256 = "0SKBy78a+GxyN1/mrZNG7Q4sLziKHq6FjOzmQGCm66g="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 3d2ad08fc6d..03788d94378 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "42.1"; + version = "42.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ATHuOY32n2tOZ9YU1pElatZJgihCRXQU64iaI7/rmfo="; + hash = "sha256-pEZqYsL+7GLn9XLwkpxY24iyXWCVuv5LFZHpnPqaDuY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index e89f616680c..2dc810ee050 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4="; + sha256 = "MtAFaYoAuK5er5Hk5/hlnvQwCnmPyuaiK3TC1/z2pIY="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index bca93ca7bc5..8429282ab36 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.42.0"; + version = "3.42.1"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8="; + sha256 = "oI4MjmJmFe4sI/90Yo66b4tIaHXdVDccp+LXYFtyqHw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 5404c0c7753..193db77c366 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -49,6 +49,7 @@ let screengrab = callPackage ./screengrab {}; qlipper = callPackage ./qlipper {}; lxqt-archiver = callPackage ./lxqt-archiver {}; + xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {}; preRequisitePackages = [ libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel @@ -92,7 +93,6 @@ let optionalPackages = [ ### LXQt project qterminal - compton-conf obconf-qt lximage-qt lxqt-archiver @@ -101,11 +101,8 @@ let qps screengrab - ### Qlipper - qlipper - ### Default icon theme - libsForQt5.oxygen-icons5 + libsForQt5.breeze-icons ### Screen saver pkgs.xscreensaver diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fd7c7758f2b..136aaae05bb 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "1kk2cv9cp2gdj2pzdgm72c009iyl3mhrvsiz05kdxd4v1kn38ci1"; + sha256 = "kF3u1Eh45l/HvL5R0PazIfGIdOVYyB2VAI33NwRfLJk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 8e17437b472..c59c4faac0e 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "08cqvq99pvz8lz13273hlpv8160r6zyz4f7h4kl1g8xdga7m45gr"; + sha256 = "vfqEB9Vh/BL47dlEvnyWwDBO0pRIUS1IuixW8A0PRds="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index b6294e20dce..128be738497 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "14jrzwdmhgn6bcggmhxx5rdapjzm93cfkjjls3nii1glnkwzncxz"; + sha256 = "llE4OxI4I/n0P8Pv5tKT3tXM7IfD3VMQSxdaLkBJ4Gk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 510339b46f5..7233b638a4a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1bf0smkawyibrabw7zcynwr2afpsv7pnnyxn4nqgh6mxnp7al157"; + sha256 = "QvQ0LBGP9XD7vwuUD+A1x8oGDvqTeCkYyd2XyjU0fUo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index abab373430b..42c9084852c 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1fr2mx19ks4crh7cjc080vkrzldzgmghxvrzjqq7lspkzd5a0pjb"; + sha256 = "GTnjmMVbkO5CeNLxNisD6XncqX32otaATZSka4YVNHo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 120014b25f6..bfbe7a96344 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "06l7vs8aqx37bhrxf9xa16g7rdmia8j73q78qfj6syw57f3ssjr9"; + sha256 = "A5dpw/vG92tC4W1q1wpDyMdRn1ScEH7m287MCEGOp9w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index a6560198f6b..d683ed78a0c 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "033lq7n34a5qk2zv8kr1633p5x2cjimv4w4n86w33xmcwya4yiji"; + sha256 = "ay0nWCe/uMsJFFtBAQnsuxR6I/8q3xv6zK/qYr3BQyw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 5d5134d38d2..68549e771d7 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21"; + sha256 = "vzppKTDwADBG5pOaluT858cWCKFFRaSbHz2Qhe6799E="; }; postPatch = '' diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 85fd5aa7034..7cb5f4686b4 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0yllqjmj4xbqi5681ffjxmlwlf9k9bpy3hgs7li6lnn90yy46qmr"; + sha256 = "ncoJLpKzE1tqOV+KuUiGLDWiDvzJg0le4m4BMKFw6Mg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 2f3afec364f..055f81a80de 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ccvDcEstSUVvJ7gf0bsCxCPPMRXSkZh+tKOKWNnzMt4="; + sha256 = "6io6gH+n7dodTDQjvCqxjvaafQ4E9H7kx+s2QiAm3mY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index baa9784e4ef..c27dbe6e102 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "06gb8k1p24gm5axy42npq7n4lmsxb03a9kvzqby44qmgwh8pn069"; + sha256 = "YXwWqab6OW1KE7Zct92xdK/f/QaDVqEMVM+Cb9kNe7E="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 7f5f1e74f35..3a4681ded91 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0fp5jq3j34p81y200jbyp7wcz04r7jk07bfwrigjwcyj2xknkrgw"; + sha256 = "s1ywmlcHsbeaRi5zrhFMPS0SJ1s8IYnDXWkFvB1kaI4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index b9b9936893f..b159f2d0e80 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0i63jyjg31336davjdak7z3as34gazx1lri65fk2f07kka9dx1jl"; + sha256 = "w5/uS8kRb5yFUXd1NImWMXxx40YtzxMZMS87e9syb6A="; }; nativeBuildInputs = [ @@ -67,6 +67,7 @@ mkDerivation rec { qtx11extras solid xorg.libXdmcp + xorg.libXtst xorg.libpthreadstubs ]; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 51e46b00ce8..9dec9590854 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0hmxzkkggnpci305xax9663cbjqdh6n0j0dawwcpwj4ks8mp7xh7"; + sha256 = "Fs3N9r8RkawbXnX8jv8Fx63ijwAfy+OfrCpjeHDjKio="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 90f03f6b3a1..ba4665b34de 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0dwz8z3463dz49d5k5bh7splb1zdi617xc4xzlqxxrxbf3n8x4ix"; + sha256 = "+FpJD5PEH2/HOSWDQEwMX2sV2JJH0kjcoohBolhSP1A="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 05119e9da40..fcb21197955 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vr2hlv1q9xwkh9bapy29g9fi90d33xw7pr9zc1bfma6j152qs36"; + sha256 = "mTA+3sXFWFYUEQhZOnAy6D/tYVAU+9AXbuLmLi7axlc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index b1d8ad35272..9a27a28db12 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "06b7l2jkh0h4ikddh82nxkz7qhg5ap7l016klg3jl2x659z59hpj"; + sha256 = "hnuzoHKXqM6xEzN0jvHVjVWUXRxuwdhD3BiBfFMmZSk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index bfed8bb13e7..8ae28b37a2a 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "6/HTCngjz0GpNAYf66CUiCZtEs5EsBbjDjcObIe3qSk="; + sha256 = "urm4Ehd26fmssJwu/V9Uu/lZ0J8yDOtAA0DIihTPxng="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index bef00af4feb..9a49fdfa5be 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1y2vq3n5sv6cxqpnz79kl3dybfbw65z93cahdz8m6gplzpp24gn4"; + sha256 = "Oa4OYIDXQUIQ96pEY7rGBq+spwVSU+kgDS7250tYNuc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 7f7278528c4..7610137c7bb 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1viaqmcq4axwsq5vrr08j95swapbqnwmv064kaijm1jj9csadsvv"; + sha256 = "OEl6ZfMKdqjONRA1LPZ69KyFjp1c21Uib/riYDWSRWE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 314a7554319..0c9580a1f2c 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1n8h8flcm0na7n295lkjv49brj6razwml21wwrinwllw7s948qp0"; + sha256 = "zHV9tR5gDjKDbfhnhVnCnw7whJDugMAGARA3UNs/6aA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 9f06d9f76d3..f77b89f492b 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1g7pl9ygk4k72rsrcsfjnr7h2yzp3pfmlc5wq6bhyq9rqpr5yv7l"; + sha256 = "AgNupKdjSigrgY2U9bnkQCV0BrRCw2X9WR4jUH6YmEU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index f8f13403775..bf6e4cf2204 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "11mbzn4syfghb3zvdrw2011njagcw206ng6c8l9z9h3zlhmhcd57"; + sha256 = "hkcl9bBQP994TGr4CQQlRZR88IZiRdcbUNOXXf4kXdg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 9412506385b..6858acecf04 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "qterminal"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "12p3fnbkpj6z0iplg75304l8kvnn145iq6bpw30n9bwflxrd6yhd"; + sha256 = "x+rgDrijDsMMdpU7afkn0dsSQbuBbEI9agoaLVsR/q8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 20602573d28..4c10d61135d 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0i1w5wgac7r4p0jjrrswlvvwivkwrp1b88xh5ijjw6k9irjc7zf6"; + sha256 = "tb1Vlkv8HsNlFCFOYfPnJlhdJmhyDmLE9SaTXZT0gGs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 2e1c568a489..cc1e1dbf893 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ca5yyvcahabyrdjcsznz9j66yrdlvnfa3650iwlz6922c3dkn2k"; + sha256 = "EWmEbXY2EEUW2Hq7JwLW/KDgQ8KHs4DZzuGgFjNthPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix new file mode 100644 index 00000000000..bda71c00e62 --- /dev/null +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, kwindowsystem +, libfm-qt +, qtx11extras +, lxqtUpdateScript +}: + +mkDerivation rec { + pname = "xdg-desktop-portal-lxqt"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = pname; + rev = version; + sha256 = "15wld2p07sbf2i2qv86ljm479q0nr9r65wavmabmn3fkzkz5vlgf"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + kwindowsystem + libfm-qt + qtx11extras + ]; + + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + + meta = with lib; { + homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt"; + description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index c83dd372e4a..b2dc9096269 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.0.1"; + version = "1.0.2"; - sha256 = "sha256-+tuJGA/g0ddDop5mTbRZGVGUKKZ87fmdVMOaaBhMpFQ="; + sha256 = "sha256-d69SjV7dkiYmc0R5OyU5DV5RM3h51an4idWV872QoE4="; nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 813ddebef43..236c54136c8 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.24.0"; + version = "0.29.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-fKe6vsY40lexnkUP4PEsc53WFaUAw5LGLEC/zJauogg="; + sha256 = "sha256-BWI7H5HU5ZgXrMWFOZ7WpTfS6syrFpEVRInZW6hC5iE="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 9d1fa9aef06..18de8cfc72a 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -66,11 +66,12 @@ let }; yamerl = builder { name = "yamerl"; - version = "0.8.1"; - src = fetchHex { - pkg = "yamerl"; - version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + version = "git"; + src = fetchFromGitHub { + owner = "erlang-ls"; + repo = "yamerl"; + rev = "9a9f7a2e84554992f2e8e08a8060bfe97776a5b7"; + sha256 = "1gb44v27paxwxm443m5f554wiziqi2kd300hgjjdg6fyvy3mvhss"; }; beamDeps = [ ]; }; @@ -130,8 +131,8 @@ let src = fetchFromGitHub { owner = "josefs"; repo = "gradualizer"; - rev = "e93db1c6725760def005c69d72f53b1a889b4c2f"; - sha256 = "0i1mh0dw2qknrjwpbxhgpwspqv12bznylv17sznid3kbb31pslay"; + rev = "6e89b4e1cd489637a848cc5ca55058c8a241bf7d"; + sha256 = "1ix0xgd0267ibx6y68fx4pq8q3j0y7rjs7j3cv3v2gdiy190psy9"; }; beamDeps = [ ]; }; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix new file mode 100644 index 00000000000..7642ae4aff2 --- /dev/null +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchurl, ocamlPackages, mpfr, ppl }: + +stdenv.mkDerivation rec { + pname = "jasmin-compiler"; + version = "21.0"; + + src = fetchurl { + url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; + sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + }; + + sourceRoot = "jasmin-compiler-v${version}/compiler"; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir camlidl ]; + + buildInputs = [ + mpfr + ppl + ] ++ (with ocamlPackages; [ + apron + batteries + menhirLib + yojson + zarith + ]); + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jasminc.native $out/bin/jasminc + runHook postInstall + ''; + + meta = { + description = "A workbench for high-assurance and high-speed cryptography"; + homepage = "https://github.com/jasmin-lang/jasmin/"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index c9c3915414c..3491e6b21f2 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -6,7 +6,12 @@ mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "20201124" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.11" "8.15"; out = "8.14"; } + { case = range "8.11" "8.13"; out = "20201124"; } + ] null; + + release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c"; release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 14f1bab574a..26bd38f72df 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -4,9 +4,13 @@ with lib; mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null; - release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; - release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.15"; out = "8.15"; } + { case = range "8.10" "8.13"; out = "8.10"; } + ] null; + releaseRev = v: "coq${v}"; + release."8.15".sha256 = "0wbp058zwa4bkdjj38aysy2g1avf9nrh8q23a3dil0q00qczi616"; + release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; sourceRoot = "source/Metalib"; installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index c514e3d7800..67886920cd3 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo="; + sha256 = "sha256-/4lc+/YiLPxrn+7Z67sEapYY0ocLWHPC8yeYD2VI+64="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 7dbc4157f6e..4428b077a47 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt librsvg ]; enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isPower64; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index d1c7233f0d4..9b67dd49c82 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -13,6 +13,8 @@ gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; + gst-plugins-viperfx = callPackage ./viperfx { }; + gst-rtsp-server = callPackage ./rtsp-server { }; gst-libav = callPackage ./libav { }; diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix new file mode 100644 index 00000000000..83c7d75e98c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gst_all_1 +, cmake +}: +stdenv.mkDerivation rec { + pname = "gst-plugins-viperfx"; + version = "unstable-2020-9-20"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "gst-plugin-viperfx"; + rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0"; + sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + propagatedBuildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + installPhase = '' + runHook preInstall + install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so + install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + description = "ViPER FX core wrapper plug-in for GStreamer1"; + homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx"; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index f4eaa9c3199..06fb0d41b8b 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; + sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix new file mode 100644 index 00000000000..3c980823f41 --- /dev/null +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libviperfx"; + version = "unstable-2018-01-15"; + + src = fetchFromGitHub { + owner = "vipersaudio"; + repo = "viperfx_core_binary"; + rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; + sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D libviperfx_x64_linux.so $out/lib/libviperfx.so + install -D README.md $out/share/licenses/libviperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/vipersaudio/viperfx_core_binary"; + description = "The ViPER FX core"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ rewine ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 1638caa0d1f..5a965c3d7d9 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, fetchpatch, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = [ + # Fix build with gcc11 + (fetchpatch { + url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; + sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; + }) + ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 32bfa6f2458..b26738c9ea1 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; - doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux + doCheck = (testsSupport && !stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " diff --git a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch deleted file mode 100644 index 5c2af7a2adc..00000000000 --- a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc ---- a/poppler/JPEG2000Stream.cc -+++ b/poppler/JPEG2000Stream.cc -@@ -201,7 +201,7 @@ void JPXStream::init() - if (getDict()) smaskInData = getDict()->lookup("SMaskInData"); - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { - -@@ -365,7 +365,7 @@ void JPXStream::init() - } - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix deleted file mode 100644 index e46da53f68d..00000000000 --- a/pkgs/development/libraries/poppler/0.61.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, cairo -, cmake -, curl -, fontconfig -, freetype -, lcms -, libiconv -, libintl -, libjpeg -, ninja -, openjpeg -, pkg-config -, zlib -, withData ? true, poppler_data -, qt5Support ? false, qtbase ? null -, introspectionSupport ? false, gobject-introspection ? null -, utils ? false -, minimal ? false, suffix ? "glib" -}: - -let - version = "0.61.1"; - mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; -in -stdenv.mkDerivation rec { - pname = "poppler-${suffix}"; - inherit version; - - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # Fix internal crash: a negative number that should not be - (fetchpatch { - name = "CVE-2018-13988"; - url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; - sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; - }) - # Fix internal crash: a negative number that should not be (not the above!) - ./0.61-CVE-2019-9959.patch - ]; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - libiconv - libintl - ] - ++ lib.optional withData poppler_data; - - # TODO: reduce propagation to necessary libs - propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg openjpeg ] - ++ optionals (!minimal) [ cairo lcms curl ] - ++ optional qt5Support qtbase - ++ optional introspectionSupport gobject-introspection; - - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") - (mkFlag (!minimal) "GLIB") - (mkFlag (!minimal) "CPP") - (mkFlag (!minimal) "LIBCURL") - (mkFlag utils "UTILS") - (mkFlag qt5Support "QT5") - ]; - - dontWrapQtApps = true; - - meta = with lib; { - homepage = "https://poppler.freedesktop.org/"; - description = "A PDF rendering library"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index bafb52be7ff..7620844f8d1 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh , mpi, blas, lapack } : @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { passthru = { inherit (blas) isILP64; }; + # upstream patch, remove with next release + patches = [ (fetchpatch { + name = "gcc-10"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; + sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; + })]; + # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 9845f291f54..b11474232b1 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -89,9 +89,6 @@ let pkgs.lib.makeBinPath [ pkgs.nodejs ] } ''; - # See: https://github.com/NixOS/nixpkgs/issues/142196 - # [...]/@hyperspace/cli/node_modules/.bin/node-gyp-build: /usr/bin/env: bad interpreter: No such file or directory - meta.broken = true; }; mdctl-cli = super."@medable/mdctl-cli".override { @@ -366,7 +363,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg=="; + sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1e7cd1f5466..b9b1f5f51b0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -7672,13 +7672,13 @@ let sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA=="; }; }; - "@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = { + "@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"; + version = "3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz"; - sha512 = "zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b.tgz"; + sha512 = "Ip9CcCeUocH61eXu4BUGpvl5KleQyhcUVLpWCv+0ZmDv44bFaDpREqjGHHdRupvPN/ugB6gTlD9b9ewdj02yVA=="; }; }; "@prisma/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = { @@ -67291,6 +67291,15 @@ let sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; }; }; + "ts-pattern-4.0.2" = { + name = "ts-pattern"; + packageName = "ts-pattern"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz"; + sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A=="; + }; + }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -119159,13 +119168,14 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz"; - sha512 = "ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.13.0.tgz"; + sha512 = "oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q=="; }; dependencies = [ - sources."@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" + sources."ts-pattern-4.0.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index faa17a83839..001b750e752 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.2.0"; + version = "8.2.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9998fedfcb932e19e3b54faeb497a49cde8b15163af764c5afe5847fef5ec1ff"; + sha256 = "sha256-+LSnyIVA/lR9xbDIgreLyU+V/Z2pJD8v8agvJj05w94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index ffd8e698c58..df8c1fffdb9 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiohttp-apispec"; - version = "3.0.0b1"; + version = "3.0.0b2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "maximdanilchenko"; repo = pname; rev = "v${version}"; - hash = "sha256-LGdi5ZhJ1G0GxUJVBZnwW3Q+x3Yo9FRV9b6REPlq7As="; + hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; propagatedBuildInputs = [ @@ -40,11 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jinja2<3.0" "jinja2" - ''; - pythonImportsCheck = [ "aiohttp_apispec" ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 3432931f935..b52760d2069 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -2,55 +2,45 @@ , buildPythonPackage , fetchFromGitHub , pymysql -, pytest -, isPy27 -, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools-scm-git-archive }: buildPythonPackage rec { pname = "aiomysql"; - version = "0.0.21"; - disabled = isPy27; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; + hash = "sha256-TNaQ4EKiHwSmPpUco0pA5SBP3fljWQ/Kd5RLs649fu0="; }; - patches = [ - (fetchpatch { - # vendor functions previously provided by pymysql.util - url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch"; - sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA="; - }) + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive ]; propagatedBuildInputs = [ pymysql ]; - checkInputs = [ - pytest - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL" - ''; - - checkPhase = '' - pytest - ''; - - # tests require mysql database + # Tests require MySQL database doCheck = false; + pythonImportsCheck = [ + "aiomysql" + ]; + meta = with lib; { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index d226192164d..ec4dd4dfcbe 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-RGs+io68LOr9Qk/8qrHDU4MNSBYSVleO16ZUSOYB6+0="; + hash = "sha256-LBsT/swIk+lGxly9XzZCeGHP+k6iIB2Pb8oi4qNzteI="; }; propagatedBuildInputs = [ @@ -38,8 +38,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + homepage = "https://github.com/celery/py-amqp"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 1d2bb9505a2..0e6f26700bc 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "5.6.0"; + version = "5.7.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-rNMHMUNBVNo3bO7rQW7hVBzfuOo8ZIAjpVo0yz7K+fM="; + sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 0d6b534b4aa..d75351839aa 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.10.0"; + version = "4.11.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wjrSPFIdgYlVpBUaZ9gVgDGdS/VI09SfQiOuBB/5iJE="; + hash = "sha256-rZqlW2XvKAjrQF9Gz3Tff8twRNXLwmSH+W6y7y5DZpM="; }; propagatedBuildInputs = [ @@ -29,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "bs4" ]; + pythonImportsCheck = [ + "bs4" + ]; meta = with lib; { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index ed13a3a3a7b..e371079b360 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -1,19 +1,16 @@ { lib +, aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, aresponses -, coverage , mypy +, packaging , poetry-core , pydantic , pytest-asyncio -, pytest-cov , pytest-mock +, pytestCheckHook , pythonOlder -, aiohttp -, attrs -, cattrs , yarl }: @@ -22,13 +19,13 @@ buildPythonPackage rec { version = "0.5.5"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; rev = "v${version}"; - sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; + hash = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; nativeBuildInputs = [ @@ -37,22 +34,26 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - attrs - cattrs + packaging pydantic yarl ]; checkInputs = [ aresponses - coverage mypy pytest-asyncio - pytest-cov pytest-mock pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace "--cov" "" + ''; + pythonImportsCheck = [ "bsblan" ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 433b7644e7a..20602139d15 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.5"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7q9zTuqdIUAiipA5kh8CwQa/TeiXGsKuGGvYYwTjObw="; + sha256 = "sha256-fPojcHuz2d3Im2Ri6iCu79KLuRNucIG/IwWrUo0uYH8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6ccd3c98c21..0eb3eec5550 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "zalando"; + owner = "spec-first"; repo = pname; rev = version; - sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; + hash = "sha256-QOxvs2z8AAxQ2oSM/PQ6QTD9G4JomviauLSDjay8HyQ="; }; propagatedBuildInputs = [ @@ -56,24 +56,18 @@ buildPythonPackage rec { testfixtures ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \ - --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1" - ''; - - disabledTests = [ - # We have a later PyYAML release - "test_swagger_yaml" - ]; - pythonImportsCheck = [ "connexion" ]; + disabledTests = [ + # AssertionError + "test_headers" + ]; + meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - homepage = "https://github.com/zalando/connexion/"; + homepage = "https://github.com/spec-first/connexion"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 12f9a667fef..41a6436c3bc 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.3.4"; + version = "1.3.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-g8tMVH1MZihEEHGQjxX/Mcn5Mu3N9VA3AGdk2avlOoE="; + hash = "sha256-sYE7bZcMXsf+4r9Rs4d0XaUqdWVZfDU9/xPqIiiJkUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index fcd65f1f317..419cb74c2cf 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.10"; + version = "1.4.11"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-PK8+NFJurJ0nD5coEFj8lXWg4VMcpX0954qDb1GW6Gk="; }; preBuild = '' diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 9b1264e738b..f068fab049a 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.5.0"; + version = "10.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw="; + sha256 = "sha256-JGk9PdCDXiDkP8Arw2pfpU+sEj/sCHwwHHWVwF3Ofzw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix new file mode 100644 index 00000000000..fb67dd34c7b --- /dev/null +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, http-sfv +, pytestCheckHook +, pythonOlder +, setuptools-scm +, requests +}: + +buildPythonPackage rec { + pname = "http-message-signatures"; + version = "0.4.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyauth"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CMF9p913P04Hx/221ck1e0AoAsP7aXkX2UKp4S1nnU0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cryptography + http-sfv + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + pytestFlagsArray = [ + "test/test.py" + ]; + + pythonImportsCheck = [ + "http_message_signatures" + ]; + + meta = with lib; { + description = "Requests authentication module for HTTP Signature"; + homepage = "https://github.com/pyauth/http-message-signatures"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix new file mode 100644 index 00000000000..264065b6efa --- /dev/null +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "http-sfv"; + version = "0.9.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mnot"; + repo = "http_sfv"; + rev = "http_sfv-${version}"; + hash = "sha256-hzg5vRX0vNKS/hYLF6n8mLK5qiwP7do4M8YMlBAA66I="; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Tests require external data (https://github.com/httpwg/structured-field-tests) + doCheck = false; + + pythonImportsCheck = [ + "http_sfv" + ]; + + meta = with lib; { + description = "Module to parse and serialise HTTP structured field values"; + homepage = "https://github.com/mnot/http_sfv"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 83d29173243..943036ecbd4 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -18,13 +18,15 @@ buildPythonPackage rec { pname = "ismartgate"; version = "4.0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; + hash = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; }; propagatedBuildInputs = [ @@ -49,7 +51,15 @@ buildPythonPackage rec { --replace '"pytest-runner>=5.2",' "" ''; - pythonImportsCheck = [ "ismartgate" ]; + pythonImportsCheck = [ + "ismartgate" + ]; + + disabledTestPaths = [ + # Tests are out-dated + "ismartgate/tests/test_init.py" + ]; + meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 11534126a18..88858b537b2 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.6"; + version = "1.18.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yk6Rg9DwilG8OWmT7SF80eYRsRwDwJp+mx2Yv2Gg+ak="; + sha256 = "sha256-1fnkeyfvFHy9/COpFtPdvj8ptUIVxfoBrOFw9Ikf47w="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 27550c30dbf..b0672c012a9 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.3.17"; + version = "2022.4.22"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0="; + hash = "sha256-NKRxt25uvMBvSpY8vk4Vr56NmnW2VTpOLBHUzM2j/yc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index 96c3f193396..db81e951cf2 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mwdblib"; - version = "4.1.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; + hash = "sha256-Wkqvi/buYKDoGi+4C9zkxWEiGynk9Ds8gLsdoaZCdKg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ede91e7df91..6f85a797c37 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; + sha256 = "sha256-gHgFEDUji43vTBZp5FLK90H+D44sfH2AuCc7Gu2T1pg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix new file mode 100644 index 00000000000..88486910796 --- /dev/null +++ b/pkgs/development/python-modules/nutils/default.nix @@ -0,0 +1,32 @@ +{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }: + +buildPythonPackage rec { + pname = "nutils"; + version = "7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6"; + }; + + pythonImportChecks = [ "nutils" ]; + + propagatedBuildInputs = [ + numpy + treelog + stringly + ]; + + checkInputs = [ coverage ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Numerical Utilities for Finite Element Analysis"; + homepage = "https://www.nutils.org/"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 85a58271b6d..deb7fcde179 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.9"; + version = "3.14.10"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; + hash = "sha256-k3kKAImE1aVlmsSPXpaIkAVspAsAo5Hz6/n7u6+zTzA="; }; buildInputs = [ @@ -31,8 +31,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ apsw - ] ++ lib.optional withPostgres psycopg2 - ++ lib.optional withMysql mysql-connector; + ] ++ lib.optional withPostgres [ + psycopg2 + ] ++ lib.optional withMysql [ + mysql-connector + ]; checkInputs = [ flask diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index bc21d6bf465..49a07000667 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,36 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pillow -, nose_progressive -, nose +, fetchFromGitHub , mock -, blessings +, pillow +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pilkit"; - version = "2.0"; + version = "unstable-2022-02-17"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "ddb30c2f0198a147e56b151476c3bb9fe045fbfd5b0a0fa2a3148dba62d1559f"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "matthewwithanm"; + repo = pname; + rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; + hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; }; - preConfigure = '' - substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' + buildInputs = [ + pillow + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov --cov-report term-missing:skip-covered" "" ''; - # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 - doCheck = false; - - buildInputs = [ pillow nose_progressive nose mock blessings ]; + pythonImportsCheck = [ + "pilkit" + ]; meta = with lib; { - homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; + homepage = "https://github.com/matthewwithanm/pilkit/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index fe364ea0ece..18d4fec6c16 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.17.7"; + version = "0.17.8"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-PZoxI7s3LTb60oXFfsOi5mCaLOKzq6ed2yFKap0Q1Ng="; + sha256 = "sha256-ZNlkdubB6E5ak+EaXsEBGa1xpm5ms4Rp3DG/M4/+WOg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index b88bc006bcc..6ebe09463e3 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2021.11.0"; + version = "2022.04.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA="; + hash = "sha256-qW1rjKc1+w2rTUGackPjb0qgTZpFXh0ZRBqMmf4nDnk="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python3 API for IQVIA data"; + description = "Module for working with IQVIA data"; longDescription = '' pyiqvia is an async-focused Python library for allergen, asthma, and disease data from the IQVIA family of websites (such as https://pollen.com, diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 257cb72b3ec..1a101310d40 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage -, certifi , fetchPypi , flaky +, httpx , importlib-metadata , pytestCheckHook , pythonOlder @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.5.0"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YoALculx2trEDD1vU4xhiCGdb1OFPdxI1p2fwlZZAY8="; + hash = "sha256-UBi2bCtGMtcavYEDtz5m5N0UxmCaj3un5aomxzbfLfg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - certifi + httpx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index e5d7f8d0b94..17942ca0b19 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2021.11.0"; + version = "2022.04.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk="; + rev = "refs/tags/${version}"; + hash = "sha256-qPk3XA6ciID6h12102AGLxfaTmE63BzKPLvwFn6F1tM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 921de2e0c7e..d5841fca4b9 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-HGF8Tu28ksIfaCKAbnJv6sDmoQrDDjteVLxbJN1HH3U="; + hash = "sha256-d1ciSl0CmQwpg4NXR+hQ2gPZE954hnREYfitdPvKFtA="; }; nativeBuildInputs = [ @@ -36,11 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ - ''; - pythonImportsCheck = [ "sigma" ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 46ee0ad00fb..c45a32d2f61 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , importlib-metadata +, pydantic , poetry-core , pytest-asyncio , pytest-mock @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.3"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-r1PoOxFPA4zYFEpw+BakzDAJ13IMfcZpTJWkRt/q4go="; + sha256 = "sha256-9zCUYB+TYgDMoTHpR0u42Usq2EKp8vtzlTgU82eXxl8="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asyncclick importlib-metadata + pydantic ]; checkInputs = [ diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 6f11559aad4..9e092ca8251 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - hash = "sha256-9eA2fx+j6WLbEkLaemwEuoWLUWlS0iF5AkR2YienN5g="; + hash = "sha256-9OlWMom/0OMlbPd3evjIaX75Gjlu+F8vKBJwX4Z58qQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index c51e24e0ac9..96ade3b45f6 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,25 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub -, cryptography +, http-message-signatures +, http-sfv , requests , pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "requests-http-signature"; - version = "0.2.0"; + version = "0.7.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s="; + hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ - cryptography + http-message-signatures + http-sfv requests ]; diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index 00277daf8a3..fcc4db1fbf0 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pyopenssl +, pythonOlder , requests }: buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.13"; + version = "1.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy"; + hash = "sha256-LZgKjSas0KdJAf4leSVz8sEnRrlJ20Sm9Ka+S5zDOTM="; }; propagatedBuildInputs = [ @@ -23,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "requests_pkcs12" ]; + + pythonImportsCheck = [ + "requests_pkcs12" + ]; meta = with lib; { description = "PKCS#12 support for the Python requests library"; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index f325d40ba92..11f31c06550 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,24 +1,41 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, buildPythonPackage , dnspython -, mock, nose +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "srvlookup"; - version = "2.0.0"; + version = "3.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; }; - propagatedBuildInputs = [ dnspython ]; - checkInputs = [ mock nose ]; + propagatedBuildInputs = [ + dnspython + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "srvlookup" + ]; meta = with lib; { + description = "Wrapper for dnspython to return SRV records for a given host, protocol, and domain name"; homepage = "https://github.com/gmr/srvlookup"; - license = [ licenses.bsd3 ]; - description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; - maintainers = [ maintainers.mmlb ]; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ mmlb ]; }; } diff --git a/pkgs/development/python-modules/stringly/default.nix b/pkgs/development/python-modules/stringly/default.nix new file mode 100644 index 00000000000..777fc11ed37 --- /dev/null +++ b/pkgs/development/python-modules/stringly/default.nix @@ -0,0 +1,28 @@ +{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "stringly"; + version = "1.0b2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09fi9dgf27v4qi0mwwms7hpwim9qpyalckd66p7nlmfp6c8bzppq"; + }; + + pythonImportsCheck = [ "stringly" ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Stringly: Human Readable Object Serialization"; + homepage = "https://github.com/evalf/stringly"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5cd0044bb59..278bf7187ad 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-EVSKBsIhYm5UqFEZ3snKF1aEW3+JjE0Kzs3gYnFQsUc="; + sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/treelog/default.nix b/pkgs/development/python-modules/treelog/default.nix new file mode 100644 index 00000000000..e3b85cd64fb --- /dev/null +++ b/pkgs/development/python-modules/treelog/default.nix @@ -0,0 +1,28 @@ +{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "treelog"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hnivz4p4llky6djxgcsr9r3j4vr46mkjvp0ksybhpx0fsnhdi81"; + }; + + pythonImportsCheck = [ "treelog" ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Logging framework that organizes messages in a tree structure"; + homepage = "https://github.com/evalf/treelog"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0810acd1ea4..c3a6a4af9e5 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.8"; + version = "3.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A="; + sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 541eda6185e..33d0bea9b83 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,18 +4,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.72"; + version = "0.0.73"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; - rev = version; - sha256 = "sha256-tVCvmQR9tGhSDB4OztNaSCj2BTxPdrX3Gw9WZopRo8k="; + rev = "refs/tags/${version}"; + hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A="; }; propagatedBuildInputs = [ @@ -28,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "zhaquirks" ]; + pythonImportsCheck = [ + "zhaquirks" + ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index 257d8a7fba1..e11251a4681 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.1.1) + brakeman (5.2.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index ea241dbf6e7..2d1ceb0393a 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0"; + sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.2"; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9b1472f53b4..b97ed2b6767 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1084"; + version = "2.0.1088"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-bzmXLqjtl742UcjBpYQdtiTKO6Oe/x7lGoJZh+uJzUo="; + hash = "sha256-g4kn8tdLgTnOFmeX8nywBvmAXL7WqCfX6ylgp7Z6Alk="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 097fd30ea9a..3a39ee75369 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lQo3rhPjKZV9XuuKYxd3jXqSiElj+O0DdERtmsMZMEw="; + sha256 = "sha256-W08EyKSMz0ZCqvPBB9xQ4WHxsK2FjgwC/GvEqOwGGQ4="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-n93ZP6sIyL5Q9UeDRXxm8KleDfUf2wd6JcTgSPtBGWg="; + vendorSha256 = "sha256-wEsWnmCv3hoQ1QkOQfo4ShmSgf27yEc8FKC7SC4gs8k="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index ad9813cde6f..4baa144fa81 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -1,18 +1,21 @@ -{ lib, python}: +{ lib, python }: python.pkgs.buildPythonApplication rec { pname = "alibuild"; - version = "1.5.5"; + version = "1.11.2"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j"; + hash = "sha256-wq2H2inUf2CjPD45krCNdjw2s4FXsEDlfOHqW8VaVKg="; }; doCheck = false; - propagatedBuildInputs = [ - python.pkgs.requests - python.pkgs.pyyaml + propagatedBuildInputs = with python.pkgs; [ + requests + pyyaml + boto3 + jinja2 + distro ]; meta = with lib; { diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 73af1bde5ea..b3c5c1b0dd0 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-lIHE63XIPutvTS2cid0+tuo+JMSKMGuSUcnFv1mCRrM="; + sha256 = "sha256-+Ug4tOaqUaqcEoMv20CKE8JrjIdW34VSn20gXZYX92k="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-SkI+GLHknC+CGhGo7KiZahBxMp/JCIukTe2C0mMTdjY="; + cargoSha256 = "sha256-V2G++BYLRGVM4leB2jkM+HcFiCIdf2wA3dfYdtlq7XI="; nativeBuildInputs = [ pkg-config ]; @@ -62,3 +62,15 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ pamplemousse pimeys superherointj ]; }; } + +### Troubleshooting +# Here's an example application using Prisma with Nix: https://github.com/pimeys/nix-prisma-example +# At example's `flake.nix` shellHook, notice the requirement of defining environment variables for prisma, it's values will show on `prisma --version`. +# Read the example's README: https://github.com/pimeys/nix-prisma-example/blob/main/README.md +# Prisma requires 2 packages, `prisma-engines` and `nodePackages.prisma`, to be at *exact* same versions. +# Certify at `package.json` that dependencies "@prisma/client" and "prisma" are equal, meaning no caret (`^`) in version. +# Configure NPM to use exact version: `npm config set save-exact=true` +# Delete `package-lock.json`, delete `node_modules` directory and run `npm install`. +# Run prisma client from `node_modules/.bin/prisma`. +# Run `./node_modules/.bin/prisma --version` and check if both prisma packages versions are equal, current platform is `linux-nixos`, and other keys equal to the prisma environment variables you defined for prisma. +# Test prisma with `generate`, `db push`, etc. It should work. If not, open an issue. diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index a394ee61577..d105dd61665 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -89,6 +89,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://wiki.gnome.org/Apps/DFeet"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ktosiek ]; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index bfd55157009..57a5f4d462a 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba"; + sha256 = "sha256-FMAXjRL+kJ/hwGmaWBy8ecON+JCMgRytfpryeLWsSVc="; }; - vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95"; + vendorSha256 = "sha256-DdA7s+N5S1ivwUgZ+M2W/HCp/7neeoqRQL0umn3m6Do="; doCheck = false; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index caa790e9fd4..c54cda1ad27 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -31,7 +31,6 @@ , CoreServices , developer_cmds , DarwinTools -, testVersion , mysql-shell }: diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index c5820018bb6..cb083bd06c7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -39,6 +39,7 @@ tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json; tree-sitter-html = lib.importJSON ./tree-sitter-html.json; tree-sitter-http = lib.importJSON ./tree-sitter-http.json; + tree-sitter-janet-simple = lib.importJSON ./tree-sitter-janet-simple.json; tree-sitter-java = lib.importJSON ./tree-sitter-java.json; tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json; tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json; @@ -57,6 +58,7 @@ tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; + tree-sitter-pgn = lib.importJSON ./tree-sitter-pgn.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json new file mode 100644 index 00000000000..10b524747a3 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/sogaiu/tree-sitter-janet-simple", + "rev": "e6c04e4b243cf3e5aca8f201e48926a72cc18334", + "date": "2022-03-29T10:00:03+09:00", + "path": "/nix/store/4ynwhc2s20xm093inlpyxgdb6pbc753m-tree-sitter-janet-simple", + "sha256": "1anbd0bx8vcg1rb6mr8hknnd5f9f6zr3h7kn98x8s7znyvlj4w6q", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json new file mode 100644 index 00000000000..786fec353d5 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/rolandwalker/tree-sitter-pgn", + "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a", + "date": "2021-08-25T17:57:38-04:00", + "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn", + "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 57bf5c0a13c..e1491ee81da 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -181,6 +181,10 @@ let orga = "bkegley"; repo = "tree-sitter-graphql"; }; + "tree-sitter-pgn" = { + orga = "rolandwalker"; + repo = "tree-sitter-pgn"; + }; "tree-sitter-perl" = { orga = "ganezdragon"; repo = "tree-sitter-perl"; @@ -277,6 +281,10 @@ let orga = "uyha"; repo = "tree-sitter-cmake"; }; + "tree-sitter-janet-simple" = { + orga = "sogaiu"; + repo = "tree-sitter-janet-simple"; + }; "tree-sitter-json5" = { orga = "joakker"; repo = "tree-sitter-json5"; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix new file mode 100644 index 00000000000..dee2f9c28f5 --- /dev/null +++ b/pkgs/development/tools/protolint/default.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "protolint"; + version = "0.37.1"; + + src = fetchFromGitHub { + owner = "yoheimuta"; + repo = pname; + rev = "6aa30515838cc0adf7c76a9461f52bdc713f2e9f"; + sha256 = "sha256-oKGA5FZpT3E5G7oREGAojdu4Xn8JPd7IYwfueK9QA34="; + }; + + vendorSha256 = "sha256-iLQwx3B5n21ZXefWiGBBL9roa9LIFByzB8KXLywhvKs="; + + # Something about the way we run tests causes issues. It doesn't happen + # when using "go test" directly: + # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/no_fix_for_a_correct_proto + # util_test.go:35: open : no such file or directory + # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/fix_for_an_incorrect_proto + # util_test.go:35: open : no such file or directory + excludedPackages = [ "internal" ]; + + ldflags = let + rev = builtins.substring 0 7 src.rev; + in [ + "-X github.com/yoheimuta/protolint/internal/cmd.version=${version}" + "-X github.com/yoheimuta/protolint/internal/cmd.revision=${rev}" + "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.version=${version}" + "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.revision=${rev}" + ]; + + meta = with lib; { + description = "A pluggable linter and fixer to enforce Protocol Buffer style and conventions"; + homepage = "https://github.com/yoheimuta/protolint"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.zane ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2e2ff56fd05..46738f7cf45 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.10"; + version = "0.35.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; + sha256 = "sha256-NzhEXt0z+0/6F3pgGmQwjnexBA2icWV3dCifZ8BxnOQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; + cargoSha256 = "sha256-+FGl0JhaRu+KLQJGAcMXv9vP6pmRzdTDtNA3h6A1jcY="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix new file mode 100644 index 00000000000..c284c18d015 --- /dev/null +++ b/pkgs/development/tools/snazy/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "snazy"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "chmouel"; + repo = pname; + rev = version; + sha256 = "sha256-Pv+vLdbMTbDbdUVQhA07WY+o1PwtCiqdAXCj+UlP/ZQ="; + }; + cargoSha256 = "sha256-96xgpkkWHsyb3kxEXM5f5jFSjbO+VEmX2uHltGJUPGk="; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/snazy --help + $out/bin/snazy --version | grep "snazy ${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/chmouel/snazy/"; + changelog = "https://github.com/chmouel/snazy/releases/tag/v${version}"; + description = "A snazzy json log viewer"; + longDescription = '' + Snazy is a simple tool to parse json logs and output them in a nice format + with nice colors. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index f49ee01deaf..27606f998d5 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-P0ga7uXwxkihpuLdjT1VNbuspbYpOh3+U60u1Blppo4="; + sha256 = "sha256-rxferVxTWmclviDshHhBmbCezOI+FvcfUW3gAkBQNHQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 7f3dce2d70c..3c90b7f665a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,15 +8,9 @@ let in buildNodejs { inherit enableNpm; - version = "16.14.2"; - sha256 = "sha256-6SLiFcxo61+U0z6KC2HiyGO3cxzIYAq5VdOCLakP+NE="; + version = "16.15.0"; + sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc="; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. - # https://github.com/nodejs/node/pull/40965 - (fetchpatch { - url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; - sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; - }) ]; } diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 986494e599d..d6e5e8a7bcb 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,6 +10,7 @@ , openssl , swig , meson-tools +, which , armTrustedFirmwareAllwinner , armTrustedFirmwareAllwinnerH616 , armTrustedFirmwareRK3328 @@ -19,10 +20,10 @@ }: let - defaultVersion = "2021.10"; + defaultVersion = "2022.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd"; + hash = "sha256-gbRUMifbIowD+KG/XdvIE7C7j2VVzkYGTvchpvxoBBM="; }; buildUBoot = { version ? null @@ -66,11 +67,14 @@ let p.setuptools # for pkg_resources ])) swig + which # for scripts/dtc-version.sh ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; + enableParallelBuilding = true; + makeFlags = [ "DTC=dtc" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" @@ -102,9 +106,6 @@ let runHook postInstall ''; - # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'. Stop. - enableParallelBuilding = false; - dontStrip = true; meta = with lib; { @@ -373,14 +374,6 @@ in { CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_XHCI_HCD=y ''; - extraPatches = [ - # https://patchwork.ozlabs.org/project/uboot/list/?series=268007&state=%2A&archive=both - # Remove when upgrading to 2022.01 - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/268007/mbox/"; - sha256 = "sha256-xn4Q959dgoB63zlmJepI41AXAf1kCycIGcmu4IIVjmE="; - }) - ]; extraMeta.platforms = [ "i686-linux" "x86_64-linux" ]; filesToInstall = [ "u-boot.rom" ]; }; @@ -401,28 +394,12 @@ in { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; - extraPatches = [ - # Remove when updating to 2022.01 - # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/273129/mbox/"; - sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; - }) - ]; }; ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; - extraPatches = [ - # Remove when updating to 2022.01 - # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/273129/mbox/"; - sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; - }) - ]; }; ubootRaspberryPi4_32bit = buildUBoot { diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 2772ca0460d..3ffe77b73b3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,9 +1,9 @@ { lib, appleDerivation, xcbuildHook -, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: +, libressl, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ]; + buildInputs = [ libressl xnu Librpcsvc libpcap developer_cmds ]; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/os-specific/darwin/mas/default.nix index 33a3114c3d6..968cb10cd5a 100644 --- a/pkgs/os-specific/darwin/mas/default.nix +++ b/pkgs/os-specific/darwin/mas/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchurl , installShellFiles -, testVersion +, testers , mas }: @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ''; passthru.tests = { - version = testVersion { + version = testers.testVersion { package = mas; command = "mas version"; }; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 72ae31c4b2d..c9192744a46 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -32,20 +32,19 @@ stdenv.mkDerivation { mkdir -p "$out/lib/firmware/brcm" # Wifi firmware - shopt -s extglob - for filename in firmware-nonfree/brcm/brcmfmac434??{,s}-sdio.*; do - cp "$filename" "$out/lib/firmware/brcm" - done + cp -rv "$NIX_BUILD_TOP/firmware-nonfree/debian/config/brcm80211/." "$out/lib/firmware/" # Bluetooth firmware - cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm" + cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm" + + # CM4 symlink must be added since it's missing from upstream + pushd $out/lib/firmware/brcm &>/dev/null + ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt" + popd &>/dev/null + runHook postInstall ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-Fw8EC1jzszWg9rNH01oaOIHnSYDuF6ov6ulmIAPuNz4="; - meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; homepage = "https://github.com/RPi-Distro/firmware-nonfree"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 100ca403f62..996db748055 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 = "510.60.02"; - sha256_64bit = "sha256-qADfwFSQeP2Mbo5ngO+47uh4cuYFXH9fOGpHaM4H4AM="; - settingsSha256 = "sha256-Voa1JZ2qqJ1t+bfwKh/mssEi/hjzLTPwef2XG/gAC+0="; - persistencedSha256 = "sha256-THgK2GpRcttqSN2WxcuJu5My++Q+Y34jG8hm7daxhAQ="; + version = "510.68.02"; + sha256_64bit = "sha256-vSw0SskrL8ErBgQ1kKT+jU6wzLdNDEk1LwBM8tKZ9MU="; + settingsSha256 = "sha256-4TBA/ITpaaBiVDkpj7/Iydei1knRPpruPL4fRrqFAmU="; + persistencedSha256 = "sha256-Q1Rk6dAK4pnm6yDK4kmj5Vg4GRbi034C96ypywHYB2I="; } else legacy_390; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 32d0a1310ef..a9166985ead 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-923"; + version = "1.8-933"; src = let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-txf8W7SoPb20S7KcQDfExPEn5dubu9JVEX89dWngYFU="; + hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE="; }; dontConfigure = true; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f917ce0d68c..447dc5da78a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-04-22"; + version = "2022-04-24"; pname = "oh-my-zsh"; - rev = "a879ff1515b6bd80eea695c03e22289bd6743718"; + rev = "8f56a8bdf39d7727ab0e220f0164f78c77f9c50e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "GFIFxlKCU6XURqZxkCkgZB0a5PW/OuC9KePpmxLAIE4="; + sha256 = "yxuvVDjNCH7r/g6ZoF8kEzwirBB0s+CRQizBwRR4Sp4="; }; installPhase = '' diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 69ae0997685..66b99c79453 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EBvsyGODqF1FM4/HaecAC9f77Nl6aU3EXGDhxYYBm1A="; + sha256 = "sha256-eyvxBpGuOXicuqINYhl4/fUgN/j+Awe5vgMaMxtAMr0="; }; - vendorSha256 = "sha256-p8w1eJPOYM/fxNknGDumdDPUiluqYTNs8iYJ1o09NWo="; + vendorSha256 = "sha256-91tq4ipi3JobVgffASn8KRd3JQkgbOx/7PsjKq5vJdE="; excludedPackages = "misc"; diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index 4c057469f03..266b0830d5c 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -4,7 +4,7 @@ , fetchpatch , pkg-config , openssl -, testVersion +, testers , gbl }: @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; passthru.tests.version = - testVersion { package = gbl; }; + testers.testVersion { package = gbl; }; meta = with lib; { description = "GBL Firmware file manipulation"; diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/tools/audio/mictray/default.nix new file mode 100644 index 00000000000..e757bac9668 --- /dev/null +++ b/pkgs/tools/audio/mictray/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, gtk3 +, lib +, libgee +, libnotify +, meson +, ninja +, pkg-config +, pulseaudio +, stdenv +, vala +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "mictray"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Junker"; + repo = "mictray"; + rev = "1f879aeda03fbe87ae5a761f46c042e09912e1c0"; + sha256 = "0achj6r545c1sigls79c8qdzryz3sgldcyzd3pwak1ymim9i9c74"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgee + libnotify + pulseaudio + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/Junker/mictray"; + description = "System tray application for microphone"; + longDescription = '' + MicTray is a Lightweight system tray application which lets you control the microphone state and volume. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.anpryl ]; + }; +} diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix deleted file mode 100644 index c89404fbba1..00000000000 --- a/pkgs/tools/audio/mpdsync/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python2, fetchFromGitHub }: -with python2.pkgs; -stdenv.mkDerivation { - pname = "mpdsync"; - version = "unstable-2017-06-15"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "mpdsync"; - rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07"; - sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; - }; - - pythonPath = [ mpd2 ]; - - nativeBuildInputs = [ - wrapPython - ]; - - dontBuild = true; - - installPhase = "install -D mpdsync.py $out/bin/mpdsync"; - postFixup = "wrapPythonPrograms"; - -} diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 985d2b11245..76e2906a942 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -15,6 +15,8 @@ # batdiff , gitMinimal , withDelta ? delta != null, delta ? null +# batman +, util-linux }: let @@ -136,7 +138,7 @@ in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); batgrep = script "batgrep" [ less coreutils ripgrep ]; - batman = script "batman" []; + batman = script "batman" [ util-linux ]; batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); prettybat = script "prettybat" ([] ++ optionalDep withShFmt shfmt diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 0831649f600..80daf996b85 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }: +{ lib, buildGoModule, fetchFromGitHub, testers, gosu }: buildGoModule rec { pname = "gosu"; @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-d" "-s" "-w" ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = gosu; }; diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/tools/misc/ikill/default.nix new file mode 100644 index 00000000000..176c2f37829 --- /dev/null +++ b/pkgs/tools/misc/ikill/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ikill"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "pjmp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sxFuDHlrEO2/gA9I++yNAISvsF7wFjSMUI+diVM/+EI="; + }; + + cargoSha256 = "sha256-dJa+bXJTA2Jju1p29Fyj87N0Pr/l6XRr3QqemhD2BAA="; + + meta = with lib; { + description = "Interactively kill running processes"; + homepage = "https://github.com/pjmp/ikill"; + maintainers = with maintainers; [ zendo ]; + license = [ licenses.mit ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 157cc1adf8d..dc370b6a3e7 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, pandoc , testers , lsd }: @@ -19,8 +20,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pandoc ]; postInstall = '' + pandoc --standalone --to man doc/lsd.md -o lsd.1 + installManPage lsd.1 + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f3277477481..861667c11e2 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Swxc2gl3YP+0Kf+trp37rGhr5G8NT4L3Bb3lHwLm50Q="; + sha256 = "sha256-CZU1pQixbv/Fvqy6lMLXNYWj+2/pplNq+IXloED1Pt8="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-UvIectx6qWkXg/yVQe11NXhh2UD0D/dMCtK1kj3ln6M="; + cargoSha256 = "sha256-5iAo8Gqvbba8W1KXtmFoKx+W1s3dwxR/T+v/R5+S38g="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 65449c203e1..77f86458ad1 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; platforms = platforms.linux; - maintainers = with maintainers; [ ktosiek ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix new file mode 100644 index 00000000000..7706ff8e888 --- /dev/null +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tun2socks"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "xjasonlyu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FBYRqxS8DJbIc8j8X6WNxl6a1YRcNrPSnNfrq/Y0fMM="; + }; + + vendorSha256 = "sha256-XWzbEtYd8h63QdpAQZTGxyxMAAnpKO9Fp4y8/eeZ7Xw="; + + ldflags = [ + "-w" "-s" "-buildid=" + "-X github.com/xjasonlyu/tun2socks/v2/internal/version.Version=v${version}" + "-X github.com/xjasonlyu/tun2socks/v2/internal/version.GitCommit=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/xjasonlyu/tun2socks"; + description = "tun2socks - powered by gVisor TCP/IP stack"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index a9885fc1351..74e59c2c6ac 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -6,7 +6,7 @@ , nix , nix-index , rustPlatform -, testVersion +, testers }: rustPlatform.buildRustPackage rec { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; passthru.tests = { - version = testVersion { package = comma; }; + version = testers.testVersion { package = comma; }; }; meta = with lib; { diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 129d335bf49..2c76d28bae2 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-04-23"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-KAbPiZ/iOwT8plqqZ4Q3Cl8+we2Tsi2GkkmXZCcmhHs="; + sha256 = "sha256-GYAIbE6Vrq6gBnCkeOSvo6gSJqPOhDh2f8n1b6B/x30="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 0f8f37a4890..dc09e8476bf 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; + sha256 = "sha256-ZH3OrJGh7TekODW5rh8JShNHKfuxPr5HhVD7wsvi8M0="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; + vendorSha256 = "sha256-hJEL6kUc6aXKq7X23dRWhAni5oRDJ3CuNTx6JL049gA="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 9295dd40099..e12fab02f1e 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "v${version}"; - hash = "sha256-ECvNob5QbOe5JfaDMGvSxCS+E9nqdsfSCZAVlAs18q4="; + hash = "sha256-/6EMnNVNSgeYHrbPF3QDS5oc0eLaggKNuZi2pXx/CqY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index c937e6c7ab1..3e87b7cb79c 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,29 +1,31 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, gucci }: -buildGoPackage rec { +buildGoModule rec { pname = "gucci"; - version = "0.1.0"; - - goPackagePath = "github.com/noqcks/gucci"; + version = "1.5.4"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; - rev = version; - sha256 = "0ksrmzb3iggc7gm51fl0jbb15d0gmpclslpkq2sl2xjzk29pkllq"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HJPNpLRJPnziSMvxLCiNDeCWO439ELSZs/4Cq1a7Amo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-rAZCj5xtwTgd9/KDYnQTU1jbabtWJF5MCFgcmixDN/Q="; - ldflags = [ - "-X main.AppVersion=${version}" - ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gucci; + }; + + checkFlags = [ "-short" ]; meta = with lib; { description = "A simple CLI templating tool written in golang"; homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; - maintainers = [ maintainers.braydenjw ]; + maintainers = with maintainers; [ braydenjw ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gucci/deps.nix b/pkgs/tools/text/gucci/deps.nix deleted file mode 100644 index 8e2cc5af3bf..00000000000 --- a/pkgs/tools/text/gucci/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } -] - diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 17065a2aa8b..be17753b343 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -1,4 +1,11 @@ -{ substituteAll, perl, shadow, util-linux }: +{ substituteAll +, perl +, shadow +, util-linux +, configurationDirectory ? "/etc/nixos-containers" +, stateDirectory ? "/var/lib/nixos-containers" +, nixosTests +}: substituteAll { name = "nixos-container"; @@ -9,6 +16,19 @@ substituteAll { su = "${shadow.su}/bin/su"; utillinux = util-linux; + inherit configurationDirectory stateDirectory; + + passthru = { + tests = { + inherit (nixosTests) + containers-imperative + containers-ip + containers-tmpfs + containers-ephemeral + ; + }; + }; + postInstall = '' t=$out/share/bash-completion/completions mkdir -p $t diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index d99b4cfba4a..38f4c8d3169 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -12,6 +12,9 @@ use Time::HiRes; my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; +my $configurationDirectory = "@configurationDirectory@"; +my $stateDirectory = "@stateDirectory@"; + # Ensure a consistent umask. umask 0022; @@ -132,11 +135,17 @@ if (defined $flake && $flake =~ /^(.*)#([^#"]+)$/) { # Execute the selected action. -mkpath("/etc/containers", 0, 0755); -mkpath("/var/lib/containers", 0, 0700); +mkpath("$configurationDirectory", 0, 0755); +mkpath("$stateDirectory", 0, 0700); + if ($action eq "list") { - foreach my $confFile (glob "/etc/containers/*.conf") { + foreach my $confFile (glob "$configurationDirectory/*.conf") { + # Filter libpod configuration files + # From 22.05 and onwards this is not an issue any more as directories dont clash + if($confFile eq "/etc/containers/libpod.conf" || $confFile eq "/etc/containers/containers.conf" || $confFile eq "/etc/containers/registries.conf") { + next + } $confFile =~ /\/([^\/]+).conf$/ or next; print "$1\n"; } @@ -198,15 +207,15 @@ if ($action eq "create") { open(my $lock, '>>', $lockFN) or die "$0: opening $lockFN: $!"; flock($lock, LOCK_EX) or die "$0: could not lock $lockFN: $!"; - my $confFile = "/etc/containers/$containerName.conf"; - my $root = "/var/lib/containers/$containerName"; + my $confFile = "$configurationDirectory/$containerName.conf"; + my $root = "$stateDirectory/$containerName"; # Maybe generate a unique name. if ($ensureUniqueName) { my $base = $containerName; for (my $nr = 0; ; $nr++) { - $confFile = "/etc/containers/$containerName.conf"; - $root = "/var/lib/containers/$containerName"; + $confFile = "$configurationDirectory/$containerName.conf"; + $root = "$stateDirectory/$containerName"; last unless -e $confFile || -e $root; $containerName = "$base-$nr"; } @@ -220,7 +229,12 @@ if ($action eq "create") { # Get an unused IP address. my %usedIPs; - foreach my $confFile2 (glob "/etc/containers/*.conf") { + foreach my $confFile2 (glob "$configurationDirectory/*.conf") { + # Filter libpod configuration files + # From 22.05 and onwards this is not an issue any more as directories dont clash + if($confFile2 eq "/etc/containers/libpod.conf" || $confFile2 eq "/etc/containers/containers.conf" || $confFile2 eq "/etc/containers/registries.conf") { + next + } my $s = read_file($confFile2) or die; $usedIPs{$1} = 1 if $s =~ /^HOST_ADDRESS=([0-9\.]+)$/m; $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; @@ -292,10 +306,10 @@ if ($action eq "create") { exit 0; } -my $root = "/var/lib/containers/$containerName"; +my $root = "$stateDirectory/$containerName"; my $profileDir = "/nix/var/nix/profiles/per-container/$containerName"; my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName"; -my $confFile = "/etc/containers/$containerName.conf"; +my $confFile = "$configurationDirectory/$containerName.conf"; if (!-e $confFile) { if ($action eq "destroy") { exit 0; diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 65c0f3af65c..2159322a587 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-eX2Pzn5It4yf94ZWH/7yAJjwpayVYvpvbrvk7qvbimg="; + sha256 = "sha256-hI6XPND05m67dxo9EwIDhFTyC2UrL4Ll1V/WcBoJymU="; }; - cargoSha256 = "sha256-WXjmXwqeWnQVyFs51t81kHHMMn9HQQjBRw1g1cU+6/M="; + cargoSha256 = "sha256-jG6HZiL2almALyEnQRmbeCTRG11URP3+Bxqyn8hLs7w="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3a7e74a0ae..1451c8be95a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1507,9 +1507,9 @@ mapAliases ({ inherit (plasma5Packages) akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk - breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook - kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary @@ -1522,8 +1522,8 @@ mapAliases ({ plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake - zanshin + sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde + yakuake zanshin ; inherit (plasma5Packages.thirdParty) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8f903a1aa8..4a0fb8dd685 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -409,6 +409,8 @@ with pkgs; protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; + protolint = callPackage ../development/tools/protolint { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -4117,6 +4119,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + snazy = callPackage ../development/tools/snazy { }; + snippetpixie = callPackage ../tools/text/snippetpixie { }; snowcat = callPackage ../tools/security/snowcat { }; @@ -7170,6 +7174,8 @@ with pkgs; usePulseaudio = true; }; + jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -10949,6 +10955,10 @@ with pkgs; trytond = with python3Packages; toPythonApplication trytond; + tun2socks = callPackage ../tools/networking/tun2socks { + buildGoModule = buildGo118Module; + }; + tuntox = callPackage ../tools/networking/tuntox { }; omapd = callPackage ../tools/security/omapd { }; @@ -17829,6 +17839,8 @@ with pkgs; idasen = with python3Packages; toPythonApplication idasen; + ikill = callPackage ../tools/misc/ikill { }; + ilbc = callPackage ../development/libraries/ilbc { }; ilmbase = callPackage ../development/libraries/ilmbase { }; @@ -19262,6 +19274,8 @@ with pkgs; libviper = callPackage ../development/libraries/libviper { }; + libviperfx = callPackage ../development/libraries/libviperfx { }; + libvpx = callPackage ../development/libraries/libvpx { }; libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; @@ -19963,7 +19977,6 @@ with pkgs; polkit = callPackage ../development/libraries/polkit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; - poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; poppler_gi = lowPrio (poppler.override { introspectionSupport = true; @@ -25337,10 +25350,7 @@ with pkgs; calibre-web = callPackage ../servers/calibre-web { }; - calligra = libsForQt5.callPackage ../applications/office/calligra { - # Must use the same Qt version as Calligra itself: - poppler = libsForQt5.poppler_0_61; - }; + calligra = libsForQt5.callPackage ../applications/office/calligra { }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -25937,8 +25947,6 @@ with pkgs; icesl = callPackage ../applications/misc/icesl { }; - kalendar = libsForQt5.callPackage ../applications/office/kalendar { }; - keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -26954,6 +26962,8 @@ with pkgs; sonixd = callPackage ../applications/audio/sonixd { }; + sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; + spectmorph = callPackage ../applications/audio/spectmorph { }; smallwm = callPackage ../applications/window-managers/smallwm { }; @@ -29076,8 +29086,6 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; - quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; libmodplug = null; @@ -29499,8 +29507,6 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; @@ -30210,6 +30216,9 @@ with pkgs; uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { }; + viper4linux = callPackage ../applications/audio/viper4linux { }; + viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { }; + vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = libsForQt5.callPackage ../applications/video/vlc { @@ -35243,4 +35252,6 @@ with pkgs; honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; + + mictray = callPackage ../tools/audio/mictray { }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6bb539550a2..ee20285a900 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23222,7 +23222,11 @@ let url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; - buildInputs = [ ListMoreUtils TestDifferences TestException ]; + nativeBuildInputs = [ shortenPerlShebang ]; + checkInputs = [ ListMoreUtils TestDifferences TestException ]; + postInstall = '' + shortenPerlShebang $out/bin/Markdown.pl + ''; }; TextMarkdownHoedown = buildPerlModule { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b32adce0dc5..2214db668cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3887,8 +3887,12 @@ in { httplib2 = callPackage ../development/python-modules/httplib2 { }; + http-message-signatures = callPackage ../development/python-modules/http-message-signatures { }; + http-parser = callPackage ../development/python-modules/http-parser { }; + http-sfv = callPackage ../development/python-modules/http-sfv { }; + httpretty = callPackage ../development/python-modules/httpretty { }; httpserver = callPackage ../development/python-modules/httpserver { }; @@ -5742,6 +5746,8 @@ in { nunavut = callPackage ../development/python-modules/nunavut { }; + nutils = callPackage ../development/python-modules/nutils { }; + nvchecker = callPackage ../development/python-modules/nvchecker { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -9816,6 +9822,8 @@ in { stringcase = callPackage ../development/python-modules/stringcase { }; + stringly = callPackage ../development/python-modules/stringly { }; + stripe = callPackage ../development/python-modules/stripe { }; striprtf = callPackage ../development/python-modules/striprtf { }; @@ -10277,6 +10285,8 @@ in { transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + treelog = callPackage ../development/python-modules/treelog { }; + treeo = callPackage ../development/python-modules/treeo { }; treex = callPackage ../development/python-modules/treex { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 72d2a77d283..0b1324b8672 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -168,12 +168,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea suffix = "qt5"; }; - poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { - lcms = pkgs.lcms2; - qt5Support = true; - suffix = "qt5"; - }; - pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { };