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

Merge master into staging-next

parents 13256bd6 54c94cd3

.github/CODEOWNERS

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
/nixos/lib/make-disk-image.nix                 @raitobezarius



# Nix, the package manager

pkgs/tools/package-management/nix/                    @raitobezarius

nixos/modules/installer/tools/nix-fallback-paths.nix  @raitobezarius

pkgs/tools/package-management/nix/                    @raitobezarius @ma27

nixos/modules/installer/tools/nix-fallback-paths.nix  @raitobezarius @ma27



# Nixpkgs documentation

/maintainers/scripts/db-to-md.sh @jtojnar @ryantm

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -2329,6 +2329,12 @@ 
      fingerprint = "D35E C9CE E631 638F F1D8  B401 6F0E 410D C3EE D02";

    }];

  };

  benhiemer = {

    name = "Benedikt Hiemer";

    email = "ben.email@posteo.de";

    github = "benhiemer";

    githubId = 16649926;

  };

  benjaminedwardwebb = {

    name = "Ben Webb";

    email = "benjaminedwardwebb@gmail.com";
@@ -14499,6 +14505,12 @@ 
    githubId = 72527881;

    name = "PassiveLemon";

  };

  patka = {

    email = "patka@patka.dev";

    github = "patka-123";

    githubId = 69802930;

    name = "patka";

  };

  patricksjackson = {

    email = "patrick@jackson.dev";

    github = "patricksjackson";

pkgs/applications/misc/camunda-modeler/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


stdenvNoCC.mkDerivation rec {

  pname = "camunda-modeler";

  version = "5.18.0";

  version = "5.19.0";



  src = fetchurl {

    url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";

    hash = "sha256-f7XYcFleEe1f6Uh6mOqfakzfWzOiQtBPhowTJUZU1MU=";

    hash = "sha256-EKtdja55KFF394sHIh1C/cXxdjedBPbmHzicDVrbXCA=";

  };

  sourceRoot = "camunda-modeler-${version}-linux-x64";

pkgs/applications/science/biology/last/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


stdenv.mkDerivation rec {

  pname = "last";

  version = "1519";

  version = "1540";



  src = fetchFromGitLab {

    owner = "mcfrith";

    repo = "last";

    rev = "refs/tags/${version}";

    hash = "sha256-659YiC7NA6ottOR41jo3ayh4lwReWj46NKMhMPuebF4=";

    hash = "sha256-oGGpPWWQ5EVK9n5BLQwt1Wch2Xn24B+NrKg6+VrsUMY=";

  };



  nativeBuildInputs = [

pkgs/by-name/gr/graphite-cli/package.nix

+3 −0
Original line number Diff line number Diff line 
{ lib

, buildNpmPackage

, fetchurl

, git

, installShellFiles

}:
@@ -20,6 +21,7 @@ buildNpmPackage rec { 
  '';



  nativeBuildInputs = [

    git

    installShellFiles

  ];
@@ -28,6 +30,7 @@ buildNpmPackage rec { 
  postInstall = ''

    installShellCompletion --cmd gt \

      --bash <($out/bin/gt completion) \

      --fish <(GT_PAGER= $out/bin/gt fish) \

      --zsh <(ZSH_NAME=zsh $out/bin/gt completion)

  '';