Commit Graph

4610 Commits

Author SHA1 Message Date
github-actions[bot]
c39cd5f314
Merge master into staging-next 2021-11-26 00:01:38 +00:00
Kerstin Humm
86b2661837
guitone: remove package
Guitone isn't used in Nixpkgs anywhere. It hasn't seen a release in 11 years
(6a09974e0f) and is unmaintained in
Nixpkgs. Also it's the sole remaining user of graphviz_2_32, which
should be removed as well.
2021-11-25 20:10:34 +01:00
github-actions[bot]
fa1a61b8a2
Merge master into staging-next 2021-11-25 06:01:06 +00:00
Bobby Rong
f5f9557cb4
Merge pull request #147313 from SuperSandro2000/delta
delta: add SuperSandro2000 as maintainer
2021-11-25 09:51:22 +08:00
github-actions[bot]
b244d0edca
Merge master into staging-next 2021-11-25 00:01:54 +00:00
Sandro
31b46dd7f9
delta: add SuperSandro2000 as maintainer 2021-11-25 00:28:48 +01:00
Sandro Jäckel
122b0e0602
delta: 0.9.2 -> 0.10.0 2021-11-24 23:45:17 +01:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts:
	nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
github-actions[bot]
9e1911e222
Merge master into staging-next 2021-11-22 12:01:27 +00:00
figsoda
b0221e0651 glitter: 1.5.5 -> 1.5.6 2021-11-21 19:35:21 -05:00
github-actions[bot]
580f371380
Merge staging-next into staging 2021-11-20 00:01:57 +00:00
github-actions[bot]
7495684853
Merge master into staging-next 2021-11-20 00:01:21 +00:00
arkivm
18e1ae0d99
bcompare: add darwin support (#141413)
Co-authored-by: Paweł Kruszewski <kruszewsky@gmail.com>
2021-11-19 23:50:53 +01:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging 2021-11-19 18:01:56 +00:00
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
b95292072f
Merge pull request #144241 from Stunkymonkey/applications-github-1 2021-11-19 17:09:37 +01:00
github-actions[bot]
209ab42b96
Merge staging-next into staging 2021-11-17 06:02:04 +00:00
github-actions[bot]
f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
figsoda
6ad04bcb7d
Merge pull request #146243 from figsoda/treewide-rust-feature
treewide: use buildFeatures and checkFeatures for rust packages
2021-11-16 21:00:48 -05:00
github-actions[bot]
cb0f62dda2
Merge staging-next into staging 2021-11-17 00:02:26 +00:00
github-actions[bot]
90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Michael Weiss
61127682ff
Merge pull request #146188 from primeos/git
git: 2.33.1 -> 2.34.0
2021-11-16 22:11:34 +01:00
Martin Weinelt
2cc5606c84
Merge pull request #142319 from mweinelt/node2nix 2021-11-16 19:46:17 +01:00
Martin Weinelt
6c2f6a21ed commitizen: 4.2.1 -> 4.2.4 2021-11-16 16:08:23 +01:00
Martin Weinelt
37fa1e7c1d treewide: pass and inherit writeShellScript in node2nix packages 2021-11-16 16:08:23 +01:00
figsoda
94e7e21452 lucky-commit: use buildNoDefaultFeatures 2021-11-16 08:34:11 -05:00
figsoda
eb97241d7c pijul: use buildFeatures 2021-11-16 08:11:45 -05:00
github-actions[bot]
617d1d1f17
Merge staging-next into staging 2021-11-16 12:02:01 +00:00
Sandro
84c4d0ce87
Merge pull request #142010 from wahjava/fossil-update 2021-11-16 12:48:46 +01:00
Michael Weiss
6e78c9331e
git: 2.33.1 -> 2.34.0 2021-11-15 23:00:11 +01:00
github-actions[bot]
faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Vladimír Čunát
64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
figsoda
df304eeb80 glitter: 1.5.4 -> 1.5.5 2021-11-14 17:39:32 -05:00
github-actions[bot]
9f6360b7fb
Merge staging-next into staging 2021-11-14 18:01:49 +00:00
sternenseemann
2f78a2d3a3 Merge remote-tracking branch 'origin/master' into staging-next 2021-11-14 16:26:44 +01:00
Domen Kožar
8d45efbdac
Merge pull request #143065 from arkivm/gitkraken-darwin
gitkraken: add darwin support
2021-11-14 08:50:24 -06:00
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
Vikram Narayanan
d7575472f5 gitkraken: add darwin support 2021-11-13 23:08:43 -08:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
figsoda
91137787da
Merge pull request #145837 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