3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2123 commits

Author SHA1 Message Date
Alyssa Ross 4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot] 0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
figsoda 91137787da
Merge pull request from r-ryantm/auto-update/git-machete
git-machete: 3.4.1 -> 3.5.0
2021-11-13 23:16:32 -05:00
R. Ryantm 04bfd3c8e1 git-machete: 3.4.1 -> 3.5.0 2021-11-14 01:41:34 +00:00
figsoda 25ae74d855 glitter: 1.5.3 -> 1.5.4 2021-11-13 17:05:21 -05:00
github-actions[bot] 914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot] 4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
figsoda e7200f5810 glitter: 1.5.2 -> 1.5.3 2021-11-13 10:55:13 -05:00
Alyssa Ross 26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
figsoda 8fff522ff9 glitter: 1.5.1 -> 1.5.2 2021-11-12 20:10:36 -05:00
github-actions[bot] e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot] c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
figsoda 3190ece3b2 glitter: 1.5.0 -> 1.5.1 2021-11-12 16:08:58 -05:00
github-actions[bot] 65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot] 699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
figsoda 3e81f958f8
Merge pull request from sikmir/git-big-picture
git-big-picture: enable on darwin
2021-11-12 08:14:24 -05:00
Nikolay Korotkiy f8f1015885
git-big-picture: enable on darwin 2021-11-12 14:41:53 +03:00
figsoda 433739b9b3 glitter: 1.4.10 -> 1.5.0 2021-11-11 19:05:57 -05:00
github-actions[bot] aa164b77b8
Merge staging-next into staging 2021-11-08 00:02:29 +00:00
John Ericson 4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
Felix Buehler b52ab3b712 pkgs/applications: rename name to pname&version part 2 2021-11-07 14:53:06 +01:00
Artturin e7dbe3bd20 git: fix build with strictDeps 2021-11-05 19:57:03 +02:00
Artturi 219339e02a
Merge pull request from ck3d/fix-cross-git 2021-11-05 14:01:41 +02:00
Christian Kögler 7bfd3a8454 gitMinimal: Fix wrong shell for cross compiled package 2021-11-04 00:36:15 +02:00
github-actions[bot] bf39715fe0
Merge staging-next into staging 2021-11-03 12:01:58 +00:00
Bobby Rong 2f83900c54
Merge pull request from r-ryantm/auto-update/stgit
stgit: 1.3 -> 1.4
2021-11-03 17:17:07 +08:00
Alyssa Ross 703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Felix Buehler 7dfb853434 svn2git: switch to fetchFromGitHub 2021-11-02 19:49:30 +01:00
tomberek 839750c207
Merge pull request from 0x4A6F/master-gst
gst: 5.0.4 -> 5.0.5
2021-11-02 14:33:30 -04:00
0x4A6F 257d8365cf
gst: 5.0.4 -> 5.0.5 2021-11-02 15:49:37 +01:00
github-actions[bot] fdcee2eb3b
Merge staging-next into staging 2021-10-31 00:02:05 +00:00
github-actions[bot] 81d84138b5
Merge master into staging-next 2021-10-31 00:01:33 +00:00
figsoda ccdaa135c6
Merge pull request from r-ryantm/auto-update/delta
delta: 0.9.1 -> 0.9.2
2021-10-30 16:57:40 -04:00
R. Ryantm 5acdca8beb delta: 0.9.1 -> 0.9.2 2021-10-30 17:32:30 +00:00
figsoda 3b02a12f2a lucky-commit: fix darwin build 2021-10-30 12:48:45 -04:00
R. Ryantm 63c8c1c8c3 stgit: 1.3 -> 1.4 2021-10-28 21:02:06 +00:00
Alyssa Ross 3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
github-actions[bot] 783f3c33e5
Merge master into staging-next 2021-10-28 06:01:14 +00:00
Benoit de Chezelles 631baa9ab9 delta: 0.8.3 -> 0.9.1 2021-10-28 04:53:28 +02:00
github-actions[bot] 22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
figsoda d7d45aadf2 lucky-commit: use checkNoDefaultFeatures 2021-10-27 08:08:03 -04:00
Mrinal Purohit 12908d7a48 gh: 2.1.0 -> 2.2.0 2021-10-27 15:43:30 +05:30
Vladimír Čunát 20ecf57704
Merge : git: disable t5003 on darwin (into staging-next) 2021-10-25 08:14:10 +02:00
Martin Weinelt c1fe3d4cda
git: disable t5003 on darwin
The following failure was visible on v2.33.1 on staging-next.

t5003-archive-zip.sh ............................... 1/?
not ok 1 - populate workdir
t5003-archive-zip.sh ............................... Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/76 subtests
        (less 58 skipped subtests: 17 okay)
2021-10-25 01:48:23 +02:00
github-actions[bot] 6d5b2c70e0
Merge master into staging-next 2021-10-24 00:01:46 +00:00
Henri Menke daf3ce27e3
git-branchless: 0.3.6 -> 0.3.7 2021-10-23 15:17:04 +02:00
github-actions[bot] c93daf97af
Merge master into staging-next 2021-10-22 18:01:15 +00:00
figsoda 7f1866e127 lucky-commit: init at 2.1.0 2021-10-22 12:06:15 -04:00
github-actions[bot] ba32b28e59
Merge master into staging-next 2021-10-20 18:01:18 +00:00
R. RyanTM 531f2bfd7d git-cola: 3.10.1 -> 3.11.0 2021-10-20 10:45:48 +00:00
Vladimír Čunát 01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Henri Menke 39b8cfebed
git-branchless: 0.3.2 -> 0.3.6 2021-10-19 16:10:09 +02:00
figsoda 22ccc96532 glitter: 1.4.4 -> 1.4.10 2021-10-18 20:54:37 -04:00
github-actions[bot] b0a41194a1
Merge master into staging-next 2021-10-18 18:01:14 +00:00
Fabián Heredia Montiel 48c041f234 git-fast-export: 200213 → 210917 2021-10-17 19:48:10 -05:00
Martin Weinelt a415d5dd2e Merge remote-tracking branch 'origin/master' into staging-next 2021-10-15 23:10:08 +02:00
Mifom 7effa9bcb1 gitui: 0.17.1 -> 0.18.0 2021-10-15 14:21:05 +03:00
Martin Weinelt adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Artturi 09ab6a7f0b
Merge pull request from LibreCybernetics/update-thicket 2021-10-15 01:15:34 +03:00
zowoq e1951b3fb2 gh: 2.0.0 -> 2.1.0
https://github.com/cli/cli/releases/tag/v2.1.0
2021-10-15 06:44:28 +10:00
Fabián Heredia Montiel b367ab9ad1 thicket: crystal_1_0 → crystal 2021-10-14 14:26:49 -05:00
figsoda 1a9c6b5ca7
Merge pull request from r-ryantm/auto-update/git-machete
git-machete: 3.3.0 -> 3.4.1
2021-10-14 08:05:02 -04:00
Peter Simons 476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Michael Adler 1c2c055883 git: 2.33.0 -> 2.33.1 2021-10-13 19:39:36 +02:00
figsoda 4c7bf71d8e
git-machete: fix version checks 2021-10-12 22:33:23 -04:00
R. RyanTM 302d33f4d1 git-machete: 3.3.0 -> 3.4.1 2021-10-12 00:47:44 +00:00
happysalada 903dc5bf92 git: darwin: disable flaky tests 2021-10-09 20:27:25 +09:00
Norbert Melzer 9b0a3cf13c lefthook: 0.7.6 -> 0.7.7 2021-10-07 09:20:14 +02:00
Ben Siraphob 2084a6cf0c
Merge pull request from siraben/git-cliff-update
git-cliff: 0.3.0 -> 0.4.0
2021-10-05 06:10:47 +00:00
Ben Siraphob 0afbd8c8a8 git-cliff: 0.3.0 -> 0.4.0 2021-10-05 00:44:38 -05:00
Sandro Jäckel 3f025a3bff
git-extras: 6.2.0 -> 6.3.0 2021-10-03 23:30:07 +02:00
Bobby Rong 2630a4a54c
Merge pull request from drewrisinger/dr-pr-update-glab
glab: 1.20.0 -> 1.21.1
2021-10-01 11:16:15 +08:00
Drew Risinger 52babc1baa glab: 1.20.0 -> 1.21.1 2021-09-30 14:15:04 -04:00
Sandro dec57cb241
Merge pull request from terinjokes/patches/stgit-1.3
stgit: 1.1 -> 1.3
2021-09-30 14:13:13 +02:00
Mario Rodas 094ce6598b lab: 0.22.0 -> 0.23.0
https://github.com/zaquestion/lab/releases/tag/v0.23.0
2021-09-30 04:20:00 +00:00
Harsh Shandilya 0b612ad35a
git-quickfix: init at 0.0.4 2021-09-30 01:17:26 +05:30
Terin Stock 180f709901 stgit: 1.1 -> 1.3 2021-09-28 09:22:44 -07:00
Sandro Jäckel d433cd1ff9 git-extras: move bash completion under share, patch less files 2021-09-28 17:58:06 +02:00
Alyssa Ross 31efca77d1
git-remote-hg: unstable-2020-06-12 -> 1.0.2.1 2021-09-28 08:34:15 +00:00
figsoda e0f52be565
Merge pull request from hmenke/pass-git-helper
pass-git-helper: 1.1.1 -> 1.1.2
2021-09-27 22:16:49 -04:00
Artturin 946154fdb7 thicket: 0.1.4 -> 0.1.5 2021-09-27 00:15:10 +03:00
Henri Menke 65605178bf
pass-git-helper: 1.1.1 -> 1.1.2 2021-09-24 21:12:08 +02:00
Ryan Burns 40299257cc Merge branch 'master' into staging-next 2021-09-23 18:43:00 -07:00
figsoda 69b52d2bdf git-machete: switch to github version to enable tests 2021-09-22 17:45:01 -04:00
github-actions[bot] 09a7436fcc
Merge master into staging-next 2021-09-22 18:01:01 +00:00
superherointj 240faba8b9 git-machete: fix tests 2021-09-22 13:21:04 -03:00
Alyssa Ross b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
figsoda ecca3b5e19 glitter: init at 1.4.4 2021-09-21 16:28:11 -04:00
github-actions[bot] 24a34e5706
Merge staging-next into staging 2021-09-15 12:01:34 +00:00
Bobby Rong a5aaee4a2e
Merge pull request from boppyt/radicle-upstream
radicle-upstream: 0.2.9 -> 0.2.10
2021-09-15 19:47:26 +08:00
Bobby Rong 1395a6fb63
Merge pull request from r-ryantm/auto-update/thicket
thicket: 0.1.4 -> 0.1.5
2021-09-15 15:07:22 +08:00
github-actions[bot] 636ebe3a72
Merge staging-next into staging 2021-09-15 06:01:54 +00:00
github-actions[bot] 5663f4625d
Merge master into staging-next 2021-09-15 06:01:20 +00:00
happysalada 964b74f6b4 gitui: do not compile openssl 2021-09-15 10:48:44 +09:00
R. RyanTM 2ecd21c1cc thicket: 0.1.4 -> 0.1.5 2021-09-15 01:27:07 +00:00
Andreas Rammhold 413da4c0f4
Merge pull request from andir/staging-git
git: disable flaky test & patch shebangs in test scripts
2021-09-14 15:55:42 +02:00
github-actions[bot] 6f038e8b11
Merge master into staging-next 2021-09-14 12:01:03 +00:00
Sandro 9b09f4724a
Merge pull request from r-ryantm/auto-update/topgit 2021-09-14 13:41:54 +02:00
R. RyanTM 9db8c0be81 gitui: 0.17 -> 0.17.1 2021-09-14 11:49:42 +02:00
R. RyanTM e1d6d8138c git-cliff: 0.2.6 -> 0.3.0 2021-09-14 11:48:21 +02:00
Andreas Rammhold 6f3ee459de git: disable flaky test 6421-merge-partial-clone
Occasionally the test fails for unknown reasons but works as soon as we
change the derivation in any way. For now it is better to not have a
test that is flaky than having a test that occasionally breaks and
continously wastes time on debugging it.

This was found as part of a random build failure of gitMinimal in
response to the systemd v249 PR being merged [0].

[0] 64556974b6 (commitcomment-56385360)
2021-09-14 11:24:11 +02:00
Andreas Rammhold a683d78ed0 git: ensure we are using the correct shell binary for tests
Previosuly the test scripts used /bin/sh which is a bit of an impurity.
It is mostly well-behaved but it essentially leaks the hosts state into
the build as /bin/sh points to some minimal shell implementation
configured on the host OS.

By patching the shebgangs of all the test scripts in the test folder
(t/*.sh) we can make sure that those run with the correct shell binary.

This was found as part of a random build failure of gitMinimal in
response to the systemd v249 PR being merged [0]. Since we have to
somehow touch the hash of the derivation to make the build failure go
away we might as well fix the hardcoded /bin/sh issue.

[0] 64556974b6 (commitcomment-56385360)
2021-09-14 11:24:11 +02:00
R. RyanTM 053eff5a46 top-git: 0.19.12 -> 0.19.13 2021-09-14 02:14:31 +00:00
github-actions[bot] a13bf1828b
Merge master into staging-next 2021-09-12 18:01:21 +00:00
Sandro Jäckel a88557ec5f
gitstatus: 1.5.2 -> 1.5.3 2021-09-12 16:36:52 +02:00
Sandro Jäckel ce79b66953
git-interactive-rebase-tool: fix compile error 2021-09-12 15:56:52 +02:00
github-actions[bot] 36ce45efae
Merge master into staging-next 2021-09-10 18:01:17 +00:00
Sandro Jäckel b99bcb5b9f
git-open: add SuperSandro2000 as maintainer 2021-09-10 16:34:56 +02:00
Sandro Jäckel 69e1161ff6
git-open: install man page 2021-09-10 16:34:44 +02:00
github-actions[bot] 2f5ea43e02
Merge master into staging-next 2021-09-07 00:01:32 +00:00
Izorkin 5df4645b39
gitty: init at 0.3.0 2021-09-07 01:02:24 +03:00
github-actions[bot] 79667a59e7
Merge master into staging-next 2021-09-06 00:01:28 +00:00
Ben Siraphob f1312d514d git-cliff: init at 0.2.6 2021-09-05 16:16:35 -05:00
Fabian Affolter e44bb98416 bump2version: 1.0.0 -> 1.0.1 2021-09-05 15:01:20 +02:00
Alyssa Ross c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
Harsh Shandilya 9a21867643 git-branchless: add msfjarvis as co-maintainer 2021-08-31 15:30:09 +00:00
Harsh Shandilya 65be0edee5 git-branchless: add support for Darwin builds 2021-08-31 15:30:09 +00:00
Zack A ef7cb07023
radicle-upstream: 0.2.9 -> 0.2.10 2021-08-30 16:14:22 -07:00
github-actions[bot] 8fb1ff7c31
Merge master into staging-next 2021-08-26 18:01:02 +00:00
Sandro Jäckel bd3377d9d2
git-delete-merged-branches: 6.3.0 -> 6.4.0 2021-08-26 16:29:11 +02:00
github-actions[bot] b13b005f0e
Merge master into staging-next 2021-08-26 12:01:09 +00:00
zowoq 13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
github-actions[bot] 1bf55a993f
Merge master into staging-next 2021-08-26 00:01:37 +00:00
0x4A6F d1f93e7bc6 gst: init at 5.0.4 2021-08-25 19:55:25 -04:00
Maximilian Bosch 52fe17a227
Merge pull request from r-ryantm/auto-update/gitui
gitui: 0.16.2 -> 0.17
2021-08-25 22:29:51 +02:00
Vladimír Čunát 70e05c1003
Merge branch 'master' into staging-next 2021-08-25 19:42:15 +02:00
zowoq ec8a69a184 gh: 1.14.0 -> 2.0.0 2021-08-24 22:12:42 +10:00
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
R. RyanTM 36fa861a29 gitui: 0.16.2 -> 0.17 2021-08-22 19:24:02 +00:00
Sandro Jäckel 905174cb91
git-delete-merged-branches: 6.0.5 -> 6.3.0 2021-08-22 20:09:00 +02:00
github-actions[bot] 095df456c2
Merge staging-next into staging 2021-08-22 06:01:44 +00:00
R. RyanTM a2ce822382 git-filter-repo: 2.32.0 -> 2.33.0 2021-08-22 00:10:46 -04:00
Michael Weiss cfc0b37a05
git: 2.32.0 -> 2.33.0 2021-08-17 11:25:09 +02:00
Jan Tojnar 0aa35561e7 Merge branch 'master' into staging-next 2021-08-14 12:53:07 +02:00
Jörg Thalheim eaaea54a37 hub: fix aarch64-darwin build 2021-08-12 21:45:04 +02:00
github-actions[bot] 234c0d62da
Merge master into staging-next 2021-08-11 18:01:11 +00:00
Jan Tojnar 4e7e464ae8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix
2021-08-11 16:22:42 +02:00
Martin Weinelt c20f28657f glab: 1.19.0 -> 1.20.0 2021-08-11 13:41:28 +02:00
Martin Weinelt 0f9339ef32
glab: expose version, enable tests 2021-08-11 13:40:24 +02:00
Martin Weinelt 75485563d5
Merge pull request from r-ryantm/auto-update/glab 2021-08-11 13:25:45 +02:00
Nikolay Korotkiy 6b9dc66a14 radicle-upstream: 0.2.3 → 0.2.9, enable on darwin 2021-08-11 13:38:12 +09:00
R. RyanTM 4f0e6e9879 glab: 1.18.1 -> 1.19.0 2021-08-10 15:14:36 +00:00
Pascal Bach 293026e7ca
Merge pull request from SuperSandro2000/gitstatus
Gitstatus
2021-08-09 23:24:59 +02:00
github-actions[bot] 610ef47b20
Merge master into staging-next 2021-08-08 18:01:03 +00:00
David Terry c1186b572f
maintainers: xwvvvvwx -> d-xo 2021-08-08 19:11:45 +02:00
R. RyanTM dbae6eea00 ghq: 1.1.7 -> 1.2.1 2021-08-08 12:09:59 +00:00
github-actions[bot] 825ed68c05
Merge master into staging-next 2021-08-08 06:01:18 +00:00
Artturi 709741c679
Merge pull request from r-ryantm/auto-update/git-hub
git-hub: 2.1.0 -> 2.1.1
2021-08-08 03:02:33 +03:00
Sandro Jäckel e4cbde6907
gitstatus: update libgit2 2021-08-06 17:23:08 +02:00