JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'plasma53'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-07-18 12:33:03 -05:00
commit 6054c837e0
4 changed files with 161 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/plasma-5.3/default.nix
View File

@ -124,8 +124,8 @@ let
} //
# packages from nixpkgs
(with pkgs; {
inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype
glib gnugrep gnused gtk2 gtk3 libinput libssh
inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xlibs xorg;
@ -233,7 +233,7 @@ let
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
inherit (scope) bash gnused gnugrep socat;
inherit (scope) bash coreutils gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools;

288
pkgs/desktops/plasma-5.3/packages.json
View File

@ -8,11 +8,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "bluez-qt-5.3.1",
"name": "bluez-qt-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz",
"name": "bluez-qt-5.3.1.tar.xz",
"sha256": "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"
"url": "stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz",
"name": "bluez-qt-5.3.2.tar.xz",
"sha256": "0bc9pi8zbfh66h3p9i76hq1jh7ygavax3zw2wygl269f1k92brlh"
},
"buildInputs": [
"ecm",
@ -32,11 +32,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kmenuedit-5.3.1",
"name": "kmenuedit-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz",
"name": "kmenuedit-5.3.1.tar.xz",
"sha256": "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"
"url": "stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz",
"name": "kmenuedit-5.3.2.tar.xz",
"sha256": "13nsjh698h09ai6b7r8zi2hlkkxfv8c00b5b6dl0pb2b474a16di"
},
"buildInputs": [
"ecm",
@ -62,11 +62,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-nm-5.3.1",
"name": "plasma-nm-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz",
"name": "plasma-nm-5.3.1.tar.xz",
"sha256": "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"
"url": "stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz",
"name": "plasma-nm-5.3.2.tar.xz",
"sha256": "0w3cs66rn7k4fzsr7qihzcgxjwmp2safnfr78lp69md59clc45ag"
},
"buildInputs": [
"ecm",
@ -112,11 +112,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "khotkeys-5.3.1",
"name": "khotkeys-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz",
"name": "khotkeys-5.3.1.tar.xz",
"sha256": "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"
"url": "stable/plasma/5.3.2/khotkeys-5.3.2.tar.xz",
"name": "khotkeys-5.3.2.tar.xz",
"sha256": "0f7z6vwkmi54jbvvqgyxn1mvh1gjwmrihj3afd4w7zd4cbyf61ka"
},
"buildInputs": [
"ecm",
@ -142,11 +142,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-workspace-wallpapers-5.3.1",
"name": "plasma-workspace-wallpapers-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz",
"name": "plasma-workspace-wallpapers-5.3.1.tar.xz",
"sha256": "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"
"url": "stable/plasma/5.3.2/plasma-workspace-wallpapers-5.3.2.tar.xz",
"name": "plasma-workspace-wallpapers-5.3.2.tar.xz",
"sha256": "1h3w824dv5yyjz6l9vsi6lddlb5xxmmaqdvvacz7qypy06f808aa"
},
"buildInputs": [
"ecm"
@ -159,11 +159,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kscreen-5.3.1",
"name": "kscreen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kscreen-5.3.1.tar.xz",
"name": "kscreen-5.3.1.tar.xz",
"sha256": "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"
"url": "stable/plasma/5.3.2/kscreen-5.3.2.tar.xz",
"name": "kscreen-5.3.2.tar.xz",
"sha256": "15dnraav3sn5rcz88nj3h6n95w4jiynn45n29pfv7yc3p41yahwd"
},
"buildInputs": [
"ecm",
@ -187,11 +187,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "oxygen-fonts-5.3.1",
"name": "oxygen-fonts-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz",
"name": "oxygen-fonts-5.3.1.tar.xz",
"sha256": "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"
"url": "stable/plasma/5.3.2/oxygen-fonts-5.3.2.tar.xz",
"name": "oxygen-fonts-5.3.2.tar.xz",
"sha256": "0x78fbllqd8ssxlr2d0xy76pvr4v6f5xans4mvr3f3aa6xhr05ya"
},
"buildInputs": [
"ecm"
@ -204,11 +204,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "breeze-5.3.1",
"name": "breeze-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/breeze-5.3.1.tar.xz",
"name": "breeze-5.3.1.tar.xz",
"sha256": "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"
"url": "stable/plasma/5.3.2/breeze-5.3.2.tar.xz",
"name": "breeze-5.3.2.tar.xz",
"sha256": "0rnw5cblz6rdcx4n6x2wwr0blrk2xlkkq1gsbr06c969hp9gq4iy"
},
"buildInputs": [
"ecm",
@ -239,11 +239,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "oxygen-5.3.1",
"name": "oxygen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/oxygen-5.3.1.tar.xz",
"name": "oxygen-5.3.1.tar.xz",
"sha256": "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"
"url": "stable/plasma/5.3.2/oxygen-5.3.2.tar.xz",
"name": "oxygen-5.3.2.tar.xz",
"sha256": "19z18n7zq8616r1dwvnw0s73wxh114d3z952x3p3z42dhl0lkrw0"
},
"buildInputs": [
"ecm",
@ -278,11 +278,11 @@
"propagatedBuildInputs": [
"kf5sysguard"
],
"name": "plasma-workspace-5.3.1",
"name": "plasma-workspace-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz",
"name": "plasma-workspace-5.3.1.tar.xz",
"sha256": "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"
"url": "stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz",
"name": "plasma-workspace-5.3.2.tar.xz",
"sha256": "1i2lz9acxl63nd6nlvgvnv7lm3nq4bvj2kyj2lmd97f5xx3sara1"
},
"buildInputs": [
"dbusmenu-qt5",
@ -351,11 +351,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kwrited-5.3.1",
"name": "kwrited-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwrited-5.3.1.tar.xz",
"name": "kwrited-5.3.1.tar.xz",
"sha256": "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"
"url": "stable/plasma/5.3.2/kwrited-5.3.2.tar.xz",
"name": "kwrited-5.3.2.tar.xz",
"sha256": "1h499rpp7jss5vikapm1247xn1bg5axq4bwwfr6frlyq03vcpga1"
},
"buildInputs": [
"ecm",
@ -378,11 +378,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "plasma-desktop-5.3.1",
"name": "plasma-desktop-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz",
"name": "plasma-desktop-5.3.1.tar.xz",
"sha256": "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"
"url": "stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz",
"name": "plasma-desktop-5.3.2.tar.xz",
"sha256": "190g0nmm97a0403nvyp1478fpk8r3d7jkxpg0mif9nvws25qfvz1"
},
"buildInputs": [
"boost",
@ -457,11 +457,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "systemsettings-5.3.1",
"name": "systemsettings-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz",
"name": "systemsettings-5.3.1.tar.xz",
"sha256": "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"
"url": "stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz",
"name": "systemsettings-5.3.2.tar.xz",
"sha256": "0lgl15hfr3na3v1dry8r5bd7z3d8jlrzh6a3avq9l9297lwfgaxd"
},
"buildInputs": [
"ecm",
@ -491,11 +491,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "libkscreen-5.3.1",
"name": "libkscreen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz",
"name": "libkscreen-5.3.1.tar.xz",
"sha256": "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"
"url": "stable/plasma/5.3.2/libkscreen-5.3.2.tar.xz",
"name": "libkscreen-5.3.2.tar.xz",
"sha256": "1k6j4nxy41d2jgwydi0ah2v0idn6zhb1lmxziyrcshqpklhwiff2"
},
"buildInputs": [
"doxygen",
@ -517,11 +517,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-sdk-5.3.1",
"name": "plasma-sdk-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz",
"name": "plasma-sdk-5.3.1.tar.xz",
"sha256": "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"
"url": "stable/plasma/5.3.2/plasma-sdk-5.3.2.tar.xz",
"name": "plasma-sdk-5.3.2.tar.xz",
"sha256": "13vkxbayxggj4bx1l40rspck59j4l736gr5hg0sd1j7hmlwcys2z"
},
"buildInputs": [
"activeapp",
@ -570,11 +570,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kwin-5.3.1",
"name": "kwin-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwin-5.3.1.tar.xz",
"name": "kwin-5.3.1.tar.xz",
"sha256": "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"
"url": "stable/plasma/5.3.2/kwin-5.3.2.tar.xz",
"name": "kwin-5.3.2.tar.xz",
"sha256": "0p2pf6aq9zy0l4f7px2p0wj1kfgax8qjmal6yn3mifx1al244xvz"
},
"buildInputs": [
"ecm",
@ -633,11 +633,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kdeplasma-addons-5.3.1",
"name": "kdeplasma-addons-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz",
"name": "kdeplasma-addons-5.3.1.tar.xz",
"sha256": "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"
"url": "stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz",
"name": "kdeplasma-addons-5.3.2.tar.xz",
"sha256": "08k3736ssir41r37y3f6bdf52l1whkr7q5qc2rfhbzm6c9lhqvn4"
},
"buildInputs": [
"ecm",
@ -686,11 +686,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "sddm-kcm-5.3.1",
"name": "sddm-kcm-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz",
"name": "sddm-kcm-5.3.1.tar.xz",
"sha256": "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"
"url": "stable/plasma/5.3.2/sddm-kcm-5.3.2.tar.xz",
"name": "sddm-kcm-5.3.2.tar.xz",
"sha256": "17pk95xqr08gjn16i4gs7gnp2ksc6082myywdarywf66nz4whind"
},
"buildInputs": [
"ecm",
@ -720,11 +720,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "khelpcenter-5.3.1",
"name": "khelpcenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz",
"name": "khelpcenter-5.3.1.tar.xz",
"sha256": "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"
"url": "stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz",
"name": "khelpcenter-5.3.2.tar.xz",
"sha256": "1nd4kj4zhw21lfdj6yrmww2rx629mia5w0fb769y5wdas82w9wb3"
},
"buildInputs": [
"ecm",
@ -747,11 +747,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "bluedevil-5.3.1",
"name": "bluedevil-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz",
"name": "bluedevil-5.3.1.tar.xz",
"sha256": "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"
"url": "stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz",
"name": "bluedevil-5.3.2.tar.xz",
"sha256": "0pdm4fpr4piaqd52nbyv3plib4z6y9dr7qgbh1cfk3bzfwi1jwn8"
},
"buildInputs": [
"ecm",
@ -782,11 +782,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "ksysguard-5.3.1",
"name": "ksysguard-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz",
"name": "ksysguard-5.3.1.tar.xz",
"sha256": "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"
"url": "stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz",
"name": "ksysguard-5.3.2.tar.xz",
"sha256": "1vf2gdihrvfjrlkg5dmpg9f5yqgxawqa2cf8h9f96n2n0cd46gq7"
},
"buildInputs": [
"ecm",
@ -817,11 +817,11 @@
"qt5core",
"xapian"
],
"name": "baloo-5.9.1",
"name": "baloo-5.9.2",
"src": {
"url": "stable/plasma/5.3.1/baloo-5.9.1.tar.xz",
"name": "baloo-5.9.1.tar.xz",
"sha256": "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"
"url": "stable/plasma/5.3.2/baloo-5.9.2.tar.xz",
"name": "baloo-5.9.2.tar.xz",
"sha256": "1rhrdri90xb4g23x92nv72x19lxrdzkzc16w5ivbglrnq5ipga8w"
},
"buildInputs": [
"ecm",
@ -852,11 +852,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kde-cli-tools-5.3.1",
"name": "kde-cli-tools-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz",
"name": "kde-cli-tools-5.3.1.tar.xz",
"sha256": "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"
"url": "stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz",
"name": "kde-cli-tools-5.3.2.tar.xz",
"sha256": "1ac36rhffw85yzck4mqj1l4yj20g6yrjxi40vrkakln5j26vxb3x"
},
"buildInputs": [
"ecm",
@ -884,11 +884,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "milou-5.3.1",
"name": "milou-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/milou-5.3.1.tar.xz",
"name": "milou-5.3.1.tar.xz",
"sha256": "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"
"url": "stable/plasma/5.3.2/milou-5.3.2.tar.xz",
"name": "milou-5.3.2.tar.xz",
"sha256": "1wlnis5ph7vxg7wj410qs8qvdc2b0s8ji1vgqpv0g19zhkph95kw"
},
"buildInputs": [
"ecm",
@ -915,11 +915,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "powerdevil-5.3.1",
"name": "powerdevil-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz",
"name": "powerdevil-5.3.1.tar.xz",
"sha256": "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"
"url": "stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz",
"name": "powerdevil-5.3.2.tar.xz",
"sha256": "1zyfqi9qppra2hw0i18wil1xym84pgqdgmh9yn577c778grr4kgk"
},
"buildInputs": [
"ecm",
@ -959,11 +959,11 @@
"qt5network",
"qt5widgets"
],
"name": "libksysguard-5.3.1",
"name": "libksysguard-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz",
"name": "libksysguard-5.3.1.tar.xz",
"sha256": "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"
"url": "stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz",
"name": "libksysguard-5.3.2.tar.xz",
"sha256": "137dr7p4q3aldm7fs2rldchq4d3irij4rpqc3c799blrgmdrp98p"
},
"buildInputs": [
"ecm",
@ -998,11 +998,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-mediacenter-5.3.1",
"name": "plasma-mediacenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz",
"name": "plasma-mediacenter-5.3.1.tar.xz",
"sha256": "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"
"url": "stable/plasma/5.3.2/plasma-mediacenter-5.3.2.tar.xz",
"name": "plasma-mediacenter-5.3.2.tar.xz",
"sha256": "0nlkzhyfi87k2r567h0hdlj1a9115mwxac55yjg7j3bpm7jr36g6"
},
"buildInputs": [
"ecm",
@ -1041,11 +1041,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "kfilemetadata-5.9.1",
"name": "kfilemetadata-5.9.2",
"src": {
"url": "stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz",
"name": "kfilemetadata-5.9.1.tar.xz",
"sha256": "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"
"url": "stable/plasma/5.3.2/kfilemetadata-5.9.2.tar.xz",
"name": "kfilemetadata-5.9.2.tar.xz",
"sha256": "070m5v54birqwh8cmik6n80nbcfjh38lay4w5i3ic0hqj6as2n89"
},
"buildInputs": [
"ecm",
@ -1070,11 +1070,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kde-gtk-config-5.3.1",
"name": "kde-gtk-config-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz",
"name": "kde-gtk-config-5.3.1.tar.xz",
"sha256": "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"
"url": "stable/plasma/5.3.2/kde-gtk-config-5.3.2.tar.xz",
"name": "kde-gtk-config-5.3.2.tar.xz",
"sha256": "0rw4yv8svbjnv06pqva81m9xvpl75bvka53kckz0nqi6v96rdg2m"
},
"buildInputs": [
"ecm",
@ -1103,11 +1103,11 @@
"propagatedBuildInputs": [
"qt5gui"
],
"name": "kwayland-5.3.1",
"name": "kwayland-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwayland-5.3.1.tar.xz",
"name": "kwayland-5.3.1.tar.xz",
"sha256": "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"
"url": "stable/plasma/5.3.2/kwayland-5.3.2.tar.xz",
"name": "kwayland-5.3.2.tar.xz",
"sha256": "1z8k3vhrbfmnbaaji2akzgqvwm990cqk1jqd3crgzv26pbhinvci"
},
"buildInputs": [
"ecm",
@ -1132,11 +1132,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "ksshaskpass-5.3.1",
"name": "ksshaskpass-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz",
"name": "ksshaskpass-5.3.1.tar.xz",
"sha256": "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"
"url": "stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz",
"name": "ksshaskpass-5.3.2.tar.xz",
"sha256": "1v4p02141pd7xkyfxmhf7lf5385krri2zdh3vb90d8pr802mv3g7"
},
"buildInputs": [
"ecm",
@ -1157,11 +1157,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kinfocenter-5.3.1",
"name": "kinfocenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz",
"name": "kinfocenter-5.3.1.tar.xz",
"sha256": "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"
"url": "stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz",
"name": "kinfocenter-5.3.2.tar.xz",
"sha256": "1w8q9xq2rl1g8axf7n7l7cq49ahhw0r1zc0sdgv4409k5iwsrikr"
},
"buildInputs": [
"ecm",
@ -1203,11 +1203,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "polkit-kde-agent-1-5.3.1",
"name": "polkit-kde-agent-1-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz",
"name": "polkit-kde-agent-1-5.3.1.tar.xz",
"sha256": "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"
"url": "stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz",
"name": "polkit-kde-agent-1-5.3.2.tar.xz",
"sha256": "0khbkgd3s0b2xl062rcxqimym8f3c9y6xadl5av27d4d78ayqmfn"
},
"buildInputs": [
"ecm",
@ -1237,11 +1237,11 @@
"propagatedBuildInputs": [
"qt5gui"
],
"name": "kdecoration-5.3.1",
"name": "kdecoration-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz",
"name": "kdecoration-5.3.1.tar.xz",
"sha256": "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"
"url": "stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz",
"name": "kdecoration-5.3.2.tar.xz",
"sha256": "192infj8s4rd3jwiy8fcvbg265zvng4xbmwj7a3bqz4h9jcrjc7v"
},
"buildInputs": [
"ecm",
@ -1259,11 +1259,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kio-extras-5.3.1",
"name": "kio-extras-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz",
"name": "kio-extras-5.3.1.tar.xz",
"sha256": "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"
"url": "stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz",
"name": "kio-extras-5.3.2.tar.xz",
"sha256": "1vfp203mmpqvwa9dqkkpgz9rgk07f11pwhg5drvkw03azi9hbjbw"
},
"buildInputs": [
"ecm",
@ -1308,11 +1308,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "muon-5.3.1",
"name": "muon-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/muon-5.3.1.tar.xz",
"name": "muon-5.3.1.tar.xz",
"sha256": "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"
"url": "stable/plasma/5.3.2/muon-5.3.2.tar.xz",
"name": "muon-5.3.2.tar.xz",
"sha256": "0c2c94yirfrkcxp30gf77xzy9gmgznx0kkhn93idggdhc4qdyf9z"
},
"buildInputs": [
"akabeiclient",

2
pkgs/desktops/plasma-5.3/packages.sh
View File

@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.1/" \
"${KDE_MIRROR}/stable/plasma/5.3.2/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}

24
pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
View File

@ -1,14 +1,14 @@
From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001
From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 11:21:43 -0500
Subject: [PATCH] startkde: NixOS patches
Date: Sat, 18 Jul 2015 12:13:08 -0500
Subject: [PATCH] startkde NixOS patches
---
startkde/startkde.cmake | 218 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 129 deletions(-)
startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
1 file changed, 91 insertions(+), 131 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 24e5c1b..e7bdd32 100644
index 6f93108..26cc2fc 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
@ -62,7 +62,8 @@ index 24e5c1b..e7bdd32 100644
-fi
-
# Check if a KDE session already is running and whether it's possible to connect to X
kcheckrunning
-kcheckrunning
+@out@/bin/kcheckrunning
kcheckrunning_result=$?
if test $kcheckrunning_result -eq 0 ; then
- echo "KDE seems to be already running on this display."
@ -129,7 +130,8 @@ index 24e5c1b..e7bdd32 100644
- }
-fi
-
kstartupconfig5
-kstartupconfig5
+@out@/bin/kstartupconfig5
returncode=$?
if test $returncode -ne 0; then
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
@ -141,7 +143,7 @@ index 24e5c1b..e7bdd32 100644
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
-fi
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
+export XCURSOR_PATH
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
@ -391,7 +393,7 @@ index 24e5c1b..e7bdd32 100644
for prefix in `echo "$scriptpath"`; do
- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
done
done
@ -405,5 +407,5 @@ index 24e5c1b..e7bdd32 100644
echo 'startkde: Done.' 1>&2
--
2.4.1
2.4.5