Commit Graph

2033 Commits

Author SHA1 Message Date
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
94e7e21452 lucky-commit: use buildNoDefaultFeatures 2021-11-16 08:34:11 -05: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
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 #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
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 #145620 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 #141959 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 #143474 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 #144252 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 #143871 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