Unverified Commit 4e2c1815 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f7e5db28 6c5e8bcc

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -7896,6 +7896,12 @@ 
    githubId = 1047859;

    name = "Kaz Wesley";

  };

  kazenyuk = {

    email = "kazenyuk@pm.me";

    github = "nvmd";

    githubId = 524492;

    name = "Sergey Kazenyuk";

  };

  kcalvinalvin = {

    email = "calvin@kcalvinalvin.info";

    github = "kcalvinalvin";

nixos/modules/misc/ids.nix

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ in 
      # nix-serve = 199; # unused, removed 2020-12-12

      #tvheadend = 200; # dynamically allocated as of 2021-09-18

      uwsgi = 201;

      gitit = 202;

      # gitit = 202; # unused, module was removed 2023-04-03

      riemanntools = 203;

      subsonic = 204;

      # riak = 205; # unused, remove 2022-07-22

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ 
  ./services/misc/gammu-smsd.nix

  ./services/misc/geoipupdate.nix

  ./services/misc/gitea.nix

  # ./services/misc/gitit.nix

  ./services/misc/gitlab.nix

  ./services/misc/gitolite.nix

  ./services/misc/gitweb.nix

nixos/modules/services/misc/gitit.nix

deleted100644 → 0
+0 −725

File deleted.

Preview size limit exceeded, changes collapsed.

nixos/tests/all-tests.nix

+3 −3
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ in { 
  cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };

  cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };

  cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };

  ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};

  ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};

  ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {};

  ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix {};

  ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix {};

  ceph-single-node-bluestore = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore.nix {};

  certmgr = handleTest ./certmgr.nix {};

  cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {};

  cgit = handleTest ./cgit.nix {};