Commit graph

503652 commits

Author SHA1 Message Date
Adam Joseph b3fa79bb89 submitting-changes.chapter.md: explain *why* we have three branches
The manual does an okay job of explaining the rules for each of the
three development branches, but really doesn't give any intuition as
to why there are three (why not four? or two?) or how we got where
we are today.

This commit attempts to fix that, by explaining that there is one
branch that allows mass-rebuild commits, and it has a fast-building
branch both upstream and downstream of it (from the perspective of
automated merges).

I have also removed the term "stabilization" from the arc labels.
This vague term is not defined anywhere, and does communicate any
useful information without a longer explanation.  Therefore it is
not appropriate for use in a diagram.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-06-29 02:38:06 -07:00
Jörg Thalheim 7cba6c2544
Merge pull request #243096 from figsoda/backup
pkgs/tools/backup: remove dead code
2023-07-12 19:55:09 +01:00
Jörg Thalheim 1936e818e6
Merge pull request #243099 from figsoda/text
pkgs/tools/text: remove dead code
2023-07-12 19:52:47 +01:00
Sandro f278beca3a
Merge pull request #242896 from adamcstephens/kitty/0.29.0
kitty: 0.28.1 -> 0.29.0
2023-07-12 20:48:29 +02:00
Sandro 447d867eaa
Merge pull request #242492 from mweinelt/vaultwarden-1.29.0
vaultwarden: 1.28.0 -> 1.29.0
2023-07-12 20:14:42 +02:00
Sandro 70c9ed6ede
Merge pull request #243009 from dotlambda/spotdl-4.2.0
spotdl: 4.1.11 -> 4.2.0
2023-07-12 20:12:09 +02:00
Sandro ff6e67d2c2
Merge pull request #241683 from OPNA2608/fix/click_pkgconfig_requires
ubports-click: Propagate required pkg-config packages properly
2023-07-12 19:43:14 +02:00
Martin Weinelt a7628118e7
vaultwarden: 1.28.1 -> 1.29.0
https://github.com/dani-garcia/vaultwarden/releases/tag/1.29.0
2023-07-12 19:13:45 +02:00
Lassulus 0e1fc501c6
Merge pull request #241927 from ether42/usbguard
nixos/usbguard: rename services.usbguard.implictPolicyTarget to services.usbguard.implicitPolicyTarget
2023-07-12 18:58:30 +02:00
Pol Dellaiera b14fb1c9c3
Merge pull request #243086 from NixOS/php/extension/update-datadog-trace-fix-nativebuildinputs
phpExtensions.datadog_trace: fix builds on Linux
2023-07-12 18:35:35 +02:00
figsoda d70e0242e9 pkgs/tools/text: remove dead code
with the help of deadnix & nil
2023-07-12 12:12:15 -04:00
figsoda 72948e9fba pkgs/tools/backup: remove dead code
with the help of deadnix & nil
2023-07-12 12:06:56 -04:00
Mario Rodas ca3e61984e
Merge pull request #242993 from marsam/update-rqbit
rqbit: 2.2.0 -> 2.2.1
2023-07-12 10:41:45 -05:00
Adam Stephens 0fa2ff3871
kitty: 0.28.1 -> 0.29.0 2023-07-12 11:19:12 -04:00
Pol Dellaiera 676380cddb
phpExtensions.datadog_trace: fix builds on Linux 2023-07-12 17:01:58 +02:00
figsoda 9a1074ae6b
Merge pull request #242938 from majiru/update-unflac
unflac: 1.0 -> 1.1
2023-07-12 11:01:22 -04:00
Sandro 2a6283db45
Merge pull request #243063 from SuperSandro2000/libretranslate-site-packages 2023-07-12 16:44:14 +02:00
Artturi 9f7c514c9c
Merge pull request #242524 from majiru/drawterm-parallel 2023-07-12 17:43:00 +03:00
Pol Dellaiera f3d3147417
Merge pull request #241528 from Gerg-L/nixos/direnvrc
nixos/direnv: init
2023-07-12 16:42:40 +02:00
Anderson Torres bf5f8aa262 dialog: 1.3-20220728 -> 1.3-20230209 2023-07-12 11:29:22 -03:00
figsoda d48fc2f2f6
Merge pull request #243073 from PedroHLC/duckstation-main-program 2023-07-12 10:21:07 -04:00
Weijia Wang 95fdc5d83b
Merge pull request #243041 from SFrijters/conky-1.19.2
conky: 1.18.0 -> 1.19.2
2023-07-12 17:06:51 +03:00
Weijia Wang 7dd33e19c4
Merge pull request #243070 from figsoda/erg
erg: 0.6.15 -> 0.6.16
2023-07-12 17:04:56 +03:00
Šimon Brandner dc8fa27d11
viber: make Viber launch on Wayland (#243060)
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2023-07-12 17:03:38 +03:00
Weijia Wang fce60dfe74
Merge pull request #239917 from wegank/pulumi-hash-2
pulumiPackages.pulumi-language-{go,nodejs}: fix build
2023-07-12 17:01:01 +03:00
Weijia Wang 9a2d7605d6
Merge pull request #241876 from wegank/osl-darwin
osl: add darwin support
2023-07-12 17:00:25 +03:00
Sandro 1f98c2794a
Merge pull request #241291 from WolfangAukang/upwork-update 2023-07-12 15:59:49 +02:00
Ryan Lahfa 635a81d673
Merge pull request #243064 from xaverdh/tuxedo-keyboard-3.2.7 2023-07-12 15:50:56 +02:00
Robert Schütz e9934b0016 spotdl: 4.1.11 -> 4.2.0
Diff: https://github.com/spotDL/spotify-downloader/compare/refs/tags/v4.1.11...v4.2.0

Changelog: https://github.com/spotDL/spotify-downloader/releases/tag/v4.2.0
2023-07-12 06:39:41 -07:00
Robert Schütz 7e7b2b6832 python310Packages.bandcamp-api: init at 0.1.15 2023-07-12 06:39:37 -07:00
Weijia Wang 6fd9edc944
Merge pull request #243021 from JesusMtnezForks/libreoffice
libreoffice-bin: 7.4.3 -> 7.4.7
2023-07-12 16:32:48 +03:00
PedroHLC ☭ e002e5f453
duckstation: add meta.mainProgram 2023-07-12 10:30:17 -03:00
Weijia Wang 8d2423adff
Merge pull request #242383 from r-ryantm/auto-update/vaultenv
vaultenv: 0.15.1 -> 0.16.0
2023-07-12 16:29:55 +03:00
Weijia Wang d0fc0cc2be
Merge pull request #242932 from r-ryantm/auto-update/dgraph
dgraph: 22.0.1 -> 23.0.1
2023-07-12 16:27:58 +03:00
Weijia Wang ca1397ac5b
Merge pull request #242977 from r-ryantm/auto-update/devbox
devbox: 0.5.5 -> 0.5.6
2023-07-12 16:26:45 +03:00
Weijia Wang 4163893cd0
Merge pull request #242980 from r-ryantm/auto-update/jumppad
jumppad: 0.5.28 -> 0.5.31
2023-07-12 16:25:59 +03:00
Weijia Wang 90abda1ddc
Merge pull request #242985 from r-ryantm/auto-update/gh-dash
gh-dash: 3.7.9 -> 3.9.0
2023-07-12 16:25:27 +03:00
Weijia Wang 75282d918f
Merge pull request #242989 from r-ryantm/auto-update/conftest
conftest: 0.43.1 -> 0.44.0
2023-07-12 16:25:09 +03:00
Weijia Wang a5636e8f0e
Merge pull request #242995 from r-ryantm/auto-update/gping
gping: 1.12.0 -> 1.13.1
2023-07-12 16:24:40 +03:00
Weijia Wang c2704b5e63
Merge pull request #242996 from r-ryantm/auto-update/klayout
klayout: 0.28.9-2 -> 0.28.10
2023-07-12 16:23:52 +03:00
Weijia Wang 9cee967b1b
Merge pull request #242999 from r-ryantm/auto-update/datree
datree: 1.9.9 -> 1.9.10
2023-07-12 16:22:53 +03:00
Weijia Wang 7a17e10dc1
Merge pull request #243002 from r-ryantm/auto-update/kluctl
kluctl: 2.20.7 -> 2.20.8
2023-07-12 16:22:20 +03:00
Weijia Wang bcbfa42f72
Merge pull request #243008 from r-ryantm/auto-update/open-stage-control
open-stage-control: 1.25.1 -> 1.25.2
2023-07-12 16:21:48 +03:00
Weijia Wang 095011943c
Merge pull request #243022 from r-ryantm/auto-update/python310Packages.pytibber
python310Packages.pytibber: 0.27.2 -> 0.28.0
2023-07-12 16:21:08 +03:00
Weijia Wang 68d15fd8f9
Merge pull request #243025 from r-ryantm/auto-update/python311Packages.django-stubs-ext
python311Packages.django-stubs-ext: 4.2.1 -> 4.2.2
2023-07-12 16:20:36 +03:00
Weijia Wang cb6c40ae61
Merge pull request #243028 from r-ryantm/auto-update/python310Packages.mf2py
python310Packages.mf2py: 1.1.2 -> 1.1.3
2023-07-12 16:20:24 +03:00
PedroHLC ☭ 0cf691661c libei: 1.0.0rc2 -> 1.0.0 2023-07-12 10:18:13 -03:00
Ilan Joselevich c483c6c303
Merge pull request #243061 from fufexan/hyprland
hyprland: 0.26.0 -> 0.27.0
2023-07-12 16:11:20 +03:00
Gerg-L 194a3a7d97 nixos/direnv: init 2023-07-12 08:48:17 -04:00
figsoda 8f36da01d5 erg: 0.6.15 -> 0.6.16
Diff: https://github.com/erg-lang/erg/compare/v0.6.15...v0.6.16

Changelog: https://github.com/erg-lang/erg/releases/tag/v0.6.16
2023-07-12 08:43:37 -04:00