Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kdeApplications: 20.08.1 -> 20.08.2 #101906

Merged
merged 5 commits into from Oct 30, 2020
Merged

kdeApplications: 20.08.1 -> 20.08.2 #101906

merged 5 commits into from Oct 30, 2020

Conversation

@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Oct 28, 2020

Motivation for this change

Also moves kdeconnect in where it belongs.

nix-review is currently running.

Related: #101369

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 28, 2020

Run on darwin: Not really interesting to be honest.

Result of nixpkgs-review pr 101906 1

2 packages marked as broken and skipped:
  • qcachegrind
  • virt-manager-qt

@peterhoeg peterhoeg force-pushed the u/kapps_20082 branch 2 times, most recently from d783c5f to 66ebd1f Oct 28, 2020
@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 28, 2020

Result of nixpkgs-review pr 101906 1

2 packages marked as broken and skipped:
  • kmymoney
  • libsForQt5.kreport
1 package failed to build:
  • zanshin
174 packages built:
  • akonadi
  • akregator
  • ark
  • bomber
  • bovo
  • calligra
  • digikam (digikam5)
  • dolphin
  • dragon
  • elisa
  • ffmpegthumbs
  • filelight
  • granatier
  • gwenview
  • k3b
  • kaddressbook
  • kalzium
  • kapman
  • kapptemplate
  • kate
  • katomic
  • kblackbox
  • kblocks
  • kbounce
  • kcachegrind
  • kcalc
  • kcharselect
  • kcolorchooser
  • kdeApplications.akonadi-calendar
  • kdeApplications.akonadi-contacts
  • kdeApplications.akonadi-import-wizard
  • kdeApplications.akonadi-mime
  • kdeApplications.akonadi-notes
  • kdeApplications.akonadi-search
  • kdeApplications.akonadiconsole
  • kdeApplications.baloo-widgets
  • kdeApplications.calendarsupport
  • kdeApplications.dolphin-plugins
  • kdeApplications.eventviews
  • kdeApplications.grantleetheme
  • kdeApplications.incidenceeditor
  • kdeApplications.kalarm
  • kdeApplications.kalarmcal
  • kdeApplications.kbreakout
  • kdeApplications.kcalutils
  • kdeApplications.kdebugsettings
  • kdeconnect (kdeApplications.kdeconnect-kde)
  • kdeApplications.kdegraphics-mobipocket
  • kdeApplications.kdegraphics-thumbnailers
  • kdeApplications.kdenetwork-filesharing
  • kdeApplications.kdenlive
  • kdeApplications.kdepim-addons
  • kdeApplications.kdepim-apps-libs
  • kdeApplications.kdepim-runtime
  • kdeApplications.kdf
  • kdeApplications.kdialog
  • kdeApplications.kdiamond
  • kdeApplications.keditbookmarks
  • kdeApplications.kfind
  • kdeApplications.kfloppy
  • kdeApplications.kgeography
  • kdeApplications.kget
  • kdeApplications.kgpg
  • kdeApplications.khelpcenter
  • kdeApplications.kidentitymanagement
  • kdeApplications.kig
  • kdeApplications.kigo
  • kdeApplications.killbots
  • kdeApplications.kimap
  • kdeApplications.kio-extras
  • kdeApplications.kipi-plugins
  • kdeApplications.kitinerary
  • kdeApplications.kldap
  • kdeApplications.kleopatra
  • kdeApplications.klettres
  • kdeApplications.klines
  • kdeApplications.kmag
  • kdeApplications.kmahjongg
  • kdeApplications.kmail
  • kdeApplications.kmail-account-wizard
  • kdeApplications.kmailtransport
  • kdeApplications.kmbox
  • kdeApplications.kmime
  • kdeApplications.kmines
  • kdeApplications.kmix
  • kdeApplications.kmplot
  • kdeApplications.knavalbattle
  • kdeApplications.knetwalk
  • kdeApplications.knights
  • kdeApplications.knotes
  • kdeApplications.kolf
  • kdeApplications.kollision
  • kdeApplications.kolourpaint
  • kdeApplications.kompare
  • kdeApplications.konqueror
  • kdeApplications.konquest
  • kdeApplications.konsole
  • kdeApplications.kontact
  • kdeApplications.kontactinterface
  • kdeApplications.korganizer
  • kdeApplications.kpat
  • kdeApplications.kpimtextedit
  • kdeApplications.kpkpass
  • kdeApplications.kqtquickcharts
  • kdeApplications.krdc
  • kdeApplications.kreversi
  • kdeApplications.krfb
  • kdeApplications.kruler
  • kdeApplications.kshisen
  • kdeApplications.ksmtp
  • kdeApplications.kspaceduel
  • kdeApplications.ksquares
  • kdeApplications.ksudoku
  • kdeApplications.ksystemlog
  • kdeApplications.kteatime
  • kdeApplications.ktimer
  • kdeApplications.ktnef
  • kdeApplications.ktouch
  • kdeApplications.kturtle
  • kdeApplications.kwalletmanager
  • kdeApplications.kwave
  • kdeApplications.libgravatar
  • kdeApplications.libkcddb
  • libsForQt514.libkdcraw (kdeApplications.libkdcraw)
  • kdeApplications.libkdegames
  • kdeApplications.libkdepim
  • libsForQt514.libkexiv2 (kdeApplications.libkexiv2)
  • kdeApplications.libkgapi
  • libsForQt514.libkipi (kdeApplications.libkipi)
  • kdeApplications.libkleo
  • kdeApplications.libkmahjongg
  • libsForQt514.libkomparediff2 (kdeApplications.libkomparediff2)
  • libsForQt514.libksane (kdeApplications.libksane)
  • kdeApplications.libksieve
  • kdeApplications.mailcommon
  • kdeApplications.mailimporter
  • kdeApplications.marble
  • kdeApplications.mbox-importer
  • kdeApplications.messagelib
  • kdeApplications.minuet
  • kdeApplications.okular
  • kdeApplications.picmi
  • kdeApplications.pim-data-exporter
  • kdeApplications.pim-sieve-editor
  • kdeApplications.pimcommon
  • kdeApplications.print-manager
  • kdeApplications.rocs
  • kdeApplications.spectacle
  • kdeApplications.yakuake
  • kdev-php
  • kdev-python
  • kdevelop
  • kdevelop-unwrapped
  • kexi
  • kile
  • libsForQt5.libkdcraw
  • libsForQt5.libkexiv2
  • libsForQt5.libkipi
  • libsForQt5.libkomparediff2
  • libsForQt5.libksane
  • libsForQt512.kreport
  • libsForQt512.libkdcraw
  • libsForQt512.libkexiv2
  • libsForQt512.libkipi
  • libsForQt512.libkomparediff2
  • libsForQt512.libksane
  • libsForQt514.kreport
  • qcachegrind
  • skanlite
  • soundkonverter
  • tellico
  • trojita
  • virtmanager-qt (virt-manager-qt)
  • zombietrackergps

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 28, 2020

zanshin was already broken, so it looks like this is good to go.

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 28, 2020

pkgs/applications/kde/kdeconnect-kde.nix Outdated Show resolved Hide resolved
@@ -21618,7 +21618,7 @@ in
kaddressbook kalzium kapptemplate kapman kate katomic
kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser
kdenlive kdf kdialog kdiamond
kdeconnect-kde kdenlive kdf kdialog kdiamond
Copy link
Contributor

@doronbehar doronbehar Oct 28, 2020

This change will conflict with #101369 .

Copy link
Member Author

@peterhoeg peterhoeg Oct 29, 2020

Sure, so either this PR or the other needs to be changed depending on which is merged first - there really is no way around that.

pkgs/applications/kde/kdenlive.nix Outdated Show resolved Hide resolved
pkgs/applications/office/zanshin/default.nix Show resolved Hide resolved
@doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Oct 28, 2020

In general I think it'd be best to cook this in #101369 .

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 29, 2020

In general I think it'd be best to cook this in #101369 .

Sure, feel free to include this as part of the other PR.

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 30, 2020

In general I think it'd be best to cook this in #101369 .

Sure, feel free to include this as part of the other PR.

Actually, come to think of it, I think we should just go ahead and get this in. I dropped the ffmpeg-full -> ffmpeg changes as ffmpeg-full was fixed separately but just haven't pushed that branch yet.

Otherwise, unless you have strong objections @doronbehar, I'll go ahead later today and merge this to avoid having too many pending PRs around the same area and as the 5.15 change is going to take some time by the looks of it.

@doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Oct 30, 2020

@peterhoeg peterhoeg merged commit 05d95cf into NixOS:master Oct 30, 2020
19 checks passed
@peterhoeg peterhoeg deleted the u/kapps_20082 branch Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants