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

Jump to bottom

kde-applications: 18.12.1 -> 18.12.3 #56155

Closed
wants to merge 2 commits into from
Closed

kde-applications: 18.12.1 -> 18.12.3 #56155

wants to merge 2 commits into from

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Feb 21, 2019 •
edited

Motivation for this change

Also including improvement for the fetch-kde-qt.sh script. I changed it so it only needs to download metadata from the KDE and Qt website instead of every source tarball. Because of this the fetch.sh needs to be updated and may cause conflicts with already opened PR like #55847 and #55650 (I could update mt branch accordingly once they are merged)

I also fixed a conflict with akonadi-paths.patch patch.

Also should I update existing hashes in src.nix ? This would only convert existing base32 hashes into hexa.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS (only some packages)
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
    • nixos.tests.plasma5.x86_64-linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member

dtzWill commented Feb 21, 2019

#55549

But this looks better, so assuming this is the same + fix I can close the other :).

@FRidh FRidh added this to the 19.03 milestone Feb 23, 2019
@nyanloutre
Copy link
Member Author

#55549

But this looks better, so assuming this is the same + fix I can close the other :).

Oh sorry, I didn't saw your PR before opening this one

nyanloutre
nyanloutre commented Feb 23, 2019
View reviewed changes
maintainers/scripts/fetch-kde-qt.sh
@@ -38,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
url="${src:2}"
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
url="$(dirname "${src:2}")/$filename"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe $filename is not safe here as the original name is modified

@lheckemann
Copy link
Member

@GrahamcOfBorg test plasma5

@nyanloutre
Copy link
Member Author

@lheckemann the build seems to have timed out

@lheckemann
Copy link
Member

Aw, that's a bummer. Since it's a minor version bump though I suppose we can still backport it to 19.03 after the branch-off.

@nyanloutre
Copy link
Member Author

18.12.3 is out, I will update this PR later today

@worldofpeace
Copy link
Contributor

@nyanloutre Would you mind moving this to https://kde.org/announcements/announce-applications-18.12.3.php?

I can test this locally and see if we can get a backport.

@dtzWill dtzWill changed the title kde-applications: 18.12.1 -> 18.12.2 kde-applications: 18.12.1 -> 18.12.3 Mar 26, 2019
@dtzWill
Copy link
Member

dtzWill commented Mar 26, 2019

@nyanloutre Would you mind moving this to https://kde.org/announcements/announce-applications-18.12.3.php?

Looks like this was done a while back, see the commits. Updated title accordingly :).

@worldofpeace
Copy link
Contributor

Ahh I see. Off to test then.

@worldofpeace
Copy link
Contributor

Also, do we really want this to go to staging?

@worldofpeace
Copy link
Contributor

worldofpeace commented Mar 27, 2019 •
edited

I've built all the directly affected applications and ran the NixOS test for good measure yesterday.

Minor version bumps in here are usually fine so this should be ready.

@infinisil
Copy link
Member

Yeah I think master would be better

@worldofpeace
Copy link
Contributor

Merged to master in 7e8d125...b16b1b3

Note that #55614 and #55650 are in staging so we should anticipate a little conflict because of 4b7d9dc

@worldofpeace
Copy link
Contributor

Backport was mentioned so I will pr that to see if that's still on the table (I have no problems with it)

@worldofpeace worldofpeace mentioned this pull request Mar 28, 2019
Merged
10 tasks
@nyanloutre nyanloutre deleted the kde-update branch March 29, 2019 10:11
@nyanloutre nyanloutre mentioned this pull request Apr 1, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
19.03
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nyanloutre @dtzWill @lheckemann @worldofpeace @infinisil @FRidh @GrahamcOfBorg