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

Merge staging-next into staging

parents 683f97e3 0b14a718

nixos/modules/programs/nncp.nix

+6 −12
Original line number Diff line number Diff line
@@ -74,19 +74,13 @@ in { 
      wantedBy = [ "basic.target" ];

      serviceConfig.Type = "oneshot";

      script = ''

        umask u=rw

        nncpCfgDir=$(mktemp --directory nncp.XXX)

        for f in ${jsonCfgFile} ${builtins.toString config.programs.nncp.secrets}; do

          tmpdir=$(mktemp --directory nncp.XXX)

          nncp-cfgdir -cfg $f -dump $tmpdir

          find $tmpdir -size 1c -delete

          cp -a $tmpdir/* $nncpCfgDir/

          rm -rf $tmpdir

        done

        nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile}

        rm -rf $nncpCfgDir

        umask 127

        rm -f ${nncpCfgFile}

        for f in ${jsonCfgFile} ${builtins.toString config.programs.nncp.secrets}

        do

          ${lib.getExe pkgs.hjson-go} -c <"$f"

        done |${lib.getExe pkgs.jq} --slurp add >${nncpCfgFile}

        chgrp ${programCfg.group} ${nncpCfgFile}

        chmod g+r ${nncpCfgFile}

      '';

    };

  };

nixos/tests/openresty-lua.nix

+3 −4
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, lib, ... }:

  let

    lualibs = [

    luaLibs = [

      pkgs.lua.pkgs.markdown

    ];



    getPath = lib: type: "${lib}/share/lua/${pkgs.lua.luaversion}/?.${type}";

    getLuaPath = lib: getPath lib "lua";

    luaPath = lib.concatStringsSep ";" (map getLuaPath lualibs);

    getLuaPath = lib: "${lib}/share/lua/${pkgs.lua.luaversion}/?.lua";

    luaPath = lib.concatStringsSep ";" (map getLuaPath luaLibs);

  in

  {

    name = "openresty-lua";

pkgs/applications/editors/vscode/vscode.nix

+8 −8
Original line number Diff line number Diff line
@@ -31,21 +31,21 @@ let 
  archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "1adwsm4n934a5z3hnsj9k7mi2l4npl499q8jzk2xhbbpqhkvd96a";

    x86_64-darwin = "04cvhhxx7s14z5794gn3pwd482cswpqyrmb1qcwm797cz1rz29z5";

    aarch64-linux = "1fca5rir2bkf4wqrs56qhv3kwrxivx17pa5brxp1k4k8a9jmhy7k";

    aarch64-darwin = "1mwymizy2a6m9fj3r00h762283fwrkhl9kv5607r0q7widggfg0j";

    armv7l-linux = "16ndp0mcfb05wfarpq3nxp3bnac1s1yay596mwjmwbwv44qcq40b";

    x86_64-linux = "11d9qqfb5kh5zsc7xd6h5xsywacir5z08l2snj0cz2cb0nji9xhj";

    x86_64-darwin = "0rbwvvakh1b5iqca49hcmqlfq4g0j067rrphrh0yx7wdyr6kmwg2";

    aarch64-linux = "0vrvcy1p5lrdy2lww42w32vr79075vpkwj4q8wfqzd7x72vmhfci";

    aarch64-darwin = "03wccm854v9va50x91kp00a16r483zpndayhlwy1fm4n0wdy6iw8";

    armv7l-linux = "0b9r78mz5djvv6n82isn2jqb4bwa41hqyxxc9arhrpvpj5w65rla";

  }.${system} or throwSystem;

in

  callPackage ./generic.nix rec {

    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.

    version = "1.94.0";

    version = "1.94.1";

    pname = "vscode" + lib.optionalString isInsiders "-insiders";



    # This is used for VS Code - Remote SSH test

    rev = "d78a74bcdfad14d5d3b1b782f87255d802b57511";

    rev = "e10f2369d0d9614a452462f2e01cdc4aa9486296";



    executableName = "code" + lib.optionalString isInsiders "-insiders";

    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -69,7 +69,7 @@ in 
      src = fetchurl {

        name = "vscode-server-${rev}.tar.gz";

        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";

        sha256 = "1iqglh4wx4wc80ihzcw4is7hd49s6kxpg9fz357r57a2679q0qw6";

        sha256 = "094klvp32475f6rsapxkhgsm8cmjmpq4qp3lx2b1vgf3xzl7j9nw";

      };

      stdenv = stdenvNoCC;

    };

pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
callPackage ./generic.nix { } rec {

  pname = "signal-desktop";

  dir = "Signal";

  version = "7.26.0";

  version = "7.27.0";

  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";

  hash = "sha256-A9gTphQ7FQm1iCutrDxAD2wazihn+4ZafJrqdZ8Nahk=";

  hash = "sha256-Ff/hRoanAVlaAu5ofZ6oy4ULifk3O0HiQK0Z8Wd1H1g=";

}

pkgs/applications/virtualization/runc/default.nix

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


buildGoModule rec {

  pname = "runc";

  version = "1.1.14";

  version = "1.1.15";



  src = fetchFromGitHub {

    owner = "opencontainers";

    repo = "runc";

    rev = "v${version}";

    hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc=";

    hash = "sha256-y8TcMyNRkVfmNkumhohBoyiU6GM8/yLXT/CTFPmXlU4=";

  };



  vendorHash = null;