Unverified Commit 1a2d5b6f authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 5104df7a 57696694

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -19852,12 +19852,6 @@ 
    githubId = 3074260;

    name = "Patryk Sondej";

  };

  patternspandemic = {

    email = "patternspandemic@live.com";

    github = "patternspandemic";

    githubId = 15645854;

    name = "Brad Christensen";

  };

  patwid = {

    email = "patrick.widmer@tbwnet.ch";

    github = "patwid";

nixos/modules/services/databases/neo4j.nix

+1 −1
Original line number Diff line number Diff line
@@ -714,6 +714,6 @@ in 
    };



  meta = {

    maintainers = with lib.maintainers; [ patternspandemic ];

    maintainers = [ ];

  };

}

nixos/modules/services/security/tor.nix

+7 −3
Original line number Diff line number Diff line
@@ -1413,10 +1413,14 @@ in 
        BindPaths = [

          stateDir

        ]

        ++ lib.catAttrs "unix" (

        ++ lib.filter (x: x != null) (

          lib.catAttrs "unix" (

            lib.filter (x: x != null) (

              lib.catAttrs "target" (

                lib.concatMap (onionService: onionService.map) (lib.attrValues cfg.relay.onionServices)

              )

            )

          )

        );

        BindReadOnlyPaths = [

          builtins.storeDir

pkgs/applications/editors/android-studio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ let 
      inherit tiling_wm;

    };

  stableVersion = {

    version = "2025.1.3.7"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3"

    sha256Hash = "sha256-pet3uTmL4pQ/FxB2qKv+IZNx540gMC7hmfOaQ8iLQpQ=";

    version = "2025.1.4.8"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4"

    sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM=";

  };

  betaVersion = {

    version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2"

pkgs/by-name/co/commitmsgfmt/package.nix

+5 −3
Original line number Diff line number Diff line
@@ -4,24 +4,26 @@ 
  fetchFromGitLab,

  testers,

  commitmsgfmt,

  nix-update-script,

}:

rustPlatform.buildRustPackage rec {

  pname = "commitmsgfmt";

  version = "1.6.0";

  version = "1.7.0";



  src = fetchFromGitLab {

    owner = "mkjeldsen";

    repo = "commitmsgfmt";

    rev = "v${version}";

    hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";

    hash = "sha256-6mMjDMWkpaKXqmyE2taV4pDa92Tdt4VEHHLdOpRHung=";

  };



  cargoHash = "sha256-cej+Jpp12QEaru1mecuXtIFDEnSBvTwpx0Vgp8s7jj8=";

  cargoHash = "sha256-Ewn7NCFtl8phC5cFyLWZcGZy4w+huummzeuXFRn64lQ=";



  passthru.tests.version = testers.testVersion {

    package = commitmsgfmt;

    command = "commitmsgfmt -V";

  };

  passthru.updateScript = nix-update-script { };



  meta = {

    homepage = "https://gitlab.com/mkjeldsen/commitmsgfmt";