| 28 Oct 2021 |
 Alyssa Ross | well, a merge does add hundreds of new commits! | 16:00:47 |
| Alyssa Ross | but for that reason they're basically impossible to review, so it's probably easier for a committer to just do it than to review a PR for it | 16:01:12 |
 trofi | Sounds good. Asked in https://github.com/NixOS/nixpkgs/pull/141918#issuecomment-953991366 | 16:08:48 |
| Alyssa Ross | I've fixed it. | 16:09:50 |
 Sandro | It would be really grateful if there would be a good way to prevent this things other than keeping track which packages changed on which branch already | 17:30:35 |
 hexa | you mean merge conflicts? | 17:45:52 |
| hexa | both modified: pkgs/development/libraries/kde-frameworks/fetch.sh
deleted by them: pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch
both modified: pkgs/development/libraries/kde-frameworks/srcs.nix
| 17:47:02 |
| hexa | DO NOT EDIT! This file is generated automatically.
| 17:47:16 |
| hexa | lovely. | 17:47:19 |
 sterni | hexa: just regenerate? | 17:47:31 |
| hexa | yeah, something like this | 17:47:40 |
| sterni | just hope it doesn't try to parse the old file :p | 17:48:18 |
| hexa | ❯ cd pkgs/development/libraries/kde-frameworks
❯ ls
attica.nix kcmutils kdewebkit.nix kirigami2.nix kquickcharts.nix oxygen-icons5.nix
baloo.nix kcodecs.nix kdnssd.nix kitemmodels.nix kross.nix plasma-framework.nix
bluez-qt.nix kcompletion.nix kdoctools kitemviews.nix krunner.nix prison.nix
breeze-icons.nix kconfig.nix kemoticons.nix kjobwidgets.nix kservice purpose.nix
default.nix kconfigwidgets kfilemetadata kjs.nix ktexteditor.nix qqc2-desktop-style.nix
extra-cmake-modules kcontacts.nix kglobalaccel.nix kjsembed.nix ktextwidgets.nix solid.nix
fetch.sh kcoreaddons.nix kguiaddons.nix kmediaplayer.nix kunitconversion.nix sonnet.nix
frameworkintegration.nix kcrash.nix kholidays.nix knewstuff kwallet.nix srcs.nix
kactivities-stats.nix kdav.nix khtml.nix knotifications.nix kwayland.nix syndication.nix
kactivities.nix kdbusaddons.nix ki18n.nix knotifyconfig.nix kwidgetsaddons.nix syntax-highlighting.nix
kapidox.nix kdeclarative.nix kiconthemes kpackage kwindowsystem threadweaver.nix
karchive.nix kded.nix kidletime.nix kparts.nix kxmlgui.nix
kauth kdelibs4support kimageformats.nix kpeople.nix kxmlrpcclient.nix
kbookmarks.nix kdesignerplugin.nix kinit kplotting.nix modemmanager-qt.nix
kcalendarcore.nix kdesu kio kpty.nix networkmanager-qt.nix | 17:48:32 |
| hexa | * ❯ ls pkgs/development/libraries/kde-frameworks
attica.nix kcmutils kdewebkit.nix kirigami2.nix kquickcharts.nix oxygen-icons5.nix
baloo.nix kcodecs.nix kdnssd.nix kitemmodels.nix kross.nix plasma-framework.nix
bluez-qt.nix kcompletion.nix kdoctools kitemviews.nix krunner.nix prison.nix
breeze-icons.nix kconfig.nix kemoticons.nix kjobwidgets.nix kservice purpose.nix
default.nix kconfigwidgets kfilemetadata kjs.nix ktexteditor.nix qqc2-desktop-style.nix
extra-cmake-modules kcontacts.nix kglobalaccel.nix kjsembed.nix ktextwidgets.nix solid.nix
fetch.sh kcoreaddons.nix kguiaddons.nix kmediaplayer.nix kunitconversion.nix sonnet.nix
frameworkintegration.nix kcrash.nix kholidays.nix knewstuff kwallet.nix srcs.nix
kactivities-stats.nix kdav.nix khtml.nix knotifications.nix kwayland.nix syndication.nix
kactivities.nix kdbusaddons.nix ki18n.nix knotifyconfig.nix kwidgetsaddons.nix syntax-highlighting.nix
kapidox.nix kdeclarative.nix kiconthemes kpackage kwindowsystem threadweaver.nix
karchive.nix kded.nix kidletime.nix kparts.nix kxmlgui.nix
kauth kdelibs4support kimageformats.nix kpeople.nix kxmlrpcclient.nix
kbookmarks.nix kdesignerplugin.nix kinit kplotting.nix modemmanager-qt.nix
kcalendarcore.nix kdesu kio kpty.nix networkmanager-qt.nix
| 17:48:56 |
| hexa | fetch.sh is just WGET_ARGS=( https://download.kde.org/stable/frameworks/5.87/ -A '*.tar.xz' ) | 17:49:51 |
| hexa | In reply to @sternenseemann:systemli.org
hexa: just regenerate? "just" | 17:50:08 |
| hexa | merged. | 17:51:55 |
| hexa | fwiw: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks | 17:53:39 |
 Ryan Burns | Has the darwin coreutils 9 -> 8 downgrade been reverted on staging-next | 17:54:01 |
 moritz.hedtke | Don't think so | 17:59:05 |
| moritz.hedtke | * Don't think so (https://raw.githubusercontent.com/NixOS/nixpkgs/da1f24822928ad74741d41526a2914231500b21d/pkgs/top-level/all-packages.nix) | 17:59:12 |
 das_j | No, it has not | 18:01:41 |
| das_j | I was told (I don't know by who) to wait for the next staging cycle so we can get this merged first without more breakages | 18:02:03 |
| moritz.hedtke | In reply to @janne.hess:helsinki-systems.de
I was told (I don't know by who) to wait for the next staging cycle so we can get this merged first without more breakages I think the reasoning was because the hydra darwin workers are not working well | 18:02:35 |
| Sandro | In reply to @hexa:lossy.network
you mean merge conflicts? yeah. Not sure if this can be done easily | 18:13:08 |
| moritz.hedtke | Fix git :D. Just add a custom merge algorithm that takes generated files into account :D | 18:13:44 |
| Sandro | you can actually do such things in git already but I don't fully know how and it surely does not work on GitHub | 18:17:40 |
| Ryan Burns | In reply to @moritz.hedtke:matrix.org
Fix git :D. Just add a custom merge algorithm that takes generated files into account :D just! | 18:18:56 |
| moritz.hedtke | In reply to @r-burns:matrix.org
just! I think the main problem would be that the ways files are generated in the repository is not clearly specified in a machine-readable form. Otherwise I assume this would be not too hard | 18:20:26 |
| Sandro | the problem is rather which entry wins | 18:21:12 |
