b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-12-18 06:01:57 +00:00 committed by GitHub
parent d1e6365b21 c690fb1ecd
commit 8d45187fd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 1204 additions and 1170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/hardware/spacenavd.nix
View file

@ -15,7 +15,6 @@ in {
config = mkIf cfg.enable {
systemd.user.services.spacenavd = {
description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion";
after = [ "syslog.target" ];
wantedBy = [ "graphical.target" ];
serviceConfig = {
ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog";

7
pkgs/applications/kde/akonadi/default.nix
View file

@ -36,4 +36,11 @@ mkDerivation {
''-DNIX_OUT=\"${placeholder "out"}\"''
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
];
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
postInstall = ''
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
'';
}

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.0/src -A '*.tar.xz' )

12
pkgs/applications/kde/kitinerary.nix
View file

@ -1,6 +1,5 @@
{
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
{ mkDerivation, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
}:
@ -16,8 +15,13 @@ mkDerivation {
shared-mime-info # for update-mime-database
];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
qtdeclarative kmime kpkpass poppler
kcontacts kcalendarcore
];
CXXFLAGS = [
"-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory
];
outputs = [ "out" "dev" ];
}

15
pkgs/applications/kde/krfb.nix
View file

@ -1,10 +1,9 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui,
libvncserver, libXtst, libXdamage,
qtx11extras
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
, libvncserver, libXtst, libXdamage
, qtx11extras
}:
mkDerivation {
@ -19,7 +18,7 @@ mkDerivation {
buildInputs = [
libvncserver libXtst libXdamage
kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
kwindowsystem kxmlgui
kwindowsystem kxmlgui kwayland
qtx11extras
];
propagatedBuildInputs = [ kdnssd ];

13
pkgs/applications/kde/picmi.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib
{ mkDerivation, lib, fetchpatch
, libkdegames, extra-cmake-modules
, kdeclarative, knewstuff
}:
@ -15,6 +15,17 @@ mkDerivation {
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
patches = [
# fix compile error due to usage of deprecated things
# probably can be removed with the next kde bump
(fetchpatch {
url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
revert = true;
sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
})
];
nativeBuildInputs = [
extra-cmake-modules
];

1840
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -197,8 +197,8 @@ rec {
};
terraform_1 = mkTerraform {
version = "1.1.1";
sha256 = "sha256-JHwHxFpAUVnm9QlfSYrBELrgct0RkjS7OQb6gKEAsCA=";
version = "1.1.2";
sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww=";
vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };

30
pkgs/applications/office/zanshin/default.nix
View file

@ -1,55 +1,31 @@
{ mkDerivation
, lib
, fetchurl
, fetchpatch
, extra-cmake-modules
, qtbase
, boost
, akonadi-calendar
, akonadi-notes
, akonadi-search
, kidentitymanagement
, kontactinterface
, kldap
, krunner
, kwallet
, kcalendarcore
}:
mkDerivation rec {
pname = "zanshin";
version = "0.5.71";
version = "21.12.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0=";
};
patches = [
# Build with kontactinterface >= 5.14.42.
# Remove after next release.
(fetchpatch {
url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
})
];
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
qtbase
boost
akonadi-calendar
akonadi-notes
akonadi-search
kidentitymanagement
kontactinterface
kldap
krunner
kwallet
kcalendarcore
];
meta = with lib; {

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.3/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.4/ -A '*.tar.xz' )

424
pkgs/desktops/plasma-5/srcs.nix
View file

@ -4,427 +4,427 @@
{
bluedevil = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/bluedevil-5.23.3.tar.xz";
sha256 = "1n6h2m4z67vl0mv0hs0g5xff1vcj03w0nhx4hkhy66hly556nq8x";
name = "bluedevil-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/bluedevil-5.23.4.tar.xz";
sha256 = "13sxwsks7gnws13jhk8428npzdyhvv5yhczzayi5yd3856d3g4av";
name = "bluedevil-5.23.4.tar.xz";
};
};
breeze = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/breeze-5.23.3.tar.xz";
sha256 = "1514y4k52bc71nljihj655d7swk2qvr168i0j2xqcm0w4aiz4jmv";
name = "breeze-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/breeze-5.23.4.tar.xz";
sha256 = "1wbhir9g2gfwcvw0ib50qhqk0rgfji8wjipqqp7ddsm463ykp472";
name = "breeze-5.23.4.tar.xz";
};
};
breeze-grub = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/breeze-grub-5.23.3.tar.xz";
sha256 = "1nwhjw0nkdg94znh7h80byrq8vpa1f20ph1m4fhlj233nfskw0zy";
name = "breeze-grub-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/breeze-grub-5.23.4.tar.xz";
sha256 = "1zkl8ddbdnckz4glaf0j6vkxf1z63d5q9nx0w64d17qydp1fwxjq";
name = "breeze-grub-5.23.4.tar.xz";
};
};
breeze-gtk = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/breeze-gtk-5.23.3.tar.xz";
sha256 = "0wq313laj7nlsw3d6p1prq1d4gic5lz2ipklj4dq4vsvsh99ggvn";
name = "breeze-gtk-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/breeze-gtk-5.23.4.tar.xz";
sha256 = "0jv064y7wlvglk0w2yx1zwnxjhczi9gq6cfnz004z18rlqwnz9pq";
name = "breeze-gtk-5.23.4.tar.xz";
};
};
breeze-plymouth = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/breeze-plymouth-5.23.3.tar.xz";
sha256 = "047clfgqcrplwi3158pw1r868yyqlxs7iqqy861wzlsmjz9qzqdl";
name = "breeze-plymouth-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/breeze-plymouth-5.23.4.tar.xz";
sha256 = "1qc8pnhhl89bqwyh215cn92qahw8k8gx7zr14rwxqjn9hxf9jxxy";
name = "breeze-plymouth-5.23.4.tar.xz";
};
};
discover = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/discover-5.23.3.tar.xz";
sha256 = "056wcvk44r11rycnn12xf8r5psxqnm0f6i6z6nc5100sqkhip6p0";
name = "discover-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/discover-5.23.4.tar.xz";
sha256 = "0z5bp7p3f470i4x5796raawx7kjg1ca453y63wn9papdbiyl4iiz";
name = "discover-5.23.4.tar.xz";
};
};
drkonqi = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/drkonqi-5.23.3.tar.xz";
sha256 = "14yc6nq3z6jm8siq2r15nzsqxpawk5iqy9ghmmwy9xa4vf18dxy5";
name = "drkonqi-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/drkonqi-5.23.4.tar.xz";
sha256 = "073vdclybx83dpvvqb3rc413k3nh50nil8rcig4kqm0gzjhp3qdb";
name = "drkonqi-5.23.4.tar.xz";
};
};
kactivitymanagerd = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kactivitymanagerd-5.23.3.tar.xz";
sha256 = "0rizk05v19qqymrjh7vswcp80a4rpyffmq7kg88pv5k11fcjqw5b";
name = "kactivitymanagerd-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kactivitymanagerd-5.23.4.tar.xz";
sha256 = "1m0rbv8pkswkzfvbf231vn2c8x507ymc07kd0dw03np8h8zs5vbz";
name = "kactivitymanagerd-5.23.4.tar.xz";
};
};
kde-cli-tools = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kde-cli-tools-5.23.3.tar.xz";
sha256 = "0f8wab6n4klxj4yy4l4k3q3pdqlz9718mbjydnsmn1jgn20shsa0";
name = "kde-cli-tools-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kde-cli-tools-5.23.4.tar.xz";
sha256 = "0ay320b3ixlicd8d1rjngkbxspmpk7rd8g562dv0c54hk73q61gj";
name = "kde-cli-tools-5.23.4.tar.xz";
};
};
kde-gtk-config = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kde-gtk-config-5.23.3.tar.xz";
sha256 = "12w2jv0mi39c2g1w3g3c68m80ailcm98hibk1mg885r36gx9kskb";
name = "kde-gtk-config-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kde-gtk-config-5.23.4.tar.xz";
sha256 = "0537vk4wdvgz7jl0qkksf38bra5fdk6d0z6lnwm5v4fapdysbry9";
name = "kde-gtk-config-5.23.4.tar.xz";
};
};
kdecoration = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kdecoration-5.23.3.tar.xz";
sha256 = "134jmp5l2bvl042a5a1f1d66mqi4g7vrpmrn3gi7ysi34w1ylfc8";
name = "kdecoration-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kdecoration-5.23.4.tar.xz";
sha256 = "0s80dhbba458yr85m6yfv7m5jkkn0xqzp42nhhaj4m9hh36bbd9s";
name = "kdecoration-5.23.4.tar.xz";
};
};
kdeplasma-addons = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kdeplasma-addons-5.23.3.tar.xz";
sha256 = "139wzfj21k32m36014sas3ad5qdc0df4131ckj1shlz882w4l3dw";
name = "kdeplasma-addons-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kdeplasma-addons-5.23.4.tar.xz";
sha256 = "1j7xd2p8a8xi69sh91hldyajqg77lx5bla1vjg65f7yqz903bp4h";
name = "kdeplasma-addons-5.23.4.tar.xz";
};
};
kgamma5 = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kgamma5-5.23.3.tar.xz";
sha256 = "06wzcpsjqy5pw3s6qg32l6qg9jf61bbpjwh802182balfq2jl0y5";
name = "kgamma5-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kgamma5-5.23.4.tar.xz";
sha256 = "1b3m812xxcya0gf665m8crpmwq91mkq28jkcjaavknr9dd22dkyk";
name = "kgamma5-5.23.4.tar.xz";
};
};
khotkeys = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/khotkeys-5.23.3.tar.xz";
sha256 = "1ccjlr3q1lsmmdmh30wbrdaardvhivdzm9vrd46d301rdz6gyv86";
name = "khotkeys-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/khotkeys-5.23.4.tar.xz";
sha256 = "1fsll3cp6z763wp65iwqz244hzq0qlm4007jpxgd4gasbrd5zfg8";
name = "khotkeys-5.23.4.tar.xz";
};
};
kinfocenter = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kinfocenter-5.23.3.tar.xz";
sha256 = "09yz5grzwzgs1cg39j18zy7af8azy2lbg4bkkmh7wayv8pngj4gv";
name = "kinfocenter-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kinfocenter-5.23.4.tar.xz";
sha256 = "0z3hwq5qjkrcxn0smgi7x49mcyixm1apjd4f16q0z40sn7sdybad";
name = "kinfocenter-5.23.4.tar.xz";
};
};
kmenuedit = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kmenuedit-5.23.3.tar.xz";
sha256 = "006kkg7jzwp4icik1hv95wcpw5sb1l1s94wnljvxdfdjkgzjxq55";
name = "kmenuedit-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kmenuedit-5.23.4.tar.xz";
sha256 = "1iildwnhkvg2i2yhp6zl7m77fpa8vs7hhv8wjma3vbr2gh808nck";
name = "kmenuedit-5.23.4.tar.xz";
};
};
kscreen = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kscreen-5.23.3.tar.xz";
sha256 = "1x4qlycb1dxw36s3zyyrjfmfvwvwk8f8r0jls6hq8gqkl810abhw";
name = "kscreen-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kscreen-5.23.4.tar.xz";
sha256 = "0sa9xvyz42c69aqnn2bm3j1hq87n2nk5yawppl7csxyz91iyv3n5";
name = "kscreen-5.23.4.tar.xz";
};
};
kscreenlocker = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kscreenlocker-5.23.3.tar.xz";
sha256 = "0wjcrikx3q533qz9wi0z3jm4k0lc09w2xsxr4iw1hh3afsd6jr34";
name = "kscreenlocker-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kscreenlocker-5.23.4.tar.xz";
sha256 = "1n4gkcf74hk60fvbkb9940q5r89jbj4kwc4byi51523n038pvymf";
name = "kscreenlocker-5.23.4.tar.xz";
};
};
ksshaskpass = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/ksshaskpass-5.23.3.tar.xz";
sha256 = "0dcych5zcv8fqmy1lhwpbfzj75ihs648d8ppfr0nj15mm2pgnvhx";
name = "ksshaskpass-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/ksshaskpass-5.23.4.tar.xz";
sha256 = "1s9wbfl867fgr5md51f63fc57626zw2b637xh7qy8sn563l8y1lk";
name = "ksshaskpass-5.23.4.tar.xz";
};
};
ksystemstats = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/ksystemstats-5.23.3.tar.xz";
sha256 = "13jic16480rxhdwz0z49di19sxdi7rgvg61lg5i00w9mm6mbph3l";
name = "ksystemstats-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/ksystemstats-5.23.4.tar.xz";
sha256 = "00vs71jxqlv52absh16jyj1zryk2ib0bpd21c4qja11a3hw7j3gz";
name = "ksystemstats-5.23.4.tar.xz";
};
};
kwallet-pam = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kwallet-pam-5.23.3.tar.xz";
sha256 = "0axxk7szp5kn5hhlxh2mjzbwzaj4g1yn40ymgb6dga10h1nfdkd8";
name = "kwallet-pam-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kwallet-pam-5.23.4.tar.xz";
sha256 = "08ycniyna3hzdgzi3m61iamwid32hajb1k1m27kw16abh3ds4vx7";
name = "kwallet-pam-5.23.4.tar.xz";
};
};
kwayland-integration = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kwayland-integration-5.23.3.tar.xz";
sha256 = "01gm3xbaih22v33bd9142xnrli13yxmib42pj8rnczhczrpnc3z3";
name = "kwayland-integration-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kwayland-integration-5.23.4.tar.xz";
sha256 = "14j6iwakkmdyhf3796ap2dnfi0vdbrl3813x4ygzjyb8068a7k9g";
name = "kwayland-integration-5.23.4.tar.xz";
};
};
kwayland-server = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kwayland-server-5.23.3.tar.xz";
sha256 = "1hjh278iaz3ydf9bqy2fmm4hsvc60hrqw4hlc3ddcadp28dhg3gx";
name = "kwayland-server-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kwayland-server-5.23.4.tar.xz";
sha256 = "13cvw4i1ysw4ncdnx7c4qw29zc350wbmc29dy06b574idm5rbnrm";
name = "kwayland-server-5.23.4.tar.xz";
};
};
kwin = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kwin-5.23.3.tar.xz";
sha256 = "04w8vnz3rzd9g1j1f4fbgyxjvxqrhasx6f2vqkrrh4cd56ndmcbz";
name = "kwin-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kwin-5.23.4.tar.xz";
sha256 = "0rqim6p0r7k886mwvqy4zpz18scnah9zvjjbgx0p77f1086azvsc";
name = "kwin-5.23.4.tar.xz";
};
};
kwrited = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/kwrited-5.23.3.tar.xz";
sha256 = "0156syandkq0s76xrrcz6nkxa6jgpf1a6nbkdw0a8biyxs5md644";
name = "kwrited-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/kwrited-5.23.4.tar.xz";
sha256 = "15sixbk5i5i1jv07hj820xi4fh0b6fmb4jkv2917911wpdkdnyik";
name = "kwrited-5.23.4.tar.xz";
};
};
layer-shell-qt = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/layer-shell-qt-5.23.3.tar.xz";
sha256 = "15y7p0a59779aqxnsryqirsxslbvbig733i5s3n5jmg98y40712a";
name = "layer-shell-qt-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/layer-shell-qt-5.23.4.tar.xz";
sha256 = "0a74s7wx3jxxi1dp4j0a5dz7k45il4wjf7hf9j6cw2m5pdni1i2k";
name = "layer-shell-qt-5.23.4.tar.xz";
};
};
libkscreen = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/libkscreen-5.23.3.tar.xz";
sha256 = "0kazvsahnk7ngld12lp1c07c34x9kal03fy8g7w9bgdha3j7xmdq";
name = "libkscreen-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/libkscreen-5.23.4.tar.xz";
sha256 = "0n1xghmabhn7sb99k0zsyrbx05mbaf926hyyw9qp5rf07r8yzk2p";
name = "libkscreen-5.23.4.tar.xz";
};
};
libksysguard = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/libksysguard-5.23.3.tar.xz";
sha256 = "0ma4b0w08j0f46ivh9grci7wfh4z5j8nml83kcvnain1nwzprha0";
name = "libksysguard-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/libksysguard-5.23.4.tar.xz";
sha256 = "1xik5qaww9m26nkg804akaxbn7i7bd8ibc2v93h3p8ihkb5hh7lw";
name = "libksysguard-5.23.4.tar.xz";
};
};
milou = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/milou-5.23.3.tar.xz";
sha256 = "0myvm9bkq189cfla7yqiwmbb5z2cm90rq5ll655n2c7zk3lqnn0d";
name = "milou-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/milou-5.23.4.tar.xz";
sha256 = "15wniaj9zprhvly6krxl5847q8kh8m8z5sr2wj816n70hh1y58f8";
name = "milou-5.23.4.tar.xz";
};
};
oxygen = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/oxygen-5.23.3.tar.xz";
sha256 = "0r79xadvg7l4nsziy78wydhn4f0223fjc2xd60zih1dwmgapgf0z";
name = "oxygen-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/oxygen-5.23.4.tar.xz";
sha256 = "0b4rhf9500jhx73xw4ghqifgkfr527n2isiiys8g7m23ya38pbxz";
name = "oxygen-5.23.4.tar.xz";
};
};
plasma-browser-integration = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-browser-integration-5.23.3.tar.xz";
sha256 = "0r3sq6w73qn246nddf4f8lbym8k4wp2ycfr2laz888b5cjf9df97";
name = "plasma-browser-integration-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-browser-integration-5.23.4.tar.xz";
sha256 = "004406s80i0gv1ga151ws7sny4l3y74swawdgd1swmvkjg2ii909";
name = "plasma-browser-integration-5.23.4.tar.xz";
};
};
plasma-desktop = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-desktop-5.23.3.tar.xz";
sha256 = "01259pqncx3gcpanrmhal51dn4y8xcrs16pl5bjnasdn9r8mlhs3";
name = "plasma-desktop-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-desktop-5.23.4.tar.xz";
sha256 = "1p48sl6zyra1iyri9zrx88wka9fbzgyhkd9m7r4nqa8h0v5p12as";
name = "plasma-desktop-5.23.4.tar.xz";
};
};
plasma-disks = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-disks-5.23.3.tar.xz";
sha256 = "1qwxhasmycn6ah2pv46z8vvls85lfwxm4z61q13l63a50489a05b";
name = "plasma-disks-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-disks-5.23.4.tar.xz";
sha256 = "0sgfwqyn539nd6s23nix3igf7z87sn3dn9zp8w2fy488vmm1pdmi";
name = "plasma-disks-5.23.4.tar.xz";
};
};
plasma-firewall = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-firewall-5.23.3.tar.xz";
sha256 = "0kqb7sxysh6gq143rmmznv95mx4275bp1xfrlys518yn97clnwqq";
name = "plasma-firewall-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-firewall-5.23.4.tar.xz";
sha256 = "040w85ml5rh0l95l744576s3kb00niyr72q4pvf5xj98df1h89aw";
name = "plasma-firewall-5.23.4.tar.xz";
};
};
plasma-integration = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-integration-5.23.3.tar.xz";
sha256 = "0q53b43yl5s1pvlqpmic2x8q5inawk66n8wng7rzgcfv9d3imhrn";
name = "plasma-integration-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-integration-5.23.4.tar.xz";
sha256 = "0b4rvfnd40xgvgab81p9qjgdpjww673nlaiklwrkrqmv41m0yy33";
name = "plasma-integration-5.23.4.tar.xz";
};
};
plasma-nano = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-nano-5.23.3.tar.xz";
sha256 = "0ijygajn78c97s8ys8m2zn52zx45kxhk857hppkxp4jqpd5psf34";
name = "plasma-nano-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-nano-5.23.4.tar.xz";
sha256 = "1kw77w00261dmp2w0jvaslamia215mlhd3nnl0wr39p5vhlym70p";
name = "plasma-nano-5.23.4.tar.xz";
};
};
plasma-nm = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-nm-5.23.3.tar.xz";
sha256 = "157almdi3br1qdfr0lwfdwc60fbizkwmpw3j2czk2sdsvm58rhgf";
name = "plasma-nm-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-nm-5.23.4.tar.xz";
sha256 = "0c4gfdyzac67yxjvz75mxd61wacnsa01liaajdyj853bn7wkx294";
name = "plasma-nm-5.23.4.tar.xz";
};
};
plasma-pa = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-pa-5.23.3.tar.xz";
sha256 = "0md3vb2iffn4qdnj4msyn6j3hvidnsxzp2dfsnb3n0yp29niwxqk";
name = "plasma-pa-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-pa-5.23.4.tar.xz";
sha256 = "0g4q0y4sr14xsi71mv5qgn6qj8svmd045ff73hf34pb15qvdq0a7";
name = "plasma-pa-5.23.4.tar.xz";
};
};
plasma-phone-components = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-phone-components-5.23.3.tar.xz";
sha256 = "1w8yqczr0933vhca5id32vg1k2np6n6hkh58n4x3z3xpdxpb5d4c";
name = "plasma-phone-components-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-phone-components-5.23.4.tar.xz";
sha256 = "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9";
name = "plasma-phone-components-5.23.4.tar.xz";
};
};
plasma-sdk = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-sdk-5.23.3.tar.xz";
sha256 = "0fb9g6vhsaxd6h6889jyhnxp86g7rwkmyiafq72hx6ikv69wyvbi";
name = "plasma-sdk-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-sdk-5.23.4.tar.xz";
sha256 = "1cbsksjy9x3jlk8bzd9m1zgr83rzkwv0jd015fap707ysdil1ypk";
name = "plasma-sdk-5.23.4.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-systemmonitor-5.23.3.tar.xz";
sha256 = "1jlgfrkdw785x9bib2hzxjyd70b9aqgcp1w6lk75bhgkrz85kz8p";
name = "plasma-systemmonitor-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-systemmonitor-5.23.4.tar.xz";
sha256 = "16kfpzm8bhxyl9jx5xqbas4cm99sny4b2n6i27hc7ggjgx9r3j31";
name = "plasma-systemmonitor-5.23.4.tar.xz";
};
};
plasma-tests = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-tests-5.23.3.tar.xz";
sha256 = "1fgl09c0ir8w128z4l0bggszjsvsqncb42k44vn6i6d0qdisxdgh";
name = "plasma-tests-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-tests-5.23.4.tar.xz";
sha256 = "1vnihnrxgbrk224xxpisqj84hjbllyk32vsra2rbgrwp2g58fh69";
name = "plasma-tests-5.23.4.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-thunderbolt-5.23.3.tar.xz";
sha256 = "0vzdzsl6isg24j0830lg7is47kpmpvsni7gf4vri2l8a6fy7ibav";
name = "plasma-thunderbolt-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-thunderbolt-5.23.4.tar.xz";
sha256 = "0g5n24qwm6yd78rg14d6j2hn0krn0z0fm6bpyzr54ycrgiv850zz";
name = "plasma-thunderbolt-5.23.4.tar.xz";
};
};
plasma-vault = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-vault-5.23.3.tar.xz";
sha256 = "061zq00mz1aamam4pc4kbbzdx4mi07iiach6w52n0c9d1bz16ym2";
name = "plasma-vault-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-vault-5.23.4.tar.xz";
sha256 = "1ay9x7kbgb5qg7w1m1rp9xbp8dzsxdj7zh2ifk3lff1g5f3yh9y6";
name = "plasma-vault-5.23.4.tar.xz";
};
};
plasma-workspace = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-5.23.3.tar.xz";
sha256 = "0mz2aanm46s88lwm1s2nwm8yfanj78rnx1y14ppzm4dx0lrjx046";
name = "plasma-workspace-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-5.23.4.tar.xz";
sha256 = "0kd37sfg8hbf8biia3ip89nx0jgrdgfprmda392gx5xfzbnlxv0k";
name = "plasma-workspace-5.23.4.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plasma-workspace-wallpapers-5.23.3.tar.xz";
sha256 = "1kz4xqzgwnhp1wmqmgadn0jjc9033i2bm8hiycqkahhj603k552s";
name = "plasma-workspace-wallpapers-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plasma-workspace-wallpapers-5.23.4.tar.xz";
sha256 = "157kbi40bv9arxq7cvgxypk1qmrpd52d76xq99rsfbzdfrggx9nc";
name = "plasma-workspace-wallpapers-5.23.4.tar.xz";
};
};
plymouth-kcm = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/plymouth-kcm-5.23.3.tar.xz";
sha256 = "1fa26h19g4f2fhpisp1jsl1niis50fbkdss7j1nqg44jih0g0qyf";
name = "plymouth-kcm-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/plymouth-kcm-5.23.4.tar.xz";
sha256 = "11f2r4nq7pi8xn3z6zjc58ix5hj3das16xqvq7m82p8zvw2qs44p";
name = "plymouth-kcm-5.23.4.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.23.3";
version = "1-5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/polkit-kde-agent-1-5.23.3.tar.xz";
sha256 = "1r5sqxzj5r9xqn3iwsfj06f1w69q41j4wq2z11kndnjad0pwrf3r";
name = "polkit-kde-agent-1-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/polkit-kde-agent-1-5.23.4.tar.xz";
sha256 = "06qjz87c2h0vgpk0jpf24194rahdrwpc274k6vmfkmbr5232w48h";
name = "polkit-kde-agent-1-5.23.4.tar.xz";
};
};
powerdevil = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/powerdevil-5.23.3.tar.xz";
sha256 = "0hcb22dy4hslzrk3md6amzm51hlmv08747f34x5drdl10cg98mzb";
name = "powerdevil-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/powerdevil-5.23.4.tar.xz";
sha256 = "1sl62vm25libbx2l2kw7s9p44kdq561gh8an03vkf1q1qgrnpwsf";
name = "powerdevil-5.23.4.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/qqc2-breeze-style-5.23.3.tar.xz";
sha256 = "0716mw6dgpzwkaiinp8vphvxj3vrb95v7zckh4pgdky8ahxv655l";
name = "qqc2-breeze-style-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/qqc2-breeze-style-5.23.4.tar.xz";
sha256 = "1wl8zxq7bca6v40mnwjnpxc3pzz30khc223y9dwpgy8ampvy2ghr";
name = "qqc2-breeze-style-5.23.4.tar.xz";
};
};
sddm-kcm = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/sddm-kcm-5.23.3.tar.xz";
sha256 = "0sb9sjdbhafjcx2nf2ffzjh14gyambj1w32gjz29fl15xjbmvqnr";
name = "sddm-kcm-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/sddm-kcm-5.23.4.tar.xz";
sha256 = "148vf9af4fhma0w6v7wwlxpq8v8a858yx3qx7w0pg8jq5zd1k6g2";
name = "sddm-kcm-5.23.4.tar.xz";
};
};
systemsettings = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/systemsettings-5.23.3.tar.xz";
sha256 = "0i8vc1y95jd3g5vcgzixd73mn1r9s2jg9ix5nwfq4i5ihi0a0ph1";
name = "systemsettings-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/systemsettings-5.23.4.tar.xz";
sha256 = "0naw5zxgs47nx5wwg1li35salyg2cfpaphhn5m20plwqfi43zbdw";
name = "systemsettings-5.23.4.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.23.3";
version = "5.23.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.23.3/xdg-desktop-portal-kde-5.23.3.tar.xz";
sha256 = "1aajlgccl1z9m49a016ixr2hiy231wyx6xnmpbvjx9h1b52b3rpz";
name = "xdg-desktop-portal-kde-5.23.3.tar.xz";
url = "${mirror}/stable/plasma/5.23.4/xdg-desktop-portal-kde-5.23.4.tar.xz";
sha256 = "17n5d4rjm28in7jpsq2qg2d7lv3qcnlpmgi9kclx81miih9rjwan";
name = "xdg-desktop-portal-kde-5.23.4.tar.xz";
};
};
}

3
pkgs/development/libraries/caf/default.nix
View file

@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
'';
# error: 'get< ... >' is unavailable: introduced in macOS 10.13
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
meta = with lib; {
description = "An open source implementation of the actor model in C++";
homepage = "http://actor-framework.org/";

2
pkgs/development/libraries/gsl/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";
# https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux";
doCheck = stdenv.hostPlatform.system != "i686-linux";
meta = {
description = "The GNU Scientific Library, a large numerical library";

16
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -19,10 +19,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "495.44";
sha256_64bit = "0j4agxfdswadxkd9hz9j5cq4q3jmhwdnvqclxxkhl5jvh5knm1zi";
settingsSha256 = "0v8gqbhjsjjsc83cqacikj9bvs10bq6i34ca8l07zvsf8hfr2ziz";
persistencedSha256 = "19rv7vskv61q4gh59nyrfyqyqi565wzjbcfddp8wfvng4dcy18ld";
version = "495.46";
sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU=";
settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk=";
persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI=";
}
else legacy_390;
@ -54,10 +54,10 @@ rec {
# Last one supporting Kepler architecture
legacy_470 = generic {
version = "470.86";
sha256_64bit = "sha256:0krwcxc0j19vjnk8sv6mx1lin2rm8hcfhc2hg266846jvcws1dsg";
settingsSha256 = "sha256:1lnj5hwmfkzs664fxlhljqy323394s1i7qzlpsjyrpm07sa93bky";
persistencedSha256 = "sha256:0apj764zc81ayb8nm9bf7cdicfinarv0gfijy2dxynbwz2xdlyvq";
version = "470.94";
sha256_64bit = "lYWqKTMOutm98izjyiusICbIWpoy8D18WfcUp3mFAOs=";
settingsSha256 = "blJNKuFu/Th/ceexkKhTH/eYk8miUlTT+ESrcIyJNn0=";
persistencedSha256 = "xnccQ/EgafwnReBlk5Y7iClAj4hwXyFq9gUmwqyEuwE=";
};
# Last one supporting x86

3
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
View file

@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
# main.cpp:498:12: error: 'is_directory' is unavailable: introduced in macOS 10.15
CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
preFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib"
'';