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

Merge master into staging-next

parents 98c4f38c 36f5b2e4

lib/systems/examples.nix

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ rec { 
  };



  gnu64 = { config = "x86_64-unknown-linux-gnu"; };

  gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix

  gnu32  = { config = "i686-unknown-linux-gnu"; };



  musl64 = { config = "x86_64-unknown-linux-musl"; };

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ with lib.maintainers; { 
    members = [

      GaetanLepage

      natsukium

      thomasjm

    ];

    scope = "Maintain Jupyter and related packages.";

    shortName = "Jupyter";

pkgs/applications/misc/keepass/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ let 
  inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;

in buildDotnetPackage rec {

  pname = "keepass";

  version = "2.54";

  version = "2.55";



  src = fetchurl {

    url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";

    hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg=";

    hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc=";

  };



  sourceRoot = ".";

pkgs/applications/networking/cluster/pv-migrate/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@ 


buildGoModule rec {

  pname = "pv-migrate";

  version = "1.3.0";

  version = "1.7.1";



  src = fetchFromGitHub {

    owner = "utkuozdemir";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8=";

    sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c=";

  };



  subPackages = [ "cmd/pv-migrate" ];



  vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0=";

  vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0=";



  ldflags = [

    "-s"

pkgs/applications/networking/protonmail-bridge/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "protonmail-bridge";

  version = "3.5.1";

  version = "3.6.1";



  src = fetchFromGitHub {

    owner = "ProtonMail";

    repo = "proton-bridge";

    rev = "v${version}";

    hash = "sha256-nYr9M9jRtKDZdtCWirpLAKA/tgz07N6/EI6JV4NzjXM=";

    hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE=";

  };



  vendorHash = "sha256-I7vDmSLccJSov5RlTtzrQTc+uCprMxwOrHkroL9oZXE=";

  vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU=";



  nativeBuildInputs = [ pkg-config ];