From 7d84dbdf5b91439f798363559310d86b21bfa86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Mon, 24 Oct 2022 13:36:22 +0200 Subject: [PATCH 01/43] =?UTF-8?q?nixos/zsh:=20don=E2=80=99t=20be=20noisy?= =?UTF-8?q?=20when=20scripts=20are=20run=20with=20-u?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a script specifies the shell option “nounset” as part of the shebang (e.g., via “#!/usr/bin/env -S zsh -u”), our initialization scripts would produce error messages of the form: __ETC_FOO_SOURCED: parameter not set These messages could probably be confusing to users when running such scripts. By providing a fall-back in the parameter expansion, we can avoid them. This patch does not address interactive shell start-up, where such messages may (or may not) be less problematic. --- nixos/modules/programs/zsh/zsh.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 0c59d20fee46..8f40af7ad546 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -173,10 +173,10 @@ in # This file is read for all shells. # Only execute this file once per shell. - if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi + if [ -n "''${__ETC_ZSHENV_SOURCED-}" ]; then return; fi __ETC_ZSHENV_SOURCED=1 - if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + if [ -z "''${__NIXOS_SET_ENVIRONMENT_DONE-}" ]; then . ${config.system.build.setEnvironment} fi @@ -206,7 +206,7 @@ in ${zshStartupNotes} # Only execute this file once per shell. - if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi + if [ -n "''${__ETC_ZPROFILE_SOURCED-}" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 # Setup custom login shell init stuff. From f375a1234a73689fac05e5362cd7682bf4acc941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 07:07:19 +0000 Subject: [PATCH 02/43] openturns: 1.19 -> 1.20 --- pkgs/development/libraries/openturns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index d5988ace408a..ae95a45dd392 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-hSvhKx7Ke5PXPYGcn9OJvq7YooAbHrbP6TdLZBotriE="; + sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; From f0f42c08cea4fcf14df04e5a3b58d5acef37c836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 11 Nov 2022 07:43:11 -0300 Subject: [PATCH 03/43] linux-lqx: 6.0.7-lqx1 -> 6.0.8-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2fc9d8fe3c08..8484fc915900 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.0.7"; #lqx + version = "6.0.8"; #lqx suffix = "lqx1"; #lqx - sha256 = "09h99fdzicbc4kkl51dqwgqqa9416hd7bvrghr4pdjqrw4z15557"; #lqx + sha256 = "1jjna3g1x58r8qz323fmdzf6ws3anjqdw57r12fnvq3by660p0qh"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 6cf7ef3010b061a7ea36a59335a24d3da7b83260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 11 Nov 2022 07:44:46 -0300 Subject: [PATCH 04/43] linux-zen: 6.0.7-zen1 -> 6.0.8-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 8484fc915900..9863e3c4f4ee 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.7"; #zen + version = "6.0.8"; #zen suffix = "zen1"; #zen - sha256 = "011wlc0h99vx830qmgy569srhb3rzhyy5j235pf7m541392vh41g"; #zen + sha256 = "0vp6vp77blrxa8rcl8wl81di7m4s1cmbznzacx3729560km98ki8"; #zen isLqx = false; }; # ./update-zen.py lqx From 3ef8ee6b24bd31ad00ce49fbd88b19be0ddd98ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Jun 2022 02:45:58 +0000 Subject: [PATCH 05/43] python310Packages.Wand: run tests --- pkgs/development/python-modules/Wand/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 86aad7708ad9..8535f0afb708 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , imagemagickBig +, pytestCheckHook }: buildPythonPackage rec { @@ -19,8 +20,17 @@ buildPythonPackage rec { "magick_home = '${imagemagickBig}'" ''; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/emcconville/wand/issues/558 + "test_forward_fourier_transform" + "test_inverse_fourier_transform" + # our imagemagick doesn't set MagickReleaseDate + "test_configure_options" + ]; passthru.imagemagick = imagemagickBig; From 86ccaac0dec8542488de0db57e3567d5a02c051a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Nov 2022 19:27:14 -0800 Subject: [PATCH 06/43] python310Packages.wand: rename from Wand --- pkgs/development/python-modules/{Wand => wand}/default.nix | 5 +++-- pkgs/servers/calibre-web/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{Wand => wand}/default.nix (94%) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/wand/default.nix similarity index 94% rename from pkgs/development/python-modules/Wand/default.nix rename to pkgs/development/python-modules/wand/default.nix index 8535f0afb708..396642b0c13a 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "Wand"; + pname = "wand"; version = "0.6.10"; src = fetchPypi { - inherit pname version; + pname = "Wand"; + inherit version; sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc="; }; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 50198b392797..6047eae3c962 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { sqlalchemy tornado unidecode - Wand + wand werkzeug ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b9d3fc1835e9..44b34cf2071f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -208,6 +208,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 617356b42c4e..c0496e6189b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11777,7 +11777,7 @@ self: super: with self; { wallbox = callPackage ../development/python-modules/wallbox { }; - Wand = callPackage ../development/python-modules/Wand { }; + wand = callPackage ../development/python-modules/wand { }; wandb = callPackage ../development/python-modules/wandb { }; From c4d1b71ec5b3d6fb7052d3c16382a98c3a3a2e9f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 08:31:17 +0000 Subject: [PATCH 07/43] synergy: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/applications/misc/synergy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index d401b2c42195..401d4e00db16 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -14,7 +14,8 @@ , gdk-pixbuf , libnotify , qttools -, xlibsWrapper +, libICE +, libSM , libX11 , libxkbfile , libXi @@ -84,7 +85,8 @@ stdenv.mkDerivation rec { util-linux libselinux libsepol - xlibsWrapper + libICE + libSM libX11 libXi libXtst From aba8af9a02c55241fb4bce562c08e20de4939777 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 14 Nov 2022 12:13:33 +0100 Subject: [PATCH 08/43] batman-adv: 2022.1 -> 2022.3 --- pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index dd2227874501..06060f22eab7 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2022.1"; + version = "2022.3"; sha256 = { - batman-adv = "sha256-bQQdNTCr1LJJq/Wpb8Ki4kFDG/lEO1R/2yWi2P0ymkA="; - alfred = "sha256-OgrCuybgyz8nMtSHNmmgoi6YJej5qOerrJhjY/J1CX8="; - batctl = "sha256-h+iak4lxuGJCJoG7NBBOmytLZRLR0WXelTYw3zjWGmg="; + batman-adv = "sha256-IY/7U0/q0cm1sNkOwbL7poggnN8A6GG+zhy/Rp/mmVM="; + alfred = "sha256-wD8XY7hV4yzCOE7KlWDpYJyW2bAe9TdfKHZc7hgAURI="; + batctl = "sha256-xYs3F3HXy5qHhtc5SDTx/41F1BVjemTpB26qCVOx8tc="; }; } From 6164b7bb61395b4488919ca4bbdf918d96a7d4ab Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Nov 2022 19:50:32 +0300 Subject: [PATCH 09/43] kde-frameworks: 5.99 -> 5.100 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 168ab3bdf63e..ca4f9eaa782c 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.99/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.100/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 2c7ae1f8a4b2..66853a1c3744 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/attica-5.99.0.tar.xz"; - sha256 = "1cb3cdn8v68d14l7gax4zdjk0vgqwj6gxmdnzhf9qfvik6rd6nhp"; - name = "attica-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/attica-5.100.0.tar.xz"; + sha256 = "1j1m7ps6rgjn8n363p0i32syxskzxjcmv255csbc1hgj6yb6cxxf"; + name = "attica-5.100.0.tar.xz"; }; }; baloo = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/baloo-5.99.0.tar.xz"; - sha256 = "0spz0sa2lbdbm12d10bswcyawayxpykk3v8yicv5khgf6adpdyq0"; - name = "baloo-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/baloo-5.100.0.tar.xz"; + sha256 = "123fl16cxrascngw2cv8y78nf68bby3xa53vc0bxwm7yhixycfzr"; + name = "baloo-5.100.0.tar.xz"; }; }; bluez-qt = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/bluez-qt-5.99.0.tar.xz"; - sha256 = "11fg7lk1yxj5dfq7s8z17n9prvnqfvk1hsgyd1ygi1x1d2qipjg7"; - name = "bluez-qt-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/bluez-qt-5.100.0.tar.xz"; + sha256 = "1fn23r80jiyif9qxzs0n1jwwvdb3vnfksg54xksxa5v57wnwqjxi"; + name = "bluez-qt-5.100.0.tar.xz"; }; }; breeze-icons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/breeze-icons-5.99.0.tar.xz"; - sha256 = "1z9wrmb4jj7sfnb7kqmx2ww53vily52ycm7rgycr2b1q0jf6j3s8"; - name = "breeze-icons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/breeze-icons-5.100.0.tar.xz"; + sha256 = "1nya1m220q68asf2qrgxdbag1gawipy8ydlgympk1nzxa9linb6h"; + name = "breeze-icons-5.100.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/extra-cmake-modules-5.99.0.tar.xz"; - sha256 = "0zl0hwp077b8w338bl0210i6892kwfx2vqpn55qvb3b20sk8m081"; - name = "extra-cmake-modules-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/extra-cmake-modules-5.100.0.tar.xz"; + sha256 = "1if02s5kb9s4wawyz7rln2k46905ms3xrxg1kkvdii73pgkkqmil"; + name = "extra-cmake-modules-5.100.0.tar.xz"; }; }; frameworkintegration = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/frameworkintegration-5.99.0.tar.xz"; - sha256 = "14dx60xvgcb6nf5d83cgm7y6wc8d7ngxg6aaka6k8996qfkczz9k"; - name = "frameworkintegration-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/frameworkintegration-5.100.0.tar.xz"; + sha256 = "18755r0l3r0q96g6zfz2g9lbf3isx865vhz4z39qblmm13jm97cm"; + name = "frameworkintegration-5.100.0.tar.xz"; }; }; kactivities = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kactivities-5.99.0.tar.xz"; - sha256 = "1l7jzj3nscfmbiq105v9gkz4sd0c92vydmhw4j9mjjjn16aqbs39"; - name = "kactivities-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kactivities-5.100.0.tar.xz"; + sha256 = "14m8dbpn6lxdjlv87ir5wa42s9zb1ipqkj33gbijdagsza0xvc8k"; + name = "kactivities-5.100.0.tar.xz"; }; }; kactivities-stats = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kactivities-stats-5.99.0.tar.xz"; - sha256 = "0cr0sjk1rwv3zjvmhs2xc7wfs33r9x6padybc7v2aq751gz5cc4k"; - name = "kactivities-stats-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kactivities-stats-5.100.0.tar.xz"; + sha256 = "15iry0vaq76ng5wadb4pq4drkccivnjh5bncf4bnjg58wby1zi95"; + name = "kactivities-stats-5.100.0.tar.xz"; }; }; kapidox = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kapidox-5.99.0.tar.xz"; - sha256 = "15r8x5z50xwfmh507kf3hsr8yqlfank224hfhcrpyl1vi256jb8c"; - name = "kapidox-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kapidox-5.100.0.tar.xz"; + sha256 = "0fgn1qfqa80q4nb8wnvmprsc9gc8axs3n13fk4p01zw6bfmc1938"; + name = "kapidox-5.100.0.tar.xz"; }; }; karchive = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/karchive-5.99.0.tar.xz"; - sha256 = "1z4msj6w7g2fy2mp07aadm9f2qv5x4mhjisv7ppl8hrhz355f6ap"; - name = "karchive-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/karchive-5.100.0.tar.xz"; + sha256 = "16wnzvmm74lzf9xs78d2gilipxgg29z9ja3i04li59zc1ixm1bpm"; + name = "karchive-5.100.0.tar.xz"; }; }; kauth = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kauth-5.99.0.tar.xz"; - sha256 = "14xz3gh4p7dn0wacjyqwm5x82kiwik3nswx7icmhnq686cvp7fin"; - name = "kauth-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kauth-5.100.0.tar.xz"; + sha256 = "0vcgfzkgpk35x14gdprlbzpvcmbx695jqdc8ril23firzrdj1191"; + name = "kauth-5.100.0.tar.xz"; }; }; kbookmarks = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kbookmarks-5.99.0.tar.xz"; - sha256 = "0vb8q69ki6aqmq8hacqq886dl7kwf9zyw015vb52nsinv8zjvf5m"; - name = "kbookmarks-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kbookmarks-5.100.0.tar.xz"; + sha256 = "1bl4brkn3am2nchjcnvxzwswmdp1mb4y644djhvrf6hbz7pghv13"; + name = "kbookmarks-5.100.0.tar.xz"; }; }; kcalendarcore = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcalendarcore-5.99.0.tar.xz"; - sha256 = "11zcgjkz0q4da3vxis7b4lg07sfvk01z0dgx1ccpa15ardmc8l8r"; - name = "kcalendarcore-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcalendarcore-5.100.0.tar.xz"; + sha256 = "0mxzqpwanjrczm5b99a7id7bgxgxzif6lrvmfffcrr7pz84j8330"; + name = "kcalendarcore-5.100.0.tar.xz"; }; }; kcmutils = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcmutils-5.99.0.tar.xz"; - sha256 = "1ljaz8xja2z720cr6n8g2lizsb4kw4vlakfv5xhq466am27csyvm"; - name = "kcmutils-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcmutils-5.100.0.tar.xz"; + sha256 = "0kyp8p3svnyn7pkgm4ww1lc0dznrjfvhyc89bd3ahy2b3kvcjymw"; + name = "kcmutils-5.100.0.tar.xz"; }; }; kcodecs = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcodecs-5.99.0.tar.xz"; - sha256 = "0xi0hscwf4kv5cp7hxwialy2wqr6ijdh0syh9p43icwx6c8q1kb2"; - name = "kcodecs-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcodecs-5.100.0.tar.xz"; + sha256 = "18qcwjhyrxh4sjakq515agpzh7mk4yr6f9fw1kwiwvc44ydbgs2m"; + name = "kcodecs-5.100.0.tar.xz"; }; }; kcompletion = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcompletion-5.99.0.tar.xz"; - sha256 = "14s7nmslli2vaiwg993rg0wvfqlnfcvxadapl41s92iisf6b4m2b"; - name = "kcompletion-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcompletion-5.100.0.tar.xz"; + sha256 = "11j51byll5ffyl2swif84sq1a751991vdic49rrj0wwwmndrss33"; + name = "kcompletion-5.100.0.tar.xz"; }; }; kconfig = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kconfig-5.99.0.tar.xz"; - sha256 = "19jqsah1x1086sqnv5f4bicmi4c5y8idxrx96ji7jign5z9c7isx"; - name = "kconfig-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.0.tar.xz"; + sha256 = "08f93na14s9zcwl6vfk9ix4jm1lwcmalh4yyf6m3p5ga5fd39vbs"; + name = "kconfig-5.100.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kconfigwidgets-5.99.0.tar.xz"; - sha256 = "07xzgmx3fvrynzhnnxrdr4536n1v10rwgk2z92q1y1q18cmbwyc5"; - name = "kconfigwidgets-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kconfigwidgets-5.100.0.tar.xz"; + sha256 = "14ahwlnnyf2dv3ik6cwa6n7cwxm5wqhiwws6y9w2ff1724vqg0g8"; + name = "kconfigwidgets-5.100.0.tar.xz"; }; }; kcontacts = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcontacts-5.99.0.tar.xz"; - sha256 = "1f3288xll0kd0dyq7namfykq8f9zkg5lm27lk2vfvba4v28hdax5"; - name = "kcontacts-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcontacts-5.100.0.tar.xz"; + sha256 = "0jw8qvw0sv73pw3n51n9dvhlwfjbcz3cf065sqy949bm6q43l1p5"; + name = "kcontacts-5.100.0.tar.xz"; }; }; kcoreaddons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcoreaddons-5.99.0.tar.xz"; - sha256 = "06qkyk3zjkpjd7zynx5krh6k2qx8nxmggyhkvd4dgcbi74ys6xjs"; - name = "kcoreaddons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcoreaddons-5.100.0.tar.xz"; + sha256 = "140pbjg38d9fcddi2ifq6y19aqbf6njs4dvqy0ad56widww6ivfz"; + name = "kcoreaddons-5.100.0.tar.xz"; }; }; kcrash = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kcrash-5.99.0.tar.xz"; - sha256 = "1wn3cwdhipw2ry1qf58cf24vq23jg8rnki33vc6mwbi54qkc95p8"; - name = "kcrash-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kcrash-5.100.0.tar.xz"; + sha256 = "0a572bc4c6ngllwfkg58sqjsjddn0a8x5mn0isrq0fdynbfyjxhs"; + name = "kcrash-5.100.0.tar.xz"; }; }; kdav = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdav-5.99.0.tar.xz"; - sha256 = "1r36nlybwwn5pk6q9hl4zkyhp3vyrqdp75g4fd4jj1a2y88yiwzd"; - name = "kdav-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdav-5.100.0.tar.xz"; + sha256 = "094fwz3iphz56nbjjyw62n3lxw1mfp10jkcn95qx8n1m20f4bnbf"; + name = "kdav-5.100.0.tar.xz"; }; }; kdbusaddons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdbusaddons-5.99.0.tar.xz"; - sha256 = "1n9j9gf4br0vykbwf1n0zcvwfz727d71ny92ka0g97bid7nwrix0"; - name = "kdbusaddons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdbusaddons-5.100.0.tar.xz"; + sha256 = "1cr40a96l5adr3xascw9ivlgy8h3nmh7y9fcnw47xmdclcvm2xg0"; + name = "kdbusaddons-5.100.0.tar.xz"; }; }; kdeclarative = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdeclarative-5.99.0.tar.xz"; - sha256 = "191s25l07z0blqcap23l6gbzvxa6pcqhsfaqfkf4f3vap48wr2hn"; - name = "kdeclarative-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdeclarative-5.100.0.tar.xz"; + sha256 = "05s0p35jph316mnzc0ldmxjccda8fwpas9libza14gsv6rrcndbn"; + name = "kdeclarative-5.100.0.tar.xz"; }; }; kded = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kded-5.99.0.tar.xz"; - sha256 = "1kbh921p3n9zszbvsrnrmi32v567s7dqp7dfm13kykmz9lsxih82"; - name = "kded-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kded-5.100.0.tar.xz"; + sha256 = "1klv9ml1ckadf5dp1gx25g33pcd66xlpjb8njr6ygycyqxgiln6j"; + name = "kded-5.100.0.tar.xz"; }; }; kdelibs4support = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kdelibs4support-5.99.0.tar.xz"; - sha256 = "074d7qaai4xj2w1534862a13flqfchdr2c6651gdgrw4275cfd85"; - name = "kdelibs4support-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kdelibs4support-5.100.0.tar.xz"; + sha256 = "1ckkwfzg4ga79bgd5g22cdals720b55nc40n3grjhzw1ksy05ac2"; + name = "kdelibs4support-5.100.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kdesignerplugin-5.99.0.tar.xz"; - sha256 = "0wvx95nx11b25ib1yqmagvzp2ky7yqdrwaxm03cvhb0y92ymmrmf"; - name = "kdesignerplugin-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kdesignerplugin-5.100.0.tar.xz"; + sha256 = "1hhddi8zmjbgvy51gwrrjrawdfp9g7n2k14rnw135q423nyfaq8c"; + name = "kdesignerplugin-5.100.0.tar.xz"; }; }; kdesu = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdesu-5.99.0.tar.xz"; - sha256 = "0chwfman5ka1fgbv5ckr21z93xmbhccv527y43mqa9rwa3gdk4xk"; - name = "kdesu-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdesu-5.100.0.tar.xz"; + sha256 = "1cgn1wznk4i8la5n03qajc38pggm162ybfdb2ya109zq7nnqkn1g"; + name = "kdesu-5.100.0.tar.xz"; }; }; kdewebkit = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kdewebkit-5.99.0.tar.xz"; - sha256 = "1m1x63w6qb4dbr5p9vzg0v5hc0bxk86h2qswm52nx8wagapi1qhp"; - name = "kdewebkit-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kdewebkit-5.100.0.tar.xz"; + sha256 = "10gl34a9zb5nad21nwqvj1fipxxckfdy7myr8bxlqkjqll0jiv15"; + name = "kdewebkit-5.100.0.tar.xz"; }; }; kdnssd = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdnssd-5.99.0.tar.xz"; - sha256 = "071ab2gx19vrl5jcm14w4y0rk431wmmmkzcs8mkcr8rwpdclyca7"; - name = "kdnssd-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdnssd-5.100.0.tar.xz"; + sha256 = "1fkjhkv7qgjr3lgfwvvhqbrigca8hw9fdw6531xqr97slwxiqxb3"; + name = "kdnssd-5.100.0.tar.xz"; }; }; kdoctools = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kdoctools-5.99.0.tar.xz"; - sha256 = "19p3lkis641cdbbfpld122n242l3980j5x38mwd6slpl2alyz5f6"; - name = "kdoctools-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kdoctools-5.100.0.tar.xz"; + sha256 = "0ar7lw6s7qzswf1k80xl9px5g9agl5zi7daaswppqjrpn7pwksa0"; + name = "kdoctools-5.100.0.tar.xz"; }; }; kemoticons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kemoticons-5.99.0.tar.xz"; - sha256 = "1fihsp4w9icc47fswnikmdpdwrznrv2zdddc59akd5n308224sys"; - name = "kemoticons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kemoticons-5.100.0.tar.xz"; + sha256 = "0qs5w5wc1ljmhvly08k0569kyy6c51ldi3080ka9hpasdxlpy4y4"; + name = "kemoticons-5.100.0.tar.xz"; }; }; kfilemetadata = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kfilemetadata-5.99.0.tar.xz"; - sha256 = "15ni3ns6c85a7121nph9c48f9ddna5bfj1134wrn76jwa2scs7vs"; - name = "kfilemetadata-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kfilemetadata-5.100.0.tar.xz"; + sha256 = "0cbiaq9ivdf7pjjh47m65zxrzr1r776ycjzzkkwfc7n27lb0rckg"; + name = "kfilemetadata-5.100.0.tar.xz"; }; }; kglobalaccel = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kglobalaccel-5.99.0.tar.xz"; - sha256 = "0c4wi6kpra34wwvsj12f1bis8jkv4c57jgp9b5k72h04hpnps7a7"; - name = "kglobalaccel-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kglobalaccel-5.100.0.tar.xz"; + sha256 = "1wm2j8hsgwfp8zv4mi0l9rg3qlnk74l1cnkgid3sd02c7vrlx6y3"; + name = "kglobalaccel-5.100.0.tar.xz"; }; }; kguiaddons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kguiaddons-5.99.0.tar.xz"; - sha256 = "0kqvf7h98d0bsgqmcfwasi7ik3025g0bi3brx47wrkd3nxjym1zf"; - name = "kguiaddons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kguiaddons-5.100.0.tar.xz"; + sha256 = "00ix7gfp5c4ph4q2f3cig1bxjvc8pnwg8psy5fxix24xxm1n7qaw"; + name = "kguiaddons-5.100.0.tar.xz"; }; }; kholidays = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kholidays-5.99.0.tar.xz"; - sha256 = "1k165ksmznhx2d5ycmw1lwly7qkmj50113w1qrfqvg16jl6il4zq"; - name = "kholidays-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kholidays-5.100.0.tar.xz"; + sha256 = "076ax7p579180vr66dqjzv43ny1cz56s4w61g6d5s6v18w9n7i2g"; + name = "kholidays-5.100.0.tar.xz"; }; }; khtml = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/khtml-5.99.0.tar.xz"; - sha256 = "0vwkii8x6l3sw0nkxvv960frz9qgjxpkxg6cabxvp3v5gcb3fbzr"; - name = "khtml-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/khtml-5.100.0.tar.xz"; + sha256 = "0h8wb1n0yfc2729rpnx3n52ky3zprfkbgk2rr85k3dax79pcv9a0"; + name = "khtml-5.100.0.tar.xz"; }; }; ki18n = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/ki18n-5.99.0.tar.xz"; - sha256 = "1bgq7saadrh9vvx15hyf03cir1nywad63vlg07qpc8ra01ddsi0m"; - name = "ki18n-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/ki18n-5.100.0.tar.xz"; + sha256 = "008gndw3cp45hkm7klfipm54k1kdglj8sb2hkkvfz4b5p3bg2qyy"; + name = "ki18n-5.100.0.tar.xz"; }; }; kiconthemes = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kiconthemes-5.99.0.tar.xz"; - sha256 = "019s0wr00s6c8p70jzi3vr2m5wkc3rsnlc44ldn16z4r4x9wl9m4"; - name = "kiconthemes-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kiconthemes-5.100.0.tar.xz"; + sha256 = "1fahg11v02757iiwc4nkwnnhf9d7jfa6ryx5l5i2sjg7c4xwqblh"; + name = "kiconthemes-5.100.0.tar.xz"; }; }; kidletime = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kidletime-5.99.0.tar.xz"; - sha256 = "1wfwhfzhpsy1m5zm2m99dsg0g9hjns33m4v4714sfpyngzqwlggg"; - name = "kidletime-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kidletime-5.100.0.tar.xz"; + sha256 = "1i3p3cfvcl3li45nn63r6vwi7sk3rbkd9crd5z686gm6z0nidw5l"; + name = "kidletime-5.100.0.tar.xz"; }; }; kimageformats = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kimageformats-5.99.0.tar.xz"; - sha256 = "1vmi3mi7gg81f556dm8gk7i3k9izr008swpdpyqd3n03zva3drh6"; - name = "kimageformats-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kimageformats-5.100.0.tar.xz"; + sha256 = "09w8fg321lzmavsid0a4yf6hwa9clhihfbvpkdl0kb60alyjbdfb"; + name = "kimageformats-5.100.0.tar.xz"; }; }; kinit = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kinit-5.99.0.tar.xz"; - sha256 = "0xq1sqyni7xzcnjiaszaxwhv7q2p4zjp6nixkam356iswkbss0i3"; - name = "kinit-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kinit-5.100.0.tar.xz"; + sha256 = "1kpjbd20dv2zazcn275p1fwgvnq1pjpkkf0mp4bwk95vrvcjs4c9"; + name = "kinit-5.100.0.tar.xz"; }; }; kio = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kio-5.99.0.tar.xz"; - sha256 = "0z587zrmdxg2dld6x6qzkpnqbcar7swz76ihhclwhcsjp94vzlpg"; - name = "kio-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kio-5.100.0.tar.xz"; + sha256 = "1dkwdmjc41zq1j0kl38zzag0hckk6fgy5prg5kcid05k5v9qi1q8"; + name = "kio-5.100.0.tar.xz"; }; }; kirigami2 = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kirigami2-5.99.0.tar.xz"; - sha256 = "1qh3vpac07582d944zgh3sxsb5i4kn2csa5dj6m52697jfpyp25r"; - name = "kirigami2-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kirigami2-5.100.0.tar.xz"; + sha256 = "1pq16p69k7g963ah5ilr8mjplzrgarqky7i6rxgm5knfqpq0l26n"; + name = "kirigami2-5.100.0.tar.xz"; }; }; kitemmodels = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kitemmodels-5.99.0.tar.xz"; - sha256 = "1z52dkrj5pg0c3avm8jph54j4vjfswsnkcmbdnbg6337qs6rvkip"; - name = "kitemmodels-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kitemmodels-5.100.0.tar.xz"; + sha256 = "1n1iis3xjmvlfgrwv61cpif63pk2wca8g168iscijvpkhihn49x3"; + name = "kitemmodels-5.100.0.tar.xz"; }; }; kitemviews = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kitemviews-5.99.0.tar.xz"; - sha256 = "13gr90sjbpqkzg370d82ji03wn9d3zcnvlhmpkvclbql6knx0q8i"; - name = "kitemviews-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kitemviews-5.100.0.tar.xz"; + sha256 = "06pzlcrjbfahhp8diirmvf2xl7a2bj4x34fp1yax9pjnx44i2vcw"; + name = "kitemviews-5.100.0.tar.xz"; }; }; kjobwidgets = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kjobwidgets-5.99.0.tar.xz"; - sha256 = "1ywqpcw925wl1lcrqpkvdhwj5s4m3n02mghx8pir7w42n36ykxq6"; - name = "kjobwidgets-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kjobwidgets-5.100.0.tar.xz"; + sha256 = "00rilxsbbhl52j9bfzk60hlqrka9hahli0p6fmd8m6m452czjqnk"; + name = "kjobwidgets-5.100.0.tar.xz"; }; }; kjs = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kjs-5.99.0.tar.xz"; - sha256 = "0jsy13gjhyl0yhdx7dxxapaqigr9a06bz555pngnfzf6lia15wa0"; - name = "kjs-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kjs-5.100.0.tar.xz"; + sha256 = "1bn23bq1g1774dvak5mq9xmndxjkwmsiyjkxc93byfwi52xrswk1"; + name = "kjs-5.100.0.tar.xz"; }; }; kjsembed = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kjsembed-5.99.0.tar.xz"; - sha256 = "0w104v96416bcf18aimxqykmi7d40l2x53g8d91zjclpylxx12gw"; - name = "kjsembed-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kjsembed-5.100.0.tar.xz"; + sha256 = "1w2cfckd6r68jmvqcfiw326s3zl4l2j3pz19p12v01vlrh4lr1m7"; + name = "kjsembed-5.100.0.tar.xz"; }; }; kmediaplayer = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kmediaplayer-5.99.0.tar.xz"; - sha256 = "1f2cn1gakjh7m52gsm4294ccn35iwwa35diyd6r8k6fvyf0bn3ny"; - name = "kmediaplayer-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kmediaplayer-5.100.0.tar.xz"; + sha256 = "002ahd1d39m22cy5xd2vvps4ib4cncfwzmqdnki9sh76gsmlpb52"; + name = "kmediaplayer-5.100.0.tar.xz"; }; }; knewstuff = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/knewstuff-5.99.0.tar.xz"; - sha256 = "0bd7shvl6m4gry8cql2p64iba8iim12rsj5shaqp31n512mbc928"; - name = "knewstuff-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/knewstuff-5.100.0.tar.xz"; + sha256 = "19fz50jqrs467qm5qvc6iadw7kb1za6ncc2vnhax6j59h5xn2bn3"; + name = "knewstuff-5.100.0.tar.xz"; }; }; knotifications = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/knotifications-5.99.0.tar.xz"; - sha256 = "0arhbhf5hrg943zmr9gs6dq3z7jifica72bqnxpv4jgn05l15c9n"; - name = "knotifications-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/knotifications-5.100.0.tar.xz"; + sha256 = "18z6cb1s6nra7cyj121knj50brmyyp9a7qdwyd101rfj1d7k08ds"; + name = "knotifications-5.100.0.tar.xz"; }; }; knotifyconfig = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/knotifyconfig-5.99.0.tar.xz"; - sha256 = "1k0ryay0vdd0slzcdjlvp3kry7q9v3drx06jl1qwamfjs4ak65xp"; - name = "knotifyconfig-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/knotifyconfig-5.100.0.tar.xz"; + sha256 = "1ads4yy08441a8hfbig4413p2qyw07b0gpxm3pzw3958y32a9d8x"; + name = "knotifyconfig-5.100.0.tar.xz"; }; }; kpackage = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kpackage-5.99.0.tar.xz"; - sha256 = "05z459mg0l0gv8749sdsgj9xfhwqgsv2cxwfjsqv06nymgq71jyq"; - name = "kpackage-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kpackage-5.100.0.tar.xz"; + sha256 = "11969rqkwf14gjk3vx2lzd3snirnv3fry5yh6jwnc17vjiz6b35j"; + name = "kpackage-5.100.0.tar.xz"; }; }; kparts = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kparts-5.99.0.tar.xz"; - sha256 = "0pkw1r1hr34ppl72blcmsdgp9a37dav7l83nc3dfcfvkhzzj0ch0"; - name = "kparts-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kparts-5.100.0.tar.xz"; + sha256 = "0vy8j5p0icxdlsvdlmbrvkbp50f3qnb7fqnvdg544d2lp7x1v5k8"; + name = "kparts-5.100.0.tar.xz"; }; }; kpeople = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kpeople-5.99.0.tar.xz"; - sha256 = "0gb63gvi61gncmd79i1zdjcgidlmb4xh5ldvp6piydw5kl2z81bz"; - name = "kpeople-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kpeople-5.100.0.tar.xz"; + sha256 = "1q9yxfrs9rhwzykah3909lv9qfly13jdirya4m4j34azbqfiahqg"; + name = "kpeople-5.100.0.tar.xz"; }; }; kplotting = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kplotting-5.99.0.tar.xz"; - sha256 = "0yxlzh1ffjs4b3fw7yxkvsxiabm1jw8zgkzzgqvmsjs41h1g8nyq"; - name = "kplotting-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kplotting-5.100.0.tar.xz"; + sha256 = "1lsi6yk7fpdji9qb2hdy2qqcp050cgckg8xmg1kmv551g6x13r7m"; + name = "kplotting-5.100.0.tar.xz"; }; }; kpty = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kpty-5.99.0.tar.xz"; - sha256 = "0vg8s3minm1p2qmhp7i7d0yxvbkzpxibvb76w9kag1ds3lq8k150"; - name = "kpty-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kpty-5.100.0.tar.xz"; + sha256 = "0h5l72klg78wy0z29zay5zyivgff8jb2v0hfw2akrfblwwdmc27j"; + name = "kpty-5.100.0.tar.xz"; }; }; kquickcharts = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kquickcharts-5.99.0.tar.xz"; - sha256 = "0b60jj9w491amciq3cragsyjfzamzakajhvzfb76xpjw2wvjaqb9"; - name = "kquickcharts-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kquickcharts-5.100.0.tar.xz"; + sha256 = "1b5ddbcgxasjyhzabbqcvlb4q04zp7yiqifk7gdigjvxx15dxwrz"; + name = "kquickcharts-5.100.0.tar.xz"; }; }; kross = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kross-5.99.0.tar.xz"; - sha256 = "1ml8fylm66dksnx5d3n2p0mndxwspqb25ak3inlf8m2my6asixvv"; - name = "kross-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kross-5.100.0.tar.xz"; + sha256 = "0jpnnvajxyzki221agl1ai15bj6xrylg69ymwxn70pcdp30wsvxj"; + name = "kross-5.100.0.tar.xz"; }; }; krunner = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/krunner-5.99.0.tar.xz"; - sha256 = "1nf8cvzvbgaynimgf5i3lc632w71zzypbdg8a25lyvvc2n5qf895"; - name = "krunner-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/krunner-5.100.0.tar.xz"; + sha256 = "0mn0b2rvkb0c743vn4xxi1f8mcb5gb9vjnksiw88jgfy4qrmal3q"; + name = "krunner-5.100.0.tar.xz"; }; }; kservice = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kservice-5.99.0.tar.xz"; - sha256 = "0ra6znqja27g3r4b856h26nchn8h5lzxahazsyx5ndrkx1ranl0s"; - name = "kservice-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kservice-5.100.0.tar.xz"; + sha256 = "1vq4hnyfpj1ax19zgly7vcqvysxdc7wyyycmhrn6982l24d14gdk"; + name = "kservice-5.100.0.tar.xz"; }; }; ktexteditor = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/ktexteditor-5.99.0.tar.xz"; - sha256 = "13462wsc5nd71w6hyn010zgmw83ml02kpximazk0pjf6akamqg8j"; - name = "ktexteditor-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/ktexteditor-5.100.0.tar.xz"; + sha256 = "1rbyaamgrnga6k39q646xfi81ic5dar9wa5wcacp9d17m6zqry51"; + name = "ktexteditor-5.100.0.tar.xz"; }; }; ktextwidgets = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/ktextwidgets-5.99.0.tar.xz"; - sha256 = "1a39nj96hi6wvzig9khp1rfh32hfd25zgmzb5ybz0rpqagqdzs1i"; - name = "ktextwidgets-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/ktextwidgets-5.100.0.tar.xz"; + sha256 = "109j8zpnpiw9h0arh2ll3ql7czyv65lva4hwa626wk6589nc82vn"; + name = "ktextwidgets-5.100.0.tar.xz"; }; }; kunitconversion = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kunitconversion-5.99.0.tar.xz"; - sha256 = "0bx44j94j2zp68n32zkml101j49pi1zq829aqsl8zxdzyj4qm8ny"; - name = "kunitconversion-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kunitconversion-5.100.0.tar.xz"; + sha256 = "06ql3ijlha0gib31mwc7r260vy3dcxi6nrz5jylv9blzvcq8qnqw"; + name = "kunitconversion-5.100.0.tar.xz"; }; }; kwallet = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kwallet-5.99.0.tar.xz"; - sha256 = "01raw36fzk3bjih72vi9ixyc0pngbqr6amyvwiy3lmkjd1rnpinj"; - name = "kwallet-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kwallet-5.100.0.tar.xz"; + sha256 = "101fhgrgjqsxdqxzraw4a8gn5dvv2nb6xxfwi9gdjdjva5zzbg9b"; + name = "kwallet-5.100.0.tar.xz"; }; }; kwayland = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kwayland-5.99.0.tar.xz"; - sha256 = "18k5vmlg1ahxv83892937k4d9h5yz7a06nj0v6dfjcx8wcjj3gm7"; - name = "kwayland-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kwayland-5.100.0.tar.xz"; + sha256 = "119ggvny15x65z2i4d7x6bh01a9wif1h5jq4rppcm7mwczmhjg91"; + name = "kwayland-5.100.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kwidgetsaddons-5.99.0.tar.xz"; - sha256 = "0scjrpwbp4p8hkxbvsaamd0y7fx5drq7nl6icfsm5v2v5rpa5kas"; - name = "kwidgetsaddons-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kwidgetsaddons-5.100.0.tar.xz"; + sha256 = "07sa914xmkrm0bb3r7rnzkn9aw1rzlgbkzmakwyw0v569yb166f7"; + name = "kwidgetsaddons-5.100.0.tar.xz"; }; }; kwindowsystem = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz"; - sha256 = "0xzqlw0nr8icdmwpr6rpi806ryb7wl6pm6cznmdhf19caszkzlgl"; - name = "kwindowsystem-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kwindowsystem-5.100.0.tar.xz"; + sha256 = "1csghc0b4jr4nfwicz29bp9lxr69iw52ghbdqi0a0jn9lnx4xck9"; + name = "kwindowsystem-5.100.0.tar.xz"; }; }; kxmlgui = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/kxmlgui-5.99.0.tar.xz"; - sha256 = "1p2ay1hfkhm3cfzyb7b31y5i7scq0z3cypysryfcnz75zz7wd4ic"; - name = "kxmlgui-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kxmlgui-5.100.0.tar.xz"; + sha256 = "19cfavf2qqy6kzc5p30s05pp92fphnaja11arnaks0vd0m9hbvky"; + name = "kxmlgui-5.100.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/portingAids/kxmlrpcclient-5.99.0.tar.xz"; - sha256 = "0rma78pj0h3ss28ncz7km0cd5l1rwwf5vraf0h96apb0vh2y115x"; - name = "kxmlrpcclient-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/portingAids/kxmlrpcclient-5.100.0.tar.xz"; + sha256 = "0fnfkka872w1bjyh3cscmcj8cfmwybj016x1zph7yxwpnbmzyimr"; + name = "kxmlrpcclient-5.100.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/modemmanager-qt-5.99.0.tar.xz"; - sha256 = "0wjcrnkgaxq5kqck6fl2328k220byhmc66ss63x7rmz7y3jir17g"; - name = "modemmanager-qt-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/modemmanager-qt-5.100.0.tar.xz"; + sha256 = "0x7l80hkxhf7b45h2kwlchd04763rcai06cjk1s88mzcl6s419fy"; + name = "modemmanager-qt-5.100.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/networkmanager-qt-5.99.0.tar.xz"; - sha256 = "0643dx3jcjrabrhds2d3lh5h9c7dc6q26gg4vb5vrhgwsybqzna9"; - name = "networkmanager-qt-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/networkmanager-qt-5.100.0.tar.xz"; + sha256 = "0pv3daiywmw0jjzd4px3g2d1ifkd63dm7zq3r77kl2ibxwk2yqfn"; + name = "networkmanager-qt-5.100.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/oxygen-icons5-5.99.0.tar.xz"; - sha256 = "1pak09dps9fwcs6rcbvjdxvivw8ahcvnmzk175ky7xjq065aprlc"; - name = "oxygen-icons5-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/oxygen-icons5-5.100.0.tar.xz"; + sha256 = "1s81jz9ndjzyvn7gps1jr5wbxmirb986cx1665lk6zgk577x8q80"; + name = "oxygen-icons5-5.100.0.tar.xz"; }; }; plasma-framework = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/plasma-framework-5.99.0.tar.xz"; - sha256 = "1ax029s0nmcv4cg6pqgv66hgyj5b4djdvvnmpmzb1003l22aivck"; - name = "plasma-framework-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.0.tar.xz"; + sha256 = "101jqybbzl6cnfh3w6gghd0916kbdwxqn1086q9i2fnvg503cxk4"; + name = "plasma-framework-5.100.0.tar.xz"; }; }; prison = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/prison-5.99.0.tar.xz"; - sha256 = "1wf1fkqgnyrbd8i2mhkb6baynkkg010f2lbiwbz77jkrkv0vkpl4"; - name = "prison-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/prison-5.100.0.tar.xz"; + sha256 = "10wlrcfqgbk88w2xr7wi2kjkkk8lcyiqqvav07r13f34hgpsdj9h"; + name = "prison-5.100.0.tar.xz"; }; }; purpose = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/purpose-5.99.0.tar.xz"; - sha256 = "1bh2rrc3h9r95qv5kn45nhx10vgcfv6y7qfl7r152mrsvas317qy"; - name = "purpose-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/purpose-5.100.0.tar.xz"; + sha256 = "0bskd3qmzsqlr8xjagx7d5cpy4s5lhf2z7p5wgn0axfb8jvva3iw"; + name = "purpose-5.100.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/qqc2-desktop-style-5.99.0.tar.xz"; - sha256 = "19pykvy9ifnfnhh7587dbb68jnk1bfjyipw3f1gshqr9b9vgjfdx"; - name = "qqc2-desktop-style-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/qqc2-desktop-style-5.100.0.tar.xz"; + sha256 = "09igdk79v0rv2kiv259zzvqinqqhhqq64l5wj2xcc5b9vpnvyyx9"; + name = "qqc2-desktop-style-5.100.0.tar.xz"; }; }; solid = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/solid-5.99.0.tar.xz"; - sha256 = "0yyhyqhvb2r374idn70rr74vyjvrgsv604issvx8d8dmvwyldrcb"; - name = "solid-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/solid-5.100.0.tar.xz"; + sha256 = "10s64js1hwda9zd7y91yq5f7x1h0z7n0khf9m3rmqmi4kpnr76cd"; + name = "solid-5.100.0.tar.xz"; }; }; sonnet = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/sonnet-5.99.0.tar.xz"; - sha256 = "1r57zhxfcgkp2bh3yqirdyl1s040qjzcsg4jsvvzqp10z408xwgk"; - name = "sonnet-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/sonnet-5.100.0.tar.xz"; + sha256 = "068y78y8n5yrnxs4kicxhjfx6mhvr5r15z8nxjpm63chhn9jprz4"; + name = "sonnet-5.100.0.tar.xz"; }; }; syndication = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/syndication-5.99.0.tar.xz"; - sha256 = "1lfgm0a2wmsssr4vlw5h4gjvci6g11n78y609mzk5hw51989i672"; - name = "syndication-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/syndication-5.100.0.tar.xz"; + sha256 = "13gkkl5yczsdg4yfxvasza286l6k6876p35b1jzhw0ysjxdh8j65"; + name = "syndication-5.100.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/syntax-highlighting-5.99.0.tar.xz"; - sha256 = "0yh92dmf6kfannbx1iv90k7g931vlqw82qfvhbk7m8kvggdvy2xy"; - name = "syntax-highlighting-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/syntax-highlighting-5.100.0.tar.xz"; + sha256 = "1d2c86a1k824f44gzzm138pkz21mk788xp2hnq1xcanlsa3r99z0"; + name = "syntax-highlighting-5.100.0.tar.xz"; }; }; threadweaver = { - version = "5.99.0"; + version = "5.100.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.99/threadweaver-5.99.0.tar.xz"; - sha256 = "1j3vcr2kcmd01byklnly239xb07vs9d74vnd7y37zjbg3yx14ina"; - name = "threadweaver-5.99.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/threadweaver-5.100.0.tar.xz"; + sha256 = "0dap8iihilqy2v9jy1s00j05qqrjj67n6v0yg4ix0lay2kqjwnh3"; + name = "threadweaver-5.100.0.tar.xz"; }; }; } From 11e7a67aa6afab6af75aac7ac80fdc3c994f8e63 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Nov 2022 20:00:55 +0300 Subject: [PATCH 10/43] ludusavi: fix eval --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 561df7c4bea7..065e34575a85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1601,7 +1601,9 @@ with pkgs; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - ludusavi = callPackage ../applications/backup/ludusavi { }; + ludusavi = callPackage ../applications/backup/ludusavi { + inherit (plasma5Packages) kdialog; + }; maiko = callPackage ../applications/emulators/maiko { }; From 39f75847d44e4dec1ff9ed126df8cb093d24158b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Nov 2022 20:04:40 +0300 Subject: [PATCH 11/43] tela-circle-icon-theme: fix eval --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 065e34575a85..ed95b104cc8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27005,6 +27005,7 @@ with pkgs; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; + inherit (plasma5Packages) breeze-icons; }; tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; From 372281881bbd3526b2e9b38b2835356b3d2bbff7 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Nov 2022 20:14:21 +0300 Subject: [PATCH 12/43] extra-cmake-modules: drop merged patch --- .../extra-cmake-modules/default.nix | 1 - .../extra-cmake-modules/nix-lib-path.patch | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index e4168299c182..ac7f75f5e742 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -4,7 +4,6 @@ mkDerivation { pname = "extra-cmake-modules"; patches = [ - ./nix-lib-path.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 (fetchpatch { url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch"; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch deleted file mode 100644 index b035b3664a2a..000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake -index c1d056b..d9e19f0 100644 ---- a/kde-modules/KDEInstallDirsCommon.cmake -+++ b/kde-modules/KDEInstallDirsCommon.cmake -@@ -15,35 +15,6 @@ - # GNUInstallDirs code deals with re-configuring, but that is dealt with - # by the _define_* macros in this module). - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' if: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are NOT on flatpak --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See https://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING -- AND NOT EXISTS "/etc/arch-release" -- AND NOT DEFINED ENV{FLATPAK_ID}) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR From 5fd091987a63c00acd84e4d3a3444bd2ffd01d0c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 14 Nov 2022 20:21:08 +0300 Subject: [PATCH 13/43] karchive: add new dependency --- pkgs/development/libraries/kde-frameworks/karchive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 822b28f3deea..514b63f44b55 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,12 +1,12 @@ { mkDerivation, extra-cmake-modules, - bzip2, xz, qtbase, zlib, zstd + bzip2, xz, qtbase, qttools, zlib, zstd }: mkDerivation { pname = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ bzip2 xz zlib zstd ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; From 065e85e8add709b5b3a3b2fe243fde9c41bea022 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 23:20:51 +0000 Subject: [PATCH 14/43] libstroke: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/libstroke/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index d40b5b6b0492..698fa5c579f7 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,10 @@ -{lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}: +{ lib +, stdenv +, fetchurl +, automake +, autoconf +, libX11 +}: stdenv.mkDerivation rec { pname = "libstroke"; @@ -10,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ xlibsWrapper ]; + buildInputs = [ libX11 ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. From e3cf54408754eaf4c801ed057d8d75ebc58efe45 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Nov 2022 10:26:35 +0300 Subject: [PATCH 15/43] krunner-pass: fix cmake configuration --- pkgs/tools/security/krunner-pass/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index a9f2c241d21c..032840b7d33c 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -42,8 +42,12 @@ mkDerivation rec { ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; - # there are *lots* of pointless warnings in v1.3.0 - cmakeFlags = [ "-Wno-dev" ]; + cmakeFlags = [ + # there are *lots* of pointless warnings in v1.3.0 + "-Wno-dev" + # required for kf5auth to work correctly + "-DCMAKE_POLICY_DEFAULT_CMP0012=NEW" + ]; meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; From 360080de176a26a572384ea308e623f01eeeea3d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Nov 2022 10:28:07 +0300 Subject: [PATCH 16/43] kmplayer: fix cmake configuration --- pkgs/applications/video/kmplayer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 986faceb82d0..a3c5b181725a 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -27,6 +27,9 @@ mkDerivation rec { -e "s,^Exec.*,Exec=$out/bin/kmplayer -qwindowtitle %c %i %U," ''; + # required for kf5auth to work correctly + cmakeFlags = ["-DCMAKE_POLICY_DEFAULT_CMP0012=NEW"]; + nativeBuildInputs = [ extra-cmake-modules makeWrapper ]; buildInputs = [ From 48e236c7e0153035b6c8198fe56ebcedb44ebedb Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Nov 2022 10:30:16 +0300 Subject: [PATCH 17/43] ksmoothdock: patch out -Werror --- pkgs/applications/misc/ksmoothdock/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index 7325c85dbd4c..80c46bd9c16d 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -18,6 +18,12 @@ mkDerivation rec { sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; }; + # Upstream seems dead and there are new deprecation warnings in KF5.100 + # Remember, kids: friends don't let friends build with -Werror + postPatch = '' + substituteInPlace src/CMakeLists.txt --replace "-Werror" "" + ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kactivities qtbase ]; From f62a898c4fdc272008620eb01f2a377fbda3f515 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Nov 2022 10:31:54 +0300 Subject: [PATCH 18/43] bcompare: 4.4.2.26348 -> 4.4.4.27058 --- pkgs/applications/version-management/bcompare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index fab2780d9644..409652888caf 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -4,19 +4,19 @@ let pname = "bcompare"; - version = "4.4.2.26348"; + version = "4.4.4.27058"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "sha256-GotORErgPs7IPXATbBfIisDCNwp8csl7pDSwV77FylA="; + sha256 = "sha256-8wJzCCfekr/mrDJCDgoIqMRz21wWjfp5c5sPavZma3g="; }; x86_64-darwin = fetchurl { url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-XqmtW2EGyFmOzCooXczP3mtMN5UVQCCx7DJnVDlzAko="; + sha256 = "sha256-UopkyKHvbIZb9rNAJ+l3dEmOX33lQwakNypWCgYDT04="; }; aarch64-darwin = srcs.x86_64-darwin; From fd019e4495f09e2d7c7f334f59c1f2e85bf71856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:09:59 +0100 Subject: [PATCH 19/43] python310Packages.pushover-complete: enable tests --- .../python-modules/pushover-complete/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index 33769af319d6..92131b52628d 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -4,9 +4,10 @@ , isPy27 , requests , six -, tox -, pytest +, pytestCheckHook , pythonOlder +, requests-toolbelt +, responses }: buildPythonPackage rec { @@ -25,11 +26,13 @@ buildPythonPackage rec { six ]; - checkInputs = [ pytest tox ]; + checkInputs = [ + pytestCheckHook + requests-toolbelt + responses + ]; - # Fails also on their travis right now: - # - https://travis-ci.org/scolby33/pushover_complete/builds?utm_medium=notification&utm_source=github_status - doCheck = pythonOlder "3.7"; + pythonImportsCheck = [ "pushover_complete" ]; meta = with lib; { description = "A Python package for interacting with *all* aspects of the Pushover API"; From 58419cf37c1e1d9d4313a04cd1aa70108f011327 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 02:38:00 +0000 Subject: [PATCH 20/43] copper: mark as broken --- pkgs/development/compilers/copper/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix index 67d31f6f5e10..f202932743f1 100644 --- a/pkgs/development/compilers/copper/default.nix +++ b/pkgs/development/compilers/copper/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , libffi }: @@ -27,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; platforms = platforms.x86_64; - broken = stdenv.isDarwin; + broken = true; }; } From b70d4b9009be9e274986ef7110b86860004aea00 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 02:50:07 +0000 Subject: [PATCH 21/43] gatling: mark as broken --- pkgs/servers/http/gatling/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index e1180121a65a..00657757fce4 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = lib.licenses.gpl2; platforms = platforms.linux; + broken = true; # 2022-11-16 }; } From 62b78d1eade02c63a8df938ede8b13e3ea581e63 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 16 Nov 2022 12:01:05 +0800 Subject: [PATCH 22/43] licenses: add bsd2WithViews --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 09f8be7d725b..612cfba6c730 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -154,6 +154,11 @@ in mkLicense lset) ({ fullName = "BSD-2-Clause Plus Patent License"; }; + bsd2WithViews = { + spdxId = "BSD-2-Clause-Views"; + fullName = "BSD 2-Clause with views sentence"; + }; + bsd3 = { spdxId = "BSD-3-Clause"; fullName = ''BSD 3-clause "New" or "Revised" License''; From ca7fcd72f41ce1363cf7326bf929319c976ab5ea Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 15 Nov 2022 12:06:12 +0800 Subject: [PATCH 23/43] moar: init at 1.10.0 --- pkgs/tools/misc/moar/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/moar/default.nix diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix new file mode 100644 index 000000000000..bea127acb008 --- /dev/null +++ b/pkgs/tools/misc/moar/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "moar"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "walles"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cFXUspVSCUy0q5CW8K+YL/LBpK87qlPys8hg6AYvg5M="; + }; + + vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ./moar.1 + ''; + + meta = with lib; { + description = "Nice-to-use pager for humans"; + homepage = "https://github.com/walles/moar"; + license = licenses.bsd2WithViews; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc052e938a44..a41510ef1ee1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4579,6 +4579,8 @@ with pkgs; mmctl = callPackage ../tools/misc/mmctl { }; + moar = callPackage ../tools/misc/moar { }; + molly-brown = callPackage ../servers/gemini/molly-brown { }; monetdb = callPackage ../servers/sql/monetdb { }; From 29dd883f5d9c91fefddc843f10bc960b97f0b9d0 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Tue, 15 Nov 2022 23:02:24 -0600 Subject: [PATCH 24/43] signal-desktop: 5.63.0 -> 5.63.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7e7830fd1b56..3e0dc4695bb0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.63.0"; # Please backport all updates to the stable channel. + version = "5.63.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-f8gQUnmI/VU0FteoMVY0k0RK1R7Ho7JRx+WoMhKki4s="; + sha256 = "sha256-+zeYjWRFEY09f3o49TcJU14fM1Wks7uR0GsyU2eMJPk="; }; nativeBuildInputs = [ From 6cb85df0906086ee464d3f39b0c8fcca4537a78d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 05:36:36 +0000 Subject: [PATCH 25/43] lazpaint: mark as broken --- pkgs/applications/graphics/lazpaint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 82eab9757c73..37ad3387f834 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -64,5 +64,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + broken = true; # 2022-11-16 }; } From 0f86e8758dd0b010fad7b3ff8c0f722d104dd063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 02:03:59 +0000 Subject: [PATCH 26/43] rymdport: init at 3.2.0 --- .../networking/rymdport/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/networking/rymdport/default.nix diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix new file mode 100644 index 000000000000..a35f918ff5a0 --- /dev/null +++ b/pkgs/applications/networking/rymdport/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pkg-config +, libGL +, xorg +, Carbon +, Cocoa +}: + +buildGoModule rec { + pname = "rymdport"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "Jacalz"; + repo = "rymdport"; + rev = "v${version}"; + hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + }; + + vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = with xorg; [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + IOKit + ]; + + meta = { + description = "Easy encrypted file, folder, and text sharing between devices"; + homepage = "https://github.com/Jacalz/rymdport"; + changelog = "https://github.com/Jacalz/rymdport/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe5c03a38c8..bac17025757b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31748,6 +31748,10 @@ with pkgs; inherit (gnome) zenity; }; + rymdport = callPackage ../applications/networking/rymdport { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + uade = callPackage ../applications/audio/uade {}; udevil = callPackage ../applications/misc/udevil {}; From 5e38acae5414020b5d5c9a53ccff42ba12daf97a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 05:33:26 +0000 Subject: [PATCH 27/43] isrcsubmit: mark as broken --- pkgs/tools/audio/isrcsubmit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix index 530094b8506c..fa01756f8982 100644 --- a/pkgs/tools/audio/isrcsubmit/default.nix +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { # drutil is required on Darwin, which does not seem to be available in nixpkgs - broken = stdenv.isDarwin; + broken = true; # 2022-11-16 description = "Script to submit ISRCs from disc to MusicBrainz"; license = licenses.gpl3Plus; homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/"; From 8b013b65a60e2a897104cb9fc59d48dee0e2ba16 Mon Sep 17 00:00:00 2001 From: Brian Cooper <20056195+coopbri@users.noreply.github.com> Date: Wed, 16 Nov 2022 06:54:04 +0000 Subject: [PATCH 28/43] nixos/misc: fix grammar typo --- nixos/modules/misc/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 00460a88d86c..7f7417226d17 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -307,7 +307,7 @@ in '' else throw '' - Neither ${opt.hostPlatform} nor or the legacy option ${opt.system} has been set. + Neither ${opt.hostPlatform} nor the legacy option ${opt.system} has been set. You can set ${opt.hostPlatform} in hardware-configuration.nix by re-running a recent version of nixos-generate-config. The option ${opt.system} is still fully supported for NixOS 22.05 interoperability, From 8f1d59e2c5907d396cfa71110fa2115b9e3b284d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 23:21:38 -0800 Subject: [PATCH 29/43] python310Packages.bibtexparser: clean up python 2 dependencies (#201457) Latest version no longer depends on unittest2 and future packages, so we can clean them up. --- pkgs/development/python-modules/bibtexparser/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 835ee405a2a1..4545eaeaef6d 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, future , pyparsing , pytestCheckHook , pythonOlder @@ -22,7 +21,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - future pyparsing ]; @@ -30,12 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/sciunto-org/python-bibtexparser/pull/259 - substituteInPlace bibtexparser/tests/test_crossref_resolving.py \ - --replace "import unittest2 as unittest" "import unittest" - ''; - pythonImportsCheck = [ "bibtexparser" ]; From a6151294db89c8409965eb3e3d70ccced60aabed Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 8 Nov 2022 10:49:14 +0100 Subject: [PATCH 30/43] yosys: 0.22 -> 0.23 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.23 The protobuf backend was removed in https://github.com/YosysHQ/yosys/pull/3508. --- pkgs/development/compilers/yosys/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 34c76b48384e..62bd8b15d1ad 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,7 +8,6 @@ , libffi , makeWrapper , pkg-config -, protobuf , python3 , readline , symlinkJoin @@ -72,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-us4GiulqkzcwD2iuNXB5eTd3iqgUdvj9Nd2p/9TJerQ="; + hash = "sha256-mOakdXhSij8k4Eo7RwpKjd59IkNjw31NNFDJtL6Adgo="; }; enableParallelBuilding = true; @@ -87,14 +86,13 @@ in stdenv.mkDerivation rec { tcl readline libffi - protobuf zlib (python3.withPackages (pp: with pp; [ click ])) ]; - makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; + makeFlags = [ "PREFIX=${placeholder "out"}"]; patches = [ ./plugin-search-dirs.patch @@ -116,9 +114,6 @@ in stdenv.mkDerivation rec { make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf - # we have to do this ourselves for some reason... - (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) - if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." exit 1 From 6e0c9dcd87280deae219d2c5abfa1f5fd550f23a Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Wed, 16 Nov 2022 17:52:00 +1000 Subject: [PATCH 31/43] mastodon: add ghuntley as maintainer --- pkgs/servers/mastodon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 7468b612cb47..91846bdf7035 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -121,6 +121,6 @@ stdenv.mkDerivation rec { homepage = "https://joinmastodon.org"; license = licenses.agpl3Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ happy-river erictapen izorkin ]; + maintainers = with maintainers; [ happy-river erictapen izorkin ghuntley ]; }; } From 977a0c94601dc774f8ad148e5ce2dd9722eb6dfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 03:08:40 +0000 Subject: [PATCH 32/43] minikube: 1.27.1 -> 1.28.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index e0a16ab885b8..997b52434b82 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.27.1"; + version = "1.28.0"; - vendorSha256 = "sha256-2sXWf+iK1v9gv2DXhmEs8xlIRF+6EM7Y6Otd6F89zGk="; + vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-GmvxKWHo0meiR1r5IlgI8jQRiDvmQafxTS9acv92EPk="; + sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; From 2bb776841914f78bdbc7bea7d007f2302aec0bcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 01:44:01 +0000 Subject: [PATCH 33/43] soft-serve: 0.4.0 -> 0.4.1 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 3981f29e1751..9e0a9a96425e 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-X9Dym2AV2By7huPI1Ns0UWue3qRZcauroIv/UAePf/U="; + sha256 = "sha256-xlfAmAU9u4pI3q8EZm4c7BF/lPAHMjLYa/57VWq067M="; }; - vendorSha256 = "sha256-FCTJJ5T2UCtpctd+ubL7ey24xtbdiw7Q2kRBdAVPtCI="; + vendorSha256 = "sha256-XSAMKR5WPG/6ix5T0e9jtHJXQ6HNkh7li+BDFyIhATQ="; doCheck = false; From 82230795697d36356bc530db9fa0aefa76b18768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Wed, 16 Nov 2022 09:57:43 +0100 Subject: [PATCH 34/43] nsncd: unstable-2021-10-20 -> unstable-2022-11-14 This bump fixes the response format for IPV6-only requests. The bogus response message was crashing glibc. See https://github.com/nix-community/nsncd/pull/1 for more informations. --- pkgs/os-specific/linux/nsncd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index f2005f50a580..e9dc2d47e0e7 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nsncd"; - version = "unstable-2021-10-20"; + version = "unstable-2022-11-14"; src = fetchFromGitHub { owner = "nix-community"; repo = "nsncd"; - rev = "b9425070bb308565a6e4dc5aefd568952a07a4ed"; - hash = "sha256-ZjInzPJo+PWAM2gAKhlasLXiqo+2Df4DIXpNwtqQVc8="; + rev = "47e580f1db99603df6e212a2e62f18cc970cef40"; + hash = "sha256-Nv3MYZcuYgD66BAGs3Tg37s086HAGsaDBFvELqQF3Tk="; }; - cargoSha256 = "sha256-hxdI+HHB0PB/zDMI21Pg5Xr9mTDn4T+OcAAenUox4bs="; + cargoSha256 = "sha256-c1L6nEUBHw1YegmoRrI3WU/bF80Nzbz13hsGlNyBR9o="; meta = with lib; { description = "the name service non-caching daemon"; From 00287cc23dc7948f3a86772c55e679f0bc983e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 14 Nov 2022 21:24:49 +0100 Subject: [PATCH 35/43] qownnotes: update hash to upstream provided format So that we can get the checksum from upstream with the curl command in the comment. No rebuild. --- pkgs/applications/office/qownnotes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b4addd5cff2d..8b41747fd30d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - hash = "sha256-oZLbplYn1AYCv/fPb2dotpQeb8MITx7F5Tc4Wxd65Ew="; + sha256 = "a192dba65627d40602bff7cf6f6768b6941e6fc3084f1ec5e537385b177ae44c"; }; nativeBuildInputs = [ qmake qttools ]; From 37b95c8d49f573384a8bd7d93e37e26bee319899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 14 Nov 2022 21:26:07 +0100 Subject: [PATCH 36/43] qownnotes: 22.11.4 -> 22.11.5 Changelog: https://github.com/pbek/QOwnNotes/blob/develop/CHANGELOG.md#22115 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 8b41747fd30d..c176248d1f4d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.11.4"; + version = "22.11.5"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "a192dba65627d40602bff7cf6f6768b6941e6fc3084f1ec5e537385b177ae44c"; + sha256 = "451c7bed728710d1ff7ddc5bcc5a32b829dfac3ed2bbfdb6f7c2c328e6676a8c"; }; nativeBuildInputs = [ qmake qttools ]; From 4e65826439f45a5a760d45c4c4d07ce2971f5b62 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 15 Nov 2022 20:08:02 -0500 Subject: [PATCH 37/43] surrealdb: init at 1.0.0-beta.8 --- pkgs/servers/nosql/surrealdb/default.nix | 51 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/servers/nosql/surrealdb/default.nix diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix new file mode 100644 index 000000000000..6e89e5ba03ad --- /dev/null +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, llvmPackages +, rocksdb +, testers +, surrealdb +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "surrealdb"; + version = "1.0.0-beta.8"; + + src = fetchFromGitHub { + owner = "surrealdb"; + repo = "surrealdb"; + rev = "v${version}"; + sha256 = "sha256-zFqHwZUpwqvuqmS18bhlpAswD5EycB3pnZwSuN5Q2G4="; + }; + + cargoSha256 = "sha256-vaAfOsbIdQXpx7v4onXY1J8ANKCccVRuWxdvX5+f2no="; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + + passthru.tests.version = testers.testVersion { + package = surrealdb; + command = "surreal version"; + }; + + meta = with lib; { + description = "A scalable, distributed, collaborative, document-graph database, for the realtime web"; + homepage = "https://surrealdb.com/"; + mainProgram = "surreal"; + license = licenses.bsl11; + maintainers = with maintainers; [ sikmir happysalada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b12165c98c3..753c5d237ff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24532,6 +24532,10 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; + surrealdb = callPackage ../servers/nosql/surrealdb { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; slurm = callPackage ../servers/computing/slurm { }; From 9a7a5256fdc21669bf076441ad24d6035f5f395c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 01:56:45 +0000 Subject: [PATCH 38/43] xmlada: 22.0.0 -> 23.0.0 --- pkgs/development/libraries/ada/xmlada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/libraries/ada/xmlada/default.nix index cd0aad61d403..e80371e092e8 100644 --- a/pkgs/development/libraries/ada/xmlada/default.nix +++ b/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "22.0.0"; + version = "23.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "1pg6m0sfc1vwvd18r80jv2vwrsb2qgvyl8jmmrmpbdni0npx0kv3"; + sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0="; }; nativeBuildInputs = [ From e3ef549a597c096a30303fa19146a57e31e8a483 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 13 Nov 2022 14:13:28 +0100 Subject: [PATCH 39/43] gprbuild, gprbuild-boot: 22.0.0 -> 23.0.0 --- pkgs/development/tools/build-managers/gprbuild/boot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/tools/build-managers/gprbuild/boot.nix index 060a74314bd4..795bb4407d58 100644 --- a/pkgs/development/tools/build-managers/gprbuild/boot.nix +++ b/pkgs/development/tools/build-managers/gprbuild/boot.nix @@ -7,14 +7,14 @@ }: let - version = "22.0.0"; + version = "23.0.0"; gprConfigKbSrc = fetchFromGitHub { name = "gprconfig-kb-${version}-src"; owner = "AdaCore"; repo = "gprconfig_kb"; rev = "v${version}"; - sha256 = "0zvd0v5cz0zd1hfnhdd91c6sr3bbv1w715j2gvzx3vxlpx1c2q4n"; + sha256 = "1rhskq4r2plf3ia67k08misygnpr9knzw3kp3kyv5778lra8y6s2"; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { owner = "AdaCore"; repo = "gprbuild"; rev = "v${version}"; - sha256 = "0rv0ha0kxzab5hhv0jzkjkmchhlvlx8fci8xalnngrgb9nd4r3v8"; + sha256 = "1ciaq4nh98vd7r5i11v353c1ms9s5yph0yxk4fkryc6bvkm4666x"; }; nativeBuildInputs = [ From a1647c38b6a1f24b872f04dfa135b435270ce343 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 13 Nov 2022 14:13:44 +0100 Subject: [PATCH 40/43] gnatcoll-core: 22.0.0 -> 23.0.0 --- pkgs/development/libraries/ada/gnatcoll/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/development/libraries/ada/gnatcoll/core.nix index 690361bb1119..171e9b99eec3 100644 --- a/pkgs/development/libraries/ada/gnatcoll/core.nix +++ b/pkgs/development/libraries/ada/gnatcoll/core.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gnatcoll-core"; - version = "22.0.0"; + version = "23.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-core"; rev = "v${version}"; - sha256 = "0fn28dp6bgpp1sshr09m1x85g2gx11xqkiy410hiicfyg5hamh1l"; + sha256 = "11q66xszqvpc9jyyzivcakik27d23yniahjdznb47wyqkxphm1dl"; }; nativeBuildInputs = [ From 30908712726f2647823daaddab1262b14a13f454 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 13 Nov 2022 14:14:09 +0100 Subject: [PATCH 41/43] gnatcoll-{sql*,postgres,xref,db2ada}, gnatinspect: 22.0.0 -> 23.0.0 --- pkgs/development/libraries/ada/gnatcoll/db.nix | 11 ++--------- .../gnatcoll-db-sqlite-static-external.patch | 18 ------------------ 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/libraries/ada/gnatcoll/db.nix index 6c87d63063fa..c064ff277de5 100644 --- a/pkgs/development/libraries/ada/gnatcoll/db.nix +++ b/pkgs/development/libraries/ada/gnatcoll/db.nix @@ -51,22 +51,15 @@ in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "22.0.0"; + version = "23.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-db"; rev = "v${version}"; - sha256 = "1c39yg13faadg5mzpq3s83rn24npmpc4yjj0cvj7kqwpqxci4m55"; + sha256 = "1j77ina17myahlsvbyiycgxkncd7ijc7jrvzwa4gagx0fwjk7prh"; }; - patches = lib.optionals (component == "sqlite") [ - # fixes build of the static sqlite component - # when building against the system libsqlite3 - # See https://github.com/AdaCore/gprbuild/issues/27#issuecomment-298444608 - ./gnatcoll-db-sqlite-static-external.patch - ]; - # Link executables dynamically unless specified by the platform, # as we usually do in nixpkgs where possible postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' diff --git a/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch b/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch deleted file mode 100644 index f67837d7d516..000000000000 --- a/pkgs/development/libraries/ada/gnatcoll/gnatcoll-db-sqlite-static-external.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/sqlite/gnatcoll_sqlite.gpr b/sqlite/gnatcoll_sqlite.gpr -index 5bd53d35..580739f8 100644 ---- a/sqlite/gnatcoll_sqlite.gpr -+++ b/sqlite/gnatcoll_sqlite.gpr -@@ -69,7 +69,12 @@ project GnatColl_Sqlite is - for Source_Dirs use (".", "amalgamation"); - when "external" => - for Source_Dirs use ("."); -- for Library_Options use ("-lsqlite3") & Thread_Lib; -+ case Library_Type is -+ when "relocatable" => -+ for Library_Options use ("-lsqlite3") & Thread_Lib; -+ when others => -+ null; -+ end case; - end case; - - package Compiler is From 35b623b82b7ac751a76ba32d26f21a2d340da102 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 13 Nov 2022 14:14:31 +0100 Subject: [PATCH 42/43] gnatcoll-{lzma,gmp,iconv,omp,python3,readline,syslog,zlib}: 22.0.0 -> 23.0.0 --- .../libraries/ada/gnatcoll/bindings.nix | 8 ++----- .../ada/gnatcoll/omp-setup-text-mode.patch | 23 ------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/libraries/ada/gnatcoll/bindings.nix index fb2a744be7fb..9d22551b32a9 100644 --- a/pkgs/development/libraries/ada/gnatcoll/bindings.nix +++ b/pkgs/development/libraries/ada/gnatcoll/bindings.nix @@ -33,19 +33,15 @@ in stdenv.mkDerivation rec { pname = "gnatcoll-${component}"; - version = "22.0.0"; + version = "23.0.0"; src = fetchFromGitHub { owner = "AdaCore"; repo = "gnatcoll-bindings"; rev = "v${version}"; - sha256 = "0wbwnd6jccwfd4jdxbnzhc0jhm8ad4phz6y9b1gk8adykkk6jcz4"; + sha256 = "1jnnfsvll4jh6ip0fww4mh2cm61h7dzpxz3zaa2psrc1w54x34nn"; }; - patches = [ - ./omp-setup-text-mode.patch - ]; - nativeBuildInputs = [ gprbuild gnat diff --git a/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch b/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch deleted file mode 100644 index 07953809bb20..000000000000 --- a/pkgs/development/libraries/ada/gnatcoll/omp-setup-text-mode.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 37c815ee660d1bf37256638d23b0346ad7cc19e7 -Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> -Date: Wed Jul 21 00:18:30 2021 +0200 - - omp/setup.py: open version_information in text mode - - Otherwise saving the config in setup_support.py will fail as a bytes - object is not encodeable as JSON. Luckily, version_information is text - anyways. - -diff --git a/omp/setup.py b/omp/setup.py -index 942ab1f5..5281398e 100755 ---- a/omp/setup.py -+++ b/omp/setup.py -@@ -25,7 +25,7 @@ class GNATCollOMP(SetupApp): - - # Set library version - with open(os.path.join(config.source_dir, '..', -- 'version_information'), 'rb') as fd: -+ 'version_information'), 'r') as fd: - version = fd.read().strip() - config.set_data('GNATCOLL_VERSION', version, sub='gprbuild') - From 14e0c0dba242ec4acd2b29769d27434e896c65a4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 14 Nov 2022 13:06:33 +0100 Subject: [PATCH 43/43] gnatinspect, gnatcoll-db2ada: drop gnatcoll- prefix from pname --- pkgs/development/libraries/ada/gnatcoll/db.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/libraries/ada/gnatcoll/db.nix index c064ff277de5..6b4ce3677d1f 100644 --- a/pkgs/development/libraries/ada/gnatcoll/db.nix +++ b/pkgs/development/libraries/ada/gnatcoll/db.nix @@ -50,7 +50,11 @@ let in stdenv.mkDerivation rec { - pname = "gnatcoll-${component}"; + # executables don't adhere to the string gnatcoll-* scheme + pname = + if onlyExecutable + then builtins.replaceStrings [ "_" ] [ "-" ] component + else "gnatcoll-${component}"; version = "23.0.0"; src = fetchFromGitHub {