diff options
96 files changed, 3768 insertions, 3108 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index d1aa701f0b35..8e8ca8e19ad6 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -246,7 +246,7 @@ The `staging` branch is a development branch where mass-rebuilds go. Mass rebuil ### Staging-next branch {#submitting-changes-staging-next-branch} -The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master ` branch. +The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master` branch. If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7294ffcb8aff..651341a6eded 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4932,6 +4932,12 @@ fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; }]; }; + gpl = { + email = "nixos-6c64ce18-bbbc-414f-8dcb-f9b6b47fe2bc@isopleth.org"; + github = "gpl"; + githubId = 39648069; + name = "isogram"; + }; gpyh = { email = "yacine.hmito@gmail.com"; github = "yacinehmito"; @@ -13862,6 +13868,15 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + victormignot = { + email = "victor.mignot@protonmail.com"; + github = "victormignot"; + githubId = 58660971; + name = "Victor Mignot"; + keys = [{ + fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; + }]; + }; vidbina = { email = "vid@bina.me"; github = "vidbina"; @@ -15247,4 +15262,10 @@ fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; }]; }; + rb = { + email = "maintainers@cloudposse.com"; + github = "nitrocode"; + githubId = 7775707; + name = "RB"; + }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index f6a1ef821b5d..0e8e4e6e24ae 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.56"; + version = "1.57"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY="; + sha256 = "sha256-47MDroiO8zvYDdHe0350ukczzemRbesEzIXZ2KoXZUI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 06d7453ede66..b5c97a7456dd 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -7,17 +7,18 @@ , substituteAll , xorg , wrapGAppsHook +, gitUpdater }: perlPackages.buildPerlPackage rec { pname = "fbmenugen"; - version = "0.86"; + version = "0.87"; src = fetchFromGitHub { owner = "trizen"; repo = pname; rev = version; - sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q"; + sha256 = "A0yhoK/cPp3JlNZacgLaDhaU838PpFna7luQKNDvyOg="; }; patches = [ @@ -65,6 +66,8 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; description = "Simple menu generator for the Fluxbox Window Manager"; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a2892e9fa894..430a0da171a0 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/ |