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

dotnet.sdk: 2.2.6 -> 3.0.100 #72257

Closed
wants to merge 724 commits into from
Closed

Conversation

ezemtsov
Copy link
Contributor

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @kuznero @jdanekrh

r-ryantm and others added 30 commits September 26, 2019 23:43
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secret/versions

(cherry picked from commit db7433d)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gradio/versions

(cherry picked from commit e146b13)
[19.09] signal-desktop: 1.27.2 -> 1.27.3 (backport)
Mucommander 0.9.3-3 was released in January 2019.

* comment out `proguard.enabled = ...` in build.gradle
* use Gradle 4.10 (upstream uses 4.8)
* fix version in build.gradle
This commits makes it clearer to a novice reader how to configure several
diferent types of SSID connections that were otherwise obscurely documented

Resolves NixOS#66650

(cherry picked from commit cce7486)
These don't use a the virtualbox sources, but an iso as src, and we need
to add the kernel 5.3 patch aswell.

As for some reason the source files are present on the .iso with Windows
Line endings (sic!), call dos2unix first.

Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
itself, as some files are missing and paths are different.

(cherry picked from commit 61f0f8d)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atlassian-jira/versions

(cherry picked from commit a8dc4e3)
(cherry picked from commit 39d7eeb)
Also close pointless diff with 8.8.1.

(cherry picked from commit b55854c)
(cherry picked from commit f6a8944)
(cherry picked from commit e331f65)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions

(cherry picked from commit 62c55bc)
GDM isn't dangerous anymore in NixOS.

(cherry picked from commit e4cce87)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kitty/versions

(cherry picked from commit c03a40a)
(cherry picked from commit 8e09b94)
(cherry picked from commit e32515a)
(cherry picked from commit 07891af)
(cherry picked from commit ec0d11a)
hdf5: Fix dependencies and flavors with multiple outputs
(cherry picked from commit a005d2e)
Re-tested both on 19.09.
* python3Packages.flit: fix tests

* python: fix flit setup hook

(cherry picked from commit 28af6ac)
TL;DR: ipv6 tests were broken (probably the privacy-extension stuff)
NixOS#68227 (comment)

(cherry picked from commit 4c07c0f)
@jonringer
Copy link
Contributor

I think you started on the wrong branch...

@ezemtsov ezemtsov closed this Oct 29, 2019
@ezemtsov
Copy link
Contributor Author

ezemtsov commented Oct 30, 2019 via email

@jirkadanek
Copy link
Member

jirkadanek commented Oct 30, 2019

@ezemtsov Hi, simply rebase the commit onto the current master and force-push it. You can then reopen the PR.

I'd do something like

git fetch --all
git pull --rebase upstream master --autostash
git push --force

This presupposes that I call the NixOS/nixpkgs remote by the name of upstream

% git remote -v
origin  git@github.com:jdanekrh/nixpkgs.git (fetch)
origin  git@github.com:jdanekrh/nixpkgs.git (push)
upstream        git://github.com/NixOS/nixpkgs.git (fetch)
upstream        git://github.com/NixOS/nixpkgs.git (push)

@ezemtsov ezemtsov deleted the dotnet-sdk-3-upgrade branch October 30, 2019 13:39
@jirkadanek
Copy link
Member

It was a duplicate of #69392 anyways, if I am looking correctly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet