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

Merge master into staging-next

parents 7f0b38bc d3840956

maintainers/maintainer-list.nix

+6 −1
Original line number Diff line number Diff line
@@ -7804,7 +7804,6 @@ 
    name = "Claudius Holeksa";

  };

  ken-matsui = {

    email = "nix@kmatsui.me";

    github = "ken-matsui";

    githubId = 26405363;

    name = "Ken Matsui";
@@ -9255,6 +9254,12 @@ 
    github = "marius851000";

    githubId = 22586596;

  };

  markbeep = {

    email = "mrkswrn@gmail.com";

    github = "markbeep";

    githubId = 20665331;

    name = "Mark";

  };

  markus1189 = {

    email = "markus1189@gmail.com";

    github = "markus1189";

nixos/tests/pomerium.nix

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
  }; in {

    pomerium = { pkgs, lib, ... }: {

      imports = [ (base "192.168.1.1") ];

      environment.systemPackages = with pkgs; [ chromium ];

      services.pomerium = {

        enable = true;

        settings = {
@@ -98,5 +99,11 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
        pomerium.succeed(

            "curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep 'hello I am login page'"

        )



    with subtest("ui"):

        pomerium.succeed(

          # check for a string that only appears if the UI is displayed correctly

            "chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'contact your administrator'"

        )

  '';

})

pkgs/applications/networking/instant-messengers/chatterino2/default.nix

+4 −4
Original line number Diff line number Diff line 
{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }:

{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }:



stdenv.mkDerivation rec {

  pname = "chatterino2";

  version = "2.4.0";

  version = "2.4.2";

  src = fetchFromGitHub {

    owner = "Chatterino";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo=";

    sha256 = "sha256-d/rsY4pgPpA4JcMmoD6AG1DzHovfSERaeuYkMY603kA=";

    fetchSubmodules = true;

  };

  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

  buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ];

  buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ];

  postInstall = lib.optionalString stdenv.isDarwin ''

    mkdir -p "$out/Applications"

    mv bin/chatterino.app "$out/Applications/"

pkgs/applications/radio/sdrangel/default.nix

+5 −4
Original line number Diff line number Diff line 
{ airspy

{ lib

, stdenv

, airspy

, airspyhf

, aptdec

, boost
@@ -13,7 +15,6 @@ 
, glew

, hackrf

, hidapi

, lib

, ffmpeg

, libiio

, libopus
@@ -95,7 +96,7 @@ mkDerivation rec { 
    "-DDAB_LIB=${dab_lib}"

    "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"

    "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"

    "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"

    "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}"

    "-DSGP4_DIR=${sgp4}"

    "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"

  ];
@@ -110,6 +111,6 @@ mkDerivation rec { 
    homepage = "https://github.com/f4exb/sdrangel";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ alkeryn ];

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}

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

+5 −4
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation rec {

  pname = "nest";

  version = "3.3";

  version = "3.4";



  src = fetchFromGitHub {

    owner = "nest";

    repo = "nest-simulator";

    rev = "v${version}";

    sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU=";

    hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0=";

  };



  postPatch = ''
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec { 
  postInstall = ''

    # Alternative to autoPatchElf, moves libraries where

    # Nest expects them to be

    find $out/lib/nest -type f -exec ln -s {} $out/lib \;

    find $out/lib/nest -exec ln -s {} $out/lib \;

  '';



  passthru.tests.version = testers.testVersion {
@@ -78,7 +78,8 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "NEST is a command line tool for simulating neural networks";

    homepage = "https://www.nest-simulator.org/";

    license = licenses.gpl2;

    changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ jiegec davidcromp ];

    platforms = platforms.unix;

  };