Commit ae213f2c authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 59ff3617 1ec347a3

.git-blame-ignore-revs

+4 −0
Original line number Diff line number Diff line
@@ -281,3 +281,7 @@ b4532efe93882ae2e3fc579929a42a5a56544146 


# emacs: keep elpa/nongnu/melpa package overrides sorted

9f2faf683ed48704aa17f693208a13aa64e22181



# nixfmt 1.0.0

62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt

5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt

ci/eval/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ let 
            -I "$src" \

            --option restrict-eval true \

            --option allow-import-from-derivation false \

            --option eval-system "${evalSystem}" \

            --arg enableWarnings false > $out/paths.json

            --option eval-system "${evalSystem}" > $out/paths.json

      '';



  singleSystem =
@@ -99,7 +98,7 @@ let 
        set +e

        command time -o "$outputDir/timestats/$myChunk" \

          -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \

          nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \

          nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \

          --eval-system "$system" \

          --option restrict-eval true \

          --option allow-import-from-derivation false \

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


- `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.



- `mx-puppet-discord` was removed from nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.



- `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).



- `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env".

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -8285,6 +8285,12 @@ 
    githubId = 92429150;

    name = "Paul Meinhold";

  };

  feyorsh = {

    email = "george@feyor.sh";

    github = "Feyorsh";

    githubId = 44840644;

    name = "George Huebner";

  };

  ffinkdevs = {

    email = "fink@h0st.space";

    github = "ffinkdevs";
@@ -10144,6 +10150,11 @@ 
    githubId = 3656888;

    name = "hhm";

  };

  hhr2020 = {

    name = "hhr2020";

    github = "HHR2020";

    githubId = 76608828;

  };

  hhydraa = {

    email = "hcurfman@keemail.me";

    github = "hcur";

nixos/doc/manual/redirects.json

+9 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,15 @@ 
  "module-services-mautrix-signal-migrate-configuration": [

    "index.html#module-services-mautrix-signal-migrate-configuration"

  ],

  "module-services-mautrix-whatsapp": [

    "index.html#module-services-mautrix-whatsapp"

  ],

  "module-services-mautrix-whatsapp-configuration": [

    "index.html#module-services-mautrix-whatsapp-configuration"

  ],

  "module-services-mautrix-whatsapp-migrate-configuration": [

    "index.html#module-services-mautrix-whatsapp-migrate-configuration"

  ],

  "module-services-maubot": [

    "index.html#module-services-maubot"

  ],