From f0fb53e63ef9ac64a64865338ab7767c64f9246a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jun 2015 09:08:32 -0500 Subject: [PATCH 1/2] Update to plasma-5.3.1 --- pkgs/desktops/plasma-5.3/manifest.nix | 360 +++++++++++++------------- pkgs/desktops/plasma-5.3/manifest.sh | 2 +- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix index 22649b7581e0..a815327826ac 100644 --- a/pkgs/desktops/plasma-5.3/manifest.nix +++ b/pkgs/desktops/plasma-5.3/manifest.nix @@ -2,327 +2,327 @@ { stdenv, fetchurl, mirror }: [ { - name = stdenv.lib.nameFromURL "kscreen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/hjhbxv0vrv64r22z5zr15av8c6kpa2q3-kscreen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "breeze-5.3.1.tar.xz" ".tar"; + store = "/nix/store/wksay8grc0ihprrjkvfwaa5n0v1dsn7p-breeze-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kscreen-5.3.0.tar.xz"; - sha256 = "1d9qlqszrkz8ia1k20xy645mngg3jwyc9mjvc27z5yx3l2bjdisq"; - name = "kscreen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/breeze-5.3.1.tar.xz"; + sha256 = "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"; + name = "breeze-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.0.tar.xz" ".tar"; - store = "/nix/store/di83lwabjyf21g6bbww68xf3k89zdih5-kde-cli-tools-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "baloo-5.9.1.tar.xz" ".tar"; + store = "/nix/store/yljbiij3svkkmmqpwqxyc5gf8p4gz9zl-baloo-5.9.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kde-cli-tools-5.3.0.tar.xz"; - sha256 = "12i74cq9kghcj7sfhxqdlqjd5n4lpxr8nvlzkh4n8pjrz1w3g9n7"; - name = "kde-cli-tools-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/baloo-5.9.1.tar.xz"; + sha256 = "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"; + name = "baloo-5.9.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "bluez-qt-5.3.0.tar.xz" ".tar"; - store = "/nix/store/7lpwpw24aahx81dq78vbk203w6xpapar-bluez-qt-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "ksshaskpass-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8p1spxbb4iv5wrccipby7khh6r5pj4gb-ksshaskpass-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/bluez-qt-5.3.0.tar.xz"; - sha256 = "0zcqb8fiawprl2qz1lnf875dnkg7nlb6hghqqzp4l5hby20kxnq5"; - name = "bluez-qt-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz"; + sha256 = "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"; + name = "ksshaskpass-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-nm-5.3.0.tar.xz" ".tar"; - store = "/nix/store/hbvm05kcmpc7fncx4padzqx2gqvra88p-plasma-nm-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kscreen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/0gf4avv67cspclipvs1934fa9vn5bday-kscreen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-nm-5.3.0.tar.xz"; - sha256 = "1zldjrdr331shl4xk4yypr22lkav47bjsw4nzdia16x6nsh32yra"; - name = "plasma-nm-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz"; + sha256 = "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"; + name = "kscreen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "libkscreen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/cr0gg8a4asd3yyy5p0rx6r1m9ngww2f7-libkscreen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwayland-5.3.1.tar.xz" ".tar"; + store = "/nix/store/fqs8y8fmkk23biqlicq50m281jf45qbj-kwayland-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/libkscreen-5.3.0.tar.xz"; - sha256 = "1hdgj3l51i277ar9af02sz27bb811amr6b6n4fmcym7ss1r3vljd"; - name = "libkscreen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz"; + sha256 = "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"; + name = "kwayland-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "powerdevil-5.3.0.tar.xz" ".tar"; - store = "/nix/store/zjanbhr6ynx98sra3ibg86ajf2mxpw4v-powerdevil-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "muon-5.3.1.tar.xz" ".tar"; + store = "/nix/store/glhhnkdnn4sancq176mwd3pdw51xg58s-muon-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/powerdevil-5.3.0.tar.xz"; - sha256 = "1pr53yzmra17h7vhp7h9ywsbgk7cm7f2srbdg3ikp2i8a1gzkchm"; - name = "powerdevil-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/muon-5.3.1.tar.xz"; + sha256 = "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"; + name = "muon-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "libksysguard-5.3.0.tar.xz" ".tar"; - store = "/nix/store/k4ccrcbd33iknvamm1v56n2kz86hmcca-libksysguard-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "khelpcenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/s676r82b3lpr3fzrqcw0srl8zx9mj57l-khelpcenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/libksysguard-5.3.0.tar.xz"; - sha256 = "16b8xrkm1b53nwhcr91hiz0nc1bj9yjz3k4ccfmc6nhyjma3n24v"; - name = "libksysguard-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz"; + sha256 = "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"; + name = "khelpcenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.0.tar.xz" ".tar"; - store = "/nix/store/yws33kggkdqd5xpq065cbp0lzvgnn749-plasma-workspace-wallpapers-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.1.tar.xz" ".tar"; + store = "/nix/store/his4ak4djxslvmrdznyzf3v6mr3aq40s-kdeplasma-addons-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-wallpapers-5.3.0.tar.xz"; - sha256 = "0kci4f445624x93k521zva08kggffxqwcg5safzhxxrwyfw65nja"; - name = "plasma-workspace-wallpapers-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz"; + sha256 = "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"; + name = "kdeplasma-addons-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-sdk-5.3.0.tar.xz" ".tar"; - store = "/nix/store/p02z3bzwd2zh62n9hj2mypvvsb0z0396-plasma-sdk-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "systemsettings-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8fyfslw9ip7fsn6gb55v6i1cxajgxmjb-systemsettings-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-sdk-5.3.0.tar.xz"; - sha256 = "1vbi45f8clpzx2hqpnzw4wamwzm4016mzh4q6yhwgappqsgn3x9f"; - name = "plasma-sdk-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz"; + sha256 = "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"; + name = "systemsettings-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-desktop-5.3.0.tar.xz" ".tar"; - store = "/nix/store/livypzdcyjjiqs50varb9m2fbky6gwhm-plasma-desktop-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kinfocenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/flpcnl0mn3mma12nkgymabjgzm1yc4kf-kinfocenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-desktop-5.3.0.tar.xz"; - sha256 = "0f8rs3p1cbvryg6z386kb9pb0ygbw7jqf63hnpcjkbg33rq14q9p"; - name = "plasma-desktop-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz"; + sha256 = "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"; + name = "kinfocenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kinfocenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/w3dl539dn5jczrc50dmsywv79m3iyqxx-kinfocenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "libkscreen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/3i82s0x8hsi0q9hyp8m42m8nxcm6cwx5-libkscreen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kinfocenter-5.3.0.tar.xz"; - sha256 = "02znnw11j37f084bcjp160sm5fs7kc251w07rxly49jdjyy6ddiw"; - name = "kinfocenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz"; + sha256 = "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"; + name = "libkscreen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.0.tar.xz" ".tar"; - store = "/nix/store/v6wgn4l8brv3v4mdjgy0hfqxynwncy2p-polkit-kde-agent-1-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "libksysguard-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8jaxispzwkpdy6kazyhdy6k00f0s7dla-libksysguard-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/polkit-kde-agent-1-5.3.0.tar.xz"; - sha256 = "0z1c354sjm218w30x2whiij43jamfh4lclwcr14bqk2s8i9njhir"; - name = "polkit-kde-agent-1-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz"; + sha256 = "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"; + name = "libksysguard-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kdecoration-5.3.0.tar.xz" ".tar"; - store = "/nix/store/8zx7y39rrcnmfdjkp7g5xrb7xkwn6mp7-kdecoration-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kmenuedit-5.3.1.tar.xz" ".tar"; + store = "/nix/store/p6x58nfjkml2125rpvkr7zcvrv11fn1l-kmenuedit-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kdecoration-5.3.0.tar.xz"; - sha256 = "1abwqd8cxf6gabc74pvhnqhwqkn8a7zszwf031ndicl3n3f93x3d"; - name = "kdecoration-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz"; + sha256 = "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"; + name = "kmenuedit-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.0.tar.xz" ".tar"; - store = "/nix/store/6hivcczg1gp31ayfz802dxdr89zpaqym-kde-gtk-config-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/g9r436iff0714c2ya9xbm0sgd4gdiaq5-plasma-mediacenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kde-gtk-config-5.3.0.tar.xz"; - sha256 = "1s7jkrb3750aw0cn5v0g7pdsbkb5ncxfhfclw8lr1nqgi03lphcf"; - name = "kde-gtk-config-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz"; + sha256 = "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"; + name = "plasma-mediacenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "systemsettings-5.3.0.tar.xz" ".tar"; - store = "/nix/store/vzxxqpvapq8fnbf88ljhhnrpzl7vl6wf-systemsettings-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-sdk-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mifrpgvf29kzr7n4lk1xq8s1b3a1d29q-plasma-sdk-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/systemsettings-5.3.0.tar.xz"; - sha256 = "0ryhm9d46r5691alnrrg88qxbdwm10y1k7jdk7czrnjm5jkg86vh"; - name = "systemsettings-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz"; + sha256 = "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"; + name = "plasma-sdk-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "muon-5.3.0.tar.xz" ".tar"; - store = "/nix/store/46mqwn6l763jq9qgvp9d6lg184760ff8-muon-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwrited-5.3.1.tar.xz" ".tar"; + store = "/nix/store/agrv0yx7fzkjyx8b4bl0anbhi99v6l6y-kwrited-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/muon-5.3.0.tar.xz"; - sha256 = "0f9bnp2pf0npil189a0g3pn6bnb9nwqdclrk7scrk4xck7c66v0r"; - name = "muon-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz"; + sha256 = "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"; + name = "kwrited-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "milou-5.3.0.tar.xz" ".tar"; - store = "/nix/store/zdx8hxf5w0yqypjk08w5hfhkzngdy6pm-milou-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "khotkeys-5.3.1.tar.xz" ".tar"; + store = "/nix/store/m1v47sjjn9hz8pdfzql5xx9r0j1zpd4q-khotkeys-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/milou-5.3.0.tar.xz"; - sha256 = "089dvxpwiwa3sasah27n4yk8l3jbmi71p4080q8pslx6j4dhhmsq"; - name = "milou-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz"; + sha256 = "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"; + name = "khotkeys-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kmenuedit-5.3.0.tar.xz" ".tar"; - store = "/nix/store/1hjwhla1d23gbmmigxmm4w2ahkayyfr8-kmenuedit-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-nm-5.3.1.tar.xz" ".tar"; + store = "/nix/store/r8sbla68dniy9snbni1g4h9rwwm5bghh-plasma-nm-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kmenuedit-5.3.0.tar.xz"; - sha256 = "0jzzl043jq9afknj1pc75ywmbs5ff4rjnbqgim5xgrbr08bsam9j"; - name = "kmenuedit-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz"; + sha256 = "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"; + name = "plasma-nm-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-workspace-5.3.0.tar.xz" ".tar"; - store = "/nix/store/sji2iki8crvy81q6mrc1dd3gibv88mrn-plasma-workspace-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdecoration-5.3.1.tar.xz" ".tar"; + store = "/nix/store/g9163zl8sjxnr32mmy70cbw0a0arsm8c-kdecoration-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-5.3.0.tar.xz"; - sha256 = "05kk8vnhsny3k8pn27pjawdfxcjf4c6pcl2k7s43zim0khqv5xcm"; - name = "plasma-workspace-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz"; + sha256 = "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"; + name = "kdecoration-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.0.tar.xz" ".tar"; - store = "/nix/store/70mkx8jw7dhs1lvqgdjhcvr6y5y4bfck-oxygen-fonts-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8z7cjvfh9bw6402ccipzpgfh4a5rwvmd-oxygen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/oxygen-fonts-5.3.0.tar.xz"; - sha256 = "0wiqn91m5b421c46fbicmzhkp7lgzck0mrqn7ng0daw8aj6am94y"; - name = "oxygen-fonts-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz"; + sha256 = "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"; + name = "oxygen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kio-extras-5.3.0.tar.xz" ".tar"; - store = "/nix/store/g889cng2b9pwz2yhp3qyjyqzhs6h5jvx-kio-extras-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.1.tar.xz" ".tar"; + store = "/nix/store/safa43z9955m484jnfagz4rxby5jhn9l-kde-gtk-config-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kio-extras-5.3.0.tar.xz"; - sha256 = "0n6fb4cadp16m1ck11d2zp6lrsjmj1q4iav5gydg3i7bds9kwlhf"; - name = "kio-extras-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz"; + sha256 = "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"; + name = "kde-gtk-config-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "oxygen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3hdjzpgy699qpfxj17dq913nf8qw2wgg-oxygen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "bluez-qt-5.3.1.tar.xz" ".tar"; + store = "/nix/store/s8k9h017za3z3j3h046ialysxxna2avs-bluez-qt-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/oxygen-5.3.0.tar.xz"; - sha256 = "0a55zncpa156rlkpg26j2gwl8ibc1fjb014sm4j07c3q85zd7n73"; - name = "oxygen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz"; + sha256 = "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"; + name = "bluez-qt-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.0.tar.xz" ".tar"; - store = "/nix/store/qrhvjbik2vzxrln457kyl80yhpsk2byx-kdeplasma-addons-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.1.tar.xz" ".tar"; + store = "/nix/store/z9hb5dcjbvnrrkhba58vbhism9djavh9-polkit-kde-agent-1-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kdeplasma-addons-5.3.0.tar.xz"; - sha256 = "10h68sqm536j972mqn216b0304r2gpy76klgdr2d2pzqs0vwywll"; - name = "kdeplasma-addons-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz"; + sha256 = "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"; + name = "polkit-kde-agent-1-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "ksshaskpass-5.3.0.tar.xz" ".tar"; - store = "/nix/store/23bkyxca8ydz1g1zj8rlyd14xn073jlw-ksshaskpass-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.1.tar.xz" ".tar"; + store = "/nix/store/gfah83qmrzhfjxjvgaczz4bggyvxqq2l-kde-cli-tools-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/ksshaskpass-5.3.0.tar.xz"; - sha256 = "1f7kn163hnxh47q6h73lqhzkzpjhlbhq670lkr89s5i7kxjnla54"; - name = "ksshaskpass-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz"; + sha256 = "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"; + name = "kde-cli-tools-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/f3bwrgk52fj27b3bpgix8zy1vmwryh5f-plasma-mediacenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "sddm-kcm-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mhvhgh8n3a6dzjsxzgp8ynsryv3y54kv-sddm-kcm-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-mediacenter-5.3.0.tar.xz"; - sha256 = "1iw6v35mg6p8g7pxnqqm1sqs75kmk04jzaakmfs6xjn8h34s0kmp"; - name = "plasma-mediacenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz"; + sha256 = "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"; + name = "sddm-kcm-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "breeze-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3d28b0pqh4qjgbff556q475fgkhx0f5r-breeze-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "powerdevil-5.3.1.tar.xz" ".tar"; + store = "/nix/store/y571p4chd574qvzjbc7pbbixsb7g4g45-powerdevil-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/breeze-5.3.0.tar.xz"; - sha256 = "12drbw4j7bk0yd7g45j1w70v3jnm4z323zsad3lnnzw448lm9vck"; - name = "breeze-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz"; + sha256 = "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"; + name = "powerdevil-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "bluedevil-5.3.0.tar.xz" ".tar"; - store = "/nix/store/9wq45x6vk9kf9c01ba2xhsdibhaqq7hc-bluedevil-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-5.3.1.tar.xz" ".tar"; + store = "/nix/store/kxn9mq9hrqzwpw8ldxqjdaxm5zqnq1jb-plasma-workspace-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/bluedevil-5.3.0.tar.xz"; - sha256 = "0bw03kkfzpcq6s2kx8zi66f308zc153m4ddknlvf5cnm7wvykx4q"; - name = "bluedevil-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz"; + sha256 = "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"; + name = "plasma-workspace-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kfilemetadata-5.9.0.tar.xz" ".tar"; - store = "/nix/store/whv1mw43461l69j1qa2dp95953si4mcy-kfilemetadata-5.9.0.tar.xz"; + name = stdenv.lib.nameFromURL "milou-5.3.1.tar.xz" ".tar"; + store = "/nix/store/02qx55q40iwpwwdr5dmnpdg5hhzcdb7a-milou-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kfilemetadata-5.9.0.tar.xz"; - sha256 = "0rgcdpys13qpv11sqrfjxxp75dlchnffvvz7bi7vps1xypnvk4jw"; - name = "kfilemetadata-5.9.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/milou-5.3.1.tar.xz"; + sha256 = "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"; + name = "milou-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "khelpcenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/7x373jrlqhj9jq6j3qcz9vimzzr3za5z-khelpcenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "ksysguard-5.3.1.tar.xz" ".tar"; + store = "/nix/store/m8q2mc88168lkh4j3jxqjyshf0h5d7gs-ksysguard-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/khelpcenter-5.3.0.tar.xz"; - sha256 = "1zk70bc2zmnh37qp2w7rh6lzid5hmavm7amyzllsksakj6ba40ki"; - name = "khelpcenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz"; + sha256 = "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"; + name = "ksysguard-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "khotkeys-5.3.0.tar.xz" ".tar"; - store = "/nix/store/ml95kbmiczriikch5jgk6iwljinsb28b-khotkeys-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-desktop-5.3.1.tar.xz" ".tar"; + store = "/nix/store/bilfn2r9akz2mxyl03q1a9i8nndbabhg-plasma-desktop-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/khotkeys-5.3.0.tar.xz"; - sha256 = "19dy7v67l2xb1x1fqjwljg940gcc9jrvywx2xxvv2lfxgc1i0da4"; - name = "khotkeys-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz"; + sha256 = "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"; + name = "plasma-desktop-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwrited-5.3.0.tar.xz" ".tar"; - store = "/nix/store/rfhx33pghmghr0kxlwijc6lfwpzs8a91-kwrited-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwin-5.3.1.tar.xz" ".tar"; + store = "/nix/store/0b3mjqqacgl23xqkhimqpgswwvsqz7bc-kwin-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwrited-5.3.0.tar.xz"; - sha256 = "0mv7nrlgwrb10dcf91mrnpjmrzwgdsylnd4b4grccc13c2f55lad"; - name = "kwrited-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwin-5.3.1.tar.xz"; + sha256 = "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"; + name = "kwin-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwayland-5.3.0.tar.xz" ".tar"; - store = "/nix/store/0bnhdabiq55i43gwcvpj52ysi2w0zvw0-kwayland-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mfn2ga4yr0v8pgknsxsgnvxayn6p7sal-plasma-workspace-wallpapers-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwayland-5.3.0.tar.xz"; - sha256 = "1ghxwhnk68nadj48r9cxl250ryylwqrarw26jvv7k7kxs6gqlncr"; - name = "kwayland-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz"; + sha256 = "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"; + name = "plasma-workspace-wallpapers-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "sddm-kcm-5.3.0.tar.xz" ".tar"; - store = "/nix/store/wfp80cwqkxifmdgqv8p6mgc1k6gf5shd-sddm-kcm-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kfilemetadata-5.9.1.tar.xz" ".tar"; + store = "/nix/store/pshcx9qvc0z4w486q4a51ygm86p7w06a-kfilemetadata-5.9.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/sddm-kcm-5.3.0.tar.xz"; - sha256 = "15x0ad6zlpdnc4z398ydpr5w0bfla3r5x6mkgakis0mx6vpyzwcc"; - name = "sddm-kcm-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz"; + sha256 = "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"; + name = "kfilemetadata-5.9.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwin-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3mzgg28m89a0g0wlysil39g8lzzip46p-kwin-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kio-extras-5.3.1.tar.xz" ".tar"; + store = "/nix/store/gy53gcnhk83ab62a2w1x0lm7lxxkn9wh-kio-extras-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwin-5.3.0.tar.xz"; - sha256 = "1mvgmjmxjmv0vl0xfxyqa43rh5n65p3z5zz1ban7lbp16sn6qkqn"; - name = "kwin-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz"; + sha256 = "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"; + name = "kio-extras-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "baloo-5.9.0.tar.xz" ".tar"; - store = "/nix/store/kz17030nf6rifv84p2y08wrygbsl66xg-baloo-5.9.0.tar.xz"; + name = stdenv.lib.nameFromURL "bluedevil-5.3.1.tar.xz" ".tar"; + store = "/nix/store/v3k1px6zx4dqz77s0l48lky1zh22c2ps-bluedevil-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/baloo-5.9.0.tar.xz"; - sha256 = "1n6k6mznnjccqirr8371z0n0h2cpg6lk50n6dcx0cbqc5mfsckyn"; - name = "baloo-5.9.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz"; + sha256 = "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"; + name = "bluedevil-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "ksysguard-5.3.0.tar.xz" ".tar"; - store = "/nix/store/ixm26iv7hhgkss8carpln178df1p56xv-ksysguard-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.1.tar.xz" ".tar"; + store = "/nix/store/lbvr2fw8361mmd8gpqk9m917qmg8h381-oxygen-fonts-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/ksysguard-5.3.0.tar.xz"; - sha256 = "0pz2v2lxcgn2jp0nzci1yrnxlcs3sf3a2bipaz31w5bhz128k7wi"; - name = "ksysguard-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz"; + sha256 = "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"; + name = "oxygen-fonts-5.3.1.tar.xz"; }; } ] diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh index befd14f0b12a..3ccfc8da3daa 100755 --- a/pkgs/desktops/plasma-5.3/manifest.sh +++ b/pkgs/desktops/plasma-5.3/manifest.sh @@ -6,5 +6,5 @@ KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" # 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.0/" \ + "${KDE_MIRROR}/stable/plasma/5.3.1/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' From 7d2e419597bc2a716f1d8386eb44c4a662f5e8dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jun 2015 16:23:00 -0500 Subject: [PATCH 2/2] plasma-5.3: run startkde with `set -x` --- .../0001-startkde-NixOS-patches.patch | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch index 68f32862b217..a542fb7b87d3 100644 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,23 +1,25 @@ -From 9aa37de6cd887c6cdd7ea2356cbb6aecdb988b75 Mon Sep 17 00:00:00 2001 +From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 3 May 2015 14:51:04 -0500 +Date: Tue, 2 Jun 2015 11:21:43 -0500 Subject: [PATCH] startkde: NixOS patches --- - startkde/startkde.cmake | 212 +++++++++++++++++++----------------------------- - 1 file changed, 85 insertions(+), 127 deletions(-) + startkde/startkde.cmake | 214 ++++++++++++++++++++---------------------------- + 1 file changed, 87 insertions(+), 127 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 24e5c1b..d8642d3 100644 +index 24e5c1b..787d719 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake -@@ -1,8 +1,29 @@ +@@ -1,8 +1,31 @@ -#!/bin/sh +#!@bash@/bin/bash # # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # ++set -x ++ +# The KDE icon cache is supposed to update itself +# automatically, but it uses the timestamp on the icon +# theme directory as a trigger. Since in Nix the @@ -42,7 +44,7 @@ index 24e5c1b..d8642d3 100644 if test "x$1" = x--failsafe; then KDE_FAILSAFE=1 # General failsafe flag KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +37,16 @@ trap 'echo GOT SIGHUP' HUP +@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -75,7 +77,7 @@ index 24e5c1b..d8642d3 100644 fi # Boot sequence: -@@ -56,13 +64,8 @@ fi +@@ -56,13 +66,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys @@ -91,7 +93,7 @@ index 24e5c1b..d8642d3 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <&2 @@ -275,7 +277,7 @@ index 24e5c1b..d8642d3 100644 # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -332,11 +284,11 @@ fi +@@ -332,11 +286,11 @@ fi # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -289,7 +291,7 @@ index 24e5c1b..d8642d3 100644 KDE_SESSION_UID=`id -ru` export KDE_SESSION_UID -@@ -346,30 +298,36 @@ export XDG_CURRENT_DESKTOP +@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP # At this point all the environment is ready, let's send it to kwalletd if running if test -n "$PAM_KWALLET_LOGIN" ; then @@ -331,7 +333,7 @@ index 24e5c1b..d8642d3 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -385,27 +343,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" +@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" @@ -366,7 +368,7 @@ index 24e5c1b..d8642d3 100644 done break fi -@@ -417,21 +375,21 @@ echo 'startkde: Shutting down...' 1>&2 +@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up @@ -393,5 +395,5 @@ index 24e5c1b..d8642d3 100644 echo 'startkde: Done.' 1>&2 -- -2.3.6 +2.4.1