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

Freerdp backport #87392

Merged
merged 3 commits into from May 11, 2020
Merged

Freerdp backport #87392

merged 3 commits into from May 11, 2020

Conversation

@lheckemann
Copy link
Member

lheckemann commented May 9, 2020

Motivation for this change

Security fixes
cc @peterhoeg @mweinelt @FRidh (thanks for the involvement)

Things done
lheckemann and others added 3 commits Apr 11, 2020
* freerdp: 2.0.0-rc4 -> 2.0.0

* freerdp: add Xtst for input in shadow server, libxslt for manpages

* freerdp: nits

(cherry picked from commit 156ee19)
(cherry picked from commit f29648e)

Original PR: #87285
@mweinelt
Copy link
Member

mweinelt commented May 9, 2020

Result of nixpkgs-review pr 87392 1

6 packages built:
- freerdp (freerdpUnstable)
- gnome3.gnome-boxes
- krdc (kdeApplications.krdc)
- remmina
- virt-manager-qt
- weston
Copy link
Contributor

bjornfor left a comment

That last commit seems to be cherry-picked not from master (github doesn't know which branch).

@FRidh
Copy link
Member

FRidh commented May 10, 2020

Yes, that's because I often rebase commits of PR's instead of merge branches to avoid all the noise in the history. IMO backport PR's should not be opened before the original change is in but it seems it has become common practice.

@peterhoeg
Copy link
Member

peterhoeg commented May 11, 2020

IMO backport PR's should not be opened before the original change is in

💯 to that

Let's get this in asap.

@peterhoeg peterhoeg merged commit 9399cc7 into NixOS:release-20.03 May 11, 2020
17 checks passed
17 checks passed
freerdp, freerdp.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
freerdp, freerdp.passthru.tests on aarch64-linux Success
Details
freerdp, freerdp.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7d9eac6"; rev="7d9eac67b718b8236f8dca20cc5c8efcb2fcee25"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@FRidh
Copy link
Member

FRidh commented May 11, 2020

Without fixing up the reference? ok...

@lheckemann lheckemann deleted the lheckemann:freerdp-backport branch May 11, 2020
@lheckemann
Copy link
Member Author

lheckemann commented May 11, 2020

Aah, I did open this PR after the original, but grabbed the commit ID from the PR view :/

@FRidh
Copy link
Member

FRidh commented May 11, 2020

Yes, that can't be trusted if the change is rebased instead of merged. Confusing.

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

5 participants
You can’t perform that action at this time.