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
Update geary to 0.12.2 from master branch #40844
Closed
Closed
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
(cherry picked from commit b6dbdaa)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmr-stak/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak -h’ got 0 exit code - ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak --help’ got 0 exit code - found 2.4.3 with grep in /nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3 - directory tree listing: https://gist.github.com/ba044f08ae439ad36ac7e143f14e0fb0 (cherry picked from commit 42f2bd3)
It just fails at runtime otherwise. (cherry picked from commit 701f222)
Also switch to using zipped update site provided on GitHub. (cherry picked from commit f54a999)
(cherry picked from commit 9b57937) Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notmuch/versions. These checks were done: - built on NixOS - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --help’ got 0 exit code - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch help’ got 0 exit code - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --version’ and found version 0.26.1 - found 0.26.1 with grep in /nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1 - directory tree listing: https://gist.github.com/adeae189f9ac416571a7c0e3beca712f
(cherry picked from commit 2848b5d)
(cherry picked from commit 954e02f)
(cherry picked from commit d974161)
(cherry picked from commit e609551)
notmuch: add missing "patchShebangs configure"
notmuch: 0.26 -> 0.26.1
build failed with "log limit exceeded", disable verbose logging (cherry picked from commit 223aad2)
kdeApplications.mbox-importer: fix hydra build [18.03]
(cherry picked from commit e0ad325)
(cherry picked from commit 14ebf24)
Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes
The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium. https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux See also #39476
(cherry picked from commit 59ad993)
(cherry picked from commit ddec4ae)
(cherry picked from commit 775bbc2)
(cherry picked from commit 04ab1ed)
(cherry picked from commit 783fb86)
(cherry picked from commit 7673593)
GrahamcOfBorg
added
6.topic: golang
6.topic: haskell
6.topic: nixos
6.topic: printing
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: steam
6.topic: vim
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
8.has: module (update)
2.status: merge conflict
labels
May 20, 2018
$ git remote add upstream https://github.com/NixOS/nixpkgs
$ git fetch upstream release-18.03 master
$ git checkout upstream release-18.03
$ git checkout -b geary-backport
$ git cherry-pick -x <commit-from-master>
$ git push origin master under the assumption that origin is your nixpkgs fork. |
zimbatm
requested review from
lucabrunox and
jtojnar
and removed request for
zimbatm,
edolstra,
edwtjo,
peti,
Ericson2314,
FRidh,
LnL7,
Mic92,
nbp,
rycee and
ttuegel
May 21, 2018 14:38
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
2.status: merge conflict
6.topic: erlang
6.topic: fetch
6.topic: GNOME
GNOME desktop environment and its underlying platform
6.topic: golang
6.topic: haskell
6.topic: nixos
6.topic: printing
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: steam
6.topic: vim
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
8.has: module (update)
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
Geary 0.12.2 fixes an annoying bug.
I've just copied the file from master branch.
I didn't test it because i do not know how.
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)