Commit graph

3558 commits

Author SHA1 Message Date
Martin Weinelt 46769c7a77
Merge pull request #104307 from jonringer/fix-mercurial
mercurial: 5.4.2 -> 5.6, fix build
2020-11-19 23:43:04 +01:00
Jonathan Ringer 81d1cea1c0 mercurial: 5.4.2 -> 5.6 2020-11-19 11:29:46 -08:00
Jonathan Ringer 635485b85c mercurial: remove dulwich dependency 2020-11-19 11:25:52 -08:00
Ryan Mulligan 74eb38ffd5
Merge pull request #104124 from r-ryantm/auto-update/gitkraken
gitkraken: 7.3.2 -> 7.4.0
2020-11-19 09:49:07 -08:00
R. RyanTM 5544734b23 gitkraken: 7.3.2 -> 7.4.0 2020-11-18 03:46:26 +00:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Vladyslav M 65e0474c7a
pijul: 1.0.0-alpha.1 -> 1.0.0-alpha.3 2020-11-16 21:49:15 +02:00
Maximilian Bosch a9a1423377
gitea: 1.12.5 -> 1.12.6
https://github.com/go-gitea/gitea/releases/tag/v1.12.6
2020-11-16 17:37:12 +01:00
Maximilian Bosch fdeba5ef32
Merge pull request #103873 from r-ryantm/auto-update/git-cola
git-cola: 3.5 -> 3.8
2020-11-16 13:30:47 +01:00
R. RyanTM acf82008ab git-cola: 3.5 -> 3.8 2020-11-15 05:44:05 +00:00
Vladyslav M a429039a1f
pijul: 1.0.0-alpha -> 1.0.0-alpha.1 2020-11-14 23:21:01 +02:00
zowoq 1e53f7e10b gitAndTools.gh: 1.2.0 -> 1.2.1
https://github.com/cli/cli/releases/tag/v1.2.1
2020-11-11 15:08:15 -08:00
Vladyslav M dd4ebbc91f
Merge pull request #102968 from dywedir/anu
pijul: 0.12.0 -> 1.0.0-alpha
2020-11-11 18:06:03 +02:00
Robert Hensing 3f7278f9e9
Merge pull request #101341 from SuperSandro2000/gitlab-triage
gitlab-triage: init at 1.13.0
2020-11-10 19:14:29 +01:00
Andrew Childs 4e2a217211
gitui: fix darwin build (#103194)
Fixes:

  = note: ld: warning: passed two min versions (10.12.0, 10.12) for platform macOS. Using 10.12.
          ld: framework not found AppKit
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
2020-11-10 10:13:52 -05:00
Vladyslav M 2e1400173b
pijul: 0.12.0 -> 1.0.0-alpha 2020-11-09 21:05:03 +02:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Robert Hensing 349288d101
Merge pull request #100582 from ldenefle/git-chglog-0.9.1
gitAndTools.git-chglog: init at 0.9.1
2020-11-05 22:39:07 +01:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Mario Rodas 422d223757 git-lfs: 2.12.0 -> 2.12.1
https://github.com/git-lfs/git-lfs/releases/tag/v2.12.1
2020-11-04 04:20:00 +00:00
Maximilian Bosch 988e44c3e6
Merge pull request #102567 from VirtusLab/git-machete-2.15.7
gitAndTools.git-machete: 2.15.6 -> 2.15.7
2020-11-04 00:18:52 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Mario Rodas 76ff5a73c7 gitAndTools.git-absorb: 0.6.5 -> 0.6.6 2020-11-02 22:00:00 -05:00
Travis CI 6373a64873 gitAndTools.git-machete: 2.15.6 -> 2.15.7
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  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
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2020-11-03 01:53:25 +00:00
Mario Rodas eb64ee0a46
Merge pull request #102295 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 6.0.0 -> 6.1.0
2020-11-02 18:10:23 -05:00
Mario Rodas c1d13cde94
Merge pull request #102430 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0
2020-11-02 04:53:13 -05:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM 73e3b14503 gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0 2020-11-02 05:48:03 +00:00
Jonathan Ringer 9122b454f6 csv_fast_export: use python3 2020-11-01 10:54:30 -08:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Frederik Rietdijk 7a8d5dc8a6 Merge master into staging-next 2020-11-01 10:10:47 +01:00
Mario Rodas 26d3fbf215
Merge pull request #102310 from r-ryantm/auto-update/git-gone
gitAndTools.git-gone: 0.3.6 -> 0.3.7
2020-10-31 23:00:45 -05:00
Mario Rodas 76fdf69296
Merge pull request #102303 from r-ryantm/auto-update/git-trim
gitAndTools.git-trim: 0.4.0 -> 0.4.2
2020-10-31 22:11:55 -05:00
R. RyanTM 5535343769 gitAndTools.git-gone: 0.3.6 -> 0.3.7 2020-11-01 02:35:57 +00:00
R. RyanTM 0c77c15642 gitAndTools.git-trim: 0.4.0 -> 0.4.2 2020-11-01 01:10:34 +00:00
R. RyanTM 3408bddacf gitAndTools.git-extras: 6.0.0 -> 6.1.0 2020-11-01 00:15:25 +00:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Michael Weiss 6a1782986d
git: 2.29.1 -> 2.29.2 2020-10-30 13:55:20 +01:00
Sebastien Braun bbf96d898b
git: Use asciidoctor instead of asciidoc for manpages
Asciidoc is severely outdated and is replaced by asciidoctor.
Eliminating asciidoc gets rid of a python2 dependency, see
https://github.com/NixOS/nixpkgs/issues/101964
2020-10-30 10:48:33 +01:00
MetaDark ff4a1cf4d8 git-review: build with python3
Also updated source to the new repo and added myself as a maintainer
2020-10-29 16:01:12 -07:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
zowoq f2eb36b889 gitAndTools.gh: 1.1.0 -> 1.2.0
https://github.com/cli/cli/releases/tag/v1.2.0
2020-10-28 00:38:12 +10:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát 2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
WORLDofPEACE 949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00