-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
Closed
dotnet.sdk: 2.2.6 -> 3.0.100 #72257
+28,224
−17,388
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.1 (cherry picked from commit 4b656c7)
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)
https://sw.kovidgoyal.net/kitty/changelog.html#id1 (cherry picked from commit 04d6fa1)
(cherry picked from commit b7c5073)
(cherry picked from commit 8e09b94)
(cherry picked from commit e32515a)
(cherry picked from commit 07891af)
(cherry picked from commit ec0d11a)
(cherry picked from commit 52af1d0)
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)
I think you started on the wrong branch... |
Hi Jon,
Sorry, I'm very new to this :)
Which branch should I use?
…On Tue, Oct 29, 2019 at 4:48 PM Jon ***@***.***> wrote:
I think you started on the wrong branch...
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#72257?email_source=notifications&email_token=AFA2X3PKEHBSXJJVCAXKTVDQRBLLXA5CNFSM4JGKANL2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOECRAO5A#issuecomment-547489652>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AFA2X3LV32ULSN4CO6J5L43QRBLLXANCNFSM4JGKANLQ>
.
--
Best regards,
Evgeny Zemtsov
|
@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
This presupposes that I call the NixOS/nixpkgs remote by the name of upstream
|
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
Labels
2.status: merge conflict
This PR has merge conflicts with the target branch
6.topic: erlang
6.topic: GNOME
GNOME desktop environment and its underlying platform
6.topic: golang
6.topic: haskell
6.topic: lua
6.topic: nixos
Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS
6.topic: pantheon
The Pantheon desktop environment
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: TeX
Issues regarding texlive and TeX in general
6.topic: vim
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
This PR adds or changes documentation
8.has: module (update)
This PR changes an existing module in `nixos/`
12. first-time contribution
This PR is the author's first one; please be gentle!
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @kuznero @jdanekrh