From cac8c4fe3dd5ae3a7806c522345eebc94299d82e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 03:47:03 +0000 Subject: [PATCH 01/12] ethash: 0.7.0 -> 0.7.1 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index c1ef9cee9906..1283ec8cfab0 100644 --- 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 = [ From fa884f123b474fe001a9bfe558afc4341a06db4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Sep 2021 16:55:45 +0200 Subject: [PATCH 02/12] python3Packages.pytest-cases: 3.6.3 -> 3.6.4 --- pkgs/development/python-modules/pytest-cases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 592a13506936..b8c1ab527220 100644 --- 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 = [ From f779a0ff03497e83dab5b04182c13cd2ef347274 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 24 Sep 2021 18:19:53 +0200 Subject: [PATCH 03/12] nix-output-monitor: 1.0.3.2 -> 1.0.3.3 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 94c5f0afb2c6..a94ae45ccea5 100644 --- 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; From a79439501f2c40dde884f59b32ef0d5f8701b091 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Sep 2021 00:01:15 +0200 Subject: [PATCH 04/12] gdu: 5.8.0 -> 5.8.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index fcc79a10a8f4..8c70910a9925 100644 --- 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"; From 98fe3260c624d94726aec9ff7f7c4f2f456ceea1 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 24 Sep 2021 17:56:56 -0700 Subject: [PATCH 05/12] nixos/gnome: Fix broken .gnome-shell-wrapped wrapper The owner and group options are required after #126289. Signed-off-by: Anders Kaseorg --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 4bc42525906c..9bb671adbecf 100644 --- 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"; }; From 5497471572f8a8c4e0ca1b44bfd4de854023b85d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Sep 2021 05:38:14 +0000 Subject: [PATCH 06/12] python38Packages.deemix: 3.5.1 -> 3.5.3 --- pkgs/development/python-modules/deemix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index 1f664fe1b000..06b915e814de 100644 --- 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 = [ From 29ba06034e1f9d17f260240a24020beb5ddddaad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Sep 2021 06:40:01 +0000 Subject: [PATCH 07/12] python38Packages.fountains: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/fountains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index a5eee78aee33..690f3dcbd3d3 100644 --- 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 = [ From df02d2b17570f569c50e9e5fd340697d0272cd8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Sep 2021 06:52:44 +0000 Subject: [PATCH 08/12] python38Packages.goalzero: 0.1.59 -> 0.2.0 --- pkgs/development/python-modules/goalzero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix index c533af8b7fdc..b2cf6e7eadaf 100644 --- 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 = [ From 29efb76ab6480426ce8c1f7bd8e341f0249a61cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sat, 25 Sep 2021 11:32:58 +0200 Subject: [PATCH 09/12] google-chrome: add pipewire dependency chromium derivation already depends on pipewire. This is required to share your screen on wayland --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 34cc5bb9160a..03bdb84f4384 100644 --- 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 From d047d336d60433a07c8e0de2dee45cfad8ceecef Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 10 Sep 2021 15:33:11 +0200 Subject: [PATCH 10/12] prisma-engines: #135934 follow-up corrections --- pkgs/development/tools/database/prisma-engines/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index a7021411b4c3..3f54428bb9b1 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + sha256 = "sha256-39+pEjve7evxcjcBK1JLTRNNjfUMoCgSgtYcdJ3zIKE="; }; cargoPatches = [ @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; - outputs = [ "out" "lib" "bin" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf ]; @@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + cp target/x86_64-unknown-linux-gnu/release/libquery_engine.so $out/lib/libquery_engine.so.node ''; # Tests are long to compile From 47557e2984cac84711bf3aad6213dade0907116f Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 10 Sep 2021 16:37:56 +0200 Subject: [PATCH 11/12] nodesPackages.prisma: #135934 follow-up corrections --- pkgs/development/node-packages/default.nix | 10 +++++----- .../tools/database/prisma-engines/default.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5858dc0e7fd8..4df09839e6ee 100644 --- 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 ''; }; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 3f54428bb9b1..51369e094493 100644 --- 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"; @@ -43,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - cp target/x86_64-unknown-linux-gnu/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 From 3bc4a574dbb1674cf99eda99bb4af364c9c8472a Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Sat, 25 Sep 2021 13:34:59 +0200 Subject: [PATCH 12/12] prisma: add pimeys as maintainer --- pkgs/development/tools/database/prisma-engines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 51369e094493..a2f4471ec52a 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -57,6 +57,6 @@ in rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ pamplemousse pimeys ]; }; }