Merge master into staging-next

2021-09-25 12:01:16 +00:00 · 2021-09-25 12:01:16 +00:00 · c6b76c16a4
commit c6b76c16a4
parent 6784698e07 f05a99e116
11 changed files with 30 additions and 27 deletions
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@ -476,6 +476,8 @@ in
    (mkIf serviceCfg.experimental-features.realtime-scheduling {
      security.wrappers.".gnome-shell-wrapped" = {
        source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped";
+        owner = "root";
+        group = "root";
        capabilities = "cap_sys_nice=ep";
      };

--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@ -6,7 +6,7 @@
 , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
 , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
 , libkrb5, libdrm, mesa
-, libxkbcommon, wayland # ozone/wayland
+, libxkbcommon, pipewire, wayland # ozone/wayland

 # Command line programs
 , coreutils
@ -67,7 +67,7 @@ let
    flac harfbuzz icu libpng opusWithCustomModes snappy speechd
    bzip2 libcap at-spi2-atk at-spi2-core
    libkrb5 libdrm mesa coreutils
-    libxkbcommon wayland
+    libxkbcommon pipewire wayland
  ] ++ optional pulseSupport libpulseaudio
    ++ optional libvaSupport libva
    ++ optional vulkanSupport vulkan-loader
--- a/pkgs/development/libraries/ethash/default.nix
+++ b/pkgs/development/libraries/ethash/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "ethash";
-  version = "0.7.0";
+  version = "0.7.1";

  src =
    fetchFromGitHub {
      owner = "chfast";
      repo = "ethash";
      rev = "v${version}";
-      sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8=";
+      sha256 = "sha256-ba8SBtJd0ERunO9KpJZkutkO6ZnZOEGzWn2IjO1Uu28=";
    };

  nativeBuildInputs = [
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@ -282,11 +282,11 @@ let
      nativeBuildInputs = [ pkgs.makeWrapper ];
      postInstall = with pkgs; ''
        wrapProgram "$out/bin/prisma" \
-          --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \
-          --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \
-          --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node"
-          --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \
-          --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt"
+          --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \
+          --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
+          --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
+          --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \
+          --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt
      '';
    };

--- a/pkgs/development/python-modules/deemix/default.nix
+++ b/pkgs/development/python-modules/deemix/default.nix
@ -12,12 +12,12 @@

 buildPythonPackage rec {
  pname = "deemix";
-  version = "3.5.1";
+  version = "3.5.3";
  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "3347d07fab5dcadcfa7798383ba0a2e026d4bfdc0a7c2a7584d7fbf128a3c233";
+    sha256 = "36dc6279f547cc0947daceb568e2b5ac1e274655f642c133e2700c22892163ce";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/fountains/default.nix
+++ b/pkgs/development/python-modules/fountains/default.nix
@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "fountains";
-  version = "1.0.0";
+  version = "1.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-e4WCO/CS7LBYUziKPuCQIOHEHUlnKE5vDbOsqC8SrA8=";
+    sha256 = "47c28e598cc3a723327daee28c757de3a40f4d8eb48e6be37081932c1d00fa6f";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/goalzero/default.nix
+++ b/pkgs/development/python-modules/goalzero/default.nix
@ -8,13 +8,13 @@

 buildPythonPackage rec {
  pname = "goalzero";
-  version = "0.1.59";
+  version = "0.2.0";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0d0f11aa31672f3ef4ab617db92c87ef6f143804473022405f6da9d830f17638";
+    sha256 = "6cb67cf772a758225b2e23b394feb697e8cbfb1aff5a2d7a17a0d4ccf61e55cd";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@ -10,12 +10,12 @@

 buildPythonPackage rec {
  pname = "pytest-cases";
-  version = "3.6.3";
+  version = "3.6.4";
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-ExNiaSQGFbx5BB+K+PyW4OPghdpy3SKxhiVFH9okQ7g=";
+    sha256 = "sha256-m2oxE7q46TWadhZgpwTAHKep5ZN9LG1VNCRJkPz5W1E=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@ -4,9 +4,12 @@
 , pkg-config
 , protobuf
 , rustPlatform
+, stdenv
 }:

-rustPlatform.buildRustPackage rec {
+let
+  node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so");
+in rustPlatform.buildRustPackage rec {
  pname = "prisma-engines";
  version = "2.30.2";

@ -14,7 +17,7 @@ rustPlatform.buildRustPackage rec {
    owner = "prisma";
    repo = "prisma-engines";
    rev = version;
-    sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg=";
+    sha256 = "sha256-39+pEjve7evxcjcBK1JLTRNNjfUMoCgSgtYcdJ3zIKE=";
  };

  cargoPatches = [
@ -28,8 +31,6 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM=";

-  outputs = [ "out" "lib" "bin" ];
-
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl protobuf ];

@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec {
  '';

  postInstall = ''
-    cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node
+    mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node
  '';

  # Tests are long to compile
@ -56,6 +57,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://www.prisma.io/";
    license = licenses.asl20;
    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ pamplemousse ];
+    maintainers = with maintainers; [ pamplemousse pimeys ];
  };
 }
--- a/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/pkgs/tools/nix/nix-output-monitor/default.nix
@ -5,11 +5,11 @@
 }:
 mkDerivation rec {
  pname = "nix-output-monitor";
-  version = "1.0.3.2";
+  version = "1.0.3.3";
  src = fetchFromGitHub {
    owner = "maralorn";
    repo = "nix-output-monitor";
-    sha256 = "0srfclmqrqcx8b756yxww24ya0xn2ajxbgj07mcvdvwbwl09pys8";
+    sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8";
    rev = "v${version}";
  };
  isLibrary = true;
--- a/pkgs/tools/system/gdu/default.nix
+++ b/pkgs/tools/system/gdu/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "gdu";
-  version = "5.8.0";
+  version = "5.8.1";

  src = fetchFromGitHub {
    owner = "dundee";
    repo = pname;
    rev = "v${version}";
-    sha256 = "14sl0a5c3vfsqxsbai6wvfmxp121rl9wz1vih6gyk6ibvkvlq793";
+    sha256 = "1410mmijzjvcylrynyq4p2fayi1wjy61sibd3kws96k3k7ylb14n";
  };

  vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";