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

Merge staging-next into staging

parents 62adb4e3 c7c96c5a

nixos/modules/services/web-apps/part-db.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ in 
    phpPackage = mkPackageOption pkgs "php" { } // {

      apply =

        pkg:

        pkg.override {

        pkg.buildEnv {

          extraConfig = ''

            memory_limit = 256M;

          '';

nixos/tests/all-tests.nix

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ in 
  cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };

  cage = handleTest ./cage.nix { };

  cagebreak = handleTest ./cagebreak.nix { };

  calibre-web = handleTest ./calibre-web.nix { };

  calibre-server = handleTest ./calibre-server.nix { };

  calibre-web = runTest ./calibre-web.nix;

  calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };

  canaille = handleTest ./canaille.nix { };

  castopod = handleTest ./castopod.nix { };

  cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };

nixos/tests/calibre-server.nix

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

  system ? builtins.currentSystem,

  config ? { },

  pkgs ? import ../.. { inherit system config; },

  pkgs,

  runTest,

  ...

}:



let

  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

  inherit (pkgs.lib)

    concatStringsSep

    maintainers
@@ -74,7 +73,7 @@ let 
in

mapAttrs (

  test: testConfig:

  (makeTest (

  (runTest (

    let

      nodeName = testConfig.nodeName or test;

      calibreConfig = {

nixos/tests/calibre-web.nix

+36 −38
Original line number Diff line number Diff line 
import ./make-test-python.nix (

  { pkgs, lib, ... }:

{ lib, ... }:



let

  port = 3142;
@@ -41,4 +40,3 @@ import ./make-test-python.nix ( 
    )

  '';

}
 
)

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ 


stdenv.mkDerivation rec {

  pname = "bitwig-studio-unwrapped";

  version = "5.3.1";

  version = "5.3.2";



  src = fetchurl {

    name = "bitwig-studio-${version}.deb";

    url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";

    hash = "sha256-mxodFCu4SDzofnoZZZ7TPDUIrRc3UJt8TuEBwDOo2wQ=";

    hash = "sha256-QKt/myqmoVVffNwkfGcAoknAiZu3D+s7d2lJgtWpvk4=";

  };



  nativeBuildInputs = [