Commit Graph

1602 Commits

Author SHA1 Message Date
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Sandro
7aef69e156
Merge pull request #109835 from r-ryantm/auto-update/glab
glab: 1.11.1 -> 1.13.1
2021-01-18 23:56:24 +01:00
Sandro
3c1286c49b
Merge pull request #109834 from r-ryantm/auto-update/gitflow
gitflow: 1.12.2 -> 1.12.3
2021-01-18 23:23:21 +01:00
Sandro
ae73cf38c3
Merge pull request #109833 from r-ryantm/auto-update/git-workspace
git-workspace: 0.7.0 -> 0.8.0
2021-01-18 23:23:04 +01:00
R. RyanTM
750a287640 glab: 1.11.1 -> 1.13.1 2021-01-18 22:00:55 +00:00
R. RyanTM
c43ab02c67 gitflow: 1.12.2 -> 1.12.3 2021-01-18 21:56:44 +00:00
R. RyanTM
90344c1b40 git-workspace: 0.7.0 -> 0.8.0 2021-01-18 21:37:14 +00:00
R. RyanTM
4e58963af8 git-ignore: 1.0.0 -> 1.1.1 2021-01-18 21:24:20 +00:00
Sebastian Pipping
b706315dfc git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
Also propagates move of repository from https://github.com/esc/git-big-picture
to https://github.com/git-big-picture/git-big-picture .

Upstream change log at
https://github.com/git-big-picture/git-big-picture#changelog
2021-01-17 23:58:42 +01:00
Anderson Torres
f0e757d98a
Merge pull request #108513 from languitar/patch-1
pass-git-helper: 1.1.0 -> 1.1.1
2021-01-16 16:27:01 -03:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Johannes Wienke
15bbb7deec pass-git-helper: 1.1.0 -> 1.1.1
Bump package and add new test requirements.
2021-01-15 12:15:27 +01:00
Alyssa Ross
3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
yoctocell
0714396196
gitAndTools.gita: 0.10.10 -> 0.11.9 2021-01-12 19:59:55 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Sandro
fbe1d82c01
Merge pull request #108656 from xwvvvvwx/radicle-upstream-0.1.6
radicle-upstream: 0.1.5 -> 0.1.6
2021-01-07 12:32:05 +01:00
David Terry
c75a976845
radicle-upstream: 0.1.5 -> 0.1.6 2021-01-07 11:48:50 +01:00
Mario Rodas
b3f079e40c
Merge pull request #107012 from DamienCassou/DamienCassou/git-when-merged
gitAndTools.git-when-merged: init at 1.2.0
2021-01-06 17:30:53 -05:00
Mario Rodas
9cd62d08d5 gitAndTools.lab: 0.17.2 -> 0.18.0
https://github.com/zaquestion/lab/releases/tag/v0.18.0
2021-01-05 22:25:32 -05:00
zowoq
e791ab1241 gitAndTools.delta: 0.5.0 -> 0.5.1
https://github.com/dandavison/delta/releases/tag/0.5.1
2021-01-06 05:55:10 +10:00
zowoq
fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
Tim Steinbach
4c9414d31c hub: Add test 2021-01-02 15:43:01 -05:00
Tim Steinbach
0576111e8a hub: Replace git references
Hub fetches git from the environment by default.
This can lead to hub installations without git available, which makes little sense.
The change replaces the references with fully-qualified calls to git
2021-01-02 15:43:01 -05:00
Maximilian Bosch
e7d1be840c
treewide: remove maintainership of ma27 from a few packages
Those are packages I don't use anymore for a longer time and I therefore
don't think that listing me as maintainer is a good idea. If those
should be removed now, I'd be fine with that.

SuperSandro2000 will take care of a few packages[1].

[1] https://github.com/NixOS/nixpkgs/pull/108126#pullrequestreview-560599381
2021-01-01 19:48:01 +01:00
Frederik Rietdijk
f3b4ae8402 Merge staging-next into staging 2020-12-31 13:29:55 +01:00
zowoq
119e770ca3 gitAndTools.delta: 0.4.5 -> 0.5.0
https://github.com/dandavison/delta/releases/tag/0.5.0
2020-12-31 11:19:34 +10:00
Michael Weiss
61ae600daf
git: 2.29.2 -> 2.30.0 (#107828)
The removed patch was merged into Git 2.30:
3569e11d69

And the disabled test is new in Git 2.30.
2020-12-29 11:19:28 +01:00
Martin Weinelt
d80f32edd1
Merge pull request #107835 from mweinelt/gitstatus
gitstatus: 1.4.3 -> 1.4.4
2020-12-29 02:22:25 +01:00
Martin Weinelt
72c33c3b62 gitAndTools.gitstatus: clarify license is gpl3Only 2020-12-29 00:14:19 +01:00
Martin Weinelt
28136138a6 gitAndTools.gitstatus: 1.4.3 -> 1.4.4 2020-12-29 00:14:16 +01:00
IvarWithoutBones
0c971e7bc5 gitAndTools.ghr: init at 0.13.0 2020-12-28 03:51:36 +01:00
Maximilian Bosch
f456a8c482
Merge pull request #107401 from yanganto/gitui-11
gitAndTools.gitui: 0.10.1 -> 0.11.0
2020-12-23 21:18:33 +01:00
zowoq
56139b3dfd gitAndTools.delta: 0.4.4 -> 0.4.5
https://github.com/dandavison/delta/releases/tag/0.4.5
2020-12-23 22:01:38 +10:00
Antonio Yang
044cd65ef0 gitui: 0.10.1 -> 0.11.0 2020-12-22 21:50:57 +08:00
Travis CI
5b5ee84a3b gitAndTools.git-machete: 2.15.7 -> 2.15.9
###### 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-12-19 22:56:37 +00:00
Damien Cassou
ffcc723c73
gitAndTools.git-when-merged: init at 1.2.0 2020-12-16 17:28:00 +01:00
zowoq
ee275b02c1 gitAndTools.gh: 1.3.1 -> 1.4.0
https://github.com/cli/cli/releases/tag/v1.4.0
2020-12-16 05:50:32 +10:00
David Terry
9062c1ecff
radicle-upstream: init at 0.1.5 2020-12-15 12:58:38 +01:00
github-actions[bot]
884a0b091b
Merge master into staging-next 2020-12-04 00:37:25 +00:00
zowoq
fa1a819492 gitAndTools.gh: 1.3.0 -> 1.3.1
https://github.com/cli/cli/releases/tag/v1.3.1
2020-12-04 07:45:19 +10:00
github-actions[bot]
58274c4f8d
Merge master into staging-next 2020-12-03 00:36:28 +00:00
R. RyanTM
a26d53abee git-secret: 0.3.2 -> 0.3.3 2020-12-02 05:56:09 +00:00
Andreas Rammhold
c3452dae0e
Merge pull request #105498 from raboof/git-reproducible-docs
git: make manual reproducible
2020-12-01 10:30:05 +01:00
Arnout Engelen
91099b08ae
git: make manual reproducible
This makes the git HTML manual reproducible.

It also removes the `git.info` manual, since this one is
basically entirely broken anyway. This likely happened
when we migrated from asciidoc to asciidoctor in #102020.
I don't suggest going back to asciidoc: that would
re-introduce a python2 dependency and another
reproducibility issue with the HTML docs.

Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-01 08:33:58 +01:00
Doron Behar
14b61ec8eb
Merge pull request #105044 from freezeboy/add-glab
gitAndTools.glab: init at 1.11.1
2020-11-28 18:15:47 +02:00
R. RyanTM
0acf2268f3 gitAndTools.gitstatus: 1.3.1 -> 1.4.3 2020-11-27 21:42:59 +00:00
freezeboy
2f2166f40d gitAndTools.glab: init at 1.11.1 2020-11-27 07:11:15 +01:00
Sandro
48feb84a9d
Merge pull request #101185 from SuperSandro2000/lab-xdg-open
gitAndTools.lab: wrap xdg-open to fix `lab mr browse`
2020-11-26 22:07:19 +01:00
Sandro
8585991bfb
Merge pull request #100758 from SuperSandro2000/git-delete-merged-branches 2020-11-26 03:52:46 +01:00