diff options
Diffstat (limited to 'pkgs')
105 files changed, 2199 insertions, 1443 deletions
diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index bf39ed8781f35..bd8b21aa5aa06 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -4,6 +4,7 @@ , python3 , nodePackages , wkhtmltopdf +, nixosTests }: let @@ -72,19 +73,18 @@ let in python.pkgs.buildPythonApplication rec { pname = "odoo"; - major = "15"; - minor = "0"; - patch = "20220126"; + odoo_version = "15.0"; + odoo_release = "20220506"; - version = "${major}.${minor}.${patch}"; + version = "${odoo_version}.${odoo_release}"; format = "setuptools"; # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile src = fetchurl { - url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz"; + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; name = "${pname}-${version}"; - hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg="; + sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo }; # needs some investigation @@ -140,6 +140,13 @@ in python.pkgs.buildPythonApplication rec { cd odoo* ''; + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) odoo; + }; + }; + meta = with lib; { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; diff --git a/pkgs/applications/finance/odoo/update.sh b/pkgs/applications/finance/odoo/update.sh new file mode 100755 index 0000000000000..3b49727867c0c --- /dev/null +++ b/pkgs/applications/finance/odoo/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils + +set -euo pipefail + +DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/15.0/Dockerfile) + +get_var() { + echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g" +} + +VERSION=$(get_var VERSION) +RELEASE=$(get_var RELEASE) + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "odoo is up-to-date: $currentVersion" + exit 0 +fi + +cd "$(dirname "${BASH_SOURCE[0]}")" + +sed -ri "s| sha256.+ # odoo| sha256 = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix +sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix +sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 66248ff5365f4..e15b82404760c 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-34"; + version = "7.1.0-35"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4="; + hash = "sha256-KLS7gKUVeOAA89Kfrk07JzSXEF6TH6AgfheECbWi0lE="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 28d0371cd8c10..d3b94c2a8527a 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.1/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 2e5c70fb4c470..7e5dff590ed33 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1859 +4,1859 @@ { akonadi = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/akonadi-22.04.0.tar.xz"; - sha256 = "1v4bpnd7335f6rf7sy7xv3pjgay28lf9cbhy6g63v1sv2vicrih7"; - name = "akonadi-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-22.04.1.tar.xz"; + sha256 = "109r46dghfg84kcgq8h69m2pkd7abmq37ykgnpqynfzyrpkcvy6s"; + name = "akonadi-22.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-calendar-22.04.1.tar.xz"; + sha256 = "1jqil45igxbii7warzil9r9lphd0vm23454zc9k0psl4zvwqd71m"; + name = "akonadi-calendar-22.04.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-calendar-tools-22.04.1.tar.xz"; + sha256 = "1sn0355mkd8cl58nm6aspjb9jzngp7cxgj3jypyvwriv3fcm3ixj"; + name = "akonadi-calendar-tools-22.04.1.tar.xz"; }; }; akonadi-contacts = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-contacts-22.04.1.tar.xz"; + sha256 = "03ir95sghhvfxcsaz2v4wp06461xdr85iidgvpp9glfhp45cdwnd"; + name = "akonadi-contacts-22.04.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-import-wizard-22.04.1.tar.xz"; + sha256 = "0qgpzz855gfvsq30m3rw935pixpc8b732lsbzjykw6pnl73yji3j"; + name = "akonadi-import-wizard-22.04.1.tar.xz"; }; }; akonadi-mime = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-mime-22.04.1.tar.xz"; + sha256 = "03kx6j48rmsz0gy7w1fhs6g0xb8difd753kyv9a2di1ijkqhhn3g"; + name = "akonadi-mime-22.04.1.tar.xz"; }; }; akonadi-notes = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-notes-22.04.1.tar.xz"; + sha256 = "119s7vgl8s9ik2fabky6xwq6gvj2xdq2ii0h1j6vx2x98mwwcqsk"; + name = "akonadi-notes-22.04.1.tar.xz"; }; }; akonadi-search = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadi-search-22.04.1.tar.xz"; + sha256 = "0arymd5islkmiarxppg3d4fwfrb13fzrj8dpzv7y9llgmngcn7kk"; + name = "akonadi-search-22.04.1.tar.xz"; }; }; akonadiconsole = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/akonadiconsole-22.04.0.tar.xz"; - sha256 = "10x3dg83fvsjvv652gi4c3zn6cq0c86j1p00aajxr4ailk72f3l0"; - name = "akonadiconsole-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/akonadiconsole-22.04.1.tar.xz"; + sha256 = "1yji38rzjn3pr9b1gqbx0jq8k6iiqsi6cwpzk0ak9qp02z8h7bx9"; + name = "akonadiconsole-22.04.1.tar.xz"; }; }; akregator = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/akregator-22.04.0.tar.xz"; - sha256 = "12caw8ms5gzkda0ac8yx1swpsb0rqa01igqnfbn5l2z42mb511zi"; - name = "akregator-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/akregator-22.04.1.tar.xz"; + sha256 = "18anzq4wcimgqizshb6i3cd18ydsls0i88pbgzc92rajqvv8m7z2"; + name = "akregator-22.04.1.tar.xz"; }; }; analitza = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/analitza-22.04.0.tar.xz"; - sha256 = "0npi7x9x9s24jdzqjkrycxvjxnn43hbak5mjzrmifx98k1k3caqc"; - name = "analitza-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/analitza-22.04.1.tar.xz"; + sha256 = "0a0xzxfqxpriq1ak8qfi2f93f4ilfdp3z4v9ivl468fssmxg2x3j"; + name = "analitza-22.04.1.tar.xz"; }; }; ark = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ark-22.04.0.tar.xz"; - sha256 = "1pjz0y0863daf4qcn9m1sf6z68a7f8asdald8vcgw0p2c5yln1yb"; - name = "ark-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ark-22.04.1.tar.xz"; + sha256 = "1ikdwr803f55fgymp27zpwwfxzsjf79angzm84ysy2mv3l4cnpkn"; + name = "ark-22.04.1.tar.xz"; }; }; artikulate = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/artikulate-22.04.0.tar.xz"; - sha256 = "0ly407s60q8mi6li3n84hcpcxzdw0a55v6wnvr5ibnw6g6xxd01q"; - name = "artikulate-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/artikulate-22.04.1.tar.xz"; + sha256 = "176qjgwwh9xalwddjlfn39hkymjajbabzhgzrrrzjpw30zz6nplc"; + name = "artikulate-22.04.1.tar.xz"; }; }; audiocd-kio = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/audiocd-kio-22.04.1.tar.xz"; + sha256 = "1mannh6f79q4i6lpyf1dqvc9ra4hdrk7md40m8jj718v834svrql"; + name = "audiocd-kio-22.04.1.tar.xz"; }; }; baloo-widgets = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/baloo-widgets-22.04.1.tar.xz"; + sha256 = "1bkkdqnl3zdwijn05cmnbf77hc1y9zx7h5r24y9197sg2b0241v8"; + name = "baloo-widgets-22.04.1.tar.xz"; }; }; blinken = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/blinken-22.04.0.tar.xz"; - sha256 = "18bbpp6n92i6fx6dk9s9cy3v9rnw8wnaiywamaal4xg2qk4dkj63"; - name = "blinken-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/blinken-22.04.1.tar.xz"; + sha256 = "162cbivfbxi8792l2m2ipm0g67v2khfgxb481fccgraq3690ib2m"; + name = "blinken-22.04.1.tar.xz"; }; }; bomber = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/bomber-22.04.0.tar.xz"; - sha256 = "13rnxc4dmgspcacslgw8ikzzha7la0591nsnfwf0kjnqskh13kyz"; - name = "bomber-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/bomber-22.04.1.tar.xz"; + sha256 = "04siq2vcicm88p31v3hlqrsyxjbvvbayr03zf5kgn08kr3dr24y9"; + name = "bomber-22.04.1.tar.xz"; }; }; bovo = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/bovo-22.04.0.tar.xz"; - sha256 = "0lv6zzsaan3wfj7l3gdc7ksh2lbhmkkaksgs20mrh2mhwd8xz0gn"; - name = "bovo-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/bovo-22.04.1.tar.xz"; + sha256 = "0xbfnhvkfyy0pi1d0df02yx91551hcw5vf8mrm163abd4mjpmzls"; + name = "bovo-22.04.1.tar.xz"; }; }; calendarsupport = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/calendarsupport-22.04.0.tar.xz"; - sha256 = "0hnsrmwy3422azd13v70gkfaj02gwd7h1q568qhyaipdfbwb3sjl"; - name = "calendarsupport-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/calendarsupport-22.04.1.tar.xz"; + sha256 = "1axfhc09shmmmwgx1n2ilz7k0sakhlx6d9jvxhr2p29s5jsrbcqh"; + name = "calendarsupport-22.04.1.tar.xz"; }; }; cantor = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/cantor-22.04.0.tar.xz"; - sha256 = "1rs7w6vzm8kir348j63jrhld888ivdl2i7vb27yh7lrdgiydlkmp"; - name = "cantor-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/cantor-22.04.1.tar.xz"; + sha256 = "1lc3nnpg601mx2km62s3jwnyhngv0w4brgrylx4q3v4g2h0czbjc"; + name = "cantor-22.04.1.tar.xz"; }; }; cervisia = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/cervisia-22.04.0.tar.xz"; - sha256 = "02dgvvqag96fr2dhz50pa6g4v2mn7msviqzg8ih6sr30hv6qa9v9"; - name = "cervisia-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/cervisia-22.04.1.tar.xz"; + sha256 = "0dr77221ayhb0ihhjgm8rbcsmni8l12hyvp5w0dcd4p58xabnd2w"; + name = "cervisia-22.04.1.tar.xz"; }; }; dolphin = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/dolphin-22.04.0.tar.xz"; - sha256 = "007ilkgmg4wzqg1m0q9k8n60qf4jmln358jy1s443b5qsg8cvijq"; - name = "dolphin-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/dolphin-22.04.1.tar.xz"; + sha256 = "0ywsjz6jqcwr8i5zafiaxlg7855vyf0cm77936li4ggw3z11mxcw"; + name = "dolphin-22.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/dolphin-plugins-22.04.1.tar.xz"; + sha256 = "1zxh4aqi3mk9wafgslchm0jvcacva405jxf5l8hffkr2llchn8l1"; + name = "dolphin-plugins-22.04.1.tar.xz"; }; }; dragon = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/dragon-22.04.0.tar.xz"; - sha256 = "0haavk3igyfw9c4q3jc972q9h6ziwazpzfwjr0658n68qmqyg4lh"; - name = "dragon-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/dragon-22.04.1.tar.xz"; + sha256 = "0nq3m5y6yawb5z036gqmqajvsk52yy5pisblkyjnj1a8i0mlkg9p"; + name = "dragon-22.04.1.tar.xz"; }; }; elisa = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/elisa-22.04.0.tar.xz"; - sha256 = "0gm3llind6v6g4biy5mn7ks6pcr5vviasg1ksgvh51af5ah7kcxq"; - name = "elisa-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/elisa-22.04.1.tar.xz"; + sha256 = "01ay2nz08943iaja8ns3p8gkjbi4hqn632gw30la9kccjgnskgkp"; + name = "elisa-22.04.1.tar.xz"; }; }; eventviews = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/eventviews-22.04.0.tar.xz"; - sha256 = "1b9lk3xnjky9k04jcad1w3iynd57c3jfjzlz798qhz8pfvbkwd39"; - name = "eventviews-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/eventviews-22.04.1.tar.xz"; + sha256 = "0j3f1y7wnw1y0c6wxbm5cx298afngzppn2rz6vynslz3pb11825d"; + name = "eventviews-22.04.1.tar.xz"; }; }; falkon = { - version = "22.04.0"; + version = "22.04.1"; 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"; + url = "${mirror}/stable/release-service/22.04.1/src/falkon-22.04.1.tar.xz"; + sha256 = "09623p10n92fjk5i4kzpjnd5vjxng2m8z7vbz7n0snly8h67i6bl"; + name = "falkon-22.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ffmpegthumbs-22.04.0.tar.xz"; - sha256 = "1gp13sn95wq487fxpj3z928ppjcc4mblpwp627s8s1d5d1pmvjmn"; - name = "ffmpegthumbs-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ffmpegthumbs-22.04.1.tar.xz"; + sha256 = "0xbqkly4bpzx0ign1diz2z0gqn05dp6pgzn6z1wfxxp8rpf7nbwc"; + name = "ffmpegthumbs-22.04.1.tar.xz"; }; }; filelight = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/filelight-22.04.0.tar.xz"; - sha256 = "11z5wjl1f2a02vd6zvkiag65ysp8i4n6sdycam35r41jjx1sfks3"; - name = "filelight-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/filelight-22.04.1.tar.xz"; + sha256 = "06zrfa8r17sf326msnbqgzyazdijxvxd4plbwdkl6iyvybvswfdn"; + name = "filelight-22.04.1.tar.xz"; }; }; granatier = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/granatier-22.04.0.tar.xz"; - sha256 = "18bjz42bqg65k9ddyn5170fq1yngw92q1j0fr09q2bn3gxqh5654"; - name = "granatier-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/granatier-22.04.1.tar.xz"; + sha256 = "01czy1a4jiwcj7ngajqb6kf47d1dhxrzjk58l9w1npnl4zgjcbqd"; + name = "granatier-22.04.1.tar.xz"; }; }; grantlee-editor = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/grantlee-editor-22.04.1.tar.xz"; + sha256 = "0yis7cd7x4z1hn3q3wwkhqjzlfm6l43fkcj218yayb7pdqxa9q44"; + name = "grantlee-editor-22.04.1.tar.xz"; }; }; grantleetheme = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/grantleetheme-22.04.0.tar.xz"; - sha256 = "1ldx62lw20qj8k04vrm1p4sfr2bv9qxv5cp8g225iw8wwhhmzx2q"; - name = "grantleetheme-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/grantleetheme-22.04.1.tar.xz"; + sha256 = "0aks9sb4ywk461wqa2yhs0nc0h0i8v30rckx44s0f29v18z50ckm"; + name = "grantleetheme-22.04.1.tar.xz"; }; }; gwenview = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/gwenview-22.04.0.tar.xz"; - sha256 = "01dbf8ij7wc2bxnjmd1a5ard0zv7sxqqzk36sn63hncci6b30s3k"; - name = "gwenview-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/gwenview-22.04.1.tar.xz"; + sha256 = "0jncx7avdfqdv0x0r0s85h1lxxhc0ni14ia37y5vmqn7nxp8z6pr"; + name = "gwenview-22.04.1.tar.xz"; }; }; incidenceeditor = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/incidenceeditor-22.04.0.tar.xz"; - sha256 = "19p9jyp6ygisvzsvcbzcwly22kyhxvmw6wsjnm7jaw3iwbr6276i"; - name = "incidenceeditor-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/incidenceeditor-22.04.1.tar.xz"; + sha256 = "0h33jgrlvdsa4d2p905hl2spg7j265mn79l02rg21258r8r56bc3"; + name = "incidenceeditor-22.04.1.tar.xz"; }; }; itinerary = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/itinerary-22.04.0.tar.xz"; - sha256 = "0qa0rzm6anaiilmfiy714zvs6iy2h1mjjrc0f4n6qkfzmbzhls71"; - name = "itinerary-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/itinerary-22.04.1.tar.xz"; + sha256 = "09h0m9g7mmy1qap8k00fx3y63lqa641cwpi7dak91jh57crialcy"; + name = "itinerary-22.04.1.tar.xz"; }; }; juk = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/juk-22.04.0.tar.xz"; - sha256 = "05sj9pj032havlp68zk8x2mri3i56aw2j14pvk7xk31iipvly5yx"; - name = "juk-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/juk-22.04.1.tar.xz"; + sha256 = "1c9cigd72qzmaann85i0kfxivkbdqy1lwcrf2mlrb6ycvbzfmbm0"; + name = "juk-22.04.1.tar.xz"; }; }; k3b = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/k3b-22.04.0.tar.xz"; - sha256 = "0135gck2fd4zghji2d6zk6nb8s8qa9pgf1v1ckmi8zygslgxfmjq"; - name = "k3b-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/k3b-22.04.1.tar.xz"; + sha256 = "1yslsf736nlkxra8ial067a69mzlfb5zdyakcjg7nmkxbklkg46p"; + name = "k3b-22.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kaccounts-integration-22.04.1.tar.xz"; + sha256 = "1yj4c4qgxk8r5salfwra8dqi418167zrcs8rnpnzlvrr3gqqvvbj"; + name = "kaccounts-integration-22.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kaccounts-providers-22.04.1.tar.xz"; + sha256 = "0mphnjgyzdxlp5iig2hyfzvpykqf7bm6vn4ninnj5wcs91jkjlxq"; + name = "kaccounts-providers-22.04.1.tar.xz"; }; }; kaddressbook = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kaddressbook-22.04.0.tar.xz"; - sha256 = "0va36dsa8yy35zi4rkvwdvm5ga45nwwyyh366nhzymm4ni6fwlf0"; - name = "kaddressbook-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kaddressbook-22.04.1.tar.xz"; + sha256 = "1n76baf47ran2rdaz6i6b8c411zagqgzz89ap7v7x843vsv6g960"; + name = "kaddressbook-22.04.1.tar.xz"; }; }; kajongg = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kajongg-22.04.0.tar.xz"; - sha256 = "1k595k1vqd3fqw985193g7wf5pyl9d3ar4fwi79ai08xwk6rf4nm"; - name = "kajongg-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kajongg-22.04.1.tar.xz"; + sha256 = "0pbym31l4gyzwi9qvhbwmkyrb7199vfn5mipc9fxkjsczsyp0cqg"; + name = "kajongg-22.04.1.tar.xz"; }; }; kalarm = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kalarm-22.04.0.tar.xz"; - sha256 = "150zj57bl528xyjs0lvdyr425q8da3l24xz1wn44w1w29i3i3m8q"; - name = "kalarm-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kalarm-22.04.1.tar.xz"; + sha256 = "04cg8ymgwx6ls62q87ma3658xswff3a4kbjbdh05vvipqpkhd0cm"; + name = "kalarm-22.04.1.tar.xz"; }; }; kalendar = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kalendar-22.04.0.tar.xz"; - sha256 = "0bma75va1nkyinmkjhm3bknrp880ngklz0c21rsgykmbb8sa0zvz"; - name = "kalendar-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kalendar-22.04.1.tar.xz"; + sha256 = "1vk1n6in42frx95mgcsz8qhrhbbg2vz0fwxf966xbsdjcrg6whsn"; + name = "kalendar-22.04.1.tar.xz"; }; }; kalgebra = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kalgebra-22.04.0.tar.xz"; - sha256 = "17mfjv3xbn02f9jzhpw2xd1rp6rvjqzksa3cqlwjjd06k3l1q414"; - name = "kalgebra-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kalgebra-22.04.1.tar.xz"; + sha256 = "07cyknqhkyr4vsrv7bfl7aqflw079rb1rcqq2lm0k0pp4mi3z5m3"; + name = "kalgebra-22.04.1.tar.xz"; }; }; kalzium = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kalzium-22.04.0.tar.xz"; - sha256 = "07glndlclws8kq3jkfsh4a12zh7ly2w4m2ws77mc4a8zsjc33hdv"; - name = "kalzium-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kalzium-22.04.1.tar.xz"; + sha256 = "1fn8vn0phnaknd8yrzv75zdz3byq0rmdpb8blvp224nnlmf1733f"; + name = "kalzium-22.04.1.tar.xz"; }; }; kamera = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kamera-22.04.0.tar.xz"; - sha256 = "06xfls262p8x7p8j04y6c59ssjcbq4f2aqiw381k5pyam81hhrah"; - name = "kamera-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kamera-22.04.1.tar.xz"; + sha256 = "0c1mb8phip67h9v2crmrv7lnb00ha257l27j6hhq0pi3mpy4jhsg"; + name = "kamera-22.04.1.tar.xz"; }; }; kamoso = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kamoso-22.04.0.tar.xz"; - sha256 = "01ghfjrl97x4kn9g7wlgwi9wmplwqgayxqma8ywhbaf2wafqbsgs"; - name = "kamoso-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kamoso-22.04.1.tar.xz"; + sha256 = "039x5nrrznhlw53v63n550wb9k7x4r5w2d45rc2inw140rj5i32v"; + name = "kamoso-22.04.1.tar.xz"; }; }; kanagram = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kanagram-22.04.0.tar.xz"; - sha256 = "0laa9vnrh7k8f2800gz64zxr8hx0qrgypg8jh3iccmg8v53b38lz"; - name = "kanagram-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kanagram-22.04.1.tar.xz"; + sha256 = "0j0lg5yx8yid1anpvjvgy8p09b1nn8pcvd6w2rlrrxjwpybnx9jc"; + name = "kanagram-22.04.1.tar.xz"; }; }; kapman = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kapman-22.04.0.tar.xz"; - sha256 = "0a5k1jdh9qrm5bdx3z1f97sa92i781d1myp7pjc7s0hvjxprz5wy"; - name = "kapman-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kapman-22.04.1.tar.xz"; + sha256 = "1a6mmzmaxmlkn9d14m06b5wzr9rbciskhb3bfdzjpk9gia6j22kk"; + name = "kapman-22.04.1.tar.xz"; }; }; kapptemplate = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kapptemplate-22.04.0.tar.xz"; - sha256 = "0qbaa1ndqq7fk2azbj2rwlakg8amg572ji86vijf2f0fd26jbv2p"; - name = "kapptemplate-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kapptemplate-22.04.1.tar.xz"; + sha256 = "16q7pzd47aksbnnfa04cnjf6gbzhzfdmykn9cqwdb37689fs9lmf"; + name = "kapptemplate-22.04.1.tar.xz"; }; }; kate = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kate-22.04.0.tar.xz"; - sha256 = "1jy87zliqh9j4r0xy5gd3q1zklphmyvbzdp6brqlda0kf4isv46a"; - name = "kate-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kate-22.04.1.tar.xz"; + sha256 = "0jcqa3c1z54k3sjqhz8f7rq3xygkxcqw9728rppk506zgqyw6vpl"; + name = "kate-22.04.1.tar.xz"; }; }; katomic = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/katomic-22.04.0.tar.xz"; - sha256 = "02s4v4clylf2wq7ifpb786m11vmvfrfj6wr6rszn77h116ckfs3j"; - name = "katomic-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/katomic-22.04.1.tar.xz"; + sha256 = "1858q8k6pzszrmgjqhp32kkqmax6nbfw04x5h1pjyxhvaxg3xr27"; + name = "katomic-22.04.1.tar.xz"; }; }; kbackup = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kbackup-22.04.0.tar.xz"; - sha256 = "122g4bn2cs4vyj30lf0nd603sibjdycwkiz5b9lh42kcnkjghs8l"; - name = "kbackup-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kbackup-22.04.1.tar.xz"; + sha256 = "1h84alirmrbn90l9zfzs1xj2nf5q5hzvy0rsbsrkhwcsw35q63z2"; + name = "kbackup-22.04.1.tar.xz"; }; }; kblackbox = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kblackbox-22.04.0.tar.xz"; - sha256 = "08gjg0abp1c58m7b6xb99ynz8fkl537bcmz4iryyd3v7ibswdr91"; - name = "kblackbox-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kblackbox-22.04.1.tar.xz"; + sha256 = "03gdwfwkzyzwh3qj6pjsd90df2knmaf6y6vgpzh92k4y1zq8n421"; + name = "kblackbox-22.04.1.tar.xz"; }; }; kblocks = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kblocks-22.04.0.tar.xz"; - sha256 = "18n9vy3xv1g4wafwiwnf5ghh3irrxlm1jxn19m322ajs8qk53qcg"; - name = "kblocks-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kblocks-22.04.1.tar.xz"; + sha256 = "1dglbppjfbdvnmpnk6cf01sp0vclnbxgvw6wnlmdp1vh00qgad3d"; + name = "kblocks-22.04.1.tar.xz"; }; }; kbounce = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kbounce-22.04.0.tar.xz"; - sha256 = "0xk41pja2kxzrmrrza23xnfnxk9k4ag3xcjjp6c8hj6brzd6g9a9"; - name = "kbounce-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kbounce-22.04.1.tar.xz"; + sha256 = "1ci5i5d5dppw7xgma6hyrd5v93n1lc8n2bp36p0za1hak9kxisaa"; + name = "kbounce-22.04.1.tar.xz"; }; }; kbreakout = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kbreakout-22.04.0.tar.xz"; - sha256 = "0z8x0i5yh6hcn2b296mx05b0lm6wv4gkwk20g82ypzbwanj269pl"; - name = "kbreakout-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kbreakout-22.04.1.tar.xz"; + sha256 = "0fmk4nd8c5z8fy2pw88l9fpcv0a59gbcvvgh3v92cmdw0ml65wb0"; + name = "kbreakout-22.04.1.tar.xz"; }; }; kbruch = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kbruch-22.04.0.tar.xz"; - sha256 = "1kpl9zk88sm4l17ndx25anlff6f1l13h4k4m39pryi5ywpsajjk9"; - name = "kbruch-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kbruch-22.04.1.tar.xz"; + sha256 = "1zx0cwi8s83j9ix0vdnjxhrkw2pa85y6plpwzy12f2fbxkmzvg1h"; + name = "kbruch-22.04.1.tar.xz"; }; }; kcachegrind = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcachegrind-22.04.0.tar.xz"; - sha256 = "03c9r0zwslsv6sb5i91bk59pzi0ia7pyssgdfr6f5b01vjjrxl5f"; - name = "kcachegrind-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcachegrind-22.04.1.tar.xz"; + sha256 = "0nvqly26w4wma68glfa6bil1jxh6hmd7mjvcr3s6fvzk4ky51was"; + name = "kcachegrind-22.04.1.tar.xz"; }; }; kcalc = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcalc-22.04.0.tar.xz"; - sha256 = "1gg7wqm1vb22pa1a791sdvg1pf4l6pnzq1wsvxa8ih6dkdplcmrg"; - name = "kcalc-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcalc-22.04.1.tar.xz"; + sha256 = "09nfcmmh5bmjx2bkjw33s0a55lky8shkhrgq1q3fd18igw7xpcgl"; + name = "kcalc-22.04.1.tar.xz"; }; }; kcalutils = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcalutils-22.04.0.tar.xz"; - sha256 = "0wn9mc4myi8mj9qc3lmswqj9y3lfgfpxg0vdzxsa0ai8i3g3g0j7"; - name = "kcalutils-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcalutils-22.04.1.tar.xz"; + sha256 = "0vgwz3yinrf2wjwj5qfj22fn7hdl0q5lhzd7v4a903gj4cb27ayq"; + name = "kcalutils-22.04.1.tar.xz"; }; }; kcharselect = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcharselect-22.04.0.tar.xz"; - sha256 = "1av1w906cy2dcdn0k7xjc1s897bgm9f8b79k97pk6x5f3rfnvy71"; - name = "kcharselect-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcharselect-22.04.1.tar.xz"; + sha256 = "0s4wfq808dsi3bjf4hq419b3ws0hsir79wgw9mbbry0s0c02nlk9"; + name = "kcharselect-22.04.1.tar.xz"; }; }; kcolorchooser = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcolorchooser-22.04.0.tar.xz"; - sha256 = "0cn5zgrsf3xji7y5ipa9zv5njyx94rg617d6l0qxjh4n94x2d4yj"; - name = "kcolorchooser-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcolorchooser-22.04.1.tar.xz"; + sha256 = "1s9j7r5rxq1zd8aaakxsw2p56rvykhnm80s5rk8krkp4gk58przr"; + name = "kcolorchooser-22.04.1.tar.xz"; }; }; kcron = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kcron-22.04.0.tar.xz"; - sha256 = "0j067izv16646hjaw5swnxyf4gbg1gz5wxjcnrvscfv3hryf9b6q"; - name = "kcron-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kcron-22.04.1.tar.xz"; + sha256 = "15g5k3z840zawhnksyzznw5w8ns3pp9vgdmz7pc2pir15mp763jm"; + name = "kcron-22.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kde-dev-scripts-22.04.1.tar.xz"; + sha256 = "1s9cjyz2im8s6gpq1w0zqrfgf3cdw697s4z7srw50cg6aagks4x3"; + name = "kde-dev-scripts-22.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kde-dev-utils-22.04.1.tar.xz"; + sha256 = "1bi8i6pnx2yi786y78ad24f1yrb2vjd5ggrgaxislijs9qpdpbnr"; + name = "kde-dev-utils-22.04.1.tar.xz"; }; }; kdebugsettings = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdebugsettings-22.04.0.tar.xz"; - sha256 = "1jh3syvy0k611jmk615ba74zl62l5nw9fhb8y8mk6mgw23i16c21"; - name = "kdebugsettings-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdebugsettings-22.04.1.tar.xz"; + sha256 = "14b0p0n14bivfr5nfjsyamx8jk2sbw283s04hrrxmv93b14068r7"; + name = "kdebugsettings-22.04.1.tar.xz"; }; }; kdeconnect-kde = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdeconnect-kde-22.04.1.tar.xz"; + sha256 = "0ym5n311iabrwal8w3yiq76g656rp1gz0yq9fdz61fl0pd4bmnbd"; + name = "kdeconnect-kde-22.04.1.tar.xz"; }; }; kdeedu-data = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdeedu-data-22.04.1.tar.xz"; + sha256 = "1lgcn4z4k2djzls35w33y5h7yjw2cs1028bxh0avlprh5ihi8cn2"; + name = "kdeedu-data-22.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdegraphics-mobipocket-22.04.1.tar.xz"; + sha256 = "0p8zsks0fcrzmcnwdzb7gcswq7vkv67vy1x1mi4v0y6lcgx1xqz7"; + name = "kdegraphics-mobipocket-22.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdegraphics-thumbnailers-22.04.1.tar.xz"; + sha256 = "1y8rkjr5azyffj8bb06jrm46j87n93xzvn2fcyarrmww01dsw1hp"; + name = "kdegraphics-thumbnailers-22.04.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdenetwork-filesharing-22.04.1.tar.xz"; + sha256 = "1h5zh0yvar3lylxm1iri3w7c7qzmdf18ak258jfphc23c9q6w32j"; + name = "kdenetwork-filesharing-22.04.1.tar.xz"; }; }; kdenlive = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdenlive-22.04.0.tar.xz"; - sha256 = "0ybd5ixjrsldsz3fr1y1phnns4lvklzcrr0mv9gg1xic38ppn536"; - name = "kdenlive-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdenlive-22.04.1.tar.xz"; + sha256 = "0kiajmkmf2254464s8rv8d61igwrd2xmrj1dxwzrps4fy50r11xf"; + name = "kdenlive-22.04.1.tar.xz"; }; }; kdepim-addons = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdepim-addons-22.04.1.tar.xz"; + sha256 = "0r5gy56n1nrsm1wvf8687g6ng5m3q9wnl8nkfqaa4a4kk16h0i5f"; + name = "kdepim-addons-22.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdepim-runtime-22.04.1.tar.xz"; + sha256 = "0gwhzdlzal2j61hak5axv68n7chhnlf8n9dqnnfili6ffps63yxm"; + name = "kdepim-runtime-22.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdesdk-kioslaves-22.04.1.tar.xz"; + sha256 = "19ay298fbjmn5xcrmpjabch7ljfmn03qkacifv337yx5idv1116q"; + name = "kdesdk-kioslaves-22.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdesdk-thumbnailers-22.04.1.tar.xz"; + sha256 = "0f7d9m13gx552f1ficw1r7ndlal39iicklrc8g8cqh2gvkbydgni"; + name = "kdesdk-thumbnailers-22.04.1.tar.xz"; }; }; kdev-php = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdev-php-22.04.1.tar.xz"; + sha256 = "1cxvzybiqxa5kgbv2jb42jq7div5q4jyl3kiar5mdnnc590x4h2y"; + name = "kdev-php-22.04.1.tar.xz"; }; }; kdev-python = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kdev-python-22.04.1.tar.xz"; + sha256 = "01570g5284llqbmnlrsbrpm6zbkkp5rip49gng4nn7pi4nab9nyr"; + name = "kdev-python-22.04.1.tar.xz"; }; }; kdevelop = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdevelop-22.04.0.tar.xz"; - sha256 = "05jamqizsbfx5bj3p5d4s4320xps8nr3lq2gv22mqiv7mcl1hymb"; - name = "kdevelop-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdevelop-22.04.1.tar.xz"; + sha256 = "1n6dcs1z88d7aaski7ffjvjpfzqssr9zjrlzlcf84k285l6zbwr2"; + name = "kdevelop-22.04.1.tar.xz"; }; }; kdf = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdf-22.04.0.tar.xz"; - sha256 = "1xy0pm7sggcwf5mf0n9514n7skbaz9w1kwahgd135s7cxw3wd9aw"; - name = "kdf-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdf-22.04.1.tar.xz"; + sha256 = "03vr48yhb08fw5f34yn8yjnygflz6993ihq9pfcp6jg916fpwkbp"; + name = "kdf-22.04.1.tar.xz"; }; }; kdialog = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdialog-22.04.0.tar.xz"; - sha256 = "1285jdcv2bbnq3292qx08i5bashvjj2vdx325nlfi1vbaydlfixc"; - name = "kdialog-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdialog-22.04.1.tar.xz"; + sha256 = "0qqpvrkbinnxz26a4msak4wa26b4r52yjyz2h5l3q1gw7j2kp4wm"; + name = "kdialog-22.04.1.tar.xz"; }; }; kdiamond = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kdiamond-22.04.0.tar.xz"; - sha256 = "1qvjrklq2vdbq26k531ddwgjjfgnj77qc9c84c7x4bjyv3j2jhry"; - name = "kdiamond-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kdiamond-22.04.1.tar.xz"; + sha256 = "19pj1lfcz7bgq6cxkn165l7b8lr5vwjp4sd724krm6l51jxzmd0x"; + name = "kdiamond-22.04.1.tar.xz"; }; }; keditbookmarks = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/keditbookmarks-22.04.0.tar.xz"; - sha256 = "09vkp0ingzf8naa7d5hvsj7nxab5z4ci1nh12jn9ri6f1bvapnnn"; - name = "keditbookmarks-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/keditbookmarks-22.04.1.tar.xz"; + sha256 = "0bix84hy02i90bpmrxjl5gd433jb2yawlbdcchgwb73py14pcay2"; + name = "keditbookmarks-22.04.1.tar.xz"; }; }; kfind = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kfind-22.04.0.tar.xz"; - sha256 = "0db9iclzq89ykb9lw90wycb1057qrys02sv6z71kzyv4pv8clcsi"; - name = "kfind-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kfind-22.04.1.tar.xz"; + sha256 = "1mrrjrnlapvajw3hysqzd1kb1qvjwbwbc4mggawpwpq4cbpap4mc"; + name = "kfind-22.04.1.tar.xz"; }; }; kfloppy = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kfloppy-22.04.0.tar.xz"; - sha256 = "07vixy0fdvvvjwchci77a32lz2bam02smnyvl5jx446gxra3kbxd"; - name = "kfloppy-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kfloppy-22.04.1.tar.xz"; + sha256 = "1yc90238v9f5czryjzfx9znjkl5r5smwr3gdx0cgp9sw225gl01q"; + name = "kfloppy-22.04.1.tar.xz"; }; }; kfourinline = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kfourinline-22.04.0.tar.xz"; - sha256 = "1kvpilvsfb4zz59jmz8qk688xf9j4v8xijahxnsfrx3a216nd5wx"; - name = "kfourinline-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kfourinline-22.04.1.tar.xz"; + sha256 = "0964iv2fa96s659crs56yqjcdkbckl7zw5h25x0r9gfycjkddhl2"; + name = "kfourinline-22.04.1.tar.xz"; }; }; kgeography = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kgeography-22.04.0.tar.xz"; - sha256 = "1f75av03iw1glsxar6ipbch2xvb9if59r3h85ndkpd7f8azdmam5"; - name = "kgeography-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kgeography-22.04.1.tar.xz"; + sha256 = "0l6az2fkbgrlg7i8h81f6jhj4vlw92x6jgkywxm93msbaz4ah1fw"; + name = "kgeography-22.04.1.tar.xz"; }; }; kget = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kget-22.04.0.tar.xz"; - sha256 = "01s73qb2658hryq639yiqjl696z6k4c6m7vmm0x9iglacl0qihdd"; - name = "kget-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kget-22.04.1.tar.xz"; + sha256 = "1v8vv32ncwnw4wn51rvk8n5kixdc2kjw9ds08ajv5x6iz06cvqrd"; + name = "kget-22.04.1.tar.xz"; }; }; kgoldrunner = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kgoldrunner-22.04.0.tar.xz"; - sha256 = "1d6z2fslxpjdnixh372p78zk1apavnn9pvhdhnz9isq1yyvbwabx"; - name = "kgoldrunner-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kgoldrunner-22.04.1.tar.xz"; + sha256 = "0hs7p3allyw16lncr7fwavgggacdlgp893i1wx0mqzgg9yp4p1zm"; + name = "kgoldrunner-22.04.1.tar.xz"; }; }; kgpg = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kgpg-22.04.0.tar.xz"; - sha256 = "0g78r1lya4vv09yiq9jmhcy4d3824n70ps71x1z6dvrpf6fnri49"; - name = "kgpg-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kgpg-22.04.1.tar.xz"; + sha256 = "0dgc33h7mmbmgk29jmrrsykngzkirk53j6xxwrz8mfwbadvmvgy5"; + name = "kgpg-22.04.1.tar.xz"; }; }; khangman = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/khangman-22.04.0.tar.xz"; - sha256 = "0dl4rdifgxbxcxslnjcgl8ni3fw30zkp90mzdrp4hbg1rql8pav9"; - name = "khangman-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/khangman-22.04.1.tar.xz"; + sha256 = "09mx12hf24rhwk0q2kni1gx5hg90nkjh556c0v6zqjmx3whlc1p6"; + name = "khangman-22.04.1.tar.xz"; }; }; khelpcenter = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/khelpcenter-22.04.0.tar.xz"; - sha256 = "1nfa9q688l151196mbfdn5i7k2x2a5sz1kn07j8flxhwpkcbyrgm"; - name = "khelpcenter-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/khelpcenter-22.04.1.tar.xz"; + sha256 = "0wjjcrmncig6ymrk2an5n12ygy652zg7lxwvi2wi6zrdjk2kazf8"; + name = "khelpcenter-22.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kidentitymanagement-22.04.0.tar.xz"; - sha256 = "1xw5q12la5p34lg8pwndx4pnr1cf5pv36611209v2qcfwjfk5570"; - name = "kidentitymanagement-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kidentitymanagement-22.04.1.tar.xz"; + sha256 = "0f07r0x8i0k8fkzik49y80wr3laxq96gcmr287n4265f7pj02skl"; + name = "kidentitymanagement-22.04.1.tar.xz"; }; }; kig = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kig-22.04.0.tar.xz"; - sha256 = "0rbrvkflm0199vz4zpqs08dqzsrqw7r8xzgr034s9g7hwf0f5nbd"; - name = "kig-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kig-22.04.1.tar.xz"; + sha256 = "1qz287cfvk7wvx5jp61jcwnmwmjm8y3h6k2hyjpspqr3k1n84345"; + name = "kig-22.04.1.tar.xz"; }; }; kigo = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kigo-22.04.0.tar.xz"; - sha256 = "0whiza2xqzi33ppaz1d72aicg53f1zmwg47drg1s42sx5rj7jmpg"; - name = "kigo-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kigo-22.04.1.tar.xz"; + sha256 = "094q9q9c728zva64dxl522s2q7lzdybrw055w5mryj66mdb9b43j"; + name = "kigo-22.04.1.tar.xz"; }; }; killbots = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/killbots-22.04.0.tar.xz"; - sha256 = "0aaip213gc6ngan122r2rm7mc794mlir3qx1krhsg6gh8i1qvj91"; - name = "killbots-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/killbots-22.04.1.tar.xz"; + sha256 = "0kymimgwa5amcc93r6nrfiv6psjb0k96a8b2vr3jbc6vrm9aimjy"; + name = "killbots-22.04.1.tar.xz"; }; }; kimagemapeditor = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kimagemapeditor-22.04.0.tar.xz"; - sha256 = "0yh7sb5pk31q1pksb74yg94mrf752baj767gq0kgmp6ymmw83i6x"; - name = "kimagemapeditor-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kimagemapeditor-22.04.1.tar.xz"; + sha256 = "1lzqgav4gfq0cay162rjypikh4dx1jjj44ds9br2rfm0wp6x6zds"; + name = "kimagemapeditor-22.04.1.tar.xz"; }; }; kimap = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kimap-22.04.0.tar.xz"; - sha256 = "12n0fjqh9mpwdii3gkvfvg33b6lzdrl2n3v94j29hq4nk8k1y8gf"; - name = "kimap-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kimap-22.04.1.tar.xz"; + sha256 = "0r945v0365vmyapcaqb6wabxdyflp33hh441cx26acwj11dpwgvl"; + name = "kimap-22.04.1.tar.xz"; }; }; kio-extras = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kio-extras-22.04.1.tar.xz"; + sha256 = "057qbz1cmmi1mgj38r4dsh49af4dqnihzs5r7w6hwx3dw03m2ix4"; + name = "kio-extras-22.04.1.tar.xz"; }; }; kio-gdrive = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kio-gdrive-22.04.1.tar.xz"; + sha256 = "12qb6m2n0nfx62z0xc1p66si140j6yih3lp80n9b43yf9c1hn5h6"; + name = "kio-gdrive-22.04.1.tar.xz"; }; }; kipi-plugins = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kipi-plugins-22.04.1.tar.xz"; + sha256 = "0587pc2nmcxig4nfqyc6yvc1rxaqqa3kgnbdah53177mb4zj1lk8"; + name = "kipi-plugins-22.04.1.tar.xz"; }; }; kirigami-gallery = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kirigami-gallery-22.04.1.tar.xz"; + sha256 = "1yjj18vcik38gzqka2kia4yrk8ay9l2d7lh3wspp97v3r49dpl7y"; + name = "kirigami-gallery-22.04.1.tar.xz"; }; }; kiriki = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kiriki-22.04.0.tar.xz"; - sha256 = "041xiw7s7r94115wvlnzk1443af9gb06scsvbqj92hdc9a2p6318"; - name = "kiriki-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kiriki-22.04.1.tar.xz"; + sha256 = "0mwdmb14ljr2vvpz05frzd3qpwp16zckivi5qb7awf488vj7iknz"; + name = "kiriki-22.04.1.tar.xz"; }; }; kiten = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kiten-22.04.0.tar.xz"; - sha256 = "0n19a4ch2rgzq7s2f6dnhgbcqdi22xqd8vhy5hnbw4mw4xa9f6xm"; - name = "kiten-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kiten-22.04.1.tar.xz"; + sha256 = "14zq296qmjfssa0f3gmq2hsadlglp95l1wrrm0v14j19rd1sfzlr"; + name = "kiten-22.04.1.tar.xz"; }; }; kitinerary = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kitinerary-22.04.0.tar.xz"; - sha256 = "1q2dwdycajab3w7w4898s3s2jcy541qgsandfzi7yapplw238gm7"; - name = "kitinerary-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kitinerary-22.04.1.tar.xz"; + sha256 = "0ykbjp3bqhlhjj3r04zgh0pza6mh4qadhxk8gsxdndqvpv4p8sih"; + name = "kitinerary-22.04.1.tar.xz"; }; }; kjumpingcube = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kjumpingcube-22.04.0.tar.xz"; - sha256 = "1q8wnyympajijzsnddrf21pzwshbvkj4r5diydgavd23zgspfkp3"; - name = "kjumpingcube-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kjumpingcube-22.04.1.tar.xz"; + sha256 = "1fgz21wy3nwqhsplpg65j54rlwdpmp6nhdh9g04zsgy3micsghag"; + name = "kjumpingcube-22.04.1.tar.xz"; }; }; kldap = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kldap-22.04.0.tar.xz"; - sha256 = "1z6kmkryc9sz3g0hf0dh7plmv59w03rzxyrnacrc94bjkbf56y1i"; - name = "kldap-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kldap-22.04.1.tar.xz"; + sha256 = "1p06v089mid7y1qapdwai781jvypl2a3q8007j0rfpk9nbb93lhb"; + name = "kldap-22.04.1.tar.xz"; }; }; kleopatra = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kleopatra-22.04.0.tar.xz"; - sha256 = "0aaz3mwyyr2i8lbkrfz9hbz8358bqhf2zzxla1i9p177cfrdv60i"; - name = "kleopatra-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kleopatra-22.04.1.tar.xz"; + sha256 = "08xfxbm9rlv36bf9zzj61ds052hg5l1q4m1fs9mcwvwcnwsn63nk"; + name = "kleopatra-22.04.1.tar.xz"; }; }; klettres = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/klettres-22.04.0.tar.xz"; - sha256 = "1ih7q2rd6ajky719dikyfhy03dyw4x4bm9032l8vd51rv9zcjbp3"; - name = "klettres-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/klettres-22.04.1.tar.xz"; + sha256 = "1clyjlrzjxw534ks6y496l1xr4iz1qxmmlgr5dyaqw8r5n45x687"; + name = "klettres-22.04.1.tar.xz"; }; }; klickety = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/klickety-22.04.0.tar.xz"; - sha256 = "1fl76vj1qrlp8giy6ing3qnm76i4scx0q5sn7dflwix5cjvsjyss"; - name = "klickety-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/klickety-22.04.1.tar.xz"; + sha256 = "1ssnrqyvm9w3jn53pshy8gd06q30760wgzk9svhk485j90g6jw9c"; + name = "klickety-22.04.1.tar.xz"; }; }; klines = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/klines-22.04.0.tar.xz"; - sha256 = "0s7vqsg5lh7znxij0fygawww8fhga3rn0dv5k147jbvrzhfn01yn"; - name = "klines-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/klines-22.04.1.tar.xz"; + sha256 = "1k3a9vr92xb7m5gqdgz9kg0vnyxq4br1zyxy7d5wgqf28qgh41vf"; + name = "klines-22.04.1.tar.xz"; }; }; kmag = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmag-22.04.0.tar.xz"; - sha256 = "1bwp7psf2vdl7q0s8ymji9zhmrfp6vxilwmf9cw1bhl0wjislnp6"; - name = "kmag-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmag-22.04.1.tar.xz"; + sha256 = "0siiwgrfvzqhm23887j560w6l9i0j43i569kfknyqkiz5p0l28zz"; + name = "kmag-22.04.1.tar.xz"; }; }; kmahjongg = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmahjongg-22.04.0.tar.xz"; - sha256 = "1hs0pv8bvxbk8c4ag7kbmylddh0wqzzi953xggpi86fzinpgzmq9"; - name = "kmahjongg-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmahjongg-22.04.1.tar.xz"; + sha256 = "0kcdpyh7iabg672y0yd84lb14h0mn4p3cq2w9zi0l71gqm1zs22a"; + name = "kmahjongg-22.04.1.tar.xz"; }; }; kmail = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmail-22.04.0.tar.xz"; - sha256 = "1rp65m1y4rynzxc0497d4kbppqj9gz5r1kd769msq01v72if7xvr"; - name = "kmail-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmail-22.04.1.tar.xz"; + sha256 = "1s4kbv8y7jhwg6b2qd8kj22xiwdgyllxnljmmna1964kqakl6h54"; + name = "kmail-22.04.1.tar.xz"; }; }; kmail-account-wizard = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kmail-account-wizard-22.04.1.tar.xz"; + sha256 = "119gp8dv84nfnd2lvxgw3qsrfrycmgbqq2xm0hlz8zp2jmikw9fk"; + name = "kmail-account-wizard-22.04.1.tar.xz"; }; }; kmailtransport = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmailtransport-22.04.0.tar.xz"; - sha256 = "1bglr299xn5z65zl49kp6ahcf229aga5fwn6ij2bv3cm9xa4f6iv"; - name = "kmailtransport-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmailtransport-22.04.1.tar.xz"; + sha256 = "1lmd4lvj66ib0f1bkaanvcdq84f8hcyxx2hgrqdyha5d1mpw47cg"; + name = "kmailtransport-22.04.1.tar.xz"; }; }; kmbox = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmbox-22.04.0.tar.xz"; - sha256 = "1ysjjz8v338l8n47dxg5jskbilsybwx6vd3lmlajw5iqfwpjk6k1"; - name = "kmbox-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmbox-22.04.1.tar.xz"; + sha256 = "1496mzbcxzdlwyy207b0ql2il934hcqigb2vybxqc6lap4irzf4i"; + name = "kmbox-22.04.1.tar.xz"; }; }; kmime = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmime-22.04.0.tar.xz"; - sha256 = "0h9dsw3jl2jpfsb19yh4v8rzjd930xbglgzasl87f0f2nawkmdik"; - name = "kmime-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmime-22.04.1.tar.xz"; + sha256 = "01favp535b9cjjwyqcaqbprcljamn2pzwl8mf5m59xq4s9h4myd7"; + name = "kmime-22.04.1.tar.xz"; }; }; kmines = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmines-22.04.0.tar.xz"; - sha256 = "1dzfi9r2zrn0rn96l42g12srqgmz8gkw6glyjadzay1mkhin7zp4"; - name = "kmines-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmines-22.04.1.tar.xz"; + sha256 = "1rcx9yxml0lgaa8bls836j010bgqbqd6pj08ncjqw42m67fzll24"; + name = "kmines-22.04.1.tar.xz"; }; }; kmix = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmix-22.04.0.tar.xz"; - sha256 = "0yjykslaynf6vcv33s3hwm2s03acp2k97dljmq8dwgq3nwyaah9z"; - name = "kmix-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmix-22.04.1.tar.xz"; + sha256 = "1flf3adk1bm9c6hi4xqana8r1jslgdffy4rri4r5s0lrr3w7kdsw"; + name = "kmix-22.04.1.tar.xz"; }; }; kmousetool = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmousetool-22.04.0.tar.xz"; - sha256 = "0a0gcq0295x3ckdhxv77lnvv8yms04xg5pkza5612k3zr386f0b5"; - name = "kmousetool-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmousetool-22.04.1.tar.xz"; + sha256 = "0hlggni1mwn1bf9xx8l643nxwzw7pjh4y9cra7adph30nqfyr4cv"; + name = "kmousetool-22.04.1.tar.xz"; }; }; kmouth = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmouth-22.04.0.tar.xz"; - sha256 = "05v0frgl6im5yv6ah8qsrgqcrjziiycnnnqq2z859psxnysvmsiz"; - name = "kmouth-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmouth-22.04.1.tar.xz"; + sha256 = "01j19l02ffijjggi8h1lrncc9177iqgdh62y14dlka83j47f1wh3"; + name = "kmouth-22.04.1.tar.xz"; }; }; kmplot = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kmplot-22.04.0.tar.xz"; - sha256 = "063bxm619jkd63jv70a4g6bj2q4fcg5a7lxjkwas9qm1qhlz2vzy"; - name = "kmplot-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kmplot-22.04.1.tar.xz"; + sha256 = "0fvsygp3sf1mvhws8mb3q3vdf4ljmvvjj9a36rl7904zan14klq8"; + name = "kmplot-22.04.1.tar.xz"; }; }; knavalbattle = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/knavalbattle-22.04.0.tar.xz"; - sha256 = "1hdgmjvsv7skck64w4j4sxyq7b8c7f5i2vcvkfbqxrrzf3wcq649"; - name = "knavalbattle-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/knavalbattle-22.04.1.tar.xz"; + sha256 = "1araf2f216hjy212ilabz4z4axa2j93j2jvvlq5y5psn4zmrz23v"; + name = "knavalbattle-22.04.1.tar.xz"; }; }; knetwalk = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/knetwalk-22.04.0.tar.xz"; - sha256 = "0ws9sgn3ygl4012irkjk82j7b08cbhpq7ca7sncw9il7lfxbis6l"; - name = "knetwalk-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/knetwalk-22.04.1.tar.xz"; + sha256 = "0psayrbk56zl54vbwhzzzpg4h9rigyw48rxl0si7z7sjwill3xq2"; + name = "knetwalk-22.04.1.tar.xz"; }; }; knights = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/knights-22.04.0.tar.xz"; - sha256 = "0dfxk811f9yjklfr01djppms86fqj3112cfh41z2zwsl4wgbyrma"; - name = "knights-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/knights-22.04.1.tar.xz"; + sha256 = "018f8y7zhdqn77qkkwqgf5w5m0y1c9i5w7xs08q2hcglpa6pb5jj"; + name = "knights-22.04.1.tar.xz"; }; }; knotes = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/knotes-22.04.0.tar.xz"; - sha256 = "023rv1cvy2ykpv9p0862csixxn65fkhis8jjf9vmdq33j7mmflsm"; - name = "knotes-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/knotes-22.04.1.tar.xz"; + sha256 = "1h1afis9d33mzz023b61b6fxy399bdxrvnbmjvb2ncgs7c3nvd21"; + name = "knotes-22.04.1.tar.xz"; }; }; kolf = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kolf-22.04.0.tar.xz"; - sha256 = "0i3j9wbhjgxd1j58brjnbyb7862h6iz8kvb6vnnqwgzybwy09n88"; - name = "kolf-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kolf-22.04.1.tar.xz"; + sha256 = "15jhd2giakbp7zy3jwz0rqmr11cv7y5n6hbvxdx17xf6rgr20qxf"; + name = "kolf-22.04.1.tar.xz"; }; }; kollision = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kollision-22.04.0.tar.xz"; - sha256 = "18vp7iqkm9pbrcl5cppwb6qngfbw75d2vjqngm5kjz124jn6hxxa"; - name = "kollision-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kollision-22.04.1.tar.xz"; + sha256 = "1g7z7n2ihfnqr10pbba2rfwm826vrir7k6lxvizma4fa65f9dg9c"; + name = "kollision-22.04.1.tar.xz"; }; }; kolourpaint = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kolourpaint-22.04.0.tar.xz"; - sha256 = "0qwibnpr5zgpwdk44xl43xlr02w75j8c01z8arsiv6rdycwy9cmf"; - name = "kolourpaint-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kolourpaint-22.04.1.tar.xz"; + sha256 = "1sxgfyvxfjwfn5rjxcgifmdlxin77f5kizwpyn1jan8awk3rcl2d"; + name = "kolourpaint-22.04.1.tar.xz"; }; }; kompare = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kompare-22.04.0.tar.xz"; - sha256 = "1381kih1ywd5k2wslasp0ap69kmbd05nm8jy67cric1f9d4fxq72"; - name = "kompare-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kompare-22.04.1.tar.xz"; + sha256 = "0kjkmj5xnvkg22i9h5bqy3r68xbxy57mpp0fynaakl3dj89pxz0m"; + name = "kompare-22.04.1.tar.xz"; }; }; konqueror = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/konqueror-22.04.0.tar.xz"; - sha256 = "0s0cf41p2ciwmgywv5g59cnw9fzy2065grk9g058d522qqadcmfv"; - name = "konqueror-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/konqueror-22.04.1.tar.xz"; + sha256 = "1vs7x40pf8290bqcxyd0p086nds9z3bczk4rjsadifrymgmf4i17"; + name = "konqueror-22.04.1.tar.xz"; }; }; konquest = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/konquest-22.04.0.tar.xz"; - sha256 = "0kpjakww8kaqf7b18v5r7xhg9z07c22959gygcq22b0dahqsgy1w"; - name = "konquest-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/konquest-22.04.1.tar.xz"; + sha256 = "0rajwi6yjxzs4g7q8bc07b4sn71p0989cz9fx4k6rs3zwhfdf0dr"; + name = "konquest-22.04.1.tar.xz"; }; }; konsole = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/konsole-22.04.0.tar.xz"; - sha256 = "1wyvfwky8p5ryc101bfxfbzrbvhw6sl9yaqk057wkqvav2h6k6xz"; - name = "konsole-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/konsole-22.04.1.tar.xz"; + sha256 = "1qr2d32j0dz1ssd8ym8llxwsdzjmn6x1z5hcbkn6895ym649h14d"; + name = "konsole-22.04.1.tar.xz"; }; }; kontact = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kontact-22.04.0.tar.xz"; - sha256 = "19jpwazr553bb1qw9lkp89gbxabjbalc1f31sf6j074zxjn7p29v"; - name = "kontact-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kontact-22.04.1.tar.xz"; + sha256 = "19krnikn5374gjp82k7g3vvv1ylakqari2rnsbp1l7vdrymj28wn"; + name = "kontact-22.04.1.tar.xz"; }; }; kontactinterface = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kontactinterface-22.04.0.tar.xz"; - sha256 = "1v0yyb81dq98dgmlzc3ry36nhsl29sh1dj7c9y3y926dkv6s3khp"; - name = "kontactinterface-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kontactinterface-22.04.1.tar.xz"; + sha256 = "0sya33b0xg9392jb8p5gdw0cd3iivgfq2jvzbvpr3iiq9cgbj2m3"; + name = "kontactinterface-22.04.1.tar.xz"; }; }; kontrast = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kontrast-22.04.0.tar.xz"; - sha256 = "1nznd3ir87r3rhmpqxdcnvivczfybqdqzabwa0f6zlryixcvqmqb"; - name = "kontrast-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kontrast-22.04.1.tar.xz"; + sha256 = "0paharkjyz51mgajan6bspkc8bpywjkgdkszdi909vxyzgszcznz"; + name = "kontrast-22.04.1.tar.xz"; }; }; konversation = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/konversation-22.04.0.tar.xz"; - sha256 = "12lvgxzdchcyg0jy3qcvfssdad5c6asiadkszz7brnnnxma3i77q"; - name = "konversation-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/konversation-22.04.1.tar.xz"; + sha256 = "1gzy1v2vdc100sr1anp3762nn3hj4km5hrjnxnkcc30z2p7g7cyi"; + name = "konversation-22.04.1.tar.xz"; }; }; kopeninghours = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kopeninghours-22.04.0.tar.xz"; - sha256 = "17yxbr86dqyxpgdr35lfvfal1qf38hx8alk2p0j7l8k9yd5zgw5h"; - name = "kopeninghours-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kopeninghours-22.04.1.tar.xz"; + sha256 = "0w9j1y7h8p6hqvrf9k0rp0hbajjlbipnwj4rc9p204khganbp1nd"; + name = "kopeninghours-22.04.1.tar.xz"; }; }; kopete = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kopete-22.04.0.tar.xz"; - sha256 = "1hy9z5148c9grh56pr4865hq62x85lnn83kg9f7kx6dnbkwyq408"; - name = "kopete-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kopete-22.04.1.tar.xz"; + sha256 = "1rhykqns68p650s64vd1x655cvfa0jgvban3v2vpa2qh2pl7w1mk"; + name = "kopete-22.04.1.tar.xz"; }; }; korganizer = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/korganizer-22.04.0.tar.xz"; - sha256 = "12qdp5wwii55prc7wih70r1sw7c3dnrwmczhsm3m6gsf4p2px4si"; - name = "korganizer-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/korganizer-22.04.1.tar.xz"; + sha256 = "0d2mshb8gj5akr4jxf85rk759i3dmkg15c3daj7jfpgr7ybyck2r"; + name = "korganizer-22.04.1.tar.xz"; }; }; kosmindoormap = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kosmindoormap-22.04.0.tar.xz"; - sha256 = "1gxw614nydmqc8s83wi6aranw4jd24zvbjky2sdfryph0gr14zg1"; - name = "kosmindoormap-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kosmindoormap-22.04.1.tar.xz"; + sha256 = "0kmla7f8ld0398prqcqanv2pf38lg4c1gkz1qiak93ay2h9nww11"; + name = "kosmindoormap-22.04.1.tar.xz"; }; }; kpat = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kpat-22.04.0.tar.xz"; - sha256 = "0kd4cxgwg7336q27api51g2xa7d20nypm32rpm9vq3cq112jwpi7"; - name = "kpat-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kpat-22.04.1.tar.xz"; + sha256 = "1wd125nxgmflzxrsasbsi3k99wwws1nrwvimqgsy2rw40fm3i6ga"; + name = "kpat-22.04.1.tar.xz"; }; }; kpimtextedit = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kpimtextedit-22.04.0.tar.xz"; - sha256 = "0j01yn28j58y05v9cf6fyjal79n0rydddsga00aqkbksf80pd93p"; - name = "kpimtextedit-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kpimtextedit-22.04.1.tar.xz"; + sha256 = "1ixzz4wlmx8sh4bkxaxacllcn3pymr75vwgks00rw1jiqgydxkpn"; + name = "kpimtextedit-22.04.1.tar.xz"; }; }; kpkpass = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kpkpass-22.04.0.tar.xz"; - sha256 = "0fk789wgx9ks99cfd7b8w62nw7820s53mb9zv9vkzy9mma4640q3"; - name = "kpkpass-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kpkpass-22.04.1.tar.xz"; + sha256 = "07a1k6gfl0x7p57n0g0199g2zaz097arbwhkjx1y7xsi775asp2y"; + name = "kpkpass-22.04.1.tar.xz"; }; }; kpmcore = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kpmcore-22.04.0.tar.xz"; - sha256 = "1fwdyr37q8bk7mwr2v7q9704q4ykwgg6ak08ss3vvlzsj981dvxh"; - name = "kpmcore-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kpmcore-22.04.1.tar.xz"; + sha256 = "1y34gh1983ihf2hcs9x35xq805wd0cx1w2dgnbb41l2v2b647l3h"; + name = "kpmcore-22.04.1.tar.xz"; }; }; kpublictransport = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kpublictransport-22.04.0.tar.xz"; - sha256 = "1nc7z7czr24wbwdpgj9vv8p3kn2hdqpf88q7q2776zh64ghi1mrc"; - name = "kpublictransport-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kpublictransport-22.04.1.tar.xz"; + sha256 = "0zssk77hxzprpgdzcw5r00kk3yccpmjcqx0hvix4q2ghj422z1cg"; + name = "kpublictransport-22.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kqtquickcharts-22.04.0.tar.xz"; - sha256 = "1pn0c8wpbd88g26g65yd0pv5xzz27k5bmx7k6as7k3s41y96lpn5"; - name = "kqtquickcharts-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kqtquickcharts-22.04.1.tar.xz"; + sha256 = "0b1cwsa16bfwlv8x3zwmvhkk5zahrhqpr94vpv5fvai47apihng8"; + name = "kqtquickcharts-22.04.1.tar.xz"; }; }; krdc = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/krdc-22.04.0.tar.xz"; - sha256 = "1rykh19g4fb7kadzg2i3kgf1s1qdm31z5hdq4yx60v009lmsa2r5"; - name = "krdc-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/krdc-22.04.1.tar.xz"; + sha256 = "0ccg5a5rk9cb0q844y2adyrxj2z0zc63jp9zcdi14f7lp4rka8zz"; + name = "krdc-22.04.1.tar.xz"; }; }; kreversi = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kreversi-22.04.0.tar.xz"; - sha256 = "0mzwjkgzv3f8y7wkbfy5gvww2gl6kww8wq2s1kwayv8cimvxmlzq"; - name = "kreversi-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kreversi-22.04.1.tar.xz"; + sha256 = "0kwy7wdrfndmxg4nrqy51j102z33xzh1768ai6jcbgz2vjv6qhln"; + name = "kreversi-22.04.1.tar.xz"; }; }; krfb = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/krfb-22.04.0.tar.xz"; - sha256 = "145wi252ah38c45p08jjwzd7f07d993mvn7nq30xc6vvs5mwgmia"; - name = "krfb-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/krfb-22.04.1.tar.xz"; + sha256 = "00843wncngb4x6l44li6yzaq4qzlfyrzyxvkk6njm5pzmgki4yvp"; + name = "krfb-22.04.1.tar.xz"; }; }; kross-interpreters = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/kross-interpreters-22.04.1.tar.xz"; + sha256 = "1sh8f0m8hh06i3wspjybhqhn1dhpxag2mass38p7gm3ipkp7q88n"; + name = "kross-interpreters-22.04.1.tar.xz"; }; }; kruler = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kruler-22.04.0.tar.xz"; - sha256 = "0ifd32x0xwrzx6whjja71qhwvzgsv956dxs05vsb4gw10sv8kwgl"; - name = "kruler-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kruler-22.04.1.tar.xz"; + sha256 = "0vp1290wmy8rji34wdzzpshrgpzpiz3hvjgd0cynqg3skjn8r17p"; + name = "kruler-22.04.1.tar.xz"; }; }; kshisen = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kshisen-22.04.0.tar.xz"; - sha256 = "0p1bxyayl5nlik9ksssqy1sa543zv9chi6cq10sic46gwz6cxbhr"; - name = "kshisen-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kshisen-22.04.1.tar.xz"; + sha256 = "0hiwkz2fm4ywm404prphl797j5dn95di6bcnnrb8l8zy6i2gwkvp"; + name = "kshisen-22.04.1.tar.xz"; }; }; ksirk = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksirk-22.04.0.tar.xz"; - sha256 = "1ys3k3y4gkyd7691yd7r7pr1csm05hmfvm60iwkv6g1a7imsanp7"; - name = "ksirk-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksirk-22.04.1.tar.xz"; + sha256 = "14zb64kz7jk46hqc388g4zv7a3m2bd131sp8pabjmn83ysrpppz7"; + name = "ksirk-22.04.1.tar.xz"; }; }; ksmtp = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksmtp-22.04.0.tar.xz"; - sha256 = "15v7bqx6y2cvj71v30zdscddv5xc1vqxq2h6r1f2c1i1ppg0x91d"; - name = "ksmtp-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksmtp-22.04.1.tar.xz"; + sha256 = "0n7lg7zavy43z73my5569hb1fv4xrsibizpzd9yp631iahn6jigl"; + name = "ksmtp-22.04.1.tar.xz"; }; }; ksnakeduel = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksnakeduel-22.04.0.tar.xz"; - sha256 = "0d03ixx8fid3wagcajasasd1h9j87wxxix7521fmnq5qhdd77nyl"; - name = "ksnakeduel-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksnakeduel-22.04.1.tar.xz"; + sha256 = "1sz70hdyfbzl5syq9f2vn2wdqdl4058xxk83vmj2a8niva49nr9m"; + name = "ksnakeduel-22.04.1.tar.xz"; }; }; kspaceduel = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kspaceduel-22.04.0.tar.xz"; - sha256 = "0gyblvlcrbdspdf740mp4587f04lnl8jm5qq0gl5gmfads7l90bh"; - name = "kspaceduel-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kspaceduel-22.04.1.tar.xz"; + sha256 = "1k5fl88w1wcsq2sbh36bkikjh272fc9z89v45xnv40hjd00wwxac"; + name = "kspaceduel-22.04.1.tar.xz"; }; }; ksquares = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksquares-22.04.0.tar.xz"; - sha256 = "122i3wwbvvc66i8mzmql3z4s23nmjc9k9rfbl9v0202hcalgzhv8"; - name = "ksquares-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksquares-22.04.1.tar.xz"; + sha256 = "1xlzbl9iqkhbh91v7qkrgk0ha8xi96j680bzyia9yjhxq8bkn0ii"; + name = "ksquares-22.04.1.tar.xz"; }; }; ksudoku = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksudoku-22.04.0.tar.xz"; - sha256 = "088bkzx1n81al774h2n9nvkhsg42alc5n4fffh490lx3ys8ckdgq"; - name = "ksudoku-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksudoku-22.04.1.tar.xz"; + sha256 = "03nasma38xiwvbapyxs2wkgk7vv83jk57zg103rgkkr78ybabmgf"; + name = "ksudoku-22.04.1.tar.xz"; }; }; ksystemlog = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ksystemlog-22.04.0.tar.xz"; - sha256 = "1927515lh64qk041d5qpshx4fy3k5hsnzv6c2jqdsa39fll5wli5"; - name = "ksystemlog-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ksystemlog-22.04.1.tar.xz"; + sha256 = "0dpb4acglqzy2cwfi32sc48r0p6vl8j7g9g6pc8r6iq25pja2qfp"; + name = "ksystemlog-22.04.1.tar.xz"; }; }; kteatime = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kteatime-22.04.0.tar.xz"; - sha256 = "1xhxz2x1a35vsibgn8myqg976gqdhipsw48c961f0vfzyw9q62gk"; - name = "kteatime-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kteatime-22.04.1.tar.xz"; + sha256 = "0nv5i2arnwzpmd2zm5ra7n87y3ygmadzzpdlr5ylpznaqfypbgym"; + name = "kteatime-22.04.1.tar.xz"; }; }; ktimer = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ktimer-22.04.0.tar.xz"; - sha256 = "0zg5hk69wz395b8faz7s8sxl3ncr6vkybz0zd3m70cm85cxv5jwv"; - name = "ktimer-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ktimer-22.04.1.tar.xz"; + sha256 = "1ragzrdzzg9nw6nnxgpw9cm982lk71j1lbcb5b19dfb3jpwwirrw"; + name = "ktimer-22.04.1.tar.xz"; }; }; ktnef = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ktnef-22.04.0.tar.xz"; - sha256 = "0kk50qf8k7q9qsdqwr2fy580adw3a4a6x0q4a825smch1m35wih0"; - name = "ktnef-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ktnef-22.04.1.tar.xz"; + sha256 = "1rpni8jhbwghzzv4nw646xmz7g3vw7k1y7bnv9kmripn1sag8f49"; + name = "ktnef-22.04.1.tar.xz"; }; }; ktorrent = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ktorrent-22.04.0.tar.xz"; - sha256 = "1yclmg4hjvss0l2q0pzc1j9gz2nqwgj37kcvacxa38n6l5clfxb2"; - name = "ktorrent-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ktorrent-22.04.1.tar.xz"; + sha256 = "1cnq13dgz8fxiw65mlhzbimmb1p25rdcawldffr2b4gxv2gxcngk"; + name = "ktorrent-22.04.1.tar.xz"; }; }; ktouch = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ktouch-22.04.0.tar.xz"; - sha256 = "03qr1q4nhayklkwyskh3wf5c101l90b9h8lp9v11y63gpzicsxhh"; - name = "ktouch-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ktouch-22.04.1.tar.xz"; + sha256 = "0rz379xc0v3nvwilisvdfqlf84xgy48mhslkgp164mmp670r5ksj"; + name = "ktouch-22.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-accounts-kcm-22.04.1.tar.xz"; + sha256 = "15mc8wc4lywn0gi6wbc9h0k38fs38jr8v771r3zpc2r9bpa0qfsl"; + name = "ktp-accounts-kcm-22.04.1.tar.xz"; }; }; ktp-approver = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-approver-22.04.1.tar.xz"; + sha256 = "11xrr83s1n0a97bkgyr8gy3f6abggndk1rdj7d4qs399jfzqs7j5"; + name = "ktp-approver-22.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-auth-handler-22.04.1.tar.xz"; + sha256 = "1fp2wj3nrnjn8mzyhqdqg8r7gdy7ksm245qagynynb1a2hdd1vpb"; + name = "ktp-auth-handler-22.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-call-ui-22.04.1.tar.xz"; + sha256 = "0jmbn52pz83d5n11hqawh64s2204izbb6w1aya4zdlsa4l2zyizb"; + name = "ktp-call-ui-22.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-common-internals-22.04.1.tar.xz"; + sha256 = "0vmy6sdxhi0d1g4iql2xx2zc259gwi155hh3s6f6nnfdvm4971a3"; + name = "ktp-common-internals-22.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-contact-list-22.04.1.tar.xz"; + sha256 = "1pczacindx828c7g6dkvq90nqadgg32jn4my335sl6ykr735a4pw"; + name = "ktp-contact-list-22.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-contact-runner-22.04.1.tar.xz"; + sha256 = "1hcy2dm8d08bp5lqxa96am6af3i33vialyc7hzdmp6alv062fqgs"; + name = "ktp-contact-runner-22.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-desktop-applets-22.04.1.tar.xz"; + sha256 = "19hdfs1pa04d0inqh5id6ysnzsbi3n24jlr6y2qn2lzqfm3kgxl6"; + name = "ktp-desktop-applets-22.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-filetransfer-handler-22.04.1.tar.xz"; + sha256 = "1698ic2y43w8bm2j6r9mms4z3zgyz5wdghyhnw1syh8g0nks6b9a"; + name = "ktp-filetransfer-handler-22.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-kded-module-22.04.1.tar.xz"; + sha256 = "1df6wiyxb4qa6d8nj8hkn7z6f9g2nn0bwi9gywfqq23n1imrnin7"; + name = "ktp-kded-module-22.04.1.tar.xz"; }; }; ktp-send-file = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-send-file-22.04.1.tar.xz"; + sha256 = "0swf599kf769ad721r0lmf74g0mp68h0lxjcvy71wfnjkfgn16rl"; + name = "ktp-send-file-22.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/ktp-text-ui-22.04.1.tar.xz"; + sha256 = "0ldgiq0amr715hivv9573gxdi6p530zjfvq1nmyn4nr3lv3k036f"; + name = "ktp-text-ui-22.04.1.tar.xz"; }; }; ktuberling = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/ktuberling-22.04.0.tar.xz"; - sha256 = "19cxpxwyzcy3vif7q5rmzzr1qa1bhql2l309psi66b4yndxs1n8q"; - name = "ktuberling-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/ktuberling-22.04.1.tar.xz"; + sha256 = "1b1ra5qxf4yba4z9hsjq1r30vfg0kgpxjmj5cpzvm0jdy5vas8j5"; + name = "ktuberling-22.04.1.tar.xz"; }; }; kturtle = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kturtle-22.04.0.tar.xz"; - sha256 = "09w4wf7w5bck2ca59gsszjdyvyfwir9vwk5wwp0xciky1qwb2hpx"; - name = "kturtle-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kturtle-22.04.1.tar.xz"; + sha256 = "1gs3q23ylxpbk65ml9xpgz7dyz9r2gbwl2jda9i2vqir4n6w1ihm"; + name = "kturtle-22.04.1.tar.xz"; }; }; kubrick = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kubrick-22.04.0.tar.xz"; - sha256 = "0k624kl2cv06r04b7y1dp7zyhcqampqa10cy77df6am20v6n0za3"; - name = "kubrick-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kubrick-22.04.1.tar.xz"; + sha256 = "13p33kmrdknzjbkpg90wjccgy7ckpk23gfghvn55q13hvvvr492w"; + name = "kubrick-22.04.1.tar.xz"; }; }; kwalletmanager = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kwalletmanager-22.04.0.tar.xz"; - sha256 = "05zc9aib2wnzn45mrcg59qkyfrwzxanddnnpv7z74ydw1ap28f6k"; - name = "kwalletmanager-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kwalletmanager-22.04.1.tar.xz"; + sha256 = "0nhfyz9fyjsjjbj4fgyqqq2rvafm8klbjnlf0sqy5fdd5ldii7i8"; + name = "kwalletmanager-22.04.1.tar.xz"; }; }; kwave = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kwave-22.04.0.tar.xz"; - sha256 = "17a2gzawp9pg5aqmj3433qrqrh03yj5ldivnzr7alf5qdvj7p1c6"; - name = "kwave-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kwave-22.04.1.tar.xz"; + sha256 = "10m847fqk3b8yhs4vji477qc9gh62rz9n72b23ib4y8xpddvkxzz"; + name = "kwave-22.04.1.tar.xz"; }; }; kwordquiz = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/kwordquiz-22.04.0.tar.xz"; - sha256 = "0pss1vz890hmv03g9gl1v6bmf73ga484qzp2j5x3mp1w3ks93s73"; - name = "kwordquiz-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/kwordquiz-22.04.1.tar.xz"; + sha256 = "0mw8pkwr52bfzwbv8rny6s5yfqf7rz55ql0v7i319vi71pk9m8bz"; + name = "kwordquiz-22.04.1.tar.xz"; }; }; libgravatar = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libgravatar-22.04.0.tar.xz"; - sha256 = "0zkbs3zniahfbhzf7qghm7d478vbhm1ifvv44xl4m596rhm18ibs"; - name = "libgravatar-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libgravatar-22.04.1.tar.xz"; + sha256 = "0fy52hm3xkh7kvask339gfxsm2fiv5d2va4wlhgqhnjq972b7fyn"; + name = "libgravatar-22.04.1.tar.xz"; }; }; libkcddb = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkcddb-22.04.0.tar.xz"; - sha256 = "0x87pg6djih6sssd7zjqarnry9v9n6kbk2zirjgp8nic272irjfx"; - name = "libkcddb-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkcddb-22.04.1.tar.xz"; + sha256 = "000bqff7gdy5bhs7jkyf08j975f9wqxv9x4qgs5gnqz4wxrqllqh"; + name = "libkcddb-22.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkcompactdisc-22.04.0.tar.xz"; - sha256 = "152zq2c23cf13lmc6895pcw36plhb8is4hilf9jvcgx0jmzgs5kz"; - name = "libkcompactdisc-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkcompactdisc-22.04.1.tar.xz"; + sha256 = "06s56iqmr0rhpp325p98mz7b0bn7siq91y11v6pvvxwp42mfm6w6"; + name = "libkcompactdisc-22.04.1.tar.xz"; }; }; libkdcraw = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkdcraw-22.04.0.tar.xz"; - sha256 = "0y9yvdfhbn0fy81y6d16r1vjcfxiq8g4wy6y5gqmkvzxhydfwb7r"; - name = "libkdcraw-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkdcraw-22.04.1.tar.xz"; + sha256 = "19d82bmz8mfp6sajjih5712z4951pp0hsnsw1s46xs0r4lwjv532"; + name = "libkdcraw-22.04.1.tar.xz"; }; }; libkdegames = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkdegames-22.04.0.tar.xz"; - sha256 = "0xif6jpdm9x0c6f4p8wy7lkyhxd1ckgw5vxn1d16v06jpw6xin2d"; - name = "libkdegames-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkdegames-22.04.1.tar.xz"; + sha256 = "1q6r1y13lzxyfgy1bphrqq6vpn43vssa077inccl1b4hqm9lgs8c"; + name = "libkdegames-22.04.1.tar.xz"; }; }; libkdepim = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkdepim-22.04.0.tar.xz"; - sha256 = "14cq8zm2ldhql91v8cc9g9v81ny0g1x06qfj2jwlqjccmphywncd"; - name = "libkdepim-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkdepim-22.04.1.tar.xz"; + sha256 = "0x21yw42fsvib28fabilxinm7sl0vrwhw12yzra66mrl7ysvwfwn"; + name = "libkdepim-22.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkeduvocdocument-22.04.0.tar.xz"; - sha256 = "0d4pxjvnnri45q8dn7r7qi9vv7kd8g35mhkc9jh80mqw5817pl5h"; - name = "libkeduvocdocument-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkeduvocdocument-22.04.1.tar.xz"; + sha256 = "05w76d7js2068wmyjahailw1bmjn6zrr9d49hixn2ic0fih4amai"; + name = "libkeduvocdocument-22.04.1.tar.xz"; }; }; libkexiv2 = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkexiv2-22.04.0.tar.xz"; - sha256 = "0h3zjldpjz2jvkwp6scpxwjmxm5l0bcs25ivrl8s3yjjggil53wx"; - name = "libkexiv2-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkexiv2-22.04.1.tar.xz"; + sha256 = "1nnmbq3xcl7blflw9ibaqwkk405rf1rfjh8zxvli8yhz76rkhvrp"; + name = "libkexiv2-22.04.1.tar.xz"; }; }; libkgapi = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkgapi-22.04.0.tar.xz"; - sha256 = "0gvr1ins5sbf8q10waqgjpricvz5v5d8q0i6q4q3r0hncg7i21rw"; - name = "libkgapi-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkgapi-22.04.1.tar.xz"; + sha256 = "17qa3c2zbsiyj6lqw56flhv0dfnwcd8ak7hisyrksalv50x5zq4l"; + name = "libkgapi-22.04.1.tar.xz"; }; }; libkipi = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkipi-22.04.0.tar.xz"; - sha256 = "0xcwjx5kidqbf64b2pd4vlf9vzyjwm1jbbm89pyb2myiadkngzkj"; - name = "libkipi-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkipi-22.04.1.tar.xz"; + sha256 = "1zcskhg1p8ldrf4r0miqnyvyw9yr4x894lp4hkahvlarxm7vf5gg"; + name = "libkipi-22.04.1.tar.xz"; }; }; libkleo = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkleo-22.04.0.tar.xz"; - sha256 = "1vwfa38wh0di2q4999bnw8dfyn8ckph5b88z0v218gl1iwwsxgsf"; - name = "libkleo-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkleo-22.04.1.tar.xz"; + sha256 = "01qqzvna4vpldflq9ah2dj8hl3wmzh6x4hw4ah3vii2rmf5hbmln"; + name = "libkleo-22.04.1.tar.xz"; }; }; libkmahjongg = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkmahjongg-22.04.0.tar.xz"; - sha256 = "0g50qks245zw9g9inzkk9n9bbzambi3pf5sd0m4qcd4hlkq494q3"; - name = "libkmahjongg-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkmahjongg-22.04.1.tar.xz"; + sha256 = "0aw79n93f4vc2fg0mrb55cz1584hwf7li4fyvs4c4wpxcpbfk3ff"; + name = "libkmahjongg-22.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libkomparediff2-22.04.0.tar.xz"; - sha256 = "0487grz2q8g3cxmirp2mzzk87xljdnakh0lqvjqc0773siwg97ww"; - name = "libkomparediff2-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libkomparediff2-22.04.1.tar.xz"; + sha256 = "0gz31j51vqgs13gyk2xrr20h852vnk9cy381sgnnk9m22lqxn174"; + name = "libkomparediff2-22.04.1.tar.xz"; }; }; libksane = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libksane-22.04.0.tar.xz"; - sha256 = "055x396jhkzqzfk54flig4cpn12hfvmsm5x5ini2vhjfdc986fkk"; - name = "libksane-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libksane-22.04.1.tar.xz"; + sha256 = "103448xv5y6q552g4g6016nmrgr2b0b6g0mg4d5hy2ibd0kmsxdv"; + name = "libksane-22.04.1.tar.xz"; }; }; libksieve = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libksieve-22.04.0.tar.xz"; - sha256 = "0ybmccxrsfvlsxrhbk4f1szj6y2gz520j5a7mdqwarwj2ba2fnvy"; - name = "libksieve-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libksieve-22.04.1.tar.xz"; + sha256 = "06ypiw5xmpxjyr5blwnwv5whm15fsafadzld8mn7qqxfzhibpzrx"; + name = "libksieve-22.04.1.tar.xz"; }; }; libktorrent = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/libktorrent-22.04.0.tar.xz"; - sha256 = "0xgh27yi06sx4jc6bfdayc2jx4fbf66939k9amg7m728sgd3yq1h"; - name = "libktorrent-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/libktorrent-22.04.1.tar.xz"; + sha256 = "1jnxwyvil5mjlj7rvy31nbdg39fziclb014ilsy2f0g1r7nldpap"; + name = "libktorrent-22.04.1.tar.xz"; }; }; lokalize = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/lokalize-22.04.0.tar.xz"; - sha256 = "1r6r3bkcnqaj7r398pl30plzs81bwj83lzbmch8pl25v8vksd0w0"; - name = "lokalize-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/lokalize-22.04.1.tar.xz"; + sha256 = "0m4z9qas74x5j7wc1gr0rfzn10mzf1jdf3ffqybrxgli22w8c9my"; + name = "lokalize-22.04.1.tar.xz"; }; }; lskat = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/lskat-22.04.0.tar.xz"; - sha256 = "0nr78krgf6hy3brn94g0lcwkw6bif5ivhhmmx62b4p3iqy6155c0"; - name = "lskat-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/lskat-22.04.1.tar.xz"; + sha256 = "0gyd8bzdnc5c0dpswmrigm81ajqgbvkvfs97nrdw08hvk5ba3a79"; + name = "lskat-22.04.1.tar.xz"; }; }; mailcommon = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/mailcommon-22.04.0.tar.xz"; - sha256 = "0yx2j9j3pylgliadbc1j2w4jmqb3ydciy7x9swhgf0zm8a0gj0k6"; - name = "mailcommon-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/mailcommon-22.04.1.tar.xz"; + sha256 = "0xfsjl6p629r0gpvcrnxgdx1hfcqk9q1zzwjs4zw1waggpf39has"; + name = "mailcommon-22.04.1.tar.xz"; }; }; mailimporter = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/mailimporter-22.04.0.tar.xz"; - sha256 = "07rkcnylpalhd774dsvsyv1lg5i8ya2wkn3zmgswvsnlxiymlv2s"; - name = "mailimporter-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/mailimporter-22.04.1.tar.xz"; + sha256 = "17gklgbi9fppc1k96nlmam8qdw8rzpc47b1vd9y1zrxsbp47fv46"; + name = "mailimporter-22.04.1.tar.xz"; }; }; marble = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/marble-22.04.0.tar.xz"; - sha256 = "0qlrg5vy2rvvgimg1bxlyia5czygqn5gwf1nfkjdm1xk6scj2fgb"; - name = "marble-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/marble-22.04.1.tar.xz"; + sha256 = "0mxqp7q4l0zic3aszfwijyk06pj9b2q3cj7bj3lqghvncd4196rm"; + name = "marble-22.04.1.tar.xz"; }; }; markdownpart = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/markdownpart-22.04.0.tar.xz"; - sha256 = "130vm0h07phzg7rdcdijcnr8nlyif7gcf80a7pfxjirxszy3l5zw"; - name = "markdownpart-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/markdownpart-22.04.1.tar.xz"; + sha256 = "1ihg3n4ndyipsfac5gfhf7pljr4x3v2zbalvc9369q39xmzvz8c5"; + name = "markdownpart-22.04.1.tar.xz"; }; }; mbox-importer = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/mbox-importer-22.04.1.tar.xz"; + sha256 = "14jl5gwz7rwsac4gzyv1larr1llwwhdrbg6pvapqgwwpmxnmdjzi"; + name = "mbox-importer-22.04.1.tar.xz"; }; }; messagelib = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/messagelib-22.04.0.tar.xz"; - sha256 = "0ny9qv26a8vi0vg5990bw82jz25balk3j0419ssbgakwybgfgkkb"; - name = "messagelib-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/messagelib-22.04.1.tar.xz"; + sha256 = "0inz5pygvfngd9brd40mk2zvh106m294mj2h52aq0ydnhxf9w0m8"; + name = "messagelib-22.04.1.tar.xz"; }; }; minuet = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/minuet-22.04.0.tar.xz"; - sha256 = "1q74jkkc0yd03xar6bpg62kvwh6kfpvipqvramg91sdi5k77rr56"; - name = "minuet-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/minuet-22.04.1.tar.xz"; + sha256 = "0af3fir0njcczqf9wgfb0kygj9nnjf7z18sr39nzd45mm0qmmgk2"; + name = "minuet-22.04.1.tar.xz"; }; }; okular = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/okular-22.04.0.tar.xz"; - sha256 = "1gz3nal7m0jlcblrzy4d3fszcj03h7z2wmvyj12v459l1k0vmvj7"; - name = "okular-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/okular-22.04.1.tar.xz"; + sha256 = "0gqnfzh0k03q6mnb5ixa1shk6sx9qzgcj1l443lji1w2y8nhpqnf"; + name = "okular-22.04.1.tar.xz"; }; }; palapeli = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/palapeli-22.04.0.tar.xz"; - sha256 = "0wixgr17z0mwmb78wn126bvg512z9dbd5gm6k1x9wikhlfi91mkd"; - name = "palapeli-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/palapeli-22.04.1.tar.xz"; + sha256 = "1a8d0qg04a8h53nxxn8016gpamb6a8vycjhhf7586aglx51nj4ds"; + name = "palapeli-22.04.1.tar.xz"; }; }; parley = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/parley-22.04.0.tar.xz"; - sha256 = "0wkjkyddx95rai0p5q6hd47swrykk20g62c5n5hh5picr9yacr98"; - name = "parley-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/parley-22.04.1.tar.xz"; + sha256 = "0xvml3svb68gpxrd80a3hqh65d0wavvksdx1wd5mxm8bkdqifb2j"; + name = "parley-22.04.1.tar.xz"; }; }; partitionmanager = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/partitionmanager-22.04.0.tar.xz"; - sha256 = "06lhxgwal3fjxyb2v4vvd67r6dyd5hf08hz7lnyp0b0xx7f6fa3q"; - name = "partitionmanager-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/partitionmanager-22.04.1.tar.xz"; + sha256 = "08nplvyzbbclqgkm03c7r6gyvmgj6931ml539ifngmfxjfhxj82n"; + name = "partitionmanager-22.04.1.tar.xz"; }; }; picmi = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/picmi-22.04.0.tar.xz"; - sha256 = "0q2wrn323wwwfnf0w6cvw0fhv3fsxhqj3a2qdki9yzz5rb5mc2y9"; - name = "picmi-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/picmi-22.04.1.tar.xz"; + sha256 = "13ipw692n72m3sbcpviyh85f993zvw2d6yqbdk96c5wwfksrhqww"; + name = "picmi-22.04.1.tar.xz"; }; }; pim-data-exporter = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/pim-data-exporter-22.04.1.tar.xz"; + sha256 = "15kbvbq7gyxkjrhkafkz1dc3zyblsys3hg6641x0hmyy3zmyigbi"; + name = "pim-data-exporter-22.04.1.tar.xz"; }; }; pim-sieve-editor = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/pim-sieve-editor-22.04.1.tar.xz"; + sha256 = "02kr6530x6x7y7ngiz98ca4rvfsbcnci9093if71kaybhs2l267k"; + name = "pim-sieve-editor-22.04.1.tar.xz"; }; }; pimcommon = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/pimcommon-22.04.0.tar.xz"; - sha256 = "0iqmyb9xx8h8ay6yzf9xbrg7c67jlsrywwlljynj7lh4n2wjg3sc"; - name = "pimcommon-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/pimcommon-22.04.1.tar.xz"; + sha256 = "01l1nj7jjq7kx7db63a8nn1jcl2hpn3in6cklz89w2ilwkcwv51a"; + name = "pimcommon-22.04.1.tar.xz"; }; }; poxml = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/poxml-22.04.0.tar.xz"; - sha256 = "15m55qb2wn66nxg0j7jwz0r4zg180dbm1ynnx1yj39iprra9j9k7"; - name = "poxml-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/poxml-22.04.1.tar.xz"; + sha256 = "0aiw90l716ii6sj82r68li7a0sq28nvy2j5phvdiqwisqcmrhhqn"; + name = "poxml-22.04.1.tar.xz"; }; }; print-manager = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/print-manager-22.04.1.tar.xz"; + sha256 = "0ydqf9p0zzsw2l2l49w3di7ihl441h54ifxidww0y1s2why0d77l"; + name = "print-manager-22.04.1.tar.xz"; }; }; rocs = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/rocs-22.04.0.tar.xz"; - sha256 = "1x80ln8px5fywb1zhc569nrpnpv5iyr73vxl1ckh3s337xn44pd7"; - name = "rocs-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/rocs-22.04.1.tar.xz"; + sha256 = "0jldr3kisfk309ykfnp6fqqny0bg4vfy0c85c593c014v099nnzc"; + name = "rocs-22.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/signon-kwallet-extension-22.04.1.tar.xz"; + sha256 = "13nh3ggy6wlh18z1ag2hxrcf7gg3bscz1518ajbhcvriz4yc3v1c"; + name = "signon-kwallet-extension-22.04.1.tar.xz"; }; }; skanlite = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/skanlite-22.04.0.tar.xz"; - sha256 = "155d62q26xfba7ihbj6mz5vyydl6bkcxzwa6fxn62kgnpq8axdxf"; - name = "skanlite-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/skanlite-22.04.1.tar.xz"; + sha256 = "1j0ky1b5pf8v8vqym8nrjpjb7z0gssj3nkbvfs0mz725a04gxxv9"; + name = "skanlite-22.04.1.tar.xz"; }; }; skanpage = { - version = "22.04.0"; + version = "22.04.1"; 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"; + url = "${mirror}/stable/release-service/22.04.1/src/skanpage-22.04.1.tar.xz"; + sha256 = "1w3w3h58arjmkfp63rgzzgzyl44wkv53dqsp43ny1yk8zyfw6cih"; + name = "skanpage-22.04.1.tar.xz"; }; }; spectacle = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/spectacle-22.04.0.tar.xz"; - sha256 = "07dx9jg9i5s1cg0zsz9s06qipz80dv0bq2q1dfy82p6xrji30pdc"; - name = "spectacle-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/spectacle-22.04.1.tar.xz"; + sha256 = "111q8jg925spgmij52vq17pdiw1wsxrw654ns2yj6vcnf2mwjnrk"; + name = "spectacle-22.04.1.tar.xz"; }; }; step = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/step-22.04.0.tar.xz"; - sha256 = "007zbkg8gg56f733wp2dbb0xskja5c6pm3n181lirqq831ai9rnb"; - name = "step-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/step-22.04.1.tar.xz"; + sha256 = "03dwp4xg84a3q79gmqlqb5idaybl3k5na5d47668zfv8hw5kwz1m"; + name = "step-22.04.1.tar.xz"; }; }; svgpart = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/svgpart-22.04.0.tar.xz"; - sha256 = "16nz12sc1zgyaa6rilqymfcw0waj0ha8xydlsbgv83v1wqlxlfwj"; - name = "svgpart-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/svgpart-22.04.1.tar.xz"; + sha256 = "1738p2k9j9lckav86fqm57i6aszwdhin7nja7dx1g637w0a96nsy"; + name = "svgpart-22.04.1.tar.xz"; }; }; sweeper = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/sweeper-22.04.0.tar.xz"; - sha256 = "1fvjq1pcqnadpvkh5jdlb62l54x7r99zshd59jdxy6h7fji3pkbs"; - name = "sweeper-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/sweeper-22.04.1.tar.xz"; + sha256 = "10719rj6pwjq6k8n60x4vg08rvy4pwnf9g2p6warp4mzkwhdn4fh"; + name = "sweeper-22.04.1.tar.xz"; }; }; umbrello = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/umbrello-22.04.0.tar.xz"; - sha256 = "1n3jvsrzmfzm7x9f125hsf8i80r0iiqzv80ddc7fpzdyxpd83xpl"; - name = "umbrello-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/umbrello-22.04.1.tar.xz"; + sha256 = "01jk3w17prvqljrn3lfk1j3ifaf59wp917527idnk3yhl6k6abdz"; + name = "umbrello-22.04.1.tar.xz"; }; }; yakuake = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/yakuake-22.04.0.tar.xz"; - sha256 = "01i0ddgz81mzqlnj6cvslzv2h1nbz238hg75izfpbajvzm46pydp"; - name = "yakuake-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/yakuake-22.04.1.tar.xz"; + sha256 = "1c61cpp8dai5bb3mcdry12iibz1mni3bhnwnsdb2v9kaf0vrhf2k"; + name = "yakuake-22.04.1.tar.xz"; }; }; zanshin = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - url = "${mirror}/stable/release-service/22.04.0/src/zanshin-22.04.0.tar.xz"; - sha256 = "1d0sn9km4xdxs28avhxpc1xpkm5bcmg8i06x97xvls4cxh3nbgm9"; - name = "zanshin-22.04.0.tar.xz"; + url = "${mirror}/stable/release-service/22.04.1/src/zanshin-22.04.1.tar.xz"; + sha256 = "0frza7k4fmwkpdaxinnza021wqri1llhpasdphbwx539sxpbwlv8"; + name = "zanshin-22.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "22.04.0"; + version = "22.04.1"; src = fetchurl { - 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"; + url = "${mirror}/stable/release-service/22.04.1/src/zeroconf-ioslave-22.04.1.tar.xz"; + sha256 = "1bswkxjw0djp60k6wp0jyfz27pvzcvgdkp4219lzf5kxyj6ln1dk"; + name = "zeroconf-ioslave-22.04.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 09a7595765d9c..dfd072fa5d923 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, nix-update-script -, fetchFromGitHub +, fetchzip , substituteAll , cmake , extra-cmake-modules , qttools +, kwayland , leptonica , tesseract4 , qtmultimedia @@ -16,14 +16,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.9.5"; + version = "2.9.8"; - src = fetchFromGitHub { - owner = "crow-translate"; - repo = pname; - rev = version; - sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI="; - fetchSubmodules = true; + src = fetchzip { + url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; + hash = "sha256-ZqiQVpKwGpglSc05Y1r6uScZyG4qnklPXqTGKxpS3f8="; }; patches = [ @@ -34,21 +31,26 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + wrapQtAppsHook + ]; - buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; + buildInputs = [ + kwayland + leptonica + tesseract4 + qtmultimedia + qtx11extras + ]; postInstall = '' substituteInPlace $out/share/applications/io.crow_translate.CrowTranslate.desktop \ --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" ''; - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - meta = with lib; { description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 225dfb93637cc..d89364280795d 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -11,6 +11,11 @@ let inherit version; hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + doCheck = false; + }); + # fails with `no tests ran in 1.75s` + alembic = super.alembic.overridePythonAttrs (lib.const { + doCheck = false; }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; @@ -20,33 +25,70 @@ let sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; }); - werkzeug = self.callPackage ../../../development/python2-modules/werkzeug { }; - flask = self.callPackage ../../../development/python2-modules/flask { }; - sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { - meta = meta // { broken = false; }; + # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 + werkzeug = super.werkzeug.overridePythonAttrs (old: rec { + version = "1.0.1"; + src = old.src.override { + inherit version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + checkInputs = old.checkInputs ++ (with self; [ + requests + ]); + disabledTests = old.disabledTests ++ [ + # ResourceWarning: unclosed file + "test_basic" + "test_date_to_unix" + "test_easteregg" + "test_file_rfc2231_filename_continuations" + "test_find_terminator" + "test_save_to_pathlib_dst" + ]; + disabledTestPaths = old.disabledTestPaths ++ [ + # ResourceWarning: unclosed file + "tests/test_http.py" + ]; }); - pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { - version = "1.7.1"; - src = python3.pkgs.fetchPypi { - pname = "PyJWT"; + # Required by flask-1.1 + jinja2 = super.jinja2.overridePythonAttrs (old: rec { + version = "2.11.3"; + src = old.src.override { inherit version; - sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY="; + sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; - # requires different testing dependencies, and privacyIDEA will test this as well - doCheck = false; + }); + # Required by jinja2-2.11.3 + markupsafe = super.markupsafe.overridePythonAttrs (old: rec { + version = "2.0.1"; + src = old.src.override { + inherit version; + sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; + }; + }); + # Required by flask-babel + itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { + version = "2.0.1"; + src = old.src.override { + inherit version; + sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A="; + }; + }); + flask = self.callPackage ../../../development/python2-modules/flask { }; + sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { broken = false; }; }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.6.3"; + version = "3.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SsOEmbyEAKU3pdzsyqi5SwDgJMGEAzyCywoio9iFQAA="; + sha256 = "sha256-c5pWbBaOFQd7z3BvtYgrnZBiknLBDCE6So76Q68AptA="; fetchSubmodules = true; }; @@ -55,7 +97,7 @@ python3'.pkgs.buildPythonPackage rec { defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata + pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt ]; passthru.tests = { inherit (nixosTests) privacyidea; }; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 1c573eb1a58b4..4f778ae138970 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.13.3"; + version = "1.13.5"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8="; + sha256 = "sha256-HZGI9vWSYCDH0lW+k6hvPm3UVW6lR8Lhr3H7blNupNk="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index e18c0f21ae3f7..57b23ea95d164 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -30,18 +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="; }) + # Fixes for building calligra with modern poppler[-qt5] + (fetchpatch { + name = "calligra-poppler-22.03.patch"; + url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch"; + sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE="; + }) + (fetchpatch { + name = "calligra-poppler-22.04.patch"; + url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch"; + sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA="; + }) ]; postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 4bf523a8b8b38..b91e9bc63a517 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , libusb1, systemd }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/OpenRTX/dmrconfig/commit/1a6901488db26262a6b69f80b0e795864e9e8d0a.patch"; + sha256 = "03px1y95a8aspd251i1jj8ggqfjvkqby4lhn5pb7l5c1lzh6h762"; + }) + ]; + buildInputs = [ libusb1 systemd ]; diff --git a/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch b/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch new file mode 100644 index 0000000000000..ddd91aec9a6e7 --- /dev/null +++ b/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch @@ -0,0 +1,43 @@ +Description: Fixing argument mismatches in Fortran code, addressing #957430. +Author: Andrius Merkys <merkys@debian.org> +Forwarded: ccp4-dev@dl.ac.uk +--- a/fortran/pack_f.f ++++ b/fortran/pack_f.f +@@ -106,7 +106,7 @@ + endif + 10 continue + filnarray(len(filn) + 1) = 0 +- call pack_wordimage_f(data, x, y, filnarray) ++ call pack_longimage_f(data, x, y, filnarray) + return + end + +@@ -138,7 +138,7 @@ + endif + 10 continue + filnarray(len(filn) + 1) = 0 +- call v2pack_wordimage_f(data, x, y, filnarray) ++ call v2pack_longimage_f(data, x, y, filnarray) + return + end + +--- a/fortran/lgglib.f ++++ b/fortran/lgglib.f +@@ -1236,7 +1236,7 @@ + B3(2) = XYZ(2) * CELL(2) + B3(3) = XYZ(3) * CELL(3) + C +- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1) ++ CALL matmult(3,3,3,1,ORTH,B3,XYZ) + END + c + c +@@ -1274,7 +1274,7 @@ + B3(1) = XYZ(1) + B3(2) = XYZ(2) + B3(3) = XYZ(3) +- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1) ++ CALL matmult(3,3,3,1,ORTH,B3,XYZ) + END + character*80 function getnam(filnam) + character*(*) filnam diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix new file mode 100644 index 0000000000000..85b18eb82fd76 --- /dev/null +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -0,0 +1,226 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, cmake +, lz4 +, bzip2 +, gfortran +, m4 +, hdf5 +, gsl +, slurm +, unzip +, makeWrapper +, meson +, git +, ninja +, eigen +, pkg-config +, wrapGAppsHook +, flex +, bison +, doxygen +, opencl-headers +, ncurses +, msgpack +, fftw +, zeromq +, ocl-icd +, gtk3 +, gdk-pixbuf +, argp-standalone +, memorymappingHook +, withGui ? true +, withBitshuffle ? true +}: + +let + libccp4 = stdenv.mkDerivation rec { + pname = "libccp4"; + version = "6.5.1"; + src = fetchurl { + # Original mirror, now times out + # url = "ftp://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz"; + url = "https://deb.debian.org/debian/pool/main/libc/${pname}/${pname}_${version}.orig.tar.gz"; + sha256 = "1rfvjliny29vy5bdi6rrjaw9hhhhh72pw536xwvqipqcjlylf2r8"; + }; + nativeBuildInputs = [ gfortran m4 ]; + buildInputs = [ hdf5 gsl ]; + + configureFlags = [ "FFLAGS=-fallow-argument-mismatch" ]; + + # libccp4 tries to read syminfo.lib by looking at an environment variable, which hinders reproducibility. + # We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a + # preprocessor flag. + preBuild = '' + makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"') + export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; + ''; + makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ]; + + patches = [ + ./libccp4-use-hardcoded-syminfo-lib.patch + ./0002-fix-ftbfs-with-gcc-10.patch + ]; + }; + # This is the statically-linked, pre-built binary of mosflm. Compiling it ourselves turns out to be very difficult + # since the build process is very hard-coded for a specific machine, architecture, and libraries. + mosflm = + let + version = "7.4.0"; + src = + if stdenv.isDarwin then + fetchurl + { + url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip"; + sha256 = "1da5wimv3kl8bccp49j69vh8gi28cn7axg59lrmb38s68c618h7j"; + } + else + fetchurl { + url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip"; + sha256 = "1rqh3nprxfmnyihllw31nb8i3wfhybmsic6y7z6wn4rafyv3w4fk"; + }; + mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; + in + stdenv.mkDerivation rec { + pname = "mosflm"; + + inherit version src; + + dontBuild = true; + + nativeBuildInputs = [ unzip makeWrapper ]; + + sourceRoot = "."; + + # mosflm statically links against its own libccp4, which as the syminfo.lib environment variable problem. + # Here, we circumvent it by creating a little wrapper script that calls mosflm after setting the SYMINFO variable. + installPhase = '' + mkdir -p $out/bin + cp ${mosflmBinary} $out/bin/mosflm-raw + makeWrapper $out/bin/mosflm-raw $out/bin/mosflm --set SYMINFO ${libccp4}/share/syminfo.lib --add-flags -n + ''; + }; + + xgandalf = stdenv.mkDerivation rec { + pname = "xgandalf"; + version = "c15afa2381d5f87d4aefcc8181a15b4a6fd3a955"; + src = fetchurl { + url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + sha256 = "11i1w57a3rpnb4x5y4n8d3iffn5m9w1zydl69syzljdk3aqg2pv8"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ eigen ]; + }; + + pinkIndexer = stdenv.mkDerivation rec { + pname = "pinkindexer"; + version = "8a828788f8272a89d484b00afbd2500c2c1ff974"; + src = fetchurl { + url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + sha256 = "1mkgf1xd91ay0z0632kzxm0z3wcxf0cayjvs6a3znds72dkhfsyh"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ eigen ]; + }; + + fdip = stdenv.mkDerivation rec { + pname = "fdip"; + version = "29da626f17f66d5c0780fc59b1eafb7c85b81dd6"; + src = fetchurl { + url = "https://gitlab.desy.de/philipp.middendorf/fdip/-/archive/${version}/fdip-${version}.tar.gz"; + sha256 = "184l76r4fgznq54rnhgjk7dg41kqdl0d1da02vr5y4cs2fyqppky"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ eigen ]; + }; + + hdf5-external-filter-plugins = stdenv.mkDerivation rec { + pname = "HDF5-External-Filter-Plugins"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nexusformat"; + repo = pname; + rev = "d469f175e5273c1d488e71a6134f84088f57d39c"; + sha256 = "1jrzzh75i68ad1yrim7s1nx9wy0s49ghkziahs71mm5azprm6gh9"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 lz4 bzip2 ]; + + cmakeFlags = [ + "-DENABLE_BITSHUFFLE_PLUGIN=yes" + "-DENABLE_LZ4_PLUGIN=yes" + "-DENABLE_BZIP2_PLUGIN=yes" + ]; + }; +in +stdenv.mkDerivation rec { + pname = "crystfel"; + version = "0.10.1"; + src = fetchurl { + url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79"; + }; + nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ] + ++ lib.optionals withGui [ wrapGAppsHook ]; + buildInputs = [ + hdf5 + gsl + ncurses + msgpack + fftw + fdip + zeromq + ocl-icd + libccp4 + mosflm + pinkIndexer + xgandalf + ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] + ++ lib.optionals stdenv.isDarwin [ + argp-standalone + memorymappingHook + ] + # slurm is not available for Darwin; when it is, remove the condition + ++ lib.optionals (!stdenv.isDarwin) [ slurm ] + # hdf5-external-filter-plugins doesn't link on Darwin + ++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ]; + + patches = [ ./link-to-argp-standalone-if-needed.patch ]; + + # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but + # we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just + # hard-code mosflm's path once. + postPatch = '' + sed -i -e 's#execlp("mosflm"#execl("${mosflm}/bin/mosflm"#' libcrystfel/src/indexers/mosflm.c; + ''; + + postInstall = lib.optionalString (withBitshuffle && !stdenv.isDarwin) '' + for file in $out/bin/*; do + wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins + done + ''; + + meta = with lib; { + description = "Data processing for serial crystallography"; + longDescription = '' + CrystFEL is a suite of programs for processing (and simulating) Bragg diffraction data from "serial crystallography" experiments, often (but not always) performed using an X-ray Free-Electron Laser. Compared to rotation data, some of the particular characteristics of such data which call for a specialised software suite are: + + - The sliced, rather than integrated, measurement of intensity data. Many, if not all reflections are partially integrated. + - Many patterns (thousands) are required - high throughput is needed. + - The crystal orientations in each pattern are random and uncorrelated. + - Merging into lower symmetry point groups may require the resolution of indexing ambiguities.''; + homepage = "https://www.desy.de/~twhite/crystfel/"; + changelog = "https://www.desy.de/~twhite/crystfel/changes.html"; + downloadPage = "https://www.desy.de/~twhite/crystfel/download.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pmiddend ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + +} diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch new file mode 100644 index 0000000000000..9c5e1365492b8 --- /dev/null +++ b/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch @@ -0,0 +1,30 @@ +diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c +index 76bc70b..7a0c5dc 100644 +--- a/ccp4/csymlib.c ++++ b/ccp4/csymlib.c +@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg, + } + + /* Open the symop file: */ +- if (!(symopfile = getenv("SYMINFO"))) { +- if (debug) +- printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n"); +- if (!(ccp4dir = getenv("CLIBD"))) { +- printf("Environment variable CLIBD not set ... big trouble! \n"); +- return NULL; +- } +- +- symopfile = ccp4_utils_malloc((strlen(ccp4dir)+22)*sizeof(char)); +- strcpy(symopfile,ccp4_utils_joinfilenames(ccp4dir,"syminfo.lib")); +- symopfile[strlen(ccp4dir)+21] = '\0'; +- ccp4printf(1," SYMINFO file set to %s \n",symopfile); +- } else { +- if (debug) { +- ccp4printf(1,"\n Spacegroup information obtained from library file: \n"); +- ccp4printf(1," Logical Name: SYMINFO Filename: %s\n\n",symopfile); +- } +- } ++ symopfile = NIX_PROVIDED_SYMOP_FILE; + + filein = fopen(symopfile,"r"); + if (!filein) { diff --git a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch new file mode 100644 index 0000000000000..707ecafde8b84 --- /dev/null +++ b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index efc9002b..070f37e4 100644 +--- a/meson.build ++++ b/meson.build +@@ -34,6 +34,12 @@ if slurmdep.found() + conf_data.set10('HAVE_SLURM', 1) + endif + ++if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') ++ argpdep = cc.find_library('argp') ++else ++ argpdep = dependency('', required : false) ++endif ++ + # Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0 + hdf5dep = dependency('hdf5', language: 'c', required: true) + +@@ -180,7 +186,7 @@ if zmqdep.found() + endif + + executable('indexamajig', indexamajig_sources, +- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep], ++ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep], + install: true, + install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c937cce79b148..0ced37bb40f69 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w="; + sha256 = "sha256-OqsLHxY7dZKN/zazeDASBt5UsQGieU5laIUeshtS55w="; }; - vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA="; + vendorSha256 = "sha256-0Z+SAEHFJio+N7ATiviBkLPn6cNFlhE3Dsj8CxVtf7c="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 8d5f5e5f28dda..19db2cdf9f03c 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -74,6 +74,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-good gst-plugins-bad gst-plugins-ugly + gst-libav ]); pythonPath = with python3.pkgs; [ diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index f3bd37b00e062..1984a6ebbe241 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,8 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, appstream-glib -, desktop-file-utils , meson , ninja , pkg-config @@ -25,18 +23,16 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-LaVJ7QLc0UdSLgLIuHP4Anc7kPUelZW9PnIWuqKGtEQ="; + sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo="; }; nativeBuildInputs = [ - appstream-glib - desktop-file-utils meson ninja pkg-config diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index fe6e5a40fa4da..aa3d9981998c6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -10,41 +9,28 @@ , vala , desktop-file-utils , gtk3 -, libxml2 , granite , libhandy , libnotify , vte , libgee -, appstream , pcre2 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "terminal"; rev = version; - sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0="; + sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/terminal/pull/649 - (fetchpatch { - url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch"; - sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg="; - }) - ]; - nativeBuildInputs = [ - appstream desktop-file-utils - libxml2 meson ninja pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 2a531815f8751..d0079e6a0571c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-power"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr"; + sha256 = "sha256-8Hu2RIgA0gSc+tLNjDqGS+b/HpbsOdR4otpY4UqNzKs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 550562f19b177..b59e26e344f76 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo="; + sha256 = "sha256-jT8aYE36ZAeB9ng3RojVqxzmLtzpbsNRHPuDQ03XKcI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 24ce7b5ad56bd..7345382591305 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk="; + sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index ff0cc92da338f..a57d14d2f40ce 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI="; + sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 2720a887565c3..51f12864de82e 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -5,16 +5,16 @@ let dist = { x86_64-darwin = { arch = "x64"; - zuluVersion = "17.30.15"; - jdkVersion = "17.0.1"; - sha256 = "sha256-CdZP5XY3O0MUQigRvIQC+7dwAXaCKw4eK/L/imytEOs="; + zuluVersion = "17.34.19"; + jdkVersion = "17.0.3"; + sha256 = "sha256-qImyxVC2y2QhxuVZwamKPyo46+n+7ytIFXpYI0e6w2c="; }; aarch64-darwin = { arch = "aarch64"; - zuluVersion = "17.30.15"; - jdkVersion = "17.0.1"; - sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM="; + zuluVersion = "17.34.19"; + jdkVersion = "17.0.3"; + sha256 = "sha256-eaRX8Qa/Mqr9JhpHSEcf0Q9c4qmqLMgWqRhkEEwAjf8="; }; }."${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/compilers/tinygo/0001-Makefile.patch b/pkgs/development/compilers/tinygo/0001-Makefile.patch new file mode 100644 index 0000000000000..81774b6e0d6f1 --- /dev/null +++ b/pkgs/development/compilers/tinygo/0001-Makefile.patch @@ -0,0 +1,57 @@ +From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> +Date: Sat, 30 Apr 2022 16:37:44 +0300 +Subject: [PATCH 1/3] Makefile + + +diff --git a/Makefile b/Makefile +index dc388c21..7efc9901 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11 + errifempty = $(if $(1),$(1),$(error $(2))) + detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2))) + toolSearchPathsVersion = $(1)-$(2) +-ifeq ($(shell uname -s),Darwin) +- # Also explicitly search Brew's copy, which is not in PATH by default. +- BREW_PREFIX := $(shell brew --prefix) +- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1) +-endif + # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. + findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) + CLANG ?= $(call findLLVMTool,clang) +@@ -644,9 +639,8 @@ endif + wasmtest: + $(GO) test ./tests/wasm + +-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen) ++build/release: + @mkdir -p build/release/tinygo/bin +- @mkdir -p build/release/tinygo/lib/clang/include + @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS + @mkdir -p build/release/tinygo/lib/macos-minimal-sdk + @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common +@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN + @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 + @echo copying source files + @cp -p build/tinygo$(EXE) build/release/tinygo/bin +-ifneq ($(USE_SYSTEM_BINARYEN),1) +- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin +-endif +- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include + @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS + @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS + @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk +@@ -705,8 +695,7 @@ endif + @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm + @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib + @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot +- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins +- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins ++ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins + @cp -rp src build/release/tinygo/src + @cp -rp targets build/release/tinygo/targets + ./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt +-- +2.36.0 + diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch new file mode 100644 index 0000000000000..875a2521a9233 --- /dev/null +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -0,0 +1,55 @@ +From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> +Date: Sat, 30 Apr 2022 16:18:31 +0300 +Subject: [PATCH 2/3] Add clang header path + + +diff --git a/builder/builtins.go b/builder/builtins.go +index 479b541d..b35283c6 100644 +--- a/builder/builtins.go ++++ b/builder/builtins.go +@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{ + var CompilerRT = Library{ + name: "compiler-rt", + cflags: func(target, headerPath string) []string { +- return []string{"-Werror", "-Wall", "-std=c11", "-nostdlibinc"} ++ return []string{"-Werror", "-Wall", "-std=c11", "-isystem", "@clang_include@"} + }, + sourceDir: func() string { + llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins") +diff --git a/builder/picolibc.go b/builder/picolibc.go +index f1b061ae..159f90cf 100644 +--- a/builder/picolibc.go ++++ b/builder/picolibc.go +@@ -27,7 +27,7 @@ var Picolibc = Library{ + "-D_COMPILING_NEWLIB", + "-DHAVE_ALIAS_ATTRIBUTE", + "-DTINY_STDIO", +- "-nostdlibinc", ++ "-isystem", "@clang_include@", + "-isystem", picolibcDir + "/include", + "-I" + picolibcDir + "/tinystdio", + "-I" + headerPath, +diff --git a/compileopts/config.go b/compileopts/config.go +index b30e653e..7561b3f2 100644 +--- a/compileopts/config.go ++++ b/compileopts/config.go +@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string { + path, _ := c.LibcPath("picolibc") + cflags = append(cflags, + "--sysroot="+path, ++ "-isystem", "@clang_include@", + "-isystem", filepath.Join(path, "include"), // necessary for Xtensa + "-isystem", filepath.Join(picolibcDir, "include"), + "-isystem", filepath.Join(picolibcDir, "tinystdio"), +@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string { + path, _ := c.LibcPath("musl") + arch := MuslArchitecture(c.Triple()) + cflags = append(cflags, +- "-nostdlibinc", + "-isystem", filepath.Join(path, "include"), + "-isystem", filepath.Join(root, "lib", "musl", "arch", arch), + "-isystem", filepath.Join(root, "lib", "musl", "include"), +-- +2.36.0 + diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 935260dbcab9e..b335df487c867 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,64 +1,147 @@ -{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc -, avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }: +{ stdenv +, lib +, buildPackages +, buildGoModule +, fetchFromGitHub +, makeWrapper +, substituteAll +, llvmPackages +, go +, libffi +, zlib +, ncurses +, libxml2 +, xar +, wasi-libc +, avrgcc +, binaryen +, avrdude +, gdb +, openocd +}: -let main = ./main.go; - gomod = ./go.mod; +let + llvmMajor = lib.versions.major llvm.version; + inherit (llvmPackages) llvm clang compiler-rt lld; in + buildGoModule rec { pname = "tinygo"; - version = "0.16.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "063aszbsnr0myq56kms1slmrfs7m4nmg0zgh2p66lxdsifrfly7j"; + sha256 = "sha256-YgQGAQJw9Xyw5BF2d9uZTQHfjHsu2evZGo4RV9DtStE="; fetchSubmodules = true; }; - overrideModAttrs = (_: { - patches = []; - preBuild = '' - rm -rf * - cp ${main} main.go - cp ${gomod} go.mod - chmod +w go.mod - ''; - }); + vendorSha256 = "sha256-fK8BlCh+1NtHW6MwW68iSIB+Sw6AK+g3y4lMyMYrXkk="; + + patches = [ + ./0001-Makefile.patch + + (substituteAll { + src = ./0002-Add-clang-header-path.patch; + clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include"; + }) + ]; - preBuild = "cp ${gomod} go.mod"; + checkInputs = [ avrgcc binaryen ]; + nativeBuildInputs = [ go makeWrapper ]; + buildInputs = [ llvm clang.cc ] + ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; - postBuild = "make gen-device"; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - vendorSha256 = "12k2gin0v7aqz5543m12yhifc0xsz26qyqra5l4c68xizvzcvkxb"; + allowGoReference = true; + tags = [ "llvm${llvmMajor}" ]; + subPackages = [ "." ]; - doCheck = false; + # Output contains static libraries for different arm cpus + # and stripping could mess up these so only strip the compiler + stripDebugList = [ "bin" ]; - prePatch = '' - sed -i s/', "-nostdlibinc"'// builder/builtins.go - sed -i s/'"-nostdlibinc", '// compileopts/config.go builder/picolibc.go + postConfigure = lib.optionalString stdenv.isDarwin '' + for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do + substituteInPlace $i --replace "curses" "ncurses" + done ''; - subPackages = [ "." ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ llvm clang-unwrapped ]; - propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ]; - - postInstall = '' - mkdir -p $out/share/tinygo - cp -a lib src targets $out/share/tinygo - wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" \ - --prefix "PATH" : "$out/libexec/tinygo" + postPatch = '' + # Copy wasi-libc, symlink seems not working + rm -rf lib/wasi-libc/* + mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include + cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/ + cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/ + + # Borrow compiler-rt builtins from our source + # See https://github.com/tinygo-org/tinygo/pull/2471 + mkdir -p lib/compiler-rt-builtins + cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/ + + substituteInPlace Makefile \ + --replace "\$(TINYGO)" "$(pwd)/build/tinygo" \ + --replace "build/release/tinygo/bin" "$out/bin" \ + --replace "build/release/" "$out/share/" + + # TODO: Fix mingw and darwin + # Disable windows and darwin cross-compile tests + sed -i "/GOOS=windows/d" Makefile + sed -i "/GOOS=darwin/d" Makefile + + # tinygo needs versioned binaries mkdir -p $out/libexec/tinygo - ln -s ${clang-unwrapped}/bin/clang $out/libexec/tinygo/clang-10 - ln -s ${lld}/bin/lld $out/libexec/tinygo/ld.lld-10 - ln -sf $out/bin $out/share/tinygo + ln -s ${lib.getBin clang.cc}/bin/clang $out/libexec/tinygo/clang-${llvmMajor} + ln -s ${lib.getBin lld}/bin/ld.lld $out/libexec/tinygo/ld.lld-${llvmMajor} + ln -s ${lib.getBin lld}/bin/wasm-ld $out/libexec/tinygo/wasm-ld-${llvmMajor} + ln -s ${gdb}/bin/gdb $out/libexec/tinygo/gdb-multiarch + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo" + ''; + + preBuild = '' + export HOME=$TMPDIR + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export PATH=$out/libexec/tinygo:$PATH ''; + postBuild = '' + # Move binary + mkdir -p build + mv $GOPATH/bin/tinygo build/tinygo + + make gen-device + ''; + + checkPhase = '' + runHook preCheck + make smoketest XTENSA=0 + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + make build/release + + wrapProgram $out/bin/tinygo \ + --set TINYGOROOT $out/share/tinygo \ + --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo + + runHook postInstall + ''; + + disallowedReferences = [ wasi-libc ]; + meta = with lib; { homepage = "https://tinygo.org/"; description = "Go compiler for small places"; license = licenses.bsd3; - maintainers = with maintainers; [ Madouura ]; + maintainers = with maintainers; [ Madouura muscaln ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/compilers/tinygo/go.mod b/pkgs/development/compilers/tinygo/go.mod deleted file mode 100644 index bab259ae48d2a..0000000000000 --- a/pkgs/development/compilers/tinygo/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module github.com/tinygo-org/tinygo - -go 1.11 - -require ( - github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 - github.com/chromedp/cdproto v0.0.0-20200709115526-d1f6fc58448b - github.com/chromedp/chromedp v0.5.4-0.20200303084119-2bb39134ab9e - github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf - github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892 - go.bug.st/serial v1.0.0 - golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 - tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9 -) diff --git a/pkgs/development/compilers/tinygo/main.go b/pkgs/development/compilers/tinygo/main.go deleted file mode 100644 index 050cf8afe39f1..0000000000000 --- a/pkgs/development/compilers/tinygo/main.go +++ /dev/null @@ -1,18 +0,0 @@ -package main - -import ( - "fmt" - - _ "github.com/blakesmith/ar" - _ "github.com/google/shlex" - _ "github.com/marcinbor85/gohex" - _ "go.bug.st/serial" - _ "golang.org/x/tools/go/ast/astutil" - _ "golang.org/x/tools/go/ssa" - _ "google.golang.org/appengine" - _ "tinygo.org/x/go-llvm" -) - -func main() { - fmt.Println("vim-go") -} diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix new file mode 100644 index 0000000000000..937ca964e904b --- /dev/null +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz +mkDerivation { + version = "25.0-rc3"; + sha256 = "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2"; +} diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/development/libraries/libfreeaptx/default.nix index 9e30973f199eb..648b6fac0dfc2 100644 --- a/pkgs/development/libraries/libfreeaptx/default.nix +++ b/pkgs/development/libraries/libfreeaptx/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-soname' '-install_name' \ + --replace 'lib$(NAME).so' 'lib$(NAME).dylib' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" # disable static builds @@ -21,11 +27,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec + install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc + install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib + install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 + ''; + meta = with lib; { description = "Free Implementation of Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; homepage = "https://github.com/iamthehorker/libfreeaptx"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ kranzes ]; }; } diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 6a2ae909a0c06..32e3917e72c11 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -1,19 +1,21 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, cunit, file, ncurses +, autoreconfHook, pkg-config, file +, cunit, ncurses }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-toGTkgJLdSLNWCPJFpT63IxF3xANbvtkhJo5NUg/ZBg="; + sha256 = "sha256-1+0ln0J8dqHqmE+fsawhbfbbMNlCkDpJx4xomUuoHdE="; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; checkInputs = [ cunit ncurses ]; @@ -21,8 +23,6 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; - outputs = [ "out" "dev" ]; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 4b08a91864729..68dabef6d9fbc 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,21 +1,23 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, cunit, file, ncurses +, autoreconfHook, pkg-config, file , libev, nghttp3, quictls +, cunit, ncurses , withJemalloc ? false, jemalloc }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nmVVK2lpz01hgSxPAMmBfF+nNVZu9PWRGzCWh/5yhj8="; + sha256 = "sha256-hpIGsQBJCOyaEqopdES/hRXc2makIERonUju9D/HvgE="; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; checkInputs = [ cunit ncurses ]; @@ -24,8 +26,6 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; - outputs = [ "out" "dev" ]; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 2cc043ee0c1be..0f85836a9c68c 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.2+quick_unstable-2022-03.15"; + version = "3.0.3+quick_unstable-2022-05.04"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "7f2ab56a2b842b8e6fefc7b9d20eb5ff9c6ef151"; - sha256 = "sha256-We4ow0mGJFXqYM4PqbGn8qY5IYH/MtNaefrSaJreoRA="; + rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce"; + sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc="; }; patches = [ @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://quictls.github.io/openssl/"; + homepage = "https://quictls.github.io"; description = "TLS/SSL and crypto library with QUIC APIs"; license = licenses.openssl; platforms = platforms.all; diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix index 21ee2a782a2f6..bde530dd9d752 100644 --- a/pkgs/development/libraries/sealcurses/default.nix +++ b/pkgs/development/libraries/sealcurses/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sealcurses"; - version = "unstable-2022-04-28"; # No release yet + version = "unstable-2022-05-18"; # No release yet src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = pname; - rev = "abf27cfd2567a0765aaa115cabab0abb7f862253"; - hash = "sha256-c4zi/orHyr1hkuEisqZ9V8SaiH1IoxIbeGMrLBEkZ0A="; + rev = "417d77d790ede990b4c149f21c58fd13b8f273cc"; + hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 7c3e495d54a34..b4e2e3b78715b 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -80,7 +80,11 @@ stdenv.mkDerivation rec { totem-pl-parser tracker gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gstreamer + gst_all_1.gst-libav icu json-glib libcue diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index f35e6617a9bdb..807276d31b216 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -11,7 +11,7 @@ buildDunePackage { doCheck = true; checkInputs = [ alcotest atdgen-codec-runtime ]; - meta = atd.meta // { + meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // { description = "Generates efficient JSON serializers, deserializers and validators"; }; } diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index eba150e340238..9795b24350c99 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -36,6 +36,5 @@ buildDunePackage rec { changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md"; license = licenses.isc; maintainers = [ maintainers.sternenseemann ]; - mainProgram = "awa_lwt_server"; }; } diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix index 00be799ddff28..9f32d9571f734 100644 --- a/pkgs/development/ocaml-modules/awa/lwt.nix +++ b/pkgs/development/ocaml-modules/awa/lwt.nix @@ -11,5 +11,5 @@ buildDunePackage { awa cstruct mtime lwt cstruct-unix mirage-crypto-rng ]; - inherit (awa) meta; + meta = awa.meta // { mainProgram = "awa_lwt_server"; }; } diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 5228727727658..4f87715a74ad9 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -75,7 +75,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; - maintainers = [ maintainers.maurer ]; license = licenses.mit; + maintainers = [ maintainers.maurer ]; + mainProgram = "bap"; }; } diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index 6e149180642d5..f9fc8e21d2b40 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -44,5 +44,6 @@ buildDunePackage { meta = dns.meta // { description = "Unix command line utilities using uDNS"; + mainProgram = "odns"; }; } diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index c7b2d09d66743..0d365c8036dd1 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = { description = "Parser combinators based on Earley Algorithm"; + homepage = "https://github.com/rlepigre/ocaml-earley"; license = lib.licenses.cecill-b; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/rlepigre/ocaml-earley"; + mainProgram = "pa_ocaml"; }; } diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 0b05a83dd7ef5..7840bb4ff19ae 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -35,5 +35,6 @@ buildDunePackage rec { homepage = "https://github.com/dinosaure/hxd"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "hxd.xxd"; }; } diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 580db48769ef0..a2debdaf492d3 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = { description = "Image formats such as PNG and PPM in OCaml"; + homepage = "https://github.com/rlepigre/ocaml-imagelib"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/rlepigre/ocaml-imagelib"; + mainProgram = "imagetool"; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7eb94bc188aa3..f82548b18838e 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -37,12 +37,11 @@ stdenv.mkDerivation { dontStrip = true; meta = with lib; { - inherit (ocaml.meta) platforms; - maintainers = with maintainers; [ - maggesi roconnor vbgl - ]; - homepage = "http://lablgtk.forge.ocamlcore.org/"; description = "An OCaml interface to GTK"; + homepage = "http://lablgtk.forge.ocamlcore.org/"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ maggesi roconnor vbgl ]; + mainProgram = "lablgtk2"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 09f505c0e2546..fc1ecb5e0762d 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -31,10 +31,11 @@ buildDunePackage rec { ''; meta = { - homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; + homepage = "https://github.com/realworldocaml/mdx"; changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "ocaml-mdx"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index 012f3b61ff324..d36063300196b 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -9,7 +9,7 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit fileutils ]; - meta = ocaml_gettext.meta // { + meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; }; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 7525a10030eb3..fa8857f36b351 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -28,5 +28,6 @@ buildDunePackage rec { homepage = "https://github.com/gildor478/ocaml-gettext"; license = licenses.lgpl21; maintainers = [ maintainers.volth ]; + mainProgram = "ocaml-gettext"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 51e902b914086..950ac652e54d8 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version useDune2 meta; + inherit (ocaml_gettext) src version useDune2; buildInputs = [ dune-configurator ]; @@ -13,4 +13,6 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; + + meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index d084e7f8a62e3..d5a70406e9c33 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; - license = lib.licenses.lgpl3Plus; homepage = "https://www.typerex.org/ocp-ocamlres.html"; + license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "ocp-ocamlres"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix index a1d6fe6486ac1..6653284ba4870 100644 --- a/pkgs/development/ocaml-modules/pgsolver/default.nix +++ b/pkgs/development/ocaml-modules/pgsolver/default.nix @@ -15,9 +15,10 @@ buildOasisPackage rec { propagatedBuildInputs = [ tcslib ocaml-sat-solvers ]; meta = { - homepage = "https://github.com/tcsprojects/pgsolver"; description = "A collection of tools for generating, manipulating and - most of all - solving parity games"; + homepage = "https://github.com/tcsprojects/pgsolver"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; + mainProgram = "pgsolver-bin"; }; } diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix index b82c2ba748278..743f94454eeba 100644 --- a/pkgs/development/ocaml-modules/rebez/default.nix +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -16,7 +16,8 @@ buildDunePackage rec { meta = with lib; { description = "Cubic bezier implementation in Reason / OCaml"; homepage = "https://github.com/jchavarri/rebez/"; - maintainers = with maintainers; [ superherointj ]; license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + mainProgram = "RebezApp.exe"; }; } diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 4e76f0c16d385..46822df31fc04 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with lib; { - homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; description = "“The Whitespace Thing” for OCaml"; + homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; + mainProgram = "ocaml+twt"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix new file mode 100644 index 0000000000000..987859fbcdd66 --- /dev/null +++ b/pkgs/development/python-modules/audible/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildPythonPackage, beautifulsoup4, httpx, pbkdf2, pillow, pyaes, rsa }: + +buildPythonPackage rec { + pname = "audible"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mkb79"; + repo = "Audible"; + rev = "v${version}"; + sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d"; + }; + + propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'httpx>=0.20.*,<=0.22.*' 'httpx' + ''; + + pythonImportsCheck = [ "audible"]; + + meta = with lib; { + description = "A(Sync) Interface for internal Audible API written in pure Python"; + license = licenses.agpl3; + homepage = "https://github.com/mkb79/Audible"; + maintainers = with maintainers; [ jvanbruegge ]; + }; +} diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index 555caa6033ca2..1a07de6dccef9 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.17"; + version = "0.1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - hash = "sha256-fuVYyDy3fG+XobFe2GCzMWRWPk8VDPLU4RHJzcF5MLg="; + hash = "sha256-+87/j94eHyW3EMMBK+aXaNTVoNxsixeLusyBsPWa9yM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/calmjs-parse/default.nix b/pkgs/development/python-modules/calmjs-parse/default.nix index 33cf052a44270..8420cbd03afdf 100644 --- a/pkgs/development/python-modules/calmjs-parse/default.nix +++ b/pkgs/development/python-modules/calmjs-parse/default.nix @@ -8,13 +8,15 @@ buildPythonPackage rec { pname = "calmjs-parse"; - version = "1.2.5"; + version = "1.3.0"; + + format = "setuptools"; src = fetchFromGitHub { owner = "calmjs"; repo = "calmjs.parse"; rev = version; - sha256 = "0ypfbas33k1706p6w1bf9gnrv38z8fa4qci1iaks80dp58g8sv4r"; + hash = "sha256-QhHNp9g88RhGHqRRjg4nk7aXjAgGCOauOagWJoJ3fqc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix new file mode 100644 index 0000000000000..c6b56651f927d --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, djangorestframework +}: + +buildPythonPackage rec { + pname = "djangorestframework-dataclasses"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "oxan"; + repo = "djangorestframework-dataclasses"; + rev = "v${version}"; + sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY="; + }; + + postPatch = '' + patchShebangs manage.py + ''; + + propagatedBuildInputs = [ + djangorestframework + ]; + + checkPhase = '' + ./manage.py test + ''; + + pythonImportsCheck = [ "rest_framework_dataclasses" ]; + + meta = with lib; { + description = " Dataclasses serializer for Django REST framework"; + homepage = "https://github.com/oxan/djangorestframework-dataclasses"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 6947808c62e50..202e466599dcc 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "0.8.0"; + version = "0.8.1"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = version; - hash = "sha256-Qk4WlMVyzOK2uyrUlJw9Q8ENtNT3PZ7FKTlCtPsm2v0="; + hash = "sha256-JQFfTgnrNvCwKCQ4lD1gE3ZI8WhCjaJ9zDejssZ7FPs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index d2afea058d0c7..1212f21e9baf1 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc="; + sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 1961789e3b586..5dfc976865308 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.6.2"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk="; + hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index bc22afe4614bd..a8ed0be5e0e2b 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4="; + sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 72e9f672047a2..cd797240cc768 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.13.1"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA="; + hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 6aca35ae9e0b5..41b41be8fbb48 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM="; + sha256 = "sha256-J8UmIL02TRyBFuqsTqKvy/uBrpE5+zGZZS/KwXJL+2w="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 0352ec41139df..0c8c724426ad2 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "habanero"; - version = "1.2.0"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sckott"; repo = pname; - rev = "v${version}"; - hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg="; + rev = "refs/tags/v${version}"; + hash = "sha256-i6tgMEiaDcaBR8XfGvEMXQfTaDp1RJRosj/EfF1dQU4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 5fb9c1a0e9b55..4a9f68fed727d 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gbR2z4mo5EFHS2N3pg5mwFQAfL9ysqYaC+tSSYBK7YI="; + sha256 = "sha256-D66bw014FWGf26rG0e65wg6F/N1bl0z/Uemq+jUxJ74="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index c50563f550077..1dedac88b8ee0 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -56,5 +56,6 @@ buildPythonPackage rec { changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst"; license = licenses.agpl3Plus; maintainers = [ maintainers.marsam ]; + mainProgram = "ia"; }; } diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 3cc92514bd6ea..195fb37d33390 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.1.0"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-OwxTcjHB1YLijEtTA+QFjEmihqXsiitIcCtdl/3uipI="; + hash = "sha256-i197ZePxngAhGh7xzaJoo7m8el+7t7yJrvhO2CTmajU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 956a91cd5b7a2..e8d18f752fe4f 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.0.24"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rAC0NXkK18DmPiZJbqSZh5O0i6KvMpWvaANWyK3zMXQ="; + hash = "sha256-jGKB2LYp2RGy+E76ZvRdOzPdT+7fL4ZTEilHDiXbAMw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 7c08468c03f44..89a293b75f408 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,22 +1,41 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, pyparsing +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "periodictable"; - version = "1.6.0"; + version = "1.6.1"; + format = "setuptools"; - propagatedBuildInputs = [numpy pyparsing]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; + hash = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM="; }; - checkInputs = [ pytest-cov pytestCheckHook ]; + propagatedBuildInputs = [ + numpy + pyparsing + ]; - meta = { - homepage = "https://www.reflectometry.org/danse/software.html"; - description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ rprospero ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "periodictable" + ]; + + meta = with lib; { + description = "Extensible periodic table of the elements"; + homepage = "https://github.com/pkienzle/periodictable"; + license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index efcdf3fd3a326..3b68fef41727c 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.3.0"; + version = "9.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7H6fpJl192L8MEWrQW89Fa/BTZ2GZXjDRcy0yc17hDI="; + hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 9aa41214bfcf0..87f3798410a89 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.19.1"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork="; + hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 454c684076b5e..464417740c365 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI="; + sha256 = "sha256-XGD1kA64rUC6WvG7VGX+f3g7fBvWqfA4ujiWAQzKeEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a25c8d235674b..195f05dc98db1 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.15"; + version = "8.0.16"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs="; + sha256 = "sha256-S8eBpRqHiaxAKzbvLgfRdjbRKniQACdU+NcPBbto31E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 315678b874efa..2d021e0a502df 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.12.0"; + version = "3.12.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU="; + sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index e8cf1edbde5ff..c5f7b9041c988 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.15"; + version = "2.8.16"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE="; + sha256 = "sha256-OqrEwTjra47LwlUJluwl1uRbXTKIfR5pPQhC7i+mWdI="; }; pythonImportsCheck = [ "dateutil-stubs" ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 437950677297a..96d009a0b473d 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.26"; + version = "2.27.27"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pqBMAnTAlJ/QUl812LU6w053r+y+s8STLdxs5nWsAJw="; + sha256 = "sha256-1hjZgJ+jL1FM8XzqhGCBTaZxxWNm+xyQiszKi/GDESs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix new file mode 100644 index 0000000000000..75640ddf33f82 --- /dev/null +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testVersion, jira-cli-go }: + +buildGoModule rec { + pname = "jira-cli-go"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ankitpokhrel"; + repo = "jira-cli"; + rev = "v${version}"; + sha256 = "sha256-sPoFv3Gzue5H6TJuQZJvqB/Dx/URp9Kt2UuIvKSnAxg="; + }; + + vendorSha256 = "sha256-UO30/D65vpu3PgEsfSDL3nYgkwo5Cj+1WKiokk7KKKg="; + + ldflags = [ + "-s" "-w" + "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}" + "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0" + "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" + ]; + + checkInputs = [ less more ]; # Tests expect a pager in $PATH + + passthru.tests.version = testVersion { + package = jira-cli-go; + command = "jira version"; + inherit version; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd jira \ + --bash <($out/bin/jira completion bash) \ + --zsh <($out/bin/jira completion zsh) + ''; + + meta = with lib; { + description = "Feature-rich interactive Jira command line"; + homepage = "https://github.com/ankitpokhrel/jira-cli"; + license = licenses.mit; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index 39f6d5f7aa2da..d72a653182d35 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; }; - inherit (js_of_ocaml-compiler) meta; - buildInputs = [ camlp4 ocsigen_deriving ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 7805ca264035f..64313112f43b4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = { description = "Compiler from OCaml bytecode to Javascript"; + homepage = "https://ocsigen.org/js_of_ocaml/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://ocsigen.org/js_of_ocaml/"; + mainProgram = "js_of_ocaml"; }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 25826e94eb3a1..679fd9ab9de81 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -5,9 +5,11 @@ buildDunePackage { pname = "js_of_ocaml"; - inherit (js_of_ocaml-compiler) version src meta useDune2; + inherit (js_of_ocaml-compiler) version src useDune2; buildInputs = [ ppxlib ]; propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 81b1a41614b0f..8cdb7224d891f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -5,9 +5,11 @@ buildDunePackage { pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src meta useDune2; + inherit (js_of_ocaml-compiler) version src useDune2; buildInputs = [ js_of_ocaml-ppx ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 3c0f8c7612393..535fe6dae79c8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -6,8 +6,10 @@ buildDunePackage { pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src meta useDune2; + inherit (js_of_ocaml-compiler) version src useDune2; buildInputs = [ js_of_ocaml ]; propagatedBuildInputs = [ ppxlib ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index d862d4bc67b78..5256cd4037fc2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -5,7 +5,9 @@ buildDunePackage { pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src meta useDune2; + inherit (js_of_ocaml-compiler) version src useDune2; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 7082e4b86c975..e371c9f10bf01 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -6,9 +6,11 @@ buildDunePackage { pname = "js_of_ocaml-tyxml"; - inherit (js_of_ocaml-compiler) version src meta useDune2; + inherit (js_of_ocaml-compiler) version src useDune2; buildInputs = [ js_of_ocaml-ppx ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; + + meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 2caf6c67857c4..3d8ade975f992 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ocaml/ocamlbuild/"; description = "A build system with builtin rules to easily build most OCaml projects"; + homepage = "https://github.com/ocaml/ocamlbuild/"; license = licenses.lgpl2; - inherit (ocaml.meta) platforms; maintainers = with maintainers; [ vbgl ]; + mainProgram = "ocamlbuild"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 583468521817b..bf87bc5502178 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/bin"; meta = with lib; { - homepage = "https://www.typerex.org/ocp-build.html"; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple @@ -33,8 +32,10 @@ stdenv.mkDerivation rec { the number of cores and the automatically-inferred dependencies between source files. ''; + homepage = "https://www.typerex.org/ocp-build.html"; license = licenses.gpl3; - platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; + mainProgram = "ocp-build"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 5ecd6ad2eb6f1..c3b77e4b3e27d 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -1,26 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "toxiproxy"; - version = "2.1.4"; + version = "2.4.0"; + src = fetchFromGitHub { owner = "Shopify"; repo = "toxiproxy"; rev = "v${version}"; - sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig"; + sha256 = "sha256-vFf1yLpAa+yO1PCE+pLTnvvtROtpVxlEgACDNNUWBEM="; }; - goPackagePath = "github.com/Shopify/toxiproxy"; - subPackages = ["cmd" "cli"]; - ldflags = [ "-X github.com/Shopify/toxiproxy.Version=v${version}" ]; + vendorSha256 = "sha256-mrRMyIU6zeyAT/fXbBmtMlZzpyeB45FQmYJ4FDwTRTo="; + + excludedPackages = [ "test/e2e" ]; + + ldflags = [ "-s" "-w" "-X github.com/Shopify/toxiproxy/v2.Version=${version}" ]; + + checkFlags = [ "-short" ]; postInstall = '' mv $out/bin/cli $out/bin/toxiproxy-cli - mv $out/bin/cmd $out/bin/toxiproxy-cmd + mv $out/bin/server $out/bin/toxiproxy-server ''; meta = { description = "Proxy for for simulating network conditions"; + homepage = "https://github.com/Shopify/toxiproxy"; maintainers = with lib.maintainers; [ avnik ]; license = lib.licenses.mit; }; diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/os-specific/linux/rt-tests/default.nix index 67e8c7b86a5c8..278a370d47d67 100644 --- a/pkgs/os-specific/linux/rt-tests/default.nix +++ b/pkgs/os-specific/linux/rt-tests/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git; + homepage = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"; description = "Suite of real-time tests - cyclictest, hwlatdetect, pip_stress, pi_stress, pmqtest, ptsematest, rt-migrate-test, sendme, signaltest, sigwaittest, svsematest"; platforms = platforms.linux; maintainers = with maintainers; [ poelzi ]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index f217c9932344f..3d4ef94dda490 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "hifi"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-10y0sWpOLbjbGBpOjr1/tJrhcOsCwcm2sSO5kHfmJZA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3YCYLhJqZAWIwpwOd8J1+uYsxw0q6jQy35Vp+ttVKhI="; }; postPatch = '' diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c81800a356174..ce2009c4ed793 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.58.0"; + version = "1.59.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA="; + sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 8b39915193efd..ac8ebb8d29b66 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,23 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "nginx_exporter"; - version = "0.9.0"; - - goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; - - ldflags = [ - "-X main.version=${version}" - ]; + version = "0.10.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "04y5vpj2kv2ygdzxy3crpnx4mhpkm1ns2995kxgvjlhnyck7a5rf"; + rev = "v${version}"; + sha256 = "sha256-k9sbMIn5N3EJ7ZlfmD9pRV6lfywnKyFvpxC/pGGgNTA="; }; - doCheck = true; + vendorSha256 = "sha256-SaaHbn97cb/d8symyrBYLzK+5ukVLfGrFiRIz+tKPhw="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) nginx; }; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 656b9ee600674..69f7dcb469afb 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,13 +1,40 @@ { lib , fetchurl -, substituteAll, python3, pkg-config, runCommand, writeText -, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc -, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which -, ffmpeg, x264, libvpx, libwebp, x265, librsvg +, substituteAll +, pkg-config +, runCommand +, writeText +, wrapGAppsHook +, withNvenc ? false +, atk +, cairo +, cudatoolkit +, ffmpeg +, gdk-pixbuf +, getopt +, glib +, gobject-introspection +, gst_all_1 +, gtk3 , libfakeXinerama -, gst_all_1, pulseaudio, gobject-introspection -, withNvenc ? false, cudatoolkit, nv-codec-headers-10, nvidia_x11 ? null -, pam }: +, librsvg +, libvpx +, libwebp +, nv-codec-headers-10 +, nvidia_x11 ? null +, pam +, pandoc +, pango +, pulseaudio +, python3 +, util-linux +, which +, x264 +, x265 +, xauth +, xorg +, xorgserver +}: with lib; @@ -43,11 +70,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-CIHVpxZ2qC7Ct5Kmc6dxEzxH9s+63/sI07f9SbCh4a4="; + hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A="; }; patches = [ @@ -56,41 +83,81 @@ in buildPythonApplication rec { inherit libfakeXinerama; }) ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106 + ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; INCLUDE_DIRS = "${pam}/include"; - nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ] - ++ lib.optional withNvenc cudatoolkit; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + pandoc + ] ++ lib.optional withNvenc cudatoolkit; + buildInputs = with xorg; [ - libX11 xorgproto libXrender libXi libXres - libXtst libXfixes libXcomposite libXdamage - libXrandr libxkbfile - ] ++ [ + libX11 + libXcomposite + libXdamage + libXfixes + libXi + libxkbfile + libXrandr + libXrender + libXres + libXtst + xorgproto + ] ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + ]) ++ [ + atk.out + cairo cython + ffmpeg + gdk-pixbuf + glib + gobject-introspection + gtk3 librsvg - - pango cairo gdk-pixbuf atk.out gtk3 glib - - ffmpeg libvpx x264 libwebp x265 - - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - + libvpx + libwebp pam - gobject-introspection + pango + x264 + x265 ] ++ lib.optional withNvenc nvencHeaders; - propagatedBuildInputs = with python3.pkgs; [ - pillow rencode pycrypto cryptography pycups lz4 dbus-python - netifaces numpy pygobject3 pycairo gst-python pam - pyopengl paramiko opencv4 python-uinput pyxdg - ipaddress idna pyinotify - ] ++ lib.optionals withNvenc (with python3.pkgs; [pynvml pycuda]); - - # error: 'import_cairo' defined but not used + + propagatedBuildInputs = with python3.pkgs; ([ + cryptography + dbus-python + gst-python + idna + ipaddress + lz4 + netifaces + numpy + opencv4 + pam + paramiko + pillow + pycairo + pycrypto + pycups + pygobject3 + pyinotify + pyopengl + python-uinput + pyxdg + rencode + ] ++ lib.optionals withNvenc [ + pycuda + pynvml + ]); + + # error: 'import_cairo' defined but not used NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; setupPyBuildFlags = [ @@ -104,12 +171,14 @@ in buildPythonApplication rec { ] ++ lib.optional withNvenc "--with-nvenc"; dontWrapGApps = true; + preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" + --set XORG_CONFIG_PREFIX "" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} '' + lib.optionalString withNvenc '' diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch new file mode 100644 index 0000000000000..fecc7e8130d1c --- /dev/null +++ b/pkgs/tools/X11/xpra/fix-122159.patch @@ -0,0 +1,16 @@ +diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py +index 6def9e0ad..031f8aba9 100755 +--- a/xpra/scripts/main.py ++++ b/xpra/scripts/main.py +@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults): + "shadow", + ) and not display_is_remote: + if use_systemd_run(options.systemd_run): +- #make sure we run via the same interpreter, +- #inject it into the command line if we have to: + argv = list(cmdline) +- if argv[0].find("python")<0: +- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor)) + return systemd_run_wrap(mode, argv, options.systemd_run_args) + configure_env(options.env) + configure_logging(options, mode) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index c77aa5b82b62a..00fee9414765e 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { }) ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: listindex.o:/build/btar-1.1.1/loadindex.h:12: multiple definition of + # `ptr'; main.o:/build/btar-1.1.1/loadindex.h:12: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + buildInputs = [ librsync ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix new file mode 100644 index 0000000000000..98a34082184ea --- /dev/null +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "audible-cli"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "mkb79"; + repo = pname; + rev = "v${version}"; + sha256 = "0i71vwq2bhndndb0mlx21bc5jkv75cr60max5iaxk23agg3xpgwv"; + }; + + propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "httpx==0.20.*" "httpx" \ + --replace "audible==0.7.2" "audible" + ''; + + meta = with lib; { + description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; + license = licenses.agpl3; + homepage = "https://github.com/mkb79/audible-cli"; + maintainers = with maintainers; [ jvanbruegge ]; + }; +} diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 4b521ed9ddaa9..e667c988ca6f5 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "274"; + version = "275"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4="; + sha256 = "sha256-HmykTyh5F49CBa1w7o/HV6Q5Lsx1Qkxe0JBHQdGxVB4="; }; buildInputs = [ libffi ]; diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index 81d81b6794eb0..3b25d479388e2 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "zabbixctl"; - version = "unstable-2019-07-06"; - - goPackagePath = "github.com/kovetskiy/zabbixctl"; + version = "unstable-2021-05-25"; src = fetchFromGitHub { owner = "kovetskiy"; repo = pname; - rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7"; - sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy"; + rev = "872d73b12901b143898bffe3711b93a34ca75abe"; + sha256 = "sha256-fWT3cgIHjHcKwFDjWIf3BUUUaVZ7hyc2ibkpU+AsW0I="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-BphQcPPmeNU7RDtaHJQxIoW8xxD86xWgqLBsLR08Tag="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Most effective way for operating in Zabbix Server"; diff --git a/pkgs/tools/misc/zabbixctl/deps.nix b/pkgs/tools/misc/zabbixctl/deps.nix deleted file mode 100644 index 2bf015acf5f5f..0000000000000 --- a/pkgs/tools/misc/zabbixctl/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/jinzhu/configor"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/configor"; - rev = "9064de4b2535f218bde55dc8de50a3904ef800d0"; - sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn"; - }; - } - { - goPackagePath = "github.com/kovetskiy/godocs"; - fetch = { - type = "git"; - url = "https://github.com/kovetskiy/godocs"; - rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24"; - sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j"; - }; - } - { - goPackagePath = "github.com/kovetskiy/lorg"; - fetch = { - type = "git"; - url = "https://github.com/kovetskiy/lorg"; - rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43"; - sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi"; - }; - } - { - goPackagePath = "github.com/kovetskiy/spinner-go"; - fetch = { - type = "git"; - url = "https://github.com/kovetskiy/spinner-go"; - rev = "00597fd24fe0d8079821b68f71d73b0661401752"; - sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; - sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d"; - sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm"; - }; - } - { - goPackagePath = "github.com/reconquest/karma-go"; - fetch = { - type = "git"; - url = "https://github.com/reconquest/karma-go"; - rev = "1094651bd246b1685f7b368e099aba6fca9efd8f"; - sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r"; - }; - } - { - goPackagePath = "github.com/simplereach/timeutils"; - fetch = { - type = "git"; - url = "https://github.com/simplereach/timeutils"; - rev = "1a719258b86a08630289b86902ab16817ba641e9"; - sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6"; - }; - } - { - goPackagePath = "github.com/zazab/zhash"; - fetch = { - type = "git"; - url = "https://github.com/zazab/zhash"; - rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4"; - sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index b6e5150fe8e24..78116cb2255a5 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.5.5"; + version = "9.5.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YBg7mY8po7yVrSX1GaoI9/E3zFbdWWQEVCuR0H0DgJ4="; + sha256 = "sha256-VXbrwUf43qvXd+/GXNA+Wkt4E5EM4+1V0wPj3JONzlU="; }; - vendorSha256 = "sha256-kaqTJMRbLSF1zy6qXqdOSzmbcV35rzrou4X0WzoQoGc="; + vendorSha256 = "sha256-45rQHG5Std7m7Xu8OEFfjdG6RyriM4yAPzJl7M2lPW8="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 4190e81021470..e9c7c34e9b5a0 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,26 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub -, pkg-config -, glib, libxml2 -}: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, glib, libxml2 }: -buildGoPackage rec { +buildGoModule rec { pname = "ua"; - version = "unstable-2017-02-24"; - - goPackagePath = "github.com/sloonz/ua"; + version = "unstable-2021-12-18"; src = fetchFromGitHub { owner = "sloonz"; repo = "ua"; - rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; - sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA="; + rev = "b6d75970bb4f6f340887e1eadad5aa8ce78f30e3"; + sha256 = "sha256-rCp8jyqQfq5eVdvKZz3vKuDfcR+gQOEAfBZx2It/rb0="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-0O80uhxSVsV9N7Z/FgaLwcjZqeb4MqSCE1YW5Zd32ns="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/sloonz/ua"; license = licenses.isc; diff --git a/pkgs/tools/networking/ua/deps.nix b/pkgs/tools/networking/ua/deps.nix deleted file mode 100644 index e59b9f239a68d..0000000000000 --- a/pkgs/tools/networking/ua/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/sloonz/cfeedparser"; - fetch = { - type = "git"; - url = "https://github.com/sloonz/cfeedparser"; - rev = "a220b181f09fa7fba347c7fa72168ed8a010907a"; - sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0"; - }; - } - { - goPackagePath = "github.com/sloonz/go-maildir"; - fetch = { - type = "git"; - url = "https://github.com/sloonz/go-maildir"; - rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6"; - sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f"; - }; - } - { - goPackagePath = "github.com/sloonz/go-mime-message"; - fetch = { - type = "git"; - url = "https://github.com/sloonz/go-mime-message"; - rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc"; - sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs"; - }; - } - { - goPackagePath = "github.com/sloonz/go-qprintable"; - fetch = { - type = "git"; - url = "https://github.com/sloonz/go-qprintable"; - rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926"; - sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43"; - }; - } - { - goPackagePath = "gopkg.in/redis.v3"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29"; - sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh"; - }; - } - { - goPackagePath = "gopkg.in/bsm/ratelimit.v1"; - fetch = { - type = "git"; - url = "https://github.com/bsm/ratelimit"; - rev = "db14e161995a5177acef654cb0dd785e8ee8bc22"; - sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh"; - }; - } -] diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 2535162525933..86d729f95d611 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -13,8 +13,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ="; }; - # Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed - patches = [ ./remove-freshclam-test.patch ]; + patches = [ + # Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed + ./remove-freshclam-test.patch + ./sample-cofiguration-file-install-location.patch + ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ]; @@ -25,6 +28,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" + "-DAPP_CONFIG_DIRECTORY=/etc/clamav" ]; doCheck = true; diff --git a/pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch b/pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch new file mode 100644 index 0000000000000..46444627dd38f --- /dev/null +++ b/pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch @@ -0,0 +1,29 @@ +diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt +index 826fff1..3cefc34 100644 +--- a/etc/CMakeLists.txt ++++ b/etc/CMakeLists.txt +@@ -6,14 +6,14 @@ install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/clamd.conf.sample + DESTINATION +- ${APP_CONFIG_DIRECTORY} ++ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY} + COMPONENT programs) + + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/freshclam.conf.sample + DESTINATION +- ${APP_CONFIG_DIRECTORY} ++ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY} + COMPONENT programs) + + if(ENABLE_MILTER) +@@ -21,6 +21,6 @@ if(ENABLE_MILTER) + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/clamav-milter.conf.sample + DESTINATION +- ${APP_CONFIG_DIRECTORY} ++ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY} + COMPONENT programs) + endif() diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb705a9eb8cdf..0eb2227eb7a78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1104,6 +1104,8 @@ with pkgs; arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + audible-cli = callPackage ../tools/misc/audible-cli { }; + auditwheel = callPackage ../tools/package-management/auditwheel { }; amidst = callPackage ../tools/games/minecraft/amidst { }; @@ -1922,6 +1924,10 @@ with pkgs; checkip = callPackage ../tools/networking/checkip { }; + crystfel = callPackage ../applications/science/physics/crystfel { }; + + crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; + ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -7271,6 +7277,8 @@ with pkgs; jira-cli = callPackage ../development/tools/jira_cli { }; + jira-cli-go = callPackage ../development/tools/jira-cli-go { }; + jirafeau = callPackage ../servers/web-apps/jirafeau { }; jitterentropy = callPackage ../development/libraries/jitterentropy { }; @@ -13993,8 +14001,9 @@ with pkgs; tinycc = callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - inherit (llvmPackages_10) llvm clang-unwrapped lld; + llvmPackages = llvmPackages_14; avrgcc = pkgsCross.avr.buildPackages.gcc; + wasi-libc = pkgsCross.wasi32.wasilibc; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { @@ -14220,7 +14229,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlangR24 erlangR23 erlangR22 erlangR21 + erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 828545ff7fa06..e7f4b6b5250f5 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -20,6 +20,20 @@ with beam; { # Standard Erlang versions, using the generic builder. + # R25 + erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix { + wxGTK = wxGTK30; + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport systemdSupport; + }; + erlangR25_odbc = erlangR25.override { odbcSupport = true; }; + erlangR25_javac = erlangR25.override { javacSupport = true; }; + erlangR25_odbc_javac = erlangR25.override { + javacSupport = true; + odbcSupport = true; + }; + # R24 erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { wxGTK = wxGTK30; @@ -106,6 +120,7 @@ with beam; { # Packages built with default Erlang version. erlang = packages.${defaultVersion}; + erlangR25 = packagesWith interpreters.erlangR25; erlangR24 = packagesWith interpreters.erlangR24; erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9f377f585841..7cbb08c74360e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -767,6 +767,8 @@ in { aubio = callPackage ../development/python-modules/aubio { }; + audible = callPackage ../development/python-modules/audible { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; audioread = callPackage ../development/python-modules/audioread { }; @@ -2380,6 +2382,8 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + djangorestframework-dataclasses = callPackage ../development/python-modules/djangorestframework-dataclasses { }; + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; django_reversion = callPackage ../development/python-modules/django_reversion { }; @@ -11320,9 +11324,9 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zeek = toPythonModule (pkgs.zeek.override { + zeek = (toPythonModule (pkgs.zeek.override { python3 = python; - }).py; + })).py; zeep = callPackage ../development/python-modules/zeep { }; |