From 2c1261127770f1886e49903742e4e989fdae6ad2 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 4 Mar 2023 00:38:07 +1100 Subject: [PATCH 01/14] phoc: 0.21.1 -> 0.25.0 --- pkgs/applications/misc/phoc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 0fae80fc14e..d1367524679 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -52,7 +52,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.21.1"; + version = "0.25.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -60,7 +60,8 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg="; + sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE="; + fetchSubmodules = true; }; nativeBuildInputs = [ From 2455dfab0da8bb2158d9c404ec13ccf42250ed3e Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 4 Mar 2023 00:38:29 +1100 Subject: [PATCH 02/14] phosh: 0.23.0 -> 0.25.1 --- nixos/modules/services/x11/desktop-managers/phosh.nix | 2 +- pkgs/applications/window-managers/phosh/default.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index e889c0e34e7..3cfa6e044b7 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -173,7 +173,7 @@ in systemd.services.phosh = { wantedBy = [ "graphical.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/phosh"; + ExecStart = "${cfg.package}/bin/phosh-session"; User = cfg.user; Group = cfg.group; PAMName = "login"; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5b4480499d9..95b546a0b1c 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.23.0"; + version = "0.25.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; + sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8="; }; nativeBuildInputs = [ @@ -97,11 +97,6 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - checkPhase = '' runHook preCheck export NO_AT_BRIDGE=1 From 22cf9cd0112c9765d99226e38bdce9b7d82fba7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 17:24:36 +0000 Subject: [PATCH 03/14] sfeed: 1.6 -> 1.7 --- pkgs/tools/misc/sfeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 36ef0fdc96a..80ff7573622 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.6"; + version = "1.7"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-GfRy/kzlFonje2Z/g7qNkbrDHBBIReN+fHVz1vsApqs="; + sha256 = "sha256-W9AQc3Y3do1M2GM7LQVM5SN07LoWaZL7GTQD+SmQRwQ="; }; buildInputs = [ ncurses ]; From 9f747c87f8570f4713f9adb5d1c539e9b25cfb83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 16:47:06 +0000 Subject: [PATCH 04/14] qpdf: 11.2.0 -> 11.3.0 --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 9a0be5169d1..67e16f6f3ee 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.2.0"; + version = "11.3.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-AkLuclDm9qjVbpFqenlbgTWt/GAWzOj9d1lqgt6aPNo="; + hash = "sha256-UZq973X93E+Ll1IKjfJNPQuQwBFOU3egFGODgXV21x0="; }; nativeBuildInputs = [ cmake perl ]; From 1ce566b2ac50a1077c1d6fb13c44b414946996a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 06:14:42 +0000 Subject: [PATCH 05/14] berglas: 1.0.1 -> 1.0.2 --- pkgs/tools/admin/berglas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index f82aebacec9..c6b8e499308 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -27,16 +27,16 @@ in buildGoModule rec { pname = "berglas"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4TUVNsiWODH8jJzV4AYchIQjDWXysJbFPYQ5W63T08="; + sha256 = "sha256-OMmvoUzdi5rie/YCkylSKjNm2ty2HnnAuFZrLAgJHZk="; }; - vendorSha256 = "sha256-jJuwfP0zJ70r62IFTPsXBCAEKDcuBwHsBR24jGx/IqY="; + vendorHash = "sha256-WIbT1N7tRAt5vJO6j06fwUAaFxfAevRo0+r2wyy+feE="; postPatch = skipTestsCommand; From dbff810de84422b5e1351c3d534fbcb5181fe561 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 07:42:03 +0000 Subject: [PATCH 06/14] ttdl: 3.6.3 -> 3.6.5 --- pkgs/applications/misc/ttdl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index 9f098efef8a..fe2d8546cff 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "3.6.3"; + version = "3.6.5"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; + sha256 = "sha256-mplV++N+us6IntNJsZoH4yyKZ8eYplUYuVJeac0ZIkQ="; }; - cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; + cargoHash = "sha256-mgvMQjScXCmr3HIQtGJ2YWRUhiSP5resL96LUCe8D+c="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; From 5e1088a0d4592dd1eeaed63c86e30ca0b1db6634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 07:53:08 +0000 Subject: [PATCH 07/14] jaq: 0.9.0 -> 0.10.0 --- pkgs/development/tools/jaq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index 794affe4434..1ba8a37a3b2 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-Y1QLNiAeHKYsSbFW235mdTiHyQFBQQsO+FtuFxDX9Hs="; + sha256 = "sha256-v3dC5Qi0Op+oFCcbkbK1ZUQxWTEYVvXsc+ye9Kk9y7c="; }; - cargoSha256 = "sha256-+9uy5R/dO2T/6dRhtYlPCKfosaYua0JvbECvMacc3XA="; + cargoHash = "sha256-N3zlaoBPVK4xI+t3F+NXz0DhqIOoE3lh3FftToACeZM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From f7b1593179eba14d58b46c0e2441f06bc8270578 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Mar 2023 22:26:11 +0000 Subject: [PATCH 08/14] tagparser: 11.5.1 -> 11.6.0 --- pkgs/development/libraries/tagparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index 8eb57c5441f..f20d5a39ea3 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.5.1"; + version = "11.6.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-6HvPbbDsHIYyTs0M5M8TkgqyAz0QtgRjuNJhYWFjNG4="; + hash = "sha256-zi1n5Mdto8DmUq5DWxcr4f+DX6Sq/JsK8uzRzj5f0/E="; }; nativeBuildInputs = [ cmake ]; From 0549af80ecf15c2d75e4163307c9a2de92c4bc83 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 9 Mar 2023 18:14:02 -0500 Subject: [PATCH 09/14] torchvision: no need to specify CUDAHOSTCXX CUDAHOSTCXX is defined for us in https://github.com/NixOS/nixpkgs/blob/a59944f1c11a5e1a6bd33cad379dae257d4bf40b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix#L50 --- pkgs/development/python-modules/torchvision/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index a9c5defbe38..8201d9c72b7 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -68,7 +68,6 @@ buildPythonPackage { + lib.optionalString cudaSupport '' export CC=${cudatoolkit.cc}/bin/cc export CXX=${cudatoolkit.cc}/bin/c++ - export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++ export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export FORCE_CUDA=1 ''; From b3a858b5420390a627b1ee12ad8624c3d45ad8ac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Mar 2023 04:20:00 +0000 Subject: [PATCH 10/14] python310Packages.unidiff: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/unidiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index c34e70eb9d2..85ec596a891 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; + sha256 = "2e5f0162052248946b9f0970a40e9e124236bf86c82b70821143a6fc1dea2574"; }; nativeCheckInputs = [ unittestCheckHook ]; From 2821b95a7a92a3d304d974746a9fe66ae59115ab Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Mar 2023 10:58:38 -0500 Subject: [PATCH 11/14] zine: 0.12.0 -> 0.12.1 Changelog: https://github.com/zineland/zine/releases/tag/v0.12.1 --- pkgs/applications/misc/zine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index a8848bc338c..a1e22e54f67 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.12.0"; + version = "0.12.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ioWgEl+bMaEDjtEQq/4vURS6Q/V9+r72NTWstyHm4mI="; + sha256 = "sha256-54kbSli/cEG8MlbPWC3xauj2VFxru/5haXfHaViUCN8="; }; - cargoHash = "sha256-2BeImBebeO4kLXmBrGjPmAjbrsLUaS2y52KSazVITb0="; + cargoHash = "sha256-youQoyJURmhPZItvfCSytUBpwRrejRf6EzfvjtgXH5E="; nativeBuildInputs = [ pkg-config From e4c76d2edd4bcd2649051e6acb8cb4413fd3bb8a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 10 Mar 2023 20:36:14 +0100 Subject: [PATCH 12/14] usql: 0.13.9 -> 0.13.10 --- pkgs/applications/misc/usql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 839b100383f..2c7aaa18eef 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; + hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; + vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ="; proxyVendor = true; # Exclude broken impala & hive driver From 05d40d8c8785f3f70fbdca901b466344c17dbb11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Mar 2023 23:40:37 +0000 Subject: [PATCH 13/14] lux: 0.16.0 -> 0.17.0 --- pkgs/tools/video/lux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index 0ef5dcfc537..4dfbadb95d7 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "lux"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - sha256 = "sha256-kB625R6Qlo9sw0iz8MbaCFOjxpMyH+9ugC6JDn7L7eM="; + sha256 = "sha256-n6oWItz0tnhpyPBGsf4+fYGnJyeYyhI2owkLrJWu7uw="; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-2cH5xVz3k9PPjzoMjWch3o8VBfP4nWAvakNwZNQLOeI="; + vendorHash = "sha256-4pn6JKE+VieadhDLkVhbJc6XSm95cNwoNBWYGEZl8iI="; ldflags = [ "-s" "-w" ]; From 000b5484bd6b812cad5a904fe6d1ff86db313f98 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 11 Mar 2023 02:08:58 +0200 Subject: [PATCH 14/14] nextcloud-client: 3.7.3 -> 3.7.4 Diff: https://github.com/nextcloud/desktop/compare/v3.7.3...v3.7.4 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 6355f2418b6..f121847e9aa 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.7.3"; + version = "3.7.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; + sha256 = "sha256-K9P9avZdW+QR+K+GSp4kqWVZX5J7mHpu4gyuR4smmcU="; }; patches = [